From 9deb120446ed956f617eea9c3c4abc9dc7c5a96b Mon Sep 17 00:00:00 2001
From: monitor1394 <monitor1394@gmail.com>
Date: Tue, 29 Aug 2023 22:28:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0`Ring`=E7=9A=84`gridIndex`?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=AE=BE=E7=BD=AE=E6=8C=87=E5=AE=9A=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Documentation~/zh/changelog.md          | 5 ++++-
 Editor/Series/RingEditor.cs             | 1 +
 Runtime/Serie/Heatmap/HeatmapHandler.cs | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Documentation~/zh/changelog.md b/Documentation~/zh/changelog.md
index ddf2a6cd..3023c79a 100644
--- a/Documentation~/zh/changelog.md
+++ b/Documentation~/zh/changelog.md
@@ -74,11 +74,14 @@ slug: /changelog
 * 增加`Symbol`的`EmptyTriangle`、`EmptyDiamond`、`Plus`、`Minus`四种新标记
 * 完善`Chart`的鼠标交互回调
 * 增加`LabelLine`可固定横坐标的功能
+* 增加`GridLayout`网格布局组件
 * 修复千年老问题：开启TMP后更新版本会报错的问题
 
 日志详情：
 
-* (2023.08.29) 增加`Pie`和`Radar`的`gridIndex`支持设置指定网格
+* (2023.08.29) 增加`Ring`的`gridIndex`支持设置指定网格
+* (2023.08.29) 增加`Radar`的`gridIndex`支持设置指定网格
+* (2023.08.29) 增加`Pie`的`gridIndex`支持设置指定网格
 * (2023.08.29) 增加`GridLayout`网格布局组件用于管理多个`GridCoord`的布局
 * (2023.08.25) 修复`MarkLine`多个时只显示一个`Label`的问题
 * (2023.08.25) 修复`MarkLine`在开启`Clip`后还绘制在坐标系外的问题
diff --git a/Editor/Series/RingEditor.cs b/Editor/Series/RingEditor.cs
index 03cbd2b6..3d2cb7ca 100644
--- a/Editor/Series/RingEditor.cs
+++ b/Editor/Series/RingEditor.cs
@@ -7,6 +7,7 @@ namespace XCharts.Editor
     {
         public override void OnCustomInspectorGUI()
         {
+            PropertyField("m_GridIndex");
             PropertyTwoFiled("m_Center");
             PropertyTwoFiled("m_Radius");
             PropertyField("m_StartAngle");
diff --git a/Runtime/Serie/Heatmap/HeatmapHandler.cs b/Runtime/Serie/Heatmap/HeatmapHandler.cs
index 878d4b90..2ff83ec0 100644
--- a/Runtime/Serie/Heatmap/HeatmapHandler.cs
+++ b/Runtime/Serie/Heatmap/HeatmapHandler.cs
@@ -190,10 +190,11 @@ namespace XCharts.Runtime
             YAxis yAxis;
             if (!chart.TryGetChartComponent<XAxis>(out xAxis, serie.xAxisIndex)) return;
             if (!chart.TryGetChartComponent<YAxis>(out yAxis, serie.yAxisIndex)) return;
+            var visualMap = chart.GetVisualMapOfSerie(serie);
+            if (visualMap == null) return;
             m_SerieGrid = chart.GetChartComponent<GridCoord>(xAxis.gridIndex);
             xAxis.boundaryGap = true;
             yAxis.boundaryGap = true;
-            var visualMap = chart.GetVisualMapOfSerie(serie);
             var emphasisStyle = serie.emphasisStyle;
             var xCount = AxisHelper.GetTotalSplitGridNum(xAxis);
             var yCount = AxisHelper.GetTotalSplitGridNum(yAxis);