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

修复SerieData单独添加ItemStyle后设置itemFormatter不生效的问题

Browse Source
This commit is contained in:
monitor1394
2023-08-11 07:41:02 +08:00
parent 9ed80d3b59
commit 95dddd9448
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Serie/SerieHelper.cs
View File

@@ -436,14 +436,14 @@ namespace XCharts.Runtime
public static ItemStyle GetItemStyle(Serie serie, SerieData serieData, SerieState state = SerieState.Auto) public static ItemStyle GetItemStyle(Serie serie, SerieData serieData, SerieState state = SerieState.Auto)
{ {
if (state == SerieState.Auto) state = GetSerieState(serie, serieData); if (state == SerieState.Auto) state = GetSerieState(serie, serieData);
if (state == SerieState.Normal) var stateStyle = GetStateStyle(serie, serieData, state);
if (stateStyle == null || !stateStyle.show)
{ {
return serieData != null && serieData.itemStyle != null ? serieData.itemStyle : serie.itemStyle; return serieData != null && serieData.itemStyle != null ? serieData.itemStyle : serie.itemStyle;
} }
else else
{ {
var stateStyle = GetStateStyle(serie, serieData, state); return stateStyle.itemStyle;
return stateStyle == null || !stateStyle.show ? serie.itemStyle : stateStyle.itemStyle;
} }
} }