From 69f5a09cdcdd64a9a0fd0726a1ee32a7eeda56d8 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 22 Apr 2021 13:46:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A7=A3=E5=86=B3=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E4=BD=86=E6=98=AF=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=85=B3=E9=97=AD=E5=B7=A6=E4=BE=A7=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/components/Toolbar.vue |  5 ++++-
 frontend/src/views/panel/edit/index.vue               | 10 +++++++---
 frontend/src/views/panel/index.vue                    |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue
index 9342e441e7..6c297b9475 100644
--- a/frontend/src/components/canvas/components/Toolbar.vue
+++ b/frontend/src/components/canvas/components/Toolbar.vue
@@ -87,7 +87,10 @@ export default {
   },
   methods: {
     closePanelEdit() {
-      bus.$emit('PanelSwitchComponent', { name: 'PanelMain' })
+      this.$emit('close-left-panel')
+      this.$nextTick(() => {
+        bus.$emit('PanelSwitchComponent', { name: 'PanelMain' })
+      })
     },
     goFile() {
       this.$refs.files.click()
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 037ff93909..512eb4968f 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -6,7 +6,7 @@
           名称：{{ panelInfo.name || '测试仪表板' }}
         </span>
         <!--横向工具栏-->
-        <Toolbar />
+        <Toolbar @close-left-panel="closeLeftPanel" />
       </el-row>
     </el-header>
     <de-container>
@@ -44,10 +44,10 @@
         </div>
         <div ref="leftPanel" :class="{show:show}" class="leftPanel-container">
           <div />
-          <div v-show="show" class="leftPanel">
+          <div v-if="show" class="leftPanel">
 
             <div class="leftPanel-items">
-              <view-select v-show=" showIndex===0" />
+              <view-select v-show="show && showIndex===0" />
               <filter-group v-show="show && showIndex===1" />
             </div>
           </div>
@@ -349,6 +349,10 @@ export default {
       this.currentWidget = ApplicationContext.getService(serviceName)
       this.currentFilterCom = this.curComponent
       this.openFilterDiolog()
+    },
+    closeLeftPanel() {
+      this.show = false
+      this.beforeDestroy()
     }
   }
 }
diff --git a/frontend/src/views/panel/index.vue b/frontend/src/views/panel/index.vue
index 32ca274ad3..cc2d25bc39 100644
--- a/frontend/src/views/panel/index.vue
+++ b/frontend/src/views/panel/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]" style="background-color: #f7f8fa">
+  <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
     <de-main-container>
       <component :is="component" :param="param" />
     </de-main-container>