From 3b9af0f8ecb2a74842e5217db4d64320a25c72b4 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Mon, 10 Jun 2024 22:42:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4`Tooltip`=E7=9A=84`Corss`?= =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E4=B8=BA`Cross`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Documentation~/en/configuration.md | 2 +- Documentation~/zh/changelog.md | 3 ++- Documentation~/zh/configuration.md | 2 +- Examples/Example80_Polar.cs | 2 +- Runtime/Chart/PolarChart.cs | 2 +- Runtime/Component/Tooltip/Tooltip.cs | 2 +- Runtime/Component/Tooltip/TooltipHandler.cs | 16 ++++++++-------- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Documentation~/en/configuration.md b/Documentation~/en/configuration.md index e4adb2bf..12ed0d9e 100644 --- a/Documentation~/en/configuration.md +++ b/Documentation~/en/configuration.md @@ -2339,7 +2339,7 @@ Tooltip component. |field|default|since|comment| |--|--|--|--| |show|true||Whether to show the tooltip component. -|type|||Indicator type.
`Tooltip.Type`:
- `Line`: line indicator.
- `Shadow`: shadow crosshair indicator.
- `None`: no indicator displayed.
- `Corss`: crosshair indicator, which is actually the shortcut of enable two axisPointers of two orthometric axes.
- `Auto`: Auto select indicator according to serie type.
| +|type|||Indicator type.
`Tooltip.Type`:
- `Line`: line indicator.
- `Shadow`: shadow crosshair indicator.
- `None`: no indicator displayed.
- `Cross`: crosshair indicator, which is actually the shortcut of enable two axisPointers of two orthometric axes.
- `Auto`: Auto select indicator according to serie type.
| |trigger|||Type of triggering.
`Tooltip.Trigger`:
- `Item`: Triggered by data item, which is mainly used for charts that don't have a category axis like scatter charts or pie charts.
- `Axis`: Triggered by axes, which is mainly used for charts that have category axes, like bar charts or line charts.
- `None`: Trigger nothing.
- `Auto`: Auto select trigger according to serie type.
| |triggerOn||v3.11.0|Condition of trigger tooltip.
`Tooltip.TriggerOn`:
- `MouseMove`: Trigger when mouse move.
- `Click`: Trigger when mouse click.
| |position||v3.3.0|Type of position.
`Tooltip.Position`:
- `Auto`: Auto. The mobile platform is displayed at the top, and the non-mobile platform follows the mouse position.
- `Custom`: Custom. Fully customize display position (x,y).
- `FixedX`: Just fix the coordinate X. Y follows the mouse position.
- `FixedY`:
| diff --git a/Documentation~/zh/changelog.md b/Documentation~/zh/changelog.md index baaf95b6..fba2d36d 100644 --- a/Documentation~/zh/changelog.md +++ b/Documentation~/zh/changelog.md @@ -73,7 +73,8 @@ slug: /changelog ## master -* (2024.06.09) 增加`Axis`的`m_MinCategorySpacing`设置类目轴默认的最小类目间距 +* (2024.06.09) 调整`Tooltip`的`Corss`重命名为`Cross` +* (2024.06.09) 增加`Axis`的`minCategorySpacing`设置类目轴默认的最小类目间距 * (2024.06.09) 修复`Tooltip`的`Cross`在`Axis`是类目轴并且开启`DataZoom`的情况下指示位置不准确的问题 * (2024.06.06) 修复`Serie`在`Clone`时动画异常问题 (#320) * (2024.06.04) 修复`Serie`的`state`在代码动态设置时不刷新的问题 diff --git a/Documentation~/zh/configuration.md b/Documentation~/zh/configuration.md index 25445c3f..396a2ef9 100644 --- a/Documentation~/zh/configuration.md +++ b/Documentation~/zh/configuration.md @@ -2267,7 +2267,7 @@ Serie的状态样式。Serie的状态有正常，高亮，淡出，选中四种 |参数|默认|版本|描述| |--|--|--|--| |show|true||是否显示提示框组件。 -|type|||提示框指示器类型。
`Tooltip.Type`:
- `Line`: 直线指示器
- `Shadow`: 阴影指示器
- `None`: 无指示器
- `Corss`: 十字准星指示器。坐标轴显示Label和交叉线。
- `Auto`: 根据serie的类型自动选择显示指示器。
| +|type|||提示框指示器类型。
`Tooltip.Type`:
- `Line`: 直线指示器
- `Shadow`: 阴影指示器
- `None`: 无指示器
- `Cross`: 十字准星指示器。坐标轴显示Label和交叉线。
- `Auto`: 根据serie的类型自动选择显示指示器。
| |trigger|||触发类型。
`Tooltip.Trigger`:
- `Item`: 数据项图形触发，主要在散点图，饼图等无类目轴的图表中使用。
- `Axis`: 坐标轴触发，主要在柱状图，折线图等会使用类目轴的图表中使用。
- `None`: 什么都不触发。
- `Auto`: 根据serie的类型自动选择触发类型。
| |triggerOn||v3.11.0|触发条件。
`Tooltip.TriggerOn`:
- `MouseMove`: 鼠标移动时触发。
- `Click`: 鼠标点击时触发。
| |position||v3.3.0|显示位置类型。
`Tooltip.Position`:
- `Auto`: 自适应。移动平台靠顶部显示，非移动平台跟随鼠标位置。
- `Custom`: 自定义。完全自定义显示位置(x,y)。
- `FixedX`: 只固定坐标X。Y跟随鼠标位置。
- `FixedY`:
| diff --git a/Examples/Example80_Polar.cs b/Examples/Example80_Polar.cs index cc6a99c0..3b9865ba 100644 --- a/Examples/Example80_Polar.cs +++ b/Examples/Example80_Polar.cs @@ -34,7 +34,7 @@ namespace XCharts.Example void AddData() { chart.RemoveData(); - chart.GetChartComponent().type = Tooltip.Type.Corss; + chart.GetChartComponent().type = Tooltip.Type.Cross; var angleAxis = chart.GetChartComponent(); angleAxis.type = Axis.AxisType.Value; angleAxis.minMaxType = Axis.AxisMinMaxType.Custom; diff --git a/Runtime/Chart/PolarChart.cs b/Runtime/Chart/PolarChart.cs index 500d0b81..0d93196d 100644 --- a/Runtime/Chart/PolarChart.cs +++ b/Runtime/Chart/PolarChart.cs @@ -22,7 +22,7 @@ namespace XCharts.Runtime radiusAxis.axisLabel.show = false; var tooltip = EnsureChartComponent(); - tooltip.type = Tooltip.Type.Corss; + tooltip.type = Tooltip.Type.Cross; tooltip.trigger = Tooltip.Trigger.Axis; RemoveData(); diff --git a/Runtime/Component/Tooltip/Tooltip.cs b/Runtime/Component/Tooltip/Tooltip.cs index 18149b85..7711fd9e 100644 --- a/Runtime/Component/Tooltip/Tooltip.cs +++ b/Runtime/Component/Tooltip/Tooltip.cs @@ -37,7 +37,7 @@ namespace XCharts.Runtime /// crosshair indicator, which is actually the shortcut of enable two axisPointers of two orthometric axes. /// ||十字准星指示器。坐标轴显示Label和交叉线。 /// - Corss, + Cross, /// /// Auto select indicator according to serie type. /// ||根据serie的类型自动选择显示指示器。 diff --git a/Runtime/Component/Tooltip/TooltipHandler.cs b/Runtime/Component/Tooltip/TooltipHandler.cs index e9bb466b..3c5b0dca 100644 --- a/Runtime/Component/Tooltip/TooltipHandler.cs +++ b/Runtime/Component/Tooltip/TooltipHandler.cs @@ -185,7 +185,7 @@ namespace XCharts.Runtime } if (!m_ShowTooltip || !anyTrigger) { - if (tooltip.context.type == Tooltip.Type.Corss && m_PointerContainer != null && m_PointerContainer.IsPointerEnter()) + if (tooltip.context.type == Tooltip.Type.Cross && m_PointerContainer != null && m_PointerContainer.IsPointerEnter()) { m_ShowTooltip = true; tooltip.SetActive(true); @@ -210,7 +210,7 @@ namespace XCharts.Runtime if (tooltip.context.type == Tooltip.Type.None) return; if (m_PointerContainer != null) { - if (tooltip.context.type == Tooltip.Type.Corss) + if (tooltip.context.type == Tooltip.Type.Cross) { if (m_PointerContainer is GridCoord) { @@ -517,7 +517,7 @@ namespace XCharts.Runtime { axis.context.axisTooltipValue = serie.GetSerieData(serie.context.pointerItemDataIndex).GetData(dimension); } - else if (component.type == Tooltip.Type.Corss) + else if (component.type == Tooltip.Type.Cross) { axis.context.axisTooltipValue = axis.context.pointerValue; } @@ -697,7 +697,7 @@ namespace XCharts.Runtime float splitWidth = AxisHelper.GetDataWidth(xAxis, grid.context.width, dataCount, dataZoom); switch (tooltip.context.type) { - case Tooltip.Type.Corss: + case Tooltip.Type.Cross: case Tooltip.Type.Line: float pX = grid.context.x; pX += xAxis.IsCategory() ? @@ -709,7 +709,7 @@ namespace XCharts.Runtime Vector2 ep = new Vector2(pX, grid.context.y + grid.context.height); var lineColor = TooltipHelper.GetLineColor(tooltip, chart.theme.tooltip.lineColor); ChartDrawer.DrawLineStyle(vh, lineType, lineWidth, sp, ep, lineColor); - if (tooltip.context.type == Tooltip.Type.Corss) + if (tooltip.context.type == Tooltip.Type.Cross) { sp = new Vector2(grid.context.x, chart.pointerPos.y); ep = new Vector2(grid.context.x + grid.context.width, chart.pointerPos.y); @@ -763,7 +763,7 @@ namespace XCharts.Runtime float splitWidth = AxisHelper.GetDataWidth(yAxis, grid.context.height, dataCount, dataZoom); switch (tooltip.context.type) { - case Tooltip.Type.Corss: + case Tooltip.Type.Cross: case Tooltip.Type.Line: float pY = (float)(grid.context.y + yAxis.context.pointerValue * splitWidth + (yAxis.boundaryGap ? splitWidth / 2 : 0)); @@ -773,7 +773,7 @@ namespace XCharts.Runtime Vector2 ep = new Vector2(grid.context.x + grid.context.width, pY); var lineColor = TooltipHelper.GetLineColor(tooltip, chart.theme.tooltip.lineColor); ChartDrawer.DrawLineStyle(vh, lineType, lineWidth, sp, ep, lineColor); - if (tooltip.context.type == Tooltip.Type.Corss) + if (tooltip.context.type == Tooltip.Type.Cross) { sp = new Vector2(chart.pointerPos.x, grid.context.y); ep = new Vector2(chart.pointerPos.x, grid.context.y + grid.context.height); @@ -818,7 +818,7 @@ namespace XCharts.Runtime switch (tooltip.context.type) { - case Tooltip.Type.Corss: + case Tooltip.Type.Cross: ChartDrawer.DrawLineStyle(vh, lineType, lineWidth, sp, ep, lineColor); var dist = Vector2.Distance(chart.pointerPos, cenPos); if (dist > radius) dist = radius;