fix：全局搜索跳转详细视图选中

2022-01-18 10:06:33 +08:00
parent c86e3114dd
commit 123c60d5d8
15 changed files with 86 additions and 14 deletions
--- a/nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue
@@ -141,7 +141,14 @@ export default {
            })
            return item
          })
-          this.detailViewRightObj = this.tableData[0]
+          const globalSearchId = this.$store.getters.getGlobalSearchId
+          let detailViewRightObj = ''
+          if (globalSearchId) {
+            detailViewRightObj = this.tableData.find(item => item.id === globalSearchId)
+          } else {
+            detailViewRightObj = this.tableData[0]
+          }
+          this.detailViewRightObj = detailViewRightObj
          this.inputDateQuery = this.handlerTableData(this.tableData)
          this.pageObj.total = this.tableData.length
          if (!this.scrollbarWrap) {
--- a/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue
+++ b/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue
@@ -21,6 +21,7 @@
        v-for="(item,index) in tableData"
        :key="index"
       class="detail-row"
+        :id="'globalSearch' + item.id"
        :class="item.id === detailViewRightObj.id ? 'selected' : ''"
        @click="detailViewRightShow(item)">
        <el-popover
--- a/nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
+++ b/nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
@@ -21,6 +21,7 @@
        v-for="(item,index) in tableData"
        :key="index"
       class="detail-row"
+        :id="'globalSearch' + item.id"
        :class="item.id === detailViewRightObj.id ? 'selected' : ''"
        @click="detailViewRightShow(item)"
        @mouseenter="labelHover(item, 'asset', true, $event)"
--- a/nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue
+++ b/nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue
@@ -21,6 +21,7 @@
        v-for="(item,index) in tableData"
        :key="index"
       class="detail-row"
+        :id="'globalSearch' + item.id"
        :class="item.id === detailViewRightObj.id ? 'selected' : ''"
        @click="detailViewRightShow(item)"
        @mouseenter="labelHover(item, 'dc', true, $event)"
--- a/nezha-fronted/src/components/common/detailView/list/endpoint/endpointDetail.vue
+++ b/nezha-fronted/src/components/common/detailView/list/endpoint/endpointDetail.vue
@@ -21,6 +21,7 @@
        v-for="(item,index) in tableData"
        :key="index"
       class="detail-row"
+        :id="'globalSearch' + item.id"
        :class="item.id === detailViewRightObj.id ? 'selected' : ''"
        @click="detailViewRightShow(item)"
        @mouseenter="labelHover(item, 'endpoint', true, $event)"
--- a/nezha-fronted/src/components/common/detailView/list/module/moduleDetail.vue
+++ b/nezha-fronted/src/components/common/detailView/list/module/moduleDetail.vue
@@ -21,6 +21,7 @@
        v-for="(item,index) in tableData"
        :key="index"
       class="detail-row"
+        :id="'globalSearch' + item.id"
        :class="item.id === detailViewRightObj.id ? 'selected' : ''"
        @click="detailViewRightShow(item)"
        @mouseenter="labelHover(item, 'module', true, $event)"
--- a/nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue
+++ b/nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue
@@ -21,6 +21,7 @@
        v-for="(item,index) in tableData"
        :key="index"
       class="detail-row"
+        :id="'globalSearch' + item.id"
        :class="item.id === detailViewRightObj.id ? 'selected' : ''"
        @click="detailViewRightShow(item)"
      >
--- a/nezha-fronted/src/components/common/detailView/list/userDetail/userDetail.vue
+++ b/nezha-fronted/src/components/common/detailView/list/userDetail/userDetail.vue
@@ -21,6 +21,7 @@
        v-for="(item,index) in tableData"
        :key="index"
       class="detail-row"
+        :id="'globalSearch' + item.id"
        :class="item.id === detailViewRightObj.id ? 'selected' : ''"
        @click="detailViewRightShow(item)"
      >
--- a/nezha-fronted/src/components/common/mixin/dataList.js
+++ b/nezha-fronted/src/components/common/mixin/dataList.js
@@ -103,7 +103,14 @@ export default {
            response.data.list[i].status = response.data.list[i].status + ''
          }
          this.tableData = response.data.list
-          this.detailViewRightObj = this.tableData[0]
+          const globalSearchId = this.$store.getters.getGlobalSearchId
+          let detailViewRightObj = ''
+          if (globalSearchId) {
+            detailViewRightObj = this.tableData.find(item => item.id === globalSearchId)
+          } else {
+            detailViewRightObj = this.tableData[0]
+          }
+          this.detailViewRightObj = detailViewRightObj
          this.pageObj.total = response.data.total
          this.pageObj.pages = response.data.pages
          if (!this.scrollbarWrap && this.$refs.dataTable.$refs.dataTable) {
--- a/nezha-fronted/src/components/common/mixin/detailViewLeftMixin.js
+++ b/nezha-fronted/src/components/common/mixin/detailViewLeftMixin.js
@@ -66,6 +66,22 @@ export default {
          this.$emit('orderDetail', this.orderBy, n)
        }
      }
+    },
+    tableData: {
+      immediate: true,
+      handler (n) {
+        if (n && n.length) {
+          const id = this.$store.getters.getGlobalSearchId
+          if (id) {
+            setTimeout(() => {
+              if (document.getElementById('globalSearch' + id)) {
+                document.getElementById('globalSearch' + id).scrollIntoView(true)
+                this.$store.commit('setGlobalSearchId', '')
+              }
+            }, 500)
+          }
+        }
+      }
    }
  }
 }
--- a/nezha-fronted/src/components/page/alert/alertRule.vue
+++ b/nezha-fronted/src/components/page/alert/alertRule.vue
@@ -283,7 +283,14 @@ export default {
            item.receiverShow = temp
          })
          this.tableData = response.data.list
-          this.detailViewRightObj = this.tableData[0]
+          const globalSearchId = this.$store.getters.getGlobalSearchId
+          let detailViewRightObj = ''
+          if (globalSearchId) {
+            detailViewRightObj = this.tableData.find(item => item.id === globalSearchId)
+          } else {
+            detailViewRightObj = this.tableData[0]
+          }
+          this.detailViewRightObj = detailViewRightObj
          this.pageObj.total = response.data.total
          this.pageObj.pages = response.data.pages
          if (!this.scrollbarWrap) {
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -713,7 +713,14 @@ export default {
            response.data.list[i].status = response.data.list[i].status + ''
          }
          this.tableData = response.data.list
-          this.detailViewRightObj = this.tableData[0]
+          const globalSearchId = this.$store.getters.getGlobalSearchId
+          let detailViewRightObj = ''
+          if (globalSearchId) {
+            detailViewRightObj = this.tableData.find(item => item.id === globalSearchId)
+          } else {
+            detailViewRightObj = this.tableData[0]
+          }
+          this.detailViewRightObj = detailViewRightObj
          this.pageObj.total = response.data.total
          this.pageObj.pages = response.data.pages
          if (!this.scrollbarWrap && this.$refs.dataTable.$refs.dataTable) {
--- a/nezha-fronted/src/components/page/config/terminalLog.vue
+++ b/nezha-fronted/src/components/page/config/terminalLog.vue
@@ -184,7 +184,14 @@ export default {
        if (response.code === 200) {
          this.tableData = response.data.list
          this.nowTime = this.utcTimeToTimezoneStr(response.time)
-          this.detailViewRightObj = this.tableData[0]
+          const globalSearchId = this.$store.getters.getGlobalSearchId
+          let detailViewRightObj = ''
+          if (globalSearchId) {
+            detailViewRightObj = this.tableData.find(item => item.id === globalSearchId)
+          } else {
+            detailViewRightObj = this.tableData[0]
+          }
+          this.detailViewRightObj = detailViewRightObj
          this.pageObj.total = response.data.total
          this.pageObj.pages = response.data.pages
          if (!this.scrollbarWrap) {
--- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
+++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
@@ -624,7 +624,14 @@ export default {
            })
          }
          this.tableData = response.data.list
-          this.detailViewRightObj = this.tableData[0]
+          const globalSearchId = this.$store.getters.getGlobalSearchId
+          let detailViewRightObj = ''
+          if (globalSearchId) {
+            detailViewRightObj = this.tableData.find(item => item.id === globalSearchId)
+          } else {
+            detailViewRightObj = this.tableData[0]
+          }
+          this.detailViewRightObj = detailViewRightObj
          this.pageObj.total = response.data.total
          this.pageObj.pages = response.data.pages
          if (!this.scrollbarWrap) {
--- a/nezha-fronted/src/components/page/monitor/module/moduleList.vue
+++ b/nezha-fronted/src/components/page/monitor/module/moduleList.vue
@@ -405,7 +405,14 @@ export default {
            response.data.list[i].status = response.data.list[i].status + ''
          }
          this.tableData = response.data.list
-          this.detailViewRightObj = this.tableData[0]
+          const globalSearchId = this.$store.getters.getGlobalSearchId
+          let detailViewRightObj = ''
+          if (globalSearchId) {
+            detailViewRightObj = this.tableData.find(item => item.id === globalSearchId)
+          } else {
+            detailViewRightObj = this.tableData[0]
+          }
+          this.detailViewRightObj = detailViewRightObj
          this.pageObj.total = response.data.total
          this.pageObj.pages = response.data.pages
          if (!this.scrollbarWrap) {