From e7f19e72a543463eaa9c5065097d0f490b298b61 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Tue, 2 Aug 2022 13:03:33 +0800 Subject: [PATCH] update serie label --- Runtime/Serie/SerieHelper.cs | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/Runtime/Serie/SerieHelper.cs b/Runtime/Serie/SerieHelper.cs index 9373e8fd..e889a2f8 100644 --- a/Runtime/Serie/SerieHelper.cs +++ b/Runtime/Serie/SerieHelper.cs @@ -440,15 +440,29 @@ namespace XCharts.Runtime public static LabelStyle GetSerieLabel(Serie serie, SerieData serieData, SerieState state = SerieState.Auto) { if (state == SerieState.Auto) state = GetSerieState(serie, serieData); - var stateStyle = GetStateStyle(serie, serieData, state); - return stateStyle == null?serie.label : stateStyle.label; + if (state == SerieState.Normal) + { + return serieData != null && serieData.labelStyle != null? serieData.labelStyle : serie.label; + } + else + { + var stateStyle = GetStateStyle(serie, serieData, state); + return stateStyle == null?serie.label : stateStyle.label; + } } public static LabelLine GetSerieLabelLine(Serie serie, SerieData serieData, SerieState state = SerieState.Auto) { if (state == SerieState.Auto) state = GetSerieState(serie, serieData); - var stateStyle = GetStateStyle(serie, serieData, state); - return stateStyle == null?serie.labelLine : stateStyle.labelLine; + if (state == SerieState.Normal) + { + return serieData != null && serieData.labelLine != null? serieData.labelLine : serie.labelLine; + } + else + { + var stateStyle = GetStateStyle(serie, serieData, state); + return stateStyle == null?serie.labelLine : stateStyle.labelLine; + } } public static SerieSymbol GetSerieSymbol(Serie serie, SerieData serieData, SerieState state = SerieState.Auto)