From b522aab62f1b59ca3cac973d8b4e54a2bee08e8c Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 29 Dec 2021 18:35:57 +0800
Subject: [PATCH 1/3] =?UTF-8?q?style:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
=?UTF-8?q?=E5=B8=83=E5=B1=80=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/canvas/components/Editor/ComponentWrapper.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
index 7a6e9092ab..3bfcdc76a8 100644
--- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
@@ -189,7 +189,7 @@ export default {
}
.component:hover {
- box-shadow: 0px 0px 7px #0a7be0;
+ box-shadow: 0px 0px 3px #0a7be0;
}
.gap_class {
From ba3c3fd1c2fa1032f6fb112146df9cd124ff4642 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 29 Dec 2021 18:51:07 +0800
Subject: [PATCH 2/3] =?UTF-8?q?style:=20=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/panel/LinkJumpSet/index.vue | 24 +++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/frontend/src/views/panel/LinkJumpSet/index.vue b/frontend/src/views/panel/LinkJumpSet/index.vue
index dbdb016174..3181a316b8 100644
--- a/frontend/src/views/panel/LinkJumpSet/index.vue
+++ b/frontend/src/views/panel/LinkJumpSet/index.vue
@@ -35,18 +35,7 @@
-
-
- {{ $t('panel.open_model') }}：
-
-
-
- {{ $t('panel.now_window') }}
- {{ $t('panel.new_window') }}
-
-
-
-
+
{{ $t('panel.link_type') }}：
@@ -69,6 +58,17 @@
/>
+
+
+ {{ $t('panel.open_model') }}：
+
+
+
+ {{ $t('panel.now_window') }}
+ {{ $t('panel.new_window') }}
+
+
+
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 3/3] =?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