From 78dc14e2a1564a04ee3ae47240d3dbe211145d08 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 25 Nov 2021 15:48:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E5=A4=9A=E9=80=89=E7=BB=84=E4=BB=B6=E8=BE=B9?=
 =?UTF-8?q?=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/dataease/DeOutWidget.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/dataease/DeOutWidget.vue b/frontend/src/components/dataease/DeOutWidget.vue
index b8e1a03681..b3057257d0 100644
--- a/frontend/src/components/dataease/DeOutWidget.vue
+++ b/frontend/src/components/dataease/DeOutWidget.vue
@@ -162,11 +162,11 @@ export default {
     height: 100%;
   }
   .first-element-contaner {
-      width: calc(100% - 10px);
+      width: 100%;
       background: initial;
       position:absolute;
-      bottom: 5px;
-      margin: 0 4px;
+      bottom: 0px;
+      margin: 0 0px;
       div {
           width: 100%;
       }
@@ -174,7 +174,7 @@ export default {
   .first-element-grid-contaner {
       background: #fff;
       border: 1px solid #d7dae2;
-      top: 5px;
+      top: 0px;
   }
   .condition-main-line {
       height: 40px !important;

From 5c8ae8289db52cb7a40d322bd7114b664d4a68a2 Mon Sep 17 00:00:00 2001
From: fit2cloudrd <reaperww@gmail.com>
Date: Thu, 25 Nov 2021 17:07:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E9=A1=B6?=
 =?UTF-8?q?=E9=83=A8=E8=8F=9C=E5=8D=95=E6=A0=8F=E9=9A=90=E8=97=8F=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: wangjiahao <1522128093@qq.com>
---
 frontend/src/layout/index.vue      | 10 +---------
 frontend/src/views/panel/index.vue |  3 ++-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/frontend/src/layout/index.vue b/frontend/src/layout/index.vue
index edb33d0bd9..554743b313 100644
--- a/frontend/src/layout/index.vue
+++ b/frontend/src/layout/index.vue
@@ -12,14 +12,6 @@
         <app-main />
       </de-main-container>
     </de-container>
-
-    <!-- <de-main-container>
-      <app-main />
-    </de-main-container> -->
-
-    <!-- <div :class="{sidebarHide: sidebar.hide}" class="main-container">
-      <app-main />
-    </div> -->
   </div>
 </template>
 
@@ -62,7 +54,7 @@ export default {
       return this.$store.state.settings.showSettings
     },
     fullHeightFlag() {
-      return this.componentName === 'PanelEdit' || this.componentName === 'ChartEdit'
+      return this.$route.path.indexOf('panel') > -1 && (this.componentName === 'PanelEdit' || this.componentName === 'ChartEdit')
     },
     mainStyle() {
       if (this.fullHeightFlag) {
diff --git a/frontend/src/views/panel/index.vue b/frontend/src/views/panel/index.vue
index 3ae88858ad..c3813c655b 100644
--- a/frontend/src/views/panel/index.vue
+++ b/frontend/src/views/panel/index.vue
@@ -28,7 +28,7 @@ export default {
   },
   computed: {
     fullHeightFlag() {
-      return this.componentName === 'PanelEdit' || this.componentName === 'ChartEdit'
+      return this.$route.path.indexOf('panel') > -1 && (this.componentName === 'PanelEdit' || this.componentName === 'ChartEdit')
     }
   },
   watch: {
@@ -49,6 +49,7 @@ export default {
     })
   },
   created() {
+    bus.$emit('PanelSwitchComponent', { name: 'PanelMain' })
     this.$store.dispatch('app/toggleSideBarHide', true)
     const routerParam = this.$router.currentRoute.params
     this.toMsgShare(routerParam)