From b4645daf2a9943afb4603e30eef1897cdca157c5 Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期一, 06 三月 2023 13:07:05 +0800
Subject: [PATCH] add 新增 迁移 4.X EasyExcel枚举类数据翻译注解功能 ; fix 修正 !pr292 相关问题, 回退特殊类转换写法 ;
---
ruoyi-ui/src/components/Pagination/index.vue | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/components/Pagination/index.vue b/ruoyi-ui/src/components/Pagination/index.vue
index b09f080..56f5a6b 100644
--- a/ruoyi-ui/src/components/Pagination/index.vue
+++ b/ruoyi-ui/src/components/Pagination/index.vue
@@ -1,7 +1,6 @@
<template>
<div :class="{'hidden':hidden}" class="pagination-container">
<el-pagination
- v-if="pageShow"
:background="background"
:current-page.sync="currentPage"
:page-size.sync="pageSize"
@@ -64,7 +63,6 @@
},
data() {
return {
- pageShow: true
};
},
computed: {
@@ -88,10 +86,7 @@
methods: {
handleSizeChange(val) {
if (this.currentPage * val > this.total) {
- this.pageShow = false;
- this.$nextTick(() => {
- this.pageShow = true
- })
+ this.currentPage = 1
}
this.$emit('pagination', { page: this.currentPage, limit: val })
if (this.autoScroll) {
--
Gitblit v1.9.3