From 92afdd0c64201e124b5885d8a18c5f00fe66a998 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 25 Dec 2023 20:39:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=BF=E5=A4=A7=E5=B1=8F=E8=B5=84=E6=BA=90=E6=A0=91=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=89=93=E5=BC=80=E7=AA=97=E5=8F=A3=E4=B8=8D=E5=AF=B9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/views/common/DeResourceTree.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/core-frontend/src/views/common/DeResourceTree.vue b/core/core-frontend/src/views/common/DeResourceTree.vue
index a5cad77784..8bea45f4d0 100644
--- a/core/core-frontend/src/views/common/DeResourceTree.vue
+++ b/core/core-frontend/src/views/common/DeResourceTree.vue
@@ -232,7 +232,7 @@ const operation = (cmd: string, data: BusiTreeNode, nodeType: string) => {
     })
   } else if (cmd === 'edit') {
     resourceEdit(data.id)
-  } else {
+  } else if (cmd === 'copy') {
     const targetPid = findParentIdByChildIdRecursive(state.resourceTree, data.id)
     const params: ResourceOrFolder = {
       nodeType: nodeType as 'folder' | 'leaf',
@@ -248,6 +248,8 @@ const operation = (cmd: string, data: BusiTreeNode, nodeType: string) => {
           : `#/dashboard?opt=copy&pid=${params.pid}&resourceId=${data.data}`
       window.open(baseUrl, '_blank')
     })
+  } else {
+    resourceGroupOpt.value.optInit(nodeType, data, cmd, ['copy'].includes(cmd))
   }
 }
 

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 2/3] =?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>

From 6e23a564cbcbc04007301244e682dd34da1e1384 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 25 Dec 2023 21:52:25 +0800
Subject: [PATCH 3/3] =?UTF-8?q?refactor:=20=E5=A4=A7=E5=B1=8F=E6=8B=96?=
 =?UTF-8?q?=E6=8B=BD=E8=BF=9B=E5=85=A5=E7=9A=84=E7=BB=84=E4=BB=B6=E5=9B=BE?=
 =?UTF-8?q?=E5=B1=82=E6=94=BE=E5=9C=A8=E6=9C=80=E9=A1=B6=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/views/data-visualization/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/core-frontend/src/views/data-visualization/index.vue b/core/core-frontend/src/views/data-visualization/index.vue
index 545893cd68..69cc98bd5e 100644
--- a/core/core-frontend/src/views/data-visualization/index.vue
+++ b/core/core-frontend/src/views/data-visualization/index.vue
@@ -109,7 +109,7 @@ const handleDrop = e => {
     component.style.left = e.clientX - rectInfo.x
     component.id = guid()
     changeComponentSizeWithScale(component)
-    dvMainStore.addComponent({ component: component, index: 0 })
+    dvMainStore.addComponent({ component: component, index: undefined })
     adaptCurThemeCommonStyle(component)
     snapshotStore.recordSnapshotCache('renderChart', component.id)
   }