From f1404fdcf3b52cde15d687abc1decc82e4638bed Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Thu, 13 Aug 2020 12:29:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DserieData=E7=9A=84Label?= =?UTF-8?q?=E8=AE=BE=E7=BD=AEnumericFormatter=E6=97=A0=E6=95=88=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Runtime/Internal/Helper/SerieLabelHelper.cs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Runtime/Internal/Helper/SerieLabelHelper.cs b/Runtime/Internal/Helper/SerieLabelHelper.cs index 923cafae..5585fad3 100644 --- a/Runtime/Internal/Helper/SerieLabelHelper.cs +++ b/Runtime/Internal/Helper/SerieLabelHelper.cs @@ -97,7 +97,7 @@ namespace XCharts { serieLabel = SerieHelper.GetSerieLabel(serie, serieData); } - var numericFormatter = GetLabelNumericFormatter(serie, serieData); + var numericFormatter = serieLabel == null ? serie.label.numericFormatter : serieLabel.numericFormatter; var serieName = serie.name; var dataName = serieData != null ? serieData.name : null; 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) { var serieData = serie.GetSerieData(0); @@ -280,6 +272,7 @@ namespace XCharts } if (!serieData.show) return; var serieLabel = SerieHelper.GetSerieLabel(serie, serieData); + if (!serieLabel.show) return; if (serieLabel.position != SerieLabel.Position.Outside) return; if (lastCheckPos == Vector3.zero) {