Merge branch 'v1.5' of github.com:dataease/dataease into v1.5

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;
+      bottom: 0px;
-      margin: 0 4px;
+      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;

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) {

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)