优化Tooltip

This commit is contained in:
monitor1394
2020-06-14 17:04:50 +08:00
parent d694c5d9f1
commit e77c9fd327
2 changed files with 10 additions and 2 deletions

View File

@@ -56,6 +56,12 @@ namespace XCharts
{ {
targetIndex = serie.index; targetIndex = serie.index;
} }
else
{
serie = series.GetSerie(0);
targetIndex = 0;
}
if (serie == null) continue;
if (p == '.') if (p == '.')
{ {
var bIndex = targetIndex; var bIndex = targetIndex;

View File

@@ -45,6 +45,7 @@ namespace XCharts
private static void InitPieTooltip(ref StringBuilder sb, Tooltip tooltip, Serie serie, int index, private static void InitPieTooltip(ref StringBuilder sb, Tooltip tooltip, Serie serie, int index,
ThemeInfo themeInfo) ThemeInfo themeInfo)
{ {
if (tooltip.runtimeDataIndex[serie.index] < 0) return;
string key = serie.data[index].name; string key = serie.data[index].name;
var serieData = serie.GetSerieData(index); var serieData = serie.GetSerieData(index);
var numericFormatter = GetItemNumericFormatter(tooltip, serie, serieData); 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); var serieData = serie.GetSerieData(dataIndex, dataZoom);
if (serieData == null) continue; if (serieData == null) continue;
@@ -256,7 +257,8 @@ namespace XCharts
string content = itemFormatter; string content = itemFormatter;
FormatterHelper.ReplaceContent(ref content, dataIndex, tooltip.numericFormatter, serie, series, themeInfo, category, dataZoom); FormatterHelper.ReplaceContent(ref content, dataIndex, tooltip.numericFormatter, serie, series, themeInfo, category, dataZoom);
if (!first) sb.Append(FormatterHelper.PH_NN); 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); sb.Append(content);
first = false; first = false;
} }