diff --git a/nezha-fronted/src/assets/css/components/common/elementSet.scss b/nezha-fronted/src/assets/css/components/common/elementSet.scss index a3b6d1ab2..7f73938b1 100644 --- a/nezha-fronted/src/assets/css/components/common/elementSet.scss +++ b/nezha-fronted/src/assets/css/components/common/elementSet.scss @@ -37,7 +37,7 @@ border: 1px solid $--button-light-border-color !important; line-height: 1.5; } -.custom-labels i { +.custom-labels i.nz-icon-check{ color: #04b330; font-size: 14px; position: absolute; @@ -63,10 +63,25 @@ background-color: $--background-color-empty; } .custom-label { - padding: 2px 0 2px 25px; + padding: 2px 25px; position: relative; cursor: default; font-size: 14px; + span{ + width: 100%; + display: inline-block; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + } + .nz-icon-sort{ + font-size: 14px; + position: absolute; + right: 5px; + top: 2px; + margin: 0 !important; + cursor: grab; + } } .custom-title { padding: 2px 0 2px 2px; diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss index 134c4171c..f53c15fbd 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss @@ -371,7 +371,7 @@ opacity: 1 !important; cursor: grab !important; background-color: $--background-color-empty; - .drag-sort .nz-icon-sort{ - color: #FF8C0E; + .nz-icon-sort{ + color: #FF8C0E !important; } } \ No newline at end of file diff --git a/nezha-fronted/src/assets/css/index.scss b/nezha-fronted/src/assets/css/index.scss index 66364822c..9f4ceabc4 100644 --- a/nezha-fronted/src/assets/css/index.scss +++ b/nezha-fronted/src/assets/css/index.scss @@ -23,6 +23,11 @@ html { overflow: hidden; } +.isDrag *{ + cursor: grab !important; +} + + /* 默认主题和暗色主题 */ .theme-light { $--theme: light; diff --git a/nezha-fronted/src/components/chart/chart/chartTable.vue b/nezha-fronted/src/components/chart/chart/chartTable.vue index 01f2d9ebc..408215c42 100644 --- a/nezha-fronted/src/components/chart/chart/chartTable.vue +++ b/nezha-fronted/src/components/chart/chart/chartTable.vue @@ -12,7 +12,7 @@
-
- - - {{item.label}} -
- + +
+ + + {{item.label}} + +
+
+ + +
+ + + {{item.label}} + +
+
@@ -39,6 +93,7 @@