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

增加Serie的Label的formatter支持{index}通配符

Browse Source
This commit is contained in:
monitor1394
2025-03-19 23:03:11 +08:00
parent 4c001c8130
commit 62f071e5a9
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation~/zh/changelog.md
View File

@@ -80,6 +80,7 @@ slug: /changelog
## master ## master
* (2025.03.19) 增加`Serie`的`Label`的`formatter`支持`{index}`通配符
* (2025.03.18) 增加`Bar`可添加`TitleStyle`组件支持 * (2025.03.18) 增加`Bar`可添加`TitleStyle`组件支持
* (2025.03.18) 增加`LabelStyle`的`fixedX`和`fixedY`可固定label的坐标 * (2025.03.18) 增加`LabelStyle`的`fixedX`和`fixedY`可固定label的坐标
* (2025.03.17) 增加`ItemStyle`的`backgroundGap`可设置数据项背景间隙 * (2025.03.17) 增加`ItemStyle`的`backgroundGap`可设置数据项背景间隙

2
Runtime/Component/Label/SerieLabelHelper.cs
View File

@@ -45,7 +45,7 @@ namespace XCharts.Runtime
{ {
var content = serieLabel.formatter; var content = serieLabel.formatter;
FormatterHelper.ReplaceSerieLabelContent(ref content, numericFormatter, serie.dataCount, dataValue, FormatterHelper.ReplaceSerieLabelContent(ref content, numericFormatter, serie.dataCount, dataValue,
dataTotal, serieName, dataName, dataName, color, serieData, chart, serie.index); dataTotal, serieName, dataName, dataName, color, serieData, chart, serie.index, serie.useSortData);
if (serieLabel.formatterFunction == null) if (serieLabel.formatterFunction == null)
return content; return content;
else else

4
Runtime/Helper/FormatterHelper.cs
View File

@@ -212,7 +212,8 @@ namespace XCharts.Runtime
} }
public static void ReplaceSerieLabelContent(ref string content, string numericFormatter, int dataCount, double value, double total, public static void ReplaceSerieLabelContent(ref string content, string numericFormatter, int dataCount, double value, double total,
string serieName, string category, string dataName, Color color, SerieData serieData, BaseChart chart = null, int serieIndex = 0) string serieName, string category, string dataName, Color color, SerieData serieData, BaseChart chart = null, int serieIndex = 0,
bool sortData = false)
{ {
var mc = s_RegexForSerieLabel.Matches(content); var mc = s_RegexForSerieLabel.Matches(content);
foreach (var m in mc) foreach (var m in mc)
@@ -309,6 +310,7 @@ namespace XCharts.Runtime
} }
} }
} }
ReplaceIndexContent(ref content, sortData ? serieData.sortIndex : serieData.index, dataCount);
content = TrimAndReplaceLine(content); content = TrimAndReplaceLine(content);
} }