From 656ed5e2d372cc82e42c25a3f94a75a08e919bd2 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Tue, 18 May 2021 14:01:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dpanel=E9=A1=B5?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=BC=96=E8=BE=91panel=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/language/en.js      |  2 +-
 .../components/common/popBox/selectPanel.vue  |  2 +-
 .../components/common/rightBox/panelBox.vue   |  2 +-
 .../src/components/page/config/setup.vue      | 28 +++++++++----------
 .../src/components/page/dashboard/panel.vue   |  5 ++--
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 5dc8cd6ed..89f559e6a 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -229,7 +229,7 @@ const en = {
       createPanelTitle: 'New panel', // "新增面板"
       selectPanelTitle: 'Select', // "选择面板"
       createPanelTitleSec: 'New panel', // "新增面板"
-      editPanelTitle: 'Panel', // "面板"
+      editPanelTitle: 'Edit panel', // "面板"
       singleStatErrorTip: 'Only queries that return single series/table is supported',
       panelForm: {
         panelName: 'Panel name', // "面板名称"
diff --git a/nezha-fronted/src/components/common/popBox/selectPanel.vue b/nezha-fronted/src/components/common/popBox/selectPanel.vue
index 8c362dcf4..71f7fdc19 100644
--- a/nezha-fronted/src/components/common/popBox/selectPanel.vue
+++ b/nezha-fronted/src/components/common/popBox/selectPanel.vue
@@ -24,7 +24,7 @@
               <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 @click.stop="editPanel(data)" class="panel-dropdown-btn"><i class="nz-icon nz-icon-edit" v-has="'panel_toEdit'"></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>
             </div>
           </el-tree>
diff --git a/nezha-fronted/src/components/common/rightBox/panelBox.vue b/nezha-fronted/src/components/common/rightBox/panelBox.vue
index e67a77517..f68e39ad1 100644
--- a/nezha-fronted/src/components/common/rightBox/panelBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/panelBox.vue
@@ -2,7 +2,7 @@
   <div v-clickoutside="{obj:editPanel,func:clickOutside}" class="right-box right-box-panel">
     <!-- begin--标题-->
     <div class="right-box__header">
-      <div class="header__title">{{editPanel.id ? ($t("config.dc.editPanel")) : $t("config.dc.createPanel")}}</div>
+      <div class="header__title">{{editPanel.id ? ($t("dashboard.panel.editPanelTitle")) : $t("dashboard.panel.createPanelTitle")}}</div>
       <div class="header__operation">
         <span v-cancel="{obj: editPanel, func: esc}"><i class="nz-icon nz-icon-close"></i></span>
       </div>
diff --git a/nezha-fronted/src/components/page/config/setup.vue b/nezha-fronted/src/components/page/config/setup.vue
index 93738754f..75d4857c8 100644
--- a/nezha-fronted/src/components/page/config/setup.vue
+++ b/nezha-fronted/src/components/page/config/setup.vue
@@ -208,20 +208,20 @@ export default {
       step: 0,
       activeStep: 0,
       database: {
-        host: "",
+        host: '',
         port: 3306,
-        name: "nz",
-        username: "",
-        pin: "",
+        name: 'nz',
+        username: '',
+        pin: ''
       },
       dbRules: {
         host: [
           {
             required: true,
-            message: this.$t("validate.required"),
-            trigger: "blur",
+            message: this.$t('validate.required'),
+            trigger: 'blur'
           },
-          { validator: host, trigger: "blur" },
+          { validator: host, trigger: 'blur' }
         ],
         port: [{ validator: port, trigger: 'blur' }],
         name: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
@@ -229,18 +229,18 @@ export default {
         pin: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }]
       },
       redis: {
-        host: "",
+        host: '',
         port: 6379,
-        pin: "",
+        pin: ''
       },
       redisRules: {
         host: [
           {
             required: true,
-            message: this.$t("validate.required"),
-            trigger: "blur",
+            message: this.$t('validate.required'),
+            trigger: 'blur'
           },
-          { validator: host, trigger: "blur" },
+          { validator: host, trigger: 'blur' }
         ],
         port: [{ validator: port, trigger: 'blur' }]
       },
@@ -251,13 +251,13 @@ export default {
         alertPrefix: '',
         haMode: 1,
         haVip: '',
-        prometheusFederationEnabled:1,
+        federationEnabled: 1
       },
       sysRules: {
         username: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
         pin: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
         alertPath: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
-        haVip: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+        haVip: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }]
       },
       reloadTime: 5000,
       reloadTimeout: null,
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index b95ee5b49..5c1ca8b36 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -83,7 +83,7 @@
       <chart-temp-box :obj="chart" :from="$CONSTANTS.fromRoute.panel" :panel-data="panelData" :show-panel="showPanel" @close="closeChartTempBox" @on-create-success="createSuccess" v-if="rightBox.chartTemp.show"></chart-temp-box>
     </transition>
     <transition name="right-box">
-      <panel-box v-if="rightBox.panel.show" ref="panelBox" :panel="panel" @reload="panelReload" @reloadForDel="panelReloadForDel" @close="closePanelBox" ></panel-box>
+      <panel-box v-if="rightBox.panel.show" ref="panelBox" :obj="panel" @close="closePanelBox" @reload="panelReload" @reloadForDel="panelReloadForDel" ></panel-box>
     </transition>
   </div>
 </template>
@@ -256,8 +256,7 @@ export default {
     },
     edit (u) {
       this.panel = Object.assign({}, u)
-      this.$refs.panelBox.setTitle(this.$t('dashboard.panel.editPanelTitle'))
-      this.$refs.panelBox.show(true)
+      this.rightBox.panel.show = true
     },
     toAdd () {
       if (!this.hasButton('panel_view')) {