From f98c89c24a5e77249c161f7a5da2ca20ddf70aba Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 4 Mar 2024 13:51:40 +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=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E7=BB=84=E5=90=88=E7=BB=84=E4=BB=B6=E5=86=85=E9=83=A8?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=E6=A0=87=E9=A2=98=E7=BC=A9=E6=94=BE=E6=AF=94?= =?UTF-8?q?=E4=BE=8B=E4=B8=8D=E6=AD=A3=E7=A1=AE=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 | 6 ++++++ .../src/custom-component/group/Component.vue | 1 + .../src/custom-component/group/GroupPreview.vue | 8 +++++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/core/core-frontend/src/custom-component/common/CanvasGroup.vue b/core/core-frontend/src/custom-component/common/CanvasGroup.vue index 09e75892b8..5b2f3bd66b 100644 --- a/core/core-frontend/src/custom-component/common/CanvasGroup.vue +++ b/core/core-frontend/src/custom-component/common/CanvasGroup.vue @@ -46,6 +46,11 @@ const props = defineProps({ type: Number, required: false, default: 0 + }, + scale: { + type: Number, + required: false, + default: 1 } }) const { element, isEdit, showPosition, canvasStyleData, canvasViewInfo, dvInfo, componentData } = @@ -71,6 +76,7 @@ const { element, isEdit, showPosition, canvasStyleData, canvasViewInfo, dvInfo, :search-count="searchCount" :prop-value="element.propValue" :show-position="showPosition" + :scale="scale * 100" > diff --git a/core/core-frontend/src/custom-component/group/Component.vue b/core/core-frontend/src/custom-component/group/Component.vue index cca710c678..950767cdc2 100644 --- a/core/core-frontend/src/custom-component/group/Component.vue +++ b/core/core-frontend/src/custom-component/group/Component.vue @@ -99,6 +99,7 @@ watch( :canvas-view-info="canvasViewInfo" :is-edit="isEdit" :element="element" + :scale="scale" > diff --git a/core/core-frontend/src/custom-component/group/GroupPreview.vue b/core/core-frontend/src/custom-component/group/GroupPreview.vue index 818da933b5..2d577ae8a6 100644 --- a/core/core-frontend/src/custom-component/group/GroupPreview.vue +++ b/core/core-frontend/src/custom-component/group/GroupPreview.vue @@ -34,10 +34,15 @@ const props = defineProps({ type: Number, required: false, default: 0 + }, + scale: { + type: Number, + required: false, + default: 1 } }) -const { propValue, dvInfo, searchCount } = toRefs(props) +const { propValue, dvInfo, searchCount, scale } = toRefs(props) const customGroupStyle = item => { return { @@ -63,6 +68,7 @@ const customGroupStyle = item => { :style="customGroupStyle(item)" :show-position="showPosition" :search-count="searchCount" + :scale="scale" />