From 76b8146e53f4c64a2417c247cbcacb0639b5e133 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Thu, 21 Apr 2022 22:07:07 +0800 Subject: [PATCH] fix datazoom exception --- Assets/XCharts/Runtime/Component/Main/Axis.cs | 10 ++++++---- Assets/XCharts/Runtime/Helper/SerieHelper.cs | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Assets/XCharts/Runtime/Component/Main/Axis.cs b/Assets/XCharts/Runtime/Component/Main/Axis.cs index 1e38ac58..ff909097 100644 --- a/Assets/XCharts/Runtime/Component/Main/Axis.cs +++ b/Assets/XCharts/Runtime/Component/Main/Axis.cs @@ -728,13 +728,15 @@ namespace XCharts filterEnd = end; filterMinShow = dataZoom.minShowNum; m_NeedUpdateFilterData = false; - if (data.Count > 0) + if (data.Count > 0 && filterMinShow < data.Count) { - if (range < dataZoom.minShowNum) + if (range < filterMinShow) { - if (dataZoom.minShowNum > data.Count) range = data.Count; - else range = dataZoom.minShowNum; + if (filterMinShow > data.Count) range = data.Count; + else range = filterMinShow; } + if (range > data.Count - start - 1) + start = data.Count - range - 1; filterData = data.GetRange(start, range); } else diff --git a/Assets/XCharts/Runtime/Helper/SerieHelper.cs b/Assets/XCharts/Runtime/Helper/SerieHelper.cs index a4e8184a..fb520507 100644 --- a/Assets/XCharts/Runtime/Helper/SerieHelper.cs +++ b/Assets/XCharts/Runtime/Helper/SerieHelper.cs @@ -666,6 +666,8 @@ namespace XCharts if (dataZoom.minShowNum > data.Count) range = data.Count; else range = dataZoom.minShowNum; } + if (range > data.Count - start - 1) + start = data.Count - range - 1; serie.m_FilterData = data.GetRange(start, range); } else