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

修复Serie的名字带_线导致Legend无法触发的问题 (#252)

Browse Source
This commit is contained in:
monitor1394
2023-06-07 08:05:57 +08:00
parent ad707ec14d
commit c8a5560a67
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Runtime/Component/Legend/LegendHandler.cs
View File

@@ -11,6 +11,7 @@ namespace XCharts.Runtime
internal sealed class LegendHandler : MainComponentHandler<Legend> internal sealed class LegendHandler : MainComponentHandler<Legend>
{ {
private static readonly string s_LegendObjectName = "legend"; private static readonly string s_LegendObjectName = "legend";
private static readonly char[] s_NameSplit = new char[] { '_' };
public override void InitComponent() public override void InitComponent()
{ {
@@ -48,7 +49,7 @@ namespace XCharts.Runtime
private void InitLegend(Legend legend) private void InitLegend(Legend legend)
{ {
legend.painter = null; legend.painter = null;
legend.refreshComponent = delegate() legend.refreshComponent = delegate ()
{ {
legend.OnChanged(); legend.OnChanged();
var legendObject = ChartHelper.AddObject(s_LegendObjectName + legend.index, chart.transform, chart.chartMinAnchor, var legendObject = ChartHelper.AddObject(s_LegendObjectName + legend.index, chart.transform, chart.chartMinAnchor,
@@ -99,7 +100,7 @@ namespace XCharts.Runtime
ChartHelper.AddEventListener(item.button.gameObject, EventTriggerType.PointerDown, (data) => ChartHelper.AddEventListener(item.button.gameObject, EventTriggerType.PointerDown, (data) =>
{ {
if (data.selectedObject == null || legend.selectedMode == Legend.SelectedMode.None) return; if (data.selectedObject == null || legend.selectedMode == Legend.SelectedMode.None) return;
var temp = data.selectedObject.name.Split('_', 2); var temp = data.selectedObject.name.Split(s_NameSplit, 2);
string selectedName = temp[1]; string selectedName = temp[1];
int clickedIndex = int.Parse(temp[0]); int clickedIndex = int.Parse(temp[0]);
if (legend.selectedMode == Legend.SelectedMode.Multiple) if (legend.selectedMode == Legend.SelectedMode.Multiple)
@@ -117,7 +118,7 @@ namespace XCharts.Runtime
{ {
for (int n = 0; n < btnList.Length; n++) for (int n = 0; n < btnList.Length; n++)
{ {
temp = btnList[n].name.Split('_', 2); temp = btnList[n].name.Split(s_NameSplit, 2);
selectedName = btnList[n].legendName; selectedName = btnList[n].legendName;
var index = btnList[n].index; var index = btnList[n].index;
OnLegendButtonClick(legend, n, selectedName, index == clickedIndex ? true : false); OnLegendButtonClick(legend, n, selectedName, index == clickedIndex ? true : false);
@@ -128,7 +129,7 @@ namespace XCharts.Runtime
ChartHelper.AddEventListener(item.button.gameObject, EventTriggerType.PointerEnter, (data) => ChartHelper.AddEventListener(item.button.gameObject, EventTriggerType.PointerEnter, (data) =>
{ {
if (item.button == null) return; if (item.button == null) return;
var temp = item.button.name.Split('_', 2); var temp = item.button.name.Split(s_NameSplit, 2);
string selectedName = temp[1]; string selectedName = temp[1];
int index = int.Parse(temp[0]); int index = int.Parse(temp[0]);
OnLegendButtonEnter(legend, index, selectedName); OnLegendButtonEnter(legend, index, selectedName);
@@ -136,7 +137,7 @@ namespace XCharts.Runtime
ChartHelper.AddEventListener(item.button.gameObject, EventTriggerType.PointerExit, (data) => ChartHelper.AddEventListener(item.button.gameObject, EventTriggerType.PointerExit, (data) =>
{ {
if (item.button == null) return; if (item.button == null) return;
var temp = item.button.name.Split('_', 2); var temp = item.button.name.Split(s_NameSplit, 2);
string selectedName = temp[1]; string selectedName = temp[1];
int index = int.Parse(temp[0]); int index = int.Parse(temp[0]);
OnLegendButtonExit(legend, index, selectedName); OnLegendButtonExit(legend, index, selectedName);