diff --git a/Documentation~/zh/changelog.md b/Documentation~/zh/changelog.md
index b43b6525..269451b7 100644
--- a/Documentation~/zh/changelog.md
+++ b/Documentation~/zh/changelog.md
@@ -64,7 +64,8 @@ slug: /changelog
 
 ## master
 
-* (2022.11.19) 修复`Tooltip`指示的`Serie`数据项索引异常的问题
+* (2022.11.30) 优化`Tooltip`的`Shadow`绘制不超出图表范围
+* (2022.11.29) 修复`Tooltip`指示的`Serie`数据项索引异常的问题
 * (2022.11.27) 优化`Axis`的`AxisName`的偏移设置
 * (2022.11.27) 优化`Comment`的位置，用`Location代替Position`
 * (2022.11.27) 优化`Tooltip`的`LineStyle`支持设置`Shadow`时的颜色
diff --git a/Runtime/Component/Tooltip/TooltipHandler.cs b/Runtime/Component/Tooltip/TooltipHandler.cs
index aa99ba18..b927fe61 100644
--- a/Runtime/Component/Tooltip/TooltipHandler.cs
+++ b/Runtime/Component/Tooltip/TooltipHandler.cs
@@ -582,10 +582,10 @@ namespace XCharts.Runtime
                                 if (pX < grid.context.x)
                                     break;
                                 float pY = grid.context.y + grid.context.height;
-                                Vector3 p1 = new Vector3(pX, grid.context.y);
-                                Vector3 p2 = new Vector3(pX, pY);
-                                Vector3 p3 = new Vector3(pX + tooltipSplitWid, pY);
-                                Vector3 p4 = new Vector3(pX + tooltipSplitWid, grid.context.y);
+                                Vector3 p1 = chart.ClampInGrid(grid,new Vector3(pX, grid.context.y));
+                                Vector3 p2 = chart.ClampInGrid(grid,new Vector3(pX, pY));
+                                Vector3 p3 = chart.ClampInGrid(grid,new Vector3(pX + tooltipSplitWid, pY));
+                                Vector3 p4 = chart.ClampInGrid(grid,new Vector3(pX + tooltipSplitWid, grid.context.y));
                                 var areaColor = TooltipHelper.GetLineColor(tooltip, chart.theme.tooltip.areaColor);
                                 UGL.DrawQuadrilateral(vh, p1, p2, p3, p4, areaColor);
                             }