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

[feature][formatter] support {d3}

Browse Source
This commit is contained in:
monitor1394
2022-08-25 13:37:36 +08:00
parent 34dd3d1c4e
commit 9552e877ce
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -58,6 +58,7 @@
## master ## master
* (2022.08.25) 增加`formatter`对`{d3}`指定维度数据百分比的支持
* (2022.08.24) 修复`ScatterChart`的`label`不刷新的问题 * (2022.08.24) 修复`ScatterChart`的`label`不刷新的问题
* (2022.08.24) 修复`MarkLine`的`label`某些情况下显示异常的问题 * (2022.08.24) 修复`MarkLine`的`label`某些情况下显示异常的问题

1
Runtime/Component/Tooltip/Tooltip.cs
View File

@@ -189,6 +189,7 @@ namespace XCharts.Runtime
/// {g}为当前所指示的serie的数据总个数。</br> /// {g}为当前所指示的serie的数据总个数。</br>
/// {c0}表示当前数据项维度为0的数据。</br> /// {c0}表示当前数据项维度为0的数据。</br>
/// {c1}表示当前数据项维度为1的数据。</br> /// {c1}表示当前数据项维度为1的数据。</br>
/// {d3}表示维度3的数据的百分比。它的分母是默认维度（一般是1维度）数据。</br>
/// |表示多个列的分隔。<br> /// |表示多个列的分隔。<br>
/// 示例："{i}", "{.}|{a}|{c}", "{.}|{b}|{c2:f2}" /// 示例："{i}", "{.}|{a}|{c}", "{.}|{b}|{c2:f2}"
/// </summary> /// </summary>

4
Runtime/Helper/FormatterHelper.cs
View File

@@ -205,7 +205,9 @@ namespace XCharts.Runtime
} }
else if (p == 'd' || p == 'D') else if (p == 'd' || p == 'D')
{ {
var rate = total == 0 ? 0 : value / total * 100; var rate = pIndex >= 0 && serieData != null ?
(value == 0 ? 0 : serieData.GetData(pIndex) / value * 100) :
(total == 0 ? 0 : value / total * 100);
content = content.Replace(old, ChartCached.NumberToStr(rate, numericFormatter)); content = content.Replace(old, ChartCached.NumberToStr(rate, numericFormatter));
} }
else if (p == 'c' || p == 'C') else if (p == 'c' || p == 'C')