NEZ-2329 fix：修复底部列表插件缺失 tableId参数

2022-10-28 14:07:06 +08:00
parent 8c8e746156
commit 46ace12008
22 changed files with 36 additions and 8 deletions
--- 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%"
--- 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']"
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.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']"
--- 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%"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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)),
--- 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"
--- 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"
--- 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,
--- 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"
--- 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']"
--- 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%"
--- 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: {
--- 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: ''
--- 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: ''
--- 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"
--- a/nezha-fronted/src/components/common/bottomBox/tabs/vsysBottomTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/vsysBottomTab.vue
@@ -2,6 +2,7 @@
  <nz-bottom-data-list
    :showTitle='showTitle'
    :obj='obj'
+    :tableId="tableId"
    id="vsysBottomTab"
    :api="url"
    :custom-table-title.sync="tools.customTableTitle"
--- 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) => { // 修复切换中英文的问题