@nocobase/client 1.9.13 → 1.9.15

package/es/index.mjs

@@ -11,7 +11,7 @@ var we = (e, t, n) => t in e ? Ee(e, t, { enumerable: !0, configurable: !0, writ
       Ne.call(t, n) && we(e, n, t[n]);
   return e;
 }, P = (e, t) => Oe(e, Ve(t));
-var Y = (e, t) => {
+var W = (e, t) => {
   var n = {};
   for (var o in e)
     Be.call(e, o) && t.indexOf(o) < 0 && (n[o] = e[o]);
@@ -4907,7 +4907,7 @@ function toSchema(e) {
 }
 const useMemoizedSchema = (e) => useMemo(() => toSchema(e), []), SchemaComponentOnChangeContext = createContext({ onChange: _.noop }), RecursionSchemaComponent = memo(
   (e) => {
-    const h = e, { components: t, scope: n, schema: o, distributed: r, onChange: a, parentSchema: i } = h, l = Y(h, ["components", "scope", "schema", "distributed", "onChange", "parentSchema"]), c = useContext(SchemaComponentContext), u = useMemo(() => toSchema(o), [o]), d = useMemo(
+    const h = e, { components: t, scope: n, schema: o, distributed: r, onChange: a, parentSchema: i } = h, l = W(h, ["components", "scope", "schema", "distributed", "onChange", "parentSchema"]), c = useContext(SchemaComponentContext), u = useMemo(() => toSchema(o), [o]), d = useMemo(
       () => P(x({}, c), {
         distributed: c.distributed == !1 ? !1 : r,
         /**
@@ -4930,14 +4930,14 @@ const useMemoizedSchema = (e) => useMemo(() => toSchema(e), []), SchemaComponent
 RecursionSchemaComponent.displayName = "RecursionSchemaComponent";
 const MemoizedSchemaComponent = memo(
   (e) => {
-    const a = e, { schema: t, parentSchema: n } = a, o = Y(a, ["schema", "parentSchema"]), r = useMemoizedSchema(t);
+    const a = e, { schema: t, parentSchema: n } = a, o = W(a, ["schema", "parentSchema"]), r = useMemoizedSchema(t);
     return /* @__PURE__ */ jsx(RecursionSchemaComponent, P(x({}, o), { schema: r, parentSchema: n }));
   }
 );
 MemoizedSchemaComponent.displayName = "MemoizedSchemaComponent";
 const SchemaComponent = memo(
   (e) => {
-    const o = e, { memoized: t } = o, n = Y(o, ["memoized"]);
+    const o = e, { memoized: t } = o, n = W(o, ["memoized"]);
     return t ? /* @__PURE__ */ jsx(MemoizedSchemaComponent, x({}, n)) : /* @__PURE__ */ jsx(RecursionSchemaComponent, x({}, n));
   }
 );
@@ -6658,14 +6658,15 @@ const InternalFormBlockProvider = (e) => {
   const e = useFormBlockContext(), { fieldSchema: t } = useActionContext();
   return e.type !== "create" && (t == null ? void 0 : t["x-acl-action"]) !== "create" && (t == null ? void 0 : t["x-action"]) !== "create";
 }, FormBlockProvider = withDynamicSchemaProps((e) => {
-  const t = useCollectionParentRecordData(), { parentRecord: n, action: o } = e, r = useCollectionRecordData(), { association: a } = e, i = useCollectionManager(), { __collection: l } = r || {}, { designable: c } = useDesignable(), u = e.collection || i.getCollection(a).name, d = useUpdate();
-  return !c && l && o && l !== u ? null : /* @__PURE__ */ jsx(TemplateBlockProvider, { onTemplateLoaded: d, children: /* @__PURE__ */ jsx(
+  var h;
+  const t = useCollectionParentRecordData(), { parentRecord: n, action: o } = e, r = useCollectionRecordData(), { association: a } = e, i = useCollectionManager(), { __collection: l } = r || {}, { designable: c } = useDesignable(), u = e.collection || i.getCollection(a).name, { fieldSchema: d } = useActionContext(), p = (h = d == null ? void 0 : d["x-component-props"]) == null ? void 0 : h.addChild, m = useUpdate();
+  return !c && l && o && l !== u ? null : /* @__PURE__ */ jsx(TemplateBlockProvider, { onTemplateLoaded: m, children: /* @__PURE__ */ jsx(
     BlockProvider,
     P(x({
       name: e.name || "form"
     }, e), {
       block: "form",
-      parentRecord: n || t,
+      parentRecord: p ? t : n || t,
       children: /* @__PURE__ */ jsx(FormActiveFieldsProvider, { name: "form", children: /* @__PURE__ */ jsx(InternalFormBlockProvider, x({}, e)) })
     })
   ) });
@@ -7899,7 +7900,7 @@ Object.keys(antIcons).forEach((e) => {
   registerIcon(e, antIcons[e]);
 });
 const Icon = (e) => {
-  const r = e, { type: t = "", component: n } = r, o = Y(r, ["type", "component"]);
+  const r = e, { type: t = "", component: n } = r, o = W(r, ["type", "component"]);
   if (n)
     return /* @__PURE__ */ jsx(antIcons__default, x({ component: n }, o));
   if (t && icons.has(t.toLowerCase())) {
@@ -7971,7 +7972,7 @@ class PluginSettingsManager {
     const o = this.hasAuth(t), r = this.getSetting(t);
     if (n && !o || !r)
       return null;
-    const a = Object.keys(r.children || {}).sort((p, m) => p.localeCompare(m)).map((p) => this.get(r.children[p].name, n)).filter(Boolean).sort((p, m) => (p.sort || 0) - (m.sort || 0)), d = r, { title: i, icon: l, aclSnippet: c } = d, u = Y(d, ["title", "icon", "aclSnippet"]);
+    const a = Object.keys(r.children || {}).sort((p, m) => p.localeCompare(m)).map((p) => this.get(r.children[p].name, n)).filter(Boolean).sort((p, m) => (p.sort || 0) - (m.sort || 0)), d = r, { title: i, icon: l, aclSnippet: c } = d, u = W(d, ["title", "icon", "aclSnippet"]);
     return P(x({
       isTopLevel: t === r.topLevelName
     }, u), {
@@ -7999,7 +8000,7 @@ const ApplicationContext = createContext(null);
 ApplicationContext.displayName = "ApplicationContext";
 const AppComponent = observer(
   (n) => {
-    var o = n, { children: e } = o, t = Y(o, ["children"]);
+    var o = n, { children: e } = o, t = W(o, ["children"]);
     var l;
     const { app: r } = t, a = useCallback((c, u) => {
       console.error(c);
@@ -8129,7 +8130,7 @@ class RouterManager {
       if (Object.keys(a).length === 1 && a.children)
         r.push(...n(a.children));
       else {
-        const i = a, { Component: l, element: c, children: u } = i, d = Y(i, ["Component", "element", "children"]);
+        const i = a, { Component: l, element: c, children: u } = i, d = W(i, ["Component", "element", "children"]);
         let p = c;
         l && (typeof l == "string" ? p = this.app.renderComponent(l) : p = React.createElement(l));
         const m = P(x({}, d), {
@@ -8168,7 +8169,7 @@ class RouterManager {
    * @internal
    */
   getRouterComponent(t) {
-    const d = this.options, { type: n = "browser" } = d, o = Y(d, ["type"]), r = {
+    const d = this.options, { type: n = "browser" } = d, o = W(d, ["type"]), r = {
       hash: createHashRouter,
       browser: createBrowserRouter,
       memory: createMemoryRouter
@@ -8476,7 +8477,7 @@ function withInitializer(e) {
   );
 }
 const SchemaInitializerSubMenuContext = React.createContext({}), SchemaInitializerMenuProvider = (e) => /* @__PURE__ */ jsx(SchemaInitializerSubMenuContext.Provider, { value: { isInMenu: !0 }, children: e.children }), useSchemaInitializerSubMenuContext = () => React.useContext(SchemaInitializerSubMenuContext), SchemaInitializerMenu = (e) => {
-  const { componentCls: t, hashId: n } = useSchemaInitializerStyles(), l = e, { items: o } = l, r = Y(l, ["items"]), { token: a } = theme.useToken(), i = useMemo(
+  const { componentCls: t, hashId: n } = useSchemaInitializerStyles(), l = e, { items: o } = l, r = W(l, ["items"]), { token: a } = theme.useToken(), i = useMemo(
     () => o.map((c) => P(x({}, c), {
       popupClassName: `${n} ${t}-menu-sub`
     })),
@@ -8525,7 +8526,7 @@ const SchemaInitializerSubMenuContext = React.createContext({}), SchemaInitializ
   ) });
 }, SchemaInitializerSubMenu = (e) => {
   var f;
-  const g = e, { children: t, items: n, title: o, name: r, onOpenChange: a, icon: i } = g, l = Y(g, ["children", "items", "title", "name", "onOpenChange", "icon"]), c = useCompile(), u = useSchemaInitializerItem(), d = useMemo(() => r || (u == null ? void 0 : u.name) || uid(), [r, u]), p = (f = n || t) == null ? void 0 : f.filter((C) => C.useVisible ? C.useVisible() : !0), m = useSchemaInitializerMenuItems(p, r), h = useMemo(() => [
+  const g = e, { children: t, items: n, title: o, name: r, onOpenChange: a, icon: i } = g, l = W(g, ["children", "items", "title", "name", "onOpenChange", "icon"]), c = useCompile(), u = useSchemaInitializerItem(), d = useMemo(() => r || (u == null ? void 0 : u.name) || uid(), [r, u]), p = (f = n || t) == null ? void 0 : f.filter((C) => C.useVisible ? C.useVisible() : !0), m = useSchemaInitializerMenuItems(p, r), h = useMemo(() => [
     P(x({}, l), {
       key: d,
       label: c(o),
@@ -8856,7 +8857,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.9.13", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.9.15", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
   "@ahooksjs/use-url-state": "3.5.1",
   "@ant-design/cssinjs": "^1.11.1",
   "@ant-design/icons": "^5.6.1",
@@ -8877,9 +8878,9 @@ const name = "@nocobase/client", version = "1.9.13", license = "AGPL-3.0", main
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.9.13",
-  "@nocobase/sdk": "1.9.13",
-  "@nocobase/utils": "1.9.13",
+  "@nocobase/evaluators": "1.9.15",
+  "@nocobase/sdk": "1.9.15",
+  "@nocobase/utils": "1.9.15",
   ahooks: "^3.7.2",
   antd: "5.24.2",
   "antd-mobile": "^5.41.1",
@@ -9520,7 +9521,7 @@ const useFieldComponentOptions = () => {
     e != null && e.title || (e.title = a((l = r == null ? void 0 : r.uiSchema) == null ? void 0 : l.title));
   }, [(i = r == null ? void 0 : r.uiSchema) == null ? void 0 : i.title]);
 }, useDef$4 = () => ({}), useProps = (e = {}) => {
-  const a = e, { useProps: t = useDef$4 } = a, n = Y(a, ["useProps"]);
+  const a = e, { useProps: t = useDef$4 } = a, n = W(a, ["useProps"]);
   let o = t;
   typeof t != "function" && (o = useDef$4);
   const r = o();
@@ -10161,7 +10162,7 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
     }, D["x-component-props"]), {
       width: R,
       schema: D,
-      render: (U, K, X) => /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: g, children: /* @__PURE__ */ jsx(
+      render: (U, K, Y) => /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: g, children: /* @__PURE__ */ jsx(
         TableCellRender,
         {
           record: K,
@@ -10170,7 +10171,7 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
           filterProperties: f,
           schemaToolbarBigger: C,
           field: r,
-          index: X
+          index: Y
         }
       ) }),
       onCell: (U, K) => ({
@@ -10256,7 +10257,7 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
   var m, g, f;
   const { token: t } = useToken$1(), n = (m = e["data-row-key"]) == null ? void 0 : m.toString(), { setNodeRef: o, active: r, over: a } = useSortable({
     id: n
-  }), h = e, { rowIndex: i } = h, l = Y(h, ["rowIndex"]), c = (a == null ? void 0 : a.id) == n, u = useMemo(() => {
+  }), h = e, { rowIndex: i } = h, l = W(h, ["rowIndex"]), c = (a == null ? void 0 : a.id) == n, u = useMemo(() => {
     const C = new TinyColor(t.colorSettings).setAlpha(0.6).toHex8String();
     return {
       topActiveClass: css`
@@ -10282,12 +10283,12 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
     })
   );
 }, SortHandle$2 = (e) => {
-  const a = e, { id: t } = a, n = Y(a, ["id"]), { listeners: o, setNodeRef: r } = useSortable({
+  const a = e, { id: t } = a, n = W(a, ["id"]), { listeners: o, setNodeRef: r } = useSortable({
     id: t
   });
   return /* @__PURE__ */ jsx(MenuOutlined, P(x(x({ ref: r }, n), o), { style: { cursor: "grab" } }));
 }, TableIndex$3 = (e) => {
-  const o = e, { index: t } = o, n = Y(o, ["index"]);
+  const o = e, { index: t } = o, n = W(o, ["index"]);
   return /* @__PURE__ */ jsx("div", P(x({ className: cls("nb-table-index"), style: { padding: "0 8px 0 16px" } }, n), { children: t }));
 }, pageSizeOptions$3 = [5, 10, 20, 50, 100, 200], usePaginationProps$3 = (e, t, n) => {
   var S, y, v, I, F, w;
@@ -10413,7 +10414,7 @@ const BodyRowComponent$1 = React.memo((e) => {
 });
 BodyRowComponent$1.displayName = "BodyRowComponent";
 const InternalBodyCellComponent$1 = React.memo((e) => {
-  const p = e, { record: t, schema: n, rowIndex: o, isSubTable: r } = p, a = Y(p, ["record", "schema", "rowIndex", "isSubTable"]), i = n == null ? void 0 : n[LinkageRuleDataKeyMap.style], [l, c] = useState({}), u = !!(n != null && n.properties) && Object.values(n.properties).some((m) => m["x-read-pretty"] === !0) || (n == null ? void 0 : n["x-action-column"]) === "actions", d = useMemo(
+  const p = e, { record: t, schema: n, rowIndex: o, isSubTable: r } = p, a = W(p, ["record", "schema", "rowIndex", "isSubTable"]), i = n == null ? void 0 : n[LinkageRuleDataKeyMap.style], [l, c] = useState({}), u = !!(n != null && n.properties) && Object.values(n.properties).some((m) => m["x-read-pretty"] === !0) || (n == null ? void 0 : n["x-action-column"]) === "actions", d = useMemo(
     () => x(x({ overflow: "hidden" }, e.style), l),
     [e.style, l]
   );
@@ -10445,7 +10446,7 @@ const TableElementRefContext = createContext(null), useTableElementRef = () => u
       columns: m,
       expandable: h,
       field: g
-    } = y, f = Y(y, [
+    } = y, f = W(y, [
       "tableHeight",
       "SortableWrapper",
       "tableSizeRefCallback",
@@ -10538,8 +10539,8 @@ InternalNocoBaseTable$1.displayName = "InternalNocoBaseTable";
 const Table$2 = withDynamicSchemaProps(
   withSkeletonComponent(
     observer$1((e) => {
-      var ye, se;
-      const { token: t } = useToken$1(), he = omit(e, ["onBlur", "onFocus"]), { pagination: n, useProps: o } = he, r = Y(he, ["pagination", "useProps"]), de = (o == null ? void 0 : o()) || {}, { pagination: a } = de, i = Y(de, ["pagination"]), be = x(x({}, r), i), {
+      var ye, ae;
+      const { token: t } = useToken$1(), ge = omit(e, ["onBlur", "onFocus"]), { pagination: n, useProps: o } = ge, r = W(ge, ["pagination", "useProps"]), pe = (o == null ? void 0 : o()) || {}, { pagination: a } = pe, i = W(pe, ["pagination"]), be = x(x({}, r), i), {
         dragSort: l = !1,
         showIndex: c = !0,
         onRowSelectionChange: u,
@@ -10551,7 +10552,7 @@ const Table$2 = withDynamicSchemaProps(
         loading: f,
         onClickRow: C,
         value: b
-      } = be, S = Y(be, [
+      } = be, S = W(be, [
         "dragSort",
         "showIndex",
         "onRowSelectionChange",
@@ -10564,7 +10565,7 @@ const Table$2 = withDynamicSchemaProps(
         "onClickRow",
         "value"
       ]), y = useArrayField$1(S), v = useFieldSchema(), { size: I = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, F = useCollection(), T = ((ye = v == null ? void 0 : v.parent) == null ? void 0 : ye["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: B, enableIndexColumn: N } = T, M = useMemoizedFn(S.onRowDragEnd || (() => {
-      })), j = usePaginationProps$3(n, a, e), R = useTableColumns$3(S, j), [O, $] = useState(() => D ? B : []), [A, E] = useState(((se = y == null ? void 0 : y.data) == null ? void 0 : se.selectedRowKeys) || []), [z, L] = useState([]), V = (p == null ? void 0 : p.type) !== "none", G = useRef(/* @__PURE__ */ new Map()), H = useMemo(() => css`
+      })), j = usePaginationProps$3(n, a, e), R = useTableColumns$3(S, j), [O, $] = useState(() => D ? B : []), [A, E] = useState(((ae = y == null ? void 0 : y.data) == null ? void 0 : ae.selectedRowKeys) || []), [z, L] = useState([]), V = (p == null ? void 0 : p.type) !== "none", G = useRef(/* @__PURE__ */ new Map()), H = useMemo(() => css`
           & > td {
             background-color: ${t.controlItemBgActive} !important;
           }
@@ -10573,109 +10574,109 @@ const Table$2 = withDynamicSchemaProps(
           }
         `, [t.controlItemBgActive, t.controlItemBgActiveHover]), U = useTableBlockContextBasicValue(), K = useRef(b);
       K.current = b, useEffect(() => {
-        var te;
-        U != null && U.field && (U.field.data = ((te = U.field) == null ? void 0 : te.data) || {}, U.field.data.clearSelectedRowKeys = () => {
+        var ne;
+        U != null && U.field && (U.field.data = ((ne = U.field) == null ? void 0 : ne.data) || {}, U.field.data.clearSelectedRowKeys = () => {
           U.field.data.selectedRowKeys = [], E([]);
         }, U.field.data.setSelectedRowKeys = E);
       }, [U == null ? void 0 : U.field]);
-      const X = useMemo(() => C ? H : "", [H, C]), W = useMemo(() => C ? (te, oe) => ({
-        onClick: (ae) => {
-          isPortalInBody(ae.target) || C(te, L, z);
+      const Y = useMemo(() => C ? H : "", [H, C]), X = useMemo(() => C ? (ne, oe) => ({
+        onClick: (ie) => {
+          isPortalInBody(ie.target) || C(ne, L, z);
         },
         rowIndex: oe,
-        record: te
-      }) : (te, oe) => ({
+        record: ne
+      }) : (ne, oe) => ({
         rowIndex: oe,
-        record: te
+        record: ne
       }), [C, z]);
       useDeepCompareEffect(() => {
-        const te = D ? B : [];
-        _.isEqual(te, O) || $(te);
+        const ne = D ? B : [];
+        _.isEqual(ne, O) || $(ne);
       }, [D, B]);
-      const J = useCallback((te) => {
+      const Q = useCallback((ne) => {
         if (m)
-          return Z(te);
-        if (te.key)
-          return te.key;
-        if (G.current.has(te))
-          return G.current.get(te);
+          return ee(ne);
+        if (ne.key)
+          return ne.key;
+        if (G.current.has(ne))
+          return G.current.get(ne);
         const oe = uid();
-        return G.current.set(te, oe), oe;
-      }, []), Z = useCallback(
-        (te) => {
+        return G.current.set(ne, oe), oe;
+      }, []), ee = useCallback(
+        (ne) => {
           var oe;
-          return Array.isArray(m) ? m.map((ae) => {
-            var le;
-            return ((le = te[ae]) == null ? void 0 : le.toString()) || "";
-          }).join("-") : typeof m == "string" ? te[m] : (oe = (m != null ? m : J)(te)) == null ? void 0 : oe.toString();
+          return Array.isArray(m) ? m.map((ie) => {
+            var ce;
+            return ((ce = ne[ie]) == null ? void 0 : ce.toString()) || "";
+          }).join("-") : typeof m == "string" ? ne[m] : (oe = (m != null ? m : Q)(ne)) == null ? void 0 : oe.toString();
         },
-        [JSON.stringify(m), J]
-      ), Q = useMemo(() => (Array.isArray(b) ? b : []).filter(Boolean), [b, b == null ? void 0 : b.length]), ee = useMemo(() => (te) => {
-        const oe = useCallback((ae) => {
+        [JSON.stringify(m), Q]
+      ), J = useMemo(() => (Array.isArray(b) ? b : []).filter(Boolean), [b, b == null ? void 0 : b.length]), Z = useMemo(() => (ne) => {
+        const oe = useCallback((ie) => {
           var ve, Pe, Fe, Ie, ke, De, je, Me;
-          if (!ae.active || !ae.over) {
+          if (!ie.active || !ie.over) {
             console.warn("move cancel");
             return;
           }
-          const le = (Fe = (Pe = (ve = ae.active) == null ? void 0 : ve.data.current) == null ? void 0 : Pe.sortable) == null ? void 0 : Fe.index, ue = (De = (ke = (Ie = ae.over) == null ? void 0 : Ie.data.current) == null ? void 0 : ke.sortable) == null ? void 0 : De.index, Se = ((je = K.current) == null ? void 0 : je[le]) || ae.active, Ae = ((Me = K.current) == null ? void 0 : Me[ue]) || ae.over;
-          y.move(le, ue), M({ from: Se, to: Ae });
+          const ce = (Fe = (Pe = (ve = ie.active) == null ? void 0 : ve.data.current) == null ? void 0 : Pe.sortable) == null ? void 0 : Fe.index, de = (De = (ke = (Ie = ie.over) == null ? void 0 : Ie.data.current) == null ? void 0 : ke.sortable) == null ? void 0 : De.index, Se = ((je = K.current) == null ? void 0 : je[ce]) || ie.active, Ae = ((Me = K.current) == null ? void 0 : Me[de]) || ie.over;
+          y.move(ce, de), M({ from: Se, to: Ae });
         }, []);
-        return /* @__PURE__ */ jsx(DndContext, { onDragEnd: oe, children: /* @__PURE__ */ jsx("tbody", x({}, te)) });
+        return /* @__PURE__ */ jsx(DndContext, { onDragEnd: oe, children: /* @__PURE__ */ jsx("tbody", x({}, ne)) });
       }, [y, M]);
-      ee.displayName = "BodyWrapperComponent";
-      const ne = useMemo(() => ({
+      Z.displayName = "BodyWrapperComponent";
+      const te = useMemo(() => ({
         header: {
           wrapper: HeaderWrapperComponent$1,
           cell: HeaderCellComponent$1
         },
         body: {
-          wrapper: ee,
+          wrapper: Z,
           row: BodyRowComponent$1,
           cell: BodyCellComponent$1
         }
-      }), [ee]), re = useMemo(() => p, [JSON.stringify(p)]), ie = useMemo(
+      }), [Z]), re = useMemo(() => p, [JSON.stringify(p)]), se = useMemo(
         () => ({
           rowSelection: N !== !1 && re ? x({
             type: "checkbox",
             selectedRowKeys: A,
-            onChange(te, oe) {
-              y.data = y.data || {}, y.data.selectedRowKeys = te, y.data.selectedRowData = oe, E(te), u == null || u(te, oe, E);
+            onChange(ne, oe) {
+              y.data = y.data || {}, y.data.selectedRowKeys = ne, y.data.selectedRowData = oe, E(ne), u == null || u(ne, oe, E);
             },
-            onSelect: (te, oe, ae, le) => {
-              var ue;
-              U && (U.field.data = ((ue = U.field) == null ? void 0 : ue.data) || {}, U.field.data.selectedRecord = te, U.field.data.selected = oe);
+            onSelect: (ne, oe, ie, ce) => {
+              var de;
+              U && (U.field.data = ((de = U.field) == null ? void 0 : de.data) || {}, U.field.data.selectedRecord = ne, U.field.data.selected = oe);
             },
-            getCheckboxProps(te) {
+            getCheckboxProps(ne) {
               return {
                 "aria-label": "checkbox"
               };
             },
-            renderCell: (te, oe, ae, le) => {
+            renderCell: (ne, oe, ie, ce) => {
               if (!l && !c)
-                return le;
-              const ue = j == null ? void 0 : j.current, Se = (j == null ? void 0 : j.pageSize) || 20;
-              return ue ? ae = ae + (ue - 1) * Se + 1 : ae = ae + 1, oe.__index && (ae = extractIndex(oe.__index)), /* @__PURE__ */ jsxs(
+                return ce;
+              const de = j == null ? void 0 : j.current, Se = (j == null ? void 0 : j.pageSize) || 20;
+              return de ? ie = ie + (de - 1) * Se + 1 : ie = ie + 1, oe.__index && (ie = extractIndex(oe.__index)), /* @__PURE__ */ jsxs(
                 "div",
                 {
                   role: "button",
-                  "aria-label": `table-index-${ae}`,
-                  className: cls(te ? "checked" : null, rowSelectCheckboxWrapperClass$1, {
+                  "aria-label": `table-index-${ie}`,
+                  className: cls(ne ? "checked" : null, rowSelectCheckboxWrapperClass$1, {
                     [rowSelectCheckboxWrapperClassHover$1]: V
                   }),
                   children: [
-                    /* @__PURE__ */ jsxs("div", { className: cls(te ? "checked" : null, rowSelectCheckboxContentClass$1), children: [
-                      l && /* @__PURE__ */ jsx(SortHandle$2, { id: Z(oe) }),
-                      c && /* @__PURE__ */ jsx(TableIndex$3, { index: ae })
+                    /* @__PURE__ */ jsxs("div", { className: cls(ne ? "checked" : null, rowSelectCheckboxContentClass$1), children: [
+                      l && /* @__PURE__ */ jsx(SortHandle$2, { id: ee(oe) }),
+                      c && /* @__PURE__ */ jsx(TableIndex$3, { index: ie })
                     ] }),
                     V && /* @__PURE__ */ jsx(
                       "div",
                       {
                         className: cls(
                           "nb-origin-node",
-                          te ? "checked" : null,
+                          ne ? "checked" : null,
                           rowSelectCheckboxCheckedClassHover$1
                         ),
-                        children: le
+                        children: ce
                       }
                     )
                   ]
@@ -10691,62 +10692,62 @@ const Table$2 = withDynamicSchemaProps(
           c,
           l,
           y,
-          Z,
+          ee,
           V,
           re,
           j,
           U,
           N
         ]
-      ), pe = useCallback(
-        ({ children: te }) => {
-          var oe, ae;
+      ), ue = useCallback(
+        ({ children: ne }) => {
+          var oe, ie;
           return l ? React.createElement(
             SortableContext$1,
             {
-              items: ((ae = (oe = K.current) == null ? void 0 : oe.map) == null ? void 0 : ae.call(oe, Z)) || []
+              items: ((ie = (oe = K.current) == null ? void 0 : oe.map) == null ? void 0 : ie.call(oe, ee)) || []
             },
-            te
-          ) : React.createElement(React.Fragment, {}, te);
+            ne
+          ) : React.createElement(React.Fragment, {}, ne);
         },
-        [l, Z]
+        [l, ee]
         // Don't put 'value' in dependencies, otherwise it will cause the dropdown component to disappear immediately when adding association fields to the table
-      ), { height: ce, tableSizeRefCallback: fe } = useTableSize(), ge = useMemo(() => ({
+      ), { height: le, tableSizeRefCallback: me } = useTableSize(), xe = useMemo(() => ({
         x: "max-content",
-        y: ce
-      }), [ce, Q]), Ce = useCallback(
-        (te) => z.includes(te[m]) ? X : "",
-        [z, X, JSON.stringify(m)]
-      ), me = useCallback(
-        (te, oe) => {
-          const ae = te ? [...O, oe[F.getPrimaryKey()]] : O.filter((le) => oe[F.getPrimaryKey()] !== le);
-          $(ae), g == null || g(te, oe);
+        y: le
+      }), [le, J]), Ce = useCallback(
+        (ne) => z.includes(ne[m]) ? Y : "",
+        [z, Y, JSON.stringify(m)]
+      ), he = useCallback(
+        (ne, oe) => {
+          const ie = ne ? [...O, oe[F.getPrimaryKey()]] : O.filter((ce) => oe[F.getPrimaryKey()] !== ce);
+          $(ie), g == null || g(ne, oe);
         },
         [O, g, F]
-      ), xe = useMemo(() => ({
-        onExpand: me,
+      ), fe = useMemo(() => ({
+        onExpand: he,
         expandedRowKeys: O
-      }), [O, me]);
+      }), [O, he]);
       return (
         // If spinning is set to undefined, it will cause the subtable to always display loading, so we need to convert it here.
         // We use Spin here instead of Table's loading prop because using Spin here reduces unnecessary re-renders.
         /* @__PURE__ */ jsx(HighPerformanceSpin, { spinning: !!f, children: /* @__PURE__ */ jsx(BlockRequestLoadingContext.Provider, { value: !1, children: /* @__PURE__ */ jsx(
           InternalNocoBaseTable$1,
           P(x(x({
-            tableHeight: ce,
-            SortableWrapper: pe,
-            tableSizeRefCallback: fe,
-            defaultRowKey: J,
-            dataSource: Q
-          }, S), ie), {
+            tableHeight: le,
+            SortableWrapper: ue,
+            tableSizeRefCallback: me,
+            defaultRowKey: Q,
+            dataSource: J
+          }, S), se), {
             paginationProps: j,
-            components: ne,
+            components: te,
             onTableChange: d,
-            onRow: W,
+            onRow: X,
             rowClassName: Ce,
-            scroll: ge,
+            scroll: xe,
             columns: R,
-            expandable: xe,
+            expandable: fe,
             field: y,
             size: I
           })
@@ -10980,7 +10981,7 @@ const InternalTableBlockProvider = (e) => {
     [t, p]
   ), F = useCallback(
     (R, O, $, A) => {
-      var Z;
+      var ee;
       const {
         association: E = !1,
         cached: z = {},
@@ -10990,30 +10991,30 @@ const InternalTableBlockProvider = (e) => {
         exceptInterfaces: H = [],
         prefixFieldValue: U = "",
         usePrefix: K = !1,
-        dataSource: X
+        dataSource: Y
       } = A || {};
       if (L.length - 1 > V)
         return;
       if (z[R])
         return _.cloneDeep(z[R]);
       O && typeof O == "string" && (O = [O]), $ && typeof $ == "string" && ($ = [$]);
-      const W = b(R, X), J = (Z = W == null ? void 0 : W.filter(
-        (Q) => Q.interface && !H.includes(Q.interface) && (G || O && O.includes(Q.type) || $ && $.includes(Q.interface) || (E && Q.target && Q.target !== R && Array.isArray(E) ? E.includes(Q.interface) : !1))
-      )) == null ? void 0 : Z.map((Q) => {
-        var ne, re;
-        const ee = x({
-          value: K && U ? `${U}.${Q.name}` : Q.name,
-          label: f((ne = Q == null ? void 0 : Q.uiSchema) == null ? void 0 : ne.title) || Q.name
-        }, Q);
-        return E && Q.target && (ee.children = L.includes(Q.target) ? [] : F(Q.target, O, $, P(x({}, A), {
+      const X = b(R, Y), Q = (ee = X == null ? void 0 : X.filter(
+        (J) => J.interface && !H.includes(J.interface) && (G || O && O.includes(J.type) || $ && $.includes(J.interface) || (E && J.target && J.target !== R && Array.isArray(E) ? E.includes(J.interface) : !1))
+      )) == null ? void 0 : ee.map((J) => {
+        var te, re;
+        const Z = x({
+          value: K && U ? `${U}.${J.name}` : J.name,
+          label: f((te = J == null ? void 0 : J.uiSchema) == null ? void 0 : te.title) || J.name
+        }, J);
+        return E && J.target && (Z.children = L.includes(J.target) ? [] : F(J.target, O, $, P(x({}, A), {
           cached: z,
-          dataSource: X,
-          collectionNames: [...L, Q.target],
-          prefixFieldValue: K ? U ? `${U}.${Q.name}` : Q.name : "",
+          dataSource: Y,
+          collectionNames: [...L, J.target],
+          prefixFieldValue: K ? U ? `${U}.${J.name}` : J.name : "",
           usePrefix: K
-        })), !((re = ee.children) != null && re.length)) ? null : ee;
+        })), !((re = Z.children) != null && re.length)) ? null : Z;
       }).filter(Boolean);
-      return z[R] = J, J;
+      return z[R] = Q, Q;
     },
     [b]
   ), w = useCallback(
@@ -11085,7 +11086,7 @@ function SelectWithTitle(i) {
     onChange: n,
     options: o,
     fieldNames: r
-  } = l, a = Y(l, [
+  } = l, a = W(l, [
     "title",
     "defaultValue",
     "onChange",
@@ -11133,7 +11134,7 @@ const DataSourceApplicationProvider = (o) => {
   var r = o, {
     children: e,
     dataSourceManager: t
-  } = r, n = Y(r, [
+  } = r, n = W(r, [
     "children",
     "dataSourceManager"
   ]);
@@ -11610,10 +11611,10 @@ const AllDataBlocksContext = React.createContext({
     getAllDataBlocks: t
   };
 }, WithForm$1 = (e) => {
-  const c = e, { children: t, form: n } = c, o = Y(c, ["children", "form"]), r = useContext(SchemaOptionsContext), a = useContext(SchemaExpressionScopeContext), i = x(x({}, r == null ? void 0 : r.scope), a), l = x({}, r == null ? void 0 : r.components);
+  const c = e, { children: t, form: n } = c, o = W(c, ["children", "form"]), r = useContext(SchemaOptionsContext), a = useContext(SchemaExpressionScopeContext), i = x(x({}, r == null ? void 0 : r.scope), a), l = x({}, r == null ? void 0 : r.components);
   return /* @__PURE__ */ jsx(FormProvider$1, P(x({}, o), { form: n, children: /* @__PURE__ */ jsx(SchemaComponentOptions, { components: l, scope: i, children: t }) }));
 }, WithoutForm$1 = (e) => {
-  const c = e, { children: t } = c, n = Y(c, ["children"]), o = useContext(SchemaOptionsContext), r = useContext(SchemaExpressionScopeContext), a = x(x({}, o == null ? void 0 : o.scope), r), i = x({}, o == null ? void 0 : o.components), l = useMemo(() => createForm(), []);
+  const c = e, { children: t } = c, n = W(c, ["children"]), o = useContext(SchemaOptionsContext), r = useContext(SchemaExpressionScopeContext), a = x(x({}, o == null ? void 0 : o.scope), r), i = x({}, o == null ? void 0 : o.components), l = useMemo(() => createForm(), []);
   return /* @__PURE__ */ jsx(FormProvider$1, P(x({}, n), { form: l, children: /* @__PURE__ */ jsx(SchemaComponentOptions, { components: i, scope: a, children: t }) }));
 }, FormProvider = (e) => e.form ? /* @__PURE__ */ jsx(WithForm$1, x({}, e)) : /* @__PURE__ */ jsx(WithoutForm$1, x({}, e)), CollectionHistoryContext = createContext({
   historyCollections: [],
@@ -12255,7 +12256,7 @@ const designerCss$4 = ({ margin: e = "-18px -16px", padding: t = "18px 16px" } =
 }, SchemaToolbarContext = createContext({});
 SchemaToolbarContext.displayName = "SchemaToolbarContext";
 const SchemaToolbarProvider = (e) => {
-  const o = e, { children: t } = o, n = Y(o, ["children"]);
+  const o = e, { children: t } = o, n = W(o, ["children"]);
   return /* @__PURE__ */ jsx(SchemaToolbarContext.Provider, { value: n, children: t });
 };
 function useSchemaToolbar() {
@@ -13099,7 +13100,7 @@ const useCurrentUserSettingsMenu = () => {
     [e, t]
   );
 }, filterProperties = (e) => e["x-component"] === "Action.Container", FieldLink = (e) => {
-  const d = e, { WrappedComponent: t } = d, n = Y(d, ["WrappedComponent"]), o = useFieldSchema(), { openPopup: r } = usePopupUtils(), a = useRef(!1), i = useInsertSchema(), l = useRef(o);
+  const d = e, { WrappedComponent: t } = d, n = W(d, ["WrappedComponent"]), o = useFieldSchema(), { openPopup: r } = usePopupUtils(), a = useRef(!1), i = useInsertSchema(), l = useRef(o);
   l.current = o;
   const c = useCallback(() => l.current, []), u = useCallback(() => {
     o.properties || (i(popupSchema), a.current = !0), a.current ? (setTimeout(() => {
@@ -14614,7 +14615,10 @@ const getActionContext = (e) => {
             getAllCollectionsInheritChain: h
           }),
           renderSchemaComponent: function(G) {
-            const H = useMemo(() => _.cloneDeep(D) || {}, []);
+            const H = useMemo(
+              () => _.cloneDeep(D.toJSON()) || {},
+              []
+            );
             H["x-read-pretty"] = !1, H["x-disabled"] = !1, _.set(H, "x-decorator-props.showTitle", !1);
             const U = getFieldDefaultValue(H, T);
             T.target && H["x-component-props"] && (H["x-component-props"].mode = "Select"), T != null && T.uiSchema.type && (H.type = T.uiSchema.type), (T == null ? void 0 : T.uiSchema["x-component"]) === "Checkbox" && (_.set(H, "x-component-props.defaultChecked", U), H.type = "void");
@@ -15592,11 +15596,11 @@ const useGetFilterOptions = () => {
         defaultFilter: ((z = (E = (A = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : A.service) == null ? void 0 : E.params) == null ? void 0 : z.filter) || {},
         form: r,
         onSubmit: ({ filter: H }) => {
-          var K, X;
+          var K, Y;
           H = removeNullCondition(H), set(l.componentProps, "service.params.filter", H), n["x-component-props"] = l.componentProps;
-          const U = (X = l.path) == null ? void 0 : X.splice(((K = l.path) == null ? void 0 : K.length) - 1, 1);
-          l.form.query(`${U.concat("*." + n.name)}`).forEach((W) => {
-            W.componentProps.service = W.componentProps.service || { params: {} }, W.componentProps.service.params.filter = H;
+          const U = (Y = l.path) == null ? void 0 : Y.splice(((K = l.path) == null ? void 0 : K.length) - 1, 1);
+          l.form.query(`${U.concat("*." + n.name)}`).forEach((X) => {
+            X.componentProps.service = X.componentProps.service || { params: {} }, X.componentProps.service.params.filter = H;
           }), d.emit("patch", {
             schema: {
               "x-uid": n["x-uid"],
@@ -15680,14 +15684,14 @@ const useGetFilterOptions = () => {
         options: m,
         value: p == null ? void 0 : p.label,
         onChange: (H) => {
-          var X, W, J, Z, Q;
-          const U = P(x(x({}, (W = (X = o == null ? void 0 : o.uiSchema) == null ? void 0 : X["x-component-props"]) == null ? void 0 : W.fieldNames), (J = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : J.fieldNames), {
+          var Y, X, Q, ee, J;
+          const U = P(x(x({}, (X = (Y = o == null ? void 0 : o.uiSchema) == null ? void 0 : Y["x-component-props"]) == null ? void 0 : X.fieldNames), (Q = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : Q.fieldNames), {
             label: H
           });
           _.set(n, "x-component-props.fieldNames", U);
-          const K = (Q = l.path) == null ? void 0 : Q.splice(((Z = l.path) == null ? void 0 : Z.length) - 1, 1);
-          l.form.query(`${K.concat("*." + n.name)}`).forEach((ee) => {
-            ee.componentProps.fieldNames = U;
+          const K = (J = l.path) == null ? void 0 : J.splice(((ee = l.path) == null ? void 0 : ee.length) - 1, 1);
+          l.form.query(`${K.concat("*." + n.name)}`).forEach((Z) => {
+            Z.componentProps.fieldNames = U;
           }), d.emit("patch", {
             schema: {
               "x-uid": n["x-uid"],
@@ -15741,14 +15745,14 @@ const useGetFilterOptions = () => {
         title: c("Required"),
         checked: n.required,
         onChange: (H) => {
-          var X, W;
+          var Y, X;
           const U = {
             "x-uid": n["x-uid"]
           };
           n.required = H, U.required = H;
-          const K = (W = l.path) == null ? void 0 : W.splice(((X = l.path) == null ? void 0 : X.length) - 1, 1);
-          l.form.query(`${K.concat("*." + n.name)}`).forEach((J) => {
-            J.required = H;
+          const K = (X = l.path) == null ? void 0 : X.splice(((Y = l.path) == null ? void 0 : Y.length) - 1, 1);
+          l.form.query(`${K.concat("*." + n.name)}`).forEach((Q) => {
+            Q.required = H;
           }), d.emit("patch", {
             schema: U
           }), d.refresh();
@@ -15767,26 +15771,26 @@ const useGetFilterOptions = () => {
         ],
         value: T,
         onChange: (H) => {
-          var X, W;
+          var Y, X;
           const U = {
             "x-uid": n["x-uid"]
-          }, K = (W = l.path) == null ? void 0 : W.splice(((X = l.path) == null ? void 0 : X.length) - 1, 1);
+          }, K = (X = l.path) == null ? void 0 : X.splice(((Y = l.path) == null ? void 0 : Y.length) - 1, 1);
           switch (H) {
             case "readonly": {
-              n["x-read-pretty"] = !1, n["x-disabled"] = !0, U["x-read-pretty"] = !1, U["x-disabled"] = !0, l.form.query(`${K.concat("*." + n.name)}`).forEach((J) => {
-                J.readonly = !0, J.disabled = !0;
+              n["x-read-pretty"] = !1, n["x-disabled"] = !0, U["x-read-pretty"] = !1, U["x-disabled"] = !0, l.form.query(`${K.concat("*." + n.name)}`).forEach((Q) => {
+                Q.readonly = !0, Q.disabled = !0;
               });
               break;
             }
             case "read-pretty": {
-              n["x-read-pretty"] = !0, n["x-disabled"] = !1, U["x-read-pretty"] = !0, U["x-disabled"] = !1, l.form.query(`${K.concat("*." + n.name)}`).forEach((J) => {
-                J.readPretty = !0;
+              n["x-read-pretty"] = !0, n["x-disabled"] = !1, U["x-read-pretty"] = !0, U["x-disabled"] = !1, l.form.query(`${K.concat("*." + n.name)}`).forEach((Q) => {
+                Q.readPretty = !0;
               });
               break;
             }
             default: {
-              n["x-read-pretty"] = !1, n["x-disabled"] = !1, U["x-read-pretty"] = !1, U["x-disabled"] = !1, l.form.query(`${K.concat("*." + n.name)}`).forEach((J) => {
-                J.readPretty = !1, J.disabled + !1;
+              n["x-read-pretty"] = !1, n["x-disabled"] = !1, U["x-read-pretty"] = !1, U["x-disabled"] = !1, l.form.query(`${K.concat("*." + n.name)}`).forEach((Q) => {
+                Q.readPretty = !1, Q.disabled + !1;
               });
               break;
             }
@@ -15804,10 +15808,10 @@ const useGetFilterOptions = () => {
       {
         fieldSchema: n,
         onSubmitCallBack: (H) => {
-          var K, X;
-          const U = (X = l.path) == null ? void 0 : X.splice(((K = l.path) == null ? void 0 : K.length) - 1, 1);
-          l.form.query(`${U.concat("*." + n.name)}`).forEach((W) => {
-            W.componentProps.service = W.componentProps.service || { params: {} }, W.componentProps.service.params.sort = H;
+          var K, Y;
+          const U = (Y = l.path) == null ? void 0 : Y.splice(((K = l.path) == null ? void 0 : K.length) - 1, 1);
+          l.form.query(`${U.concat("*." + n.name)}`).forEach((X) => {
+            X.componentProps.service = X.componentProps.service || { params: {} }, X.componentProps.service.params.sort = H;
           });
         }
       }
@@ -16537,7 +16541,7 @@ function useFieldComponentName() {
   return c[u] || u;
 }
 const SchemaSettingsChildErrorFallback = (e) => {
-  const o = e, { title: t } = o, n = Y(o, ["title"]);
+  const o = e, { title: t } = o, n = W(o, ["title"]);
   return /* @__PURE__ */ jsx(SchemaSettingsItem, { title: t, children: /* @__PURE__ */ jsx(ErrorFallback.Modal, x({}, n)) });
 }, getFallbackComponent = _.memoize((e) => (t) => /* @__PURE__ */ jsx(SchemaSettingsChildErrorFallback, P(x({}, t), { title: e }))), SchemaSettingsChildren = (e) => {
   const { children: t } = e, { visible: n } = useSchemaSettings(), o = useRef(!1), r = useFieldComponentName();
@@ -16596,7 +16600,7 @@ const SchemaSettingsChildErrorFallback = (e) => {
 });
 SchemaSettingsIcon.displayName = "SchemaSettingsIcon";
 const SchemaSettingsWrapper = React.memo((e) => {
-  const p = e, { items: t, Component: n = SchemaSettingsIcon, name: o, componentProps: r, style: a } = p, i = Y(p, ["items", "Component", "name", "componentProps", "style"]), { dn: l } = useDesignable(), c = useField(), u = useFieldSchema(), d = useMemo(
+  const p = e, { items: t, Component: n = SchemaSettingsIcon, name: o, componentProps: r, style: a } = p, i = W(p, ["items", "Component", "name", "componentProps", "style"]), { dn: l } = useDesignable(), c = useField(), u = useFieldSchema(), d = useMemo(
     () => x({
       options: e,
       style: a
@@ -17395,7 +17399,7 @@ const useFormItemInitializerFields = (e) => {
     template: i,
     settings: l,
     action: c = "list"
-  } = m, u = Y(m, [
+  } = m, u = W(m, [
     "formItemInitializers",
     "actionInitializers",
     "collection",
@@ -17471,7 +17475,7 @@ const useFormItemInitializerFields = (e) => {
     template: d,
     title: p,
     settings: m
-  } = C, h = Y(C, [
+  } = C, h = W(C, [
     "formItemInitializers",
     "actionInitializers",
     "collection",
@@ -17543,7 +17547,7 @@ const useFormItemInitializerFields = (e) => {
     resource: i,
     template: l,
     settings: c
-  } = m, u = Y(m, [
+  } = m, u = W(m, [
     "formItemInitializers",
     "actionInitializers",
     "collection",
@@ -17609,7 +17613,7 @@ const useFormItemInitializerFields = (e) => {
     dataSource: c,
     blockType: u,
     pageSize: d = 20
-  } = h, p = Y(h, [
+  } = h, p = W(h, [
     "collection",
     "rowKey",
     "tableActionInitializers",
@@ -18181,7 +18185,7 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
     }
   ) })) : null;
 }, InternalSchemaToolbar = React.memo((e) => {
-  var X;
+  var Y;
   const t = useFieldSchema(), {
     title: n,
     initializer: o,
@@ -18212,46 +18216,46 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
     o || (t == null ? void 0 : t["x-initializer"]),
     t == null ? void 0 : t["x-initializer-props"]
   ), A = useGridRowContext(), E = useGridContext(), z = useMemo(() => {
-    var W;
+    var X;
     return {
       insertPosition: "afterEnd",
-      wrap: ((W = A == null ? void 0 : A.cols) == null ? void 0 : W.length) === 1 ? gridRowColWrap : void 0,
-      Component: (J) => /* @__PURE__ */ jsx(
+      wrap: ((X = A == null ? void 0 : A.cols) == null ? void 0 : X.length) === 1 ? gridRowColWrap : void 0,
+      Component: (Q) => /* @__PURE__ */ jsx(
         PlusOutlined,
-        P(x({}, J), {
+        P(x({}, Q), {
           role: "button",
           "aria-label": v("schema-initializer"),
           style: { cursor: "pointer", fontSize: 14 }
         })
       )
     };
-  }, [v, (X = A == null ? void 0 : A.cols) == null ? void 0 : X.length]), L = useMemo(() => u === !1 || C === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": v("drag-handler") }) }), [u, v, C]), V = useMemo(() => {
-    var W;
+  }, [v, (Y = A == null ? void 0 : A.cols) == null ? void 0 : Y.length]), L = useMemo(() => u === !1 || C === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": v("drag-handler") }) }), [u, v, C]), V = useMemo(() => {
+    var X;
     if (o === !1)
       return null;
     if ($)
       return O(z);
     if (E != null && E.InitializerComponent || E != null && E.renderSchemaInitializer)
-      return E != null && E.InitializerComponent ? /* @__PURE__ */ jsx(E.InitializerComponent, x({}, z)) : (W = E.renderSchemaInitializer) == null ? void 0 : W.call(E, z);
+      return E != null && E.InitializerComponent ? /* @__PURE__ */ jsx(E.InitializerComponent, x({}, z)) : (X = E.renderSchemaInitializer) == null ? void 0 : X.call(E, z);
   }, [E, o, z, $, O]), G = useMemo(() => r !== !1 && R ? j() : null, [R, j, r]), H = useRef(null), U = "hidden";
   useEffect(() => {
-    const W = H.current;
-    let J = W == null ? void 0 : W.parentElement;
-    for (; J && J.clientHeight === 0; )
-      J = J.parentElement;
-    const Z = g || J;
-    if (!Z)
+    const X = H.current;
+    let Q = X == null ? void 0 : X.parentElement;
+    for (; Q && Q.clientHeight === 0; )
+      Q = Q.parentElement;
+    const ee = g || Q;
+    if (!ee)
       return;
-    function Q() {
-      var ne;
-      W && (W.classList.remove(U), (ne = e.onVisibleChange) == null || ne.call(e, !0));
+    function J() {
+      var te;
+      X && (X.classList.remove(U), (te = e.onVisibleChange) == null || te.call(e, !0));
     }
-    function ee() {
-      var ne;
-      W && (W.classList.add(U), (ne = e.onVisibleChange) == null || ne.call(e, !1));
+    function Z() {
+      var te;
+      X && (X.classList.add(U), (te = e.onVisibleChange) == null || te.call(e, !1));
     }
-    return Z.addEventListener("mouseenter", Q), Z.addEventListener("mouseleave", ee), () => {
-      Z.removeEventListener("mouseenter", Q), Z.removeEventListener("mouseleave", ee);
+    return ee.addEventListener("mouseenter", J), ee.addEventListener("mouseleave", Z), () => {
+      ee.removeEventListener("mouseenter", J), ee.removeEventListener("mouseleave", Z);
     };
   }, [e.onVisibleChange, g]);
   const K = useMemo(
@@ -20272,7 +20276,7 @@ function getSelectedIdFilter(e) {
   } : null;
 }
 function SelectItem(e) {
-  const i = e, { title: t, options: n, value: o, onChange: r } = i, a = Y(i, ["title", "options", "value", "onChange"]);
+  const i = e, { title: t, options: n, value: o, onChange: r } = i, a = W(i, ["title", "options", "value", "onChange"]);
   return /* @__PURE__ */ jsx(SchemaSettingsItem, P(x({ title: t }, a), { children: /* @__PURE__ */ jsxs("div", { style: { alignItems: "center", display: "flex", justifyContent: "space-between" }, children: [
     t,
     /* @__PURE__ */ jsx(
@@ -20298,7 +20302,7 @@ const Tree$1 = connect(
 Tree$1.displayName = "Tree";
 const compatibleDataId = (e, t) => e == null ? void 0 : e.map((n) => {
   var l;
-  const i = n, { dataId: o } = i, r = Y(i, ["dataId"]), a = x({}, r);
+  const i = n, { dataId: o } = i, r = W(i, ["dataId"]), a = x({}, r);
   return o && (a.dataScope = { $and: [{ id: { $eq: o } }] }, a.titleField = (a == null ? void 0 : a.titleField) || ((l = t == null ? void 0 : t[n.collection]) == null ? void 0 : l.titleField) || "id"), a;
 }), FormDataTemplates = withDynamicSchemaProps(
   observer$1((e) => {
@@ -21784,7 +21788,7 @@ const SchemaSettingsProvider = (e) => {
   );
   return /* @__PURE__ */ jsx(SchemaSettingsContext.Provider, { value: i, children: t });
 }, InternalSchemaSettingsDropdown = React.memo((e) => {
-  const f = e, { title: t, dn: n } = f, o = Y(f, ["title", "dn"]), [r, a] = useState(!1), { Component: i, getMenuItems: l } = useMenuItem(), c = useNiceDropdownMaxHeight([r]), [u, d] = useState(!1), p = useContext(SchemaToolbarVisibleContext);
+  const f = e, { title: t, dn: n } = f, o = W(f, ["title", "dn"]), [r, a] = useState(!1), { Component: i, getMenuItems: l } = useMenuItem(), c = useNiceDropdownMaxHeight([r]), [u, d] = useState(!1), p = useContext(SchemaToolbarVisibleContext);
   useEffect(() => {
     p && d(!1);
   }, [p]);
@@ -21821,7 +21825,7 @@ const SchemaSettingsProvider = (e) => {
     )
   ] }));
 }), InternalSchemaSettingsMenu = React.memo((e) => {
-  const u = e, { title: t, dn: n } = u, o = Y(u, ["title", "dn"]), [r, a] = useState(!0), { Component: i, getMenuItems: l } = useMenuItem(), c = l(() => e.children);
+  const u = e, { title: t, dn: n } = u, o = W(u, ["title", "dn"]), [r, a] = useState(!0), { Component: i, getMenuItems: l } = useMenuItem(), c = l(() => e.children);
   return /* @__PURE__ */ jsxs(SchemaSettingsProvider, P(x({ visible: r, setVisible: a, dn: n }, o), { children: [
     /* @__PURE__ */ jsx(i, {}),
     /* @__PURE__ */ jsx(Menu$1, { items: c })
@@ -22012,10 +22016,10 @@ const findGridSchema = (e) => e.reduceProperties((t, n) => {
     }
   );
 }, SchemaSettingsSelectItem = (e) => {
-  const l = e, { title: t, options: n, value: o, onChange: r, optionRender: a } = l, i = Y(l, ["title", "options", "value", "onChange", "optionRender"]);
+  const l = e, { title: t, options: n, value: o, onChange: r, optionRender: a } = l, i = W(l, ["title", "options", "value", "onChange", "optionRender"]);
   return /* @__PURE__ */ jsx(SchemaSettingsItem, P(x({ title: t }, i), { children: /* @__PURE__ */ jsx(SelectWithTitle, { title: t, defaultValue: o, onChange: r, options: n, optionRender: a }) }));
 }, SchemaSettingsCascaderItem = (e) => {
-  const i = e, { title: t, options: n, value: o, onChange: r } = i, a = Y(i, ["title", "options", "value", "onChange"]);
+  const i = e, { title: t, options: n, value: o, onChange: r } = i, a = W(i, ["title", "options", "value", "onChange"]);
   return /* @__PURE__ */ jsx(SchemaSettingsItem, P(x({ title: t }, a), { children: /* @__PURE__ */ jsxs("div", { style: { alignItems: "center", display: "flex", justifyContent: "space-between" }, children: [
     t,
     /* @__PURE__ */ jsx(
@@ -22034,7 +22038,7 @@ const findGridSchema = (e) => e.reduceProperties((t, n) => {
 }, ml32 = { marginLeft: 32 }, MenuItemSwitch = observer$1(({ state: e }) => /* @__PURE__ */ jsx(Switch, { size: "small", checked: e.checked, style: ml32 }));
 MenuItemSwitch.displayName = "MenuItemSwitch";
 const SchemaSettingsSwitchItem = (e) => {
-  const a = e, { title: t, onChange: n } = a, o = Y(a, ["title", "onChange"]), [r] = useState(() => observable({ checked: !!e.checked }));
+  const a = e, { title: t, onChange: n } = a, o = W(a, ["title", "onChange"]), [r] = useState(() => observable({ checked: !!e.checked }));
   return /* @__PURE__ */ jsx(
     SchemaSettingsItem,
     P(x({
@@ -22050,7 +22054,7 @@ const SchemaSettingsSwitchItem = (e) => {
     })
   );
 }, SchemaSettingsPopupItem = (e) => {
-  const i = e, { schema: t } = i, n = Y(i, ["schema"]), [o, r] = useState(!1), a = useContext(SchemaSettingsContext);
+  const i = e, { schema: t } = i, n = W(i, ["schema"]), [o, r] = useState(!1), a = useContext(SchemaSettingsContext);
   return /* @__PURE__ */ jsxs(ActionContextProvider, { value: { visible: o, setVisible: r }, children: [
     /* @__PURE__ */ jsx(
       SchemaSettingsItem,
@@ -22084,7 +22088,7 @@ const SchemaSettingsSwitchItem = (e) => {
     modalTip: c,
     components: u,
     scope: d
-  } = R, p = Y(R, [
+  } = R, p = W(R, [
     "title",
     "onSubmit",
     "width",
@@ -22171,7 +22175,7 @@ const SchemaSettingsModalItem = (e) => {
     noRecord: d = !1,
     ModalContextProvider: p = (K) => /* @__PURE__ */ jsx(Fragment$1, { children: K.children }),
     dialogRootClassName: m
-  } = U, h = Y(U, [
+  } = U, h = W(U, [
     "hidden",
     "title",
     "components",
@@ -22191,9 +22195,9 @@ const SchemaSettingsModalItem = (e) => {
       title: n
     }, h), {
       onClick: () => q(void 0, null, function* () {
-        const K = l ? yield l() : c, X = _.isFunction(e.schema) ? e.schema() : e.schema;
+        const K = l ? yield l() : c, Y = _.isFunction(e.schema) ? e.schema() : e.schema;
         FormDialog(
-          { title: X.title || n, width: u, rootClassName: m },
+          { title: Y.title || n, width: u, rootClassName: m },
           () => /* @__PURE__ */ jsx(VariableScopeContext$1.Provider, { value: E, children: /* @__PURE__ */ jsx(SchemaComponentContext.Provider, { value: A, children: /* @__PURE__ */ jsx(AllDataBlocksContext.Provider, { value: $, children: /* @__PURE__ */ jsx(p, { children: /* @__PURE__ */ jsx(CollectOperators, { defaultOperators: j(), children: /* @__PURE__ */ jsx(VariablesContext.Provider, { value: O, children: /* @__PURE__ */ jsx(BlockContext.Provider, { value: M, children: /* @__PURE__ */ jsx(
             VariablePopupRecordProvider,
             {
@@ -22248,7 +22252,7 @@ const SchemaSettingsModalItem = (e) => {
                                         {
                                           components: o,
                                           scope: r,
-                                          schema: X
+                                          schema: Y
                                         }
                                       ) }) }) }) })
                                     }
@@ -22269,8 +22273,8 @@ const SchemaSettingsModalItem = (e) => {
         ).open({
           initialValues: K,
           effects: a
-        }).then((W) => (i(W), W)).catch((W) => {
-          console.error(W);
+        }).then((X) => (i(X), X)).catch((X) => {
+          console.error(X);
         });
       }),
       children: e.children || e.title
@@ -22788,7 +22792,7 @@ const HeightMode = {
   font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
 `, Json = React.forwardRef(
   (i, a) => {
-    var l = i, { value: e, onChange: t, space: n = 2, json5: o = !1 } = l, r = Y(l, ["value", "onChange", "space", "json5"]);
+    var l = i, { value: e, onChange: t, space: n = 2, json5: o = !1 } = l, r = W(l, ["value", "onChange", "space", "json5"]);
     const c = o ? JSON5 : JSON, u = useField(), [d, p] = useState("");
     return useEffect(() => {
       try {
@@ -23275,7 +23279,7 @@ const qrcodeEleId = "qrcode-scanner", QRCodeScannerInner = ({ visible: e, onClos
   ] });
 };
 function InputInner(e) {
-  const i = e, { onChange: t, trim: n, enableScan: o } = i, r = Y(i, ["onChange", "trim", "enableScan"]), a = useCallback(
+  const i = e, { onChange: t, trim: n, enableScan: o } = i, r = W(i, ["onChange", "trim", "enableScan"]), a = useCallback(
     (l) => {
       n && (l.target.value = l.target.value.trim()), t == null || t(l);
     },
@@ -23423,7 +23427,7 @@ const ConstantTypes = {
     label: '{{t("String")}}',
     value: "string",
     component: function(r) {
-      var a = r, { onChange: t, value: n } = a, o = Y(a, ["onChange", "value"]);
+      var a = r, { onChange: t, value: n } = a, o = W(a, ["onChange", "value"]);
       return /* @__PURE__ */ jsx(Input$3, x({ value: n, onChange: (i) => t(i.target.value) }, o));
     },
     default() {
@@ -23434,7 +23438,7 @@ const ConstantTypes = {
     label: '{{t("Number")}}',
     value: "number",
     component: function(r) {
-      var a = r, { onChange: t, value: n } = a, o = Y(a, ["onChange", "value"]);
+      var a = r, { onChange: t, value: n } = a, o = W(a, ["onChange", "value"]);
       return /* @__PURE__ */ jsx(InputNumber$1, x({ value: n, onChange: t }, o));
     },
     default() {
@@ -23445,7 +23449,7 @@ const ConstantTypes = {
     label: '{{t("Boolean")}}',
     value: "boolean",
     component: function(r) {
-      var a = r, { onChange: t, value: n } = a, o = Y(a, ["onChange", "value"]);
+      var a = r, { onChange: t, value: n } = a, o = W(a, ["onChange", "value"]);
       const { t: i } = useTranslation();
       return /* @__PURE__ */ jsx(
         Select$1,
@@ -23470,7 +23474,7 @@ const ConstantTypes = {
     label: '{{t("Date")}}',
     value: "date",
     component: function(r) {
-      var a = r, { onChange: t, value: n } = a, o = Y(a, ["onChange", "value"]);
+      var a = r, { onChange: t, value: n } = a, o = W(a, ["onChange", "value"]);
       return /* @__PURE__ */ jsx(
         DatePicker$1,
         x({
@@ -23527,8 +23531,8 @@ function getTypedConstantOption(e, t, n) {
   };
 }
 function Input$1(e) {
-  var W, J, Z;
-  const X = e, {
+  var X, Q, ee;
+  const Y = e, {
     value: t = "",
     onChange: n,
     children: o,
@@ -23542,7 +23546,7 @@ function Input$1(e) {
     parseOptions: p,
     hideVariableButton: m,
     constantAbel: h = !0
-  } = X, g = Y(X, [
+  } = Y, g = W(Y, [
     "value",
     "onChange",
     "children",
@@ -23572,10 +23576,10 @@ function Input$1(e) {
     label: I("Constant"),
     [A.value]: "$",
     [A.label]: I("Constant")
-  } : a ? getTypedConstantOption(O, a, A) : null : null, [O, a]), z = (W = E == null ? void 0 : E.component) != null ? W : NullComponent, L = Array.isArray(a) ? (Z = (J = a.find((Q) => Array.isArray(Q) && Q[0] === O)) == null ? void 0 : J[1]) != null ? Z : {} : {};
+  } : a ? getTypedConstantOption(O, a, A) : null : null, [O, a]), z = (X = E == null ? void 0 : E.component) != null ? X : NullComponent, L = Array.isArray(a) ? (ee = (Q = a.find((J) => Array.isArray(J) && J[0] === O)) == null ? void 0 : Q[1]) != null ? ee : {} : {};
   let V;
   t == null ? i ? o && N ? V = ["$"] : V = [""] : o ? V = ["$"] : V = [" ", O] : V = o ? ["$"] : [" ", O], m && (V = ["$"]), useEffect(() => {
-    const re = E != null ? E : {}, { component: Q } = re, ee = Y(re, ["component"]), ne = [
+    const re = E != null ? E : {}, { component: J } = re, Z = W(re, ["component"]), te = [
       ...i ? [
         {
           value: "",
@@ -23584,49 +23588,49 @@ function Input$1(e) {
           [A.label]: I("Null")
         }
       ] : [],
-      ...E ? [v(ee)] : [],
+      ...E ? [v(Z)] : [],
       ...f ? [...f] : []
-    ].filter((ie) => !ie.deprecated || ($ == null ? void 0 : $[0]) === ie[A.value]);
-    T(ne);
+    ].filter((se) => !se.deprecated || ($ == null ? void 0 : $[0]) === se[A.value]);
+    T(te);
   }, [f, $, E, i]);
-  const G = (Q) => q(this, null, function* () {
-    var ne;
-    const ee = Q[Q.length - 1];
-    if (!((ne = ee.children) != null && ne.length) && !ee.isLeaf && ee.loadChildren) {
+  const G = (J) => q(this, null, function* () {
+    var te;
+    const Z = J[J.length - 1];
+    if (!((te = Z.children) != null && te.length) && !Z.isLeaf && Z.loadChildren) {
       let re;
       if ($ && $.length >= 2) {
-        for (const ie of $)
-          if (ie === ee[A.value]) {
-            re = ie;
+        for (const se of $)
+          if (se === Z[A.value]) {
+            re = se;
             break;
           }
       }
-      yield ee.loadChildren(ee, re, $), T((ie) => [...ie]);
+      yield Z.loadChildren(Z, re, $), T((se) => [...se]);
     }
   }), H = useCallback(
-    (Q, ee) => {
-      var ne, re, ie;
-      if (Q[0] === "$") {
-        M(!0), $ && n(null, ee);
+    (J, Z) => {
+      var te, re, se;
+      if (J[0] === "$") {
+        M(!0), $ && n(null, Z);
         return;
       } else
         M(!1);
-      if (Q[0] === "") {
+      if (J[0] === "") {
         n(null);
         return;
       }
-      if (Q[0] === " ") {
-        Q[1] ? Q[1] !== O && n((ie = (re = (ne = ConstantTypes[Q[1]]) == null ? void 0 : ne.default) == null ? void 0 : re.call(ne)) != null ? ie : null, ee) : $ && n(null, ee);
+      if (J[0] === " ") {
+        J[1] ? J[1] !== O && n((se = (re = (te = ConstantTypes[J[1]]) == null ? void 0 : te.default) == null ? void 0 : re.call(te)) != null ? se : null, Z) : $ && n(null, Z);
         return;
       }
-      n(`{{${Q.join(".")}}}`, ee);
+      n(`{{${J.join(".")}}}`, Z);
     },
     [O, $, n]
   ), U = useCallback(() => {
-    var Q;
-    if (M(!!o), (Q = E == null ? void 0 : E.children) != null && Q.length) {
-      const ee = E.children[0].default();
-      return n(ee);
+    var J;
+    if (M(!!o), (J = E == null ? void 0 : E.children) != null && J.length) {
+      const Z = E.children[0].default();
+      return n(Z);
     }
     n(null);
   }, [E]);
@@ -23635,19 +23639,19 @@ function Input$1(e) {
       var re;
       if (!$ || w.length <= 1)
         return;
-      let ee = null;
-      const ne = [];
-      for (let ie = 0; ie < $.length; ie++) {
-        const pe = $[ie];
+      let Z = null;
+      const te = [];
+      for (let se = 0; se < $.length; se++) {
+        const ue = $[se];
         try {
-          if (ie === 0 ? ee = w.find((ce) => ce[A.value] === pe) : (ee.loadChildren && !((re = ee.children) != null && re.length) && (yield ee.loadChildren(ee, pe, $)), ee = ee.children.find((ce) => ce[A.value] === pe)), !ee)
+          if (se === 0 ? Z = w.find((le) => le[A.value] === ue) : (Z.loadChildren && !((re = Z.children) != null && re.length) && (yield Z.loadChildren(Z, ue, $)), Z = Z.children.find((le) => le[A.value] === ue)), !Z)
             return;
-          ne.push(ee[A.label]);
-        } catch (ce) {
-          error(ce);
+          te.push(Z[A.label]);
+        } catch (le) {
+          error(le);
         }
       }
-      T([...w]), B([...ne]);
+      T([...w]), B([...te]);
     });
   }, [$, w.length]);
   const K = e.disabled || F.disabled;
@@ -23692,10 +23696,10 @@ function Input$1(e) {
                   "aria-label": "variable-tag",
                   style: { overflow: "hidden" },
                   className: cx("ant-input ant-input-outlined", { "ant-input-disabled": K }, b),
-                  children: /* @__PURE__ */ jsx(Tag, { color: "blue", children: D.map((Q, ee) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
-                    ee ? " / " : "",
-                    Q
-                  ] }, Q)) })
+                  children: /* @__PURE__ */ jsx(Tag, { color: "blue", children: D.map((J, Z) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
+                    Z ? " / " : "",
+                    J
+                  ] }, J)) })
                 }
               ),
               K ? null : /* @__PURE__ */ jsx(
@@ -23845,12 +23849,26 @@ function setNativeInputValue(e, t) {
   );
 }
 function RawTextArea(e) {
-  const t = useRef(null), m = e, { changeOnSelect: n, component: o = Input$3.TextArea, fieldNames: r, scope: a, buttonClass: i } = m, l = Y(m, ["changeOnSelect", "component", "fieldNames", "scope", "buttonClass"]), c = typeof a == "function" ? a() : a, [u, d] = useState(c || []);
-  function p(h) {
+  const t = useRef(null), h = e, {
+    changeOnSelect: n,
+    component: o = Input$3.TextArea,
+    fieldNames: r,
+    scope: a,
+    buttonClass: i,
+    delimiters: l = ["{{", "}}"]
+  } = h, c = W(h, [
+    "changeOnSelect",
+    "component",
+    "fieldNames",
+    "scope",
+    "buttonClass",
+    "delimiters"
+  ]), u = typeof a == "function" ? a() : a, [d, p] = useState(u || []);
+  function m(g) {
     if (!t.current)
       return;
-    const g = `{{${h.join(".")}}}`, { textArea: f } = t.current.resizableTextArea, C = f.value.slice(0, f.selectionStart) + g + f.value.slice(f.selectionEnd), b = [f.selectionStart, f.selectionStart + g.length];
-    setNativeInputValue(f, C), f.setSelectionRange(...b), f.focus();
+    const f = `${l[0]}${g.join(".")}${l[1]}`, { textArea: C } = t.current.resizableTextArea, b = C.value.slice(0, C.selectionStart) + f + C.value.slice(C.selectionEnd), S = [C.selectionStart, C.selectionStart + f.length];
+    setNativeInputValue(C, b), C.setSelectionRange(...S), C.focus();
   }
   return /* @__PURE__ */ jsxs(
     "div",
@@ -23862,7 +23880,7 @@ function RawTextArea(e) {
         }
       `,
       children: [
-        /* @__PURE__ */ jsx(o, P(x({}, l), { ref: t })),
+        /* @__PURE__ */ jsx(o, P(x({}, c), { ref: t })),
         /* @__PURE__ */ jsx(
           Space$1.Compact,
           {
@@ -23885,11 +23903,11 @@ function RawTextArea(e) {
               background-color: transparent;
             `,
                 fieldNames: r,
-                options: u,
-                setOptions: d,
-                onInsert: p,
+                options: d,
+                setOptions: p,
+                onInsert: m,
                 changeOnSelect: n,
-                disabled: l.disabled
+                disabled: c.disabled
               }
             )
           }
@@ -24042,8 +24060,8 @@ function TextArea(e) {
       const { lastChild: U } = V;
       if (U) {
         G.setStartAfter(U), G.setEndAfter(U);
-        const K = Array.from(V.childNodes), X = G.startContainer === V ? -1 : K.indexOf(U), W = G.startContainer === V ? -1 : K.indexOf(U);
-        D([X, G.startOffset, W, G.endOffset]);
+        const K = Array.from(V.childNodes), Y = G.startContainer === V ? -1 : K.indexOf(U), X = G.startContainer === V ? -1 : K.indexOf(U);
+        D([Y, G.startOffset, X, G.endOffset]);
       }
     }
   }, [F]);
@@ -25737,7 +25755,7 @@ class SchemaComponentPlugin extends Plugin {
   }
 }
 const TabsContext = React.createContext({}), TabsContextProvider = (n) => {
-  var o = n, { children: e } = o, t = Y(o, ["children"]);
+  var o = n, { children: e } = o, t = W(o, ["children"]);
   return /* @__PURE__ */ jsx(TabsContext.Provider, { value: t, children: e });
 }, useTabsContext = () => React.useContext(TabsContext), randomNestedSchemaKeyStorage = {}, getRandomNestedSchemaKey = (e) => randomNestedSchemaKeyStorage[e] || (randomNestedSchemaKeyStorage[e] = uid()), deleteRandomNestedSchemaKey = (e) => delete randomNestedSchemaKeyStorage[e], PopupVisibleProviderContext = React.createContext(null), PopupParamsProviderContext = React.createContext(null), AllPopupsPropsProviderContext = React.createContext(null);
 PopupVisibleProviderContext.displayName = "PopupVisibleProviderContext";
@@ -26153,7 +26171,7 @@ const DrawerErrorFallback = (e) => {
 ActionDrawerContent.displayName = "ActionDrawerContent";
 const InternalActionDrawer = observer$1(
   (e) => {
-    const F = e, { footerNodeName: t = "Action.Drawer.Footer", zIndex: n, onClose: o } = F, r = Y(F, ["footerNodeName", "zIndex", "onClose"]), { visible: a, setVisible: i, openSize: l = "middle", drawerProps: c } = useActionContext(), u = useFieldSchema(), d = useField(), { t: p } = useTranslation(), { componentCls: m, hashId: h } = useStyles$b(), g = useTabsContext(), f = useZIndexContext(), C = u.reduceProperties((w, T) => T["x-component"] === t ? T : w), { hidden: b } = useCurrentPopupContext(), S = useMemo(() => P(x(x({}, c == null ? void 0 : c.style), r == null ? void 0 : r.style), {
+    const F = e, { footerNodeName: t = "Action.Drawer.Footer", zIndex: n, onClose: o } = F, r = W(F, ["footerNodeName", "zIndex", "onClose"]), { visible: a, setVisible: i, openSize: l = "middle", drawerProps: c } = useActionContext(), u = useFieldSchema(), d = useField(), { t: p } = useTranslation(), { componentCls: m, hashId: h } = useStyles$b(), g = useTabsContext(), f = useZIndexContext(), C = u.reduceProperties((w, T) => T["x-component"] === t ? T : w), { hidden: b } = useCurrentPopupContext(), S = useMemo(() => P(x(x({}, c == null ? void 0 : c.style), r == null ? void 0 : r.style), {
       display: b ? "none" : "block"
     }), [b, c == null ? void 0 : c.style, r == null ? void 0 : r.style]), y = getZIndex("drawer", n || f, e.level || 0), v = useCallback(
       (w) => {
@@ -26263,7 +26281,7 @@ function useDelayedVisible(e, t = 200) {
 }
 const InternalActionModal = observer$1(
   (e) => {
-    const I = e, { footerNodeName: t = "Action.Modal.Footer", width: n, zIndex: o, delay: r = 200 } = I, a = Y(I, ["footerNodeName", "width", "zIndex", "delay"]), { visible: i, setVisible: l, openSize: c = "middle", modalProps: u } = useActionContext(), d = n != null ? n : openSizeWidthMap.get(c), p = useFieldSchema(), m = useField(), { token: h } = useToken(), g = useTabsContext(), f = useZIndexContext(), C = p.reduceProperties((F, w) => w["x-component"] === t ? w : F), { hidden: b } = useCurrentPopupContext(), S = !!C, y = getZIndex("modal", o || f, e.level || 0), v = useDelayedVisible(i, r);
+    const I = e, { footerNodeName: t = "Action.Modal.Footer", width: n, zIndex: o, delay: r = 200 } = I, a = W(I, ["footerNodeName", "width", "zIndex", "delay"]), { visible: i, setVisible: l, openSize: c = "middle", modalProps: u } = useActionContext(), d = n != null ? n : openSizeWidthMap.get(c), p = useFieldSchema(), m = useField(), { token: h } = useToken(), g = useTabsContext(), f = useZIndexContext(), C = p.reduceProperties((F, w) => w["x-component"] === t ? w : F), { hidden: b } = useCurrentPopupContext(), S = !!C, y = getZIndex("modal", o || f, e.level || 0), v = useDelayedVisible(i, r);
     return /* @__PURE__ */ jsx(ActionContextNoRerender, { children: /* @__PURE__ */ jsx(zIndexContext.Provider, { value: y, children: /* @__PURE__ */ jsx(TabsContextProvider, P(x({}, g), { tabBarExtraContent: null, children: /* @__PURE__ */ jsx(
       Modal,
       P(x(x({
@@ -26486,7 +26504,7 @@ const SchemaInitializerItemInternal = () => {
   const e = useSchemaInitializerItem();
   return /* @__PURE__ */ jsx(SchemaInitializerItem, x({}, e));
 }, switchStyle = { marginLeft: 20 }, itemStyle = { display: "flex", alignItems: "center", justifyContent: "space-between" }, SchemaInitializerSwitch = (e) => {
-  const a = e, { title: t, checked: n } = a, o = Y(a, ["title", "checked"]), r = useCompile();
+  const a = e, { title: t, checked: n } = a, o = W(a, ["title", "checked"]), r = useCompile();
   return /* @__PURE__ */ jsx(SchemaInitializerItem, P(x({}, o), { closeInitializerMenuWhenClick: !1, children: /* @__PURE__ */ jsxs("div", { style: itemStyle, children: [
     r(t),
     /* @__PURE__ */ jsx(Switch, { disabled: e.disabled, style: switchStyle, size: "small", checked: n })
@@ -26518,7 +26536,7 @@ const SchemaInitializerItemInternal = () => {
     hideIfNoChildren: c,
     componentProps: u,
     sort: d
-  } = I, p = Y(I, [
+  } = I, p = W(I, [
     "type",
     "Component",
     "component",
@@ -26650,7 +26668,7 @@ const useMenuSearch$1 = (e) => {
   const { items: t } = e;
   return t.length === 0 ? null : /* @__PURE__ */ jsx(SchemaInitializerChildren, { children: t });
 }, SchemaInitializerActionModalItemComponent = React.forwardRef((e, t) => {
-  const r = e, { onClick: n } = r, o = Y(r, ["onClick"]);
+  const r = e, { onClick: n } = r, o = W(r, ["onClick"]);
   return /* @__PURE__ */ jsx(SchemaInitializerItem, P(x({ ref: t }, o), { onClick: (a) => n == null ? void 0 : n(a.event, !1) }));
 }), SchemaInitializerActionModal = (e) => {
   const { title: t, icon: n, width: o, schema: r, buttonText: a, btnStyles: i, isItem: l, component: c, onCancel: u, onSubmit: d } = e, { setVisible: p } = useSchemaInitializer(), m = useCallback(() => {
@@ -26748,7 +26766,7 @@ const useMenuSearch$1 = (e) => {
   const e = useSchemaInitializerItem();
   return /* @__PURE__ */ jsx(SchemaInitializerActionModal, x({}, e));
 }, SchemaInitializerSelect = (e) => {
-  const h = e, { title: t, options: n, value: o, onChange: r, openOnHover: a, onClick: i } = h, l = Y(h, ["title", "options", "value", "onChange", "openOnHover", "onClick"]), [c, u] = useState(!1), d = useCallback(
+  const h = e, { title: t, options: n, value: o, onChange: r, openOnHover: a, onClick: i } = h, l = W(h, ["title", "options", "value", "onChange", "openOnHover", "onClick"]), [c, u] = useState(!1), d = useCallback(
     (...g) => {
       u(!1), i == null || i(...g);
     },
@@ -26813,7 +26831,7 @@ const useMenuSearch$1 = (e) => {
     [e, t]
   ) };
 }, SchemaInitializerButton = React.memo((e) => {
-  const i = e, { style: t, options: n } = i, o = Y(i, ["style", "options"]), r = useCompile(), { getAriaLabel: a } = useGetAriaLabelOfSchemaInitializer();
+  const i = e, { style: t, options: n } = i, o = W(i, ["style", "options"]), r = useCompile(), { getAriaLabel: a } = useGetAriaLabelOfSchemaInitializer();
   return /* @__PURE__ */ jsx(
     Button,
     P(x({
@@ -26915,7 +26933,7 @@ function useGetSchemaInitializerMenuItems(e) {
       }
       if (a.isMenuType) {
         const f = a, { isMenuType: C } = f;
-        return Y(f, ["isMenuType"]);
+        return W(f, ["isMenuType"]);
       }
       const d = c || u, p = a.key || `${r}-${u}-${i}`, m = (C) => {
         C.domEvent.stopPropagation(), C.key === p && (a.onClick ? a.onClick(P(x({}, C), { item: a })) : e == null || e(P(x({}, C), { item: a })));
@@ -27159,21 +27177,21 @@ https://requirejs.org/docs/errors.html#` + e);
         }
     }
     function b(A, E, z) {
-      var L, V, G, H, U, K, X, W, J, Z, Q, ee, ne = E && E.split("/"), re = i.map, ie = re && re["*"];
-      if (A && (A = A.split("/"), X = A.length - 1, i.nodeIdCompat && jsSuffixRegExp.test(A[X]) && (A[X] = A[X].replace(jsSuffixRegExp, "")), A[0].charAt(0) === "." && ne && (ee = ne.slice(0, ne.length - 1), A = ee.concat(A)), C(A), A = A.join("/")), z && re && (ne || ie)) {
+      var L, V, G, H, U, K, Y, X, Q, ee, J, Z, te = E && E.split("/"), re = i.map, se = re && re["*"];
+      if (A && (A = A.split("/"), Y = A.length - 1, i.nodeIdCompat && jsSuffixRegExp.test(A[Y]) && (A[Y] = A[Y].replace(jsSuffixRegExp, "")), A[0].charAt(0) === "." && te && (Z = te.slice(0, te.length - 1), A = Z.concat(A)), C(A), A = A.join("/")), z && re && (te || se)) {
         G = A.split("/");
         e:
           for (H = G.length; H > 0; H -= 1) {
-            if (K = G.slice(0, H).join("/"), ne) {
-              for (U = ne.length; U > 0; U -= 1)
-                if (V = getOwn(re, ne.slice(0, U).join("/")), V && (V = getOwn(V, K), V)) {
-                  W = V, J = H;
+            if (K = G.slice(0, H).join("/"), te) {
+              for (U = te.length; U > 0; U -= 1)
+                if (V = getOwn(re, te.slice(0, U).join("/")), V && (V = getOwn(V, K), V)) {
+                  X = V, Q = H;
                   break e;
                 }
             }
-            !Z && ie && getOwn(ie, K) && (Z = getOwn(ie, K), Q = H);
+            !ee && se && getOwn(se, K) && (ee = getOwn(se, K), J = H);
           }
-        !W && Z && (W = Z, J = Q), W && (G.splice(0, J, W), A = G.join("/"));
+        !X && ee && (X = ee, Q = J), X && (G.splice(0, Q, X), A = G.join("/"));
       }
       return L = getOwn(i.pkgs, A), L || A;
     }
@@ -27195,18 +27213,18 @@ https://requirejs.org/docs/errors.html#` + e);
       return z > -1 && (E = A.substring(0, z), A = A.substring(z + 1, A.length)), [E, A];
     }
     function I(A, E, z, L) {
-      var V, G, H, U, K = null, X = E ? E.name : null, W = A, J = !0, Z = "";
-      return A || (J = !1, A = "_@r" + (g += 1)), U = v(A), K = U[0], A = U[1], K && (K = b(K, X, L), G = getOwn(p, K)), A && (K ? z ? Z = A : G && G.normalize ? Z = G.normalize(A, function(Q) {
-        return b(Q, X, L);
-      }) : Z = A.indexOf("!") === -1 ? b(A, X, L) : A : (Z = b(A, X, L), U = v(Z), K = U[0], Z = U[1], z = !0, V = o.nameToUrl(Z))), H = K && !G && !z ? "_unnormalized" + (f += 1) : "", {
+      var V, G, H, U, K = null, Y = E ? E.name : null, X = A, Q = !0, ee = "";
+      return A || (Q = !1, A = "_@r" + (g += 1)), U = v(A), K = U[0], A = U[1], K && (K = b(K, Y, L), G = getOwn(p, K)), A && (K ? z ? ee = A : G && G.normalize ? ee = G.normalize(A, function(J) {
+        return b(J, Y, L);
+      }) : ee = A.indexOf("!") === -1 ? b(A, Y, L) : A : (ee = b(A, Y, L), U = v(ee), K = U[0], ee = U[1], z = !0, V = o.nameToUrl(ee))), H = K && !G && !z ? "_unnormalized" + (f += 1) : "", {
         prefix: K,
-        name: Z,
+        name: ee,
         parentMap: E,
         unnormalized: !!H,
         url: V,
-        originalName: W,
-        isDefine: J,
-        id: (K ? K + "!" + Z : Z) + H
+        originalName: X,
+        isDefine: Q,
+        id: (K ? K + "!" + ee : ee) + H
       };
     }
     function F(A) {
@@ -27263,11 +27281,11 @@ https://requirejs.org/docs/errors.html#` + e);
       var A, E, z = i.waitSeconds * 1e3, L = z && o.startTime + z < (/* @__PURE__ */ new Date()).getTime(), V = [], G = [], H = !1, U = !0;
       if (!t) {
         if (t = !0, eachProp(c, function(K) {
-          var X = K.map, W = X.id;
-          if (K.enabled && (X.isDefine || G.push(K), !K.error)) {
+          var Y = K.map, X = Y.id;
+          if (K.enabled && (Y.isDefine || G.push(K), !K.error)) {
             if (!K.inited && L)
-              y(W) ? (E = !0, H = !0) : (V.push(W), S(W));
-            else if (!K.inited && K.fetched && X.isDefine && (H = !0, !X.prefix))
+              y(X) ? (E = !0, H = !0) : (V.push(X), S(X));
+            else if (!K.inited && K.fetched && Y.isDefine && (H = !0, !Y.prefix))
               return U = !1;
           }
         }), L && V.length)
@@ -27349,12 +27367,12 @@ https://requirejs.org/docs/errors.html#` + e);
       callPlugin: function() {
         var A = this.map, E = A.id, z = I(A.prefix);
         this.depMaps.push(z), w(z, "defined", bind(this, function(L) {
-          var V, G, H, U = getOwn(h, this.map.id), K = this.map.name, X = this.map.parentMap ? this.map.parentMap.name : null, W = o.makeRequire(A.parentMap, {
+          var V, G, H, U = getOwn(h, this.map.id), K = this.map.name, Y = this.map.parentMap ? this.map.parentMap.name : null, X = o.makeRequire(A.parentMap, {
             enableBuildCallback: !0
           });
           if (this.map.unnormalized) {
-            L.normalize && (K = L.normalize(K, function(J) {
-              return b(J, X, !0);
+            L.normalize && (K = L.normalize(K, function(Q) {
+              return b(Q, Y, !0);
             }) || ""), G = I(
               A.prefix + "!" + K,
               this.map.parentMap,
@@ -27362,16 +27380,16 @@ https://requirejs.org/docs/errors.html#` + e);
             ), w(
               G,
               "defined",
-              bind(this, function(J) {
+              bind(this, function(Q) {
                 this.map.normalizedMap = G, this.init([], function() {
-                  return J;
+                  return Q;
                 }, null, {
                   enabled: !0,
                   ignore: !0
                 });
               })
-            ), H = getOwn(l, G.id), H && (this.depMaps.push(G), this.events.error && H.on("error", bind(this, function(J) {
-              this.emit("error", J);
+            ), H = getOwn(l, G.id), H && (this.depMaps.push(G), this.events.error && H.on("error", bind(this, function(Q) {
+              this.emit("error", Q);
             })), H.enable());
             return;
           }
@@ -27379,21 +27397,21 @@ https://requirejs.org/docs/errors.html#` + e);
             this.map.url = o.nameToUrl(U), this.load();
             return;
           }
-          V = bind(this, function(J) {
+          V = bind(this, function(Q) {
             this.init([], function() {
-              return J;
+              return Q;
             }, null, {
               enabled: !0
             });
-          }), V.error = bind(this, function(J) {
-            this.inited = !0, this.error = J, J.requireModules = [E], eachProp(l, function(Z) {
-              Z.map.id.indexOf(E + "_unnormalized") === 0 && B(Z.map.id);
-            }), T(J);
-          }), V.fromText = bind(this, function(J, Z) {
-            var Q = A.name, ee = I(Q), ne = useInteractive;
-            Z && (J = Z), ne && (useInteractive = !1), F(ee), hasProp(i.config, E) && (i.config[Q] = i.config[E]);
+          }), V.error = bind(this, function(Q) {
+            this.inited = !0, this.error = Q, Q.requireModules = [E], eachProp(l, function(ee) {
+              ee.map.id.indexOf(E + "_unnormalized") === 0 && B(ee.map.id);
+            }), T(Q);
+          }), V.fromText = bind(this, function(Q, ee) {
+            var J = A.name, Z = I(J), te = useInteractive;
+            ee && (Q = ee), te && (useInteractive = !1), F(Z), hasProp(i.config, E) && (i.config[J] = i.config[E]);
             try {
-              req.exec(J);
+              req.exec(Q);
             } catch (re) {
               return T(makeError(
                 "fromtexteval",
@@ -27402,8 +27420,8 @@ https://requirejs.org/docs/errors.html#` + e);
                 [E]
               ));
             }
-            ne && (useInteractive = !0), this.depMaps.push(ee), o.completeLoad(Q), W([Q], V);
-          }), L.load(A.name, W, V, i);
+            te && (useInteractive = !0), this.depMaps.push(Z), o.completeLoad(J), X([J], V);
+          }), L.load(A.name, X, V, i);
         })), o.enable(z, this), this.pluginMaps[z.id] = z;
       },
       enable: function() {
@@ -27602,9 +27620,9 @@ https://requirejs.org/docs/errors.html#` + e);
        * internal API, not a public one. Use toUrl for the public API.
        */
       nameToUrl: function(A, E, z) {
-        var L, V, G, H, U, K, X, W = getOwn(i.pkgs, A);
-        if (W && (A = W), X = getOwn(h, A), X)
-          return o.nameToUrl(X, E, z);
+        var L, V, G, H, U, K, Y, X = getOwn(i.pkgs, A);
+        if (X && (A = X), Y = getOwn(h, A), Y)
+          return o.nameToUrl(Y, E, z);
         if (req.jsExtRegExp.test(A))
           U = A + (E || "");
         else {
@@ -28707,7 +28725,7 @@ const DataBlockResourceContext = createContext(null), RerenderDataBlockProvider
   return /* @__PURE__ */ jsx(r.Component, { name: r.name, allowNull: o, children: e.children });
 }, DataBlockProvider = withDynamicSchemaProps(
   React.memo((e) => {
-    const u = e, { collection: t, association: n, dataSource: o, children: r, hidden: a } = u, i = Y(u, ["collection", "association", "dataSource", "children", "hidden"]), { dn: l } = useDesignable(), c = useFieldSchema();
+    const u = e, { collection: t, association: n, dataSource: o, children: r, hidden: a } = u, i = W(u, ["collection", "association", "dataSource", "children", "hidden"]), { dn: l } = useDesignable(), c = useFieldSchema();
     return a ? null : /* @__PURE__ */ jsx(VariableScope, { scopeId: c == null ? void 0 : c["x-uid"], type: "dataBlock", children: /* @__PURE__ */ jsx(
       DataBlockContext.Provider,
       {
@@ -29358,8 +29376,8 @@ const Markdown = connect(
 };
 Markdown.Void = MarkdownVoid;
 const BlockItemCardContext = createContext({}), BlockItemCard = React.forwardRef((o, n) => {
-  var r = o, { children: e } = r, t = Y(r, ["children"]);
-  const { token: a } = useToken(), S = t, { title: i, description: l } = S, c = Y(S, ["title", "description"]), u = useMemo(() => ({ marginBottom: a.marginBlock, height: "100%" }), [a.marginBlock]), [d, p] = useState(0), m = useRef(null), { t: h } = useTranslation(), g = useFieldSchema(), f = g == null ? void 0 : g["x-block-linkage-rules"];
+  var r = o, { children: e } = r, t = W(r, ["children"]);
+  const { token: a } = useToken(), S = t, { title: i, description: l } = S, c = W(S, ["title", "description"]), u = useMemo(() => ({ marginBottom: a.marginBlock, height: "100%" }), [a.marginBlock]), [d, p] = useState(0), m = useRef(null), { t: h } = useTranslation(), g = useFieldSchema(), f = g == null ? void 0 : g["x-block-linkage-rules"];
   useEffect(() => {
     const y = setTimeout(() => {
       if (m.current) {
@@ -29566,10 +29584,10 @@ const useCreateActionProps = () => {
           skipValidator: N,
           triggerWorkflows: M
         } = (E = l == null ? void 0 : l["x-action-settings"]) != null ? E : {}, j = (z = a == null ? void 0 : a["x-component-props"]) == null ? void 0 : z.addChild, { successMessage: R } = D || {}, O = {}, $ = Object.keys(T).map((U) => q(this, null, function* () {
-          const K = T[U], X = d(U);
+          const K = T[U], Y = d(U);
           if (isVariable$1(K)) {
-            const { value: W } = (yield C == null ? void 0 : C.parseVariable(K, b)) || {};
-            O[U] = transformVariableValue(W, { targetCollectionField: X });
+            const { value: X } = (yield C == null ? void 0 : C.parseVariable(K, b)) || {};
+            O[U] = transformVariableValue(X, { targetCollectionField: Y });
           } else
             K !== "" && (O[U] = K);
         }));
@@ -29796,7 +29814,7 @@ const useCreateActionProps = () => {
               V.filter || (V.forceUpdate = !0);
               try {
                 yield t.update(V);
-              } catch (X) {
+              } catch (Y) {
               } finally {
                 m.data.loading = !1;
               }
@@ -29830,7 +29848,7 @@ const useCreateActionProps = () => {
         F !== !0 && R === "customize:form:request" && (yield a.submit());
         const O = T.headers ? JSON.parse(T.headers) : {}, $ = T.params ? JSON.parse(T.params) : {}, A = T.data ? JSON.parse(T.data) : {};
         if (R === "customize:form:request" && ["POST", "PUT", "PATCH"].includes(T.method)) {
-          const U = i.map((X) => X.name), K = getFormValues({
+          const U = i.map((Y) => Y.name), K = getFormValues({
             filterByTk: n,
             field: c,
             form: a,
@@ -29883,8 +29901,8 @@ const useCreateActionProps = () => {
         } = T || {}, A = {}, E = Object.keys(w).map((H) => q(this, null, function* () {
           const U = w[H], K = d(H);
           if (isVariable$1(U)) {
-            const { value: X } = (yield b == null ? void 0 : b.parseVariable(U, S)) || {};
-            A[H] = transformVariableValue(X, { targetCollectionField: K });
+            const { value: Y } = (yield b == null ? void 0 : b.parseVariable(U, S)) || {};
+            A[H] = transformVariableValue(Y, { targetCollectionField: K });
           } else
             U !== "" && (A[H] = U);
         }));
@@ -30259,8 +30277,8 @@ const useCreateActionProps = () => {
     (R) => {
       const { targets: O, uid: $ } = findFilterTargets(t);
       o().forEach((A) => {
-        var H, U, K, X;
-        if (!O.find((W) => W.uid === A.uid))
+        var H, U, K, Y;
+        if (!O.find((X) => X.uid === A.uid))
           return;
         const z = `${$}${t.name}`, L = ((H = A.service.params) == null ? void 0 : H[0]) || {};
         (K = (U = A.service.params) == null ? void 0 : U[1]) != null && K.filters || _.set(A.service.params, "[1].filters", {});
@@ -30270,7 +30288,7 @@ const useCreateActionProps = () => {
             [S]: R
           };
         else {
-          if ((X = A.clearSelection) == null || X.call(A), A.dataLoadingMode === "manual")
+          if ((Y = A.clearSelection) == null || Y.call(A), A.dataLoadingMode === "manual")
             return A.clearData();
           delete V[z];
         }
@@ -30965,7 +30983,7 @@ const SortableProvider = (e) => {
   return /* @__PURE__ */ jsx(SortableContext.Provider, { value: i, children: o });
 }, getComputedColor = (e) => new TinyColor(e).setAlpha(0.15).toHex8String(), Sortable = (e) => {
   var C, b;
-  const f = e, { component: t, overStyle: n, style: o, children: r, openMode: a } = f, i = Y(f, ["component", "overStyle", "style", "children", "openMode"]), { token: l } = useToken$1(), { draggable: c, droppable: u } = useContext(SortableContext), { isOver: d, setNodeRef: p } = u, m = x({}, o), h = useFieldSchema(), g = (h == null ? void 0 : h["x-component"]) === "Action.Link" || t === "a";
+  const f = e, { component: t, overStyle: n, style: o, children: r, openMode: a } = f, i = W(f, ["component", "overStyle", "style", "children", "openMode"]), { token: l } = useToken$1(), { draggable: c, droppable: u } = useContext(SortableContext), { isOver: d, setNodeRef: p } = u, m = x({}, o), h = useFieldSchema(), g = (h == null ? void 0 : h["x-component"]) === "Action.Link" || t === "a";
   return d && ((C = c == null ? void 0 : c.active) == null ? void 0 : C.id) !== ((b = u == null ? void 0 : u.over) == null ? void 0 : b.id) && (m[g ? "color" : "background"] = getComputedColor(l.colorSettings), Object.assign(m, n)), React.createElement(
     t || "div",
     P(x({
@@ -30986,7 +31004,7 @@ const SortableProvider = (e) => {
   return e.id ? e.id : (n = t.address) == null ? void 0 : n.toString();
 }, InternalSortableItem = observer$1(
   (e) => {
-    const l = useSortableItemProps(e), { schema: t, id: n, eid: o, removeParentsIfNoChildren: r } = l, a = Y(l, ["schema", "id", "eid", "removeParentsIfNoChildren"]), i = useMemo(() => {
+    const l = useSortableItemProps(e), { schema: t, id: n, eid: o, removeParentsIfNoChildren: r } = l, a = W(l, ["schema", "id", "eid", "removeParentsIfNoChildren"]), i = useMemo(() => {
       var c, u, d;
       return {
         insertAdjacent: "afterEnd",
@@ -30998,7 +31016,7 @@ const SortableProvider = (e) => {
   },
   { displayName: "InternalSortableItem" }
 ), SortableItem = React.memo((e) => {
-  const r = e, { component: t } = r, n = Y(r, ["component"]), { designable: o } = useDesignable();
+  const r = e, { component: t } = r, n = W(r, ["component"]), { designable: o } = useDesignable();
   return o ? /* @__PURE__ */ jsx(InternalSortableItem, x({}, e)) : React.createElement(
     t || "div",
     _.omit(n, ["children", "schema", "overStyle", "openMode", "id", "eid", "removeParentsIfNoChildren"]),
@@ -31070,7 +31088,7 @@ const DragHandler = (e) => {
   { value: "lastYear", label: '{{t("Last Year")}}' },
   { value: "nextYear", label: '{{t("Next Year")}}' }
 ], SmartDatePicker = (e) => {
-  const r = e, { isRange: t, defaultValue: n } = r, o = Y(r, ["isRange", "defaultValue"]);
+  const r = e, { isRange: t, defaultValue: n } = r, o = W(r, ["isRange", "defaultValue"]);
   return t ? /* @__PURE__ */ jsx(DatePicker.RangePicker, x({}, o)) : /* @__PURE__ */ jsx(DatePicker.FilterWithPicker, x({}, o));
 }, DateFilterDynamicComponent = (e) => {
   const { value: t, onChange: n } = e, o = useCompile(), { t: r } = useTranslation(), { token: a } = theme.useToken(), [i, l] = useState(!1), c = (d) => {
@@ -33606,7 +33624,7 @@ const actionSettings = new SchemaSettings({
     linkageRulesProps: a,
     schemaSettings: i = "ActionSettings",
     enableDrag: l = !0
-  } = f, c = Y(f, [
+  } = f, c = W(f, [
     "modalTip",
     "linkageAction",
     "removeButtonProps",
@@ -38125,9 +38143,9 @@ const enabledIndexColumn$1 = {
         }), U["x-component-props"] = n["x-component-props"], o.componentProps = n["x-component-props"];
         const K = o.path.entire.split(".");
         K.pop();
-        const X = K.join(".");
-        o.query(`${X}.*[0:].${n.name}`).forEach((W) => {
-          W.props.name === n.name && W.setComponentProps({
+        const Y = K.join(".");
+        o.query(`${Y}.*[0:].${n.name}`).forEach((X) => {
+          X.props.name === n.name && X.setComponentProps({
             _maxDate: F(H == null ? void 0 : H._maxDate),
             _minDate: F(H == null ? void 0 : H._minDate)
           });
@@ -39548,7 +39566,7 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
                 params: {
                   appends: S == null ? void 0 : S.appends
                 }
-              }).then((X) => (clearRequested(U), X.data.data));
+              }).then((Y) => (clearRequested(U), Y.data.data));
               return stashRequested(U, K), K;
             }
             return H == null ? void 0 : H[A];
@@ -40122,7 +40140,7 @@ const ActionLink = withDynamicSchemaProps(
   }
 }), handleError = console.log, Action = withDynamicSchemaProps(
   React.memo((e) => {
-    var X;
+    var Y;
     const K = useProps(e), {
       popover: t,
       containerRefKey: n,
@@ -40142,7 +40160,7 @@ const ActionLink = withDynamicSchemaProps(
       onMouseEnter: C,
       refreshDataBlockRequest: b,
       confirmTitle: S
-    } = K, y = Y(K, [
+    } = K, y = W(K, [
       "popover",
       "containerRefKey",
       "component",
@@ -40162,31 +40180,31 @@ const ActionLink = withDynamicSchemaProps(
       "onMouseEnter",
       "refreshDataBlockRequest",
       "confirmTitle"
-    ]), v = useDesigner(), I = useField(), F = useFieldSchema(), w = useCompile(), T = useCollectionRecordData(), D = w((X = F["x-component-props"]) == null ? void 0 : X.confirm) || g, B = useMemo(
+    ]), v = useDesigner(), I = useField(), F = useFieldSchema(), w = useCompile(), T = useCollectionRecordData(), D = w((Y = F["x-component-props"]) == null ? void 0 : Y.confirm) || g, B = useMemo(
       () => {
-        var W;
-        return ((W = F == null ? void 0 : F["x-linkage-rules"]) == null ? void 0 : W.filter((J) => !J.disabled)) || [];
+        var X;
+        return ((X = F == null ? void 0 : F["x-linkage-rules"]) == null ? void 0 : X.filter((Q) => !Q.disabled)) || [];
       },
       [F == null ? void 0 : F["x-linkage-rules"]]
     ), { designable: N } = useDesignable(), M = useComponent(o) || o, j = useVariables$1(), R = useLocalVariables$1(), { visibleWithURL: O, setVisibleWithURL: $ } = usePopupUtils(), { setSubmitted: A } = useActionContext(), { getAriaLabel: E } = useGetAriaLabelOfAction(l), z = useCollectionParentRecordData(), L = useApp(), { getAllDataBlocks: V } = useAllDataBlocks(), G = useForm();
     useEffect(() => {
       I.stateOfLinkageRules && setInitialActionState(I);
-      const W = uid(), J = [];
+      const X = uid(), Q = [];
       return setTimeout(() => {
-        G.addEffects(W, () => {
-          forEachLinkageRule(B, (Z, Q) => {
-            J.push(
+        G.addEffects(X, () => {
+          forEachLinkageRule(B, (ee, J) => {
+            Q.push(
               reaction(
                 () => [getVariableValuesInCondition({ linkageRules: B, localVariables: R })].map((re) => JSON.stringify(re)).join(","),
                 () => {
                   I.stateOfLinkageRules = {}, linkageAction(
                     {
-                      operator: Z.operator,
+                      operator: ee.operator,
                       field: I,
-                      condition: Q.condition,
+                      condition: J.condition,
                       variables: j,
                       localVariables: R,
-                      conditionType: Q.conditionType,
+                      conditionType: J.conditionType,
                       variableNameOfLeftCondition: "$nRecord"
                     },
                     L.jsonLogic
@@ -40198,27 +40216,27 @@ const ActionLink = withDynamicSchemaProps(
           });
         });
       }), () => {
-        G.removeEffects(W), J.forEach((Z) => {
-          Z();
+        G.removeEffects(X), Q.forEach((ee) => {
+          ee();
         });
       };
     }, [B, T]);
     const H = useCallback(
-      (W) => {
-        C == null || C(W);
+      (X) => {
+        C == null || C(X);
       },
       [C]
-    ), U = useMemo(() => c && ((W, J) => q(void 0, null, function* () {
-      var Q, ee;
-      yield c == null ? void 0 : c(W, J);
-      const Z = ((ee = (Q = F["x-action-settings"]) == null ? void 0 : Q.onSuccess) == null ? void 0 : ee.blocksToRefresh) || [];
-      Z.length > 0 && V().forEach((ne) => {
+    ), U = useMemo(() => c && ((X, Q) => q(void 0, null, function* () {
+      var J, Z;
+      yield c == null ? void 0 : c(X, Q);
+      const ee = ((Z = (J = F["x-action-settings"]) == null ? void 0 : J.onSuccess) == null ? void 0 : Z.blocksToRefresh) || [];
+      ee.length > 0 && V().forEach((te) => {
         var re;
-        if (Z.includes(ne.uid))
+        if (ee.includes(te.uid))
           try {
-            (re = ne.service) == null || re.refresh();
-          } catch (ie) {
-            console.error("Failed to refresh block:", ne.uid, ie);
+            (re = te.service) == null || re.refresh();
+          } catch (se) {
+            console.error("Failed to refresh block:", te.uid, se);
           }
       });
     })), [c, F, V]);
@@ -40257,8 +40275,8 @@ const ActionLink = withDynamicSchemaProps(
   }),
   { displayName: "Action" }
 ), InternalAction = observer$1(function e(t) {
-  var ge, Ce, me, xe, he;
-  const fe = t, {
+  var xe, Ce, he, fe, ge;
+  const me = t, {
     containerRefKey: n,
     fieldSchema: o,
     designable: r,
@@ -40286,7 +40304,7 @@ const ActionLink = withDynamicSchemaProps(
     setSubmitted: B,
     getAriaLabel: N,
     parentRecordData: M
-  } = fe, j = Y(fe, [
+  } = me, j = W(me, [
     "containerRefKey",
     "fieldSchema",
     "designable",
@@ -40314,24 +40332,24 @@ const ActionLink = withDynamicSchemaProps(
     "setSubmitted",
     "getAriaLabel",
     "parentRecordData"
-  ]), [R, O] = useState(!1), { wrapSSR: $, componentCls: A, hashId: E } = useStyles$8(), [z, L] = useState(!1), V = o["x-toolbar-props"] || o["x-designer-props"], G = (ge = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : ge.openMode, H = (Ce = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : Ce.openSize, U = (me = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : me.refreshDataBlockRequest, { modal: K } = App.useApp(), X = useForm(), W = useACLActionParamsContext(), {
-    run: J,
-    element: Z,
-    disabled: Q,
-    loading: ee
-  } = (F == null ? void 0 : F(w)) || {}, ne = X.disabled || a.disabled || ((xe = a.data) == null ? void 0 : xe.disabled) || I || Q, re = useMemo(() => {
-    var de;
+  ]), [R, O] = useState(!1), { wrapSSR: $, componentCls: A, hashId: E } = useStyles$8(), [z, L] = useState(!1), V = o["x-toolbar-props"] || o["x-designer-props"], G = (xe = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : xe.openMode, H = (Ce = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : Ce.openSize, U = (he = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : he.refreshDataBlockRequest, { modal: K } = App.useApp(), Y = useForm(), X = useACLActionParamsContext(), {
+    run: Q,
+    element: ee,
+    disabled: J,
+    loading: Z
+  } = (F == null ? void 0 : F(w)) || {}, te = Y.disabled || a.disabled || ((fe = a.data) == null ? void 0 : fe.disabled) || I || J, re = useMemo(() => {
+    var pe;
     return P(x({}, v), {
-      opacity: r && (((de = a == null ? void 0 : a.data) == null ? void 0 : de.hidden) || !W) && 0.1,
-      color: ne ? "rgba(0, 0, 0, 0.25)" : v == null ? void 0 : v.color
+      opacity: r && (((pe = a == null ? void 0 : a.data) == null ? void 0 : pe.hidden) || !X) && 0.1,
+      color: te ? "rgba(0, 0, 0, 0.25)" : v == null ? void 0 : v.color
     });
-  }, [W, r, (he = a == null ? void 0 : a.data) == null ? void 0 : he.hidden, v, ne]), ie = {
+  }, [X, r, (ge = a == null ? void 0 : a.data) == null ? void 0 : ge.hidden, v, te]), se = {
     designable: r,
     field: a,
-    aclCtx: W,
+    aclCtx: X,
     icon: i,
-    loading: typeof ee == "boolean" ? ee : l,
-    disabled: ne,
+    loading: typeof Z == "boolean" ? Z : l,
+    disabled: te,
     buttonStyle: re,
     handleMouseEnter: c,
     tarComponent: u,
@@ -40347,24 +40365,24 @@ const ActionLink = withDynamicSchemaProps(
     refreshDataBlockRequest: U,
     fieldSchema: o,
     setVisible: O,
-    run: J,
+    run: Q,
     confirm: g,
     modal: K,
     setSubmitted: B,
     confirmTitle: f,
     title: y
-  }, pe = useCallback(
-    (de) => {
-      O == null || O(de), D == null || D(de);
+  }, ue = useCallback(
+    (pe) => {
+      O == null || O(pe), D == null || D(pe);
     },
     [D]
   );
-  let ce = /* @__PURE__ */ jsx(PopupVisibleProvider, { visible: !1, children: /* @__PURE__ */ jsxs(
+  let le = /* @__PURE__ */ jsx(PopupVisibleProvider, { visible: !1, children: /* @__PURE__ */ jsxs(
     ActionContextProvider,
     {
-      button: RenderButton(ie),
+      button: RenderButton(se),
       visible: R || T,
-      setVisible: pe,
+      setVisible: ue,
       formValueChanged: z,
       setFormValueChanged: L,
       openMode: G,
@@ -40374,13 +40392,13 @@ const ActionLink = withDynamicSchemaProps(
       setSubmitted: B,
       children: [
         C && /* @__PURE__ */ jsx(NocoBaseRecursionField, { basePath: a.address, onlyRenderProperties: !0, schema: o }),
-        !C && /* @__PURE__ */ jsx(RenderButton, x({}, ie)),
+        !C && /* @__PURE__ */ jsx(RenderButton, x({}, se)),
         /* @__PURE__ */ jsx(VariablePopupRecordProvider, { children: !C && t.children }),
-        Z
+        ee
       ]
     }
   ) });
-  return isBulkEditAction(o) && (ce = /* @__PURE__ */ jsx(TabsContextProvider, { children: ce })), $(b ? /* @__PURE__ */ jsx(TreeRecordProvider, { parent: S, children: ce }) : ce);
+  return isBulkEditAction(o) && (le = /* @__PURE__ */ jsx(TabsContextProvider, { children: le })), $(b ? /* @__PURE__ */ jsx(TreeRecordProvider, { parent: S, children: le }) : le);
 });
 InternalAction.displayName = "InternalAction";
 Action.Popover = function e(t) {
@@ -40461,23 +40479,23 @@ const RenderButton = ({
     localVariables: $
   }, V = useCallback(
     (G, H = !0) => q(void 0, null, function* () {
-      var X;
+      var Y;
       if (H && isPortalInBody(G.target))
         return;
       G.preventDefault(), G.stopPropagation();
       const U = yield getVariableValue(M(F == null ? void 0 : F.title, { title: E(y.title) }), L), K = yield getVariableValue(M(F == null ? void 0 : F.content, { title: E(y.title) }), L);
       if (!a && n) {
-        const W = () => {
+        const X = () => {
           b ? b(G, () => {
-            var J, Z;
-            S !== !1 && (T == null || T(!0), (Z = (J = N()) == null ? void 0 : J.refresh) == null || Z.call(J));
+            var Q, ee;
+            S !== !1 && (T == null || T(!0), (ee = (Q = N()) == null ? void 0 : Q.refresh) == null || ee.call(Q));
           }) : isBulkEditAction(y) || !j() ? (v(!0), I == null || I()) : ["view", "update", "create", "customize:popup"].includes(y["x-action"]) && y["x-uid"] ? A.current() : (v(!0), I == null || I());
         };
-        (F == null ? void 0 : F.enable) !== !1 && (F != null && F.content) ? (yield (X = z == null ? void 0 : z.submit) == null ? void 0 : X.call(z), w.confirm({
+        (F == null ? void 0 : F.enable) !== !1 && (F != null && F.content) ? (yield (Y = z == null ? void 0 : z.submit) == null ? void 0 : Y.call(z), w.confirm({
           title: M(U, { title: D || B || (t == null ? void 0 : t.title) }),
           content: M(K, { title: D || B || (t == null ? void 0 : t.title) }),
-          onOk: W
-        })) : W();
+          onOk: X
+        })) : X();
       }
     }),
     [
@@ -40550,7 +40568,7 @@ const RenderButtonInner = observer$1(
       title: S,
       isLink: y,
       onlyIcon: v
-    } = O, I = Y(O, [
+    } = O, I = W(O, [
       "designable",
       "field",
       "aclCtx",
@@ -40587,7 +40605,7 @@ const RenderButtonInner = observer$1(
     const T = useMemo(
       () => React.forwardRef(
         (K, U) => {
-          var X = K, { component: z = p || Button, icon: L, onlyIcon: V, children: G } = X, H = Y(X, ["component", "icon", "onlyIcon", "children"]);
+          var Y = K, { component: z = p || Button, icon: L, onlyIcon: V, children: G } = Y, H = W(Y, ["component", "icon", "onlyIcon", "children"]);
           return /* @__PURE__ */ jsxs(z, P(x({ ref: U }, H), { children: [
             v ? /* @__PURE__ */ jsx(Tooltip, { title: H.title, children: /* @__PURE__ */ jsx("span", { style: { padding: 3 }, children: L && typeof L == "string" ? /* @__PURE__ */ jsx(Icon, { type: L }) : L }) }) : /* @__PURE__ */ jsx("span", { style: { paddingRight: 3 }, children: L && typeof L == "string" ? /* @__PURE__ */ jsx(Icon, { type: L }) : L }),
             v ? G[1] : G
@@ -40598,7 +40616,7 @@ const RenderButtonInner = observer$1(
     );
     if (!t && (($ = n == null ? void 0 : n.data) != null && $.hidden || !o))
       return null;
-    const D = S != null ? S : n == null ? void 0 : n.title, B = typeof D == "string" ? F(D, { ns: NAMESPACE_UI_SCHEMA }) : D, A = l, { opacity: N } = A, M = Y(A, ["opacity"]), j = y && N ? { opacity: N } : void 0, R = v || p ? T : p || Button;
+    const D = S != null ? S : n == null ? void 0 : n.title, B = typeof D == "string" ? F(D, { ns: NAMESPACE_UI_SCHEMA }) : D, A = l, { opacity: N } = A, M = W(A, ["opacity"]), j = y && N ? { opacity: N } : void 0, R = v || p ? T : p || Button;
     return /* @__PURE__ */ jsxs(
       SortableItem,
       P(x({
@@ -40627,14 +40645,14 @@ RenderButtonInner.displayName = "RenderButtonInner";
 const ActionBarContext = React.createContext({
   container: null
 }), ActionBarProvider = (n) => {
-  var o = n, { children: e } = o, t = Y(o, ["children"]);
+  var o = n, { children: e } = o, t = W(o, ["children"]);
   return /* @__PURE__ */ jsx(ActionBarContext.Provider, { value: t, children: e });
 }, useActionBarContext = () => useContext(ActionBarContext), Portal = (e) => {
   const t = useFieldSchema(), { container: n, parentComponents: o = ["BlockItem", "CardItem"] } = useActionBarContext();
   return /* @__PURE__ */ jsx(Fragment$1, { children: n && o.includes(t.parent["x-component"]) ? createPortal(e.children, n) : e.children });
 }, InternalActionBar = (e) => {
   var p;
-  const { forceProps: t = {} } = useActionBarContext(), d = x(x({}, useProps(e)), t), { layout: n = "two-columns", style: o, spaceProps: r } = d, a = Y(d, ["layout", "style", "spaceProps"]), i = useFieldSchema(), { render: l } = useSchemaInitializerRender(i["x-initializer"], i["x-initializer-props"]), { designable: c } = useDesignable();
+  const { forceProps: t = {} } = useActionBarContext(), d = x(x({}, useProps(e)), t), { layout: n = "two-columns", style: o, spaceProps: r } = d, a = W(d, ["layout", "style", "spaceProps"]), i = useFieldSchema(), { render: l } = useSchemaInitializerRender(i["x-initializer"], i["x-initializer-props"]), { designable: c } = useDesignable();
   if (n === "one-column")
     return /* @__PURE__ */ jsx(Portal, { children: /* @__PURE__ */ jsx(DndContext, { children: /* @__PURE__ */ jsxs(
       "div",
@@ -40706,10 +40724,10 @@ const ActionBarContext = React.createContext({
     }
   });
 }, FormComponent$1 = (e) => {
-  const l = e, { form: t, children: n } = l, o = Y(l, ["form", "children"]), r = useField(), a = useFieldSchema(), i = useAttach(t.createVoidField(P(x({}, r.props), { basePath: "" })));
+  const l = e, { form: t, children: n } = l, o = W(l, ["form", "children"]), r = useField(), a = useFieldSchema(), i = useAttach(t.createVoidField(P(x({}, r.props), { basePath: "" })));
   return /* @__PURE__ */ jsx(FieldContext.Provider, { value: void 0, children: /* @__PURE__ */ jsx(FormContext.Provider, { value: t, children: /* @__PURE__ */ jsx(FormLayout, P(x({ layout: "vertical" }, o), { children: /* @__PURE__ */ jsx(NocoBaseRecursionField, { basePath: i.address, schema: a, onlyRenderProperties: !0 }) })) }) });
 }, Def$1 = (e) => e.children, FormDecorator$1 = (e) => {
-  const u = e, { form: t, children: n, disabled: o } = u, r = Y(u, ["form", "children", "disabled"]), a = useField(), i = useFieldSchema(), l = useAttach(t.createVoidField(P(x({}, a.props), { basePath: "" }))), c = useComponent(i["x-component"], Def$1);
+  const u = e, { form: t, children: n, disabled: o } = u, r = W(u, ["form", "children", "disabled"]), a = useField(), i = useFieldSchema(), l = useAttach(t.createVoidField(P(x({}, a.props), { basePath: "" }))), c = useComponent(i["x-component"], Def$1);
   return useEffect(() => {
     t.disabled = o || a.disabled;
   }, [o, a.disabled]), /* @__PURE__ */ jsx(ConfigProvider, { componentDisabled: o, children: /* @__PURE__ */ jsx(FieldContext.Provider, { value: void 0, children: /* @__PURE__ */ jsx(FormContext.Provider, { value: t, children: /* @__PURE__ */ jsx(FormLayout, P(x({ layout: "vertical" }, r), { children: /* @__PURE__ */ jsx(FieldContext.Provider, { value: l, children: /* @__PURE__ */ jsx(c, P(x({}, a.componentProps), { children: /* @__PURE__ */ jsx(NocoBaseRecursionField, { basePath: l.address, schema: i, onlyRenderProperties: !0 }) })) }) })) }) }) });
@@ -40722,7 +40740,7 @@ const ActionBarContext = React.createContext({
 FormBlockContext.displayName = "FormBlockContext";
 const Form$1 = observer$1(
   (e) => {
-    const p = e, { request: t, effects: n, initialValue: o, useValues: r = useDefaultValues } = p, a = Y(p, ["request", "effects", "initialValue", "useValues"]), i = useFieldSchema(), l = useField(), c = useMemo(() => createForm({ effects: n }), []), u = r(
+    const p = e, { request: t, effects: n, initialValue: o, useValues: r = useDefaultValues } = p, a = W(p, ["request", "effects", "initialValue", "useValues"]), i = useFieldSchema(), l = useField(), c = useMemo(() => createForm({ effects: n }), []), u = r(
       {
         uid: i["x-uid"],
         onSuccess(h) {
@@ -40885,7 +40903,7 @@ const ReadPrettyInternal = observer$1(
   },
   { displayName: "SelectReadPretty" }
 ), ReadPretty$b = withPopupWrapper(ReadPrettyInternal), isEmptyObject = (e) => !isValid(e) || typeof e == "object" && Object.keys(e).length === 0, ObjectSelect = (e) => {
-  const h = e, { value: t, options: n, onChange: o, fieldNames: r, mode: a, loading: i, rawOptions: l, defaultValue: c } = h, u = Y(h, ["value", "options", "onChange", "fieldNames", "mode", "loading", "rawOptions", "defaultValue"]), d = isDesktop ? "" : fixKeyboardIssue, p = isDesktop ? void 0 : "topLeft", m = (g) => {
+  const h = e, { value: t, options: n, onChange: o, fieldNames: r, mode: a, loading: i, rawOptions: l, defaultValue: c } = h, u = W(h, ["value", "options", "onChange", "fieldNames", "mode", "loading", "rawOptions", "defaultValue"]), d = isDesktop ? "" : fixKeyboardIssue, p = isDesktop ? void 0 : "topLeft", m = (g) => {
     var b;
     if (isEmptyObject(g))
       return;
@@ -40955,7 +40973,7 @@ const ReadPrettyInternal = observer$1(
   }
 `, InternalSelect = connect(
   (e) => {
-    const m = e, { objectValue: t, loading: n, value: o, rawOptions: r, defaultValue: a } = m, i = Y(m, ["objectValue", "loading", "value", "rawOptions", "defaultValue"]), l = useCompile(), c = isDesktop ? "" : fixKeyboardIssue, u = isDesktop ? void 0 : "topLeft";
+    const m = e, { objectValue: t, loading: n, value: o, rawOptions: r, defaultValue: a } = m, i = W(m, ["objectValue", "loading", "value", "rawOptions", "defaultValue"]), l = useCompile(), c = isDesktop ? "" : fixKeyboardIssue, u = isDesktop ? void 0 : "topLeft";
     let d = e.multiple ? "multiple" : e.mode;
     if (d && !["multiple", "tags"].includes(d) && (d = void 0), useEffect(() => {
       var h;
@@ -41058,8 +41076,8 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
 ), EMPTY$1 = "N/A", InternalRemoteSelect = withDynamicSchemaProps(
   connect(
     (e) => {
-      var K, X;
-      const U = e, {
+      var Q, ee;
+      const X = e, {
         fieldNames: t = {},
         service: n = {},
         wait: o = 300,
@@ -41072,10 +41090,10 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
         CustomDropdownRender: d,
         optionFilter: p,
         dataSource: m,
-        toOptionsItem: h = (W) => W,
+        toOptionsItem: h = (J) => J,
         popupMatchSelectWidth: g = !1,
         onSuccess: f
-      } = U, C = Y(U, [
+      } = X, C = W(X, [
         "fieldNames",
         "service",
         "wait",
@@ -41091,39 +41109,39 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
         "toOptionsItem",
         "popupMatchSelectWidth",
         "onSuccess"
-      ]), b = useDataSourceKey(), S = useDataSourceHeaders(m || b), y = useRef(!1), v = useFieldSchema(), I = ((K = v["x-component-props"]) == null ? void 0 : K.addMode) === "quickAdd", { getField: F } = useCollection_deprecated(), w = useRef(null), { getCollectionJoinField: T, getInterface: D } = useCollectionManager_deprecated(), B = v["x-collection-field"] || v.name, N = F(B) || T(B), M = u || (N == null ? void 0 : N.target) && (t == null ? void 0 : t.label) && T(`${N.target}.${t.label}`), j = useMemo(() => {
-        var W;
+      ]), b = useDataSourceKey(), S = useDataSourceHeaders(m || b), y = useRef(!1), v = useFieldSchema(), I = ((Q = v["x-component-props"]) == null ? void 0 : Q.addMode) === "quickAdd", { getField: F } = useCollection_deprecated(), w = useRef(null), { getCollectionJoinField: T, getInterface: D } = useCollectionManager_deprecated(), B = v["x-collection-field"] || v.name, N = F(B) || T(B), M = u || (N == null ? void 0 : N.target) && (t == null ? void 0 : t.label) && T(`${N.target}.${t.label}`), j = useMemo(() => {
+        var J;
         if (M != null && M.interface) {
-          const J = D(M.interface), Z = ((W = J == null ? void 0 : J.filterable) == null ? void 0 : W.operators[0].value) || "$includes";
-          return M.type === "string" || M.dataType === "string" ? "$includes" : Z;
+          const Z = D(M.interface), te = ((J = Z == null ? void 0 : Z.filterable) == null ? void 0 : J.operators[0].value) || "$includes";
+          return M.type === "string" || M.dataType === "string" ? "$includes" : te;
         }
         return "$includes";
       }, [M]), R = useCompile(), O = useCallback(
-        (W) => {
+        (J) => {
           try {
-            return W.filter((J) => ["number", "string"].includes(typeof J[t.value]) || !J[t.value]).map((J) => {
-              var Q;
-              let Z = R(J[t.label]);
-              if ((Q = M == null ? void 0 : M.uiSchema) != null && Q.enum)
-                if (Array.isArray(Z))
-                  Z = Z.map((ee, ne) => {
-                    const re = M.uiSchema.enum.find((ie) => ie.value === ee);
-                    return re ? /* @__PURE__ */ jsx(Tag, { role: "button", color: re.color, style: { marginRight: 3 }, children: (re == null ? void 0 : re.label) || ee }, ne) : /* @__PURE__ */ jsx(Tag, { role: "button", children: ee }, ee);
+            return J.filter((Z) => ["number", "string"].includes(typeof Z[t.value]) || !Z[t.value]).map((Z) => {
+              var re;
+              let te = R(Z[t.label]);
+              if ((re = M == null ? void 0 : M.uiSchema) != null && re.enum)
+                if (Array.isArray(te))
+                  te = te.map((se, ue) => {
+                    const le = M.uiSchema.enum.find((me) => me.value === se);
+                    return le ? /* @__PURE__ */ jsx(Tag, { role: "button", color: le.color, style: { marginRight: 3 }, children: (le == null ? void 0 : le.label) || se }, ue) : /* @__PURE__ */ jsx(Tag, { role: "button", children: se }, se);
                   }).reverse();
                 else {
-                  const ee = M.uiSchema.enum.find((ne) => ne.value === Z);
-                  ee && (Z = /* @__PURE__ */ jsx(Tag, { role: "button", color: ee.color, children: ee.label }));
+                  const se = M.uiSchema.enum.find((ue) => ue.value === te);
+                  se && (te = /* @__PURE__ */ jsx(Tag, { role: "button", color: se.color, children: se.label }));
                 }
-              return (M == null ? void 0 : M.type) === "date" && (Z = dayjs(Z).format("YYYY-MM-DD")), c ? c({
-                [t.label]: Z || EMPTY$1,
-                [t.value]: J[t.value]
-              }) : P(x({}, omit(J, "style")), {
-                [t.label]: Z || EMPTY$1,
-                [t.value]: J[t.value]
+              return (M == null ? void 0 : M.type) === "date" && (te = dayjs(te).format("YYYY-MM-DD")), c ? c({
+                [t.label]: te || EMPTY$1,
+                [t.value]: Z[t.value]
+              }) : P(x({}, omit(Z, "style")), {
+                [t.label]: te || EMPTY$1,
+                [t.value]: Z[t.value]
               });
             }).filter(Boolean);
-          } catch (J) {
-            return console.error(J), W;
+          } catch (Z) {
+            return console.error(Z), J;
           }
         },
         [M == null ? void 0 : M.uiSchema, t]
@@ -41135,7 +41153,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
           params: P(x({
             pageSize: 200
           }, n == null ? void 0 : n.params), {
-            filter: (X = n == null ? void 0 : n.params) == null ? void 0 : X.filter
+            filter: (ee = n == null ? void 0 : n.params) == null ? void 0 : ee.filter
           })
         }),
         x({
@@ -41143,13 +41161,27 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
           debounceWait: o,
           onSuccess: f
         }, n.defaultParams ? { defaultParams: [n.defaultParams] } : {})
-      ), z = useMemo(
+      ), {
+        data: z,
+        run: L,
+        loading: V
+      } = useRequest(
+        P(x({
+          action: "get"
+        }, n), {
+          headers: S
+        }),
+        {
+          manual: !0,
+          debounceWait: o
+        }
+      ), G = useMemo(
         () => JSON.stringify({
           service: n,
           fieldNames: t
         }),
         [n, t]
-      ), L = useCallback(() => w.current && d ? /* @__PURE__ */ jsx(
+      ), H = useCallback(() => w.current && d ? /* @__PURE__ */ jsx(
         d,
         {
           search: w.current,
@@ -41160,27 +41192,31 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
       ) : null, [w.current]);
       useEffect(() => {
         y.current && A();
-      }, [z]);
-      const V = (W) => q(void 0, null, function* () {
-        var J;
+      }, [G]), useEffect(() => {
+        !i && ($ != null && $.data) && ($ != null && $.data.some((J) => J[t.value] === r) || L({
+          filterByTk: r
+        }));
+      }, [r, $ == null ? void 0 : $.data]);
+      const U = (J) => q(void 0, null, function* () {
+        var Z;
         A({
           filter: mergeFilter([
-            W ? {
+            J ? {
               [t.label]: {
-                [j]: W
+                [j]: J
               }
             } : {},
-            (J = n == null ? void 0 : n.params) == null ? void 0 : J.filter
+            (Z = n == null ? void 0 : n.params) == null ? void 0 : Z.filter
           ])
-        }), w.current = W;
-      }), G = useMemo(() => {
-        var Q;
-        const W = r || a;
-        if (!((Q = $ == null ? void 0 : $.data) != null && Q.length))
-          return W != null ? Array.isArray(W) ? W : [W] : [];
-        const J = W != null && (Array.isArray(W) ? W.map((ee) => P(x({}, ee), { [t.value]: ee[t.value] || ee })) : [P(x({}, W), { [t.value]: W[t.value] || W })]) || [], Z = typeof p == "function" ? $.data.filter(p) : $.data;
-        return uniqBy(Z.concat(J != null ? J : []), t.value);
-      }, [r, a, $ == null ? void 0 : $.data, t.value, p]);
+        }), w.current = J;
+      }), K = useMemo(() => {
+        var re;
+        const J = i ? r || a : z == null ? void 0 : z.data;
+        if (!((re = $ == null ? void 0 : $.data) != null && re.length))
+          return J != null ? Array.isArray(J) ? J : [J] : [];
+        const Z = J != null && (Array.isArray(J) ? J.map((se) => P(x({}, se), { [t.value]: se[t.value] || se })) : [P(x({}, J), { [t.value]: J[t.value] || J })]) || [], te = typeof p == "function" ? $.data.filter(p) : $.data;
+        return uniqBy(te.concat(Z != null ? Z : []), t.value);
+      }, [r, a, $ == null ? void 0 : $.data, t.value, p, z == null ? void 0 : z.data]);
       return /* @__PURE__ */ jsx(
         Select,
         P(x({
@@ -41189,24 +41225,24 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
           filterOption: !1,
           filterSort: null,
           fieldNames: t,
-          onSearch: V,
-          onDropdownVisibleChange: (W) => {
-            w.current = null, W && A(), y.current = !0;
+          onSearch: U,
+          onDropdownVisibleChange: (J) => {
+            w.current = null, J && A(), y.current = !0;
           },
           objectValue: i,
           value: r,
           defaultValue: a
         }, C), {
           loading: $ ? E : !0,
-          options: h(O(G)),
-          rawOptions: G,
-          dropdownRender: (W) => {
-            const J = G.some((Z) => Z[t.label] === w.current);
+          options: h(O(K)),
+          rawOptions: K,
+          dropdownRender: (J) => {
+            const Z = K.some((te) => te[t.label] === w.current);
             return /* @__PURE__ */ jsx(Fragment$1, { children: I ? /* @__PURE__ */ jsxs(Fragment$1, { children: [
-              !(($ == null ? void 0 : $.data.length) === 0 && (w != null && w.current)) && W,
-              ($ == null ? void 0 : $.data.length) > 0 && (w == null ? void 0 : w.current) && !J && /* @__PURE__ */ jsx(Divider$1, { style: { margin: 0 } }),
-              !J && /* @__PURE__ */ jsx(L, {})
-            ] }) : W });
+              !(($ == null ? void 0 : $.data.length) === 0 && (w != null && w.current)) && J,
+              ($ == null ? void 0 : $.data.length) > 0 && (w == null ? void 0 : w.current) && !Z && /* @__PURE__ */ jsx(Divider$1, { style: { margin: 0 } }),
+              !Z && /* @__PURE__ */ jsx(H, {})
+            ] }) : J });
           }
         })
       );
@@ -41346,7 +41382,7 @@ const useFormBlockHeight = () => {
   const e = useDataBlockHeight(), t = useFieldSchema(), { token: n } = theme.useToken(), { designable: o } = useDesignable(), { heightProps: r } = useBlockHeightProps() || {}, { title: a, titleHeight: i } = r || {}, { display: l, enabled: c } = useFormDataTemplates(), u = t.reduceProperties((w, T) => T["x-component"] === "ActionBar" ? T : w), d = Object.keys((u == null ? void 0 : u.properties) || {}).length > 0, p = (F = (I = (v = t == null ? void 0 : t.parent) == null ? void 0 : v["x-decorator"]) == null ? void 0 : I.includes) == null ? void 0 : F.call(I, "FormBlockProvider"), m = d || o ? n.controlHeight + (p ? 1 * n.marginLG : 24 + n.paddingLG) : n.marginLG, h = a ? i : 0, g = useDataBlockRequestData(), { count: f, pageSize: C } = (g == null ? void 0 : g.meta) || {}, S = f > C ? n.controlHeightSM + 24 : 0, y = l && c ? n.controlHeight + 2 * n.padding + n.margin : 0;
   return e - m - n.paddingLG - h - S - y;
 }, FormComponent = (e) => {
-  const S = e, { form: t, children: n } = S, o = Y(S, ["form", "children"]), r = useField(), a = useFieldSchema(), i = getCardItemSchema == null ? void 0 : getCardItemSchema(a), l = useAttach(t.createVoidField(P(x({}, r.props), { basePath: "" }))), c = useFormBlockHeight(), { token: u } = theme.useToken(), {
+  const S = e, { form: t, children: n } = S, o = W(S, ["form", "children"]), r = useField(), a = useFieldSchema(), i = getCardItemSchema == null ? void 0 : getCardItemSchema(a), l = useAttach(t.createVoidField(P(x({}, r.props), { basePath: "" }))), c = useFormBlockHeight(), { token: u } = theme.useToken(), {
     layout: d = "vertical",
     labelAlign: p = "left",
     labelWidth: m = 120,
@@ -41393,7 +41429,7 @@ const useFormBlockHeight = () => {
     })
   ) }) });
 }, Def = (e) => e.children, FormDecorator = (e) => {
-  const p = e, { form: t, children: n, disabled: o } = p, r = Y(p, ["form", "children", "disabled"]), a = useField(), i = useFieldSchema(), l = useAttach(t.createVoidField(P(x({}, a.props), { basePath: "" }))), c = useComponent(i["x-component"], Def), { isMobileLayout: u } = useMobileLayout(), d = useMemo(
+  const p = e, { form: t, children: n, disabled: o } = p, r = W(p, ["form", "children", "disabled"]), a = useField(), i = useFieldSchema(), l = useAttach(t.createVoidField(P(x({}, a.props), { basePath: "" }))), c = useComponent(i["x-component"], Def), { isMobileLayout: u } = useMobileLayout(), d = useMemo(
     () => u ? transformMultiColumnToSingleColumn(i) : i,
     [i, u]
   );
@@ -41470,7 +41506,7 @@ const useFormBlockHeight = () => {
   }
 `, Form = withDynamicSchemaProps(
   observer$1((e) => {
-    const t = useField(), { token: n } = useToken(), c = useProps(e), { form: o, disabled: r } = c, a = Y(c, ["form", "disabled"]), i = useMemo(() => ({
+    const t = useField(), { token: n } = useToken(), c = useProps(e), { form: o, disabled: r } = c, a = W(c, ["form", "disabled"]), i = useMemo(() => ({
       token: {
         // 这里是为了防止区块内部也收到 marginBlock 的影响（marginBlock：区块之间的间距）
         // @ts-ignore
@@ -42866,7 +42902,7 @@ const menuItemTitleStyle = {
 };
 Menu.Item = observer$1(
   (e) => {
-    const { t } = useMenuTranslation(), { pushMenuItem: n } = useCollectMenuItems(), p = e, { icon: o, children: r, hidden: a } = p, i = Y(p, ["icon", "children", "hidden"]), l = useFieldSchema(), c = useField(), u = useContext(MenuItemDesignerContext), d = useMemo(() => {
+    const { t } = useMenuTranslation(), { pushMenuItem: n } = useCollectMenuItems(), p = e, { icon: o, children: r, hidden: a } = p, i = W(p, ["icon", "children", "hidden"]), l = useFieldSchema(), c = useField(), u = useContext(MenuItemDesignerContext), d = useMemo(() => {
       var m;
       return P(x({}, i), {
         hidden: a,
@@ -42938,7 +42974,7 @@ const MenuURLButton = ({ href: e, params: t, icon: n }) => {
 };
 Menu.URL = observer$1(
   (e) => {
-    const { pushMenuItem: t } = useCollectMenuItems(), { designable: n } = useDesignable(), d = e, { icon: o, children: r, hidden: a } = d, i = Y(d, ["icon", "children", "hidden"]), l = useFieldSchema(), c = useField();
+    const { pushMenuItem: t } = useCollectMenuItems(), { designable: n } = useDesignable(), d = e, { icon: o, children: r, hidden: a } = d, i = W(d, ["icon", "children", "hidden"]), l = useFieldSchema(), c = useField();
     if (!t)
       return error("Menu.URL must be wrapped by GetMenuItemsContext.Provider"), null;
     const u = useMemo(() => P(x({}, i), {
@@ -42957,7 +42993,7 @@ Menu.URL = observer$1(
 );
 Menu.SubMenu = observer$1(
   (e) => {
-    const { t } = useMenuTranslation(), { designable: n } = useDesignable(), { Component: o, getMenuItems: r } = useMenuItem(), { pushMenuItem: a } = useCollectMenuItems(), f = e, { icon: i, children: l, hidden: c } = f, u = Y(f, ["icon", "children", "hidden"]), d = useFieldSchema(), p = useField(), m = useContext(MenuModeContext), h = useContext(MenuItemDesignerContext), g = useMemo(() => {
+    const { t } = useMenuTranslation(), { designable: n } = useDesignable(), { Component: o, getMenuItems: r } = useMenuItem(), { pushMenuItem: a } = useCollectMenuItems(), f = e, { icon: i, children: l, hidden: c } = f, u = W(f, ["icon", "children", "hidden"]), d = useFieldSchema(), p = useField(), m = useContext(MenuModeContext), h = useContext(MenuItemDesignerContext), g = useMemo(() => {
       var C;
       return P(x({}, u), {
         hidden: n ? !1 : c,
@@ -43201,7 +43237,15 @@ const className1 = css`
 }, PageContent = memo((e) => /* @__PURE__ */ jsx(PopupRouteContextResetter, { children: /* @__PURE__ */ jsx(InternalPageContent, x({}, e)) })), TabBadge = (e) => {
   var n, o, r;
   const t = useEvaluatedExpression((o = (n = e.tabRoute.options) == null ? void 0 : n.badge) == null ? void 0 : o.count);
-  return t == null ? null : /* @__PURE__ */ jsx(Badge, P(x({}, (r = e.tabRoute.options) == null ? void 0 : r.badge), { count: t, style: x({ maxWidth: "10em" }, e.style), dot: !1, children: e.children }));
+  return t == null ? null : /* @__PURE__ */ jsx(
+    Badge,
+    P(x({}, (r = e.tabRoute.options) == null ? void 0 : r.badge), {
+      count: t,
+      style: x({ maxWidth: "10em" }, e.style),
+      dot: !1,
+      children: e.children
+    })
+  );
 }, NocoBasePageHeaderTabs = ({ className: e, activeKey: t }) => {
   const n = useFieldSchema(), { t: o } = useTranslation(), { t: r } = useRouteTranslation(), { token: a } = useToken$1(), i = useRouterBasename(), l = useNavigateNoUpdate(), c = useCallback(
     (I) => {
@@ -43654,7 +43698,7 @@ const FieldsTreeSelect = (e) => {
     rootOption: l,
     loadData: c,
     includeFieldPaths: u
-  } = M, d = Y(M, [
+  } = M, d = W(M, [
     "title",
     "value",
     "onChange",
@@ -43787,7 +43831,7 @@ function getFieldPath(e) {
 const InternalAssociationSelect$1 = observer$1(
   (e) => {
     var B;
-    const D = e, { objectValue: t = !0, addMode: n } = D, o = Y(D, ["objectValue", "addMode"]), r = useField(), a = useFieldSchema(), i = useServiceOptions$1((a == null ? void 0 : a["x-component-props"]) || e), { options: l } = useAssociationFieldContext(), c = isVariable$1(e.value) ? void 0 : e.value, u = Array.isArray(c) ? c.filter(Boolean) : c, [d, p] = useState(u), m = (B = a["x-component-props"]) == null ? void 0 : B.addMode, { t: h } = useTranslation(), { multiple: g } = e, f = useForm(), b = useAPIClient().resource(l.target), S = useCollectionRecordData(), y = useContext(SchemaComponentContext), { getCollection: v } = useCollectionManager_deprecated(), I = v(l.target), { filterTargetKey: F } = I;
+    const D = e, { objectValue: t = !0, addMode: n } = D, o = W(D, ["objectValue", "addMode"]), r = useField(), a = useFieldSchema(), i = useServiceOptions$1((a == null ? void 0 : a["x-component-props"]) || e), { options: l } = useAssociationFieldContext(), c = isVariable$1(e.value) ? void 0 : e.value, u = Array.isArray(c) ? c.filter(Boolean) : c, [d, p] = useState(u), m = (B = a["x-component-props"]) == null ? void 0 : B.addMode, { t: h } = useTranslation(), { multiple: g } = e, f = useForm(), b = useAPIClient().resource(l.target), S = useCollectionRecordData(), y = useContext(SchemaComponentContext), { getCollection: v } = useCollectionManager_deprecated(), I = v(l.target), { filterTargetKey: F } = I;
     useEffect(() => {
       const N = isVariable$1(r.value) ? void 0 : r.value, M = Array.isArray(N) ? N.filter(Boolean) : N, j = removeIfKeyEmpty(M, F);
       p(j), isEqual(r.value, j) || (r.value = j);
@@ -44349,7 +44393,7 @@ function IframePreviewer({ index: e, list: t, onSwitchIndex: n }) {
   );
 }
 function InternalUpload(e) {
-  const r = e, { onChange: t } = r, n = Y(r, ["onChange"]), o = useCallback(
+  const r = e, { onChange: t } = r, n = W(r, ["onChange"]), o = useCallback(
     (a) => {
       t == null || t(toFileList(a.fileList));
     },
@@ -44358,7 +44402,7 @@ function InternalUpload(e) {
   return /* @__PURE__ */ jsx(Upload$1, P(x({}, useUploadProps(n)), { onChange: o }));
 }
 function ReadPretty$9(i) {
-  var l = i, { value: e, onChange: t, disabled: n, multiple: o, size: r } = l, a = Y(l, ["value", "onChange", "disabled", "multiple", "size"]);
+  var l = i, { value: e, onChange: t, disabled: n, multiple: o, size: r } = l, a = W(l, ["value", "onChange", "disabled", "multiple", "size"]);
   const { wrapSSR: c, hashId: u, componentCls: d } = useStyles$6();
   (useUploadStyle.default ? useUploadStyle.default : useUploadStyle)(d);
   const { isInTableCell: m } = useFlag(), h = useMemo(() => m ? { display: "inline-block" } : {}, [m]);
@@ -44497,7 +44541,7 @@ function AttachmentList(e) {
   ] });
 }
 function Uploader(n) {
-  var o = n, { rules: e } = o, t = Y(o, ["rules"]);
+  var o = n, { rules: e } = o, t = W(o, ["rules"]);
   const { disabled: r, multiple: a, value: i, onChange: l, toValueItem: c = toValueItem } = t, [u, d] = useState([]), [p, m] = useState([]), { t: h } = useTranslation(), { componentCls: g } = useStyles$6(), f = useField(), C = useUploadProps(t), b = useBeforeUpload(e);
   useEffect(() => {
     if (p.length) {
@@ -44590,7 +44634,7 @@ Upload.Attachment = withDynamicSchemaProps(connect(Attachment, mapReadPretty(Att
 });
 Upload.Dragger = connect(
   (e) => {
-    const c = e, { tipContent: t, onChange: n } = c, o = Y(c, ["tipContent", "onChange"]), { wrapSSR: r, hashId: a, componentCls: i } = useStyles$6(), l = useCallback(
+    const c = e, { tipContent: t, onChange: n } = c, o = W(c, ["tipContent", "onChange"]), { wrapSSR: r, hashId: a, componentCls: i } = useStyles$6(), l = useCallback(
       (u) => {
         n == null || n(toFileList(u.fileList));
       },
@@ -44610,8 +44654,8 @@ Upload.Dragger = connect(
 Upload.DraggerV2 = withDynamicSchemaProps(
   connect(
     (n) => {
-      var o = n, { rules: e } = o, t = Y(o, ["rules"]);
-      const { t: r } = useTranslation(), a = r("Click or drag file to this area to upload"), S = useProps(t), { title: i = a } = S, l = Y(S, ["title"]), [c, u] = useState(!1), { wrapSSR: d, hashId: p, componentCls: m } = useStyles$6(), h = useBeforeUpload(e), { size: g, mimetype: f } = e != null ? e : {}, C = useSizeHint(g), b = useCallback(
+      var o = n, { rules: e } = o, t = W(o, ["rules"]);
+      const { t: r } = useTranslation(), a = r("Click or drag file to this area to upload"), S = useProps(t), { title: i = a } = S, l = W(S, ["title"]), [c, u] = useState(!1), { wrapSSR: d, hashId: p, componentCls: m } = useStyles$6(), h = useBeforeUpload(e), { size: g, mimetype: f } = e != null ? e : {}, C = useSizeHint(g), b = useCallback(
         ({ fileList: y }) => {
           const { onChange: v } = l;
           v == null || v(y), y.some((I) => I.status === "uploading") ? u(!0) : u(!1);
@@ -44780,7 +44824,7 @@ const schema$1 = {
     setSelectedRows: o,
     selectedRows: r = [],
     onChange: a
-  } = useContext(RecordPickerContext), d = useTableSelectorProps$4(), { onRowSelectionChange: i, rowKey: l = "id" } = d, c = Y(d, ["onRowSelectionChange", "rowKey"]), { setVisible: u } = useActionContext();
+  } = useContext(RecordPickerContext), d = useTableSelectorProps$4(), { onRowSelectionChange: i, rowKey: l = "id" } = d, c = W(d, ["onRowSelectionChange", "rowKey"]), { setVisible: u } = useActionContext();
   return P(x({}, c), {
     rowKey: l,
     rowSelection: {
@@ -44797,7 +44841,7 @@ const schema$1 = {
   });
 };
 function FileSelector(e) {
-  const y = e, { disabled: t, multiple: n, value: o, onChange: r, action: a, onSelect: i, quickUpload: l, selectFile: c } = y, u = Y(y, ["disabled", "multiple", "value", "onChange", "action", "onSelect", "quickUpload", "selectFile"]), { wrapSSR: d, hashId: p, componentCls: m } = useStyles$6(), { useFileCollectionStorageRules: h, useAttachmentFieldProps: g } = useExpressionScope(), { t: f } = useTranslation(), C = h(), b = g(), S = c === void 0 && l === void 0;
+  const y = e, { disabled: t, multiple: n, value: o, onChange: r, action: a, onSelect: i, quickUpload: l, selectFile: c } = y, u = W(y, ["disabled", "multiple", "value", "onChange", "action", "onSelect", "quickUpload", "selectFile"]), { wrapSSR: d, hashId: p, componentCls: m } = useStyles$6(), { useFileCollectionStorageRules: h, useAttachmentFieldProps: g } = useExpressionScope(), { t: f } = useTranslation(), C = h(), b = g(), S = c === void 0 && l === void 0;
   return d(
     /* @__PURE__ */ jsx("div", { className: cls(`${m}-wrapper`, `${m}-picture-card-wrapper`, "nb-upload", p), children: /* @__PURE__ */ jsxs("div", { className: cls(`${m}-list`, `${m}-list-picture-card`), children: [
       /* @__PURE__ */ jsx(AttachmentList, x({ disabled: t, multiple: n, value: o, onChange: r }, u)),
@@ -44853,7 +44897,7 @@ function FileSelector(e) {
 }
 const InternalFileManager = (e) => {
   var D, B;
-  const T = e, { value: t, multiple: n, onChange: o } = T, r = Y(T, ["value", "multiple", "onChange"]), a = useFieldSchema(), [i, l] = useState(!1), [c, u] = useState([]), d = useInsertSchema$1("Selector"), p = useFieldNames$1(e), { designable: m } = useDesignable(), h = useField(), [g, f] = useState([]), { getField: C } = useCollection_deprecated(), b = C(h.props.name), S = useLabelUiSchema$1(b == null ? void 0 : b.target, (p == null ? void 0 : p.label) || "label"), y = useCompile(), { modalProps: v } = useActionContext(), I = (N) => {
+  const T = e, { value: t, multiple: n, onChange: o } = T, r = W(T, ["value", "multiple", "onChange"]), a = useFieldSchema(), [i, l] = useState(!1), [c, u] = useState([]), d = useInsertSchema$1("Selector"), p = useFieldNames$1(e), { designable: m } = useDesignable(), h = useField(), [g, f] = useState([]), { getField: C } = useCollection_deprecated(), b = C(h.props.name), S = useLabelUiSchema$1(b == null ? void 0 : b.target, (p == null ? void 0 : p.label) || "label"), y = useCompile(), { modalProps: v } = useActionContext(), I = (N) => {
     N.stopPropagation(), N.preventDefault(), m ? d(schema$1.Selector) : a.reduceProperties((j, R) => R["x-component"] === "AssociationField.Selector" ? R : j, null) || a.addProperty("selector", schema$1.Selector), l(!0), u([]);
   };
   useEffect(() => {
@@ -45180,7 +45224,7 @@ function transformNestedData(e) {
       const { parent: l } = o;
       n(l);
     }
-    const i = o, { parent: r } = i, a = Y(i, ["parent"]);
+    const i = o, { parent: r } = i, a = W(i, ["parent"]);
     t.push(a);
   }
   return e && n(e), t;
@@ -45327,7 +45371,7 @@ const useTableSelectorProps$2 = () => {
     setSelectedRows: o,
     selectedRows: r = [],
     onChange: a
-  } = useContext(RecordPickerContext), d = useTableSelectorProps$4(), { onRowSelectionChange: i, rowKey: l = "id" } = d, c = Y(d, ["onRowSelectionChange", "rowKey"]), { setVisible: u } = useActionContext();
+  } = useContext(RecordPickerContext), d = useTableSelectorProps$4(), { onRowSelectionChange: i, rowKey: l = "id" } = d, c = W(d, ["onRowSelectionChange", "rowKey"]), { setVisible: u } = useActionContext();
   return P(x({}, c), {
     rowKey: l,
     rowSelection: {
@@ -45345,7 +45389,7 @@ const useTableSelectorProps$2 = () => {
 }, InternalPicker = observer$1(
   (e) => {
     var z;
-    const E = e, { value: t, multiple: n, openSize: o, onChange: r, quickUpload: a, selectFile: i, shouldMountElement: l } = E, c = Y(E, ["value", "multiple", "openSize", "onChange", "quickUpload", "selectFile", "shouldMountElement"]), u = useField(), d = useFieldNames$1(e), [p, m] = useState(!1), h = useFieldSchema(), g = useInsertSchema$1("Selector"), { options: f } = useAssociationFieldContext(), { collectionName: C } = useFormBlockContext(), b = useCompile(), S = useLabelUiSchema$1(f, (d == null ? void 0 : d.label) || "label"), y = h["x-add-new"], [v, I] = useState([]), F = useCollectionRecordData(), w = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((V) => {
+    const E = e, { value: t, multiple: n, openSize: o, onChange: r, quickUpload: a, selectFile: i, shouldMountElement: l } = E, c = W(E, ["value", "multiple", "openSize", "onChange", "quickUpload", "selectFile", "shouldMountElement"]), u = useField(), d = useFieldNames$1(e), [p, m] = useState(!1), h = useFieldSchema(), g = useInsertSchema$1("Selector"), { options: f } = useAssociationFieldContext(), { collectionName: C } = useFormBlockContext(), b = useCompile(), S = useLabelUiSchema$1(f, (d == null ? void 0 : d.label) || "label"), y = h["x-add-new"], [v, I] = useState([]), F = useCollectionRecordData(), w = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((V) => {
       const G = V == null ? void 0 : V[d.label];
       return P(x({}, V), {
         [d.label]: getLabelFormatValue$1(b(S), b(G))
@@ -46111,7 +46155,7 @@ function FinallyButton(h) {
     linkageFromForm: t,
     allowAddToCurrent: n,
     props: f
-  } = g, C = f, { onlyIcon: o } = C, r = Y(C, ["onlyIcon"]), {
+  } = g, C = f, { onlyIcon: o } = C, r = W(C, ["onlyIcon"]), {
     componentType: a,
     menu: i,
     onClick: l,
@@ -46587,7 +46631,7 @@ const useColumnsDeepMemoized = (e) => {
   var g, C, b, S, y, v;
   const { isInSubTable: t } = useFlag(), { token: n } = useToken$1(), o = (g = e["data-row-key"]) == null ? void 0 : g.toString(), { setNodeRef: r, isOver: a, active: i, over: l } = useSortable({
     id: o
-  }), f = e, { rowIndex: c } = f, u = Y(f, ["rowIndex"]), { ref: d, inView: p } = useInView({
+  }), f = e, { rowIndex: c } = f, u = W(f, ["rowIndex"]), { ref: d, inView: p } = useInView({
     threshold: 0,
     triggerOnce: !0,
     initialInView: t || (c || 0) < INITIAL_ROWS_NUMBER,
@@ -46618,12 +46662,12 @@ const useColumnsDeepMemoized = (e) => {
     })
   ) });
 }, SortHandle$1 = (e) => {
-  const a = e, { id: t } = a, n = Y(a, ["id"]), { listeners: o, setNodeRef: r } = useSortable({
+  const a = e, { id: t } = a, n = W(a, ["id"]), { listeners: o, setNodeRef: r } = useSortable({
     id: t
   });
   return /* @__PURE__ */ jsx(MenuOutlined, P(x(x({ ref: r }, n), o), { style: { cursor: "grab" } }));
 }, TableIndex$2 = (e) => {
-  const o = e, { index: t } = o, n = Y(o, ["index"]);
+  const o = e, { index: t } = o, n = W(o, ["index"]);
   return /* @__PURE__ */ jsx("div", P(x({ className: cls("nb-table-index"), style: { padding: "0 8px 0 16px" } }, n), { children: t }));
 }, pageSizeOptions$1 = [5, 10, 20, 50, 100, 200], usePaginationProps$2 = (e, t) => {
   var S, y, v, I, F, w;
@@ -46728,19 +46772,19 @@ const useColumnsDeepMemoized = (e) => {
 }, columnOpacityStyle = {
   opacity: 0.3
 }, HeaderCellComponent = (n) => {
-  var o = n, { columnHidden: e } = o, t = Y(o, ["columnHidden"]);
+  var o = n, { columnHidden: e } = o, t = W(o, ["columnHidden"]);
   const { designable: r } = useDesignable();
   return e ? /* @__PURE__ */ jsx("th", { style: r ? columnOpacityStyle : columnHiddenStyle, children: r ? t.children : null }) : /* @__PURE__ */ jsx("th", P(x({}, t), { className: cls(t.className, headerClass) }));
 }, BodyRowComponent = (e) => /* @__PURE__ */ jsx(SortableRow, x({}, e)), InternalBodyCellComponent = (e) => {
   var m;
-  const { token: t } = useToken$1(), n = useContext(InViewContext), o = (m = e.className) == null ? void 0 : m.includes("selection-column"), h = e, { record: r, schema: a, rowIndex: i, isSubTable: l } = h, c = Y(h, ["record", "schema", "rowIndex", "isSubTable"]), { valueMap: u } = useSatisfiedActionValues({ formValues: r, category: "style", schema: a }), d = useMemo(() => Object.assign(x({}, e.style), u), [e.style, u]), p = {
+  const { token: t } = useToken$1(), n = useContext(InViewContext), o = (m = e.className) == null ? void 0 : m.includes("selection-column"), h = e, { record: r, schema: a, rowIndex: i, isSubTable: l } = h, c = W(h, ["record", "schema", "rowIndex", "isSubTable"]), { valueMap: u } = useSatisfiedActionValues({ formValues: r, category: "style", schema: a }), d = useMemo(() => Object.assign(x({}, e.style), u), [e.style, u]), p = {
     height: "1em",
     backgroundColor: "rgba(0, 0, 0, 0.06)",
     borderRadius: `${t.borderRadiusSM}px`
   };
   return /* @__PURE__ */ jsx("td", P(x({}, c), { className: cls(e.className, cellClass), style: d, children: l || n || o ? e.children : /* @__PURE__ */ jsx("div", { style: p }) }));
 }, displayNone = { display: "none" }, BodyCellComponent = (n) => {
-  var o = n, { columnHidden: e } = o, t = Y(o, ["columnHidden"]);
+  var o = n, { columnHidden: e } = o, t = W(o, ["columnHidden"]);
   const { designable: r } = useDesignable(), a = useCollection();
   return e ? /* @__PURE__ */ jsx("td", { style: r ? columnOpacityStyle : columnHiddenStyle, children: r ? t.children : /* @__PURE__ */ jsx("span", { style: displayNone, children: t.children }) }) : /* @__PURE__ */ jsxs(SubFormProvider, { value: { value: t == null ? void 0 : t.record, collection: a, fieldSchema: t.schema }, children: [
     /* @__PURE__ */ jsx(InternalBodyCellComponent, x({}, t)),
@@ -46763,7 +46807,7 @@ const useColumnsDeepMemoized = (e) => {
       columns: m,
       expandable: h,
       field: g
-    } = b, f = Y(b, [
+    } = b, f = W(b, [
       "tableHeight",
       "SortableWrapper",
       "tableSizeRefCallback",
@@ -46841,8 +46885,8 @@ const useColumnsDeepMemoized = (e) => {
 InternalNocoBaseTable.displayName = "InternalNocoBaseTable";
 const Table$1 = withDynamicSchemaProps(
   observer$1((e) => {
-    var de, be, ye;
-    const { token: t } = useToken$1(), me = omit(e, ["onBlur", "onFocus", "value"]), { pagination: n, useProps: o } = me, r = Y(me, ["pagination", "useProps"]), xe = (o == null ? void 0 : o()) || {}, { pagination: a } = xe, i = Y(xe, ["pagination"]), he = x(x({}, r), i), {
+    var pe, be, ye;
+    const { token: t } = useToken$1(), he = omit(e, ["onBlur", "onFocus", "value"]), { pagination: n, useProps: o } = he, r = W(he, ["pagination", "useProps"]), fe = (o == null ? void 0 : o()) || {}, { pagination: a } = fe, i = W(fe, ["pagination"]), ge = x(x({}, r), i), {
       dragSort: l = !1,
       showIndex: c = !0,
       onRowSelectionChange: u,
@@ -46854,7 +46898,7 @@ const Table$1 = withDynamicSchemaProps(
       loading: f,
       onClickRow: C,
       enableIndexColumn: b
-    } = he, S = Y(he, [
+    } = ge, S = W(ge, [
       "dragSort",
       "showIndex",
       "onRowSelectionChange",
@@ -46866,7 +46910,7 @@ const Table$1 = withDynamicSchemaProps(
       "loading",
       "onClickRow",
       "enableIndexColumn"
-    ]), y = useArrayField(S), v = useFieldSchema(), { size: I = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, F = useCollection(), T = ((de = v == null ? void 0 : v.parent) == null ? void 0 : de["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: B } = T, N = useMemoizedFn(S.onRowDragEnd || (() => {
+    ]), y = useArrayField(S), v = useFieldSchema(), { size: I = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, F = useCollection(), T = ((pe = v == null ? void 0 : v.parent) == null ? void 0 : pe["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: B } = T, N = useMemoizedFn(S.onRowDragEnd || (() => {
     })), M = usePaginationProps$2(n, a), j = useTableColumns$1(S, M), [R, O] = useState(() => D ? B : []), [$, A] = useState(((be = y == null ? void 0 : y.data) == null ? void 0 : be.selectedRowKeys) || []), [E, z] = useState([]), L = (p == null ? void 0 : p.type) !== "none", V = useRef(/* @__PURE__ */ new Map()), G = useMemo(() => css`
         & > td {
           background-color: ${t.controlItemBgActive} !important;
@@ -46874,85 +46918,85 @@ const Table$1 = withDynamicSchemaProps(
         &:hover > td {
           background-color: ${t.controlItemBgActiveHover} !important;
         }
-      `, [t.controlItemBgActive, t.controlItemBgActiveHover]), H = useMemo(() => C ? G : "", [G, C]), U = useMemo(() => C ? (se, te) => ({
+      `, [t.controlItemBgActive, t.controlItemBgActiveHover]), H = useMemo(() => C ? G : "", [G, C]), U = useMemo(() => C ? (ae, ne) => ({
       onClick: (oe) => {
-        isPortalInBody(oe.target) || C(se, z, E);
+        isPortalInBody(oe.target) || C(ae, z, E);
       },
-      rowIndex: te
+      rowIndex: ne
     }) : null, [C, E]);
     useDeepCompareEffect(() => {
-      const se = D ? B : [];
-      _.isEqual(se, R) || O(se);
+      const ae = D ? B : [];
+      _.isEqual(ae, R) || O(ae);
     }, [D, B]);
-    const K = useCallback((se) => {
+    const K = useCallback((ae) => {
       if (m)
-        return X(se);
-      if (se.key)
-        return se.key;
-      if (V.current.has(se))
-        return V.current.get(se);
-      const te = uid();
-      return V.current.set(se, te), te;
-    }, []), X = useCallback(
-      (se) => {
-        var te;
+        return Y(ae);
+      if (ae.key)
+        return ae.key;
+      if (V.current.has(ae))
+        return V.current.get(ae);
+      const ne = uid();
+      return V.current.set(ae, ne), ne;
+    }, []), Y = useCallback(
+      (ae) => {
+        var ne;
         return Array.isArray(m) ? m.map((oe) => {
-          var ae;
-          return ((ae = se[oe]) == null ? void 0 : ae.toString()) || "";
-        }).join("-") : typeof m == "string" ? se[m] : (te = (m != null ? m : K)(se)) == null ? void 0 : te.toString();
+          var ie;
+          return ((ie = ae[oe]) == null ? void 0 : ie.toString()) || "";
+        }).join("-") : typeof m == "string" ? ae[m] : (ne = (m != null ? m : K)(ae)) == null ? void 0 : ne.toString();
       },
       [JSON.stringify(m), K]
-    ), W = useMemo(() => (Array.isArray(y == null ? void 0 : y.value) ? y.value : []).filter(Boolean), [y == null ? void 0 : y.value, (ye = y == null ? void 0 : y.value) == null ? void 0 : ye.length]), J = useMemo(() => (se) => {
-      const te = useCallback((oe) => {
+    ), X = useMemo(() => (Array.isArray(y == null ? void 0 : y.value) ? y.value : []).filter(Boolean), [y == null ? void 0 : y.value, (ye = y == null ? void 0 : y.value) == null ? void 0 : ye.length]), Q = useMemo(() => (ae) => {
+      const ne = useCallback((oe) => {
         var Ae, ve, Pe, Fe, Ie, ke;
         if (!oe.active || !oe.over) {
           console.warn("move cancel");
           return;
         }
-        const ae = (Pe = (ve = (Ae = oe.active) == null ? void 0 : Ae.data.current) == null ? void 0 : ve.sortable) == null ? void 0 : Pe.index, le = (ke = (Ie = (Fe = oe.over) == null ? void 0 : Fe.data.current) == null ? void 0 : Ie.sortable) == null ? void 0 : ke.index, ue = y.value[ae] || oe.active, Se = y.value[le] || oe.over;
-        y.move(ae, le), N({ from: ue, to: Se });
+        const ie = (Pe = (ve = (Ae = oe.active) == null ? void 0 : Ae.data.current) == null ? void 0 : ve.sortable) == null ? void 0 : Pe.index, ce = (ke = (Ie = (Fe = oe.over) == null ? void 0 : Fe.data.current) == null ? void 0 : Ie.sortable) == null ? void 0 : ke.index, de = y.value[ie] || oe.active, Se = y.value[ce] || oe.over;
+        y.move(ie, ce), N({ from: de, to: Se });
       }, []);
-      return /* @__PURE__ */ jsx(DndContext, { onDragEnd: te, children: /* @__PURE__ */ jsx("tbody", x({}, se)) });
+      return /* @__PURE__ */ jsx(DndContext, { onDragEnd: ne, children: /* @__PURE__ */ jsx("tbody", x({}, ae)) });
     }, [y, N]);
-    J.displayName = "BodyWrapperComponent";
-    const Z = useMemo(() => ({
+    Q.displayName = "BodyWrapperComponent";
+    const ee = useMemo(() => ({
       header: {
         wrapper: HeaderWrapperComponent,
         cell: HeaderCellComponent
       },
       body: {
-        wrapper: J,
+        wrapper: Q,
         row: BodyRowComponent,
         cell: BodyCellComponent
       }
-    }), [J]), Q = useMemo(() => p, [JSON.stringify(p)]), ee = useMemo(
+    }), [Q]), J = useMemo(() => p, [JSON.stringify(p)]), Z = useMemo(
       () => ({
-        rowSelection: b && Q ? x({
+        rowSelection: b && J ? x({
           type: "checkbox",
           selectedRowKeys: $,
-          onChange(se, te) {
-            y.data = y.data || {}, y.data.selectedRowKeys = se, y.data.selectedRowData = te, A(se), u == null || u(se, te);
+          onChange(ae, ne) {
+            y.data = y.data || {}, y.data.selectedRowKeys = ae, y.data.selectedRowData = ne, A(ae), u == null || u(ae, ne);
           },
-          getCheckboxProps(se) {
+          getCheckboxProps(ae) {
             return {
               "aria-label": "checkbox"
             };
           },
-          renderCell: (se, te, oe, ae) => {
+          renderCell: (ae, ne, oe, ie) => {
             if (!l && !c)
-              return ae;
-            const le = M == null ? void 0 : M.current, ue = (M == null ? void 0 : M.pageSize) || 20;
-            return le ? oe = oe + (le - 1) * ue + 1 : oe = oe + 1, te.__index && (oe = extractIndex(te.__index)), /* @__PURE__ */ jsxs(
+              return ie;
+            const ce = M == null ? void 0 : M.current, de = (M == null ? void 0 : M.pageSize) || 20;
+            return ce ? oe = oe + (ce - 1) * de + 1 : oe = oe + 1, ne.__index && (oe = extractIndex(ne.__index)), /* @__PURE__ */ jsxs(
               "div",
               {
                 role: "button",
                 "aria-label": `table-index-${oe}`,
-                className: cls(se ? "checked" : null, rowSelectCheckboxWrapperClass, {
+                className: cls(ae ? "checked" : null, rowSelectCheckboxWrapperClass, {
                   [rowSelectCheckboxWrapperClassHover]: L
                 }),
                 children: [
-                  /* @__PURE__ */ jsxs("div", { className: cls(se ? "checked" : null, rowSelectCheckboxContentClass), children: [
-                    l && /* @__PURE__ */ jsx(SortHandle$1, { id: X(te) }),
+                  /* @__PURE__ */ jsxs("div", { className: cls(ae ? "checked" : null, rowSelectCheckboxContentClass), children: [
+                    l && /* @__PURE__ */ jsx(SortHandle$1, { id: Y(ne) }),
                     c && /* @__PURE__ */ jsx(TableIndex$2, { index: oe })
                   ] }),
                   L && /* @__PURE__ */ jsx(
@@ -46960,78 +47004,78 @@ const Table$1 = withDynamicSchemaProps(
                     {
                       className: cls(
                         "nb-origin-node",
-                        se ? "checked" : null,
+                        ae ? "checked" : null,
                         rowSelectCheckboxCheckedClassHover
                       ),
-                      children: ae
+                      children: ie
                     }
                   )
                 ]
               }
             );
           }
-        }, Q) : void 0
+        }, J) : void 0
       }),
       [
-        Q,
+        J,
         $,
         u,
         c,
         l,
         y,
-        X,
+        Y,
         L,
-        Q,
+        J,
         M,
         b
       ]
-    ), ne = useCallback(
-      ({ children: se }) => {
-        var te, oe;
+    ), te = useCallback(
+      ({ children: ae }) => {
+        var ne, oe;
         return l ? React.createElement(
           SortableContext$1,
           {
-            items: ((oe = (te = y.value) == null ? void 0 : te.map) == null ? void 0 : oe.call(te, X)) || []
+            items: ((oe = (ne = y.value) == null ? void 0 : ne.map) == null ? void 0 : oe.call(ne, Y)) || []
           },
-          se
-        ) : React.createElement(React.Fragment, {}, se);
+          ae
+        ) : React.createElement(React.Fragment, {}, ae);
       },
-      [y, l, X]
-    ), { height: re, tableSizeRefCallback: ie } = useTableSize(), pe = useMemo(() => ({
+      [y, l, Y]
+    ), { height: re, tableSizeRefCallback: se } = useTableSize(), ue = useMemo(() => ({
       x: "max-content"
-    }), []), ce = useMemo(() => ({
+    }), []), le = useMemo(() => ({
       x: "max-content",
-      y: W.length > 0 ? re : void 0
-    }), [re, pe, W]), fe = useCallback(
-      (se) => E.includes(se[m]) ? H : "",
+      y: X.length > 0 ? re : void 0
+    }), [re, ue, X]), me = useCallback(
+      (ae) => E.includes(ae[m]) ? H : "",
       [E, H, JSON.stringify(m)]
-    ), ge = useCallback(
-      (se, te) => {
-        const oe = se ? [...R, te[F.getPrimaryKey()]] : R.filter((ae) => te[F.getPrimaryKey()] !== ae);
-        O(oe), g == null || g(se, te);
+    ), xe = useCallback(
+      (ae, ne) => {
+        const oe = ae ? [...R, ne[F.getPrimaryKey()]] : R.filter((ie) => ne[F.getPrimaryKey()] !== ie);
+        O(oe), g == null || g(ae, ne);
       },
       [R, g, F]
     ), Ce = useMemo(() => ({
-      onExpand: ge,
+      onExpand: xe,
       expandedRowKeys: R
-    }), [R, ge]);
+    }), [R, xe]);
     return (
       // If spinning is set to undefined, it will cause the subtable to always display loading, so we need to convert it here
       /* @__PURE__ */ jsx(Spin, { spinning: !!f, children: /* @__PURE__ */ jsx(
         InternalNocoBaseTable,
         P(x(x({
           tableHeight: re,
-          SortableWrapper: ne,
-          tableSizeRefCallback: ie,
+          SortableWrapper: te,
+          tableSizeRefCallback: se,
           defaultRowKey: K,
-          dataSource: W
-        }, S), ee), {
+          dataSource: X
+        }, S), Z), {
           paginationProps: M,
-          components: Z,
+          components: ee,
           onTableChange: d,
           onRow: U,
-          rowClassName: fe,
-          scroll: ce,
+          rowClassName: me,
+          scroll: le,
           columns: j,
           expandable: Ce,
           field: y,
@@ -47354,19 +47398,19 @@ AssociationSelect.Designer = function e() {
   useEffect(() => {
     c.readPretty !== u["x-read-pretty"] && (c.readPretty = !!u["x-read-pretty"]);
   }, [u["x-read-pretty"]]);
-  const N = B == null ? void 0 : B.map((X) => X.startsWith("-") ? {
-    field: X.substring(1),
+  const N = B == null ? void 0 : B.map((Y) => Y.startsWith("-") ? {
+    field: Y.substring(1),
     direction: "desc"
   } : {
-    field: X,
+    field: Y,
     direction: "asc"
   });
   c.readPretty || c.required;
-  const M = T.filter((X) => a(X)).map((X) => {
-    var W;
+  const M = T.filter((Y) => a(Y)).map((Y) => {
+    var X;
     return {
-      value: X == null ? void 0 : X.name,
-      label: f((W = X == null ? void 0 : X.uiSchema) == null ? void 0 : W.title) || (X == null ? void 0 : X.name)
+      value: Y == null ? void 0 : Y.name,
+      label: f((X = Y == null ? void 0 : Y.uiSchema) == null ? void 0 : X.title) || (Y == null ? void 0 : Y.name)
     };
   });
   let j = "editable";
@@ -47460,20 +47504,20 @@ AssociationSelect.Designer = function e() {
             }
           }
         },
-        onSubmit: (X) => {
-          var ee;
-          const W = [], J = (ne) => ne != null && !Number.isNaN(ne);
-          for (const ne of X.rules)
-            W.push(_.pickBy(ne, J));
-          const Z = {
+        onSubmit: (Y) => {
+          var Z;
+          const X = [], Q = (te) => te != null && !Number.isNaN(te);
+          for (const te of Y.rules)
+            X.push(_.pickBy(te, Q));
+          const ee = {
             "x-uid": u["x-uid"]
           };
           if (["percent"].includes(S == null ? void 0 : S.interface))
-            for (const ne of W)
-              (ne.maxValue || ne.minValue) && (ne.percentMode = !0), ne.percentFormat && (ne.percentFormats = !0);
-          const Q = _.concat([], ((ee = S == null ? void 0 : S.uiSchema) == null ? void 0 : ee["x-validator"]) || [], W);
-          c.validator = Q, u["x-validator"] = W, Z["x-validator"] = W, m.emit("patch", {
-            schema: Z
+            for (const te of X)
+              (te.maxValue || te.minValue) && (te.percentMode = !0), te.percentFormat && (te.percentFormats = !0);
+          const J = _.concat([], ((Z = S == null ? void 0 : S.uiSchema) == null ? void 0 : Z["x-validator"]) || [], X);
+          c.validator = J, u["x-validator"] = X, ee["x-validator"] = X, m.emit("patch", {
+            schema: ee
           }), h();
         }
       }
@@ -47504,12 +47548,12 @@ AssociationSelect.Designer = function e() {
             })
           }
         },
-        onSubmit: (X) => {
-          const W = {
+        onSubmit: (Y) => {
+          const X = {
             "x-uid": u["x-uid"]
           };
-          c.value !== X.default && (c.value = X.default), u.default = X.default, W.default = X.default, m.emit("patch", {
-            schema: W
+          c.value !== Y.default && (c.value = Y.default), u.default = Y.default, X.default = Y.default, m.emit("patch", {
+            schema: X
           }), h();
         }
       }
@@ -47520,9 +47564,9 @@ AssociationSelect.Designer = function e() {
         title: d("Field component"),
         options: y,
         value: u["x-component"],
-        onChange: (X) => {
-          var J, Z;
-          const W = {
+        onChange: (Y) => {
+          var Q, ee;
+          const X = {
             name: S == null ? void 0 : S.name,
             type: "void",
             required: u.required,
@@ -47532,19 +47576,19 @@ AssociationSelect.Designer = function e() {
             // 'x-designer': 'FormItem.Designer',
             "x-toolbar": "FormItemSchemaToolbar",
             "x-settings": "fieldSettings:FormItem",
-            "x-component": X,
+            "x-component": Y,
             "x-validator": u["x-validator"],
             "x-collection-field": u["x-collection-field"],
             "x-decorator-props": u["x-decorator-props"],
-            "x-component-props": x(x({}, (J = S == null ? void 0 : S.uiSchema) == null ? void 0 : J["x-component-props"]), u["x-component-props"])
+            "x-component-props": x(x({}, (Q = S == null ? void 0 : S.uiSchema) == null ? void 0 : Q["x-component-props"]), u["x-component-props"])
           };
-          (Z = I == null ? void 0 : I.schemaInitialize) == null || Z.call(I, W, {
+          (ee = I == null ? void 0 : I.schemaInitialize) == null || ee.call(I, X, {
             field: S,
             block: "Form",
             readPretty: c.readPretty,
             action: p ? "get" : null,
             targetCollection: r(S == null ? void 0 : S.target)
-          }), X === "CollectionField" && (W.type = "string"), g("beforeBegin", divWrap(W), {
+          }), Y === "CollectionField" && (X.type = "string"), g("beforeBegin", divWrap(X), {
             onSuccess: () => {
               m.remove(null, {
                 removeParentsIfNoChildren: !0,
@@ -47562,12 +47606,12 @@ AssociationSelect.Designer = function e() {
       {
         title: d("Allow multiple"),
         checked: ((L = u["x-component-props"]) == null ? void 0 : L.multiple) === void 0 ? !0 : u["x-component-props"].multiple,
-        onChange: (X) => {
-          const W = {
+        onChange: (Y) => {
+          const X = {
             "x-uid": u["x-uid"]
           };
-          u["x-component-props"] = u["x-component-props"] || {}, c.componentProps = c.componentProps || {}, u["x-component-props"].multiple = X, c.componentProps.multiple = X, W["x-component-props"] = u["x-component-props"], m.emit("patch", {
-            schema: W
+          u["x-component-props"] = u["x-component-props"] || {}, c.componentProps = c.componentProps || {}, u["x-component-props"].multiple = Y, c.componentProps.multiple = Y, X["x-component-props"] = u["x-component-props"], m.emit("patch", {
+            schema: X
           }), h();
         }
       },
@@ -47579,8 +47623,8 @@ AssociationSelect.Designer = function e() {
         collectionName: S == null ? void 0 : S.target,
         defaultFilter: ((H = (G = (V = c.componentProps) == null ? void 0 : V.service) == null ? void 0 : G.params) == null ? void 0 : H.filter) || {},
         form: l,
-        onSubmit: ({ filter: X }) => {
-          X = removeNullCondition(X), _.set(c.componentProps, "service.params.filter", X), u["x-component-props"] = c.componentProps, m.emit("patch", {
+        onSubmit: ({ filter: Y }) => {
+          Y = removeNullCondition(Y), _.set(c.componentProps, "service.params.filter", Y), u["x-component-props"] = c.componentProps, m.emit("patch", {
             schema: {
               "x-uid": u["x-uid"],
               "x-component-props": c.componentProps
@@ -47663,9 +47707,9 @@ AssociationSelect.Designer = function e() {
             }
           }
         },
-        onSubmit: ({ sort: X }) => {
-          const W = X.map((J) => J.direction === "desc" ? `-${J.field}` : J.field);
-          _.set(c.componentProps, "service.params.sort", W), u["x-component-props"] = c.componentProps, m.emit("patch", {
+        onSubmit: ({ sort: Y }) => {
+          const X = Y.map((Q) => Q.direction === "desc" ? `-${Q.field}` : Q.field);
+          _.set(c.componentProps, "service.params.sort", X), u["x-component-props"] = c.componentProps, m.emit("patch", {
             schema: {
               "x-uid": u["x-uid"],
               "x-component-props": c.componentProps
@@ -47684,26 +47728,26 @@ AssociationSelect.Designer = function e() {
           { label: d("Easy-reading"), value: "read-pretty" }
         ],
         value: j,
-        onChange: (X) => {
-          const W = {
+        onChange: (Y) => {
+          const X = {
             "x-uid": u["x-uid"]
           };
-          switch (X) {
+          switch (Y) {
             case "readonly": {
-              u["x-read-pretty"] = !1, u["x-disabled"] = !0, W["x-read-pretty"] = !1, W["x-disabled"] = !0, c.readPretty = !1, c.disabled = !0;
+              u["x-read-pretty"] = !1, u["x-disabled"] = !0, X["x-read-pretty"] = !1, X["x-disabled"] = !0, c.readPretty = !1, c.disabled = !0;
               break;
             }
             case "read-pretty": {
-              u["x-read-pretty"] = !0, u["x-disabled"] = !1, W["x-read-pretty"] = !0, W["x-disabled"] = !1, c.readPretty = !0;
+              u["x-read-pretty"] = !0, u["x-disabled"] = !1, X["x-read-pretty"] = !0, X["x-disabled"] = !1, c.readPretty = !0;
               break;
             }
             default: {
-              u["x-read-pretty"] = !1, u["x-disabled"] = !1, W["x-read-pretty"] = !1, W["x-disabled"] = !1, c.readPretty = !1, c.disabled = !1;
+              u["x-read-pretty"] = !1, u["x-disabled"] = !1, X["x-read-pretty"] = !1, X["x-disabled"] = !1, c.readPretty = !1, c.disabled = !1;
               break;
             }
           }
           m.emit("patch", {
-            schema: W
+            schema: X
           }), m.refresh();
         }
       },
@@ -47715,15 +47759,15 @@ AssociationSelect.Designer = function e() {
         title: d("Title field"),
         options: M,
         value: (K = (U = c == null ? void 0 : c.componentProps) == null ? void 0 : U.fieldNames) == null ? void 0 : K.label,
-        onChange: (X) => {
-          var Z, Q;
-          const W = {
+        onChange: (Y) => {
+          var ee, J;
+          const X = {
             "x-uid": u["x-uid"]
-          }, J = P(x(x({}, (Q = (Z = S == null ? void 0 : S.uiSchema) == null ? void 0 : Z["x-component-props"]) == null ? void 0 : Q.fieldNames), c.componentProps.fieldNames), {
-            label: X
+          }, Q = P(x(x({}, (J = (ee = S == null ? void 0 : S.uiSchema) == null ? void 0 : ee["x-component-props"]) == null ? void 0 : J.fieldNames), c.componentProps.fieldNames), {
+            label: Y
           });
-          c.componentProps.fieldNames = J, u["x-component-props"] = u["x-component-props"] || {}, u["x-component-props"].fieldNames = J, W["x-component-props"] = u["x-component-props"], m.emit("patch", {
-            schema: W
+          c.componentProps.fieldNames = Q, u["x-component-props"] = u["x-component-props"] || {}, u["x-component-props"].fieldNames = Q, X["x-component-props"] = u["x-component-props"], m.emit("patch", {
+            schema: X
           }), m.refresh();
         }
       },
@@ -48067,7 +48111,7 @@ const AutoComplete = withDynamicSchemaProps(
     }
   };
 }), CardItem = (e) => {
-  const p = e, { children: t, name: n, heightMode: o } = p, r = Y(p, ["children", "name", "heightMode"]), a = useSchemaTemplate(), i = useFieldSchema(), l = i == null ? void 0 : i["x-template-key"], { wrapSSR: c, componentCls: u, hashId: d } = useStyles$5();
+  const p = e, { children: t, name: n, heightMode: o } = p, r = W(p, ["children", "name", "heightMode"]), a = useSchemaTemplate(), i = useFieldSchema(), l = i == null ? void 0 : i["x-template-key"], { wrapSSR: c, componentCls: u, hashId: d } = useStyles$5();
   return l && !a ? null : c(
     /* @__PURE__ */ jsx(BlockItemError, { children: /* @__PURE__ */ jsx(BlockItem, { name: n, className: `${u} ${d} noco-card-item`, children: /* @__PURE__ */ jsx(BlockItemCard, P(x({}, r), { children: e.children })) }) })
   );
@@ -48108,7 +48152,7 @@ const AutoComplete = withDynamicSchemaProps(
         changeOnSelectLast: c,
         changeOnSelect: u,
         maxLevel: d
-      } = y, p = Y(y, [
+      } = y, p = W(y, [
         "value",
         "onChange",
         "labelInValue",
@@ -48204,7 +48248,7 @@ function useCollectionOptions({ filter: e, isTableOid: t }) {
 }
 const CollectionSelect = connect(
   (e) => {
-    const i = e, { filter: t } = i, n = Y(i, ["filter"]), o = useCollectionOptions(e), { t: r } = useTranslation(), a = useCallback(
+    const i = e, { filter: t } = i, n = W(i, ["filter"]), o = useCollectionOptions(e), { t: r } = useTranslation(), a = useCallback(
       (l, c) => {
         var u, d;
         return ((u = c == null ? void 0 : c.label.toLowerCase()) != null ? u : "").includes(l.toLocaleLowerCase()) || ((d = c == null ? void 0 : c.value.toString().toLowerCase()) != null ? d : "").includes(l.toLocaleLowerCase());
@@ -48249,7 +48293,7 @@ function useDataSourceOptions({ filter: e }) {
   );
 }
 const DataSourceSelect = connect((e) => {
-  const i = e, { filter: t } = i, n = Y(i, ["filter"]), o = useDataSourceOptions(e), { t: r } = useTranslation(), a = useCallback(
+  const i = e, { filter: t } = i, n = W(i, ["filter"]), o = useDataSourceOptions(e), { t: r } = useTranslation(), a = useCallback(
     (l, c) => {
       var u, d;
       return ((u = c == null ? void 0 : c.label.toLowerCase()) != null ? u : "").includes(l.toLocaleLowerCase()) || ((d = c == null ? void 0 : c.value.toString().toLowerCase()) != null ? d : "").includes(l.toLocaleLowerCase());
@@ -48270,7 +48314,7 @@ const DataSourceSelect = connect((e) => {
     })
   );
 }), DataSourceCollectionCascaderReadPretty = observer$1((e) => {
-  const t = useDataSourceManager(), n = useCompile(), f = e, { value: o, onChange: r, dataSourceFilter: a, collectionFilter: i } = f, l = Y(f, ["value", "onChange", "dataSourceFilter", "collectionFilter"]), [c, u] = parseCollectionName(o), d = [c, u].filter(Boolean), p = t.getDataSources(), m = useMemo(() => (a ? p.filter(a) : p).map((C) => ({
+  const t = useDataSourceManager(), n = useCompile(), f = e, { value: o, onChange: r, dataSourceFilter: a, collectionFilter: i } = f, l = W(f, ["value", "onChange", "dataSourceFilter", "collectionFilter"]), [c, u] = parseCollectionName(o), d = [c, u].filter(Boolean), p = t.getDataSources(), m = useMemo(() => (a ? p.filter(a) : p).map((C) => ({
     label: n(C.displayName),
     value: C.key,
     children: C.collectionManager.collectionInstancesArr.filter(i != null ? i : (b) => !b.hidden).map((b) => ({
@@ -48287,7 +48331,7 @@ const DataSourceSelect = connect((e) => {
   })(d, m);
   return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(Tag, { children: g.join(" / ") }) });
 }), DataSourceCollectionCascader = connect((e) => {
-  const t = useDataSourceManager(), n = useCompile(), g = e, { value: o, onChange: r, dataSourceFilter: a, collectionFilter: i } = g, l = Y(g, ["value", "onChange", "dataSourceFilter", "collectionFilter"]), [c, u] = parseCollectionName(o), d = [c, u].filter(Boolean), p = t.getDataSources(), m = useMemo(() => (a ? p.filter(a) : p).map((f) => ({
+  const t = useDataSourceManager(), n = useCompile(), g = e, { value: o, onChange: r, dataSourceFilter: a, collectionFilter: i } = g, l = W(g, ["value", "onChange", "dataSourceFilter", "collectionFilter"]), [c, u] = parseCollectionName(o), d = [c, u].filter(Boolean), p = t.getDataSources(), m = useMemo(() => (a ? p.filter(a) : p).map((f) => ({
     label: n(f.displayName),
     value: f.key,
     children: f.collectionManager.collectionInstancesArr.filter(i != null ? i : (C) => !C.hidden).map((C) => ({
@@ -48305,7 +48349,7 @@ const DataSourceSelect = connect((e) => {
   return /* @__PURE__ */ jsx(Cascader$1, P(x({ showSearch: !0 }, l), { options: m, value: d, onChange: h }));
 }, mapReadPretty(DataSourceCollectionCascaderReadPretty)), ColorPicker = connect(
   (e) => {
-    const r = e, { value: t, onChange: n } = r, o = Y(r, ["value", "onChange"]);
+    const r = e, { value: t, onChange: n } = r, o = W(r, ["value", "onChange"]);
     return /* @__PURE__ */ jsx("div", { role: "button", "aria-label": "color-picker-normal", style: { display: "inline-block" }, children: /* @__PURE__ */ jsx(
       ColorPicker$1,
       P(x({
@@ -48377,7 +48421,7 @@ const DataSourceSelect = connect((e) => {
   default: '{{t("Default")}}'
 }, ColorSelect = connect(
   (e) => {
-    const t = useCompile(), r = e, { colors: n = defaultColors } = r, o = Y(r, ["colors"]);
+    const t = useCompile(), r = e, { colors: n = defaultColors } = r, o = W(r, ["colors"]);
     return /* @__PURE__ */ jsx(Select$1, P(x({}, o), { children: Object.keys(n).map((a) => /* @__PURE__ */ jsx(Select$1.Option, { value: a, children: /* @__PURE__ */ jsx(Tag, { color: a, children: t(n[a] || n.default) }) }, a)) }));
   },
   mapProps((e, t) => P(x({}, e), {
@@ -48388,7 +48432,7 @@ const DataSourceSelect = connect((e) => {
     return o[n] ? /* @__PURE__ */ jsx(Tag, { color: n, children: t(o[n] || o.default) }) : null;
   })
 ), Input = (e) => {
-  const o = e, { onChange: t } = o, n = Y(o, ["onChange"]);
+  const o = e, { onChange: t } = o, n = W(o, ["onChange"]);
   return /* @__PURE__ */ jsx(
     "fieldset",
     {
@@ -49783,7 +49827,7 @@ function toSafeNumber(e) {
   return e && (e > Number.MAX_SAFE_INTEGER || e < Number.MIN_SAFE_INTEGER ? new BigNumber(e).toString() : Number(e));
 }
 const InputNumber = connect((e) => {
-  const a = e, { onChange: t } = a, n = Y(a, ["onChange"]);
+  const a = e, { onChange: t } = a, n = W(a, ["onChange"]);
   let r = x({
     onChange: (i) => {
       Number.isNaN(i) ? t(null) : t(toSafeNumber(i));
@@ -50228,7 +50272,7 @@ const NanoIDInput = Object.assign(
 ), Pagination = withDynamicSchemaProps(
   observer$1(
     (e) => {
-      const r = useProps(e), { hidden: t } = r, n = Y(r, ["hidden"]);
+      const r = useProps(e), { hidden: t } = r, n = W(r, ["hidden"]);
       return t ? null : /* @__PURE__ */ jsx("div", { onKeyPress: (a) => {
         a.key === "Enter" && a.preventDefault();
       }, children: /* @__PURE__ */ jsx(Pagination$1, x({}, n)) });
@@ -50280,7 +50324,7 @@ const NanoIDInput = Object.assign(
   return m += 4 * h, n > 0 && (m += 2 * (h - n)), o > 0 && (m += 2 * (h - o)), t !== h && (m += 4 * t), m += 6 * r, m += 2 * a, m += 2 * p(), h === n + o && (m -= h), h === t && (m -= t), m -= l, m -= 2 * c, m -= 3 * u, m = m < 0 ? 0 : m, m = m > 100 ? 100 : m, m >= 80 ? 100 : m >= 60 ? 80 : m >= 40 ? 60 : m >= 20 ? 40 : 20;
 }, PasswordStrength = (e) => isFn(e.children) ? e.children(getStrength(String(e.value || ""))) : /* @__PURE__ */ jsx(Fragment, { children: e.children }), Password = connect(
   (e) => {
-    const l = e, { value: t, className: n, checkStrength: o, showForgotPassword: r } = l, a = Y(l, ["value", "className", "checkStrength", "showForgotPassword"]), i = {
+    const l = e, { value: t, className: n, checkStrength: o, showForgotPassword: r } = l, a = W(l, ["value", "className", "checkStrength", "showForgotPassword"]), i = {
       position: "absolute",
       zIndex: 1,
       height: 8,
@@ -50445,7 +50489,7 @@ const useTableSelectorProps$1 = () => {
     setSelectedRows: o,
     selectedRows: r = [],
     onChange: a
-  } = useContext(RecordPickerContext), d = useTableSelectorProps$4(), { onRowSelectionChange: i, rowKey: l = "id" } = d, c = Y(d, ["onRowSelectionChange", "rowKey"]), { setVisible: u } = useActionContext();
+  } = useContext(RecordPickerContext), d = useTableSelectorProps$4(), { onRowSelectionChange: i, rowKey: l = "id" } = d, c = W(d, ["onRowSelectionChange", "rowKey"]), { setVisible: u } = useActionContext();
   return P(x({}, c), {
     rowKey: l,
     rowSelection: {
@@ -50471,7 +50515,7 @@ const useTableSelectorProps$1 = () => {
   const t = useFieldSchema(), { association: n } = e, { getField: o } = useCollection_deprecated();
   return n || o(t.name);
 }, InputRecordPicker = (e) => {
-  const v = e, { value: t, multiple: n, onChange: o, quickUpload: r, selectFile: a } = v, i = Y(v, ["value", "multiple", "onChange", "quickUpload", "selectFile"]), l = useFieldNames(e), [c, u] = useState(!1), d = useFieldSchema(), p = useAssociation(e), m = useCompile(), h = useLabelUiSchema(p, (l == null ? void 0 : l.label) || "label"), g = isShowFilePicker(h), [f, C] = useState([]), [b, S] = useState([]);
+  const v = e, { value: t, multiple: n, onChange: o, quickUpload: r, selectFile: a } = v, i = W(v, ["value", "multiple", "onChange", "quickUpload", "selectFile"]), l = useFieldNames(e), [c, u] = useState(!1), d = useFieldSchema(), p = useAssociation(e), m = useCompile(), h = useLabelUiSchema(p, (l == null ? void 0 : l.label) || "label"), g = isShowFilePicker(h), [f, C] = useState([]), [b, S] = useState([]);
   useEffect(() => {
     if (t) {
       const I = (Array.isArray(t) ? t : t ? [t] : []).map((F) => {
@@ -50540,7 +50584,7 @@ const useTableSelectorProps$1 = () => {
     })
   ] });
 }, RecordPickerProvider = (e) => {
-  const c = e, { multiple: t, onChange: n, selectedRows: o, setSelectedRows: r, options: a, collectionField: i } = c, l = Y(c, ["multiple", "onChange", "selectedRows", "setSelectedRows", "options", "collectionField"]);
+  const c = e, { multiple: t, onChange: n, selectedRows: o, setSelectedRows: r, options: a, collectionField: i } = c, l = W(c, ["multiple", "onChange", "selectedRows", "setSelectedRows", "options", "collectionField"]);
   return /* @__PURE__ */ jsx(
     RecordPickerContext.Provider,
     {
@@ -51399,7 +51443,7 @@ const useStyles$2 = genStyleHook("nb-rich-text", (e) => {
     data: n.value
   }), e);
 }, SortHandle = (e) => /* @__PURE__ */ jsx(MenuOutlined, x({ className: "drag-handle", style: { cursor: "grab" } }, e)), TableIndex$1 = (e) => {
-  const o = e, { index: t } = o, n = Y(o, ["index"]);
+  const o = e, { index: t } = o, n = W(o, ["index"]);
   return /* @__PURE__ */ jsx("div", P(x({ className: cls("nb-table-index"), style: { padding: "0 8px 0 16px" } }, n), { children: t + 1 }));
 }, useDefAction = () => ({
   move() {
@@ -51416,7 +51460,7 @@ const useStyles$2 = genStyleHook("nb-rich-text", (e) => {
       useDataSource: l = useDefDataSource,
       useAction: c = useDefAction,
       onChange: u
-    } = C, d = Y(C, [
+    } = C, d = W(C, [
       "dragSort",
       "showIndex",
       "useSelectedRowKeys",
@@ -52710,7 +52754,7 @@ const UnixTimestamp = connect(
   const t = useGlobalVariable("$env");
   return useMemo(() => t ? [t].filter(Boolean) : e, [t, e]);
 }, isVariable = (e) => /{{.*?}}/.test(e), TextAreaWithGlobalScope = connect((e) => {
-  const d = e, { supportsLineBreak: t, password: n, number: o, boolean: r, input: a, expression: i = !0 } = d, l = Y(d, ["supportsLineBreak", "password", "number", "boolean", "input", "expression"]), c = useEnvironmentVariableOptions(e.scope), u = { value: "name", label: "title" };
+  const d = e, { supportsLineBreak: t, password: n, number: o, boolean: r, input: a, expression: i = !0 } = d, l = W(d, ["supportsLineBreak", "password", "number", "boolean", "input", "expression"]), c = useEnvironmentVariableOptions(e.scope), u = { value: "name", label: "title" };
   return t ? /* @__PURE__ */ jsx(RawTextArea, P(x({}, l), { scope: c, fieldNames: u, rows: 3 })) : o ? /* @__PURE__ */ jsx(Variable.Input, P(x({}, e), { scope: c, fieldNames: u })) : n && e.value && !isVariable(e.value) ? /* @__PURE__ */ jsx(Password, P(x({}, l), { autoFocus: !0 })) : r ? /* @__PURE__ */ jsx(Variable.Input, P(x({}, e), { scope: c, fieldNames: u })) : a ? /* @__PURE__ */ jsx(Variable.Input, P(x({}, l), { scope: c, fieldNames: u })) : i ? /* @__PURE__ */ jsx(TextArea, P(x({}, l), { scope: c, fieldNames: u })) : /* @__PURE__ */ jsx(Variable.Input, P(x({}, l), { scope: c, fieldNames: u }));
 }, mapReadPretty(Input$2.ReadPretty)), isDrawerTitle = (e) => isNum$1(e) || isStr(e) || isBool(e) || React.isValidElement(e), getDrawerProps = (e) => isDrawerTitle(e) ? {
   title: e
@@ -53166,12 +53210,12 @@ const useCollectionFields = (e) => {
   const t = useCollection();
   return useMemo(() => t.getFields(e), [t, e]);
 }, collectionTransform = (e, t) => {
-  const i = e, { rawTitle: n, title: o, fields: r = [] } = i, a = Y(i, ["rawTitle", "title", "fields"]);
+  const i = e, { rawTitle: n, title: o, fields: r = [] } = i, a = W(i, ["rawTitle", "title", "fields"]);
   return P(x({}, a), {
     title: n ? o : t.i18n.t(o, { ns: "lm-collections" }),
     rawTitle: n || o,
     fields: r == null ? void 0 : r.map((u) => {
-      var d = u, { uiSchema: l } = d, c = Y(d, ["uiSchema"]);
+      var d = u, { uiSchema: l } = d, c = W(d, ["uiSchema"]);
       if (l != null && l.title) {
         const p = l.title;
         l.title = l.rawTitle ? p : t.i18n.t(p, { ns: "lm-collections" }), l.rawTitle = l.rawTitle || p;
@@ -53453,7 +53497,7 @@ const SelfFields = (e) => {
   });
   return /* @__PURE__ */ jsx(SchemaInitializerChildren, { children: i });
 }, AssociationCollectionFields = (e) => {
-  const m = e, { filterAssociationField: t, filterSelfField: n = () => !0, getSchema: o } = m, r = Y(m, ["filterAssociationField", "filterSelfField", "getSchema"]), { collection: a, t: i, collectionManager: l } = e.context, c = a.getFields(), u = ["o2o", "oho", "obo", "m2o"], d = c.filter((h) => u.includes(h.interface)).filter((h) => n(h, e.context));
+  const m = e, { filterAssociationField: t, filterSelfField: n = () => !0, getSchema: o } = m, r = W(m, ["filterAssociationField", "filterSelfField", "getSchema"]), { collection: a, t: i, collectionManager: l } = e.context, c = a.getFields(), u = ["o2o", "oho", "obo", "m2o"], d = c.filter((h) => u.includes(h.interface)).filter((h) => n(h, e.context));
   if (!d.length)
     return null;
   const p = d.map((h) => {
@@ -54528,19 +54572,19 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
               {
                 value: O,
                 onChange: (U) => {
-                  var K, X;
+                  var K, Y;
                   if (R.key === "tlds" && (j.key === "email" || j.key === "domain")) {
-                    const W = U.target.value;
-                    if (W === "iana")
+                    const X = U.target.value;
+                    if (X === "iana")
                       F(M.key, "tlds", { allow: !0 });
-                    else if (W === "disable")
+                    else if (X === "disable")
                       F(M.key, "tlds", !1);
-                    else if (W === "allow") {
-                      const J = (K = M.args) == null ? void 0 : K.tlds, Z = Array.isArray(J == null ? void 0 : J.allow) ? J.allow : [];
-                      F(M.key, "tlds", { allow: Z });
-                    } else if (W === "deny") {
-                      const J = (X = M.args) == null ? void 0 : X.tlds, Z = Array.isArray(J == null ? void 0 : J.deny) ? J.deny : [];
-                      F(M.key, "tlds", { deny: Z });
+                    else if (X === "allow") {
+                      const Q = (K = M.args) == null ? void 0 : K.tlds, ee = Array.isArray(Q == null ? void 0 : Q.allow) ? Q.allow : [];
+                      F(M.key, "tlds", { allow: ee });
+                    } else if (X === "deny") {
+                      const Q = (Y = M.args) == null ? void 0 : Y.tlds, ee = Array.isArray(Q == null ? void 0 : Q.deny) ? Q.deny : [];
+                      F(M.key, "tlds", { deny: ee });
                     }
                   } else
                     F(M.key, R.key, U.target.value);
@@ -54549,21 +54593,21 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
               }
             ),
             (L = R.options) == null ? void 0 : L.map((U) => {
-              var K, X, W;
+              var K, Y, X;
               return U.value === O && U.componentType ? /* @__PURE__ */ jsx("div", { style: { marginTop: c.marginXS }, children: U.componentType === "text" ? (() => {
-                var Z;
+                var ee;
                 if (R.key === "tlds" && (U.value === "allow" || U.value === "deny")) {
-                  const Q = (Z = M.args) == null ? void 0 : Z.tlds, ee = Array.isArray(
-                    U.value === "allow" ? Q == null ? void 0 : Q.allow : Q == null ? void 0 : Q.deny
-                  ) ? U.value === "allow" ? Q.allow : Q.deny : [];
+                  const J = (ee = M.args) == null ? void 0 : ee.tlds, Z = Array.isArray(
+                    U.value === "allow" ? J == null ? void 0 : J.allow : J == null ? void 0 : J.deny
+                  ) ? U.value === "allow" ? J.allow : J.deny : [];
                   return /* @__PURE__ */ jsx(
                     Select$1,
                     {
                       mode: "tags",
-                      value: ee,
-                      onChange: (ne) => {
+                      value: Z,
+                      onChange: (te) => {
                         const re = Array.from(
-                          new Set(ne.map((ie) => String(ie).trim()).filter(Boolean))
+                          new Set(te.map((se) => String(se).trim()).filter(Boolean))
                         );
                         U.value === "allow" ? F(M.key, "tlds", { allow: re }) : F(M.key, "tlds", { deny: re });
                       },
@@ -54578,7 +54622,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
                   Input$3,
                   {
                     value: "",
-                    onChange: (Q) => F(M.key, `${R.key}_${U.value}`, Q.target.value),
+                    onChange: (J) => F(M.key, `${R.key}_${U.value}`, J.target.value),
                     style: { width: "100%" }
                   }
                 );
@@ -54588,21 +54632,21 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
                   precision: y ? void 0 : 0,
                   step: y ? 0.1 : 1,
                   value: ((K = M.args) == null ? void 0 : K[`${R.key}_${U.value}`]) || "",
-                  onChange: (J) => F(M.key, `${R.key}_${U.value}`, J),
+                  onChange: (Q) => F(M.key, `${R.key}_${U.value}`, Q),
                   style: { width: "100%" }
                 }
               ) : U.componentType === "checkbox" ? /* @__PURE__ */ jsx(
                 Checkbox$1,
                 {
-                  checked: ((X = M.args) == null ? void 0 : X[`${R.key}_${U.value}`]) || !1,
-                  onChange: (J) => F(M.key, `${R.key}_${U.value}`, J.target.checked),
+                  checked: ((Y = M.args) == null ? void 0 : Y[`${R.key}_${U.value}`]) || !1,
+                  onChange: (Q) => F(M.key, `${R.key}_${U.value}`, Q.target.checked),
                   children: l(U.label)
                 }
               ) : U.componentType === "datePicker" ? /* @__PURE__ */ jsx(
                 DatePicker$1,
                 {
-                  value: (W = M.args) != null && W[`${R.key}_${U.value}`] ? dayjs(M.args[`${R.key}_${U.value}`]) : null,
-                  onChange: (J) => F(M.key, `${R.key}_${U.value}`, J == null ? void 0 : J.toISOString()),
+                  value: (X = M.args) != null && X[`${R.key}_${U.value}`] ? dayjs(M.args[`${R.key}_${U.value}`]) : null,
+                  onChange: (Q) => F(M.key, `${R.key}_${U.value}`, Q == null ? void 0 : Q.toISOString()),
                   placeholder: l("Select date"),
                   style: { width: "100%" }
                 }
@@ -55357,7 +55401,7 @@ const supportTypes = ["string", "bigInt", "integer", "uuid", "uid", "nanoid"], S
   const t = useRecord(), n = useCollectionParentRecordData();
   return /* @__PURE__ */ jsx(EditFieldAction, x({ item: t, parentItem: n }, e));
 }, EditFieldAction = (e) => {
-  const F = e, { scope: t, getContainer: n, item: o, parentItem: r, children: a } = F, i = Y(F, ["scope", "getContainer", "item", "parentItem", "children"]), { getInterface: l, collections: c, getCollection: u } = useCollectionManager_deprecated(), [d, p] = useState(!1), [m, h] = useState({}), g = useAPIClient(), { t: f } = useTranslation(), C = useCompile(), [b, S] = useState({}), { isDialect: y } = useDialect(), v = useMemo(() => {
+  const F = e, { scope: t, getContainer: n, item: o, parentItem: r, children: a } = F, i = W(F, ["scope", "getContainer", "item", "parentItem", "children"]), { getInterface: l, collections: c, getCollection: u } = useCollectionManager_deprecated(), [d, p] = useState(!1), [m, h] = useState({}), g = useAPIClient(), { t: f } = useTranslation(), C = useCompile(), [b, S] = useState({}), { isDialect: y } = useDialect(), v = useMemo(() => {
     var w;
     return (o == null ? void 0 : o.fields) || ((w = u(o.collectionName)) == null ? void 0 : w.options.fields.filter((T) => ["string", "bigInt", "integer"].includes(T.type)).map((T) => {
       var D;
@@ -55928,7 +55972,7 @@ const getSchema$4 = (e, t, n) => {
   const t = useRecord();
   return /* @__PURE__ */ jsx(EditCollectionAction, x({ item: t }, e));
 }, EditCollectionAction = (e) => {
-  const h = e, { scope: t, getContainer: n, item: o, children: r } = h, a = Y(h, ["scope", "getContainer", "item", "children"]), { getTemplate: i } = useCollectionManager_deprecated(), [l, c] = useState(!1), [u, d] = useState({}), { t: p } = useTranslation(), m = useCompile();
+  const h = e, { scope: t, getContainer: n, item: o, children: r } = h, a = W(h, ["scope", "getContainer", "item", "children"]), { getTemplate: i } = useCollectionManager_deprecated(), [l, c] = useState(!1), [u, d] = useState({}), { t: p } = useTranslation(), m = useCompile();
   return /* @__PURE__ */ jsx(RecordProvider, { record: o, children: /* @__PURE__ */ jsxs(ActionContextProvider, { value: { visible: l, setVisible: c }, children: [
     /* @__PURE__ */ jsx(
       "a",
@@ -56389,7 +56433,7 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
 }, AsyncDataContext = createContext(null);
 AsyncDataContext.displayName = "AsyncDataContext";
 const AsyncDataProvider = (e) => {
-  const i = e, { value: t, request: n, children: o } = i, r = Y(i, ["value", "request", "children"]), a = useRequest(n, x({}, r));
+  const i = e, { value: t, request: n, children: o } = i, r = W(i, ["value", "request", "children"]), a = useRequest(n, x({}, r));
   return t ? /* @__PURE__ */ jsx(AsyncDataContext.Provider, { value: t, children: o }) : /* @__PURE__ */ jsx(AsyncDataContext.Provider, { value: a, children: o });
 }, useAsyncData = () => useContext(AsyncDataContext), inferInterface = (e, t) => e.toLowerCase().includes("id") ? "id" : typeof t == "number" ? Number.isInteger(t) ? "integer" : "number" : typeof t == "boolean" ? "checkbox" : dayjs(t).isValid() ? "datetime" : "input", useSourceFieldsOptions = () => {
   const e = useForm(), { sources: t = [] } = e.values, { t: n } = useTranslation(), { getCollection: o, getInheritCollections: r, getParentCollectionFields: a } = useCollectionManager_deprecated(), i = [];
@@ -56851,7 +56895,7 @@ const AsyncDataProvider = (e) => {
     }
   };
 }, DeleteCollectionAction = (e) => {
-  const h = e, { scope: t, getContainer: n, item: o, children: r, isBulk: a, useAction: i } = h, l = Y(h, ["scope", "getContainer", "item", "children", "isBulk", "useAction"]), { t: c } = useTranslation(), [u, d] = useState(!1), p = () => a ? useBulkDestroyActionAndRefreshCM : i || useDestroyActionAndRefreshCM, m = () => /* @__PURE__ */ jsxs("span", { children: [
+  const h = e, { scope: t, getContainer: n, item: o, children: r, isBulk: a, useAction: i } = h, l = W(h, ["scope", "getContainer", "item", "children", "isBulk", "useAction"]), { t: c } = useTranslation(), [u, d] = useState(!1), p = () => a ? useBulkDestroyActionAndRefreshCM : i || useDestroyActionAndRefreshCM, m = () => /* @__PURE__ */ jsxs("span", { children: [
     /* @__PURE__ */ jsx(ExclamationCircleFilled, { style: { color: "#faad14", marginRight: "12px", fontSize: "22px" } }),
     /* @__PURE__ */ jsx("span", { style: { fontSize: "19px" }, children: c("Delete collection") })
   ] });
@@ -61276,7 +61320,7 @@ const useBlockContext = () => useContext(BlockContext), useCompatDataBlockParent
   };
   return n.__collection && i && !["oho", "m2o", "obo"].includes(i.interface) && (u.targetCollection = n.__collection), !t && Object.keys(c).length > 0 && (u.filter = c), u;
 }, RecordLink = (e) => {
-  const t = useField(), n = useRecord(), l = e, { title: o, to: r } = l, a = Y(l, ["title", "to"]), i = template(r || "");
+  const t = useField(), n = useRecord(), l = e, { title: o, to: r } = l, a = W(l, ["title", "to"]), i = template(r || "");
   return /* @__PURE__ */ jsx(Link$1, P(x({}, a), { to: i({ record: n || {} }), children: t.title }));
 }, ACLContext = createContext({});
 ACLContext.displayName = "ACLContext";
@@ -64246,7 +64290,7 @@ AppLangContext.displayName = "AppLangContext";
 const useAppLangContext = () => useContext(AppLangContext);
 function AntdConfigProvider(e) {
   var c;
-  const l = e, { remoteLocale: t } = l, n = Y(l, ["remoteLocale"]), o = useAPIClient(), { i18n: r } = useTranslation(), { data: a, loading: i } = useRequest(
+  const l = e, { remoteLocale: t } = l, n = W(l, ["remoteLocale"]), o = useAPIClient(), { i18n: r } = useTranslation(), { data: a, loading: i } = useRequest(
     {
       url: "app:getLang",
       params: {
@@ -65114,20 +65158,20 @@ const ActionInitializerItem = (e) => {
       }, 100);
     }, [i.default, d]), !a)
       return null;
-    const $ = (X) => {
-      B(X), R(!1);
-    }, A = (X) => {
-      M(X), d(X), p == null || p(X);
-    }, E = (X) => {
-      var J;
-      const W = (J = h == null ? void 0 : h[0]) == null ? void 0 : J.filter;
-      (y || W) && g(P(x({}, h == null ? void 0 : h[0]), {
+    const $ = (Y) => {
+      B(Y), R(!1);
+    }, A = (Y) => {
+      M(Y), d(Y), p == null || p(Y);
+    }, E = (Y) => {
+      var Q;
+      const X = (Q = h == null ? void 0 : h[0]) == null ? void 0 : Q.filter;
+      (y || X) && g(P(x({}, h == null ? void 0 : h[0]), {
         filter: f
-      })), v(!y), X.stopPropagation();
-    }, z = (X) => {
-      X.stopPropagation();
-    }, L = (X) => {
-      m(X);
+      })), v(!y), Y.stopPropagation();
+    }, z = (Y) => {
+      Y.stopPropagation();
+    }, L = (Y) => {
+      m(Y);
     }, V = (K = i.title) != null ? K : (U = a == null ? void 0 : a.uiSchema) == null ? void 0 : U.title;
     return t(
       /* @__PURE__ */ jsxs(SortableItem, { className: cls(n, o, "nb-block-item", e.className, "SortableItem"), children: [
@@ -65178,7 +65222,7 @@ const ActionInitializerItem = (e) => {
                 treeData: u,
                 onSelect: A,
                 fieldNames: T,
-                titleRender: (X) => /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: getLabelFormatValue(O, c(X[w])) }),
+                titleRender: (Y) => /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: getLabelFormatValue(O, c(Y[w])) }),
                 selectedKeys: N,
                 blockNode: !0
               }
@@ -65395,7 +65439,7 @@ const AssociationFilterDesignerDelete = () => {
     }
   );
 }, BlockInitializer = (e) => {
-  const a = e, { item: t, schema: n } = a, o = Y(a, ["item", "schema"]), { insert: r } = useSchemaInitializer();
+  const a = e, { item: t, schema: n } = a, o = W(a, ["item", "schema"]), { insert: r } = useSchemaInitializer();
   return /* @__PURE__ */ jsx(
     SchemaInitializerItem,
     P(x({}, o), {
@@ -65407,7 +65451,7 @@ const AssociationFilterDesignerDelete = () => {
     })
   );
 }, BlockItemInitializer = () => {
-  const e = useSchemaInitializerItem(), o = e, { schema: t } = o, n = Y(o, ["schema"]);
+  const e = useSchemaInitializerItem(), o = e, { schema: t } = o, n = W(o, ["schema"]);
   return /* @__PURE__ */ jsx(BlockInitializer, P(x({}, n), { item: e }));
 }, CreateFilterActionInitializer = (e) => {
   const t = {
@@ -65746,7 +65790,7 @@ const DataBlockInitializer = (e) => {
     }
   };
 }, RecordAssociationBlockInitializer = () => {
-  const e = useSchemaInitializerItem(), p = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = p, r = Y(p, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: a } = useSchemaInitializer(), { getTemplateSchemaByMode: i } = useSchemaTemplateManager(), { getCollection: l } = useCollectionManager_deprecated(), c = e.field, u = l(c.target), d = `${c.collectionName}.${c.name}`;
+  const e = useSchemaInitializerItem(), p = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = p, r = W(p, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: a } = useSchemaInitializer(), { getTemplateSchemaByMode: i } = useSchemaTemplateManager(), { getCollection: l } = useCollectionManager_deprecated(), c = e.field, u = l(c.target), d = `${c.collectionName}.${c.name}`;
   return /* @__PURE__ */ jsx(
     SchemaInitializerItem,
     P(x({
@@ -65840,7 +65884,7 @@ function createDetailsWithPaginationUISchema(e) {
   };
 }
 const RecordAssociationDetailsBlockInitializer = () => {
-  const e = useSchemaInitializerItem(), p = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = p, r = Y(p, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: a } = useSchemaInitializer(), { getTemplateSchemaByMode: i } = useSchemaTemplateManager(), { getCollection: l } = useCollectionManager_deprecated(), c = e.field, u = l(c.target), d = `${c.collectionName}.${c.name}`;
+  const e = useSchemaInitializerItem(), p = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = p, r = W(p, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: a } = useSchemaInitializer(), { getTemplateSchemaByMode: i } = useSchemaTemplateManager(), { getCollection: l } = useCollectionManager_deprecated(), c = e.field, u = l(c.target), d = `${c.collectionName}.${c.name}`;
   return /* @__PURE__ */ jsx(
     SchemaInitializerItem,
     P(x({
@@ -65926,7 +65970,7 @@ function createCreateFormBlockUISchema(e) {
   };
 }
 const RecordAssociationFormBlockInitializer = () => {
-  const e = useSchemaInitializerItem(), p = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = p, r = Y(p, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: a } = useSchemaInitializer(), { getCollection: i } = useCollectionManager_deprecated(), { getTemplateSchemaByMode: l } = useSchemaTemplateManager(), c = e.field, u = c.target, d = useMemo(() => i(u), [u]);
+  const e = useSchemaInitializerItem(), p = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = p, r = W(p, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: a } = useSchemaInitializer(), { getCollection: i } = useCollectionManager_deprecated(), { getTemplateSchemaByMode: l } = useSchemaTemplateManager(), c = e.field, u = c.target, d = useMemo(() => i(u), [u]);
   return /* @__PURE__ */ jsx(
     SchemaInitializerItem,
     P(x({
@@ -66054,7 +66098,7 @@ const createGridCardBlockUISchema = (e) => {
     }
   };
 }, RecordAssociationGridCardBlockInitializer = () => {
-  const e = useSchemaInitializerItem(), p = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = p, r = Y(p, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: a } = useSchemaInitializer(), { getTemplateSchemaByMode: i } = useSchemaTemplateManager(), { getCollection: l } = useCollectionManager_deprecated(), c = e.field, u = l(c.target), d = `${c.collectionName}.${c.name}`;
+  const e = useSchemaInitializerItem(), p = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = p, r = W(p, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: a } = useSchemaInitializer(), { getTemplateSchemaByMode: i } = useSchemaTemplateManager(), { getCollection: l } = useCollectionManager_deprecated(), c = e.field, u = l(c.target), d = `${c.collectionName}.${c.name}`;
   return /* @__PURE__ */ jsx(
     SchemaInitializerItem,
     P(x({
@@ -66159,7 +66203,7 @@ const createListBlockUISchema = (e) => {
     }
   };
 }, RecordAssociationListBlockInitializer = () => {
-  const e = useSchemaInitializerItem(), p = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = p, r = Y(p, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: a } = useSchemaInitializer(), { getTemplateSchemaByMode: i } = useSchemaTemplateManager(), { getCollection: l } = useCollectionManager_deprecated(), c = e.field, u = l(c.target), d = `${c.collectionName}.${c.name}`;
+  const e = useSchemaInitializerItem(), p = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = p, r = W(p, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: a } = useSchemaInitializer(), { getTemplateSchemaByMode: i } = useSchemaTemplateManager(), { getCollection: l } = useCollectionManager_deprecated(), c = e.field, u = l(c.target), d = `${c.collectionName}.${c.name}`;
   return /* @__PURE__ */ jsx(
     SchemaInitializerItem,
     P(x({
@@ -66248,7 +66292,7 @@ function createDetailsUISchema(e) {
   });
 }
 const RecordReadPrettyAssociationFormBlockInitializer = () => {
-  const e = useSchemaInitializerItem(), m = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = m, r = Y(m, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: a } = useSchemaInitializer(), { getCollection: i } = useCollectionManager_deprecated(), { getTemplateSchemaByMode: l } = useSchemaTemplateManager(), c = e.field, u = c.target, d = i(u), p = `${c.collectionName}.${c.name}`;
+  const e = useSchemaInitializerItem(), m = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = m, r = W(m, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: a } = useSchemaInitializer(), { getCollection: i } = useCollectionManager_deprecated(), { getTemplateSchemaByMode: l } = useSchemaTemplateManager(), c = e.field, u = c.target, d = i(u), p = `${c.collectionName}.${c.name}`;
   return /* @__PURE__ */ jsx(
     SchemaInitializerItem,
     P(x({
@@ -66405,7 +66449,7 @@ const SelectActionInitializer = (e) => {
   return /* @__PURE__ */ jsx(InitializerWithSwitch, P(x({}, t), { schema: e, item: t, type: "x-action-column" }));
 };
 function ModalActionSchemaInitializerItem(e) {
-  const d = e, { modalSchema: t = {}, components: n = {} } = d, o = Y(d, ["modalSchema", "components"]), p = t, { properties: r } = p, a = Y(p, ["properties"]), [i, l] = useState(!1), { setVisible: c } = useSchemaInitializer$1(), u = useMemo(() => P(x({
+  const d = e, { modalSchema: t = {}, components: n = {} } = d, o = W(d, ["modalSchema", "components"]), p = t, { properties: r } = p, a = W(p, ["properties"]), [i, l] = useState(!1), { setVisible: c } = useSchemaInitializer$1(), u = useMemo(() => P(x({
     name: uid$1(),
     "x-component": "Action.Modal",
     "x-component-props": {
@@ -66704,7 +66748,7 @@ const items = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
   }, r = useSchemaInitializerItem();
   return /* @__PURE__ */ jsx(BlockInitializer, P(x({}, r), { schema: o, item: r }));
 }, useTableSelectorProps = () => {
-  const { setSelectedRows: e } = useContext(RecordPickerContext), r = useTableSelectorProps$4(), { onRowSelectionChange: t, rowKey: n = "id" } = r, o = Y(r, ["onRowSelectionChange", "rowKey"]);
+  const { setSelectedRows: e } = useContext(RecordPickerContext), r = useTableSelectorProps$4(), { onRowSelectionChange: t, rowKey: n = "id" } = r, o = W(r, ["onRowSelectionChange", "rowKey"]);
   return P(x({}, o), {
     rowKey: n,
     rowSelection: {
@@ -67168,7 +67212,7 @@ const items = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
   }, commonOptions$i),
   readPrettyFormItemInitializers_deprecated
 ), RecordReadPrettyFormBlockInitializer = () => {
-  const l = useSchemaInitializerItem(), { icon: t = !0, targetCollection: n } = l, o = Y(l, ["icon", "targetCollection"]), r = useCollection_deprecated(), a = n || r, { createSingleDetailsSchema: i } = useCreateSingleDetailsSchema();
+  const l = useSchemaInitializerItem(), { icon: t = !0, targetCollection: n } = l, o = W(l, ["icon", "targetCollection"]), r = useCollection_deprecated(), a = n || r, { createSingleDetailsSchema: i } = useCreateSingleDetailsSchema();
   return /* @__PURE__ */ jsx(
     SchemaInitializerItem,
     P(x({
@@ -67369,7 +67413,7 @@ function createEditFormBlockUISchema(e) {
   });
 }
 const RecordFormBlockInitializer = () => {
-  const u = useSchemaInitializerItem(), { targetCollection: t } = u, n = Y(u, ["targetCollection"]), { insert: o } = useSchemaInitializer(), { getTemplateSchemaByMode: r } = useSchemaTemplateManager(), a = useCollection_deprecated(), i = t || a, { createEditFormBlock: l, templateWrap: c } = useCreateEditFormBlock();
+  const u = useSchemaInitializerItem(), { targetCollection: t } = u, n = W(u, ["targetCollection"]), { insert: o } = useSchemaInitializer(), { getTemplateSchemaByMode: r } = useSchemaTemplateManager(), a = useCollection_deprecated(), i = t || a, { createEditFormBlock: l, templateWrap: c } = useCreateEditFormBlock();
   return /* @__PURE__ */ jsx(
     SchemaInitializerItem,
     P(x({
@@ -68041,7 +68085,7 @@ const commonOptions$h = {
     }
   };
 }, TableSelectorInitializer = () => {
-  const l = useSchemaInitializerItem(), { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = l, r = Y(l, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: a } = useSchemaInitializer(), i = useCollection_deprecated();
+  const l = useSchemaInitializerItem(), { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = l, r = W(l, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: a } = useSchemaInitializer(), i = useCollection_deprecated();
   return /* @__PURE__ */ jsx(
     SchemaInitializerItem,
     P(x({
@@ -68066,7 +68110,7 @@ const commonOptions$h = {
     {
       title: e("Column width"),
       component: React.forwardRef((r, a) => {
-        const u = r, { children: i, onClick: l } = u, c = Y(u, ["children", "onClick"]);
+        const u = r, { children: i, onClick: l } = u, c = W(u, ["children", "onClick"]);
         return /* @__PURE__ */ jsx(
           SchemaInitializerItem,
           P(x({