From 5f1867894b13b00d5f8f50df80a95ad5438acecc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8A=B2=E6=9D=BE?= <chenjinsong@zdjizhi.com>
Date: Wed, 13 Jan 2021 15:27:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9Echar?=
 =?UTF-8?q?t=E9=80=89=E6=8B=A9=E9=9D=9E1=E7=BA=A7panel=E5=90=8E=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/popBox/selectPanel.vue  | 11 ++++++++-
 .../src/components/page/dashboard/panel.vue   | 24 +++++++++++++++----
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/common/popBox/selectPanel.vue b/nezha-fronted/src/components/common/popBox/selectPanel.vue
index b4973ef00..19afd10bd 100644
--- a/nezha-fronted/src/components/common/popBox/selectPanel.vue
+++ b/nezha-fronted/src/components/common/popBox/selectPanel.vue
@@ -45,7 +45,7 @@
         placement: {type: String},
         isEdit: {type: Boolean, default: true},
         panelData: {type: Array},
-        showPanel: {type: Number},
+        showPanel: {type: Object},
         panelLock: {type: Boolean, default: true},
         filterPanel: {type: String},
       },
@@ -58,6 +58,14 @@
           handler(n) {
             this.$refs.panelTree && this.$refs.panelTree.filter(n);
           }
+        },
+        showPanel: {
+          immediate: true,
+          handler(n) {
+            if (n && n.id) {
+              this.$refs.panelTree.setCurrentKey(this.showPanel);
+            }
+          }
         }
       },
       data(){
@@ -120,6 +128,7 @@
         selectPanel(data, checked, child) {
           this.panel = data;
           this.$emit('selectPanel', this.panel);
+          this.$refs.panelTree.setCurrentKey(this.panel);
           this.esc();
         },
         //tree设为单选
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 12f6a461c..17e319f37 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -6,8 +6,8 @@
       </div>
       <template v-else>
         <div class="top-tool-main-left">
-          <select-panel :current-panel="showPanel" :filter-panel="filterPanel" :panel-lock="panelLock" :panelData="panelData" :placement="'bottom-start'" @deletePanel="del" @editPanel="edit"
-                        @selectPanel="panelChange" ref="selectPanel" style="width: 300px;">
+          <select-panel :current-panel="showPanel" :filter-panel="filterPanel" :panel-data="panelData" :panel-lock="panelLock" :placement="'bottom-start'" :show-panel="showPanel"
+                        @deletePanel="del" @editPanel="edit" @selectPanel="panelChange" ref="selectPanel" style="width: 300px;">
             <template v-slot:header>
               <div class="panel-select-header">
                 <el-input :placeholder="$t('overall.search')" clearable size="mini" style="width: 340px; margin-right: 5px;" v-model="filterPanel"></el-input>
@@ -452,12 +452,13 @@
           }
         });
       },
+
       getTableData(clearShowPanel) {
         this.$get('panel?type=dashboard').then(response => {
           if (response.code === 200) {
             this.panelData = response.data.list;
             this.showPanelList = this.panelData;
-            this.dataTotalListBak=[...response.data.list]
+            this.dataTotalListBak = [...response.data.list];
             let isInitData = false;
             if (response.data.list.length > 0) {
               if (this.$store.state.showPanel.id > 0 && this.$store.state.showPanel.name) {
@@ -472,7 +473,7 @@
                 this.getData(this.filter);
                 isInitData = true;
               }else{
-                this.showPanel=response.data.list.find(item=>{return item.id == this.showPanel.id})
+                handler(response.data.list);
               }
               this.filter.panelId = this.showPanel.id;
             } else {
@@ -498,9 +499,24 @@
         }).catch((error) => {
           //console.log('error................'+JSON.stringify(error));
           if (error) {
+            console.error(error);
             this.$message.error(error.toString());
           }
         });
+
+        let vm = this;
+
+        function handler(panelData) {
+          panelData.forEach(panel => {
+            if (panel.id == vm.showPanel.id) {
+              vm.showPanel = panel;
+            } else {
+              if (panel.children && panel.children.length > 0) {
+                handler(panel.children)
+              }
+            }
+          });
+        }
       },
       //定期刷新
       selectInterval(val) {