修复Check warning不生效的问题

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

View File

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

View File

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

View File

@@ -108,22 +108,43 @@ namespace XCharts
private static void CheckSerie(BaseChart chart, StringBuilder sb) private static void CheckSerie(BaseChart chart, StringBuilder sb)
{ {
var allDataIsEmpty = true;
var allDataIsZero = true;
var allSerieIsHide = true;
foreach (var serie in chart.series.list) 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)) if (IsColorAlphaZero(serie.itemStyle.color))
sb.AppendFormat("warning:serie {0} itemStyle->color alpha is 0\n", serie.index); sb.AppendFormat("warning:serie {0} itemStyle->color alpha is 0\n", serie.index);
if (serie.itemStyle.opacity == 0) if (serie.itemStyle.opacity == 0)
sb.AppendFormat("warning:serie {0} itemStyle->opacity is 0\n", serie.index); sb.AppendFormat("warning:serie {0} itemStyle->opacity is 0\n", serie.index);
if (serie.itemStyle.borderWidth != 0 && IsColorAlphaZero(serie.itemStyle.borderColor)) if (serie.itemStyle.borderWidth != 0 && IsColorAlphaZero(serie.itemStyle.borderColor))
sb.AppendFormat("warning:serie {0} itemStyle->borderColor alpha is 0\n", serie.index); 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) switch (serie.type)
{ {
case SerieType.Line: case SerieType.Line:
@@ -145,10 +166,13 @@ namespace XCharts
case SerieType.Scatter: case SerieType.Scatter:
case SerieType.EffectScatter: case SerieType.EffectScatter:
if (serie.symbol.type == SerieSymbolType.None) 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; 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");
} }
} }
} }

View File

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