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

修复Check warning不生效的问题

Browse Source
This commit is contained in:
monitor1394
2020-06-11 09:24:33 +08:00
parent 77fd92d2b0
commit a65ad893eb
4 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/XCharts/CHANGELOG.md
View File

@@ -1,6 +1,8 @@
# 更新日志
* (2020.06.11) 修复`Check warning`不生效的问题
* (2020.06.11) 修复`PieChart`和`RingChart`在数据占比很小时不显示的问题
* (2020.06.11) 增加`Tooltip`的`titleFormatter`支持配置占位符`{i}`表示忽略不显示标题
* (2020.06.07) 增加`Animation`的`customFadeInDelay`等自定义数据项延时和时长回调函数
* (2020.06.07) 优化`PieChart`在数据全为`0`时的显示为等份的效果

2
Assets/XCharts/Editor/BaseChartEditor.cs
View File

@@ -138,7 +138,7 @@ namespace XCharts
if (!string.IsNullOrEmpty(m_Target.warningInfo))
{
sb.AppendLine();
sb.Append(XChartsMgr.Instance.nowVersion);
sb.Append(m_Target.warningInfo);
}
else
{

42
Assets/XCharts/Runtime/Helper/CheckHelper.cs
View File

@@ -108,22 +108,43 @@ namespace XCharts
private static void CheckSerie(BaseChart chart, StringBuilder sb)
{
var allDataIsEmpty = true;
var allDataIsZero = true;
var allSerieIsHide = true;
foreach (var serie in chart.series.list)
{
if (serie.show) allSerieIsHide = false;
if (serie.dataCount > 0)
{
allDataIsEmpty = false;
for (int i = 1; i < serie.dataCount; i++)
{
var serieData = serie.GetSerieData(i);
for (int j = 1; j < serieData.data.Count; j++)
{
if (serieData.GetData(j) != 0)
{
allDataIsZero = false;
break;
}
}
}
var dataCount = serie.GetSerieData(0).data.Count;
if (serie.showDataDimension > 1 && serie.showDataDimension != dataCount)
{
sb.AppendFormat("warning:serie {0} serieData.data.count[{1}] not match showDataDimension[{2}]\n", serie.index, dataCount, serie.showDataDimension);
}
}
else
{
sb.AppendFormat("warning:serie {0} no data\n", serie.index);
}
if (IsColorAlphaZero(serie.itemStyle.color))
sb.AppendFormat("warning:serie {0} itemStyle->color alpha is 0\n", serie.index);
if (serie.itemStyle.opacity == 0)
sb.AppendFormat("warning:serie {0} itemStyle->opacity is 0\n", serie.index);
if (serie.itemStyle.borderWidth != 0 && IsColorAlphaZero(serie.itemStyle.borderColor))
sb.AppendFormat("warning:serie {0} itemStyle->borderColor alpha is 0\n", serie.index);
if (serie.dataCount > 0)
{
var dataCount = serie.GetSerieData(0).data.Count;
if (serie.showDataDimension != dataCount)
{
sb.AppendFormat("warning:serie {0} serieData.data.count[{1}] not match showDataDimension[{2}]\n", serie.index, dataCount, serie.showDataDimension);
}
}
switch (serie.type)
{
case SerieType.Line:
@@ -145,10 +166,13 @@ namespace XCharts
case SerieType.Scatter:
case SerieType.EffectScatter:
if (serie.symbol.type == SerieSymbolType.None)
sb.AppendFormat("warning:symbol type is None");
sb.AppendFormat("warning:serie {0} symbol type is None\n", serie.index);
break;
}
}
if (allDataIsEmpty) sb.Append("warning:all serie data is empty\n");
if (!allDataIsEmpty && allDataIsZero) sb.Append("warning:all serie data is 0\n");
if (allSerieIsHide) sb.Append("warning:all serie is hide\n");
}
}
}

1
Assets/XCharts/Runtime/Internal/Helper/TooltipHelper.cs
View File

@@ -201,7 +201,6 @@ namespace XCharts
{
isScatter = true;
var itemFormatter = GetItemFormatter(tooltip, serie, null);
var numericFormatter = GetItemNumericFormatter(tooltip, serie, null);
if (string.IsNullOrEmpty(itemFormatter))
{
if (!first) sb.Append(FormatterHelper.PH_NN);