diff --git a/CHANGELOG.md b/CHANGELOG.md index 64d9a9ef..0f259304 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,6 +54,7 @@ ## master +* (2022.07.02) 修复`PieChart`用代码动态创建时`Legend`不正常的问题 (#206) * (2022.07.02) 修复`YAxis`的`AxisLabel`设置`onZero`不生效的问题 * (2022.07.02) 修复`AxisLabel`代码设置`distance`属性后一直刷新的问题 * (2022.06.30) 修复`Runtime`下代码创建图表时组件无法初始化的问题 diff --git a/Runtime/Component/Axis/AxisHandler.cs b/Runtime/Component/Axis/AxisHandler.cs index 109fa876..60ea3238 100644 --- a/Runtime/Component/Axis/AxisHandler.cs +++ b/Runtime/Component/Axis/AxisHandler.cs @@ -272,7 +272,7 @@ namespace XCharts list.Add(value); value += tick; - if (list.Count > 20) + if (list.Count > 100) break; } if (!ChartHelper.IsEquals(axis.context.maxValue, list[list.Count - 1])) diff --git a/Runtime/Component/Legend/LegendHelper.cs b/Runtime/Component/Legend/LegendHelper.cs index f51f9cfa..9151d94d 100644 --- a/Runtime/Component/Legend/LegendHelper.cs +++ b/Runtime/Component/Legend/LegendHelper.cs @@ -48,7 +48,7 @@ namespace XCharts.Runtime var objAnchorMin = new Vector2(0, 1); var objAnchorMax = new Vector2(0, 1); var objPivot = new Vector2(0, 1); - var btnObj = ChartHelper.AddObject(objName, parent, objAnchorMin, objAnchorMax, objPivot, sizeDelta, i); + var btnObj = ChartHelper.AddObject(objName, parent, objAnchorMin, objAnchorMax, objPivot, sizeDelta); var iconObj = ChartHelper.AddObject("icon", btnObj.transform, anchorMin, anchorMax, pivot, iconSizeDelta); var img = ChartHelper.GetOrAddComponent(btnObj); img.color = Color.clear; diff --git a/Runtime/Internal/BaseChart.Serie.cs b/Runtime/Internal/BaseChart.Serie.cs index d5c28b8b..8d8c0a5e 100644 --- a/Runtime/Internal/BaseChart.Serie.cs +++ b/Runtime/Internal/BaseChart.Serie.cs @@ -100,7 +100,14 @@ namespace XCharts.Runtime { foreach (var serie in m_Series) { - if (serie.serieName.Equals(serieName)) return serie; + if (string.IsNullOrEmpty(serie.serieName)) + { + if (string.IsNullOrEmpty(serieName)) return serie; + } + else if (serie.serieName.Equals(serieName)) + { + return serie; + } } return null; }