From f34b8dd4bf778b8d68b96ab6767a97f41c94e383 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 30 Dec 2020 11:39:37 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9asset=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/alert/alertMessageTable.vue           | 12 ++++++++++++
 .../src/components/page/asset/asset.vue          | 16 +++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/common/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/alert/alertMessageTable.vue
index 4fa310488..2b79494a6 100644
--- a/nezha-fronted/src/components/common/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/alert/alertMessageTable.vue
@@ -785,6 +785,10 @@
       tableDataSort(item){
         this.$emit('tableDataSort',item);
       },
+      pageNo(val) {
+        this.pageObj.pageNo = val;
+        this.getTableData();
+      },
       // label tooltip是否显示
       labelToolTipDis(labelType){
         switch(labelType){
@@ -844,6 +848,14 @@
         },
         immediate: true,
         deep:true,
+      },
+      tableData: {
+        deep: true,
+        handler(n) {
+          if (n.length === 0 && this.pageObj.pageNo > 1) {
+            this.pageNo(this.pageObj.pageNo-1);
+          }
+        }
       }
     },
     mounted() {
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 83fe985e4..7ae2919ea 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -21,7 +21,7 @@
           <button :title="$t('overall.batchEdit')" @click.stop="batchEdit" class="nz-btn nz-btn-size-normal nz-btn-style-light" id="asset-batch-asset" style="margin-left: 15px" v-has="'asset_toBatchEdit'">
             <i class="nz-icon nz-icon-batch-edit"></i>
           </button>
-          <delete-button :delete-objs="batchDeleteObjs" @after="afterTableListChange" api="asset" v-has="'asset_delete'"></delete-button>
+          <delete-button :delete-objs="batchDeleteObjs" @after="getTableData" api="asset" v-has="'asset_delete'"></delete-button>
         </div>
         <div class="pagination-top pagination-top-hide display-none"></div>
       </div>
@@ -426,6 +426,16 @@
           }
         }
       },
+      tableData: {
+        deep: true,
+        handler(n) {
+          if (n.length === 0 && this.pageObj.pageNo > 1) {
+            this.pageNo(this.pageObj.pageNo-1);
+          }else if(n.length === 0 && this.pageObj.pageNo === 1){
+            this.afterTableListChange();
+          }
+        }
+      }
     },
     methods: {
       fullScreen() {
@@ -545,7 +555,7 @@
           this.$delete("asset?ids=" + asset.id).then(response => {
             if (response.code === 200) {
               this.$message({duration: 2000, type: 'success', message: this.$t("tip.deleteSuccess")});
-             this.afterTableListChange()
+             this.getTableData()
             } else {
               this.$message.error(response.msg);
             }
@@ -583,7 +593,7 @@
         this.rightBox.show = false;
         this.rightBox.batchShow = false;
         if (refresh) {
-         this.afterTableListChange()
+         this.getTableData()
           this.loadKeys();
         }
       },