修复表格系统调试时会出现死循环的问题,优化释放流程

This commit is contained in:
2026-07-28 14:14:27 +08:00
parent 550f588408
commit 84f6a4294d
4 changed files with 136 additions and 63 deletions
+2 -2
View File
@@ -95,14 +95,14 @@ namespace XericUIEditor.XTable
if (GUILayout.Button("重新生成表格", GUILayout.Height(26))) if (GUILayout.Button("重新生成表格", GUILayout.Height(26)))
{ {
m_Table.FullRebuildPreservingData(); m_Table.FullRebuildPreservingData();
m_Table.SetChildrenVisible(m_ShowChildren); m_ShowChildren = m_Table.ChildrenVisible;
EditorApplication.RepaintHierarchyWindow(); EditorApplication.RepaintHierarchyWindow();
} }
if (GUILayout.Button("强制刷新样式", GUILayout.Height(26))) if (GUILayout.Button("强制刷新样式", GUILayout.Height(26)))
{ {
m_Table.ForceStyleRefresh(); m_Table.ForceStyleRefresh();
m_Table.SetChildrenVisible(m_ShowChildren); m_ShowChildren = m_Table.ChildrenVisible;
EditorApplication.RepaintHierarchyWindow(); EditorApplication.RepaintHierarchyWindow();
} }
@@ -421,6 +421,13 @@ namespace XericUI.XTable.Rendering.Component
[ContextMenu("Xeric UI/完全重建表格")] [ContextMenu("Xeric UI/完全重建表格")]
public void FullRebuild() public void FullRebuild()
{ {
m_IsRebuilding = true;
try
{
// 清理跟踪状态(在销毁旧 Assembler 前先解除引用)
ReleaseAllTrackedCells();
m_ActivePrefabMap?.Clear();
m_Assembler?.DestroyAll(); m_Assembler?.DestroyAll();
m_PrefabPool?.DestroyAll(); m_PrefabPool?.DestroyAll();
ClearAllChildren(); ClearAllChildren();
@@ -440,9 +447,17 @@ namespace XericUI.XTable.Rendering.Component
RefreshView(); RefreshView();
SetChildrenVisible(m_ChildrenVisible); SetChildrenVisible(m_ChildrenVisible);
} }
finally
{
m_IsRebuilding = false;
}
}
/// <summary>重新生成表格但保留已有文本数据——先保存,重建后再回填</summary> /// <summary>重新生成表格但保留已有文本数据——先保存,重建后再回填</summary>
public void FullRebuildPreservingData() public void FullRebuildPreservingData()
{
m_IsRebuilding = true;
try
{ {
// 保存当前单元格文本 // 保存当前单元格文本
var savedTexts = new Dictionary<(int, int), string>(); var savedTexts = new Dictionary<(int, int), string>();
@@ -461,9 +476,24 @@ namespace XericUI.XTable.Rendering.Component
} }
} }
FullRebuild(); // 先清理跟踪状态再销毁旧对象
ReleaseAllTrackedCells();
m_ActivePrefabMap?.Clear();
// 恢复文本数据 m_Assembler?.DestroyAll();
m_PrefabPool?.DestroyAll();
ClearAllChildren();
m_BackgroundGo = null;
m_BorderRenderer = null;
m_TableData = new XTableData();
m_Assembler = new CellAssembler(ContentTransform, m_DefaultStyleNamespace);
m_PrefabPool = new PrefabPrototypePool(ContentTransform);
m_ActivePrefabMap = new Dictionary<(int, int), GameObject>();
RecalculateTotalSize();
// 恢复文本数据到新 TableData
foreach (var kv in savedTexts) foreach (var kv in savedTexts)
{ {
int r = kv.Key.Item1, c = kv.Key.Item2; int r = kv.Key.Item1, c = kv.Key.Item2;
@@ -471,9 +501,21 @@ namespace XericUI.XTable.Rendering.Component
m_TableData.GetOrCreateCell(r, c).Text = kv.Value; m_TableData.GetOrCreateCell(r, c).Text = kv.Value;
} }
// 如果没有恢复任何数据,则创建默认示例
if (savedTexts.Count == 0)
CreateDefaultSampleData();
CreateBackground();
CreateViewportRenderer();
MarkDirty(TableDirtyType.All);
RefreshView(); RefreshView();
SetChildrenVisible(m_ChildrenVisible); SetChildrenVisible(m_ChildrenVisible);
} }
finally
{
m_IsRebuilding = false;
}
}
/// <summary> /// <summary>
/// 清空所有数据(单元格文本、合并信息),但保留行列排布和样式。 /// 清空所有数据(单元格文本、合并信息),但保留行列排布和样式。
@@ -483,11 +525,21 @@ namespace XericUI.XTable.Rendering.Component
{ {
if (m_TableData != null) if (m_TableData != null)
{ {
// 清理预制体:先调用 OnPrefabRelease 再清理映射
if (m_ActivePrefabMap != null)
{
foreach (var kv in m_ActivePrefabMap)
{
var cellData = m_TableData.GetCell(kv.Key.Item1, kv.Key.Item2);
cellData?.OnPrefabRelease?.Invoke(kv.Value);
}
m_ActivePrefabMap.Clear();
}
m_PrefabPool?.ReturnAll();
m_TableData.ClearAllMerges(); m_TableData.ClearAllMerges();
m_TableData.BlockMap.Clear(); m_TableData.BlockMap.Clear();
} }
m_ActivePrefabMap?.Clear();
m_PrefabPool?.ReturnAll();
m_Quadtree?.Clear(); m_Quadtree?.Clear();
ClearSelection(); ClearSelection();
MarkDirty(TableDirtyType.DataChanged); MarkDirty(TableDirtyType.DataChanged);
@@ -499,17 +551,30 @@ namespace XericUI.XTable.Rendering.Component
/// </summary> /// </summary>
public void ClearTable() public void ClearTable()
{ {
m_Assembler?.DestroyAll(); m_IsRebuilding = true;
m_PrefabPool?.DestroyAll(); try
{
// 清理预制体回调
if (m_ActivePrefabMap != null && m_TableData != null)
{
foreach (var kv in m_ActivePrefabMap)
{
var cellData = m_TableData.GetCell(kv.Key.Item1, kv.Key.Item2);
cellData?.OnPrefabRelease?.Invoke(kv.Value);
}
}
ReleaseAllTrackedCells();
m_ActivePrefabMap?.Clear(); m_ActivePrefabMap?.Clear();
m_Quadtree?.Clear(); m_Quadtree?.Clear();
m_Assembler?.DestroyAll();
m_PrefabPool?.DestroyAll();
ClearAllChildren(); ClearAllChildren();
m_BackgroundGo = null; m_BackgroundGo = null;
m_BorderRenderer = null; m_BorderRenderer = null;
m_TableData = new XTableData(); m_TableData = new XTableData();
m_RowHeights = null;
m_ColWidths = null;
ClearSelection(); ClearSelection();
m_Assembler = new CellAssembler(ContentTransform, m_DefaultStyleNamespace); m_Assembler = new CellAssembler(ContentTransform, m_DefaultStyleNamespace);
@@ -522,6 +587,11 @@ namespace XericUI.XTable.Rendering.Component
RefreshView(); RefreshView();
SetChildrenVisible(m_ChildrenVisible); SetChildrenVisible(m_ChildrenVisible);
} }
finally
{
m_IsRebuilding = false;
}
}
/// <summary>仅强制刷新样式,不重建数据结构</summary> /// <summary>仅强制刷新样式,不重建数据结构</summary>
public void ForceStyleRefresh() public void ForceStyleRefresh()
@@ -39,7 +39,7 @@ namespace XericUI.XTable.Rendering.Component
return; return;
} }
if (!m_DirtyFlag.IsDirty) return; if (m_IsRebuilding || !m_DirtyFlag.IsDirty) return;
var flags = m_DirtyFlag.Flags; var flags = m_DirtyFlag.Flags;
if ((flags & ~(TableDirtyType.ScrollChanged | TableDirtyType.SelectionChanged)) == 0) if ((flags & ~(TableDirtyType.ScrollChanged | TableDirtyType.SelectionChanged)) == 0)
@@ -318,9 +318,12 @@ namespace XericUI.XTable.Rendering.Component
base.OnDestroy(); base.OnDestroy();
} }
/// <summary>是否正在同步重建中,此时 Update / EditorUpdate 应跳过以避免重入</summary>
[System.NonSerialized] private bool m_IsRebuilding;
private void Update() private void Update()
{ {
if (!m_DirtyFlag.IsDirty) return; if (m_IsRebuilding || !m_DirtyFlag.IsDirty) return;
var flags = m_DirtyFlag.Flags; var flags = m_DirtyFlag.Flags;
// 仅滚动或选区变更 → 轻刷新(不重建边框/背景/预制体全回收) // 仅滚动或选区变更 → 轻刷新(不重建边框/背景/预制体全回收)