diff --git a/CHANGELOG.md b/CHANGELOG.md index d12b4bfc..4f1b8834 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,7 @@ ## master +* (2022.08.25) 优化`EmphasisStyle`对`label`的支持 * (2022.08.25) 增加`formatter`对`{d3}`指定维度数据百分比的支持 * (2022.08.24) 修复`ScatterChart`的`label`不刷新的问题 * (2022.08.24) 修复`MarkLine`的`label`某些情况下显示异常的问题 diff --git a/Runtime/Serie/SerieHandler.cs b/Runtime/Serie/SerieHandler.cs index 520fe7c6..62d0e05e 100644 --- a/Runtime/Serie/SerieHandler.cs +++ b/Runtime/Serie/SerieHandler.cs @@ -239,7 +239,7 @@ namespace XCharts.Runtime if (count == -1) count = serie.dataCount; var serieLabel = SerieHelper.GetSerieLabel(serie, serieData); - if (serieLabel == null || !serieLabel.show) + if (serieLabel == null) { return false; } @@ -401,7 +401,7 @@ namespace XCharts.Runtime SerieLabelHelper.GetFormatterContent(serie, serieData, value, total, currLabel, color); var offset = GetSerieDataLabelOffset(serieData, currLabel); - labelObject.SetActive(!isIgnore); + labelObject.SetActive(currLabel.show && !isIgnore); labelObject.SetText(content); labelObject.SetPosition(serieData.context.dataPoints[i] + offset); labelObject.UpdateIcon(currLabel.icon); @@ -422,7 +422,7 @@ namespace XCharts.Runtime ChartCached.NumberToStr(value, currLabel.numericFormatter) : SerieLabelHelper.GetFormatterContent(serie, serieData, value, total, currLabel, color); - serieData.SetLabelActive(!isIgnore); + serieData.SetLabelActive(currLabel.show && !isIgnore); serieData.labelObject.UpdateIcon(currLabel.icon); serieData.labelObject.SetText(content); UpdateLabelPosition(serieData, currLabel); diff --git a/Runtime/Serie/SerieHelper.cs b/Runtime/Serie/SerieHelper.cs index ea5cff22..e9e77d9c 100644 --- a/Runtime/Serie/SerieHelper.cs +++ b/Runtime/Serie/SerieHelper.cs @@ -433,7 +433,7 @@ namespace XCharts.Runtime else { var stateStyle = GetStateStyle(serie, serieData, state); - return stateStyle == null?serie.itemStyle : stateStyle.itemStyle; + return stateStyle == null || !stateStyle.show ? serie.itemStyle : stateStyle.itemStyle; } } @@ -447,7 +447,7 @@ namespace XCharts.Runtime else { var stateStyle = GetStateStyle(serie, serieData, state); - return stateStyle == null?serie.label : stateStyle.label; + return stateStyle == null || !stateStyle.show ? serie.label : stateStyle.label; } } @@ -461,7 +461,7 @@ namespace XCharts.Runtime else { var stateStyle = GetStateStyle(serie, serieData, state); - return stateStyle == null?serie.labelLine : stateStyle.labelLine; + return stateStyle == null || !stateStyle.show ? serie.labelLine : stateStyle.labelLine; } } @@ -475,7 +475,7 @@ namespace XCharts.Runtime else { var stateStyle = GetStateStyle(serie, serieData, state); - return stateStyle == null?serie.symbol : stateStyle.symbol; + return stateStyle == null || !stateStyle.show ? serie.symbol : stateStyle.symbol; } } @@ -533,7 +533,7 @@ namespace XCharts.Runtime Serie serie, SerieData serieData, ThemeStyle theme, int index) { bool fill; - return GetAreaColor(out color, out toColor, out fill,serie, serieData, theme, index); + return GetAreaColor(out color, out toColor, out fill, serie, serieData, theme, index); } public static bool GetAreaColor(out Color32 color, out Color32 toColor, out bool innerFill,