From 1eaaee8cb866ea9c50ed6d488de4e41b8ba0f7f0 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 1 Jul 2024 11:37:16 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=B6=E7=BB=84=E5=90=88=E5=9B=BE=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=87=BA=E6=9D=A5=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/custom-component/common/CanvasGroup.vue | 1 + .../src/custom-component/group/Component.vue | 8 ++++++-- .../src/custom-component/group/GroupPreview.vue | 10 +++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/core/core-frontend/src/custom-component/common/CanvasGroup.vue b/core/core-frontend/src/custom-component/common/CanvasGroup.vue index 5b2f3bd66b..f8d1d16a51 100644 --- a/core/core-frontend/src/custom-component/common/CanvasGroup.vue +++ b/core/core-frontend/src/custom-component/common/CanvasGroup.vue @@ -77,6 +77,7 @@ const { element, isEdit, showPosition, canvasStyleData, canvasViewInfo, dvInfo, :prop-value="element.propValue" :show-position="showPosition" :scale="scale * 100" + :canvas-view-info="canvasViewInfo" > diff --git a/core/core-frontend/src/custom-component/group/Component.vue b/core/core-frontend/src/custom-component/group/Component.vue index 95870a5e99..65cee0a41a 100644 --- a/core/core-frontend/src/custom-component/group/Component.vue +++ b/core/core-frontend/src/custom-component/group/Component.vue @@ -6,7 +6,7 @@ import CanvasGroup from '@/custom-component/common/CanvasGroup.vue' import { deepCopy } from '@/utils/utils' import { DEFAULT_CANVAS_STYLE_DATA_DARK } from '@/views/chart/components/editor/util/dataVisualiztion' const dvMainStore = dvMainStoreWithOut() -const { canvasViewInfo, canvasStyleData, curComponent } = storeToRefs(dvMainStore) +const { canvasStyleData, curComponent } = storeToRefs(dvMainStore) const sourceCanvasStyle = deepCopy(DEFAULT_CANVAS_STYLE_DATA_DARK) const props = defineProps({ @@ -50,10 +50,14 @@ const props = defineProps({ active: { type: Boolean, default: false + }, + canvasViewInfo: { + type: Object, + required: true } }) -const { propValue, dvInfo, element, scale } = toRefs(props) +const { propValue, dvInfo, element, scale, canvasViewInfo } = toRefs(props) const customCanvasStyle = computed(() => { const result = sourceCanvasStyle result.scale = canvasStyleData.value.scale diff --git a/core/core-frontend/src/custom-component/group/GroupPreview.vue b/core/core-frontend/src/custom-component/group/GroupPreview.vue index 2d577ae8a6..41026a54f8 100644 --- a/core/core-frontend/src/custom-component/group/GroupPreview.vue +++ b/core/core-frontend/src/custom-component/group/GroupPreview.vue @@ -1,11 +1,7 @@