From a1431c5cb198c42d8830969a9a35710fddbc92c0 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期四, 17 十一月 2022 17:33:32 +0800 Subject: [PATCH] !251 add 新增字典数据映射注解,根据字段数据(sys_dict_data表).dict_type 的 value 映射对应的 label Merge pull request !251 from itino/dev-itino --- 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