From b2dd73c4fd91ed461040f25f7c1c01f745e2dd7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=8A=B2=E6=9D=BE?= Date: Tue, 29 Dec 2020 15:38:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=97=E8=A1=A8=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E9=A1=B5=E8=A2=AB=E5=88=A0=E9=99=A4=E7=A9=BA=E5=90=8E=E9=A1=B5?= =?UTF-8?q?=E7=A0=81=E5=87=8F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/bottomBox/tabs/alertMessageTab.vue | 8 ++++++++ nezha-fronted/src/components/page/alert/config.vue | 8 ++++++++ nezha-fronted/src/components/page/alert/list.vue | 8 ++++++++ nezha-fronted/src/components/page/config/account.vue | 8 ++++++++ nezha-fronted/src/components/page/config/dc.vue | 8 ++++++++ nezha-fronted/src/components/page/config/mib.vue | 10 ++++++++++ nezha-fronted/src/components/page/config/model.vue | 8 ++++++++ .../src/components/page/config/promServer.vue | 8 ++++++++ nezha-fronted/src/components/page/config/roles.vue | 10 ++++++++++ nezha-fronted/src/components/page/project/project.vue | 8 ++++++++ 10 files changed, 84 insertions(+) diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue index 75e5b2150..583e556ab 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue @@ -715,6 +715,14 @@ this.getAlertList(); } }, + tableData: { + deep: true, + handler(n) { + if (n.length === 0 && this.pageObj.pageNo > 1) { + this.pageNo(this.pageObj.pageNo-1); + } + } + } }, created(){ //是否存在分页缓存 diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index fae4ac7ea..762c81612 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -503,6 +503,14 @@ this.bottomBox.ruleDetail = this.convertToDetail(n); } }, + tableData: { + deep: true, + handler(n) { + if (n.length === 0 && this.pageObj.pageNo > 1) { + this.pageNo(this.pageObj.pageNo-1); + } + } + } }, beforeDestroy() { bus.$off("alert-rule-list-change"); diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue index 46fccc799..d1682fbd6 100644 --- a/nezha-fronted/src/components/page/alert/list.vue +++ b/nezha-fronted/src/components/page/alert/list.vue @@ -691,6 +691,14 @@ showSubList(n) { this.$bottomBoxWindow.showSubListWatch(vm, n); }, + tableData: { + deep: true, + handler(n) { + if (n.length === 0 && this.pageObj.pageNo > 1) { + this.pageNo(this.pageObj.pageNo-1); + } + } + } }, created(){ //是否存在分页缓存 diff --git a/nezha-fronted/src/components/page/config/account.vue b/nezha-fronted/src/components/page/config/account.vue index f735aeb7e..6c02a7fa2 100644 --- a/nezha-fronted/src/components/page/config/account.vue +++ b/nezha-fronted/src/components/page/config/account.vue @@ -452,6 +452,14 @@ let vm = this; this.$bottomBoxWindow.showSubListWatch(vm, n); }, + tableData: { + deep: true, + handler(n) { + if (n.length === 0 && this.pageObj.pageNo > 1) { + this.pageNo(this.pageObj.pageNo-1); + } + } + } }, created(){ //是否存在分页缓存 diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue index 66f8ba998..aac61138a 100644 --- a/nezha-fronted/src/components/page/config/dc.vue +++ b/nezha-fronted/src/components/page/config/dc.vue @@ -510,6 +510,14 @@ let vm = this; this.$bottomBoxWindow.showSubListWatch(vm, n); }, + tableData: { + deep: true, + handler(n) { + if (n.length === 0 && this.pageObj.pageNo > 1) { + this.pageNo(this.pageObj.pageNo-1); + } + } + } }, beforeDestroy(){ bus.$off("dc-list-change"); diff --git a/nezha-fronted/src/components/page/config/mib.vue b/nezha-fronted/src/components/page/config/mib.vue index 417686a2b..d2a63cafd 100644 --- a/nezha-fronted/src/components/page/config/mib.vue +++ b/nezha-fronted/src/components/page/config/mib.vue @@ -345,6 +345,16 @@ this.getTableData(); }, }, + watch: { + tableData: { + deep: true, + handler(n) { + if (n.length === 0 && this.pageObj.pageNo > 1) { + this.pageNo(this.pageObj.pageNo-1); + } + } + } + }, created(){ //是否存在分页缓存 let pageSize = localStorage.getItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId); diff --git a/nezha-fronted/src/components/page/config/model.vue b/nezha-fronted/src/components/page/config/model.vue index 3a649e10c..de8af7e50 100644 --- a/nezha-fronted/src/components/page/config/model.vue +++ b/nezha-fronted/src/components/page/config/model.vue @@ -365,6 +365,14 @@ let vm = this; this.$bottomBoxWindow.showSubListWatch(vm, n); }, + tableData: { + deep: true, + handler(n) { + if (n.length === 0 && this.pageObj.pageNo > 1) { + this.pageNo(this.pageObj.pageNo-1); + } + } + } }, beforeDestroy() { this.scrollbarWrap.removeEventListener('scroll', bus.debounce); diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue index 8d8617931..2e285393f 100644 --- a/nezha-fronted/src/components/page/config/promServer.vue +++ b/nezha-fronted/src/components/page/config/promServer.vue @@ -445,6 +445,14 @@ let vm = this; this.$bottomBoxWindow.showSubListWatch(vm, n); }, + tableData: { + deep: true, + handler(n) { + if (n.length === 0 && this.pageObj.pageNo > 1) { + this.pageNo(this.pageObj.pageNo-1); + } + } + } }, } diff --git a/nezha-fronted/src/components/page/config/roles.vue b/nezha-fronted/src/components/page/config/roles.vue index a3117690a..68d14313d 100644 --- a/nezha-fronted/src/components/page/config/roles.vue +++ b/nezha-fronted/src/components/page/config/roles.vue @@ -293,6 +293,16 @@ this.getTableData(); }, }, + watch: { + tableData: { + deep: true, + handler(n) { + if (n.length === 0 && this.pageObj.pageNo > 1) { + this.pageNo(this.pageObj.pageNo-1); + } + } + } + }, created(){ //是否存在分页缓存 let pageSize = localStorage.getItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId); diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue index b610ebbd1..7df17382a 100644 --- a/nezha-fronted/src/components/page/project/project.vue +++ b/nezha-fronted/src/components/page/project/project.vue @@ -836,6 +836,14 @@ }); } }, + endpointTableData: { + deep: true, + handler(n) { + if (n.length === 0 && this.endpointPageObj.pageNo > 1) { + this.endpointPageNo(this.endpointPageObj.pageNo-1); + } + } + } }, beforeDestroy() { bus.$off("project-page-type");