From c0d430f4e5adf08129c2610d9d2b5446bb19c0d6 Mon Sep 17 00:00:00 2001
From: XCSDN <gitee@xcsdn.net>
Date: Thu, 07 Apr 2022 12:57:56 +0800
Subject: [PATCH] update ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java. 字典类型必须以字母开头,且字典类型只能由小写字母或加下划线还有数字组成 防止由于字典类型不符合前端开发规范而报错
---
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 4d86211..1617af0 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.2