diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 16b8e4982..f4685088c 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -1047,6 +1047,9 @@ li{ padding: 0 20px 20px 20px; border-radius: 10px; } +.nz-pop-select-panel { + z-index: 1999 !important; +} .nz-pop-select-area, .nz-pop-select-panel { padding: 0 !important; box-shadow: 0 2px 12px 0 rgba(0,0,0,.1) !important; diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 18bf86b24..5943aff7d 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -1757,13 +1757,13 @@ const cn = { }, profile: { profile: '个人中心', - close: '关闭', + close: '禁用', clear: '清空', enable: '启用', update: '更新', operationRecord: '操作记录', changePassword: '修改密码', - oldPassword: '旧密码', + oldPassword: '当前密码', newPassword: '新密码', confirmPassword: '确认密码', lastLoginIp: '最后登录IP', diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 4dd84d0c1..ddb61ebaa 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -1639,13 +1639,13 @@ const en = { }, profile: { profile: 'Profile', - close: 'Close', + close: 'disable', clear: 'Clear', enable: 'Enable', update: 'Update', operationRecord: 'Operation log', changePassword: 'Change password', - oldPassword: 'Old password', + oldPassword: 'Current password', newPassword: 'New password', confirmPassword: 'Confirm password', lastLoginIp: 'Last login IP', diff --git a/nezha-fronted/src/components/common/popBox/selectPanel.vue b/nezha-fronted/src/components/common/popBox/selectPanel.vue index d449a7cd1..8b9729cc9 100644 --- a/nezha-fronted/src/components/common/popBox/selectPanel.vue +++ b/nezha-fronted/src/components/common/popBox/selectPanel.vue @@ -22,10 +22,25 @@ ref="panelTree">
{{ node.label }} - - - - + + + + + + + + + + + Edit + + + Delete + + + + +
@@ -34,6 +49,9 @@
+
+ +
@@ -212,3 +230,8 @@ export default { color: #D96D7A; } + diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue index dc88cfa77..62f32c0ca 100644 --- a/nezha-fronted/src/components/page/dashboard/panel.vue +++ b/nezha-fronted/src/components/page/dashboard/panel.vue @@ -13,7 +13,7 @@ +
@@ -904,9 +909,19 @@ export default { display: flex; justify-content: space-evenly; margin-bottom: 15px; + } + .panel-select-tail { .panel-select-add { - line-height: 26px; + line-height: 32px; + height: 32px; + display: inline-block; cursor: pointer; + i { + color: #FA901C; + font-size: 12px; + font-weight: bold; + padding-left: 20px; + } } } /* end-chart list*/