Merge remote-tracking branch 'gitea/master' into thr_dev/dev2

2026-07-01 16:06:02 +08:00
parent 054890251b aee8e6527f
commit 49373a3216
5 changed files with 5 additions and 38 deletions
@@ -168,7 +168,7 @@ namespace XericUI.XTable.Core
 						int endRow = merge.StartRow + merge.RowSpan - 1;
 						int endCol = merge.StartCol + merge.ColSpan - 1;
 						if (endRow < rows && endCol < cols)
-							td.MergeCells(merge.StartRow, merge.StartCol, endRow, endCol);
+							td.MergeCells(merge.StartRow, merge.StartCol, merge.RowSpan, merge.ColSpan);
 					}
 				}
 			}
@@ -12,7 +12,7 @@ using XericLibrary.Runtime.SuperStyleSheet;
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
-//233333Git666
+
 namespace XericUI.XTable.Rendering.Component
 {
    /// <summary>