From 9ed80d3b595155e90c8aa2c5d93ae607254da4f6 Mon Sep 17 00:00:00 2001
From: monitor1394 <monitor1394@gmail.com>
Date: Thu, 10 Aug 2023 13:19:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96`BarChart`=E5=9C=A8`Tooltip`?=
 =?UTF-8?q?=E7=9A=84`Trigger`=E4=B8=BA`Item`=E6=97=B6=E7=9A=84=E8=A1=A8?=
 =?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Documentation~/zh/changelog.md              | 1 +
 Examples/Example02_ChartEvent.cs            | 8 ++++----
 Runtime/Component/Tooltip/TooltipHandler.cs | 2 +-
 Runtime/Serie/Bar/BarHandler.cs             | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Documentation~/zh/changelog.md b/Documentation~/zh/changelog.md
index bd03c2f9..6df99e2b 100644
--- a/Documentation~/zh/changelog.md
+++ b/Documentation~/zh/changelog.md
@@ -76,6 +76,7 @@ slug: /changelog
 
 日志详情：
 
+* (2023.08.10) 优化`BarChart`在`Tooltip`的`Trigger`为`Item`时的表现
 * (2023.08.09) 增加`Axis`可通过设置`IconStyle`的`color`为`clear`来实现动态图标颜色的支持
 * (2023.08.08) 增加`Pie`对`LabelLine`的`lineEndX`的支持
 * (2023.08.05) 整理`Examples`的代码，删除不必要的用例
diff --git a/Examples/Example02_ChartEvent.cs b/Examples/Example02_ChartEvent.cs
index b2a85904..7847cf77 100644
--- a/Examples/Example02_ChartEvent.cs
+++ b/Examples/Example02_ChartEvent.cs
@@ -80,17 +80,17 @@ namespace XCharts.Example
 
         void OnDraw(VertexHelper vh)
         {
-            Debug.Log("OnDraw");
+            //Debug.Log("OnDraw");
         }
 
         void OnDrawBeforeSerie(VertexHelper vh, Serie serie)
         {
-            Debug.Log("OnDrawBeforeSerie: " + serie.index);
+            //Debug.Log("OnDrawBeforeSerie: " + serie.index);
         }
 
         void OnDrawAfterSerie(VertexHelper vh, Serie serie)
         {
-            Debug.Log("OnDrawAfterSerie: " + serie.index);
+            //Debug.Log("OnDrawAfterSerie: " + serie.index);
             if (serie.index != 0) return;
             var dataPoints = serie.context.dataPoints;
             if (dataPoints.Count > 0)
@@ -107,7 +107,7 @@ namespace XCharts.Example
 
         void OnDrawTop(VertexHelper vh)
         {
-            Debug.Log("OnDrawTop");
+            //Debug.Log("OnDrawTop");
         }
     }
 }
\ No newline at end of file
diff --git a/Runtime/Component/Tooltip/TooltipHandler.cs b/Runtime/Component/Tooltip/TooltipHandler.cs
index c14f8a2a..4fc83fbb 100644
--- a/Runtime/Component/Tooltip/TooltipHandler.cs
+++ b/Runtime/Component/Tooltip/TooltipHandler.cs
@@ -454,10 +454,10 @@ namespace XCharts.Runtime
             tooltip.context.pointer = chart.pointerPos;
             if (m_PointerContainer is GridCoord)
             {
+                GetAxisCategory(m_PointerContainer.index, ref dataIndex, ref category);
                 if (tooltip.trigger == Tooltip.Trigger.Axis)
                 {
                     isTriggerByAxis = true;
-                    GetAxisCategory(m_PointerContainer.index, ref dataIndex, ref category);
                     if (series.Count <= 1)
                     {
                         showCategory = true;
diff --git a/Runtime/Serie/Bar/BarHandler.cs b/Runtime/Serie/Bar/BarHandler.cs
index 0cc1faa3..8cd8b80b 100644
--- a/Runtime/Serie/Bar/BarHandler.cs
+++ b/Runtime/Serie/Bar/BarHandler.cs
@@ -25,7 +25,7 @@ namespace XCharts.Runtime
             string marker, string itemFormatter, string numericFormatter, string ignoreDataDefaultContent,
             ref List<SerieParams> paramList, ref string title)
         {
-            UpdateCoordSerieParams(ref paramList, ref title, dataIndex, showCategory, category,
+            UpdateCoordSerieParams(ref paramList, ref title, dataIndex, true, category,
                 marker, itemFormatter, numericFormatter, ignoreDataDefaultContent);
         }