From 123c60d5d86d7e5efb4ea59eeaab6b2f3fa5615c Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 18 Jan 2022 10:06:33 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=85=A8=E5=B1=80=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=20=E8=B7=B3=E8=BD=AC=20=E8=AF=A6=E7=BB=86=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E9=80=89=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/bottomBox/tabs/scrapeEndpoint.vue | 9 ++++++++- .../list/alertRule/alertRuleDetail.vue | 3 ++- .../common/detailView/list/asset/assetDetail.vue | 3 ++- .../common/detailView/list/dc/dcDetail.vue | 3 ++- .../detailView/list/endpoint/endpointDetail.vue | 3 ++- .../detailView/list/module/moduleDetail.vue | 3 ++- .../list/terminalLogDetail/terminalLogDetail.vue | 3 ++- .../detailView/list/userDetail/userDetail.vue | 3 ++- .../src/components/common/mixin/dataList.js | 9 ++++++++- .../common/mixin/detailViewLeftMixin.js | 16 ++++++++++++++++ .../src/components/page/alert/alertRule.vue | 9 ++++++++- .../src/components/page/asset/asset.vue | 9 ++++++++- .../src/components/page/config/terminalLog.vue | 9 ++++++++- .../page/monitor/endpoint/endpointList.vue | 9 ++++++++- .../page/monitor/module/moduleList.vue | 9 ++++++++- 15 files changed, 86 insertions(+), 14 deletions(-) diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue b/nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue index 2e12f47a4..100de5d93 100644 --- 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) { diff --git a/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue b/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue index 50866eeb5..ccf36e426 100644 --- a/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue +++ b/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue @@ -20,7 +20,8 @@
  • diff --git a/nezha-fronted/src/components/common/detailView/list/userDetail/userDetail.vue b/nezha-fronted/src/components/common/detailView/list/userDetail/userDetail.vue index 0ce5180de..df8779a98 100644 --- a/nezha-fronted/src/components/common/detailView/list/userDetail/userDetail.vue +++ b/nezha-fronted/src/components/common/detailView/list/userDetail/userDetail.vue @@ -20,7 +20,8 @@
  • diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js index bf1cb6a1c..97a446913 100644 --- 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) { diff --git a/nezha-fronted/src/components/common/mixin/detailViewLeftMixin.js b/nezha-fronted/src/components/common/mixin/detailViewLeftMixin.js index a7d39685f..7789d97c2 100644 --- 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) + } + } + } } } } diff --git a/nezha-fronted/src/components/page/alert/alertRule.vue b/nezha-fronted/src/components/page/alert/alertRule.vue index 50263016e..cf614af9c 100644 --- 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) { diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index bf9c910e9..5094aedae 100644 --- 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) { diff --git a/nezha-fronted/src/components/page/config/terminalLog.vue b/nezha-fronted/src/components/page/config/terminalLog.vue index bcd70fe42..1f71671dc 100644 --- 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) { diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue index b4038aa31..28dfc1b18 100644 --- 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) { diff --git a/nezha-fronted/src/components/page/monitor/module/moduleList.vue b/nezha-fronted/src/components/page/monitor/module/moduleList.vue index dcc4cbcc3..4b50b5f9f 100644 --- 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) {