From 3b82d7efff977efb3647855fd5b099a443c64eec Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Fri, 11 Apr 2025 11:16:05 +0800
Subject: [PATCH] =?UTF-8?q?style(=E5=9B=BE=E8=A1=A8):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E6=93=8D=E4=BD=9C=E4=B8=8B=E6=8B=89=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E4=B8=8Etooltip=E7=9A=84=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/visualization/ViewTrackBar.vue     | 11 ++++++++---
 .../chart/components/js/panel/common/common_antv.ts   |  6 ++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/components/visualization/ViewTrackBar.vue b/core/core-frontend/src/components/visualization/ViewTrackBar.vue
index 0c2897e5a1..31aca406ae 100644
--- a/core/core-frontend/src/components/visualization/ViewTrackBar.vue
+++ b/core/core-frontend/src/components/visualization/ViewTrackBar.vue
@@ -1,6 +1,11 @@
 <template>
   <div>
-    <el-dropdown :teleported="false" trigger="click" @visible-change="visibleChange">
+    <el-dropdown
+      :id="'view-track-bar-' + chartId"
+      :teleported="false"
+      trigger="click"
+      @visible-change="visibleChange"
+    >
       <input id="input" ref="trackButton" type="button" hidden />
       <template #dropdown>
         <div :class="{ 'data-mobile': isDataVMobile }">
@@ -63,10 +68,10 @@ const state = reactive({
     event_refreshView: t('visualization.refresh_view')
   }
 })
-const visibleChange = isVisible => {
+const visibleChange = _isVisible => {
   document.querySelectorAll('.g2-tooltip')?.forEach(tooltip => {
     if (tooltip.id?.includes(chartId.value)) {
-      tooltip.classList.toggle('hidden-tooltip', isVisible)
+      tooltip.classList.toggle('hidden-tooltip', true)
     }
   })
 }
diff --git a/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts b/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts
index 4544cb7b14..5a39e80e23 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts
@@ -1788,6 +1788,8 @@ export function configPlotTooltipEvent<O extends PickOptions, P extends Plot<O>>
     if (!tooltipCtl) {
       return
     }
+    // 处理 tooltip 与下拉菜单的显示冲突问题
+    const viewTrackBarElement = document.getElementById('view-track-bar-' + chart.id)
     const event = plot.chart.interactions.tooltip?.context?.event
     // 是否时轮播模式
     const isCarousel =
@@ -1801,6 +1803,10 @@ export function configPlotTooltipEvent<O extends PickOptions, P extends Plot<O>>
     if (tooltipCtl.tooltip) {
       // 处理视图放大后再关闭 tooltip 的 dom 被清除
       const container = tooltipCtl.tooltip.cfg.container
+      // 当下拉菜单不显示时，移除tooltip的hidden-tooltip样式
+      if (viewTrackBarElement?.getAttribute('aria-expanded') === 'false') {
+        container.classList.toggle('hidden-tooltip', false)
+      }
       container.style.display = 'block'
       const dom = document.getElementById(container.id)
       if (!dom) {