From ae9cc37592841ade4a7e2b61a3f8edfdb67de039 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Fri, 3 Dec 2021 08:38:00 +0800 Subject: [PATCH] Fixed axis boundaryGap display error #174 --- CHANGELOG-EN.md | 3 ++- CHANGELOG.md | 1 + Runtime/Helper/AxisHelper.cs | 12 ++++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGELOG-EN.md b/CHANGELOG-EN.md index d82b52d5..31e7aa6a 100644 --- a/CHANGELOG-EN.md +++ b/CHANGELOG-EN.md @@ -41,7 +41,8 @@ ## branch-2.0 -* (2021.11.30) Fixed serie ignore display error #173 +* (2021.12.03) Fixed axis boundaryGap display error in some cases #174 +* (2021.11.30) Fixed serie ignore display error in some cases #173 ## v2.5.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index f4d6427b..011fd8e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ ## branch-2.0 +* (2021.12.03) 修复`Axis`的`boundaryGap`某些情况下显示的问题 #174 * (2021.11.30) 修复`Serie`的`ignore`某些情况下绘制异常的问题 #173 ## v2.5.0 diff --git a/Runtime/Helper/AxisHelper.cs b/Runtime/Helper/AxisHelper.cs index 9d8426b7..fd5585a5 100644 --- a/Runtime/Helper/AxisHelper.cs +++ b/Runtime/Helper/AxisHelper.cs @@ -214,17 +214,21 @@ namespace XCharts if (splitNum == 0) return 0; if (axis.IsCategory()) { - var data = axis.GetDataList(dataZoom); + var dataCount = axis.GetDataList(dataZoom).Count; var scaleNum = 0; if (axis.boundaryGap) { - scaleNum = data.Count % splitNum == 0 ? splitNum + 1 : splitNum + 2; + scaleNum = dataCount > 2 && dataCount % splitNum == 0 + ? splitNum + 1 + : splitNum + 2; } else { - if (data.Count < splitNum) scaleNum = splitNum; - else scaleNum = data.Count % splitNum == 0 ? splitNum : splitNum + 1; + if (dataCount < splitNum) scaleNum = splitNum; + else scaleNum = dataCount > 2 && dataCount % splitNum == 0 + ? splitNum + : splitNum + 1; } return scaleNum; }