diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index d55d0c25b..b939763bc 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -507,6 +507,7 @@ li{ } .nz-table .el-table__body-wrapper { background-color: $content-right-background-color; + overflow: hidden; } .chart-table .nz-table.el-table th:last-of-type { background-color: white; @@ -628,7 +629,7 @@ li{ width: 520px; } .right-box-add-asset, .right-box-add-chart { - width: 550px; + width: 520px; } .right-box-chart .el-input__inner, .right-box-chart input { background-color: white; diff --git a/nezha-fronted/src/components/charts/chart-table.vue b/nezha-fronted/src/components/charts/chart-table.vue index 314a7d098..1047a4684 100644 --- a/nezha-fronted/src/components/charts/chart-table.vue +++ b/nezha-fronted/src/components/charts/chart-table.vue @@ -25,7 +25,7 @@
- + @@ -42,7 +42,7 @@
- + diff --git a/nezha-fronted/src/components/common/rightBox/assetBox.vue b/nezha-fronted/src/components/common/rightBox/assetBox.vue index e3b0d8204..e39a8e391 100644 --- a/nezha-fronted/src/components/common/rightBox/assetBox.vue +++ b/nezha-fronted/src/components/common/rightBox/assetBox.vue @@ -90,7 +90,7 @@ -
+
-
+
--> - + @@ -368,7 +368,7 @@ - + diff --git a/nezha-fronted/src/main.js b/nezha-fronted/src/main.js index aecd213db..e6df1c1ed 100644 --- a/nezha-fronted/src/main.js +++ b/nezha-fronted/src/main.js @@ -75,12 +75,11 @@ const el_scrollBar = el => { el._ps_.update(); } else { //el上挂一份属性 - el._ps_ = new PerfectScrollbar(el, {}); + el._ps_ = new PerfectScrollbar(el, {minScrollbarLength: 20}); } }; Vue.directive("scrollBar", { inserted(el, binding, vnode) { - console.info(1) const { arg } = binding; if (arg === "el-table") { el = el.querySelector(".el-table__body-wrapper"); @@ -109,7 +108,6 @@ Vue.directive("scrollBar", { el_scrollBar(el); }, componentUpdated(el, binding, vnode, oldVnode) { - console.info(2) const { arg } = binding; if (arg === "el-table") { el = el.querySelector(".el-table__body-wrapper"); @@ -127,7 +125,7 @@ Vue.directive("scrollBar", { }, }); -const exceptClassName = ["config-dropdown", "nz-pop", "el-picker", "chart-box-dropdown", 'metric-dropdown']; //clickoutside排除的class(白名单) +const exceptClassName = ["config-dropdown", "nz-pop", "el-picker", "chart-box-dropdown", 'metric-dropdown', 'el-cascader__dropdown']; //clickoutside排除的class(白名单) const clickoutside = { // 初始化指令 bind(el, binding, vnode) {