diff --git a/Editor/XTable/XericUIActionTableEditor.cs b/Editor/XTable/XericUIActionTableEditor.cs index 6767e6b..fdf44a0 100644 --- a/Editor/XTable/XericUIActionTableEditor.cs +++ b/Editor/XTable/XericUIActionTableEditor.cs @@ -182,6 +182,16 @@ namespace XericUIEditor.XTable EditorGUILayout.Space(4); + bool autoTemplate = EditorGUILayout.Toggle( + new GUIContent("自动维护 ScrollRect 模板", "关掉后表格不再补/重置 Viewport、Content、滚动条,可以自己替换"), + m_Table.AutoScrollTemplate); + if (autoTemplate != m_Table.AutoScrollTemplate) + { + Undo.RecordObject(m_Table, "Toggle Auto Scroll Template"); + m_Table.AutoScrollTemplate = autoTemplate; + EditorUtility.SetDirty(m_Table); + } + bool newShow = EditorGUILayout.Toggle("显示子项", m_ShowChildren); if (newShow != m_ShowChildren) { diff --git a/Runtime/XTable/Rendering/Component/XericUIActionTable.Border.cs b/Runtime/XTable/Rendering/Component/XericUIActionTable.Border.cs index 2015f3e..d338e77 100644 --- a/Runtime/XTable/Rendering/Component/XericUIActionTable.Border.cs +++ b/Runtime/XTable/Rendering/Component/XericUIActionTable.Border.cs @@ -38,7 +38,7 @@ namespace XericUI.XTable.Rendering.Component if (m_BorderRenderer != null) { // 顺带自愈旧对象的标记:运行期渲染物一律不可编辑,编辑期改动才不会被记成预制体覆盖。 - existing.gameObject.hideFlags = HideFlags.DontSave | HideFlags.HideInHierarchy | HideFlags.NotEditable; + existing.gameObject.hideFlags = HideFlags.DontSave | HideFlags.HideInHierarchy; // 图元渲染器的顶点原点是 rect 中心:把中心摆到左上角(pivot 0.5 + 锚位 0)。 PinPrimitiveRect(existing.transform as RectTransform, new Vector2(m_ContentOffset, -m_ContentOffset), m_TotalWidth, m_TotalHeight); @@ -48,7 +48,7 @@ namespace XericUI.XTable.Rendering.Component var go = new GameObject("_TableBorders", typeof(RectTransform), typeof(CanvasRenderer), typeof(UILineRendererV2)); - go.hideFlags = HideFlags.DontSave | HideFlags.HideInHierarchy | HideFlags.NotEditable; + go.hideFlags = HideFlags.DontSave | HideFlags.HideInHierarchy; go.transform.SetParent(contentT, false); RectTransform rt = go.GetComponent(); diff --git a/Runtime/XTable/Rendering/Component/XericUIActionTable.Editor.cs b/Runtime/XTable/Rendering/Component/XericUIActionTable.Editor.cs index 99bfffd..b0c3c5a 100644 --- a/Runtime/XTable/Rendering/Component/XericUIActionTable.Editor.cs +++ b/Runtime/XTable/Rendering/Component/XericUIActionTable.Editor.cs @@ -124,10 +124,9 @@ namespace XericUI.XTable.Rendering.Component var child = parent.GetChild(i); if ((child.gameObject.hideFlags & HideFlags.DontSave) != 0) { - // NotEditable 保留:看得见、不误改(编辑期改动不会被记成预制体覆盖)。 child.gameObject.hideFlags = visible - ? HideFlags.DontSave | HideFlags.NotEditable - : HideFlags.DontSave | HideFlags.NotEditable | HideFlags.HideInHierarchy; + ? HideFlags.DontSave + : HideFlags.DontSave | HideFlags.HideInHierarchy; } ApplyGeneratedVisibility(child, visible); } diff --git a/Runtime/XTable/Rendering/Component/XericUIActionTable.RendererFilter.cs b/Runtime/XTable/Rendering/Component/XericUIActionTable.RendererFilter.cs index a7caf5a..d9922e0 100644 --- a/Runtime/XTable/Rendering/Component/XericUIActionTable.RendererFilter.cs +++ b/Runtime/XTable/Rendering/Component/XericUIActionTable.RendererFilter.cs @@ -484,7 +484,7 @@ namespace XericUI.XTable.Rendering.Component #region 背景创建 /// 运行时渲染子物体的统一标记:不存盘、隐藏,且在编辑器里不可编辑(避免被记成预制体改动)。 - private const HideFlags RuntimeRendererFlags = HideFlags.DontSave | HideFlags.HideInHierarchy | HideFlags.NotEditable; + private const HideFlags RuntimeRendererFlags = HideFlags.DontSave | HideFlags.HideInHierarchy; private void CreateBackground() { diff --git a/Runtime/XTable/Rendering/Component/XericUIActionTable.ScrollTemplate.cs b/Runtime/XTable/Rendering/Component/XericUIActionTable.ScrollTemplate.cs index d2861bf..e5da63a 100644 --- a/Runtime/XTable/Rendering/Component/XericUIActionTable.ScrollTemplate.cs +++ b/Runtime/XTable/Rendering/Component/XericUIActionTable.ScrollTemplate.cs @@ -7,7 +7,8 @@ namespace XericUI.XTable.Rendering.Component { /// /// ScrollRect 模板:Viewport / Content / 横竖滚动条全部由表格自己生成,统一标记 - /// DontSave | NotEditable。结构照右键菜单「生成表格」(CreateTable)那一套。 + /// DontSave(不保存、但编辑器里可改)。结构照右键菜单「生成表格」(CreateTable)那一套。 + /// 表上的「自动维护 ScrollRect 模板」关掉后,这里整段不再碰它们。 /// /// 为什么整块都要管(2026-11-13 现场):这几个节点以前是手摆进预制体的。 /// 保存预制体时它们把运行时的尺寸/布局一起存进去(尺寸被写歪);把表格组件从预制体里 @@ -16,8 +17,8 @@ namespace XericUI.XTable.Rendering.Component /// public partial class XericUIActionTable { - /// 模板生成物的统一标记:不保存、不进编辑。 - private const HideFlags TemplateFlags = HideFlags.DontSave | HideFlags.NotEditable; + /// 模板生成物只标"不保存":编辑器里可以改(换样式/关节锚点),改动不会写进预制体。 + private const HideFlags TemplateFlags = HideFlags.DontSave; [NonSerialized] private RectTransform m_TemplateViewport; [NonSerialized] private RectTransform m_TemplateContent; @@ -35,6 +36,8 @@ namespace XericUI.XTable.Rendering.Component public void EnsureScrollTemplate() { if (m_ScrollRect == null) return; + // 关掉自动维护:缺了不补、有也不重置(用户可以自己替换这几个节点)。 + if (!m_AutoScrollTemplate) return; var self = rectTransform; if (self == null) return; diff --git a/Runtime/XTable/Rendering/Component/XericUIActionTable.cs b/Runtime/XTable/Rendering/Component/XericUIActionTable.cs index 72f429c..eff687c 100644 --- a/Runtime/XTable/Rendering/Component/XericUIActionTable.cs +++ b/Runtime/XTable/Rendering/Component/XericUIActionTable.cs @@ -55,6 +55,10 @@ namespace XericUI.XTable.Rendering.Component [Tooltip("在 Hierarchy 中显示动态生成的子对象(仅编辑器,不保存到场景)")] private bool m_ChildrenVisible; + [SerializeField] + [Tooltip("由表格自动补齐 ScrollRect 模板(Viewport/Content/滚动条)。关掉后表格不再碰它们,可以自己替换")] + private bool m_AutoScrollTemplate = true; + [SerializeField] private bool m_EnableSelectionAutoScroll = true; [SerializeField, Min(1f), Tooltip("框选自动滚动的 Content 边缘阈值(像素)")] private float m_SelectionAutoScrollEdgeThreshold = 32f; @@ -200,6 +204,21 @@ namespace XericUI.XTable.Rendering.Component set => SetChildrenVisible(value); } + /// + /// 是否由表格自动补齐 ScrollRect 模板(Viewport/Content/滚动条)。 + /// 关掉后表格不再碰这几个节点:缺了不补、有也不重置,可以自己替换样式。 + /// + public bool AutoScrollTemplate + { + get => m_AutoScrollTemplate; + set + { + if (m_AutoScrollTemplate == value) return; + m_AutoScrollTemplate = value; + MarkDirty(TableDirtyType.All); + } + } + /// 动态子对象挂载的父节点。 /// 若绑定了 ScrollRect 则使用其 Content,否则回退到自身的 rectTransform。 public Transform ContentTransform