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

[feature][tooltip] support {c0} for itemFormatter (#205)

Browse Source
This commit is contained in:
monitor1394
2022-06-29 13:33:38 +08:00
parent 0f2f55e436
commit bb9f28dd5c
12 changed files with 72 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Runtime/Helper/FormatterHelper.cs
View File

@@ -16,8 +16,8 @@ namespace XCharts.Runtime
private static Regex s_RegexNewLine = new Regex(@"[\\|/]+n|</br>|<br>|<br/>", RegexOptions.IgnoreCase);
private static Regex s_RegexForAxisLabel = new Regex(@"{value(:[c-g|x|p|r]\d*)?}", RegexOptions.IgnoreCase);
private static Regex s_RegexSubForAxisLabel = new Regex(@"(value)|([c-g|x|p|r]\d*)", RegexOptions.IgnoreCase);
private static Regex s_RegexForSerieLabel = new Regex(@"{[a-g|\.](:[c-g|x|p|r]\d*)?}", RegexOptions.IgnoreCase);
private static Regex s_RegexSubForSerieLabel = new Regex(@"(\.)|([a-g])|([c-g|x|p|r]\d*)", RegexOptions.IgnoreCase);
private static Regex s_RegexForSerieLabel = new Regex(@"{[a-g|\.]\d*(:[c-g|x|p|r]\d*)?}", RegexOptions.IgnoreCase);
private static Regex s_RegexSubForSerieLabel = new Regex(@"(\.)|([a-g]\d*)|([c-g|x|p|r]\d*)", RegexOptions.IgnoreCase);
public static bool NeedFormat(string content)
{
@@ -41,6 +41,7 @@ namespace XCharts.Runtime
{
var foundDot = false;
var mc = s_Regex.Matches(content);
Debug.LogError("context:" + content);
foreach (var m in mc)
{
var old = m.ToString();
@@ -167,7 +168,7 @@ namespace XCharts.Runtime
}
public static void ReplaceSerieLabelContent(ref string content, string numericFormatter, int dataCount, double value, double total,
string serieName, string category, string dataName, Color color)
string serieName, string category, string dataName, Color color, SerieData serieData)
{
var mc = s_RegexForSerieLabel.Matches(content);
foreach (var m in mc)
@@ -176,7 +177,13 @@ namespace XCharts.Runtime
var args = s_RegexSubForSerieLabel.Matches(old);
var argsCount = args.Count;
if (argsCount <= 0) continue;
var p = args[0].ToString().ElementAt(0);
var pstr = args[0].ToString();
var p = pstr.ElementAt(0);
var pIndex = -1;
if (pstr.Length > 1)
{
int.TryParse(pstr.Substring(1, pstr.Length - 1), out pIndex);
}
if (argsCount >= 2)
{
numericFormatter = args[1].ToString();
@@ -204,7 +211,10 @@ namespace XCharts.Runtime
}
else if (p == 'c' || p == 'C')
{
content = content.Replace(old, ChartCached.NumberToStr(value, numericFormatter));
if (pIndex >= 0 && serieData != null)
content = content.Replace(old, ChartCached.NumberToStr(serieData.GetData(pIndex), numericFormatter));
else
content = content.Replace(old, ChartCached.NumberToStr(value, numericFormatter));
}
else if (p == 'f' || p == 'f')
{

2
Runtime/Helper/SerieLabelHelper.cs
View File

@@ -53,7 +53,7 @@ namespace XCharts.Runtime
{
var content = serieLabel.formatter;
FormatterHelper.ReplaceSerieLabelContent(ref content, numericFormatter, serie.dataCount, dataValue,
dataTotal, serieName, dataName, dataName, color);
dataTotal, serieName, dataName, dataName, color, serieData);
return content;
}
}