From 32eea248c36d50c886038a9a80d2c8b59265bc51 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 25 Dec 2023 21:37:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=BB=84=E5=90=88=E5=86=85=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=97=B6=E6=9C=AA=E5=90=8C=E6=AD=A5=E7=BC=A9?=
 =?UTF-8?q?=E6=94=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/data-visualization/canvas/CanvasCore.vue | 6 +++++-
 core/core-frontend/src/custom-component/group/Component.vue | 3 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
index 7e5cb6c784..4af2b06de1 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
@@ -205,6 +205,10 @@ const curScale = computed(() => {
   return canvasStyleData.value.scale / 100
 })
 
+const curBaseScale = computed(() => {
+  return dvMainStore.canvasStyleData.scale / 100
+})
+
 const pointShadowShow = computed(() => {
   return (
     canvasId.value === 'canvas-main' &&
@@ -1314,7 +1318,7 @@ defineExpose({
         :id="'component' + item.id"
         :active="item.id === curComponentId"
         :dv-type="dvInfo.type"
-        :scale="curScale"
+        :scale="curBaseScale"
         :style="getComponentStyle(item.style)"
         :prop-value="item.propValue"
         :is-edit="true"
diff --git a/core/core-frontend/src/custom-component/group/Component.vue b/core/core-frontend/src/custom-component/group/Component.vue
index aceef1095b..52429009e0 100644
--- a/core/core-frontend/src/custom-component/group/Component.vue
+++ b/core/core-frontend/src/custom-component/group/Component.vue
@@ -55,9 +55,6 @@ const customCanvasStyle = computed(() => {
   result.scale = canvasStyleData.value.scale
   result.width = (element.value.style.width * 100) / result.scale
   result.height = (element.value.style.height * 100) / result.scale
-
-  // result.width = element.value.style.width
-  // result.height = element.value.style.height
   return result
 })
 </script>