From 6eae4c75336c4e03f9201b23f3a8daa1a6b3ae0d Mon Sep 17 00:00:00 2001
From: monitor1394 <monitor1394@gmail.com>
Date: Wed, 28 Apr 2021 07:00:23 +0800
Subject: [PATCH] Fixed bug where `AxisLabel` displayed incorrectly with
 `DataRoom` (#138)

---
 CHANGELOG-EN.md              | 1 +
 CHANGELOG.md                 | 1 +
 Runtime/Helper/AxisHelper.cs | 6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG-EN.md b/CHANGELOG-EN.md
index aff09acb..9e289e29 100644
--- a/CHANGELOG-EN.md
+++ b/CHANGELOG-EN.md
@@ -34,6 +34,7 @@
 
 ## Latest
 
+* (2021.04.28) Fixed bug where `AxisLabel` displayed incorrectly with `DataRoom` (#138)
 * (2021.04.26) Fixed dynamically creating chart at runtime would be abnormal #137
 * (2021.04.26) Added support for `Barchart` to draw gradient borders
 * (2021.04.23) Added support for custom charts
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b583b803..a6ecfd5a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
 
 ## Latest
 
+* (2021.04.28) 修复`DataZoom`下`AxisLabel`显示不准确的问题 #138
 * (2021.04.26) 修复运行时动态创建图表会异常的问题 #137
 * (2021.04.26) 增加`BarChart`绘制渐变边框的支持
 * (2021.04.23) 增加自定义图表支持
diff --git a/Runtime/Helper/AxisHelper.cs b/Runtime/Helper/AxisHelper.cs
index 32f1d575..3720754e 100644
--- a/Runtime/Helper/AxisHelper.cs
+++ b/Runtime/Helper/AxisHelper.cs
@@ -213,7 +213,7 @@ namespace XCharts
             int splitNum = GetSplitNumber(axis, coordinateWidth, dataZoom);
             if (axis.IsCategory())
             {
-                var data = axis.GetDataList();
+                var data = axis.GetDataList(dataZoom);
                 int tick = Mathf.RoundToInt(data.Count * 1f / splitNum);
                 if (axis.boundaryGap)
                     return Mathf.CeilToInt(data.Count * 1.0f / tick) + 1;
@@ -246,7 +246,7 @@ namespace XCharts
             }
             else
             {
-                var data = axis.GetDataList();
+                var data = axis.GetDataList(dataZoom);
                 if (axis.IsCategory() && data.Count > 0)
                 {
                     int tick = Mathf.RoundToInt(data.Count * 1f / splitNum);
@@ -270,7 +270,7 @@ namespace XCharts
 
         public static float GetEachWidth(Axis axis, float coordinateWidth, DataZoom dataZoom = null)
         {
-            var data = axis.GetDataList();
+            var data = axis.GetDataList(dataZoom);
             if (data.Count > 0)
             {
                 var count = axis.boundaryGap ? data.Count : data.Count - 1;