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

修复Label在初始化时会堆积的问题

Browse Source
This commit is contained in:
monitor1394
2024-06-23 22:03:09 +08:00
parent 3b7e8184b0
commit 6d16a9c16a
2 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation~/zh/changelog.md
View File

@@ -74,6 +74,8 @@ slug: /changelog
## master ## master
* (2024.06.23) 修复`Label`在初始化时会堆积的问题
## v3.11.0 ## v3.11.0
版本要点： 版本要点：

40
Runtime/Serie/SerieHandler.cs
View File

@@ -484,6 +484,8 @@ namespace XCharts.Runtime
var dataAddDuration = serie.animation.GetAdditionDuration(); var dataAddDuration = serie.animation.GetAdditionDuration();
var unscaledTime = serie.animation.unscaledTime; var unscaledTime = serie.animation.unscaledTime;
var needCheck = serie.context.dataIndexs.Count > 0; var needCheck = serie.context.dataIndexs.Count > 0;
var allLabelZeroPosition = true;
var anyLabelActive = false;
foreach (var serieData in serie.data) foreach (var serieData in serie.data)
{ {
if (serieData.labelObject == null && serieData.context.dataLabels.Count <= 0) if (serieData.labelObject == null && serieData.context.dataLabels.Count <= 0)
@@ -518,7 +520,16 @@ namespace XCharts.Runtime
SerieLabelHelper.GetFormatterContent(serie, serieData, value, total, SerieLabelHelper.GetFormatterContent(serie, serieData, value, total,
currLabel, color, chart); currLabel, color, chart);
var offset = GetSerieDataLabelOffset(serieData, currLabel); var offset = GetSerieDataLabelOffset(serieData, currLabel);
labelObject.SetActive(currLabel.show && !isIgnore && !serie.IsMinShowLabelValue(value)); var active = currLabel.show && !isIgnore && !serie.IsMinShowLabelValue(value);
if (active)
{
anyLabelActive = true;
if (!ChartHelper.IsZeroVector(serieData.context.dataPoints[i]))
{
allLabelZeroPosition = false;
}
}
labelObject.SetActive(active);
labelObject.SetText(content); labelObject.SetText(content);
labelObject.SetPosition(serieData.context.dataPoints[i] + offset); labelObject.SetPosition(serieData.context.dataPoints[i] + offset);
labelObject.UpdateIcon(currLabel.icon); labelObject.UpdateIcon(currLabel.icon);
@@ -539,10 +550,19 @@ namespace XCharts.Runtime
ChartCached.NumberToStr(value, currLabel.numericFormatter) : ChartCached.NumberToStr(value, currLabel.numericFormatter) :
SerieLabelHelper.GetFormatterContent(serie, serieData, value, total, SerieLabelHelper.GetFormatterContent(serie, serieData, value, total,
currLabel, color, chart); currLabel, color, chart);
serieData.SetLabelActive(currLabel.show && !isIgnore && !serie.IsMinShowLabelValue(value)); var labelPos = UpdateLabelPosition(serieData, currLabel);
var active = currLabel.show && !isIgnore && !serie.IsMinShowLabelValue(value);
if (active)
{
anyLabelActive = true;
if (!ChartHelper.IsZeroVector(labelPos))
{
allLabelZeroPosition = false;
}
}
serieData.SetLabelActive(active);
serieData.labelObject.UpdateIcon(currLabel.icon); serieData.labelObject.UpdateIcon(currLabel.icon);
serieData.labelObject.SetText(content); serieData.labelObject.SetText(content);
UpdateLabelPosition(serieData, currLabel);
if (currLabel.textStyle.autoColor) if (currLabel.textStyle.autoColor)
{ {
var dataAutoColor = GetSerieDataAutoColor(serieData); var dataAutoColor = GetSerieDataAutoColor(serieData);
@@ -556,6 +576,17 @@ namespace XCharts.Runtime
serieData.SetLabelActive(false); serieData.SetLabelActive(false);
} }
} }
if (anyLabelActive && allLabelZeroPosition)
{
foreach (var serieData in serie.data)
{
if (serieData.labelObject == null && serieData.context.dataLabels.Count <= 0)
{
continue;
}
serieData.SetLabelActive(false);
}
}
} }
public virtual void RefreshEndLabelInternal() public virtual void RefreshEndLabelInternal()
@@ -579,7 +610,7 @@ namespace XCharts.Runtime
m_EndLabel.isAnimationEnd = serie.animation.IsFinish(); m_EndLabel.isAnimationEnd = serie.animation.IsFinish();
} }
protected void UpdateLabelPosition(SerieData serieData, LabelStyle currLabel) protected Vector3 UpdateLabelPosition(SerieData serieData, LabelStyle currLabel)
{ {
var labelPosition = GetSerieDataLabelPosition(serieData, currLabel); var labelPosition = GetSerieDataLabelPosition(serieData, currLabel);
var offset = GetSerieDataLabelOffset(serieData, currLabel); var offset = GetSerieDataLabelOffset(serieData, currLabel);
@@ -591,6 +622,7 @@ namespace XCharts.Runtime
else else
serieData.labelObject.SetRotate(-serieData.context.angle + currLabel.rotate); serieData.labelObject.SetRotate(-serieData.context.angle + currLabel.rotate);
} }
return labelPosition;
} }
public virtual Vector3 GetSerieDataLabelPosition(SerieData serieData, LabelStyle label) public virtual Vector3 GetSerieDataLabelPosition(SerieData serieData, LabelStyle label)