From 23dfe4ab7fa7e665a3b1dccba00f01fc8e27a387 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 16 Jan 2024 09:40:25 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):?=
 =?UTF-8?q?=20=E5=A4=A7=E5=B1=8F=E4=BD=8D=E7=BD=AE=E5=AE=9A=E4=BD=8D?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8F=98=E6=9B=B4=E4=B8=BA=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=8E=9F=E5=A7=8B=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=86=8D=E9=9A=8F?=
 =?UTF-8?q?=E7=BC=A9=E6=94=BE=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-backend/pom.xml                     | 10 +++++
 .../common/ComponentPosition.vue              | 40 ++++++++++++++++---
 2 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/core/core-backend/pom.xml b/core/core-backend/pom.xml
index 1e43ec1d51..a37a5973f0 100644
--- a/core/core-backend/pom.xml
+++ b/core/core-backend/pom.xml
@@ -96,6 +96,16 @@
                     <groupId>com.h2database</groupId>
                     <artifactId>h2</artifactId>
                 </dependency>
+                <dependency>
+                    <groupId>io.dataease</groupId>
+                    <artifactId>xpack-permissions</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>io.dataease</groupId>
+                    <artifactId>xpack-base</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
             </dependencies>
 
             <build>
diff --git a/core/core-frontend/src/components/visualization/common/ComponentPosition.vue b/core/core-frontend/src/components/visualization/common/ComponentPosition.vue
index 981fd92741..6e8ea71237 100644
--- a/core/core-frontend/src/components/visualization/common/ComponentPosition.vue
+++ b/core/core-frontend/src/components/visualization/common/ComponentPosition.vue
@@ -10,8 +10,8 @@
             :min="min"
             :max="max"
             :step="step"
-            v-model="curComponent.style[key]"
-            @change="onPositionChange"
+            v-model="positionMounted[key]"
+            @change="onPositionChange(key)"
             controls-position="right"
           />
         </el-form-item>
@@ -21,7 +21,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue'
+import { computed, ref, watch } from 'vue'
 import { positionData } from '@/utils/attr'
 import { storeToRefs } from 'pinia'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
@@ -30,7 +30,13 @@ import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapsho
 const snapshotStore = snapshotStoreWithOut()
 
 const dvMainStore = dvMainStoreWithOut()
-const { curComponent } = storeToRefs(dvMainStore)
+const { curComponent, canvasStyleData } = storeToRefs(dvMainStore)
+const positionMounted = ref({
+  width: 0,
+  height: 0,
+  top: 0,
+  left: 0
+})
 
 withDefaults(
   defineProps<{
@@ -60,9 +66,33 @@ const positionKeysGroup = computed(() => {
   return _list
 })
 
-const onPositionChange = () => {
+const onPositionChange = key => {
+  curComponent.value.style[key] = Math.round(
+    (positionMounted.value[key] * canvasStyleData.value.scale) / 100
+  )
   snapshotStore.recordSnapshotCache()
 }
+
+const positionInit = () => {
+  if (curComponent.value) {
+    Object.keys(positionMounted.value).forEach(key => {
+      positionMounted.value[key] = Math.round(
+        (curComponent.value.style[key] * 100) / canvasStyleData.value.scale
+      )
+    })
+  }
+}
+
+watch(
+  () => curComponent.value,
+  () => {
+    positionInit()
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+)
 </script>
 
 <style lang="less" scoped>