diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss
index 13bae1cdd..cb63d49ad 100644
--- a/nezha-fronted/src/assets/stylus/main.scss
+++ b/nezha-fronted/src/assets/stylus/main.scss
@@ -156,7 +156,7 @@ li{
opacity: 0;
background-color: #aaa;
outline: none;
- z-index: 10;
+ z-index: 100;
color: white;
transition: opacity .2s linear, top .2s linear;
transform: translateY(-50%);
@@ -820,6 +820,12 @@ li{
border: none;
font-size: 12px;
}
+.nz-table + .to-top-is-hover{
+ z-index: 10;
+}
+.nz-table:hover + .to-top-is-hover{
+ z-index: 100;
+}
.nz-table .el-table {
border: none;
font-size: 12px;
diff --git a/nezha-fronted/src/components/common/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/alert/alertMessageTable.vue
index 7f97b2e34..a07d6e085 100644
--- a/nezha-fronted/src/components/common/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/alert/alertMessageTable.vue
@@ -160,11 +160,9 @@
-
-
-
+
@@ -856,16 +854,12 @@
plpsscrolly(el,self){
if (el._ps_.scrollbarYTop > 50) {
self.tools.showTopBtn = true;
+ self.tools.tableHover = true;
} else {
self.tools.showTopBtn = false;
+ self.tools.tableHover = false;
}
},
- plmouseenter(el,self){
- self.tools.tableHover = true;
- },
- plmouseleave(el,self){
- self.tools.tableHover = false;
- }
},
watch: {
/*tableData(){
@@ -901,8 +895,6 @@
let el = this.$refs.alertListTable.$el.querySelector(".el-table__body-wrapper");
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));
}
});
/*if(this.from=='alertMessage'){
@@ -927,8 +919,6 @@
let el = this.$refs.alertListTable.$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();
}
}
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
index 400fdc543..94c82cb2d 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
@@ -662,16 +662,12 @@
plpsscrolly(el,self){
if (el._ps_.scrollbarYTop > 50) {
self.showTopBtn = true;
+ self.tableHover = true;
} else {
self.showTopBtn = false;
+ self.tableHover = false;
}
},
- plmouseenter(el,self){
- self.tableHover = true;
- },
- plmouseleave(el,self){
- self.tableHover = false;
- }
},
mounted() {
this.getPanelData();
@@ -682,8 +678,6 @@
let el = this.$refs.endpointQueryTable.$el.querySelector(".el-table__body-wrapper");
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));
}
}, 300);
@@ -693,8 +687,6 @@
let el = this.$refs.endpointQueryTable.$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();
}
}
diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue
index 67700b2bd..72e2969e6 100644
--- a/nezha-fronted/src/components/page/alert/config.vue
+++ b/nezha-fronted/src/components/page/alert/config.vue
@@ -128,11 +128,9 @@
-
-
-
+
@@ -521,16 +519,12 @@
plpsscrolly(el,self){
if (el._ps_.scrollbarYTop > 50) {
self.tools.showTopBtn = true;
+ self.tools.tableHover = true;
} else {
self.tools.showTopBtn = false;
+ self.tools.tableHover = false;
}
},
- plmouseenter(el,self){
- self.tools.tableHover = true;
- },
- plmouseleave(el,self){
- self.tools.tableHover = false;
- }
},
watch: {
'bottomBox.showSubList': function(n) {
@@ -571,8 +565,6 @@
let el = this.$refs.alertRuleTable.$el.querySelector(".el-table__body-wrapper");
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));
}
});
},
@@ -580,8 +572,6 @@
let el = this.$refs.alertRuleTable.$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();
}
}
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 30155cefe..271d76bdc 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -48,6 +48,7 @@
@sort-change="tableDataSort"
@row-dblclick="detail"
@selection-change="(selection)=>{this.batchDeleteObjs=selection}"
+ @scroll="plpsscrolly"
>
{{account.protocol}}
-
@@ -172,11 +172,9 @@
-
-
-
+
@@ -756,16 +754,20 @@
plpsscrolly(el,self){
if (el._ps_.scrollbarYTop > 50) {
self.tools.showTopBtn = true;
+ self.tools.tableHover = true;
} else {
self.tools.showTopBtn = false;
+ self.tools.tableHover = false;
}
},
- plmouseenter(el,self){
- self.tools.tableHover = true;
- },
- plmouseleave(el,self){
- self.tools.tableHover = false;
- }
+ // plmouseenter(el,self){
+ // console.log(123123123123)
+ // self.tools.tableHover = true;
+ // },
+ // plmouseleave(el,self){
+ // console.log(123123123123)
+ // self.tools.tableHover = false;
+ // }
},
created(){
//是否存在分页缓存
@@ -825,8 +827,8 @@
let el = this.$refs.assetTable.$el.querySelector(".el-table__body-wrapper");
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));
+ // el.addEventListener("mouseenter", this.plmouseenter.bind('',el,this));
+ // el.addEventListener("mouseleave", this.plmouseleave.bind('',el,this));
}
//resize时刷新左侧列表滚动条
let vm = this;
@@ -840,8 +842,8 @@
let el = this.$refs.assetTable.$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.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/account.vue b/nezha-fronted/src/components/page/config/account.vue
index 75a873b18..3894c3596 100644
--- a/nezha-fronted/src/components/page/config/account.vue
+++ b/nezha-fronted/src/components/page/config/account.vue
@@ -97,11 +97,9 @@
-
-
-
+
@@ -345,16 +343,12 @@
plpsscrolly(el,self){
if (el._ps_.scrollbarYTop > 50) {
self.tools.showTopBtn = true;
+ self.tools.tableHover = true;
} else {
self.tools.showTopBtn = false;
+ self.tools.tableHover = false;
}
},
- plmouseenter(el,self){
- self.tools.tableHover = true;
- },
- plmouseleave(el,self){
- self.tools.tableHover = false;
- }
},
computed: {
isCurrentUser() {
@@ -395,8 +389,6 @@
let el = this.$refs.accountTable.$el.querySelector(".el-table__body-wrapper");
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));
}
});
},
@@ -404,8 +396,6 @@
let el = this.$refs.accountTable.$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();
}
}
diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue
index 25dab8d9f..f84112fdf 100644
--- a/nezha-fronted/src/components/page/config/dc.vue
+++ b/nezha-fronted/src/components/page/config/dc.vue
@@ -122,11 +122,9 @@
-
-
-
+
@@ -481,15 +479,11 @@
plpsscrolly(el,self){
if (el._ps_.scrollbarYTop > 100) {
self.tools.showTopBtn = true;
+ self.tools.tableHover = true;
} else {
self.tools.showTopBtn = false;
+ self.tools.tableHover = false;
}
- },
- plmouseenter(el,self){
- self.tools.tableHover = true;
- },
- plmouseleave(el,self){
- self.tools.tableHover = false;
}
},
watch: {
@@ -531,8 +525,6 @@
let el = this.$refs.dcTable.$el.querySelector(".el-table__body-wrapper");
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));
window.onresize = function() {
el._ps_.update();
};
@@ -543,8 +535,6 @@
let el = this.$refs.dcTable.$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();
}
}
diff --git a/nezha-fronted/src/components/page/config/mib.vue b/nezha-fronted/src/components/page/config/mib.vue
index eb5af3701..b40ffeadc 100644
--- a/nezha-fronted/src/components/page/config/mib.vue
+++ b/nezha-fronted/src/components/page/config/mib.vue
@@ -100,11 +100,9 @@
-
-
-
+
@@ -336,16 +334,12 @@
plpsscrolly(el,self){
if (el._ps_.scrollbarYTop > 50) {
self.tools.showTopBtn = true;
+ self.tools.tableHover = true;
} else {
self.tools.showTopBtn = false;
+ self.tools.tableHover = false;
}
},
- plmouseenter(el,self){
- self.tools.tableHover = true;
- },
- plmouseleave(el,self){
- self.tools.tableHover = false;
- }
},
created(){
//是否存在分页缓存
@@ -367,8 +361,6 @@
let el = this.$refs.mibTable.$el.querySelector(".el-table__body-wrapper");
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));
}
});
},
@@ -376,8 +368,6 @@
let el = this.$refs.mibTable.$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();
}
}
diff --git a/nezha-fronted/src/components/page/config/model.vue b/nezha-fronted/src/components/page/config/model.vue
index badebe451..c84f06a81 100644
--- a/nezha-fronted/src/components/page/config/model.vue
+++ b/nezha-fronted/src/components/page/config/model.vue
@@ -88,11 +88,9 @@
-
-
-
+
@@ -336,16 +334,12 @@
plpsscrolly(el,self){
if (el._ps_.scrollbarYTop > 50) {
self.tools.showTopBtn = true;
+ self.tools.tableHover = true;
} else {
self.tools.showTopBtn = false;
+ self.tools.tableHover = false;
}
},
- plmouseenter(el,self){
- self.tools.tableHover = true;
- },
- plmouseleave(el,self){
- self.tools.tableHover = false;
- }
},
created(){
//是否存在分页缓存
@@ -367,8 +361,6 @@
let el = this.$refs.modelTable.$el.querySelector(".el-table__body-wrapper");
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));
}
});
},
@@ -382,8 +374,6 @@
let el = this.$refs.modelTable.$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();
}
}
diff --git a/nezha-fronted/src/components/page/config/operationlog.vue b/nezha-fronted/src/components/page/config/operationlog.vue
index ef68e939e..27355dccc 100644
--- a/nezha-fronted/src/components/page/config/operationlog.vue
+++ b/nezha-fronted/src/components/page/config/operationlog.vue
@@ -59,11 +59,9 @@
-
-
-
+
@@ -261,16 +259,12 @@
plpsscrolly(el,self){
if (el._ps_.scrollbarYTop > 50) {
self.tools.showTopBtn = true;
+ self.tools.tableHover = true;
} else {
self.tools.showTopBtn = false;
+ self.tools.tableHover = false;
}
},
- plmouseenter(el,self){
- self.tools.tableHover = true;
- },
- plmouseleave(el,self){
- self.tools.tableHover = false;
- }
},
watch:{
tableData(){
@@ -304,19 +298,7 @@
//绑定滚动条事件,控制top按钮
let el = this.$refs.operationLogTable.$el.querySelector(".el-table__body-wrapper");
if (el._ps_) {
- el.addEventListener("ps-scroll-y", () => {
- if (el._ps_.scrollbarYTop > 50) {
- this.tools.showTopBtn = true;
- } else {
- this.tools.showTopBtn = false;
- }
- });
- el.addEventListener("mouseenter", () => {
- this.tools.tableHover = true;
- });
- el.addEventListener("mouseleave", () => {
- this.tools.tableHover = false;
- });
+ el.addEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this));
}
});
},
@@ -324,8 +306,6 @@
let el = this.$refs.operationLogTable.$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();
}
}
diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue
index 0f1460f72..43e57f518 100644
--- a/nezha-fronted/src/components/page/config/promServer.vue
+++ b/nezha-fronted/src/components/page/config/promServer.vue
@@ -81,11 +81,9 @@