From e2626d0423d2ba090be0e3c750eb8b3213ea84d9 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Sun, 10 Oct 2021 20:58:22 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=A7=86=E5=9B=BE=E7=9F=A9?=
 =?UTF-8?q?=E9=98=B5=E5=92=8C=E6=82=AC=E6=B5=AE=E7=9B=B8=E4=BA=92=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/DeDrag/index.vue      |  5 +++-
 .../canvas/components/Editor/EditBar.vue      | 25 ++++++++++++++++---
 .../canvas/components/Editor/index.vue        |  4 +--
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue
index e0cf9c2d1e..49dc0f7295 100644
--- a/frontend/src/components/DeDrag/index.vue
+++ b/frontend/src/components/DeDrag/index.vue
@@ -21,7 +21,7 @@
     @mouseenter="enter"
     @mouseleave="leave"
   >
-    <edit-bar v-if="active||linkageSettingStatus" style="transform: translateZ(10px)" :active-model="'edit'" :element="element" @showViewDetails="showViewDetails" @amRemoveItem="amRemoveItem" @amAddItem="amAddItem" />
+    <edit-bar v-if="active||linkageSettingStatus" style="transform: translateZ(10px)" :active-model="'edit'" :element="element" @showViewDetails="showViewDetails" @amRemoveItem="amRemoveItem" @amAddItem="amAddItem" @resizeView="resizeView" />
     <div v-if="resizing" style="transform: translateZ(11px);position: absolute; z-index: 3" :style="resizeShadowStyle" />
     <div
       v-for="(handlei, indexi) in actualHandles"
@@ -1680,6 +1680,9 @@ export default {
     },
     amRemoveItem() {
       this.$emit('amRemoveItem')
+    },
+    resizeView() {
+      this.$emit('resizeView')
     }
   }
 
diff --git a/frontend/src/components/canvas/components/Editor/EditBar.vue b/frontend/src/components/canvas/components/Editor/EditBar.vue
index 7bbb767846..0c45514236 100644
--- a/frontend/src/components/canvas/components/Editor/EditBar.vue
+++ b/frontend/src/components/canvas/components/Editor/EditBar.vue
@@ -39,6 +39,7 @@ import { mapState } from 'vuex'
 import bus from '@/utils/bus'
 import SettingMenu from '@/components/canvas/components/Editor/SettingMenu'
 import LinkageField from '@/components/canvas/components/Editor/LinkageField'
+import { deepCopy } from '@/components/canvas/utils/utils'
 
 export default {
   components: { SettingMenu, LinkageField },
@@ -126,10 +127,6 @@ export default {
     },
     auxiliaryMatrixChange() {
       if (this.curComponent.auxiliaryMatrix) {
-        this.curComponent.style.left = (this.curComponent.x - 1) * this.curCanvasScale.matrixStyleOriginWidth
-        this.curComponent.style.top = (this.curComponent.y - 1) * this.curCanvasScale.matrixStyleOriginHeight
-        this.curComponent.style.width = this.curComponent.sizex * this.curCanvasScale.matrixStyleOriginWidth
-        this.curComponent.style.height = this.curComponent.sizey * this.curCanvasScale.matrixStyleOriginHeight
         this.curComponent.auxiliaryMatrix = false
         this.$emit('amRemoveItem')
       } else {
@@ -140,9 +137,29 @@ export default {
         this.curComponent.auxiliaryMatrix = true
         this.$emit('amAddItem')
       }
+      setTimeout(() => {
+        this.recordMatrixCurShadowStyle()
+      }, 50)
       this.$store.state.styleChangeTimes++
       bus.$emit('auxiliaryMatrixChange')
     },
+    // 记录当前样式 跟随阴影位置 矩阵处理
+    recordMatrixCurShadowStyle() {
+      // debugger
+      const left = (this.curComponent.x - 1) * this.curCanvasScale.matrixStyleWidth
+      const top = (this.curComponent.y - 1) * this.curCanvasScale.matrixStyleHeight
+      const width = this.curComponent.sizex * this.curCanvasScale.matrixStyleWidth
+      const height = this.curComponent.sizey * this.curCanvasScale.matrixStyleHeight
+      const style = {
+        left: left,
+        top: top,
+        width: width,
+        height: height
+      }
+      this.$store.commit('setShapeStyle', style)
+      // resize
+      this.$emit('resizeView')
+    },
     edit() {
       // 编辑时临时保存 当前修改的画布
       this.$store.dispatch('panel/setComponentDataTemp', JSON.stringify(this.componentData))
diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index 57d95d9558..c20deb0ce8 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -13,9 +13,9 @@
     @scroll="canvasScroll"
   >
     <!-- 网格线 -->
-<!--    <Grid v-if="canvasStyleData.auxiliaryMatrix&&!linkageSettingStatus" :matrix-style="matrixStyle" />-->
+    <!--    <Grid v-if="canvasStyleData.auxiliaryMatrix&&!linkageSettingStatus" :matrix-style="matrixStyle" />-->
     <!--    positionBox:{{positionBoxInfo}}-->
-<!--    <PGrid :position-box="positionBoxInfoArray" :matrix-style="matrixStyle" />-->
+    <PGrid :position-box="positionBoxInfoArray" :matrix-style="matrixStyle" />
 
     <!-- 仪表板联动清除按钮-->
     <canvas-opt-bar />