diff --git a/nezha-fronted/src/components/common/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/alert/alertMessageTable.vue index 8c7d8bac0..2ae481b90 100644 --- a/nezha-fronted/src/components/common/alert/alertMessageTable.vue +++ b/nezha-fronted/src/components/common/alert/alertMessageTable.vue @@ -161,7 +161,7 @@ @@ -854,16 +854,21 @@ return this.$CONSTANTS.alertMessage.severityData.find(s => {return s.value == key}).label }, plpsscrolly(el,self){ + console.log(el._ps_,self.bottomBox.mainResizeShow) if (el._ps_.scrollbarYTop > 50) { + console.log(true) self.tools.showTopBtn = true; } else { + console.log(false) self.tools.showTopBtn = false; } }, plmouseenter(el,self){ + console.log('plmouseenter') self.tools.tableHover = true; }, plmouseleave(el,self){ + console.log('plmouseleave') self.tools.tableHover = false; } }, @@ -899,6 +904,7 @@ this.$nextTick(() => { //绑定滚动条事件,控制top按钮 let el = this.$refs.alertListTable.$el.querySelector(".el-table__body-wrapper"); + console.log(el); if (el._ps_) { el.addEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this)); el.addEventListener("mouseenter", this.plmouseenter.bind('',el,this)); @@ -929,6 +935,7 @@ el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this)); el.removeEventListener("mouseenter", this.plmouseenter.bind('',el,this)); el.removeEventListener("mouseleave", this.plmouseleave.bind('',el,this)); + el._ps_.destroy(); } } } diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue index 14dc3511f..657d7b452 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue @@ -686,6 +686,7 @@ this.dropCol = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-/alertList") ? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-/alertList")) : this.tableTitle; + this.$refs['alertMessageTable'].bottomBox.mainResizeShow=false; }, beforeDestroy(){ diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue index 5d65ae9aa..400fdc543 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue @@ -695,6 +695,7 @@ el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this)); el.removeEventListener("mouseenter", this.plmouseenter.bind('',el,this)); el.removeEventListener("mouseleave", this.plmouseleave.bind('',el,this)); + el._ps_.destroy(); } } } diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index 7fc65a835..587ca4867 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -580,6 +580,7 @@ el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this)); el.removeEventListener("mouseenter", this.plmouseenter.bind('',el,this)); el.removeEventListener("mouseleave", this.plmouseleave.bind('',el,this)); + el._ps_.destroy(); } } } diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 06aea0832..7f9a0b178 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -836,6 +836,7 @@ el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this)); el.removeEventListener("mouseenter", this.plmouseenter.bind('',el,this)); el.removeEventListener("mouseleave", this.plmouseleave.bind('',el,this)); + el._ps_.destroy(); } }, destroyed() { diff --git a/nezha-fronted/src/components/page/config/account.vue b/nezha-fronted/src/components/page/config/account.vue index 7177479d8..c0221cd6d 100644 --- a/nezha-fronted/src/components/page/config/account.vue +++ b/nezha-fronted/src/components/page/config/account.vue @@ -404,6 +404,7 @@ el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this)); el.removeEventListener("mouseenter", this.plmouseenter.bind('',el,this)); el.removeEventListener("mouseleave", this.plmouseleave.bind('',el,this)); + el._ps_.destroy(); } } } diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue index 8e5379294..5a91686db 100644 --- a/nezha-fronted/src/components/page/config/dc.vue +++ b/nezha-fronted/src/components/page/config/dc.vue @@ -542,6 +542,7 @@ el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this)); el.removeEventListener("mouseenter", this.plmouseenter.bind('',el,this)); el.removeEventListener("mouseleave", this.plmouseleave.bind('',el,this)); + el._ps_.destroy(); } } } diff --git a/nezha-fronted/src/components/page/config/mib.vue b/nezha-fronted/src/components/page/config/mib.vue index c41f48a0e..5649bf2ba 100644 --- a/nezha-fronted/src/components/page/config/mib.vue +++ b/nezha-fronted/src/components/page/config/mib.vue @@ -376,6 +376,7 @@ el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this)); el.removeEventListener("mouseenter", this.plmouseenter.bind('',el,this)); el.removeEventListener("mouseleave", this.plmouseleave.bind('',el,this)); + el._ps_.destroy(); } } } diff --git a/nezha-fronted/src/components/page/config/model.vue b/nezha-fronted/src/components/page/config/model.vue index ff9ded959..e33ec1650 100644 --- a/nezha-fronted/src/components/page/config/model.vue +++ b/nezha-fronted/src/components/page/config/model.vue @@ -381,6 +381,7 @@ el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this)); el.removeEventListener("mouseenter", this.plmouseenter.bind('',el,this)); el.removeEventListener("mouseleave", this.plmouseleave.bind('',el,this)); + el._ps_.destroy(); } } } diff --git a/nezha-fronted/src/components/page/config/operationlog.vue b/nezha-fronted/src/components/page/config/operationlog.vue index cca57b65d..e21b4c10a 100644 --- a/nezha-fronted/src/components/page/config/operationlog.vue +++ b/nezha-fronted/src/components/page/config/operationlog.vue @@ -312,6 +312,7 @@ el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this)); el.removeEventListener("mouseenter", this.plmouseenter.bind('',el,this)); el.removeEventListener("mouseleave", this.plmouseleave.bind('',el,this)); + el._ps_.destroy(); } } } diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue index 9352710e0..278e76c19 100644 --- a/nezha-fronted/src/components/page/config/promServer.vue +++ b/nezha-fronted/src/components/page/config/promServer.vue @@ -457,6 +457,7 @@ el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this)); el.removeEventListener("mouseenter", this.plmouseenter.bind('',el,this)); el.removeEventListener("mouseleave", this.plmouseleave.bind('',el,this)); + el._ps_.destroy(); } } } diff --git a/nezha-fronted/src/components/page/config/terminallog.vue b/nezha-fronted/src/components/page/config/terminallog.vue index 52b9b3a76..5b52e2057 100644 --- a/nezha-fronted/src/components/page/config/terminallog.vue +++ b/nezha-fronted/src/components/page/config/terminallog.vue @@ -328,6 +328,7 @@ el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this)); el.removeEventListener("mouseenter", this.plmouseenter.bind('',el,this)); el.removeEventListener("mouseleave", this.plmouseleave.bind('',el,this)); + el._ps_.destroy(); } } } diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue index 4137fbdc8..55e99cc81 100644 --- a/nezha-fronted/src/components/page/project/project.vue +++ b/nezha-fronted/src/components/page/project/project.vue @@ -752,6 +752,7 @@ return ''; }, plpsscrolly(el,self){ + console.log(self.tools.showTopBtn && self.bottomBox.mainResizeShow) if (el._ps_.scrollbarYTop > 50) { self.tools.showTopBtn = true; } else { @@ -817,16 +818,26 @@ }, watch:{ pageType(n){ + console.log(n); if(n=='endpoint'){ - this.$nextTick(()=>{ + setTimeout(()=>{ //绑定滚动条事件,控制top按钮 let el=this.$refs.endpointTable.$el.querySelector(".el-table__body-wrapper"); + console.log(el._ps_); if(el._ps_){ el.addEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this)); el.addEventListener("mouseenter", this.plmouseenter.bind('',el,this)); el.addEventListener("mouseleave", this.plmouseleave.bind('',el,this)); } - }); + },100) + }else{ + let el = this.$refs.endpointTable.$el.querySelector(".el-table__body-wrapper"); + if (el._ps_) { + el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this)); + el.removeEventListener("mouseenter", this.plmouseenter.bind('',el,this)); + el.removeEventListener("mouseleave", this.plmouseleave.bind('',el,this)); + el._ps_.destroy(); + } } }, currentModule(n,o){ @@ -865,11 +876,14 @@ bus.$off('alert-message-change') }, beforeDestroy(){ - let el = this.$refs.endpointTable.$el.querySelector(".el-table__body-wrapper"); - if (el._ps_) { - el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this)); - el.removeEventListener("mouseenter", this.plmouseenter.bind('',el,this)); - el.removeEventListener("mouseleave", this.plmouseleave.bind('',el,this)); + if(this.$refs.endpointTable){ + let el = this.$refs.endpointTable.$el.querySelector(".el-table__body-wrapper"); + if (el._ps_) { + el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this)); + el.removeEventListener("mouseenter", this.plmouseenter.bind('',el,this)); + el.removeEventListener("mouseleave", this.plmouseleave.bind('',el,this)); + el._ps_.destroy(); + } } } }