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

修复serieData的Label设置numericFormatter无效的问题

Browse Source
This commit is contained in:
monitor1394
2020-08-13 12:29:24 +08:00
parent 18be460bee
commit dbbe6de544
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Assets/XCharts/Runtime/Internal/Helper/SerieLabelHelper.cs
View File

@@ -97,7 +97,7 @@ namespace XCharts
{ {
serieLabel = SerieHelper.GetSerieLabel(serie, serieData); serieLabel = SerieHelper.GetSerieLabel(serie, serieData);
} }
var numericFormatter = GetLabelNumericFormatter(serie, serieData); var numericFormatter = serieLabel == null ? serie.label.numericFormatter : serieLabel.numericFormatter;
var serieName = serie.name; var serieName = serie.name;
var dataName = serieData != null ? serieData.name : null; var dataName = serieData != null ? serieData.name : null;
if (string.IsNullOrEmpty(serieLabel.formatter)) if (string.IsNullOrEmpty(serieLabel.formatter))
@@ -111,14 +111,6 @@ namespace XCharts
} }
} }
private static string GetLabelNumericFormatter(Serie serie, SerieData serieData)
{
var itemStyle = SerieHelper.GetItemStyle(serie, serieData);
if (!string.IsNullOrEmpty(itemStyle.numericFormatter)) return itemStyle.numericFormatter;
else return serie.label.numericFormatter;
}
private static void SetGaugeLabelText(Serie serie) private static void SetGaugeLabelText(Serie serie)
{ {
var serieData = serie.GetSerieData(0); var serieData = serie.GetSerieData(0);
@@ -280,6 +272,7 @@ namespace XCharts
} }
if (!serieData.show) return; if (!serieData.show) return;
var serieLabel = SerieHelper.GetSerieLabel(serie, serieData); var serieLabel = SerieHelper.GetSerieLabel(serie, serieData);
if (!serieLabel.show) return;
if (serieLabel.position != SerieLabel.Position.Outside) return; if (serieLabel.position != SerieLabel.Position.Outside) return;
if (lastCheckPos == Vector3.zero) if (lastCheckPos == Vector3.zero)
{ {