From e77c9fd327636b1f86f7fc309f666a8d100e87c8 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Sun, 14 Jun 2020 17:04:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96Tooltip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/XCharts/Runtime/Helper/FormatterHelper.cs | 6 ++++++ Assets/XCharts/Runtime/Internal/Helper/TooltipHelper.cs | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Assets/XCharts/Runtime/Helper/FormatterHelper.cs b/Assets/XCharts/Runtime/Helper/FormatterHelper.cs index 5fca6245..3330fed8 100644 --- a/Assets/XCharts/Runtime/Helper/FormatterHelper.cs +++ b/Assets/XCharts/Runtime/Helper/FormatterHelper.cs @@ -56,6 +56,12 @@ namespace XCharts { targetIndex = serie.index; } + else + { + serie = series.GetSerie(0); + targetIndex = 0; + } + if (serie == null) continue; if (p == '.') { var bIndex = targetIndex; diff --git a/Assets/XCharts/Runtime/Internal/Helper/TooltipHelper.cs b/Assets/XCharts/Runtime/Internal/Helper/TooltipHelper.cs index feb762a9..de0a4b46 100644 --- a/Assets/XCharts/Runtime/Internal/Helper/TooltipHelper.cs +++ b/Assets/XCharts/Runtime/Internal/Helper/TooltipHelper.cs @@ -45,6 +45,7 @@ namespace XCharts private static void InitPieTooltip(ref StringBuilder sb, Tooltip tooltip, Serie serie, int index, ThemeInfo themeInfo) { + if (tooltip.runtimeDataIndex[serie.index] < 0) return; string key = serie.data[index].name; var serieData = serie.GetSerieData(index); var numericFormatter = GetItemNumericFormatter(tooltip, serie, serieData); @@ -234,7 +235,7 @@ namespace XCharts } } } - else + else if (tooltip.runtimeDataIndex[serie.index] >= 0) { var serieData = serie.GetSerieData(dataIndex, dataZoom); if (serieData == null) continue; @@ -256,7 +257,8 @@ namespace XCharts string content = itemFormatter; FormatterHelper.ReplaceContent(ref content, dataIndex, tooltip.numericFormatter, serie, series, themeInfo, category, dataZoom); if (!first) sb.Append(FormatterHelper.PH_NN); - sb.Append(ChartCached.ColorToDotStr(themeInfo.GetColor(i))); + var dotColorIndex = serie.type == SerieType.Pie || serie.type == SerieType.Radar || serie.type == SerieType.Ring ? dataIndex : i; + sb.Append(ChartCached.ColorToDotStr(themeInfo.GetColor(dotColorIndex))); sb.Append(content); first = false; }