diff --git a/Assets/XCharts/CHANGELOG.md b/Assets/XCharts/CHANGELOG.md index 9c093110..75121dc3 100644 --- a/Assets/XCharts/CHANGELOG.md +++ b/Assets/XCharts/CHANGELOG.md @@ -1,6 +1,7 @@ # 更新日志 +* (2020.01.20) 优化`Tooltip`设置`itemFormatter`时显示系列颜色 * (2020.01.20) 增加`Radar`雷达图在`inspector`配置`areaStyle`的支持 * (2020.01.15) 发布`v1.2.0`版本 * (2020.01.15) 增加`AxisLabel`格式化为整数的支持(`{value:f0}`) diff --git a/Assets/XCharts/Runtime/Component/Main/Tooltip.cs b/Assets/XCharts/Runtime/Component/Main/Tooltip.cs index 5b778aa7..0b8cced2 100644 --- a/Assets/XCharts/Runtime/Component/Main/Tooltip.cs +++ b/Assets/XCharts/Runtime/Component/Main/Tooltip.cs @@ -373,7 +373,7 @@ namespace XCharts return string.IsNullOrEmpty(m_Formatter) && string.IsNullOrEmpty(m_ItemFormatter); } - internal string GetFormatterContent(int dataIndex, Series series, string category, DataZoom dataZoom = null) + internal string GetFormatterContent(int dataIndex, Series series, string category,ThemeInfo themeInfo = null, DataZoom dataZoom = null) { if (string.IsNullOrEmpty(m_Formatter)) { @@ -400,6 +400,7 @@ namespace XCharts content = content.Replace("{c}", ChartCached.FloatToStr(serieData.GetData(1), 0, m_ForceENotation)); content = content.Replace("{d}", ChartCached.FloatToStr(percent, 1)); if (!first) sb.Append("\n"); + sb.Append("● "); sb.Append(content); first = false; } diff --git a/Assets/XCharts/Runtime/Internal/CoordinateChart.cs b/Assets/XCharts/Runtime/Internal/CoordinateChart.cs index a6dac1ac..fccbc148 100644 --- a/Assets/XCharts/Runtime/Internal/CoordinateChart.cs +++ b/Assets/XCharts/Runtime/Internal/CoordinateChart.cs @@ -339,7 +339,7 @@ namespace XCharts else { var category = tempAxis.GetData(index, m_DataZoom); - m_Tooltip.UpdateContentText(m_Tooltip.GetFormatterContent(index, m_Series, category, m_DataZoom)); + m_Tooltip.UpdateContentText(m_Tooltip.GetFormatterContent(index, m_Series, category, m_ThemeInfo, m_DataZoom)); } var pos = m_Tooltip.GetContentPos(); if (pos.x + m_Tooltip.runtimeWidth > chartWidth) diff --git a/Assets/XCharts/Runtime/PieChart.cs b/Assets/XCharts/Runtime/PieChart.cs index 2f958f74..3e67ee9f 100644 --- a/Assets/XCharts/Runtime/PieChart.cs +++ b/Assets/XCharts/Runtime/PieChart.cs @@ -596,7 +596,7 @@ namespace XCharts } else { - m_Tooltip.UpdateContentText(m_Tooltip.GetFormatterContent(index, m_Series, null)); + m_Tooltip.UpdateContentText(m_Tooltip.GetFormatterContent(index, m_Series, null, m_ThemeInfo)); } var pos = m_Tooltip.GetContentPos();