From fb9937606942134836d66e7355d9c3657085e0e0 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 18 Apr 2024 10:44:09 +0800
Subject: [PATCH] =?UTF-8?q?style(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E4=B8=8B=E9=92=BB=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-backend/pom.xml                              | 10 ++++++++++
 core/core-frontend/src/utils/canvasUtils.ts            |  6 +++---
 .../views/components/ChartComponentG2Plot.vue          | 10 ++++++++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/core/core-backend/pom.xml b/core/core-backend/pom.xml
index 431f4be49c..5fc3da2993 100644
--- a/core/core-backend/pom.xml
+++ b/core/core-backend/pom.xml
@@ -101,6 +101,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/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts
index f6e15fecd1..9fe45459f1 100644
--- a/core/core-frontend/src/utils/canvasUtils.ts
+++ b/core/core-frontend/src/utils/canvasUtils.ts
@@ -422,9 +422,9 @@ export async function decompressionPre(params, callBack) {
 }
 
 export function trackBarStyleCheck(element, trackbarStyle, scale) {
-  const { width, height } = element.value.style
-  const widthReal = width * scale
-  const heightReal = height * scale
+  const { width, height } = element.style
+  const widthReal = width
+  const heightReal = height
   if (trackbarStyle.left < 0) {
     trackbarStyle.left = 0
   } else if (widthReal - trackbarStyle.left < 60) {
diff --git a/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue b/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue
index 94a91c5dae..641e0b8756 100644
--- a/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue
+++ b/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue
@@ -15,6 +15,7 @@ import ChartError from '@/views/chart/components/views/components/ChartError.vue
 import { BASE_VIEW_CONFIG } from '../../editor/util/chart'
 import { customAttrTrans, customStyleTrans, recursionTransObj } from '@/utils/canvasStyle'
 import { deepCopy } from '@/utils/utils'
+import { trackBarStyleCheck } from '@/utils/canvasUtils'
 
 const dvMainStore = dvMainStoreWithOut()
 const { nowPanelTrackInfo, nowPanelJumpInfo, mobileInPc } = storeToRefs(dvMainStore)
@@ -202,8 +203,13 @@ const action = param => {
     trackClick(trackMenu.value[0])
   } else {
     // 图表关联多个事件
-    state.trackBarStyle.left = param.x - 50 + 'px'
-    state.trackBarStyle.top = param.y + 10 + 'px'
+    const barStyleTemp = {
+      left: param.x - 50,
+      top: param.y + 10
+    }
+    trackBarStyleCheck(props.element, barStyleTemp, props.scale)
+    state.trackBarStyle.left = barStyleTemp.left + 'px'
+    state.trackBarStyle.top = barStyleTemp.top + 'px'
     viewTrack.value.trackButtonClick()
   }
 }