Merge pull request #1996 from dataease/pr@dev@fix_panel-style

fix: 过滤组件编辑弹框不正确

frontend/src/components/canvas/components/Editor/ComponentWrapper.vue

@@ -5,7 +5,7 @@
     @click="handleClick"
     @mousedown="elementMouseDown"
   >
-    <div :style="commonStyle">
+    <div :style="commonStyle" class="main_view">
       <edit-bar v-if="componentActiveFlag" :element="config" @showViewDetails="showViewDetails" />
       <close-bar v-if="previewVisible" @closePreview="closePreview" />
       <de-out-widget
@@ -107,7 +107,6 @@ export default {
             style['background-color'] = hexColorToRGBA(this.config.commonBackground.color, this.config.commonBackground.alpha)
           }
         }
-        style['background-size'] = `100% 100%`
         style['overflow'] = 'hidden'
       }
       return style
@@ -228,4 +227,7 @@ export default {
     width: 100% !important;
     height: 100%;
   }
+  .main_view{
+    background-size: 100% 100%!important;
+  }
 </style>

frontend/src/components/canvas/components/Editor/SettingMenu.vue

@@ -46,24 +46,11 @@ export default {
   ]),
   methods: {
     edit() {
-      bus.$emit('change_panel_right_draw', true)
+      if (this.curComponent.type === 'custom') {
-      // // 编辑时临时保存 当前修改的画布
+        bus.$emit('component-dialog-edit')
-      // this.$store.dispatch('panel/setComponentDataTemp', JSON.stringify(this.componentData))
+      } else if (this.curComponent.type === 'v-text' || this.curComponent.type === 'rect-shape') {
-      // this.$store.dispatch('panel/setCanvasStyleDataTemp', JSON.stringify(this.canvasStyleData))
+        bus.$emit('component-dialog-style')
-      // if (this.curComponent.type === 'view') {
+      } else { bus.$emit('change_panel_right_draw', true) }
-      //   this.$store.dispatch('chart/setViewId', null)
-      //   this.$store.dispatch('chart/setViewId', this.curComponent.propValue.viewId)
-      //   bus.$emit('PanelSwitchComponent', { name: 'ChartEdit', param: { 'id': this.curComponent.propValue.viewId, 'optType': 'edit' }})
-      // }
-      // if (this.curComponent.type === 'custom') {
-      //   bus.$emit('component-dialog-edit')
-      // }
-      //
-      // // 编辑样式组件
-      //
-      // if (this.curComponent.type === 'v-text' || this.curComponent.type === 'rect-shape') {
-      //   bus.$emit('component-dialog-style')
-      // }
     },
     lock() {
       this.$store.commit('lock')

frontend/src/store/modules/chart.js

@@ -3,7 +3,7 @@ const getDefaultState = () => {
     sceneData: {},
     table: {},
     sceneId: {},
-    viewId: {},
+    viewId: null,
     tableId: {},
     chartSceneData: {}
   }