From a1ba6b095de2627816a15ecb2728d2d0234d6c40 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Mon, 10 Mar 2025 08:40:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0`Bar`=E7=9A=84`realtimeSort`?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=AE=9E=E6=97=B6=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Runtime/Component/Axis/AxisHandler.cs | 6 +++--- Runtime/Component/Axis/AxisHelper.cs | 2 +- Runtime/Internal/BaseChart.Serie.cs | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Runtime/Component/Axis/AxisHandler.cs b/Runtime/Component/Axis/AxisHandler.cs index 7129ea9e..f77f51b9 100644 --- a/Runtime/Component/Axis/AxisHandler.cs +++ b/Runtime/Component/Axis/AxisHandler.cs @@ -150,7 +150,7 @@ namespace XCharts axis.context.minValue = 0; axis.context.maxValue = axis.data.Count > 0 ? axis.data.Count - 1 : SeriesHelper.GetMaxSerieDataCount(chart.series) - 1; axis.context.minMaxRange = axis.context.maxValue; - if (chart.HasRealtimeSortSerie()) + if (chart.HasRealtimeSortSerie(axis.gridIndex)) { UpdateAxisLabelText(axis); } @@ -478,7 +478,7 @@ namespace XCharts if (axis.IsCategory() && axis.boundaryGap) splitNumber -= 1; axis.context.aligment = defaultAlignment; - var sortSerie = chart.GetRealtimeSortSerie(); + var sortSerie = chart.GetRealtimeSortSerie(axis.gridIndex); if (sortSerie != null) { SerieHelper.UpdateSerieRuntimeFilterData(sortSerie); @@ -598,7 +598,7 @@ namespace XCharts if (axis.IsCategory() && axis.boundaryGap) splitNumber -= 1; axis.context.aligment = defaultAlignment; - var sortSerie = chart.GetRealtimeSortSerie(); + var sortSerie = chart.GetRealtimeSortSerie(axis.gridIndex); if (sortSerie != null) { SerieHelper.UpdateSerieRuntimeFilterData(sortSerie); diff --git a/Runtime/Component/Axis/AxisHelper.cs b/Runtime/Component/Axis/AxisHelper.cs index 7c294b7f..03fe5fdb 100644 --- a/Runtime/Component/Axis/AxisHelper.cs +++ b/Runtime/Component/Axis/AxisHelper.cs @@ -119,7 +119,7 @@ namespace XCharts.Runtime DataZoom dataZoom, bool forcePercent, int sortIndex = -1) { int split = GetSplitNumber(axis, coordinateWidth, dataZoom); - if(sortIndex == -1) sortIndex = index; + if (sortIndex == -1) sortIndex = index; if (axis.type == Axis.AxisType.Value) { if (minValue == 0 && maxValue == 0) diff --git a/Runtime/Internal/BaseChart.Serie.cs b/Runtime/Internal/BaseChart.Serie.cs index 86412ddc..4063d5fe 100644 --- a/Runtime/Internal/BaseChart.Serie.cs +++ b/Runtime/Internal/BaseChart.Serie.cs @@ -101,20 +101,22 @@ namespace XCharts.Runtime return false; } - public bool HasRealtimeSortSerie() + public bool HasRealtimeSortSerie(int gridIndex) { foreach (var serie in m_Series) { + if (!CheckSerieGridIndex(serie, gridIndex)) continue; if (serie.useSortData) return true; } return false; } - public Serie GetRealtimeSortSerie() + public Serie GetRealtimeSortSerie(int gridIndex) { foreach (var serie in m_Series) { + if (!CheckSerieGridIndex(serie, gridIndex)) continue; if (serie.useSortData) return serie; }