public/RuoYi-Cloud-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Cloud-Plus.git synced 2026-05-04 11:01:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud

Browse Source 
 Conflicts:
	ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java
	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
This commit is contained in:
疯狂的狮子li
2022-02-24 15:24:01 +08:00
parent 3b79582251 089ebaf9c5
commit 0d827e55ff
7 changed files with 98 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-ui/src/components/Pagination/index.vue
View File

@@ -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 @@ export default {
},
data() {
return {
pageShow: true
};
},
computed: {
@@ -88,10 +86,7 @@ export default {
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) {