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

增加AxisLabel和SerieLabel的formatter可单独配置数值格式化#68

Browse Source
This commit is contained in:
monitor1394
2020-07-21 09:13:51 +08:00
parent 4bb662043c
commit 58ab97c2a0
6 changed files with 70 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Runtime/Component/Sub/AxisLabel.cs
View File

@@ -253,27 +253,11 @@ namespace XCharts
}
return ChartCached.NumberToStr(value, numericFormatter);
}
else if (m_Formatter.Contains("{value"))
{
var content = m_Formatter;
if (content.Contains("{value:f0}"))
content = m_Formatter.Replace("{value:f0}", ChartCached.IntToStr((int)value));
if (content.Contains("{value:f2}"))
content = m_Formatter.Replace("{value:f2}", ChartCached.FloatToStr(value, string.Empty, 2));
else if (content.Contains("{value:f1}"))
content = m_Formatter.Replace("{value:f1}", ChartCached.FloatToStr(value, string.Empty, 1));
else if (content.Contains("{value}"))
{
content = m_Formatter.Replace("{value}", ChartCached.NumberToStr((int)value, numericFormatter));
}
content = content.Replace("\\n", "\n");
content = content.Replace("<br/>", "\n");
return content;
}
else
{
return value.ToString(m_Formatter);
var content = m_Formatter;
FormatterHelper.ReplaceAxisLabelContent(ref content, numericFormatter, value);
return content;
}
}
}

2
Runtime/Component/Sub/SerieAnimation.cs
View File

@@ -205,7 +205,6 @@ namespace XCharts
if (fadeInFinishCallback != null)
{
fadeInFinishCallback();
fadeInFinishCallback = null;
}
}
if (m_FadeOut)
@@ -215,7 +214,6 @@ namespace XCharts
if (fadeOutFinishCallback != null)
{
fadeOutFinishCallback();
fadeOutFinishCallback = null;
}
}
}