From 530276e1b283d70e835384e3c1613e51e64c8dea Mon Sep 17 00:00:00 2001 From: zyh Date: Tue, 6 Jun 2023 17:46:16 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-2857=20fix=EF=BC=9A=E9=BC=A0=E6=A0=87?= =?UTF-8?q?=E5=85=89=E6=A0=87cursor=E6=A0=B7=E5=BC=8F=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/assets/css/common.scss | 18 ++++ .../common/alert/alertDaysInfo.scss | 1 - .../common/project/L5/CanvasProps.scss | 1 + .../rightBox/chartRightBox/chartRightBox.scss | 1 + .../common/rightBox/editEndpointBoxNew.scss | 1 + .../components/common/rightBox/moduleBox.scss | 1 + .../common/table/settings/endpointTable.scss | 3 - .../common/table/settings/projectTable.scss | 22 ----- .../common/table/settings/userTable.scss | 3 - .../css/components/common/timePicker.scss | 2 +- .../components/common/alert/alertLabel.vue | 18 ++-- .../common/globalSearch/searchItemInfo.vue | 2 +- .../common/table/alert/alertRuleTable.vue | 2 +- .../common/table/alert/alertSilenceTable.vue | 2 +- .../common/table/asset/assetTable.vue | 34 ++++---- .../common/table/settings/dcTable.vue | 10 +-- .../common/table/settings/endpointTable.vue | 86 ++++++++++--------- .../common/table/settings/modelTable.vue | 2 +- .../common/table/settings/moduleTable.vue | 8 +- .../common/table/settings/projectTable.vue | 10 +-- .../src/components/common/timePicker.vue | 15 ++-- .../src/components/page/alert/nzAlertTag.vue | 2 +- 22 files changed, 116 insertions(+), 128 deletions(-) delete mode 100644 nezha-fronted/src/assets/css/components/common/table/settings/projectTable.scss diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index 79a91fda2..dfbdfdd2d 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -521,6 +521,11 @@ textarea { align-items: center; transform: scale(0.95); } + +i.nz-icon-override{ + cursor: pointer; +} + .is-disabled{ color: $--color-text-disabled !important; } @@ -706,3 +711,16 @@ textarea { .message-zindex{ z-index: 5000 !important; } + +.el-table{ + .num-cursor{ + cursor: pointer; + } +} +.bottom-data-list{ + .el-table{ + .num-cursor{ + cursor: default; + } + } +} \ No newline at end of file diff --git a/nezha-fronted/src/assets/css/components/common/alert/alertDaysInfo.scss b/nezha-fronted/src/assets/css/components/common/alert/alertDaysInfo.scss index 2ff87302e..e747d7a06 100644 --- a/nezha-fronted/src/assets/css/components/common/alert/alertDaysInfo.scss +++ b/nezha-fronted/src/assets/css/components/common/alert/alertDaysInfo.scss @@ -9,7 +9,6 @@ margin-right: 3px; border-radius: 2px; background-color:$--color-success; - cursor: pointer; position: relative; } } diff --git a/nezha-fronted/src/assets/css/components/common/project/L5/CanvasProps.scss b/nezha-fronted/src/assets/css/components/common/project/L5/CanvasProps.scss index 8eb0ce442..01b1bd5f8 100644 --- a/nezha-fronted/src/assets/css/components/common/project/L5/CanvasProps.scss +++ b/nezha-fronted/src/assets/css/components/common/project/L5/CanvasProps.scss @@ -365,6 +365,7 @@ line-height: 24px; color: $--color-primary; box-sizing: border-box; + cursor: pointer; } .mb10 { 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..c327af5a7 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 @@ -191,6 +191,7 @@ text-align: center; margin-bottom: 10px; padding: 3px 10px; + cursor: pointer; } .prev-mapping-icon{ font-size: 16px; diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/editEndpointBoxNew.scss b/nezha-fronted/src/assets/css/components/common/rightBox/editEndpointBoxNew.scss index 73091db3c..ebdafcc65 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/editEndpointBoxNew.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/editEndpointBoxNew.scss @@ -183,6 +183,7 @@ background: $--background-color-copy; border: 1px solid $--span-nz-icon-border-color; color: $--nz-icon-color; + cursor: pointer; } #module-box-relabel .vue-tags-input{ max-width: unset; diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss index 98d7e2a52..7f697bf6d 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss @@ -195,6 +195,7 @@ background: $--background-color-copy; border: 1px solid $--span-nz-icon-border-color; color: $--nz-icon-color; + cursor: pointer; } #module-box-relabel .vue-tags-input{ max-width: unset; diff --git a/nezha-fronted/src/assets/css/components/common/table/settings/endpointTable.scss b/nezha-fronted/src/assets/css/components/common/table/settings/endpointTable.scss index 32dfe238f..aeb2d9c6b 100644 --- a/nezha-fronted/src/assets/css/components/common/table/settings/endpointTable.scss +++ b/nezha-fronted/src/assets/css/components/common/table/settings/endpointTable.scss @@ -30,9 +30,6 @@ .inline-block { display: inline-block; } - .pointer { - cursor: pointer; - } .endpoint-cell-left { margin-right: 5px; } diff --git a/nezha-fronted/src/assets/css/components/common/table/settings/projectTable.scss b/nezha-fronted/src/assets/css/components/common/table/settings/projectTable.scss deleted file mode 100644 index ec28d08aa..000000000 --- a/nezha-fronted/src/assets/css/components/common/table/settings/projectTable.scss +++ /dev/null @@ -1,22 +0,0 @@ -.project-table { - .module-num{ - font-size: 14px; - font-weight: 400; - cursor: pointer; - padding: 0 3px; - .nz-icon-overview-module{ - color: rgb(122, 208, 188) - } - } - .alert-num{ - padding: 0 3px; - cursor: pointer; - border-radius: 2px; - } - .colorEF7458{ - color: #EF7458; - } - .color23BF9A{ - color: #23BF9A; - } -} diff --git a/nezha-fronted/src/assets/css/components/common/table/settings/userTable.scss b/nezha-fronted/src/assets/css/components/common/table/settings/userTable.scss index ea5550fc2..87b8b580a 100644 --- a/nezha-fronted/src/assets/css/components/common/table/settings/userTable.scss +++ b/nezha-fronted/src/assets/css/components/common/table/settings/userTable.scss @@ -40,7 +40,4 @@ color: #38cc20; } } - .endpoint-num, .alert-num{ - cursor: pointer; - } } diff --git a/nezha-fronted/src/assets/css/components/common/timePicker.scss b/nezha-fronted/src/assets/css/components/common/timePicker.scss index 44e1c949c..6d6f82300 100644 --- a/nezha-fronted/src/assets/css/components/common/timePicker.scss +++ b/nezha-fronted/src/assets/css/components/common/timePicker.scss @@ -130,7 +130,7 @@ border-radius: 2px; line-height: 30px; transition: width .3s; - + cursor: pointer; .cn-icon { font-size: 14px; } diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue index 086cdb773..5265d894e 100644 --- a/nezha-fronted/src/components/common/alert/alertLabel.vue +++ b/nezha-fronted/src/components/common/alert/alertLabel.vue @@ -321,7 +321,6 @@
{{ $t("overall.module") }}
  {{ @@ -431,7 +430,6 @@
{{ $t("overall.module") }}
  {{ @@ -494,18 +492,16 @@ {{ $t("overall.metric") }} - + @@ -515,18 +511,16 @@ {{ $t("overall.logs") }} - + diff --git a/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue b/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue index 235fe38cb..b01facc77 100644 --- a/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue +++ b/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue @@ -77,7 +77,7 @@ -
+
{{$t('project.topology.alert')}}({{$t('overall.active')}})
diff --git a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue index 6aa594227..7583f021b 100644 --- a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue @@ -43,7 +43,7 @@ {{scope.row[item.prop].name}}