From 46ace1200855695eb0114b52fa1c7955444d796c Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 28 Oct 2022 14:07:06 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2329=20fix=EF=BC=9A=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=BA=95=E9=83=A8=E5=88=97=E8=A1=A8=E6=8F=92=E4=BB=B6=E7=BC=BA?=
 =?UTF-8?q?=E5=A4=B1=20tableId=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/bottomBox/tabs/IpDetails.vue    | 1 +
 .../common/bottomBox/tabs/alertMessageTabNew.vue          | 1 +
 .../components/common/bottomBox/tabs/alertRuleEvalLog.vue | 5 +++--
 .../src/components/common/bottomBox/tabs/assetSubTab.vue  | 1 +
 .../src/components/common/bottomBox/tabs/assetTab.vue     | 1 +
 .../src/components/common/bottomBox/tabs/cabinetTab.vue   | 1 +
 .../common/bottomBox/tabs/commentsBottomTab.vue           | 1 +
 .../components/common/bottomBox/tabs/endpointQuery.vue    | 1 +
 .../components/common/bottomBox/tabs/endpointTabNew.vue   | 1 +
 .../src/components/common/bottomBox/tabs/logBottomTab.vue | 2 ++
 .../components/common/bottomBox/tabs/networkBottomTab.vue | 1 +
 .../components/common/bottomBox/tabs/operationLogTab.vue  | 1 +
 .../src/components/common/bottomBox/tabs/panelTabNew.vue  | 2 ++
 .../components/common/bottomBox/tabs/processBottomTab.vue | 1 +
 .../common/bottomBox/tabs/recordRuleEvalLog.vue           | 1 +
 .../components/common/bottomBox/tabs/scrapeEndpoint.vue   | 1 +
 .../common/bottomBox/tabs/terminalLogCMDTab.vue           | 4 +++-
 .../common/bottomBox/tabs/terminalLogMonitorTab.vue       | 2 ++
 .../common/bottomBox/tabs/terminalLogRecordTab.vue        | 2 ++
 .../components/common/bottomBox/tabs/terminalLogTab.vue   | 1 +
 .../components/common/bottomBox/tabs/vsysBottomTab.vue    | 5 +++--
 nezha-fronted/src/components/common/mixin/dataList.js     | 8 +++++---
 22 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue b/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue
index f89773410..ee63b3da8 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue
@@ -3,6 +3,7 @@
     <nz-bottom-data-list
       :showTitle='showTitle'
       :obj='obj'
+      :tableId="tableId"
       :targetTab.sync="targetTab"
       :api="url"
       style="height: 100%"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index 6f9721d12..fe3a62c8f 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -3,6 +3,7 @@
     <nz-bottom-data-list
       :showTitle='showTitle'
       :obj='obj'
+      :tableId="tableId"
       :api="url"
       :custom-table-title.sync="tools.customTableTitle"
       :layout="['searchInput', 'elementSet']"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue
index 3ba496132..f59b1c85c 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue
@@ -1,7 +1,8 @@
 <template>
   <nz-bottom-data-list
-      :showTitle='showTitle'
-      :obj='obj'
+    :showTitle='showTitle'
+    :obj='obj'
+    :tableId="tableId"
     :api="url"
     :custom-table-title.sync="tools.customTableTitle"
     :layout="['elementSet']"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue
index 573d70e0b..94239019a 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue
@@ -3,6 +3,7 @@
     <nz-bottom-data-list
       :showTitle='showTitle'
       :obj='obj'
+      :tableId="tableId"
       :api="url"
       :targetTab="targetTab"
       style="height: 100%"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
index d7d697bf8..ef1a8df34 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
@@ -9,6 +9,7 @@
       :custom-table-title.sync="tools.customTableTitle"
       :layout="['searchInput', 'elementSet']"
       :search-msg="searchMsg"
+      :tableId="tableId"
       :tabs="tabs"
       @search="search"
       @changeTab="changeTab"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
index 0403f49ec..07a3e76ec 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
@@ -4,6 +4,7 @@
       :showTitle='showTitle'
       :obj='obj'
       :api="url"
+      :tableId="tableId"
       :targetTab="targetTab"
       style="height: 100%"
       :custom-table-title.sync="tools.customTableTitle"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/commentsBottomTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/commentsBottomTab.vue
index e4dbbd582..3ba90e2b4 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/commentsBottomTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/commentsBottomTab.vue
@@ -2,6 +2,7 @@
   <nz-bottom-data-list
     :showTitle='showTitle'
     :obj='obj'
+    :tableId="tableId"
     id="commentBottomTab"
     :api="url"
     :custom-table-title.sync="tools.customTableTitle"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
index e475a6787..44c299b7a 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
@@ -4,6 +4,7 @@
       :showTitle='showTitle'
       :obj='obj'
       :api="url"
+      :tableId="tableId"
       :layout="['searchInput', 'elementSet']"
       :search-msg="searchMsg"
       :tabs="tabs"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
index 482eb0228..859455e14 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
@@ -4,6 +4,7 @@
       :showTitle='showTitle'
       :obj='obj'
       :api="url"
+      :tableId="tableId"
       :custom-table-title.sync="tools.customTableTitle"
       :layout="['searchInput', 'elementSet']"
       :search-msg="searchMsg"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
index 4c957f009..31a312c63 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
@@ -3,6 +3,7 @@
       :showTitle='showTitle'
       :obj='obj'
       id="logBottomTab"
+      :tableId="tableId"
     :custom-tool="true"
     :layout="[]"
     :show-pagination="false"
@@ -61,6 +62,7 @@ export default {
   },
   data () {
     return {
+      tableId: 'logBottomTab',
       logData: null,
       filterTime: [
         bus.timeFormate(bus.getOffsetTimezoneData(-1)),
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/networkBottomTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/networkBottomTab.vue
index 96ebb7cbb..46a549fb5 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/networkBottomTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/networkBottomTab.vue
@@ -2,6 +2,7 @@
   <nz-bottom-data-list
       :showTitle='showTitle'
       :obj='obj'
+      :tableId="tableId"
     id="networkBottomTab"
     :api="url"
     :custom-table-title.sync="tools.customTableTitle"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue
index 3c5187faa..10bb7a231 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue
@@ -3,6 +3,7 @@
       :showTitle='showTitle'
       :obj='obj'
       :api="url"
+      :tableId="tableId"
       :custom-table-title.sync="tools.customTableTitle"
       :layout="['searchInput', 'elementSet']"
       :search-msg="searchMsg"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
index c5ded880a..963dbfc03 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
@@ -3,6 +3,7 @@
     <nz-bottom-data-list
       :showTitle='showTitle'
       :obj='obj'
+      :tableId="tableId"
       :layout="[]"
       :tabs="tabs"
       :targetTab="targetTab"
@@ -188,6 +189,7 @@ export default {
   data () {
     return {
       fromRoute,
+      tableId: 'panelTabNew',
       pdfId: 'pdfDom',
       htmlTitle: 'panel',
       panelTabLoading: false,
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/processBottomTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/processBottomTab.vue
index fc5ba82c4..3347dd5e4 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/processBottomTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/processBottomTab.vue
@@ -2,6 +2,7 @@
   <nz-bottom-data-list
       :showTitle='showTitle'
       :obj='obj'
+      :tableId="tableId"
     id="processBottomTab"
     :api="url"
     :custom-table-title.sync="tools.customTableTitle"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/recordRuleEvalLog.vue b/nezha-fronted/src/components/common/bottomBox/tabs/recordRuleEvalLog.vue
index e61da1a4f..9cc65e072 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/recordRuleEvalLog.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/recordRuleEvalLog.vue
@@ -2,6 +2,7 @@
   <nz-bottom-data-list
       :showTitle='showTitle'
       :obj='obj'
+      :tableId="tableId"
     :api="url"
     :custom-table-title.sync="tools.customTableTitle"
     :layout="['elementSet']"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue b/nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue
index c64a6a10f..e6dbd4cda 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue
@@ -3,6 +3,7 @@
     <nz-bottom-data-list
       :showTitle='showTitle'
       :obj='obj'
+      :tableId="tableId"
       :targetTab.sync="targetTab"
       :api="url"
       style="height: 100%"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue
index f2dd862e2..27d0c6631 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue
@@ -1,6 +1,7 @@
 <template>
   <nz-bottom-data-list
     :showTitle='showTitle'
+    :tableId="tableId"
     :obj='obj'
     :layout="[]"
     :tabs="tabs"
@@ -91,7 +92,8 @@ export default {
       },
       records: [ // 加载更多时有多个record，否则只有一个
 
-      ]
+      ],
+      tableId: 'terminaLogCMDTab'
     }
   },
   methods: {
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue
index 9b27cfcec..b147e9acc 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue
@@ -6,6 +6,7 @@
     :tabs="tabs"
       :targetTab="targetTab"
     @changeTab="changeTab"
+      :tableId="tableId"
     :title="'Session ID'"
   >
     <template v-slot:title><span :title="obj.uuid.substring(0, 8).toUpperCase()">{{obj.uuid.substring(0, 8).toUpperCase()}}</span></template>
@@ -36,6 +37,7 @@ export default {
   },
   data () {
     return {
+      tableId: 'terminaLogMonitorTab',
       filter: {
         size: 1,
         uuid: ''
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue
index 6f4f0ffff..0e545d601 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue
@@ -2,6 +2,7 @@
   <nz-bottom-data-list
     :showTitle='showTitle'
     :obj='obj'
+    :tableId="tableId"
     :layout="[]"
     :tabs="tabs"
     :targetTab="targetTab"
@@ -49,6 +50,7 @@ export default {
   },
   data () {
     return {
+      tableId: 'terminaLogRecordTab',
       filter: {
         size: 1,
         uuid: ''
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
index 1579a44bc..fa3652fad 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
@@ -4,6 +4,7 @@
     :obj='obj'
     :targetTab="targetTab"
     :api="url"
+    :tableId="tableId"
     :custom-table-title.sync="tools.customTableTitle"
     :layout="['searchInput', 'elementSet']"
     :search-msg="searchMsg"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/vsysBottomTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/vsysBottomTab.vue
index cb37e74ac..2328f1926 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/vsysBottomTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/vsysBottomTab.vue
@@ -1,7 +1,8 @@
 <template>
   <nz-bottom-data-list
-      :showTitle='showTitle'
-      :obj='obj'
+    :showTitle='showTitle'
+    :obj='obj'
+    :tableId="tableId"
     id="vsysBottomTab"
     :api="url"
     :custom-table-title.sync="tools.customTableTitle"
diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js
index 1d11a21e9..a5ce470a4 100644
--- a/nezha-fronted/src/components/common/mixin/dataList.js
+++ b/nezha-fronted/src/components/common/mixin/dataList.js
@@ -1314,10 +1314,12 @@ export default {
     if (pageSize && pageSize !== 'undefined') {
       this.pageObj.pageSize = pageSize
     }
-    if (!this.$refs.dataTable && !this.$refs.dataDetail) {
-      return
+    let tableTitle = ''
+    if (this.$refs.dataTable) {
+      tableTitle = this.$refs.dataTable.tableTitle
+    } else if (this.$refs.dataDetail) {
+      tableTitle = this.$refs.dataDetail.tableTitle
     }
-    const tableTitle = this.$refs.dataTable ? this.$refs.dataTable.tableTitle : this.$refs.dataDetail.tableTitle
     let localStorageTableTitle = localStorage.getItem('nz-tableTitle-' + localStorage.getItem('nz-username') + '-' + this.tableId)
     localStorageTableTitle = localStorageTableTitle ? JSON.parse(localStorageTableTitle) : tableTitle
     this.tools.customTableTitle = tableTitle.map((item, index) => { // 修复切换中英文的问题