修复预绑定可能会导致样式表查询出现递归死循环的问题。
This commit is contained in:
@@ -30,6 +30,9 @@ namespace XericUI.XTable.Rendering.Elements
|
|||||||
/// <summary>是否已绑定</summary>
|
/// <summary>是否已绑定</summary>
|
||||||
private bool m_IsBound;
|
private bool m_IsBound;
|
||||||
|
|
||||||
|
/// <summary>是否正在注册字段,防止 StyleManager 同步回调导致重复注册。</summary>
|
||||||
|
private bool m_IsBinding;
|
||||||
|
|
||||||
/// <summary>样式变更时触发(通知表格重绘)</summary>
|
/// <summary>样式变更时触发(通知表格重绘)</summary>
|
||||||
public event System.Action OnStyleChangedCallback;
|
public event System.Action OnStyleChangedCallback;
|
||||||
|
|
||||||
@@ -46,6 +49,7 @@ namespace XericUI.XTable.Rendering.Elements
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public void Bind(string styleNamespace)
|
public void Bind(string styleNamespace)
|
||||||
{
|
{
|
||||||
|
if (m_IsBinding && m_StyleNamespace == styleNamespace) return;
|
||||||
if (m_IsBound) Unbind();
|
if (m_IsBound) Unbind();
|
||||||
m_StyleNamespace = styleNamespace;
|
m_StyleNamespace = styleNamespace;
|
||||||
|
|
||||||
@@ -56,19 +60,33 @@ namespace XericUI.XTable.Rendering.Elements
|
|||||||
if (namespaces == null || !namespaces.Contains(styleNamespace))
|
if (namespaces == null || !namespaces.Contains(styleNamespace))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// 预注册常用路径
|
// 先提交绑定状态。StyleField.Register 可能同步触发外部渲染;若此时仍显示未绑定,
|
||||||
RegisterField("/cell/bg/color", OnStyleChanged);
|
// 同一对象会被再次 Bind 并重复注册,最终耗尽调用栈。
|
||||||
RegisterField("/cell/fg/color", OnStyleChanged);
|
|
||||||
RegisterField("/cell/border/top/color", OnStyleChanged);
|
|
||||||
RegisterField("/cell/border/bottom/color", OnStyleChanged);
|
|
||||||
RegisterField("/cell/border/left/color", OnStyleChanged);
|
|
||||||
RegisterField("/cell/border/right/color", OnStyleChanged);
|
|
||||||
RegisterField("/cell/font/size", OnStyleChanged);
|
|
||||||
RegisterField("/cell/font/alignment", OnStyleChanged);
|
|
||||||
RegisterField("/cell/font/richText", OnStyleChanged);
|
|
||||||
|
|
||||||
m_IsBound = true;
|
m_IsBound = true;
|
||||||
RefreshAll();
|
m_IsBinding = true;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// 预注册常用路径
|
||||||
|
RegisterField("/cell/bg/color", OnStyleChanged);
|
||||||
|
RegisterField("/cell/fg/color", OnStyleChanged);
|
||||||
|
RegisterField("/cell/border/top/color", OnStyleChanged);
|
||||||
|
RegisterField("/cell/border/bottom/color", OnStyleChanged);
|
||||||
|
RegisterField("/cell/border/left/color", OnStyleChanged);
|
||||||
|
RegisterField("/cell/border/right/color", OnStyleChanged);
|
||||||
|
RegisterField("/cell/font/size", OnStyleChanged);
|
||||||
|
RegisterField("/cell/font/alignment", OnStyleChanged);
|
||||||
|
RegisterField("/cell/font/richText", OnStyleChanged);
|
||||||
|
RefreshAll();
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
Unbind();
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
m_IsBinding = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
Reference in New Issue
Block a user