From f29b6608194f4cb7151bd913e3bea0b4077e9a44 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 30 Dec 2021 11:47:26 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E9=97=B4=E9=9A=99=E8=AE=BE=E7=BD=AE=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                      | 2 +-
 .../components/canvas/components/Editor/ComponentWrapper.vue  | 2 +-
 frontend/src/components/canvas/custom-component/UserView.vue  | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue
index bc2065eeaa..0c339f1b8f 100644
--- a/frontend/src/components/DeDrag/index.vue
+++ b/frontend/src/components/DeDrag/index.vue
@@ -535,7 +535,7 @@ export default {
       return this.$store.state.curComponent
     },
     curGap() {
-      return this.element.auxiliaryMatrix && this.element.type !== 'custom' ? this.componentGap : 0
+      return (this.canvasStyleData.panel.gap === 'yes' && this.element.auxiliaryMatrix && this.element.type !== 'custom') ? this.componentGap : 0
     },
     ...mapState([
       'editor',
diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
index 3bfcdc76a8..1b4d51095d 100644
--- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
@@ -85,7 +85,7 @@ export default {
       return (this.curComponent && this.config === this.curComponent) && !this.previewVisible
     },
     curGap() {
-      return this.config.auxiliaryMatrix ? this.componentGap : 0
+      return (this.canvasStyleData.panel.gap === 'yes' && this.config.auxiliaryMatrix) ? this.componentGap : 0
     },
     ...mapState([
       'mobileLayoutStatus',
diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index b1d40b3a97..01db302241 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -261,6 +261,10 @@ export default {
         if (!this.preCanvasPanel || this.preCanvasPanel.resultCount !== newVal.panel.resultCount || this.preCanvasPanel.resultMode !== newVal.panel.resultMode) {
           this.getData(this.element.propValue.viewId, false)
         }
+        // 如果gap有变化刷新
+        if (this.preCanvasPanel && this.preCanvasPanel.gap !== newVal.panel.gap) {
+          this.$refs[this.element.propValue.id].chartResize()
+        }
         this.preCanvasPanel = deepCopy(newVal.panel)
       },
       deep: true