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