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

修复DataZoom拖动时SerieLabel不刷新的问题 (#165)

Browse Source
This commit is contained in:
monitor1394
2021-08-31 13:41:46 +08:00
parent ab5995be7f
commit 608ba43246
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG-EN.md
View File

@@ -39,6 +39,7 @@
## master ## master
* (2021.08.31) Fixed bug where `SerieLabel` does not refresh when `DataZoom` is dragged (#165)
* (2021.08.25) Fixed an issue where the theme switch could not be save to the scene (#166) * (2021.08.25) Fixed an issue where the theme switch could not be save to the scene (#166)
* (2021.08.24) Added `Animation`'s `alongWithLinePath` * (2021.08.24) Added `Animation`'s `alongWithLinePath`
* (2021.08.22) Added `Serie`'s `ignoreLineBreak` (#164) * (2021.08.22) Added `Serie`'s `ignoreLineBreak` (#164)

1
CHANGELOG.md
View File

@@ -39,6 +39,7 @@
## master ## master
* (2021.08.31) 修复`DataZoom`拖动时`SerieLabel`不刷新的问题 (#165)
* (2021.08.25) 修复`Theme`主题切换无法保持到场景上的问题 (#166) * (2021.08.25) 修复`Theme`主题切换无法保持到场景上的问题 (#166)
* (2021.08.24) 增加`Animation`的`alongWithLinePath`参数设置折线轨迹匀速动画 * (2021.08.24) 增加`Animation`的`alongWithLinePath`参数设置折线轨迹匀速动画
* (2021.08.22) 增加`Serie`的`ignoreLineBreak`参数设置忽略数据连线是否断开 (#164) * (2021.08.22) 增加`Serie`的`ignoreLineBreak`参数设置忽略数据连线是否断开 (#164)

18
Runtime/Internal/CoordinateChart.cs
View File

@@ -1464,10 +1464,11 @@ namespace XCharts
if (!serie.show) continue; if (!serie.show) continue;
if (serie.IsPerformanceMode()) continue; if (serie.IsPerformanceMode()) continue;
if (!serie.IsCoordinateSerie()) continue; if (!serie.IsCoordinateSerie()) continue;
DataZoomHelper.GetSerieRelatedDataZoom(serie, dataZooms, out var xDataZoom, out var yDataZoom);
for (int j = 0; j < serie.data.Count; j++) var showData = serie.GetDataList(xDataZoom);
for (int j = 0; j < showData.Count; j++)
{ {
var serieData = serie.data[j]; var serieData = showData[j];
if (serieData.labelObject == null) continue; if (serieData.labelObject == null) continue;
var serieLabel = SerieHelper.GetSerieLabel(serie, serieData, serieData.highlighted); var serieLabel = SerieHelper.GetSerieLabel(serie, serieData, serieData.highlighted);
serieData.index = j; serieData.index = j;
@@ -1546,9 +1547,13 @@ namespace XCharts
if (!serie.IsCoordinateSerie()) continue; if (!serie.IsCoordinateSerie()) continue;
var total = serie.yTotal; var total = serie.yTotal;
var isPercentStack = SeriesHelper.IsPercentStack(m_Series, serie.stack, SerieType.Bar); var isPercentStack = SeriesHelper.IsPercentStack(m_Series, serie.stack, SerieType.Bar);
for (int j = 0; j < serie.data.Count; j++) DataZoomHelper.GetSerieRelatedDataZoom(serie, dataZooms, out var xDataZoom, out var yDataZoom);
var showData = serie.GetDataList(xDataZoom);
if (xDataZoom != null)
ChartHelper.HideAllObject(m_SerieLabelRoot, "label_" + i);
for (int j = 0; j < showData.Count; j++)
{ {
var serieData = serie.data[j]; var serieData = showData[j];
if (serieData.labelObject == null) continue; if (serieData.labelObject == null) continue;
if (j >= serie.dataPoints.Count) if (j >= serie.dataPoints.Count)
{ {
@@ -1556,6 +1561,7 @@ namespace XCharts
serieData.SetIconActive(false); serieData.SetIconActive(false);
continue; continue;
} }
serieData.labelObject.SetActive(true);
var pos = serie.dataPoints[j]; var pos = serie.dataPoints[j];
var serieLabel = SerieHelper.GetSerieLabel(serie, serieData); var serieLabel = SerieHelper.GetSerieLabel(serie, serieData);
var iconStyle = SerieHelper.GetIconStyle(serie, serieData); var iconStyle = SerieHelper.GetIconStyle(serie, serieData);
@@ -1689,7 +1695,7 @@ namespace XCharts
} }
public void Internal_CheckClipAndDrawZebraLine(VertexHelper vh, Vector3 p1, Vector3 p2, float size, float zebraWidth, public void Internal_CheckClipAndDrawZebraLine(VertexHelper vh, Vector3 p1, Vector3 p2, float size, float zebraWidth,
float zebraGap, Color32 color,Color32 toColor, bool clip, Grid grid) float zebraGap, Color32 color, Color32 toColor, bool clip, Grid grid)
{ {
ClampInChart(ref p1); ClampInChart(ref p1);
ClampInChart(ref p2); ClampInChart(ref p2);