foldcc/XCharts
1
0
Fork 0
mirror of https://github.com/XCharts-Team/XCharts.git synced 2026-05-28 20:28:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

增加SerieData可单独添加Label的支持

Browse Source
This commit is contained in:
monitor1394
2023-11-30 22:36:24 +08:00
parent 0a19b2a6cc
commit 735e36d6e5
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation~/zh/changelog.md
View File

@@ -83,6 +83,7 @@ slug: /changelog
日志详情： 日志详情：
* (2023.11.30) 增加`SerieData`可单独添加`Label`的支持
* (2023.11.28) 修复`Tooltip`在对数轴时指示不准确的问题 * (2023.11.28) 修复`Tooltip`在对数轴时指示不准确的问题
* (2023.11.24) 修复`Chart`的`UpdateData()`接口返回值不准确的问题 * (2023.11.24) 修复`Chart`的`UpdateData()`接口返回值不准确的问题
* (2023.11.24) 修复`Axis`的更新数据时效果不顺畅的问题 * (2023.11.24) 修复`Axis`的更新数据时效果不顺畅的问题

12
Runtime/Serie/SerieHelper.cs
View File

@@ -469,7 +469,9 @@ namespace XCharts.Runtime
else else
{ {
var stateStyle = GetStateStyle(serie, serieData, state); var stateStyle = GetStateStyle(serie, serieData, state);
return stateStyle == null || !stateStyle.show ? serie.label : stateStyle.label; if (stateStyle != null && stateStyle.show) return stateStyle.label;
else if (serieData.labelStyle != null) return serieData.labelStyle;
else return serie.label;
} }
} }
@@ -483,7 +485,9 @@ namespace XCharts.Runtime
else else
{ {
var stateStyle = GetStateStyle(serie, serieData, state); var stateStyle = GetStateStyle(serie, serieData, state);
return stateStyle == null || !stateStyle.show ? serie.labelLine : stateStyle.labelLine; if (stateStyle != null && stateStyle.show) return stateStyle.labelLine;
else if (serieData.labelLine != null) return serieData.labelLine;
else return serie.labelLine;
} }
} }
@@ -497,7 +501,9 @@ namespace XCharts.Runtime
else else
{ {
var stateStyle = GetStateStyle(serie, serieData, state); var stateStyle = GetStateStyle(serie, serieData, state);
return stateStyle == null || !stateStyle.show ? serie.symbol : stateStyle.symbol; if (stateStyle != null && stateStyle.show) return stateStyle.symbol;
else if (serieData.symbol != null) return serieData.symbol;
else return serie.symbol;
} }
} }