From ffa54ad6de6b255a775911118b1f9c94eb43bd18 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 12 Nov 2021 12:07:06 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=E4=BC=98=E5=8C=96=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E9=97=B4=E9=9A=99=E5=92=8C=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=94=BB?=
 =?UTF-8?q?=E5=B8=83=E9=97=B4=E9=9A=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/DeDrag/index.vue      | 15 +++++++-------
 .../components/Editor/ComponentWrapper.vue    | 11 +++++++---
 .../canvas/components/Editor/Preview.vue      | 20 +++++--------------
 .../canvas/components/Editor/index.vue        |  3 ++-
 frontend/src/views/panel/edit/index.vue       | 12 ++++++-----
 .../src/views/panel/list/PanelViewShow.vue    |  2 +-
 6 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue
index 5c2f32078b..49adf6b611 100644
--- a/frontend/src/components/DeDrag/index.vue
+++ b/frontend/src/components/DeDrag/index.vue
@@ -444,7 +444,7 @@ export default {
     style() {
       // console.log('style-top:' + this.y + '--' + this.top)
       return {
-        padding: (this.canvasStyleData.panel.gap === 'yes' ? this.componentGap : 0) + 'px',
+        padding: this.curGap + 'px',
         transform: `translate(${this.left}px, ${this.top}px) rotate(${this.rotate}deg)`,
         width: this.computedWidth,
         height: this.computedHeight,
@@ -487,7 +487,6 @@ export default {
 
     //  根据left right 算出元素的宽度
     computedMainSlotWidth() {
-      const gap = (this.canvasStyleData.panel.gap === 'yes' ? this.componentGap : 0) * 2
       if (this.w === 'auto') {
         if (!this.widthTouched) {
           return 'auto'
@@ -495,14 +494,13 @@ export default {
       }
       if (this.element.auxiliaryMatrix) {
         const width = Math.round(this.width / this.curCanvasScale.matrixStyleWidth) * this.curCanvasScale.matrixStyleWidth
-        return (width - gap) + 'px'
+        return (width - this.curGap * 2) + 'px'
       } else {
-        return (this.width - gap) + 'px'
+        return (this.width - this.curGap * 2) + 'px'
       }
     },
     // 根据top bottom 算出元素的宽度
     computedMainSlotHeight() {
-      const gap = (this.canvasStyleData.panel.gap === 'yes' ? this.componentGap : 0) * 2
       if (this.h === 'auto') {
         if (!this.heightTouched) {
           return 'auto'
@@ -510,9 +508,9 @@ export default {
       }
       if (this.element.auxiliaryMatrix) {
         const height = Math.round(this.height / this.curCanvasScale.matrixStyleHeight) * this.curCanvasScale.matrixStyleHeight
-        return (height - gap) + 'px'
+        return (height - this.curGap * 2) + 'px'
       } else {
-        return (this.height - gap) + 'px'
+        return (this.height - this.curGap * 2) + 'px'
       }
     },
 
@@ -528,6 +526,9 @@ export default {
     curComponent() {
       return this.$store.state.curComponent
     },
+    curGap() {
+      return this.canvasStyleData.panel.gap === 'yes' && this.element.auxiliaryMatrix ? this.componentGap : 0
+    },
     ...mapState([
       'editor',
       'curCanvasScale',
diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
index 3d0b764a8e..84acd7331f 100644
--- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
@@ -1,7 +1,6 @@
 <template>
   <div
     :style="getOutStyleDefault(config.style)"
-    :class="{'gap_class':canvasStyleData.panel.gap==='yes'}"
     class="component"
     @click="handleClick"
     @mousedown="elementMouseDown"
@@ -66,9 +65,13 @@ export default {
     }
   },
   computed: {
+    curGap() {
+      return this.canvasStyleData.panel.gap === 'yes' && this.config.auxiliaryMatrix ? this.componentGap : 0
+    },
     ...mapState([
       'canvasStyleData',
-      'curComponent'
+      'curComponent',
+      'componentGap'
     ])
   },
   mounted() {
@@ -101,7 +104,9 @@ export default {
       return value * scale / 100
     },
     getOutStyleDefault(style) {
-      const result = {};
+      const result = {
+        padding: this.curGap + 'px'
+      };
       ['width', 'left'].forEach(attr => {
         result[attr] = style[attr] + 'px'
       });
diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index 4bb6f4d3fd..380c9d5a68 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -1,6 +1,6 @@
 <template>
-  <div id="canvasInfoMain" ref="canvasInfoMain" class="main-class">
-    <div id="canvasInfoTemp" ref="canvasInfoTemp" :style="customStyle" class="bg" @mouseup="deselectCurComponent" @mousedown="handleMouseDown">
+  <div id="canvasInfoMain" ref="canvasInfoMain" :style="customStyle" class="bg">
+    <div id="canvasInfoTemp" ref="canvasInfoTemp" class="main-class" @mouseup="deselectCurComponent" @mousedown="handleMouseDown">
       <el-row v-if="componentDataShow.length===0" style="height: 100%;" class="custom-position">
         {{ $t('panel.panelNull') }}
       </el-row>
@@ -95,9 +95,7 @@ export default {
   computed: {
     customStyle() {
       let style = {
-        margin: 'auto',
-        width: this.mainWidth,
-        height: this.mainHeight
+        padding: this.componentGap + 'px'
       }
       if (this.canvasStyleData.openCommonStyle) {
         if (this.canvasStyleData.panel.backgroundType === 'image' && this.canvasStyleData.panel.imageUrl) {
@@ -132,7 +130,8 @@ export default {
       'isClickComponent',
       'curComponent',
       'componentData',
-      'canvasStyleData'
+      'canvasStyleData',
+      'componentGap'
     ])
   },
   watch: {
@@ -192,15 +191,6 @@ export default {
       const canvasWidth = document.getElementById('canvasInfoMain').offsetWidth
       this.scaleWidth = canvasWidth * 100 / parseInt(this.canvasStyleData.width)// 获取宽度比
       this.scaleHeight = canvasHeight * 100 / parseInt(this.canvasStyleData.height)// 获取高度比
-
-      // console.log('scaleHeight:' + this.scaleHeight + ';ch:' + this.canvasStyleData.height)
-
-      // this.scaleHeight = this.scaleWidth
-      // this.mainHeight = this.canvasStyleData.height * this.scaleHeight / 100 + 'px'
-      // if (this.showType === 'width') {
-      //   this.scaleHeight = this.scaleWidth
-      //   this.mainHeight = this.canvasStyleData.height * this.scaleHeight / 100 + 'px'
-      // }
       this.handleScaleChange()
     },
     resetID(data) {
diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index 7e74686b24..92a19670eb 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -982,7 +982,8 @@ export default {
       'editor',
       'linkageSettingStatus',
       'curLinkageView',
-      'doSnapshotIndex'
+      'doSnapshotIndex',
+      'componentGap'
     ])
   },
   watch: {
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 5e756bd6d7..70beaea1f8 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -310,7 +310,9 @@ export default {
       }
     },
     customCanvasStyle() {
-      let style = {}
+      let style = {
+        padding: this.componentGap + 'px'
+      }
 
       if (this.canvasStyleData.openCommonStyle) {
         if (this.canvasStyleData.panel.backgroundType === 'image' && this.canvasStyleData.panel.imageUrl) {
@@ -340,7 +342,8 @@ export default {
       'curComponentIndex',
       'componentData',
       'linkageSettingStatus',
-      'dragComponentInfo'
+      'dragComponentInfo',
+      'componentGap'
     ])
   },
 
@@ -680,9 +683,9 @@ export default {
         this.$nextTick(() => {
           const canvasHeight = document.getElementById('canvasInfo').offsetHeight
           const canvasWidth = document.getElementById('canvasInfo').offsetWidth
-          this.outStyle.height = canvasHeight
+          this.outStyle.height = canvasHeight - (this.componentGap * 2)
           // 临时处理 确保每次restore 有会更新
-          this.outStyle.width = canvasWidth + (Math.random() * 0.000001)
+          this.outStyle.width = canvasWidth - (this.componentGap * 2) + (Math.random() * 0.000001)
           // console.log(canvasHeight + '--' + canvasWidth)
         })
       }
@@ -919,7 +922,6 @@ export default {
   overflow-x: hidden;
   overflow-y: auto;
   background-size:100% 100% !important;
-
 }
 .el-main{
   height: calc(100vh - 91px);
diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue
index 5dcc1ad79d..89a5fb8719 100644
--- a/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/frontend/src/views/panel/list/PanelViewShow.vue
@@ -342,7 +342,7 @@ export default {
     min-height: 400px;
     height: 100%;
     min-width: 500px;
-    overflow-y: auto;
+    overflow-y: hidden;
     border-top: 1px solid #E6E6E6;
   }