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

增加Radar对通配符{b}的支持

Browse Source
This commit is contained in:
monitor1394
2023-04-12 22:50:05 +08:00
parent 5fe12dcde7
commit a038317c6e
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation~/zh/changelog.md
View File

@@ -66,6 +66,7 @@ slug: /changelog
## master ## master
* (2023.04.12) 增加`RadarChart`对通配符`{b}`的支持
* (2023.04.11) 修复动态添加组件时`Inspector`可能异常的问题 * (2023.04.11) 修复动态添加组件时`Inspector`可能异常的问题
## v3.6.0 ## v3.6.0

7
Runtime/Component/Radar/RadarCoord.cs
View File

@@ -429,6 +429,13 @@ namespace XCharts.Runtime
return indicatorList[indicatorIndex]; return indicatorList[indicatorIndex];
} }
public string GetIndicatorName(int indicatorIndex)
{
var indicator = GetIndicator(indicatorIndex);
if (indicator == null) return string.Empty;
return indicator.name;
}
public override void ClearData() public override void ClearData()
{ {
indicatorList.Clear(); indicatorList.Clear();

10
Runtime/Serie/Radar/RadarHandler.cs
View File

@@ -38,18 +38,19 @@ namespace XCharts.Runtime
if (dataIndex < 0) if (dataIndex < 0)
return; return;
var radar = chart.GetChartComponent<RadarCoord>(serie.radarIndex);
if (radar == null)
return;
if (serie.radarType == RadarType.Single) if (serie.radarType == RadarType.Single)
{ {
var colorIndex1 = serie.colorByData ? dataIndex : serie.context.colorIndex; var colorIndex1 = serie.colorByData ? dataIndex : serie.context.colorIndex;
category = radar.GetIndicatorName(dataIndex);
UpdateItemSerieParams(ref paramList, ref title, dataIndex, category, UpdateItemSerieParams(ref paramList, ref title, dataIndex, category,
marker, itemFormatter, numericFormatter, ignoreDataDefaultContent, 1, colorIndex1); marker, itemFormatter, numericFormatter, ignoreDataDefaultContent, 1, colorIndex1);
return; return;
} }
var radar = chart.GetChartComponent<RadarCoord>(serie.radarIndex);
if (radar == null)
return;
var serieData = serie.GetSerieData(dataIndex); var serieData = serie.GetSerieData(dataIndex);
if (serieData == null) if (serieData == null)
return; return;
@@ -72,6 +73,7 @@ namespace XCharts.Runtime
param.value = serieData.GetData(i); param.value = serieData.GetData(i);
param.total = indicator.max; param.total = indicator.max;
param.color = color; param.color = color;
param.category = radar.GetIndicatorName(i);
param.marker = SerieHelper.GetItemMarker(serie, serieData, marker); param.marker = SerieHelper.GetItemMarker(serie, serieData, marker);
param.itemFormatter = SerieHelper.GetItemFormatter(serie, serieData, itemFormatter); param.itemFormatter = SerieHelper.GetItemFormatter(serie, serieData, itemFormatter);
param.numericFormatter = SerieHelper.GetNumericFormatter(serie, serieData, numericFormatter); param.numericFormatter = SerieHelper.GetNumericFormatter(serie, serieData, numericFormatter);