Merge pull request #832 from dataease/pr@dev@refactor_panel-text

feat:仪表板视图拖拽阴影跟随

frontend/src/components/DeDrag/index.vue

@@ -510,11 +510,13 @@ export default {
         width: this.computedMainSlotWidth,
         height: this.computedMainSlotHeight
       }
-      console.log('style=>' + JSON.stringify(style))
+      // console.log('style=>' + JSON.stringify(style))
       return style
     },
+    curComponent() {
+      return this.$store.state.curComponent
+    },
     ...mapState([
-      'curComponent',
       'editor',
       'curCanvasScale',
       'canvasStyleData',
@@ -614,6 +616,18 @@ export default {
       this.beforeDestroyFunction()
       this.createdFunction()
       this.mountedFunction()
+    },
+    // private 监控dragging  resizing
+    dragging(val) {
+      if (this.enabled) {
+        this.curComponent.optStatus.dragging = val
+      }
+    },
+    // private 监控dragging  resizing
+    resizing(val) {
+      if (this.enabled) {
+        this.curComponent.optStatus.resizing = val
+      }
     }
   },
   created: function() {
@@ -1572,10 +1586,6 @@ export default {
       addEvent(document.documentElement, 'touchend touchcancel', this.deselect)
       //  窗口变化时，检查容器大小
       addEvent(window, 'resize', this.checkParentSize)
-
-      // private 记录当前组件的操作状态
-      this.curComponent.optStatus.resizing = this.resizing
-      this.curComponent.optStatus.dragging = this.dragging
     },
     createdFunction() {
       // minWidth不能大于maxWidth

frontend/src/components/DeDrag/shadow.vue

@@ -28,7 +28,7 @@ export default {
         background: 'gray',
         position: 'absolute'
       }
-      console.log('style=>' + JSON.stringify(style))
+      // console.log('style=>' + JSON.stringify(style))
       return style
     },
     ...mapState([

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

@@ -12,7 +12,7 @@
     @mousedown="handleMouseDown"
   >
     <!-- 网格线 -->
-    <Grid v-if="canvasStyleData.auxiliaryMatrix&&!linkageSettingStatus" :matrix-style="matrixStyle" />
+<!--    <Grid v-if="canvasStyleData.auxiliaryMatrix&&!linkageSettingStatus" :matrix-style="matrixStyle" />-->
 
     <!-- 仪表板联动清除按钮-->
     <canvas-opt-bar />
@@ -636,7 +636,7 @@ export default {
     },
     resizeView(index, item) {
       if (item.type === 'view') {
-        console.log('view:resizeView')
+        // console.log('view:resizeView')
         this.$refs.wrapperChild[index].chartResize()
       }
     }

frontend/src/store/index.js

@@ -87,9 +87,11 @@ const data = {
 
     setCurComponent(state, { component, index }) {
       // 当前视图操作状态置空
-      component['optStatus'] = {
+      if (component) {
-        dragging: false,
+        component['optStatus'] = {
-        resizing: false
+          dragging: false,
+          resizing: false
+        }
       }
       state.styleChangeTimes = 0
       state.curComponent = component