From 32669aca3e3f0c143a29adf5af99260c006e58f0 Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Wed, 29 May 2024 11:32:05 +0800
Subject: [PATCH] =?UTF-8?q?style(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=B8=8B=E9=92=BB=E5=BC=B9=E6=A1=86=E7=9A=84=E5=BC=B9?=
 =?UTF-8?q?=E5=87=BA=E4=BD=8D=E7=BD=AE=EF=BC=8C=E9=81=BF=E5=85=8D=E8=B6=85?=
 =?UTF-8?q?=E5=87=BA=E5=9B=BE=E8=A1=A8=E5=8F=AF=E8=A7=86=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/utils/canvasUtils.ts     | 17 +++++++++++++----
 .../views/components/ChartComponentG2Plot.vue   |  2 +-
 .../views/components/ChartComponentS2.vue       |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts
index e106b35000..bd5d9dcf40 100644
--- a/core/core-frontend/src/utils/canvasUtils.ts
+++ b/core/core-frontend/src/utils/canvasUtils.ts
@@ -432,19 +432,28 @@ export async function decompressionPre(params, callBack) {
   callBack(deTemplateData)
 }
 
-export function trackBarStyleCheck(element, trackbarStyle, scale) {
+export function trackBarStyleCheck(element, trackbarStyle, _scale, trackMenuNumber) {
   const { width, height } = element.style
   const widthReal = width
   const heightReal = height
+  // 浮窗高度
+  function calculateTrackHeight(trackMenuNumber) {
+    if (trackMenuNumber === 2) {
+      return 75
+    } else {
+      const increment = Math.floor(trackMenuNumber - 2) * 35
+      return 75 + increment
+    }
+  }
   if (trackbarStyle.left < 0) {
     trackbarStyle.left = 0
   } else if (widthReal - trackbarStyle.left < 60) {
     trackbarStyle.left = trackbarStyle.left - 60
   }
-
+  const trackMenuHeight = calculateTrackHeight(trackMenuNumber)
   if (trackbarStyle.top < 0) {
     trackbarStyle.top = 0
-  } else if (heightReal - trackbarStyle.top < 100) {
-    trackbarStyle.top = trackbarStyle.top - 100
+  } else if (trackbarStyle.top + trackMenuHeight + 60 > heightReal) {
+    trackbarStyle.top = trackbarStyle.top - trackMenuHeight
   }
 }
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 b953c53b94..b5b233070c 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
@@ -244,7 +244,7 @@ const action = param => {
       left: param.x - 50,
       top: param.y + 10
     }
-    trackBarStyleCheck(props.element, barStyleTemp, props.scale)
+    trackBarStyleCheck(props.element, barStyleTemp, props.scale, trackMenu.value.length)
     state.trackBarStyle.left = barStyleTemp.left + 'px'
     state.trackBarStyle.top = barStyleTemp.top + 'px'
     viewTrack.value.trackButtonClick()
diff --git a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
index 7900e71a29..c2bbc01c0c 100644
--- a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
+++ b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
@@ -261,7 +261,7 @@ const action = param => {
       left: param.x - 50,
       top: param.y + 10
     }
-    trackBarStyleCheck(props.element, barStyleTemp, props.scale)
+    trackBarStyleCheck(props.element, barStyleTemp, props.scale, trackMenu.value.length)
     state.trackBarStyle.left = barStyleTemp.left + 'px'
     state.trackBarStyle.top = barStyleTemp.top + 'px'
     viewTrack.value.trackButtonClick()