From c4bbf8698acb5a4f760836f3e73d8d590050a3f2 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Wed, 25 Aug 2021 10:38:46 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-928=20fix:=20panel=20=E9=A1=B5=E9=9D=A2=20?=
 =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E9=80=89=E6=8B=A9=E5=99=A8=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/stylus/main.scss     |  3 ++
 .../src/components/common/language/cn.js      |  4 +--
 .../src/components/common/language/en.js      |  4 +--
 .../components/common/popBox/selectPanel.vue  | 31 ++++++++++++++++---
 .../src/components/page/dashboard/panel.vue   | 19 ++++++++++--
 5 files changed, 51 insertions(+), 10 deletions(-)

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">
             <div class="tree--node" slot-scope="{ node, data }">
               <span>{{ node.label }}</span>
-              <span class="tree--operation" v-if="!panelLock">
-                <span @click.stop="deletePanel(data)" class="panel-dropdown-btn panel-dropdown-btn-delete" v-has="'panel_delete'"><i class="nz-icon nz-icon-delete"></i></span>
-                <span class="panel-dropdown-btn" @click.stop="editPanel(data)"><i v-has="'panel_edit'" class="nz-icon nz-icon-edit"></i></span>
-              </span>
+<!--              <span class="tree&#45;&#45;operation" v-if="!panelLock">-->
+<!--                <span @click.stop="deletePanel(data)" class="panel-dropdown-btn panel-dropdown-btn-delete" v-has="'panel_delete'"><i class="nz-icon nz-icon-delete"></i></span>-->
+<!--                <span class="panel-dropdown-btn" @click.stop="editPanel(data)"><i v-has="'panel_edit'" class="nz-icon nz-icon-edit"></i></span>-->
+<!--              </span>-->
+              <el-row class="block-col-2" style="width: 35px;">
+                <el-col>
+                  <el-dropdown trigger="click" popper-class="testt">
+                    <span class="el-dropdown-link tree--operation" @click.stop><i class="nz-icon nz-icon-more1"></i></span>
+                    <el-dropdown-menu slot="dropdown" v-has="['panel_edit', 'panel_delete']">
+                      <el-dropdown-item>
+                        <span @click.stop="editPanel(data)"><i v-has="'panel_edit'" class="nz-icon nz-icon-edit"></i>Edit</span>
+                      </el-dropdown-item>
+                      <el-dropdown-item>
+                        <span @click.stop="deletePanel(data)" v-has="'panel_delete'"><i class="nz-icon nz-icon-delete"></i>Delete</span>
+                      </el-dropdown-item>
+                    </el-dropdown-menu>
+                  </el-dropdown>
+                </el-col>
+              </el-row>
             </div>
           </el-tree>
         </div>
@@ -34,6 +49,9 @@
     <div slot="reference">
       <slot name="trigger"></slot>
     </div>
+    <div slot="default">
+      <slot name="tail"></slot>
+    </div>
   </el-popover>
 </template>
 
@@ -212,3 +230,8 @@ export default {
   color: #D96D7A;
 }
 </style>
+<style scoped lang="scss">
+.nz-pop-select-panel {
+  z-index: 1999 !important;
+}
+</style>
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 @@
                 <template v-slot:header>
                   <div class="panel-select-header">
                     <el-input id="panel-list-search" v-model="filterPanel" :placeholder="$t('overall.search')" clearable size="mini" style="width: 340px;"></el-input>
-                    <span id="panel-list-toadd" v-has="'panel_add'" :title='$t("dashboard.panel.createPanelTitleSec")' class="panel-select-add" @click="toAdd"><i class="nz-icon nz-icon-plus"></i></span>
+<!--                    <span id="panel-list-toadd" v-has="'panel_add'" :title='$t("dashboard.panel.createPanelTitleSec")' class="panel-select-add" @click="toAdd"><i class="nz-icon nz-icon-plus"></i></span>-->
                   </div>
                 </template>
                 <template v-slot:trigger>
@@ -21,6 +21,11 @@
                     <i slot="prefix" class="el-icon-menu"></i>
                   </el-input>
                 </template>
+                <template v-slot:tail>
+                  <div class="panel-select-tail">
+                    <span id="panel-list-toadd" v-has="'panel_add'" :title='$t("dashboard.panel.createPanelTitleSec")' class="panel-select-add" @click="toAdd"><i class="nz-icon nz-icon-create-square"></i>&nbsp;&nbsp;Add</span>
+                  </div>
+                </template>
               </select-panel>
             </div>
             <div class="top-tool-right">
@@ -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*/