@nocobase/client 1.8.5 → 1.8.7

package/es/index.mjs

@@ -3676,6 +3676,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get useDatetimeVariableContext() {
     return useDatetimeVariableContext;
   },
+  get useDeleteRouteSchema() {
+    return useDeleteRouteSchema;
+  },
   get useDesignable() {
     return useDesignable;
   },
@@ -6234,7 +6237,7 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
   }
   const p = (y, { exclude: v = [], depth: I = 0, maxDepth: F, prefix: R = "" }) => I > F ? [] : o(y).map((T) => {
     var $;
-    if (v.includes(T.name) || !T.interface || ["sort", "password", "sequence"].includes(T.type) || n && n(T))
+    if (v.includes(T.name) || !T.interface || I === 0 && ["sort", "password", "sequence"].includes(T.type) || n && n(T))
       return;
     const D = {
       type: "duplicate",
@@ -6255,7 +6258,7 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
       depth: I + 1,
       maxDepth: F,
       prefix: B.key,
-      exclude: ["id", ...systemKeys]
+      exclude: ["id", ...systemKeys.filter((O) => O !== "sort")]
     })), B;
   }).filter(Boolean), m = (y, { prefix: v, maxDepth: I, depth: F = 0, exclude: R = [] }) => F > I ? [] : o(y).map((T) => {
     var $;
@@ -6310,15 +6313,15 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
     getOnCheck: C,
     getScopeDataSource: (y) => {
       const v = o(y), I = (T, D) => {
-        var O, N;
+        var L, N;
         if (!T.interface)
           return;
         const B = i(T.interface);
         if (!(B != null && B.filterable))
           return;
-        const { nested: $, children: L, operators: j } = B.filterable, w = {
+        const { nested: $, children: O, operators: j } = B.filterable, w = {
           name: T.name,
-          title: ((O = T == null ? void 0 : T.uiSchema) == null ? void 0 : O.title) || T.name,
+          title: ((L = T == null ? void 0 : T.uiSchema) == null ? void 0 : L.title) || T.name,
           schema: T == null ? void 0 : T.uiSchema,
           operators: ((N = j == null ? void 0 : j.filter) == null ? void 0 : N.call(j, (k) => !(k != null && k.visible) || k.visible(T))) || [],
           interface: T.interface
@@ -6326,7 +6329,7 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
         if (!(T.target && D > 2)) {
           if (D > 2)
             return w;
-          if (L != null && L.length && (w.children = L), $) {
+          if (O != null && O.length && (w.children = O), $) {
             const k = o(T.target), M = F(k, D + 1).filter(Boolean);
             w.children = w.children || [], w.children.push(...M);
           }
@@ -6335,8 +6338,8 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
       }, F = (T, D) => {
         const B = [];
         return T.forEach(($) => {
-          const L = I($, D);
-          L && B.push(L);
+          const O = I($, D);
+          O && B.push(O);
         }), B;
       };
       return F(v, 1);
@@ -6373,7 +6376,7 @@ function loadChildren$1({ node: e, traverseAssociations: t, traverseFields: n, s
     prefix: e.key,
     maxDepth: 1
   }) : (["hasOne", "hasMany"].includes(e.field.type) || (e == null ? void 0 : e.type) === "duplicate") && (i = n(e.field.target, {
-    exclude: ["id", ...o],
+    exclude: ["id", ...o.filter((l) => l !== "sort")],
     prefix: e.key,
     maxDepth: 1
   })), i.length ? a.children = i : a.isLeaf = !0, i;
@@ -7084,14 +7087,14 @@ const collectFieldStateOfLinkageRules = ({
   action: l,
   conditionType: c
 }, u) => {
-  var S, y, v, I, F, R, T, D, B, $, L, j, w, O;
+  var S, y, v, I, F, R, T, D, B, $, O, j, w, L;
   const d = ((S = n == null ? void 0 : n.stateOfLinkageRules) == null ? void 0 : S.required) || [(y = n == null ? void 0 : n.initStateOfLinkageRules) == null ? void 0 : y.required], p = ((v = n == null ? void 0 : n.stateOfLinkageRules) == null ? void 0 : v.display) || [(I = n == null ? void 0 : n.initStateOfLinkageRules) == null ? void 0 : I.display], m = ((F = n == null ? void 0 : n.stateOfLinkageRules) == null ? void 0 : F.pattern) || [(R = n == null ? void 0 : n.initStateOfLinkageRules) == null ? void 0 : R.pattern], h = ((T = n == null ? void 0 : n.stateOfLinkageRules) == null ? void 0 : T.value) || [(D = n == null ? void 0 : n.initStateOfLinkageRules) == null ? void 0 : D.value], g = ((B = n == null ? void 0 : n.stateOfLinkageRules) == null ? void 0 : B.dataSource) || [($ = n == null ? void 0 : n.initStateOfLinkageRules) == null ? void 0 : $.dataSource], { evaluate: f } = evaluators.get("formula.js"), C = {
     ruleGroup: o,
     variables: r,
     localVariables: a,
     variableNameOfLeftCondition: i,
     conditionType: c
-  }, b = ((L = n == null ? void 0 : n.stateOfLinkageRules) == null ? void 0 : L.dateScope) || [(j = n == null ? void 0 : n.initStateOfLinkageRules) == null ? void 0 : j.dateScope];
+  }, b = ((O = n == null ? void 0 : n.stateOfLinkageRules) == null ? void 0 : O.dateScope) || [(j = n == null ? void 0 : n.initStateOfLinkageRules) == null ? void 0 : j.dateScope];
   switch (e) {
     case ActionType.Required:
       d.push(getTempFieldState(conditionAnalyses(C, u), !0)), n.stateOfLinkageRules = P(x({}, n.stateOfLinkageRules), {
@@ -7143,7 +7146,7 @@ const collectFieldStateOfLinkageRules = ({
       break;
     case ActionType.Options:
       {
-        const N = (O = (w = n.data) == null ? void 0 : w.dataSource) == null ? void 0 : O.filter((k) => t.value.includes(k.value));
+        const N = (L = (w = n.data) == null ? void 0 : w.dataSource) == null ? void 0 : L.filter((k) => t.value.includes(k.value));
         g.push(getTempFieldState(conditionAnalyses(C, u), N || [])), n.stateOfLinkageRules = P(x({}, n.stateOfLinkageRules), {
           dataSource: g
         });
@@ -8302,11 +8305,11 @@ function withInitializer(e) {
         style: C,
         componentProps: b
       } = n, S = l ? l() : i, y = c(u), v = useCallback(
-        (O) => {
-          S ? S(y(O, { isInSubTable: a })) : r(d, y(O, { isInSubTable: a }), { onSuccess: p });
+        (L) => {
+          S ? S(y(L, { isInSubTable: a })) : r(d, y(L, { isInSubTable: a }), { onSuccess: p });
         },
         [S, y, a, r, d, p]
-      ), { wrapSSR: I, hashId: F, componentCls: R } = useSchemaInitializerStyles(), [T, D] = useState(!1), { token: B } = theme.useToken(), $ = useNiceDropdownMaxHeight([T]), L = useMemo(
+      ), { wrapSSR: I, hashId: F, componentCls: R } = useSchemaInitializerStyles(), [T, D] = useState(!1), { token: B } = theme.useToken(), $ = useNiceDropdownMaxHeight([T]), O = useMemo(
         () => x({
           options: n,
           style: C
@@ -8346,7 +8349,7 @@ function withInitializer(e) {
                 options: n,
                 insert: v
               },
-              children: f === !1 ? React.createElement(e, L) : /* @__PURE__ */ jsx(
+              children: f === !1 ? React.createElement(e, O) : /* @__PURE__ */ jsx(
                 Popover,
                 P(x({
                   zIndex: 9999,
@@ -8374,7 +8377,7 @@ function withInitializer(e) {
                       }
                     ) })
                   ),
-                  children: React.createElement(e, L)
+                  children: React.createElement(e, O)
                 })
               )
             }
@@ -8597,6 +8600,26 @@ const titleWrapperStyle = {
     /* @__PURE__ */ jsx(e, x({}, t)),
     /* @__PURE__ */ jsx(Tooltip, { title: n, children: /* @__PURE__ */ jsx(QuestionCircleOutlined, { style: { zIndex: 1 } }) })
   ] }) : /* @__PURE__ */ jsx(e, x({}, t));
+}, { evaluate } = evaluators.get("formula.js"), useEvaluatedExpression = (e) => {
+  const t = useVariables$1(), n = useLocalVariables$1(), [o, r] = useState();
+  return useEffect(() => {
+    z(void 0, null, function* () {
+      if (e == null || e === "") {
+        r(void 0);
+        return;
+      }
+      const { exp: i, scope: l } = yield replaceVariables(e, {
+        variables: t,
+        localVariables: n
+      });
+      try {
+        const c = evaluate(i, x({ now: () => (/* @__PURE__ */ new Date()).toString() }, l));
+        r(c);
+      } catch (c) {
+        console.error(c);
+      }
+    });
+  }, [t.parseVariable, e, n]), o;
 };
 class SchemaInitializer {
   constructor(t) {
@@ -8746,7 +8769,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.8.5", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.8.7", 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",
@@ -8767,9 +8790,9 @@ const name = "@nocobase/client", version = "1.8.5", license = "AGPL-3.0", main =
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.8.5",
-  "@nocobase/sdk": "1.8.5",
-  "@nocobase/utils": "1.8.5",
+  "@nocobase/evaluators": "1.8.7",
+  "@nocobase/sdk": "1.8.7",
+  "@nocobase/utils": "1.8.7",
   ahooks: "^3.7.2",
   antd: "5.24.2",
   "antd-style": "3.7.1",
@@ -8780,6 +8803,7 @@ const name = "@nocobase/client", version = "1.8.5", license = "AGPL-3.0", main =
   "file-saver": "^2.0.5",
   filesize: "9.0.11",
   flat: "^5.0.2",
+  "html5-qrcode": "^2.3.8",
   i18next: "^22.4.9",
   "i18next-http-backend": "^2.1.1",
   ignore: "^5.2.0",
@@ -8793,6 +8817,7 @@ const name = "@nocobase/client", version = "1.8.5", license = "AGPL-3.0", main =
   mime: "^4.0.4",
   "mime-match": "^1.0.2",
   "react-beautiful-dnd": "^13.1.0",
+  "react-device-detect": "2.2.3",
   "react-drag-listview": "^0.1.9",
   "react-error-boundary": "^4.0.10",
   "react-helmet": "^6.1.0",
@@ -8818,8 +8843,7 @@ const name = "@nocobase/client", version = "1.8.5", license = "AGPL-3.0", main =
   "@types/react-big-calendar": "^1.6.4",
   "axios-mock-adapter": "^1.20.0",
   dumi: "2.2.14",
-  "dumi-theme-nocobase": "^0.2.28",
-  "html5-qrcode": "^2.3.8"
+  "dumi-theme-nocobase": "^0.2.28"
 }, clientPkg = {
   name,
   version,
@@ -9937,11 +9961,11 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
       }
     `, [o.paddingContentVerticalLG, o.marginSM, o.margin]), b = useCollection(), S = useMemo(() => withTooltipComponent(NocoBaseRecursionField), []), y = useMemo(
     () => d == null ? void 0 : d.map((I) => {
-      var L, j, w, O;
+      var O, j, w, L;
       const F = I.reduceProperties((N, k) => {
         if (isCollectionFieldComponent(k))
           return N.concat([k]);
-      }, []), R = (F == null ? void 0 : F.length) > 0 ? F[0].name : I.name, T = !!((L = I["x-component-props"]) != null && L.columnHidden), { uiSchema: D, defaultValue: B, interface: $ } = (b == null ? void 0 : b.getField(R)) || {};
+      }, []), R = (F == null ? void 0 : F.length) > 0 ? F[0].name : I.name, T = !!((O = I["x-component-props"]) != null && O.columnHidden), { uiSchema: D, defaultValue: B, interface: $ } = (b == null ? void 0 : b.getField(R)) || {};
       return I.title = n(I == null ? void 0 : I.title, { ns: NAMESPACE_UI_SCHEMA }), D && (D.default = B), P(x({
         title: /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: g, children: /* @__PURE__ */ jsx(
           S,
@@ -9958,7 +9982,7 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
         sorter: (w = I["x-component-props"]) == null ? void 0 : w.sorter,
         columnHidden: T
       }, I["x-component-props"]), {
-        width: T && !l ? 0 : ((O = I["x-component-props"]) == null ? void 0 : O.width) || 100,
+        width: T && !l ? 0 : ((L = I["x-component-props"]) == null ? void 0 : L.width) || 100,
         render: (N, k, M) => /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: g, children: /* @__PURE__ */ jsx(
           TableCellRender,
           {
@@ -10191,7 +10215,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 = 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), 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]
   );
@@ -10341,8 +10365,8 @@ const Table$2 = withDynamicSchemaProps(
         "loading",
         "onClickRow",
         "value"
-      ]), y = useArrayField$1(S), v = useFieldSchema(), { size: I = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, F = useCollection(), T = ((be = v == null ? void 0 : v.parent) == null ? void 0 : be["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: B, enableIndexColumn: $ } = T, L = useMemoizedFn(S.onRowDragEnd || (() => {
-      })), j = usePaginationProps$3(n, a, e), w = useTableColumns$2(S, j), [O, N] = useState(() => D ? B : []), [k, M] = useState(((Se = y == null ? void 0 : y.data) == null ? void 0 : Se.selectedRowKeys) || []), [q, E] = useState([]), V = (p == null ? void 0 : p.type) !== "none", H = useRef(/* @__PURE__ */ new Map()), U = useMemo(() => css`
+      ]), y = useArrayField$1(S), v = useFieldSchema(), { size: I = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, F = useCollection(), T = ((be = v == null ? void 0 : v.parent) == null ? void 0 : be["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: B, enableIndexColumn: $ } = T, O = useMemoizedFn(S.onRowDragEnd || (() => {
+      })), j = usePaginationProps$3(n, a, e), w = useTableColumns$2(S, j), [L, N] = useState(() => D ? B : []), [k, M] = useState(((Se = y == null ? void 0 : y.data) == null ? void 0 : Se.selectedRowKeys) || []), [q, E] = useState([]), V = (p == null ? void 0 : p.type) !== "none", H = useRef(/* @__PURE__ */ new Map()), U = useMemo(() => css`
           & > td {
             background-color: ${t.controlItemBgActive} !important;
           }
@@ -10368,7 +10392,7 @@ const Table$2 = withDynamicSchemaProps(
       }), [C, q]);
       useDeepCompareEffect(() => {
         const Z = D ? B : [];
-        _.isEqual(Z, O) || N(Z);
+        _.isEqual(Z, L) || N(Z);
       }, [D, B]);
       const K = useCallback((Z) => {
         if (m)
@@ -10396,10 +10420,10 @@ const Table$2 = withDynamicSchemaProps(
             return;
           }
           const ie = (Pe = (ve = (ye = re.active) == null ? void 0 : ye.data.current) == null ? void 0 : ve.sortable) == null ? void 0 : Pe.index, ce = (Ae = (Ie = (Fe = re.over) == null ? void 0 : Fe.data.current) == null ? void 0 : Ie.sortable) == null ? void 0 : Ae.index, fe = (b == null ? void 0 : b[ie]) || re.active, Re = (b == null ? void 0 : b[ce]) || re.over;
-          y.move(ie, ce), L({ from: fe, to: Re });
+          y.move(ie, ce), O({ from: fe, to: Re });
         }, []);
         return /* @__PURE__ */ jsx(DndContext, { onDragEnd: oe, children: /* @__PURE__ */ jsx("tbody", x({}, Z)) });
-      }, [y, L]);
+      }, [y, O]);
       Q.displayName = "BodyWrapperComponent";
       const te = useMemo(() => ({
         header: {
@@ -10497,14 +10521,14 @@ const Table$2 = withDynamicSchemaProps(
         [q, Y, JSON.stringify(m)]
       ), ge = useCallback(
         (Z, oe) => {
-          const re = Z ? [...O, oe[F.getPrimaryKey()]] : O.filter((ie) => oe[F.getPrimaryKey()] !== ie);
+          const re = Z ? [...L, oe[F.getPrimaryKey()]] : L.filter((ie) => oe[F.getPrimaryKey()] !== ie);
           N(re), g == null || g(Z, oe);
         },
-        [O, g, F]
+        [L, g, F]
       ), xe = useMemo(() => ({
         onExpand: ge,
-        expandedRowKeys: O
-      }), [O, ge]);
+        expandedRowKeys: L
+      }), [L, ge]);
       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.
@@ -10685,22 +10709,22 @@ const InternalTableBlockProvider = (e) => {
   const t = useDataSourceManager(), n = useDataSource(), o = useCollectionManager(), r = e || (n == null ? void 0 : n.key) || void 0, [a, i] = useState(uid()), { refresh: l } = useSchemaComponentContext(), c = useMemo(
     () => {
       var w;
-      return (w = t == null ? void 0 : t.collectionFieldInterfaceManager) == null ? void 0 : w.getFieldInterfaces().reduce((O, N) => (O[N.name] = N, O), {});
+      return (w = t == null ? void 0 : t.collectionFieldInterfaceManager) == null ? void 0 : w.getFieldInterfaces().reduce((L, N) => (L[N.name] = N, L), {});
     },
     [t, a]
   ), u = useMemo(() => t == null ? void 0 : t.collectionTemplateManager.getCollectionTemplates(), [t, a]), d = useCallback(() => {
-    var w, O;
-    return (O = (w = t == null ? void 0 : t.getDataSource(r)) == null ? void 0 : w.collectionManager) == null ? void 0 : O.getCollections().map((N) => N.getOptions());
+    var w, L;
+    return (L = (w = t == null ? void 0 : t.getDataSource(r)) == null ? void 0 : w.collectionManager) == null ? void 0 : L.getCollections().map((N) => N.getOptions());
   }, [t, n]), p = useCallback(
     (w) => {
-      var O;
-      return o && !w ? o : (O = t == null ? void 0 : t.getDataSource(w || r)) == null ? void 0 : O.collectionManager;
+      var L;
+      return o && !w ? o : (L = t == null ? void 0 : t.getDataSource(w || r)) == null ? void 0 : L.collectionManager;
     },
     [o, t, r]
   ), m = useMemo(
     () => {
-      var w, O;
-      return (O = (w = t == null ? void 0 : t.getDataSource(DEFAULT_DATA_SOURCE_KEY)) == null ? void 0 : w.collectionManager) == null ? void 0 : O.getCollections();
+      var w, L;
+      return (L = (w = t == null ? void 0 : t.getDataSource(DEFAULT_DATA_SOURCE_KEY)) == null ? void 0 : w.collectionManager) == null ? void 0 : L.getCollections();
     },
     [t, a]
   ), h = useCallback(
@@ -10714,50 +10738,50 @@ const InternalTableBlockProvider = (e) => {
     }),
     [t]
   ), f = useCompile(), C = useCallback(
-    (w, O) => {
+    (w, L) => {
       var N, k;
-      return ((k = (N = p(O)) == null ? void 0 : N.getCollection(w)) == null ? void 0 : k.getInheritedFields()) || [];
+      return ((k = (N = p(L)) == null ? void 0 : N.getCollection(w)) == null ? void 0 : k.getInheritedFields()) || [];
     },
     [t, p]
   ), b = useCallback(
-    (w, O) => {
+    (w, L) => {
       var k, M;
       if (!w)
         return [];
-      const N = (k = p(O)) == null ? void 0 : k.getCollection(w);
+      const N = (k = p(L)) == null ? void 0 : k.getCollection(w);
       return ((M = N == null ? void 0 : N.getAllFields) == null ? void 0 : M.call(N)) || (N == null ? void 0 : N.getFields()) || [];
     },
     [t, p]
   ), S = useCallback(
-    (w, O) => {
+    (w, L) => {
       var N;
       if (!(!w || w.split(".").length < 2))
-        return (N = p(O)) == null ? void 0 : N.getCollectionField(w);
+        return (N = p(L)) == null ? void 0 : N.getCollectionField(w);
     },
     [t, p]
   ), y = useCallback(
-    (w, O) => {
+    (w, L) => {
       var N, k;
-      return w ? ((k = (N = p(O)) == null ? void 0 : N.getCollection(w)) == null ? void 0 : k.getParentCollectionsName()) || [] : [];
+      return w ? ((k = (N = p(L)) == null ? void 0 : N.getCollection(w)) == null ? void 0 : k.getParentCollectionsName()) || [] : [];
     },
     [t, p]
   ), v = useCallback(
-    (w, O = !1, N) => {
+    (w, L = !1, N) => {
       var q;
       if (!w)
         return [];
       const k = (q = p(N)) == null ? void 0 : q.getCollection(w);
-      return (k == null ? void 0 : k.getChildrenCollections(O)) || [];
+      return (k == null ? void 0 : k.getChildrenCollections(L)) || [];
     },
     [t, p]
   ), I = useCallback(
-    (w, O) => {
+    (w, L) => {
       var N, k;
-      return w ? ((k = (N = p(O)) == null ? void 0 : N.getCollection(w)) == null ? void 0 : k.getCurrentFields()) || [] : [];
+      return w ? ((k = (N = p(L)) == null ? void 0 : N.getCollection(w)) == null ? void 0 : k.getCurrentFields()) || [] : [];
     },
     [t, p]
   ), F = useCallback(
-    (w, O, N, k) => {
+    (w, L, N, k) => {
       var ee;
       const {
         association: M = !1,
@@ -10774,16 +10798,16 @@ const InternalTableBlockProvider = (e) => {
         return;
       if (q[w])
         return _.cloneDeep(q[w]);
-      O && typeof O == "string" && (O = [O]), N && typeof N == "string" && (N = [N]);
+      L && typeof L == "string" && (L = [L]), N && typeof N == "string" && (N = [N]);
       const K = b(w, J), X = (ee = K == null ? void 0 : K.filter(
-        (Q) => Q.interface && !U.includes(Q.interface) && (H || O && O.includes(Q.type) || N && N.includes(Q.interface) || (M && Q.target && Q.target !== w && Array.isArray(M) ? M.includes(Q.interface) : !1))
+        (Q) => Q.interface && !U.includes(Q.interface) && (H || L && L.includes(Q.type) || N && N.includes(Q.interface) || (M && Q.target && Q.target !== w && Array.isArray(M) ? M.includes(Q.interface) : !1))
       )) == null ? void 0 : ee.map((Q) => {
         var ne, se;
         const te = x({
           value: Y && G ? `${G}.${Q.name}` : Q.name,
           label: f((ne = Q == null ? void 0 : Q.uiSchema) == null ? void 0 : ne.title) || Q.name
         }, Q);
-        return M && Q.target && (te.children = E.includes(Q.target) ? [] : F(Q.target, O, N, P(x({}, k), {
+        return M && Q.target && (te.children = E.includes(Q.target) ? [] : F(Q.target, L, N, P(x({}, k), {
           cached: q,
           dataSource: J,
           collectionNames: [...E, Q.target],
@@ -10795,21 +10819,21 @@ const InternalTableBlockProvider = (e) => {
     },
     [b]
   ), R = useCallback(
-    (w, O) => {
+    (w, L) => {
       var N;
-      return (N = p(O)) == null ? void 0 : N.getCollection(w);
+      return (N = p(L)) == null ? void 0 : N.getCollection(w);
     },
     [t, p]
   ), T = useCallback(
-    (w, O) => {
+    (w, L) => {
       var N, k;
-      return (k = (N = p(O)) == null ? void 0 : N.getCollection(w)) == null ? void 0 : k.getAllCollectionsInheritChain();
+      return (k = (N = p(L)) == null ? void 0 : N.getCollection(w)) == null ? void 0 : k.getAllCollectionsInheritChain();
     },
     [t, p]
   ), D = useCallback(
-    (w, O) => () => {
+    (w, L) => () => {
       var N, k;
-      return (k = (N = p(O)) == null ? void 0 : N.getCollection(w)) == null ? void 0 : k.getInheritCollectionsChain();
+      return (k = (N = p(L)) == null ? void 0 : N.getCollection(w)) == null ? void 0 : k.getInheritCollectionsChain();
     },
     [t, p]
   ), B = useCallback(
@@ -10817,14 +10841,14 @@ const InternalTableBlockProvider = (e) => {
     [t]
   ), $ = useCallback(
     (w) => {
-      var O;
-      return (O = B(w.interface)) == null ? void 0 : O.titleUsable;
+      var L;
+      return (L = B(w.interface)) == null ? void 0 : L.titleUsable;
     },
     [B]
-  ), L = useCallback(
-    (w, O, N) => {
+  ), O = useCallback(
+    (w, L, N) => {
       var k, M;
-      return (M = (k = p(N)) == null ? void 0 : k.getCollection(O)) == null ? void 0 : M.getParentCollectionFields(w);
+      return (M = (k = p(N)) == null ? void 0 : k.getCollection(L)) == null ? void 0 : M.getParentCollectionFields(w);
     },
     [t, p]
   ), j = useCallback(
@@ -10839,7 +10863,7 @@ const InternalTableBlockProvider = (e) => {
     getTemplate: j,
     getInterface: B,
     getCollections: d,
-    getParentCollectionFields: L,
+    getParentCollectionFields: O,
     getInheritCollections: y,
     getChildrenCollections: v,
     refreshCM: g,
@@ -11050,14 +11074,14 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
 }, usePopupUtils = (e = {}) => {
   const t = useNavigateNoUpdate(), n = useLocationNoUpdate(), o = useFieldSchema(), r = useDataSourceKey(), a = useCollectionRecord(), i = useCollectionParentRecord(), l = useCollection(), c = useCollectionManager(), u = useAssociationName(), { visible: d, setVisible: p } = useContext(PopupVisibleProviderContext) || { visible: !1, setVisible: _.noop }, { params: m, currentLevel: h = 0 } = useCurrentPopupContext(), { getDataBlockRequest: g } = useDataBlockRequestGetter(), { isPopupVisibleControlledByURL: f } = usePopupSettings(), { setVisible: C } = useContext(ActionContext), { updatePopupContext: b } = usePopupContextInActionOrAssociationField(), S = useCurrentPopupContext(), y = useCallback(
     (w) => {
-      var O;
-      return (O = w || (i == null ? void 0 : i.data)) == null ? void 0 : O[c.getSourceKeyByAssociation(u)];
+      var L;
+      return (L = w || (i == null ? void 0 : i.data)) == null ? void 0 : L[c.getSourceKeyByAssociation(u)];
     },
     [i, u]
   ), v = useDataBlockRequestData(), I = useTableBlockContextBasicValue() || {}, F = e.setVisible || C, R = useCallback(
     ({
       tabKey: w,
-      popupUid: O,
+      popupUid: L,
       recordData: N,
       sourceId: k,
       collection: M,
@@ -11065,7 +11089,7 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
     }) => {
       const E = c.getFilterByTK(u || l, N);
       return getPopupPathFromParams({
-        popupuid: O,
+        popupuid: L,
         puid: q,
         collection: M,
         filterbytk: E,
@@ -11084,14 +11108,14 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
   }, [r, l, u]), D = useCallback(
     ({
       recordData: w,
-      parentRecordData: O,
+      parentRecordData: L,
       collectionNameUsedInURL: N,
       popupUidUsedInURL: k,
       customActionSchema: M
     } = {}) => {
       if (!f())
         return F == null ? void 0 : F(!0);
-      const q = M || o, E = q == null ? void 0 : q["x-uid"], V = y(O);
+      const q = M || o, E = q == null ? void 0 : q["x-uid"], V = y(L);
       w = w || (a == null ? void 0 : a.data);
       const H = R({
         popupUid: E,
@@ -11104,7 +11128,7 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
       if (_.last(U) === "/" && (U = U.slice(0, -1)), storePopupContext(E, {
         schema: q,
         record: new CollectionRecord({ isNew: !1, data: w }),
-        parentRecord: O ? new CollectionRecord({ isNew: !1, data: O }) : i,
+        parentRecord: L ? new CollectionRecord({ isNew: !1, data: L }) : i,
         service: g(),
         dataSource: r,
         collection: l == null ? void 0 : l.name,
@@ -11154,11 +11178,11 @@ ${JSON.stringify(q, null, 2)}`
     m == null ? void 0 : m.popupuid
   ]), $ = useCallback(
     (w) => {
-      const O = y(), N = R({
+      const L = y(), N = R({
         tabKey: w,
         popupUid: m == null ? void 0 : m.popupuid,
         recordData: a == null ? void 0 : a.data,
-        sourceId: O
+        sourceId: L
       });
       let k = removeLastPopupPath(n.pathname);
       _.last(k) === "/" && (k = k.slice(0, -1)), t(`${k}${N}`, {
@@ -11166,8 +11190,8 @@ ${JSON.stringify(q, null, 2)}`
       });
     },
     [R, t, m == null ? void 0 : m.popupuid, a == null ? void 0 : a.data, n]
-  ), L = useCallback((w, O) => {
-    O.__popup = w;
+  ), O = useCallback((w, L) => {
+    L.__popup = w;
   }, []), j = useCallback((w) => w.__popup, []);
   return {
     /**
@@ -11178,7 +11202,7 @@ ${JSON.stringify(q, null, 2)}`
      * used to close popup by changing the url
      */
     closePopup: B,
-    savePopupSchemaToSchema: L,
+    savePopupSchemaToSchema: O,
     getPopupSchemaFromSchema: j,
     context: S,
     /**
@@ -11974,20 +11998,18 @@ const designerCss$4 = ({ margin: e = "-18px -16px", padding: t = "18px 16px" } =
   }
 `, TableColumnActionBar$1 = observer$1(
   (e) => {
-    const t = useDesigner();
-    useFlag();
-    const { designable: n } = useSchemaComponentContext(), { token: o } = useToken$1();
-    return !n || t.isNullComponent ? e.children : /* @__PURE__ */ jsxs(
+    const t = useDesigner(), { isInSubTable: n } = useFlag() || {}, { designable: o } = useSchemaComponentContext(), { token: r } = useToken$1(), { name: a } = (useBlockContext == null ? void 0 : useBlockContext()) || {};
+    return !o || t.isNullComponent ? e.children : /* @__PURE__ */ jsx(
       SortableItem,
       {
         className: designerCss$4({
-          margin: `-${o.margin}px -${o.marginXS}px`,
-          padding: `${o.margin}px ${o.marginXS}px`
+          margin: `-${r.margin}px -${r.marginXS}px`,
+          padding: `${r.margin}px ${r.marginXS}px`
         }),
-        children: [
+        children: /* @__PURE__ */ jsxs(BlockContext.Provider, { value: { name: n ? a : "taleColumn" }, children: [
           /* @__PURE__ */ jsx(t, {}),
           e.children
-        ]
+        ] })
       }
     );
   },
@@ -12627,7 +12649,7 @@ const BaseVariableContext = React.createContext(null), BaseVariableProvider = (e
     return new Promise((T) => {
       setTimeout(() => {
         var $;
-        const B = (b && g(($ = I.field) == null ? void 0 : $.children) || getChildren$1(d(f(F, u, !0), I), {
+        const B = (b && F === "attachments" && g(($ = I.field) == null ? void 0 : $.children) || getChildren$1(d(f(F, u, !0), I), {
           collectionField: e,
           uiSchema: t,
           targetFieldSchema: n,
@@ -12639,7 +12661,7 @@ const BaseVariableContext = React.createContext(null), BaseVariableProvider = (e
           isDisabled: C || isDisabledDefault,
           getCollectionField: S.getCollectionField,
           deprecated: p
-        }) || []).sort((L, j) => L.isLeaf && !j.isLeaf ? -1 : !L.isLeaf && j.isLeaf ? 1 : 0).sort((L, j) => L.disabled && !j.disabled ? 1 : !L.disabled && j.disabled ? -1 : 0);
+        }) || []).sort((O, j) => O.isLeaf && !j.isLeaf ? -1 : !O.isLeaf && j.isLeaf ? 1 : 0).sort((O, j) => O.disabled && !j.disabled ? 1 : !O.disabled && j.disabled ? -1 : 0);
         if (B.length === 0) {
           I.disabled = !0, I.isLeaf = !0, T();
           return;
@@ -12998,7 +13020,7 @@ const DatePickerContext = React.createContext({ utc: !0 }), useDatePickerContext
           return B;
         },
         disabledMinutes: (B) => I && B === g.hour() ? C.filter(($) => $ < g.minute()) : F && B === f.hour() ? C.filter(($) => $ > f.minute()) : [],
-        disabledSeconds: (B, $) => I && B === g.hour() && $ === g.minute() ? C.filter((L) => L < g.second()) : F && B === f.hour() && $ === f.minute() ? C.filter((L) => L > f.second()) : []
+        disabledSeconds: (B, $) => I && B === g.hour() && $ === g.minute() ? C.filter((O) => O < g.second()) : F && B === f.hour() && $ === f.minute() ? C.filter((O) => O > f.second()) : []
       };
     };
     i(() => b), c(() => S);
@@ -13906,7 +13928,7 @@ const ParentCollectionProvider = (e) => {
     collectionField: e,
     noDisabled: r,
     targetFieldSchema: a
-  }), { settings: $, shouldDisplayParentPopupRecord: L } = useParentPopupVariable({
+  }), { settings: $, shouldDisplayParentPopupRecord: O } = useParentPopupVariable({
     schema: n,
     collectionField: e,
     noDisabled: r,
@@ -13917,7 +13939,7 @@ const ParentCollectionProvider = (e) => {
     collectionField: e,
     noDisabled: r,
     targetFieldSchema: a
-  }), { urlSearchParamsSettings: O, shouldDisplay: N } = useURLSearchParamsVariable();
+  }), { urlSearchParamsSettings: L, shouldDisplay: N } = useURLSearchParamsVariable();
   return [...useMemo(() => [
     p,
     m,
@@ -13930,8 +13952,8 @@ const ParentCollectionProvider = (e) => {
     T && R,
     w && j,
     B && D,
-    L && $,
-    N && O
+    O && $,
+    N && L
   ].filter(Boolean).filter(u), [
     p,
     m,
@@ -13950,7 +13972,7 @@ const ParentCollectionProvider = (e) => {
     B,
     D,
     N,
-    O
+    L
   ]), ...c.map(({ option: E }) => E)];
 }, VariableInput = (e) => {
   const {
@@ -13997,20 +14019,20 @@ const ParentCollectionProvider = (e) => {
       }));
     },
     [n, u]
-  ), L = m(
+  ), O = m(
     B(_.isEmpty(I) ? T : I, {
       value: t
     })
   );
   return useEffect(() => {
-    C == null || C(L);
+    C == null || C(O);
   }, [t, I]), /* @__PURE__ */ jsx(
     Variable.Input,
     {
       className: i,
       value: t,
       onChange: $,
-      scope: L,
+      scope: O,
       style: r,
       changeOnSelect: y,
       hideVariableButton: f,
@@ -14312,8 +14334,8 @@ const SchemaSettingsDateFormat = function(t) {
         (o.componentProps.picker || "date") !== D.picker && !m && o.value && (o.value = void 0, o.initialValue = void 0, n.default = void 0, B.default = void 0), B["x-component-props"] = o.componentProps || {}, n["x-component-props"] = x(x({}, o.componentProps || {}), D), B["x-component-props"] = n["x-component-props"], o.componentProps = n["x-component-props"];
         const $ = o.path.entire.split(".");
         $.pop();
-        const L = $.join(".");
-        o.query(`${L}.*[0:].${n.name}`).forEach((j) => {
+        const O = $.join(".");
+        o.query(`${O}.*[0:].${n.name}`).forEach((j) => {
           j.props.name === n.name && ((o.componentProps.picker || "date") !== D.picker && !m && (j.value = void 0, j.initialValue = void 0), j.setComponentProps(x({}, D)));
         }), r.emit("patch", {
           schema: B
@@ -14345,13 +14367,13 @@ const getActionContext = (e) => {
   T != null && T.target && (u = p(
     `${T.target}.${((E = (q = o["x-component-props"]) == null ? void 0 : q.fieldNames) == null ? void 0 : E.label) || "id"}`
   ));
-  const B = (T == null ? void 0 : T.interface) === "m2o" && findParentFieldSchema(o), $ = B && p(B == null ? void 0 : B["x-collection-field"]), L = useTableBlockContext(), j = (T == null ? void 0 : T.interface) === "m2m" || (T == null ? void 0 : T.interface) === "mbm" || ($ == null ? void 0 : $.type) === "hasMany" && (T == null ? void 0 : T.interface) === "m2o", w = useCallback(
+  const B = (T == null ? void 0 : T.interface) === "m2o" && findParentFieldSchema(o), $ = B && p(B == null ? void 0 : B["x-collection-field"]), O = useTableBlockContext(), j = (T == null ? void 0 : T.interface) === "m2m" || (T == null ? void 0 : T.interface) === "mbm" || ($ == null ? void 0 : $.type) === "hasMany" && (T == null ? void 0 : T.interface) === "m2o", w = useCallback(
     (V) => {
       const H = V.find((G) => G.value === "$nForm"), U = m(R);
       return !(U != null && U.length) && H && (H.children = formatVariableScop(v())), V;
     },
     [v, R]
-  ), O = useMemo(() => ({
+  ), L = useMemo(() => ({
     ArrayCollapse: ArrayCollapse$2,
     FormLayout,
     VariableInput: (V) => /* @__PURE__ */ jsx(
@@ -14423,7 +14445,7 @@ const getActionContext = (e) => {
     b,
     w,
     i,
-    L.collection,
+    O.collection,
     u,
     g
   ]), k = useCallback(
@@ -14443,7 +14465,7 @@ const getActionContext = (e) => {
     SchemaSettingsModalItem,
     {
       title: i("Set default value"),
-      components: O,
+      components: L,
       width: 800,
       schema: N,
       onSubmit: k,
@@ -15313,10 +15335,10 @@ const useGetFilterOptions = () => {
     };
   });
 }, TableColumnDesigner$1 = (e) => {
-  var $, L, j, w, O, N, k, M, q, E, V, H;
-  const { uiSchema: t, fieldSchema: n, collectionField: o } = e, { form: r } = useFormBlockContext(), { getInterface: a, getCollection: i } = useCollectionManager_deprecated(), l = useField(), { t: c } = useTranslation(), u = useFieldSchema(), { dn: d } = useDesignable(), p = (($ = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : $.fieldNames) || ((L = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : L.fieldNames), m = useLabelFields$1((j = o == null ? void 0 : o.target) != null ? j : o == null ? void 0 : o.targetCollection), h = useColorFields((w = o == null ? void 0 : o.target) != null ? w : o == null ? void 0 : o.targetCollection), g = a(o == null ? void 0 : o.interface), f = i(o == null ? void 0 : o.target), C = isFileCollection$2(f), b = ["QuickEdit", "FormItem"].includes(n["x-decorator"]), { currentMode: S } = useAssociationFieldContext(), { isAllowToSetDefaultValue: y } = useIsAllowToSetDefaultValue({ collectionField: o, fieldSchema: n }), v = ["datetime", "createdAt", "updatedAt"].includes(o == null ? void 0 : o.interface), I = ["obo", "oho", "o2o", "o2m", "m2m", "m2o", "snapshot"].includes(
+  var $, O, j, w, L, N, k, M, q, E, V, H;
+  const { uiSchema: t, fieldSchema: n, collectionField: o } = e, { form: r } = useFormBlockContext(), { getInterface: a, getCollection: i } = useCollectionManager_deprecated(), l = useField(), { t: c } = useTranslation(), u = useFieldSchema(), { dn: d } = useDesignable(), p = (($ = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : $.fieldNames) || ((O = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : O.fieldNames), m = useLabelFields$1((j = o == null ? void 0 : o.target) != null ? j : o == null ? void 0 : o.targetCollection), h = useColorFields((w = o == null ? void 0 : o.target) != null ? w : o == null ? void 0 : o.targetCollection), g = a(o == null ? void 0 : o.interface), f = i(o == null ? void 0 : o.target), C = isFileCollection$2(f), b = ["QuickEdit", "FormItem"].includes(n["x-decorator"]), { currentMode: S } = useAssociationFieldContext(), { isAllowToSetDefaultValue: y } = useIsAllowToSetDefaultValue({ collectionField: o, fieldSchema: n }), v = ["datetime", "createdAt", "updatedAt"].includes(o == null ? void 0 : o.interface), I = ["obo", "oho", "o2o", "o2m", "m2m", "m2o", "snapshot"].includes(
     o == null ? void 0 : o.interface
-  ), F = useFieldModeOptions({ fieldSchema: n }), R = ((O = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : O.mode) || "Select";
+  ), F = useFieldModeOptions({ fieldSchema: n }), R = ((L = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : L.mode) || "Select";
   let T = "editable";
   n["x-disabled"] === !0 && (T = "readonly"), n["x-read-pretty"] === !0 && (T = "read-pretty");
   const D = I && R === "Select", B = () => {
@@ -16675,8 +16697,8 @@ const useFormItemInitializerFields = (e) => {
       schema: S
     };
     return l == "Kanban" && (y.find = (D, B, $) => {
-      const L = findSchema(D, "x-component", l);
-      return findSchema(L, B, $);
+      const O = findSchema(D, "x-component", l);
+      return findSchema(O, B, $);
     }), y;
   });
 }, useFilterFormItemInitializerFields = (e) => {
@@ -17055,7 +17077,7 @@ const useFormItemInitializerFields = (e) => {
     ]
   })), [y, C == null ? void 0 : C.inherits, C == null ? void 0 : C.name, t, v, h]);
   return r ? useMemo(() => {
-    var L;
+    var O;
     const F = {
       name: "currentRecord",
       collectionName: C.name,
@@ -17126,7 +17148,7 @@ const useFormItemInitializerFields = (e) => {
     else if (I[0].children.length)
       if (l) {
         if (I[0].children.length <= 1)
-          return I[0].children = ((L = I[0].children[0]) == null ? void 0 : L.children) || [], I;
+          return I[0].children = ((O = I[0].children[0]) == null ? void 0 : O.children) || [], I;
         B = [F];
       } else
         B = [F, D];
@@ -17894,10 +17916,10 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
     t["x-settings"] || a,
     t["x-settings-props"]
   ), S = useGridRowContext(), y = useGridContext(), v = useDataSourceManager(), I = v == null ? void 0 : v.getDataSources(), F = useDataSource(), R = (I == null ? void 0 : I.length) > 1 && F, T = ["FormItem", "ReadPrettyFormItem"].includes(r == null ? void 0 : r.componentName) ? `${r == null ? void 0 : r.name} ${m("(Fields only)")}` : r == null ? void 0 : r.name, D = useMemo(() => {
-    var L;
+    var O;
     return {
       insertPosition: "afterEnd",
-      wrap: ((L = S == null ? void 0 : S.cols) == null ? void 0 : L.length) > 1 ? void 0 : gridRowColWrap,
+      wrap: ((O = S == null ? void 0 : S.cols) == null ? void 0 : O.length) > 1 ? void 0 : gridRowColWrap,
       Component: (j) => /* @__PURE__ */ jsx(
         PlusOutlined,
         P(x({}, j), {
@@ -17965,7 +17987,7 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
     container: g
   } = x(x({}, e), (t == null ? void 0 : t["x-toolbar-props"]) || {}), f = useCompile(), { draggable: C } = useContext(SchemaComponentContext), { componentCls: b, hashId: S } = useStyles$g(), { t: y } = useTranslation(), { getAriaLabel: v } = useGetAriaLabelOfDesigner(), I = useDataSourceManager(), F = I == null ? void 0 : I.getDataSources(), R = useDataSource(), T = (F == null ? void 0 : F.length) > 1 && R, D = useRefreshFieldSchema(), B = useRef(y("Reference template")), $ = useCallback(() => {
     D({ refreshParentSchema: !0 });
-  }, [D]), L = useMemo(() => {
+  }, [D]), O = useMemo(() => {
     if (n) {
       if (typeof n == "string")
         return [f(n)];
@@ -17975,7 +17997,7 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
   }, [n, t]), { render: j, exists: w } = useSchemaSettingsRender(
     r || (t == null ? void 0 : t["x-settings"]),
     t == null ? void 0 : t["x-settings-props"]
-  ), { render: O, exists: N } = useSchemaInitializerRender(
+  ), { render: L, exists: N } = useSchemaInitializerRender(
     o || (t == null ? void 0 : t["x-initializer"]),
     t == null ? void 0 : t["x-initializer-props"]
   ), k = useGridRowContext(), M = useGridContext(), q = useMemo(() => {
@@ -17997,10 +18019,10 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
     if (o === !1)
       return null;
     if (N)
-      return O(q);
+      return L(q);
     if (M != null && M.InitializerComponent || M != null && M.renderSchemaInitializer)
       return M != null && M.InitializerComponent ? /* @__PURE__ */ jsx(M.InitializerComponent, x({}, q)) : (K = M.renderSchemaInitializer) == null ? void 0 : K.call(M, q);
-  }, [M, o, q, N, O]), H = useMemo(() => r !== !1 && w ? j() : null, [w, j, r]), U = useRef(null), G = "hidden";
+  }, [M, o, q, N, L]), H = useMemo(() => r !== !1 && w ? j() : null, [w, j, r]), U = useRef(null), G = "hidden";
   useEffect(() => {
     const K = U.current;
     let X = K == null ? void 0 : K.parentElement;
@@ -18035,9 +18057,9 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
       className: cls(b, S, m, "schema-toolbar", G),
       style: Y,
       children: [
-        L && /* @__PURE__ */ jsx("div", { className: "toolbar-title", children: /* @__PURE__ */ jsxs(Space$1, { size: 2, children: [
-          /* @__PURE__ */ jsx("span", { className: "toolbar-title-tag", children: T ? `${f(T == null ? void 0 : T.displayName)} > ${L[0]}` : L[0] }, L[0]),
-          L[1] && /* @__PURE__ */ jsx("span", { className: "toolbar-title-tag", children: `${B.current}: ${`${L[1]}` || y("Untitled")}` })
+        O && /* @__PURE__ */ jsx("div", { className: "toolbar-title", children: /* @__PURE__ */ jsxs(Space$1, { size: 2, children: [
+          /* @__PURE__ */ jsx("span", { className: "toolbar-title-tag", children: T ? `${f(T == null ? void 0 : T.displayName)} > ${O[0]}` : O[0] }, O[0]),
+          O[1] && /* @__PURE__ */ jsx("span", { className: "toolbar-title-tag", children: `${B.current}: ${`${O[1]}` || y("Untitled")}` })
         ] }) }),
         /* @__PURE__ */ jsx("div", { className: cls("toolbar-icons", i), style: l, children: /* @__PURE__ */ jsxs(Space$1, { size: 3, align: "center", className: d, style: p, children: [
           E,
@@ -18268,8 +18290,8 @@ const useDragEnd = (e) => {
   const { refresh: t } = useDesignable(), n = useAPIClient(), { t: o } = useTranslation();
   return useCallback(
     (r) => {
-      var f, C, b, S, y, v, I, F, R, T, D, B, $, L, j;
-      const { active: a, over: i } = r, l = (C = (f = a == null ? void 0 : a.data) == null ? void 0 : f.current) == null ? void 0 : C.schema, c = (S = (b = i == null ? void 0 : i.data) == null ? void 0 : b.current) == null ? void 0 : S.schema, u = (v = (y = i == null ? void 0 : i.data) == null ? void 0 : y.current) == null ? void 0 : v.insertAdjacent, d = (F = (I = i == null ? void 0 : i.data) == null ? void 0 : I.current) == null ? void 0 : F.breakRemoveOn, p = (T = (R = i == null ? void 0 : i.data) == null ? void 0 : R.current) == null ? void 0 : T.wrapSchema, m = (B = (D = i == null ? void 0 : i.data) == null ? void 0 : D.current) == null ? void 0 : B.onSuccess, h = (j = (L = ($ = i == null ? void 0 : i.data) == null ? void 0 : $.current) == null ? void 0 : L.removeParentsIfNoChildren) != null ? j : !0;
+      var f, C, b, S, y, v, I, F, R, T, D, B, $, O, j;
+      const { active: a, over: i } = r, l = (C = (f = a == null ? void 0 : a.data) == null ? void 0 : f.current) == null ? void 0 : C.schema, c = (S = (b = i == null ? void 0 : i.data) == null ? void 0 : b.current) == null ? void 0 : S.schema, u = (v = (y = i == null ? void 0 : i.data) == null ? void 0 : y.current) == null ? void 0 : v.insertAdjacent, d = (F = (I = i == null ? void 0 : i.data) == null ? void 0 : I.current) == null ? void 0 : F.breakRemoveOn, p = (T = (R = i == null ? void 0 : i.data) == null ? void 0 : R.current) == null ? void 0 : T.wrapSchema, m = (B = (D = i == null ? void 0 : i.data) == null ? void 0 : D.current) == null ? void 0 : B.onSuccess, h = (j = (O = ($ = i == null ? void 0 : i.data) == null ? void 0 : $.current) == null ? void 0 : O.removeParentsIfNoChildren) != null ? j : !0;
       if (!l || !c) {
         e == null || e(r);
         return;
@@ -18421,29 +18443,29 @@ const breakRemoveOnGrid = (e) => e["x-component"] === "Grid", breakRemoveOnRow =
   }), [v, I] = useState([0, 0]);
   return useDndMonitor({
     onDragStart(D) {
-      var w, O, N;
-      const B = (N = (O = (w = D.active) == null ? void 0 : w.data) == null ? void 0 : O.current) == null ? void 0 : N.dividerRef;
+      var w, L, N;
+      const B = (N = (L = (w = D.active) == null ? void 0 : w.data) == null ? void 0 : L.current) == null ? void 0 : N.dividerRef;
       if (!B || !r)
         return;
       n.current = D.active.id;
-      const $ = B.current, L = $.previousElementSibling, j = $.nextElementSibling;
-      I([L.clientWidth, j.clientWidth]);
+      const $ = B.current, O = $.previousElementSibling, j = $.nextElementSibling;
+      I([O.clientWidth, j.clientWidth]);
     },
     onDragMove(D) {
       if (!r || !y)
         return;
       n.current === D.active.id && (n.current = n.current + "_move");
-      const B = l.current, $ = B.previousElementSibling, L = B.nextElementSibling;
-      $.style.width = `${v[0] + D.delta.x}px`, L.style.width = `${v[1] - D.delta.x}px`;
+      const B = l.current, $ = B.previousElementSibling, O = B.nextElementSibling;
+      $.style.width = `${v[0] + D.delta.x}px`, O.style.width = `${v[1] - D.delta.x}px`;
     },
     onDragEnd(D) {
       var N;
       if (!r || !n.current || (N = n.current) != null && N.startsWith(D.active.id) && !n.current.endsWith("_move") || v[0] <= 0 || v[1] <= 0 || (I([0, 0]), !h || !g))
         return;
-      const B = l.current, $ = B.previousElementSibling, L = B.nextElementSibling;
+      const B = l.current, $ = B.previousElementSibling, O = B.nextElementSibling;
       h["x-component-props"] = h["x-component-props"] || {}, g["x-component-props"] = g["x-component-props"] || {};
-      const j = B.clientWidth * (e.cols.length + 1) / e.cols.length, w = (100 * ($.getBoundingClientRect().width + j) / B.parentElement.clientWidth).toFixed(2), O = (100 * (L.getBoundingClientRect().width + j) / B.parentElement.clientWidth).toFixed(2);
-      _.set(h, "x-component-props.width", w), _.set(g, "x-component-props.width", O), o.emit("batchPatch", {
+      const j = B.clientWidth * (e.cols.length + 1) / e.cols.length, w = (100 * ($.getBoundingClientRect().width + j) / B.parentElement.clientWidth).toFixed(2), L = (100 * (O.getBoundingClientRect().width + j) / B.parentElement.clientWidth).toFixed(2);
+      _.set(h, "x-component-props.width", w), _.set(g, "x-component-props.width", L), o.emit("batchPatch", {
         schemas: [
           {
             "x-uid": h["x-uid"],
@@ -18757,8 +18779,8 @@ const useTableBlockProps = () => {
     ),
     onChange: useCallback(
       ({ current: S, pageSize: y }, v, I) => {
-        var B, $, L, j, w, O, N, k, M, q;
-        const F = (L = ($ = (B = t.parent) == null ? void 0 : B["x-decorator-props"]) == null ? void 0 : $.params) == null ? void 0 : L.sort, R = I.order ? I.order === "ascend" ? [I.field] : [`-${I.field}`] : F || a.dragSortBy, T = y || ((O = (w = (j = t.parent) == null ? void 0 : j["x-decorator-props"]) == null ? void 0 : w.params) == null ? void 0 : O.pageSize), D = P(x({}, (M = (k = (N = i.current) == null ? void 0 : N.service) == null ? void 0 : k.params) == null ? void 0 : M[0]), { page: S || 1, pageSize: T });
+        var B, $, O, j, w, L, N, k, M, q;
+        const F = (O = ($ = (B = t.parent) == null ? void 0 : B["x-decorator-props"]) == null ? void 0 : $.params) == null ? void 0 : O.sort, R = I.order ? I.order === "ascend" ? [I.field] : [`-${I.field}`] : F || a.dragSortBy, T = y || ((L = (w = (j = t.parent) == null ? void 0 : j["x-decorator-props"]) == null ? void 0 : w.params) == null ? void 0 : L.pageSize), D = P(x({}, (M = (k = (N = i.current) == null ? void 0 : N.service) == null ? void 0 : k.params) == null ? void 0 : M[0]), { page: S || 1, pageSize: T });
         R && (D.sort = R), (q = i.current) == null || q.service.run(D);
       },
       [t.parent]
@@ -18776,7 +18798,7 @@ const useTableBlockProps = () => {
           const B = I.find((E) => E.uid === D.uid);
           if (!B)
             return;
-          const $ = getSourceKey(T, B.field) || a.rowKey || "id", L = [S[$]], j = ((N = D.service.params) == null ? void 0 : N[0]) || {}, w = ((M = (k = D.service.params) == null ? void 0 : k[1]) == null ? void 0 : M.filters) || {};
+          const $ = getSourceKey(T, B.field) || a.rowKey || "id", O = [S[$]], j = ((N = D.service.params) == null ? void 0 : N[0]) || {}, w = ((M = (k = D.service.params) == null ? void 0 : k[1]) == null ? void 0 : M.filters) || {};
           if (v.includes(S[a.rowKey])) {
             if ((q = D.clearSelection) == null || q.call(D), D.dataLoadingMode === "manual")
               return D.clearData();
@@ -18786,19 +18808,19 @@ const useTableBlockProps = () => {
               $and: [
                 {
                   [B.field || a.rowKey]: {
-                    [B.field ? "$in" : "$eq"]: L
+                    [B.field ? "$in" : "$eq"]: O
                   }
                 }
               ]
             };
-          const O = mergeFilter([
+          const L = mergeFilter([
             ...Object.values(w).map((E) => removeNullCondition(E)),
             D.defaultFilter
           ]);
           return D.doFilter(
             P(x({}, j), {
               page: 1,
-              filter: O
+              filter: L
             }),
             { filters: w }
           );
@@ -19152,10 +19174,10 @@ const useTableSelectorParams = () => useContext(TableSelectorParamsContext), Tab
   var i, l, c, u, d, p, m, h, g, f, C, b, S, y, v, I;
   const e = useField(), t = useTableSelectorContext(), n = useFieldSchema(), { getCollectionJoinField: o } = useCollectionManager_deprecated(), r = recursiveParent(n, "CollectionField"), a = o(r == null ? void 0 : r["x-collection-field"]);
   return useEffect(() => {
-    var R, T, D, B, $, L, j, w, O, N, k, M, q;
+    var R, T, D, B, $, O, j, w, L, N, k, M, q;
     if (!((R = t == null ? void 0 : t.service) != null && R.loading)) {
       const E = (D = (T = t == null ? void 0 : t.service) == null ? void 0 : T.data) == null ? void 0 : D.data.map((V) => V);
-      e.value = E, (B = e == null ? void 0 : e.setInitialValue) == null || B.call(e, E), e.data = e.data || {}, e.data.selectedRowKeys = [], e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (j = (L = ($ = t == null ? void 0 : t.service) == null ? void 0 : $.data) == null ? void 0 : L.meta) == null ? void 0 : j.pageSize, e.componentProps.pagination.total = (N = (O = (w = t == null ? void 0 : t.service) == null ? void 0 : w.data) == null ? void 0 : O.meta) == null ? void 0 : N.count, e.componentProps.pagination.current = (q = (M = (k = t == null ? void 0 : t.service) == null ? void 0 : k.data) == null ? void 0 : M.meta) == null ? void 0 : q.page;
+      e.value = E, (B = e == null ? void 0 : e.setInitialValue) == null || B.call(e, E), e.data = e.data || {}, e.data.selectedRowKeys = [], e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (j = (O = ($ = t == null ? void 0 : t.service) == null ? void 0 : $.data) == null ? void 0 : O.meta) == null ? void 0 : j.pageSize, e.componentProps.pagination.total = (N = (L = (w = t == null ? void 0 : t.service) == null ? void 0 : w.data) == null ? void 0 : L.meta) == null ? void 0 : N.count, e.componentProps.pagination.current = (q = (M = (k = t == null ? void 0 : t.service) == null ? void 0 : k.data) == null ? void 0 : M.meta) == null ? void 0 : q.page;
     }
   }, [
     a == null ? void 0 : a.foreignKey,
@@ -20620,7 +20642,7 @@ const DynamicComponent$1 = (e) => {
 }, DateScopeComponent = (e) => {
   var g, f, C, b, S, y, v, I, F, R, T, D, B, $;
   const t = useFieldSchema(), { getCollectionJoinField: n } = useCollectionManager_deprecated(), o = n(t == null ? void 0 : t["x-collection-field"]) || {}, r = ((g = o == null ? void 0 : o.uiSchema) == null ? void 0 : g["x-component-props"].gmt) || !1, a = ((f = o == null ? void 0 : o.uiSchema) == null ? void 0 : f["x-component-props"].utc) || !1, { form: i } = useFormBlockContext(), l = useRecord(), c = ((C = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : C.showTime) || ((S = (b = o == null ? void 0 : o.uiSchema) == null ? void 0 : b["x-component-props"]) == null ? void 0 : S.showTime) || !1, u = ((y = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : y.dateFormat) || ((I = (v = o == null ? void 0 : o.uiSchema) == null ? void 0 : v["x-component-props"]) == null ? void 0 : I.dateFormat) || "YYYY-MM-DD", d = ((F = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : F.timeFormat) || ((T = (R = o == null ? void 0 : o.uiSchema) == null ? void 0 : R["x-component-props"]) == null ? void 0 : T.timeFormat) || "HH:mm:ss", p = ((D = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : D.picker) || (($ = (B = o == null ? void 0 : o.uiSchema) == null ? void 0 : B["x-component-props"]) == null ? void 0 : $.picker) || "date", m = useCallback(
-    (L) => /* @__PURE__ */ jsx(
+    (O) => /* @__PURE__ */ jsx(
       SchemaComponent,
       {
         schema: {
@@ -20646,9 +20668,9 @@ const DynamicComponent$1 = (e) => {
     ),
     [u, r, p, c, d, a]
   ), h = useCallback(
-    (L) => /* @__PURE__ */ jsx(FlagProvider, { collectionField: o, children: /* @__PURE__ */ jsx(
+    (O) => /* @__PURE__ */ jsx(FlagProvider, { collectionField: o, children: /* @__PURE__ */ jsx(
       VariableInput,
-      P(x({}, L), {
+      P(x({}, O), {
         form: i,
         record: l,
         noDisabled: !0,
@@ -21874,21 +21896,21 @@ const SchemaSettingsSwitchItem = (e) => {
   }, [D]), $ = useCallback(() => z(void 0, null, function* () {
     yield D.submit();
     try {
-      const O = D.values, N = Object.keys(O).reduce((k, M) => (D.query(M).take() && (k[M] = O[M]), k), {});
+      const L = D.values, N = Object.keys(L).reduce((k, M) => (D.query(M).take() && (k[M] = L[M]), k), {});
       h(!1), yield n == null ? void 0 : n(cloneDeep$1(N));
-    } catch (O) {
-      console.error(O);
+    } catch (L) {
+      console.error(L);
     }
-  }), [D, n]), L = useCallback(() => z(void 0, null, function* () {
+  }), [D, n]), O = useCallback(() => z(void 0, null, function* () {
     !g && (i != null && i["x-uid"]) && (b["x-action-settings"].schemaUid = i["x-uid"], y.emit("patch", { schema: b }), yield I.resource("uiSchemas").insert({ values: i }), f(i["x-uid"])), typeof a == "function" && (a == null || a()), S.setVisible(!1), h(!0);
-  }), [I, S, y, b, i, g]), j = useCallback((O) => O.stopPropagation(), []);
+  }), [I, S, y, b, i, g]), j = useCallback((L) => L.stopPropagation(), []);
   return /* @__PURE__ */ jsxs(zIndexContext.Provider, { value: T, children: [
     /* @__PURE__ */ jsx(
       SchemaSettingsItem,
       P(x({
         title: v(t)
       }, p), {
-        onClick: L,
+        onClick: O,
         onKeyDown: j,
         children: e.children || e.title
       })
@@ -21948,7 +21970,7 @@ const SchemaSettingsModalItem = (e) => {
     "noRecord",
     "ModalContextProvider",
     "dialogRootClassName"
-  ]), g = useContext(SchemaOptionsContext), f = useCollection(), C = useAPIClient(), b = useApp(), { theme: S } = useGlobalTheme(), y = useBlockRequestContext(), v = useFormActiveFields(), { locale: I } = useContext(ConfigProvider.ConfigContext), F = useDataSourceManager(), R = useDataSourceKey(), T = useCollectionRecord(), { association: D } = useDataBlockProps() || {}, B = useCurrentRecord(), $ = useFormBlockContext(), L = useBlockContext(), { getOperators: j } = useOperators(), w = useLocationSearch(), O = useVariables$1(), N = useContext(AllDataBlocksContext), k = useContext(SchemaComponentContext), M = useContext(VariableScopeContext$1), { formValue: q, collection: E, parent: V } = useSubFormValue(), H = useCurrentPopupRecord(), U = useParentPopupRecord();
+  ]), g = useContext(SchemaOptionsContext), f = useCollection(), C = useAPIClient(), b = useApp(), { theme: S } = useGlobalTheme(), y = useBlockRequestContext(), v = useFormActiveFields(), { locale: I } = useContext(ConfigProvider.ConfigContext), F = useDataSourceManager(), R = useDataSourceKey(), T = useCollectionRecord(), { association: D } = useDataBlockProps() || {}, B = useCurrentRecord(), $ = useFormBlockContext(), O = useBlockContext(), { getOperators: j } = useOperators(), w = useLocationSearch(), L = useVariables$1(), N = useContext(AllDataBlocksContext), k = useContext(SchemaComponentContext), M = useContext(VariableScopeContext$1), { formValue: q, collection: E, parent: V } = useSubFormValue(), H = useCurrentPopupRecord(), U = useParentPopupRecord();
   return t ? null : /* @__PURE__ */ jsx(
     SchemaSettingsItem,
     P(x({
@@ -21958,7 +21980,7 @@ const SchemaSettingsModalItem = (e) => {
         const Y = l ? yield l() : c, J = _.isFunction(e.schema) ? e.schema() : e.schema;
         FormDialog(
           { title: J.title || n, width: u, rootClassName: m },
-          () => /* @__PURE__ */ jsx(VariableScopeContext$1.Provider, { value: M, children: /* @__PURE__ */ jsx(SchemaComponentContext.Provider, { value: k, children: /* @__PURE__ */ jsx(AllDataBlocksContext.Provider, { value: N, children: /* @__PURE__ */ jsx(p, { children: /* @__PURE__ */ jsx(CollectOperators, { defaultOperators: j(), children: /* @__PURE__ */ jsx(VariablesContext.Provider, { value: O, children: /* @__PURE__ */ jsx(BlockContext.Provider, { value: L, children: /* @__PURE__ */ jsx(
+          () => /* @__PURE__ */ jsx(VariableScopeContext$1.Provider, { value: M, children: /* @__PURE__ */ jsx(SchemaComponentContext.Provider, { value: k, children: /* @__PURE__ */ jsx(AllDataBlocksContext.Provider, { value: N, children: /* @__PURE__ */ jsx(p, { children: /* @__PURE__ */ jsx(CollectOperators, { defaultOperators: j(), children: /* @__PURE__ */ jsx(VariablesContext.Provider, { value: L, children: /* @__PURE__ */ jsx(BlockContext.Provider, { value: O, children: /* @__PURE__ */ jsx(
             VariablePopupRecordProvider,
             {
               recordData: H == null ? void 0 : H.value,
@@ -22168,11 +22190,11 @@ const SchemaSettingsModalItem = (e) => {
       }
     }),
     [n, c, u, y, g, f, p, h, T, r]
-  ), L = useMemo(() => ({ ArrayCollapse: ArrayCollapse$2, FormLayout }), []), j = useCallback(
-    (O) => {
+  ), O = useMemo(() => ({ ArrayCollapse: ArrayCollapse$2, FormLayout }), []), j = useCallback(
+    (L) => {
       var E;
       const N = [];
-      for (const V of O.fieldReaction.rules)
+      for (const V of L.fieldReaction.rules)
         N.push(_.omit(_.pickBy(V, _.identity), ["conditionBasic", "conditionAdvanced"]));
       const k = y["x-component"] === "BlockTemplate" && ((E = y["x-component-props"]) == null ? void 0 : E.templateId), q = {
         "x-uid": b !== LinkageRuleCategory.block ? k && m(k).uid || y["x-uid"] : c["x-uid"]
@@ -22187,11 +22209,11 @@ const SchemaSettingsModalItem = (e) => {
     SchemaSettingsModalItem,
     {
       title: D,
-      components: L,
+      components: O,
       width: 960,
       schema: $,
       onSubmit: j,
-      ModalContextProvider: (O) => /* @__PURE__ */ jsx(FlagProvider, P(x({}, B), { children: O.children }))
+      ModalContextProvider: (L) => /* @__PURE__ */ jsx(FlagProvider, P(x({}, B), { children: L.children }))
     }
   );
 }, useDataTemplates = (e) => {
@@ -23322,9 +23344,9 @@ function Input$1(e) {
     "constantAbel"
   ]), f = typeof e.scope == "function" ? e.scope() : e.scope, { wrapSSR: C, hashId: b, componentCls: S, rootPrefixCls: y } = useStyles$d({ hideVariableButton: m });
   useAntdInputStyle(`${y}-input`);
-  const v = useCompile(), { t: I } = useTranslation(), F = useForm(), [R, T] = React.useState([]), [D, B] = React.useState([]), [$, L] = React.useState(
+  const v = useCompile(), { t: I } = useTranslation(), F = useForm(), [R, T] = React.useState([]), [D, B] = React.useState([]), [$, O] = React.useState(
     m || !!(o && t != null)
-  ), j = useMemo(() => parseValue(t, p), [p, t]), w = typeof j == "string", O = w ? j : "", N = w ? null : j, k = Object.assign(
+  ), j = useMemo(() => parseValue(t, p), [p, t]), w = typeof j == "string", L = w ? j : "", N = w ? null : j, k = Object.assign(
     {
       label: "label",
       value: "value",
@@ -23336,9 +23358,9 @@ function Input$1(e) {
     label: I("Constant"),
     [k.value]: "$",
     [k.label]: I("Constant")
-  } : a ? getTypedConstantOption(O, a, k) : null : null, [O, a]), q = (K = M == null ? void 0 : M.component) != null ? K : NullComponent, E = Array.isArray(a) ? (ee = (X = a.find((Q) => Array.isArray(Q) && Q[0] === O)) == null ? void 0 : X[1]) != null ? ee : {} : {};
+  } : a ? getTypedConstantOption(L, a, k) : null : null, [L, a]), q = (K = M == null ? void 0 : M.component) != null ? K : NullComponent, E = Array.isArray(a) ? (ee = (X = a.find((Q) => Array.isArray(Q) && Q[0] === L)) == null ? void 0 : X[1]) != null ? ee : {} : {};
   let V;
-  t == null ? i ? o && $ ? V = ["$"] : V = [""] : o ? V = ["$"] : V = [" ", O] : V = o ? ["$"] : [" ", O], m && (V = ["$"]), useEffect(() => {
+  t == null ? i ? o && $ ? V = ["$"] : V = [""] : o ? V = ["$"] : V = [" ", L] : V = o ? ["$"] : [" ", L], m && (V = ["$"]), useEffect(() => {
     const se = M != null ? M : {}, { component: Q } = se, te = W(se, ["component"]), ne = [
       ...i ? [
         {
@@ -23371,24 +23393,24 @@ function Input$1(e) {
     (Q, te) => {
       var ne, se, ae;
       if (Q[0] === "$") {
-        L(!0), N && n(null, te);
+        O(!0), N && n(null, te);
         return;
       } else
-        L(!1);
+        O(!1);
       if (Q[0] === "") {
         n(null);
         return;
       }
       if (Q[0] === " ") {
-        Q[1] ? Q[1] !== O && n((ae = (se = (ne = ConstantTypes[Q[1]]) == null ? void 0 : ne.default) == null ? void 0 : se.call(ne)) != null ? ae : null, te) : N && n(null, te);
+        Q[1] ? Q[1] !== L && n((ae = (se = (ne = ConstantTypes[Q[1]]) == null ? void 0 : ne.default) == null ? void 0 : se.call(ne)) != null ? ae : null, te) : N && n(null, te);
         return;
       }
       n(`{{${Q.join(".")}}}`, te);
     },
-    [O, N, n]
+    [L, N, n]
   ), G = useCallback(() => {
     var Q;
-    if (L(!!o), (Q = M == null ? void 0 : M.children) != null && Q.length) {
+    if (O(!!o), (Q = M == null ? void 0 : M.children) != null && Q.length) {
       const te = M.children[0].default();
       return n(te);
     }
@@ -23772,7 +23794,7 @@ function TextArea(e) {
     [l, g]
   ), [S, y] = useState(!1), [v, I] = useState(!1), [F, R] = useState(() => renderHTML(p != null ? p : "", b, c)), [T, D] = useState([-1, 0, -1, 0]);
   useAntdInputStyle("ant-input");
-  const { token: B } = theme.useToken(), $ = c.join(" "), L = useCallback(
+  const { token: B } = theme.useToken(), $ = c.join(" "), O = useCallback(
     (V) => {
       var U;
       const H = getValue(V, c);
@@ -23820,15 +23842,15 @@ function TextArea(e) {
       const G = createVariableTagHTML(H.join("."), b);
       pasteHTML(U, G, {
         range: T
-      }), I(!0), D(getCurrentRange(U)), L(U);
+      }), I(!0), D(getCurrentRange(U)), O(U);
     },
-    [b, L, T]
+    [b, O, T]
   ), w = useCallback(
     function({ currentTarget: V }) {
-      S || (I(!0), D(getCurrentRange(V)), L(V));
+      S || (I(!0), D(getCurrentRange(V)), O(V));
     },
-    [S, L]
-  ), O = useCallback(function({ currentTarget: V }) {
+    [S, O]
+  ), L = useCallback(function({ currentTarget: V }) {
     D(getCurrentRange(V));
   }, []), N = useCallback(function(V) {
     V.key === "Enter" && V.preventDefault();
@@ -23836,9 +23858,9 @@ function TextArea(e) {
     y(!0);
   }, []), M = useCallback(
     ({ currentTarget: V }) => {
-      y(!1), I(!0), D(getCurrentRange(V)), L(V);
+      y(!1), I(!0), D(getCurrentRange(V)), O(V);
     },
-    [L]
+    [O]
   ), q = useCallback(
     function(V) {
       V.preventDefault();
@@ -23859,9 +23881,9 @@ function TextArea(e) {
           }
         }
       }).replace(/\n/g, " ");
-      I(!0), pasteHTML(V.currentTarget, U), D(getCurrentRange(V.currentTarget)), L(V.currentTarget);
+      I(!0), pasteHTML(V.currentTarget, U), D(getCurrentRange(V.currentTarget)), O(V.currentTarget);
     },
-    [L]
+    [O]
   ), E = e.disabled || C.disabled;
   return t(
     /* @__PURE__ */ jsxs(Fragment$1, { children: [
@@ -23912,7 +23934,7 @@ function TextArea(e) {
                 role: "button",
                 "aria-label": "textbox",
                 onInput: w,
-                onBlur: O,
+                onBlur: L,
                 onKeyDown: N,
                 onPaste: q,
                 onCompositionStart: k,
@@ -24372,7 +24394,20 @@ const GroupItem$1 = () => {
       Component: LinkMenuItem
     }
   ]
-}), useMenuTranslation = () => useTranslation("lm-desktop-routes"), components$5 = { TreeSelect: TreeSelect$1 }, toItems$2 = (e, { t, compile: n }) => {
+}), useMenuTranslation = () => useTranslation("lm-desktop-routes");
+function useDeleteRouteSchema(e = "uiSchemas") {
+  const t = useAPIClient(), n = useMemo(() => t.resource(e), [t, e]), { refresh: o } = useAllAccessDesktopRoutes();
+  return { deleteRouteSchema: useCallback(
+    (a) => z(this, null, function* () {
+      if (!a)
+        return;
+      const i = yield n[`remove/${a}`]();
+      return o(), i;
+    }),
+    [n, o]
+  ) };
+}
+const components$5 = { TreeSelect: TreeSelect$1 }, toItems$2 = (e, { t, compile: n }) => {
   var r;
   const o = [];
   for (const a of e) {
@@ -24413,7 +24448,7 @@ const GroupItem$1 = () => {
       }
     }
 }, RemoveRoute = () => {
-  const { t: e } = useTranslation(), { modal: t } = App.useApp(), { deleteRoute: n } = useNocoBaseRoutes(), o = useCurrentRoute(), { allAccessRoutes: r } = useAllAccessDesktopRoutes(), a = useNavigateNoUpdate(), i = useCurrentPageUid();
+  const { t: e } = useTranslation(), { modal: t } = App.useApp(), { deleteRoute: n } = useNocoBaseRoutes(), { deleteRouteSchema: o } = useDeleteRouteSchema(), r = useCurrentRoute(), { allAccessRoutes: a } = useAllAccessDesktopRoutes(), i = useNavigateNoUpdate(), l = useCurrentPageUid();
   return /* @__PURE__ */ jsx(
     SchemaSettingsItem,
     {
@@ -24424,10 +24459,10 @@ const GroupItem$1 = () => {
           title: e("Delete menu item"),
           content: e("Are you sure you want to delete it?"),
           onOk: () => z(void 0, null, function* () {
-            if ((o == null ? void 0 : o.id) != null && (yield n(o.id)), i !== (o == null ? void 0 : o.schemaUid) && !findRouteBySchemaUid(i, o == null ? void 0 : o.children))
+            if ((r == null ? void 0 : r.id) != null && (yield Promise.all([n(r.id), o(r.schemaUid)])), l !== (r == null ? void 0 : r.schemaUid) && !findRouteBySchemaUid(l, r == null ? void 0 : r.children))
               return;
-            const l = findPrevSibling(r, o), c = findNextSibling(r, o);
-            a(l || c ? `/admin/${(l == null ? void 0 : l.schemaUid) || (c == null ? void 0 : c.schemaUid)}` : "/");
+            const c = findPrevSibling(a, r), u = findNextSibling(a, r);
+            i(c || u ? `/admin/${(c == null ? void 0 : c.schemaUid) || (u == null ? void 0 : u.schemaUid)}` : "/");
           })
         });
       },
@@ -24909,27 +24944,7 @@ const LanguageSettings = () => {
       sort: 350
     }
   ]
-}), { evaluate } = evaluators.get("formula.js"), useEvaluatedExpression = (e) => {
-  const t = useVariables$1(), n = useLocalVariables$1(), [o, r] = useState();
-  return useEffect(() => {
-    z(void 0, null, function* () {
-      if (e == null || e === "") {
-        r(void 0);
-        return;
-      }
-      const { exp: i, scope: l } = yield replaceVariables(e, {
-        variables: t,
-        localVariables: n
-      });
-      try {
-        const c = evaluate(i, x({ now: () => (/* @__PURE__ */ new Date()).toString() }, l));
-        r(c);
-      } catch (c) {
-        console.error(c);
-      }
-    });
-  }, [t.parseVariable, e, n]), o;
-}, NocoBaseRouteContext = createContext(null);
+}), NocoBaseRouteContext = createContext(null);
 NocoBaseRouteContext.displayName = "NocoBaseRouteContext";
 const CurrentRouteProvider = memo(({ children: e, uid: t }) => {
   const { allAccessRoutes: n } = useAllAccessDesktopRoutes(), o = useMemo(() => findRouteBySchemaUid(t, n), [t, n]);
@@ -25063,10 +25078,10 @@ const LayoutContent = () => {
       const F = (D = t._route.options) == null ? void 0 : D.href, R = (B = t._route.options) == null ? void 0 : B.params, T = ($ = t._route.options) == null ? void 0 : $.openInNewWindow;
       I.preventDefault(), I.stopPropagation();
       try {
-        const L = yield n(F, R || []);
-        T !== !1 ? window.open(L, "_blank") : navigateWithinSelf(F, i, window.location.origin + l);
-      } catch (L) {
-        console.error(L), window.open(F, "_blank");
+        const O = yield n(F, R || []);
+        T !== !1 ? window.open(O, "_blank") : navigateWithinSelf(F, i, window.location.origin + l);
+      } catch (O) {
+        console.error(O), window.open(F, "_blank");
       }
     }),
     [n, t]
@@ -27022,7 +27037,7 @@ https://requirejs.org/docs/errors.html#` + e);
         G && !k.depMatched[H] && !q[U] && (getOwn(M, U) ? (k.defineDep(H, p[U]), k.check()) : $(G, M, q));
       }), q[E] = !0);
     }
-    function L() {
+    function O() {
       var k, M, q = i.waitSeconds * 1e3, E = q && o.startTime + q < (/* @__PURE__ */ new Date()).getTime(), V = [], H = [], U = !1, G = !0;
       if (!t) {
         if (t = !0, eachProp(c, function(Y) {
@@ -27038,7 +27053,7 @@ https://requirejs.org/docs/errors.html#` + e);
         G && each(H, function(Y) {
           $(Y, {}, {});
         }), (!E || M) && U && (isBrowser || isWebWorker) && !a && (a = setTimeout(function() {
-          a = 0, L();
+          a = 0, O();
         }, 50)), t = !1;
       }
     }
@@ -27210,7 +27225,7 @@ https://requirejs.org/docs/errors.html#` + e);
     function w(k, M, q, E) {
       k.detachEvent && !isOpera ? E && k.detachEvent(E, M) : k.removeEventListener(q, M, !1);
     }
-    function O(k) {
+    function L(k) {
       var M = k.currentTarget || k.srcElement;
       return w(M, o.onScriptLoad, "load", "onreadystatechange"), w(M, o.onScriptError, "error"), {
         node: M,
@@ -27286,7 +27301,7 @@ https://requirejs.org/docs/errors.html#` + e);
           return M.enableBuildCallback && V && isFunction(V) && (V.__requireJsBuild = !0), typeof E == "string" ? isFunction(V) ? T(makeError("requireargs", "Invalid require call"), H) : k && hasProp(r, E) ? r[E](l[k.id]) : req.get ? req.get(o, E, k, q) : (G = I(E, k, !1, !0), U = G.id, hasProp(p, U) ? p[U] : T(makeError("notloaded", 'Module name "' + U + '" has not been loaded yet for context: ' + e + (k ? "" : ". Use require([])")))) : (N(), o.nextTick(function() {
             N(), Y = F(I(null, k)), Y.skipMap = M.skipMap, Y.init(E, V, H, {
               enabled: !0
-            }), L();
+            }), O();
           }), q);
         }
         return mixin(q, {
@@ -27355,7 +27370,7 @@ https://requirejs.org/docs/errors.html#` + e);
             ));
           j([k, V.deps || [], V.exportsFn]);
         }
-        L();
+        O();
       },
       /**
        * Converts a module name to a file path. Supports cases where
@@ -27404,7 +27419,7 @@ https://requirejs.org/docs/errors.html#` + e);
       onScriptLoad: function(k) {
         if (k.type === "load" || readyRegExp.test((k.currentTarget || k.srcElement).readyState)) {
           interactiveScript = null;
-          var M = O(k);
+          var M = L(k);
           o.completeLoad(M.id);
         }
       },
@@ -27412,7 +27427,7 @@ https://requirejs.org/docs/errors.html#` + e);
        * Callback for script errors.
        */
       onScriptError: function(k) {
-        var M = O(k);
+        var M = L(k);
         if (!y(M.id)) {
           var q = [];
           return eachProp(l, function(E, V) {
@@ -29025,9 +29040,9 @@ const MarkdownVoidInner = withDynamicSchemaProps(
     const { isDarkTheme: t } = useGlobalTheme(), { componentCls: n, hashId: o } = useStyles$a({ isDarkTheme: t }), { content: r, className: a } = e, i = useField(), l = useFieldSchema(), { dn: c } = useDesignable(), { onSave: u, onCancel: d, form: p } = e, m = useCollectionRecord(), [h, g] = useState(""), f = useVariables$1(), C = useLocalVariables$1(), { engine: b } = (l == null ? void 0 : l["x-decorator-props"]) || {}, [S, y] = useState(!1), { t: v, i18n: I } = useTranslation(), F = useForm(), R = extractNFormPaths(r), [T, D] = useState(null);
     useEffect(() => {
       if (R.length > 0) {
-        const L = uid();
+        const O = uid();
         return setTimeout(() => {
-          F.addEffects(L, () => reaction(
+          F.addEffects(O, () => reaction(
             () => {
               const j = getValuesByPaths(F.values, R);
               return JSON.stringify(j);
@@ -29038,7 +29053,7 @@ const MarkdownVoidInner = withDynamicSchemaProps(
             { fireImmediately: !0, equals: isEqual }
           ));
         }), () => {
-          F.removeEffects(L);
+          F.removeEffects(O);
         };
       }
     }, []), useEffect(() => {
@@ -29068,13 +29083,13 @@ const MarkdownVoidInner = withDynamicSchemaProps(
         onCancel: () => {
           i.editable = !1, d == null || d();
         },
-        onSubmit: (L) => z(void 0, null, function* () {
+        onSubmit: (O) => z(void 0, null, function* () {
           var j;
-          i.editable = !1, (j = l["x-component-props"]) != null || (l["x-component-props"] = {}), l["x-component-props"].content = L, i.componentProps.content = L, u == null || u(l), c.emit("patch", {
+          i.editable = !1, (j = l["x-component-props"]) != null || (l["x-component-props"] = {}), l["x-component-props"].content = O, i.componentProps.content = O, u == null || u(l), c.emit("patch", {
             schema: {
               "x-uid": l["x-uid"],
               "x-component-props": {
-                content: L
+                content: O
               }
             }
           });
@@ -29242,8 +29257,8 @@ function useCollectValuesToSubmit() {
     }), S = {}, y = Object.keys(f).map((D) => z(this, null, function* () {
       const B = f[D], $ = a(D);
       if (isVariable$1(B)) {
-        const { value: L } = (yield p == null ? void 0 : p.parseVariable(B, m)) || {};
-        S[D] = transformVariableValue(L, { targetCollectionField: $ });
+        const { value: O } = (yield p == null ? void 0 : p.parseVariable(B, m)) || {};
+        S[D] = transformVariableValue(O, { targetCollectionField: $ });
       } else
         B !== "" && (S[D] = B);
     }));
@@ -29275,12 +29290,12 @@ const useCreateActionProps = () => {
   return {
     onClick() {
       return z(this, null, function* () {
-        var O, N;
-        const { onSuccess: F, skipValidator: R, triggerWorkflows: T } = (O = u == null ? void 0 : u["x-action-settings"]) != null ? O : {}, {
+        var L, N;
+        const { onSuccess: F, skipValidator: R, triggerWorkflows: T } = (L = u == null ? void 0 : u["x-action-settings"]) != null ? L : {}, {
           manualClose: D,
           redirecting: B,
           redirectTo: $,
-          successMessage: L,
+          successMessage: O,
           actionAfterSuccess: j
         } = F || {};
         R || (yield n.submit());
@@ -29299,16 +29314,16 @@ const useCreateActionProps = () => {
           if ($ && (M = yield getVariableValue($, {
             variables: y,
             localVariables: [...S, { name: "$record", ctx: new Proxy((N = k == null ? void 0 : k.data) == null ? void 0 : N.data, {}) }]
-          })), (j === "previous" || !j && B !== !0) && (a == null || a(!1)), i == null || i(!0), l == null || l(!1), d.data.loading = !1, d.data.data = k, !L) {
+          })), (j === "previous" || !j && B !== !0) && (a == null || a(!1)), i == null || i(!0), l == null || l(!1), d.data.loading = !1, d.data.data = k, !O) {
             message.success(h("Saved successfully")), yield resetFormCorrectly(n), (B && !j || j === "redirect") && M && (isURL(M) ? window.location.href = M : c(M));
             return;
           }
           D ? m.success({
-            title: p(L),
+            title: p(O),
             onOk: () => z(this, null, function* () {
               yield resetFormCorrectly(n), (B && !j || j === "redirect") && M && (isURL(M) ? window.location.href = M : c(M));
             })
-          }) : (message.success(p(L)), yield resetFormCorrectly(n), (B && !j || j === "redirect") && M && (isURL(M) ? window.location.href = M : c(M)));
+          }) : (message.success(p(O)), yield resetFormCorrectly(n), (B && !j || j === "redirect") && M && (isURL(M) ? window.location.href = M : c(M)));
         } catch (k) {
           d.data.loading = !1;
         }
@@ -29327,14 +29342,14 @@ const useCreateActionProps = () => {
           onSuccess: D,
           overwriteValues: B,
           skipValidator: $,
-          triggerWorkflows: L
-        } = (M = l == null ? void 0 : l["x-action-settings"]) != null ? M : {}, j = (q = a == null ? void 0 : a["x-component-props"]) == null ? void 0 : q.addChild, { successMessage: w } = D || {}, O = {}, N = Object.keys(T).map((G) => z(this, null, function* () {
+          triggerWorkflows: O
+        } = (M = l == null ? void 0 : l["x-action-settings"]) != null ? M : {}, j = (q = a == null ? void 0 : a["x-component-props"]) == null ? void 0 : q.addChild, { successMessage: w } = D || {}, L = {}, N = Object.keys(T).map((G) => z(this, null, function* () {
           const Y = T[G], J = d(G);
           if (isVariable$1(Y)) {
             const { value: K } = (yield C == null ? void 0 : C.parseVariable(Y, b)) || {};
-            O[G] = transformVariableValue(K, { targetCollectionField: J });
+            L[G] = transformVariableValue(K, { targetCollectionField: J });
           } else
-            Y !== "" && (O[G] = Y);
+            Y !== "" && (L[G] = Y);
         }));
         yield Promise.all(N), $ || (yield e.submit());
         const k = getFormValues({
@@ -29353,10 +29368,10 @@ const useCreateActionProps = () => {
         c.data = t.data || {}, c.data.loading = !0;
         try {
           const G = yield n[y]({
-            values: x(x(x({}, k), B), O),
+            values: x(x(x({}, k), B), L),
             filterKeys: v,
             // TODO(refactor): should change to inject by plugin
-            triggerWorkflows: L != null && L.length ? L.map((Y) => [Y.workflowKey, Y.context].filter(Boolean).join("!")).join(",") : void 0
+            triggerWorkflows: O != null && O.length ? O.map((Y) => [Y.workflowKey, Y.context].filter(Boolean).join("!")).join(",") : void 0
           });
           if (c.data.loading = !1, c.data.data = G, (U = (H = o == null ? void 0 : o.service) == null ? void 0 : H.refresh) == null || U.call(H), r == null || r(!1), i == null || i(!0), !w)
             return;
@@ -29465,7 +29480,7 @@ const useCreateActionProps = () => {
   return {
     onClick(f, C) {
       return z(this, null, function* () {
-        var w, O, N, k;
+        var w, L, N, k;
         const {
           assignedValues: b = {},
           onSuccess: S,
@@ -29486,7 +29501,7 @@ const useCreateActionProps = () => {
             q !== "" && (B[M] = q);
         }));
         yield Promise.all($), y === !1 && (yield l.submit());
-        const L = yield e.update({
+        const O = yield e.update({
           filterByTk: o,
           values: x({}, B),
           // TODO(refactor): should change to inject by plugin
@@ -29495,7 +29510,7 @@ const useCreateActionProps = () => {
         let j = R;
         R && (j = yield getVariableValue(R, {
           variables: u,
-          localVariables: [...d, { name: "$record", ctx: new Proxy((O = L == null ? void 0 : L.data) == null ? void 0 : O.data, {}) }]
+          localVariables: [...d, { name: "$record", ctx: new Proxy((L = O == null ? void 0 : O.data) == null ? void 0 : L.data, {}) }]
         })), (D === "previous" || !D && F !== !0) && (h == null || h(!1)), C && (C == null || C()), e instanceof TableFieldResource || (k = (N = t == null ? void 0 : t.service) == null ? void 0 : N.refresh) == null || k.call(N), T && (I ? c.success({
           title: i(T),
           onOk: () => z(this, null, function* () {
@@ -29518,7 +29533,7 @@ const useCreateActionProps = () => {
           assignedValues: T = {},
           onSuccess: D,
           updateMode: B
-        } = (M = a == null ? void 0 : a["x-action-settings"]) != null ? M : {}, { manualClose: $, redirecting: L, redirectTo: j, successMessage: w, actionAfterSuccess: O } = D || {};
+        } = (M = a == null ? void 0 : a["x-action-settings"]) != null ? M : {}, { manualClose: $, redirecting: O, redirectTo: j, successMessage: w, actionAfterSuccess: L } = D || {};
         m.data = e.data || {}, m.data.loading = !0;
         const N = {}, k = Object.keys(T).map((E) => z(this, null, function* () {
           const V = T[E], H = C(E);
@@ -29528,7 +29543,7 @@ const useCreateActionProps = () => {
           } else
             V !== "" && (N[E] = V);
         }));
-        yield Promise.all(k), (O === "previous" || !O && L !== !0) && (S == null || S(!1)), h.confirm({
+        yield Promise.all(k), (L === "previous" || !L && O !== !0) && (S == null || S(!1)), h.confirm({
           title: p("Bulk update"),
           content: p(B === "selected" ? "Update selected data?" : "Update all data?"),
           onOk() {
@@ -29556,9 +29571,9 @@ const useCreateActionProps = () => {
               t instanceof TableFieldResource || (Y = (G = n == null ? void 0 : n.service) == null ? void 0 : G.refresh) == null || Y.call(G), w && ($ ? h.success({
                 title: d(w),
                 onOk: () => z(this, null, function* () {
-                  (L && !O || O === "redirect") && j && (isURL(j) ? window.location.href = j : u(j));
+                  (O && !L || L === "redirect") && j && (isURL(j) ? window.location.href = j : u(j));
                 })
-              }) : (message.success(d(w)), (L && !O || O === "redirect") && j && (isURL(j) ? window.location.href = j : u(j))));
+              }) : (message.success(d(w)), (O && !L || L === "redirect") && j && (isURL(j) ? window.location.href = j : u(j))));
             });
           },
           onCancel() {
@@ -29577,11 +29592,11 @@ const useCreateActionProps = () => {
     onClick() {
       return z(this, null, function* () {
         var E, V, H, U;
-        const { skipValidator: F, onSuccess: R, requestSettings: T } = (E = o == null ? void 0 : o["x-action-settings"]) != null ? E : {}, { manualClose: D, redirecting: B, redirectTo: $, successMessage: L, actionAfterSuccess: j } = R || {}, w = o == null ? void 0 : o["x-action"];
+        const { skipValidator: F, onSuccess: R, requestSettings: T } = (E = o == null ? void 0 : o["x-action-settings"]) != null ? E : {}, { manualClose: D, redirecting: B, redirectTo: $, successMessage: O, actionAfterSuccess: j } = R || {}, w = o == null ? void 0 : o["x-action"];
         if (!T.url)
           return;
         F !== !0 && w === "customize:form:request" && (yield a.submit());
-        const O = T.headers ? JSON.parse(T.headers) : {}, N = T.params ? JSON.parse(T.params) : {}, k = T.data ? JSON.parse(T.data) : {};
+        const L = T.headers ? JSON.parse(T.headers) : {}, N = T.params ? JSON.parse(T.params) : {}, k = T.data ? JSON.parse(T.data) : {};
         if (w === "customize:form:request" && ["POST", "PUT", "PATCH"].includes(T.method)) {
           const G = i.map((J) => J.name), Y = getFormValues({
             filterByTk: n,
@@ -29597,18 +29612,18 @@ const useCreateActionProps = () => {
         const q = {
           url: renderTemplate(T.url, { currentRecord: m, currentUser: g }),
           method: T.method,
-          headers: parse(O)({ currentRecord: m, currentUser: g }),
+          headers: parse(L)({ currentRecord: m, currentUser: g }),
           params: parse(N)({ currentRecord: m, currentUser: g }),
           data: parse(k)({ currentRecord: m, currentUser: g })
         };
         f.data = c.data || {}, f.data.loading = !0;
         try {
-          yield e.request(x({}, q)), f.data.loading = !1, u instanceof TableFieldResource || (H = (V = d == null ? void 0 : d.service) == null ? void 0 : V.refresh) == null || H.call(V), (U = p == null ? void 0 : p.refresh) == null || U.call(p), w === "customize:form:request" && (j === "previous" || !j && B !== !0) && (b == null || b(!1)), L || (message.success(C("Saved successfully")), yield resetFormCorrectly(a), (B && !j || j === "redirect") && $ && (isURL($) ? window.location.href = $ : t($))), D ? S.success({
-            title: r(L),
+          yield e.request(x({}, q)), f.data.loading = !1, u instanceof TableFieldResource || (H = (V = d == null ? void 0 : d.service) == null ? void 0 : V.refresh) == null || H.call(V), (U = p == null ? void 0 : p.refresh) == null || U.call(p), w === "customize:form:request" && (j === "previous" || !j && B !== !0) && (b == null || b(!1)), O || (message.success(C("Saved successfully")), yield resetFormCorrectly(a), (B && !j || j === "redirect") && $ && (isURL($) ? window.location.href = $ : t($))), D ? S.success({
+            title: r(O),
             onOk: () => z(this, null, function* () {
               (B && !j || j === "redirect") && $ && (isURL($) ? window.location.href = $ : t($));
             })
-          }) : message.success(r(L));
+          }) : message.success(r(O));
         } finally {
           f.data.loading = !1;
         }
@@ -29628,10 +29643,10 @@ const useCreateActionProps = () => {
           skipValidator: B,
           triggerWorkflows: $
         } = (V = l == null ? void 0 : l["x-action-settings"]) != null ? V : {}, {
-          manualClose: L,
+          manualClose: O,
           redirecting: j,
           redirectTo: w,
-          successMessage: O,
+          successMessage: L,
           actionAfterSuccess: N
         } = T || {}, k = {}, M = Object.keys(R).map((U) => z(this, null, function* () {
           const G = R[U], Y = d(U);
@@ -29666,14 +29681,14 @@ const useCreateActionProps = () => {
           if (w && (G = yield getVariableValue(w, {
             variables: b,
             localVariables: [...S, { name: "$record", ctx: new Proxy((H = U == null ? void 0 : U.data) == null ? void 0 : H.data, {}) }]
-          })), (N === "previous" || !N && j !== !0) && (a == null || a(!1)), i == null || i(!1), !O)
+          })), (N === "previous" || !N && j !== !0) && (a == null || a(!1)), i == null || i(!1), !L)
             return;
-          L ? f.success({
-            title: m(O),
+          O ? f.success({
+            title: m(L),
             onOk: () => z(this, null, function* () {
               yield e.reset(), (j && !N || N === "redirect") && G && (isURL(G) ? window.location.href = G : c(G));
             })
-          }) : (message.success(m(O)), (j && !N || N === "redirect" || N === "redirect") && G && (isURL(G) ? window.location.href = G : c(G)));
+          }) : (message.success(m(L)), (j && !N || N === "redirect" || N === "redirect") && G && (isURL(G) ? window.location.href = G : c(G)));
         } catch (U) {
           h.data.loading = !1;
         }
@@ -29864,7 +29879,7 @@ const useCreateActionProps = () => {
   var n;
   return ["select", "multipleSelect", "checkbox", "checkboxGroup", "chinaRegion"].includes(e == null ? void 0 : e.interface) && ((n = e == null ? void 0 : e.uiSchema) == null ? void 0 : n.enum);
 }, useAssociationFilterBlockProps = () => {
-  var v, I, F, R, T, D, B, $, L, j;
+  var v, I, F, R, T, D, B, $, O, j;
   const e = AssociationFilter.useAssociationField(), t = useFieldSchema(), n = useOptionalFieldList(), { getDataBlocks: o } = useFilterBlock(), r = e == null ? void 0 : e.name, a = useField(), { props: i } = useBlockRequestContext(), l = useDataSourceHeaders(i == null ? void 0 : i.dataSource), c = useCollectionManager(), { filter: u, parseVariableLoading: d } = useParsedFilter({ filterOption: (I = (v = a.componentProps) == null ? void 0 : v.params) == null ? void 0 : I.filter });
   let p, m, h, g, f, C, b, S;
   C = e != null && e.target ? (F = c == null ? void 0 : c.getCollection(e.target)) == null ? void 0 : F.getPrimaryKey() : "id", b = ((T = (R = t["x-component-props"]) == null ? void 0 : R.fieldNames) == null ? void 0 : T.label) || C, { data: f, params: h, run: g } = useRequest(
@@ -29893,15 +29908,15 @@ const useCreateActionProps = () => {
     g,
     C,
     (B = a.componentProps) == null ? void 0 : B.params,
-    (L = ($ = a.componentProps) == null ? void 0 : $.params) == null ? void 0 : L.sort,
+    (O = ($ = a.componentProps) == null ? void 0 : $.params) == null ? void 0 : O.sort,
     d
   ]);
   const y = useCallback(
     (w) => {
-      const { targets: O, uid: N } = findFilterTargets(t);
+      const { targets: L, uid: N } = findFilterTargets(t);
       o().forEach((k) => {
         var U, G, Y, J;
-        if (!O.find((K) => K.uid === k.uid))
+        if (!L.find((K) => K.uid === k.uid))
           return;
         const q = `${N}${t.name}`, E = ((U = k.service.params) == null ? void 0 : U[0]) || {};
         (Y = (G = k.service.params) == null ? void 0 : G[1]) != null && Y.filters || _.set(k.service.params, "[1].filters", {});
@@ -29930,14 +29945,14 @@ const useCreateActionProps = () => {
   if (!e)
     return {};
   if (isOptionalField(e)) {
-    const w = n.find((k) => k.name === t.name), O = {
+    const w = n.find((k) => k.name === t.name), L = {
       select: "$in",
       multipleSelect: "$anyOf",
       checkbox: "$in",
       checkboxGroup: "$anyOf"
     }, N = ((j = w == null ? void 0 : w.uiSchema) == null ? void 0 : j.enum) || [];
     C = "value", b = "label", p = N, h = {}, g = () => {
-    }, S = `${w.name}.${O[w.interface]}`, m = (k) => {
+    }, S = `${w.name}.${L[w.interface]}`, m = (k) => {
       const M = k.target.value;
       if (!M) {
         p = N;
@@ -30234,35 +30249,35 @@ const useSyncFromForm = (e, t, n) => {
       const $ = {
         type: "duplicate",
         tag: c((w = B.uiSchema) == null ? void 0 : w.title) || B.name
-      }, L = P(x({}, $), {
+      }, O = P(x({}, $), {
         title: React.createElement(TreeNode, $),
         key: v ? `${v}.${B.name}` : B.name,
         isLeaf: !0,
         field: B,
         disabled: I
-      }), j = F.find((O) => O.name === L.key);
+      }), j = F.find((L) => L.name === O.key);
       if (["belongsTo", "belongsToMany"].includes(B.type) && (!j || ["Select", "Picker"].includes(j == null ? void 0 : j.fieldMode)))
-        $.type = "reference", L.type = "reference", L.title = React.createElement(TreeNode, P(x({}, $), { type: "reference" })), L.isLeaf = !1, L.children = m(B.target, {
+        $.type = "reference", O.type = "reference", O.title = React.createElement(TreeNode, P(x({}, $), { type: "reference" })), O.isLeaf = !1, O.children = m(B.target, {
           depth: S + 1,
           maxDepth: y,
-          prefix: L.key,
+          prefix: O.key,
           exclude: systemKeys
         });
       else if (["hasOne", "hasMany"].includes(B.type) || ["Nester", "SubTable"].includes(j == null ? void 0 : j.fieldMode)) {
-        let O = !1;
-        ["hasOne", "hasMany"].includes(B.type) && ["Select", "Picker"].includes(j == null ? void 0 : j.fieldMode) && (O = !0), L.disabled = !0, L.isLeaf = !1, L.children = p(
+        let L = !1;
+        ["hasOne", "hasMany"].includes(B.type) && ["Select", "Picker"].includes(j == null ? void 0 : j.fieldMode) && (L = !0), O.disabled = !0, O.isLeaf = !1, O.children = p(
           B.target,
           {
             depth: S + 1,
             maxDepth: y,
-            prefix: L.key,
+            prefix: O.key,
             exclude: ["id", ...systemKeys],
-            disabled: O
+            disabled: L
           },
           F
         );
       }
-      return L;
+      return O;
     }).filter(Boolean);
     return f.set(R, D), D;
   })(new LRUCache({ max: 100 })), m = /* @__PURE__ */ ((f) => (C, { prefix: b, maxDepth: S, depth: y = 0, exclude: v = [] }) => {
@@ -30272,7 +30287,7 @@ const useSyncFromForm = (e, t, n) => {
     if (y > S)
       return [];
     const R = r(C).map((T) => {
-      var $, L;
+      var $, O;
       if (!T.target || !T.interface || v.includes(T.name))
         return;
       const D = {
@@ -30281,7 +30296,7 @@ const useSyncFromForm = (e, t, n) => {
       }, B = b ? `${b}.${T.name}` : T.name;
       return {
         type: "preloading",
-        tag: c((L = T.uiSchema) == null ? void 0 : L.title) || T.name,
+        tag: c((O = T.uiSchema) == null ? void 0 : O.title) || T.name,
         title: React.createElement(TreeNode, D),
         key: B,
         isLeaf: !1,
@@ -30311,9 +30326,9 @@ const useSyncFromForm = (e, t, n) => {
         const f = /* @__PURE__ */ new Set([]), C = /* @__PURE__ */ new Set([]), b = (v, I) => {
           var F;
           (F = v == null ? void 0 : v.reduceProperties) == null || F.call(v, (R, T) => {
-            var O, N, k;
-            const D = R || I, B = T["x-collection-field"] && o(T["x-collection-field"]), $ = T.name.includes("."), L = B && ["hasOne", "hasMany", "belongsTo", "belongsToMany"].includes(B.type), j = !L && $ ? getAssociationPath(T.name) : T.name, w = D === "" || !D ? j : D + "." + j;
-            if (B && !(["hasOne", "hasMany"].includes(B.type) || ["SubForm", "Nester"].includes((O = T["x-component-props"]) == null ? void 0 : O.mode)) && C.add(w), B && (L || $) && T["x-component"] !== "TableField") {
+            var L, N, k;
+            const D = R || I, B = T["x-collection-field"] && o(T["x-collection-field"]), $ = T.name.includes("."), O = B && ["hasOne", "hasMany", "belongsTo", "belongsToMany"].includes(B.type), j = !O && $ ? getAssociationPath(T.name) : T.name, w = D === "" || !D ? j : D + "." + j;
+            if (B && !(["hasOne", "hasMany"].includes(B.type) || ["SubForm", "Nester"].includes((L = T["x-component-props"]) == null ? void 0 : L.mode)) && C.add(w), B && (O || $) && T["x-component"] !== "TableField") {
               if (f.add({ name: w, fieldMode: ((N = T["x-component-props"]) == null ? void 0 : N.mode) || "Select" }), ["Nester", "SubTable"].includes((k = T["x-component-props"]) == null ? void 0 : k.mode)) {
                 const M = D && D !== "" ? D + "." + T.name : T.name;
                 b(T, M);
@@ -31367,7 +31382,7 @@ const DragHandler = (e) => {
   } = useURLSearchParamsVariable(), { datetimeCtx: F } = useDatetimeVariableContext(), { currentFormCtx: R } = useCurrentFormContext({ form: e == null ? void 0 : e.currentForm }), { name: T } = useCollection_deprecated(), D = useContextVariable();
   let { name: B } = useBlockCollection();
   e != null && e.collectionName && (B = e.collectionName);
-  const $ = useApp(), L = ((j = $.getVariables) == null ? void 0 : j.call($).map((w) => ({
+  const $ = useApp(), O = ((j = $.getVariables) == null ? void 0 : j.call($).map((w) => ({
     name: w.name,
     ctx: w.useCtx()
   }))) || [];
@@ -31458,7 +31473,7 @@ const DragHandler = (e) => {
       ctx: y,
       defaultValue: I
     },
-    ...L
+    ...O
   ].filter(Boolean), [
     i,
     l,
@@ -31482,7 +31497,7 @@ const DragHandler = (e) => {
     o,
     D,
     y,
-    ...L.map((w) => w.ctx)
+    ...O.map((w) => w.ctx)
   ]);
 }, useLocalVariables$1 = useLocalVariables, useVariables = () => useContext(VariablesContext), useVariables$1 = useVariables, isSubFormOrSubTableField = (e) => {
   for (; e; ) {
@@ -31558,7 +31573,7 @@ const useParseDefaultValue = () => {
         const D = !t.name.toString().includes(".") && (d == null ? void 0 : d.getField(t.name)), {
           value: B,
           collectionName: $,
-          dataSource: L = "main"
+          dataSource: O = "main"
         } = yield n.parseVariable(t.default, o, {
           fieldOperator: C(t.name)
         });
@@ -31566,7 +31581,7 @@ const useParseDefaultValue = () => {
           collectionName: D.target,
           targetCollectionName: $,
           dm: b,
-          dataSource: L
+          dataSource: O
         })) {
           e.loading = !1;
           return;
@@ -31582,8 +31597,8 @@ const useParseDefaultValue = () => {
       const R = getVariableName(t.default), T = S(R);
       return T ? (y({ forceUpdate: !0 }), reaction(
         () => {
-          const B = { [R]: (T == null ? void 0 : T.ctx) || {} }, $ = getPath(t.default), L = getValuesByPath(B, $);
-          return L === void 0 ? Math.random() : L;
+          const B = { [R]: (T == null ? void 0 : T.ctx) || {} }, $ = getPath(t.default), O = getValuesByPath(B, $);
+          return O === void 0 ? Math.random() : O;
         },
         () => v({ forceUpdate: !0 }),
         {
@@ -37614,8 +37629,8 @@ const enabledIndexColumn$1 = {
   name: "fieldSettings:component:CascadeSelect",
   items: [fieldComponent$6, titleField$1, ellipsisSettingsItem, setTheDataScope]
 }), SchemaSettingsDateRange = function e(t) {
-  var R, T, D, B, $, L, j, w, O, N, k, M, q, E, V, H;
-  const { fieldSchema: n } = t, o = useField(), { dn: r } = useDesignable(), { t: a } = useTranslation(), { getCollectionJoinField: i } = useCollectionManager_deprecated(), { isInSubForm: l, isInSubTable: c } = useFlag() || {}, u = i(n == null ? void 0 : n["x-collection-field"]) || {}, d = ((R = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : R.showTime) || ((D = (T = u == null ? void 0 : u.uiSchema) == null ? void 0 : T["x-component-props"]) == null ? void 0 : D.showTime) || !1, p = ((B = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : B.dateFormat) || ((L = ($ = u == null ? void 0 : u.uiSchema) == null ? void 0 : $["x-component-props"]) == null ? void 0 : L.dateFormat) || "YYYY-MM-DD", m = ((j = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : j.timeFormat) || ((O = (w = u == null ? void 0 : u.uiSchema) == null ? void 0 : w["x-component-props"]) == null ? void 0 : O.timeFormat) || "HH:mm:ss", h = ((N = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : N.picker) || ((M = (k = u == null ? void 0 : u.uiSchema) == null ? void 0 : k["x-component-props"]) == null ? void 0 : M.picker) || "date";
+  var R, T, D, B, $, O, j, w, L, N, k, M, q, E, V, H;
+  const { fieldSchema: n } = t, o = useField(), { dn: r } = useDesignable(), { t: a } = useTranslation(), { getCollectionJoinField: i } = useCollectionManager_deprecated(), { isInSubForm: l, isInSubTable: c } = useFlag() || {}, u = i(n == null ? void 0 : n["x-collection-field"]) || {}, d = ((R = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : R.showTime) || ((D = (T = u == null ? void 0 : u.uiSchema) == null ? void 0 : T["x-component-props"]) == null ? void 0 : D.showTime) || !1, p = ((B = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : B.dateFormat) || ((O = ($ = u == null ? void 0 : u.uiSchema) == null ? void 0 : $["x-component-props"]) == null ? void 0 : O.dateFormat) || "YYYY-MM-DD", m = ((j = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : j.timeFormat) || ((L = (w = u == null ? void 0 : u.uiSchema) == null ? void 0 : w["x-component-props"]) == null ? void 0 : L.timeFormat) || "HH:mm:ss", h = ((N = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : N.picker) || ((M = (k = u == null ? void 0 : u.uiSchema) == null ? void 0 : k["x-component-props"]) == null ? void 0 : M.picker) || "date";
   n["x-read-pretty"] || o.readOnly || o.readPretty;
   const g = (q = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : q._minDate, f = (E = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : E._maxDate, C = ((V = u == null ? void 0 : u.uiSchema) == null ? void 0 : V["x-component-props"].gmt) || !1, b = ((H = u == null ? void 0 : u.uiSchema) == null ? void 0 : H["x-component-props"].utc) || !1, S = useRecord(), { form: y } = useFormBlockContext(), v = useCallback(
     (U) => /* @__PURE__ */ jsx(
@@ -39096,12 +39111,12 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
     _.isFunction(C) ? n.current = C(n.current) : n.current = C;
   }, []), u = useCallback(
     (C, b, S) => z(void 0, null, function* () {
-      var w, O;
+      var w, L;
       const y = C.split("."), v = y[0], I = mergeVariableToCollectionNameWithLocalVariables(variablesStore, b);
       let F = mergeCtxWithLocalVariables(n.current, b);
       const { fieldPath: R, dataSource: T, variableOption: D } = getFieldPath$1(v, I);
       let B = R;
-      const { fieldPath: $ } = getFieldPath$1(C, I), L = y.length === 1 ? D == null ? void 0 : D.collectionName : (w = r($, T)) == null ? void 0 : w.target;
+      const { fieldPath: $ } = getFieldPath$1(C, I), O = y.length === 1 ? D == null ? void 0 : D.collectionName : (w = r($, T)) == null ? void 0 : w.target;
       if (!(v in F))
         throw new Error(`VariablesProvider: ${v} is not found`);
       for (let N = 0; N < y.length; N++) {
@@ -39109,11 +39124,11 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
           return {
             value: F === void 0 ? D == null ? void 0 : D.defaultValue : F,
             dataSource: T,
-            collectionName: L
+            collectionName: O
           };
         if (_.isFunction(F))
           break;
-        const k = y[N], M = y.slice(0, N + 1).join("."), { fieldPath: q } = getFieldPath$1(M, I), E = r(q, T), V = (O = a(B, T)) == null ? void 0 : O.getPrimaryKey();
+        const k = y[N], M = y.slice(0, N + 1).join("."), { fieldPath: q } = getFieldPath$1(M, I), E = r(q, T), V = (L = a(B, T)) == null ? void 0 : L.getPrimaryKey();
         if (Array.isArray(F)) {
           const H = F.map((U) => {
             if (!(S != null && S.doNotRequest) && shouldToRequest(U == null ? void 0 : U[k], U, M) && (U == null ? void 0 : U[V]) != null && E != null && E.target) {
@@ -39163,7 +39178,7 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
       return {
         value: j === void 0 ? D.defaultValue : j,
         dataSource: T,
-        collectionName: L
+        collectionName: O
       };
     }),
     [r]
@@ -39588,8 +39603,8 @@ const NocoBaseField = (e) => {
   !y.parent && p && (y.parent = p, !((B = (D = y.parent) == null ? void 0 : D.properties) != null && B[y.name]) && y.name && _.set(y.parent, `properties.${y.name}`, y));
   const v = useCallback(() => {
     const $ = y.parent;
-    h.current = new Schema(y.toJSON(), $), $ != null && $.properties && Object.keys($.properties).forEach((L) => {
-      L === y.name && ($.properties[L] = h.current);
+    h.current = new Schema(y.toJSON(), $), $ != null && $.properties && Object.keys($.properties).forEach((O) => {
+      O === y.name && ($.properties[O] = h.current);
     }), b(), S == null || S();
   }, [y, S, b]), I = useMemo(() => d ? createMergedSchemaInstance(y, d, o) : f ? (f.default = C, createMergedSchemaInstance(y, f, o)) : y, [f, C, y, o, d]), F = useFieldProps(I), R = ($) => {
     if (!r)
@@ -39745,7 +39760,7 @@ const ActionLink = withDynamicSchemaProps(
         return ((K = F == null ? void 0 : F["x-linkage-rules"]) == null ? void 0 : K.filter((X) => !X.disabled)) || [];
       },
       [F == null ? void 0 : F["x-linkage-rules"]]
-    ), { designable: $ } = useDesignable(), L = useComponent(o) || o, j = useVariables$1(), w = useLocalVariables$1(), { visibleWithURL: O, setVisibleWithURL: N } = usePopupUtils(), { setSubmitted: k } = useActionContext(), { getAriaLabel: M } = useGetAriaLabelOfAction(l), q = useCollectionParentRecordData(), E = useApp(), { getAllDataBlocks: V } = useAllDataBlocks(), H = useForm();
+    ), { designable: $ } = useDesignable(), O = useComponent(o) || o, j = useVariables$1(), w = useLocalVariables$1(), { visibleWithURL: L, setVisibleWithURL: N } = usePopupUtils(), { setSubmitted: k } = useActionContext(), { getAriaLabel: M } = useGetAriaLabelOfAction(l), q = useCollectionParentRecordData(), E = useApp(), { getAllDataBlocks: V } = useAllDataBlocks(), H = useForm();
     useEffect(() => {
       I.stateOfLinkageRules && setInitialActionState(I);
       const K = uid(), X = [];
@@ -39809,7 +39824,7 @@ const ActionLink = withDynamicSchemaProps(
         icon: i,
         loading: d,
         handleMouseEnter: U,
-        tarComponent: L,
+        tarComponent: O,
         className: a,
         type: e.type,
         Designer: v,
@@ -39823,7 +39838,7 @@ const ActionLink = withDynamicSchemaProps(
         style: u,
         propsDisabled: m,
         useAction: r,
-        visibleWithURL: O,
+        visibleWithURL: L,
         setVisibleWithURL: N,
         setSubmitted: k,
         getAriaLabel: M,
@@ -39862,7 +39877,7 @@ const ActionLink = withDynamicSchemaProps(
     setVisibleWithURL: D,
     setSubmitted: B,
     getAriaLabel: $,
-    parentRecordData: L
+    parentRecordData: O
   } = Ce, j = W(Ce, [
     "containerRefKey",
     "fieldSchema",
@@ -39891,7 +39906,7 @@ const ActionLink = withDynamicSchemaProps(
     "setSubmitted",
     "getAriaLabel",
     "parentRecordData"
-  ]), [w, O] = useState(!1), { wrapSSR: N, componentCls: k, hashId: M } = useStyles$8(), [q, E] = useState(!1), V = o["x-toolbar-props"] || o["x-designer-props"], H = (he = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : he.openMode, U = (ge = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : ge.openSize, G = (xe = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : xe.refreshDataBlockRequest, { modal: Y } = App.useApp(), J = useForm(), K = useACLActionParamsContext(), {
+  ]), [w, L] = useState(!1), { wrapSSR: N, componentCls: k, hashId: M } = useStyles$8(), [q, E] = useState(!1), V = o["x-toolbar-props"] || o["x-designer-props"], H = (he = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : he.openMode, U = (ge = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : ge.openSize, G = (xe = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : xe.refreshDataBlockRequest, { modal: Y } = App.useApp(), J = useForm(), K = useACLActionParamsContext(), {
     run: X,
     element: ee,
     disabled: Q,
@@ -39923,7 +39938,7 @@ const ActionLink = withDynamicSchemaProps(
     onClick: h,
     refreshDataBlockRequest: G,
     fieldSchema: o,
-    setVisible: O,
+    setVisible: L,
     run: X,
     confirm: g,
     modal: Y,
@@ -39932,7 +39947,7 @@ const ActionLink = withDynamicSchemaProps(
     title: y
   }, ue = useCallback(
     (de) => {
-      O == null || O(de), D == null || D(de);
+      L == null || L(de), D == null || D(de);
     },
     [D]
   );
@@ -40031,10 +40046,10 @@ const RenderButton = ({
   confirmTitle: D,
   title: B
 }) => {
-  const { getDataBlockRequest: $ } = useDataBlockRequestGetter(), { t: L } = useTranslation(), { isPopupVisibleControlledByURL: j } = usePopupSettings(), { openPopup: w } = usePopupUtils(), O = useVariables$1(), N = useLocalVariables$1(), k = useRef(null), M = useCompile(), q = useForm();
+  const { getDataBlockRequest: $ } = useDataBlockRequestGetter(), { t: O } = useTranslation(), { isPopupVisibleControlledByURL: j } = usePopupSettings(), { openPopup: w } = usePopupUtils(), L = useVariables$1(), N = useLocalVariables$1(), k = useRef(null), M = useCompile(), q = useForm();
   k.current = w;
   const E = {
-    variables: O,
+    variables: L,
     localVariables: N
   }, V = useCallback(
     (H, U = !0) => z(void 0, null, function* () {
@@ -40042,7 +40057,7 @@ const RenderButton = ({
       if (U && isPortalInBody(H.target))
         return;
       H.preventDefault(), H.stopPropagation();
-      const G = yield getVariableValue(L(F == null ? void 0 : F.title, { title: M(y.title) }), E), Y = yield getVariableValue(L(F == null ? void 0 : F.content, { title: M(y.title) }), E);
+      const G = yield getVariableValue(O(F == null ? void 0 : F.title, { title: M(y.title) }), E), Y = yield getVariableValue(O(F == null ? void 0 : F.content, { title: M(y.title) }), E);
       if (!a && n) {
         const K = () => {
           b ? b(H, () => {
@@ -40051,8 +40066,8 @@ const RenderButton = ({
           }) : isBulkEditAction(y) || !j() ? (v(!0), I == null || I()) : ["view", "update", "create", "customize:popup"].includes(y["x-action"]) && y["x-uid"] ? k.current() : (v(!0), I == null || I());
         };
         (F == null ? void 0 : F.enable) !== !1 && (F != null && F.content) ? (yield (J = q == null ? void 0 : q.submit) == null ? void 0 : J.call(q), R.confirm({
-          title: L(G, { title: D || B || (t == null ? void 0 : t.title) }),
-          content: L(Y, { title: D || B || (t == null ? void 0 : t.title) }),
+          title: O(G, { title: D || B || (t == null ? void 0 : t.title) }),
+          content: O(Y, { title: D || B || (t == null ? void 0 : t.title) }),
           onOk: K
         })) : K();
       }
@@ -40073,7 +40088,7 @@ const RenderButton = ({
       I,
       T,
       v,
-      L,
+      O,
       B,
       $
     ]
@@ -40106,7 +40121,7 @@ RenderButton.displayName = "RenderButton";
 const RenderButtonInner = observer$1(
   (e) => {
     var N, M;
-    const O = e, {
+    const L = e, {
       designable: t,
       field: n,
       aclCtx: o,
@@ -40127,7 +40142,7 @@ const RenderButtonInner = observer$1(
       title: S,
       isLink: y,
       onlyIcon: v
-    } = O, I = W(O, [
+    } = L, I = W(L, [
       "designable",
       "field",
       "aclCtx",
@@ -40175,7 +40190,7 @@ const RenderButtonInner = observer$1(
     );
     if (!t && ((N = n == null ? void 0 : n.data) != null && N.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, k = l, { opacity: $ } = k, L = W(k, ["opacity"]), j = y && $ ? { opacity: $ } : void 0, w = 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, k = l, { opacity: $ } = k, O = W(k, ["opacity"]), j = y && $ ? { opacity: $ } : void 0, w = v || p ? T : p || Button;
     return /* @__PURE__ */ jsxs(
       SortableItem,
       P(x({
@@ -40186,7 +40201,7 @@ const RenderButtonInner = observer$1(
         loading: ((M = n == null ? void 0 : n.data) == null ? void 0 : M.loading) || a,
         icon: typeof r == "string" ? /* @__PURE__ */ jsx(Icon, { type: r, style: j }) : r,
         disabled: i,
-        style: y ? L : l,
+        style: y ? O : l,
         onClick: R,
         component: w,
         className: cls(m, h, g, "nb-action"),
@@ -40661,30 +40676,30 @@ 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 = ((Y = v["x-component-props"]) == null ? void 0 : Y.addMode) === "quickAdd", { getField: F } = useCollection_deprecated(), R = useRef(null), { getCollectionJoinField: T, getInterface: D } = useCollectionManager_deprecated(), B = v["x-collection-field"] || v.name, $ = F(B) || T(B), L = u || ($ == null ? void 0 : $.target) && (t == null ? void 0 : t.label) && T(`${$.target}.${t.label}`), j = useMemo(() => {
+      ]), b = useDataSourceKey(), S = useDataSourceHeaders(m || b), y = useRef(!1), v = useFieldSchema(), I = ((Y = v["x-component-props"]) == null ? void 0 : Y.addMode) === "quickAdd", { getField: F } = useCollection_deprecated(), R = useRef(null), { getCollectionJoinField: T, getInterface: D } = useCollectionManager_deprecated(), B = v["x-collection-field"] || v.name, $ = F(B) || T(B), O = u || ($ == null ? void 0 : $.target) && (t == null ? void 0 : t.label) && T(`${$.target}.${t.label}`), j = useMemo(() => {
         var K;
-        if (L != null && L.interface) {
-          const X = D(L.interface), ee = ((K = X == null ? void 0 : X.filterable) == null ? void 0 : K.operators[0].value) || "$includes";
-          return L.type === "string" ? "$includes" : ee;
+        if (O != null && O.interface) {
+          const X = D(O.interface), ee = ((K = X == null ? void 0 : X.filterable) == null ? void 0 : K.operators[0].value) || "$includes";
+          return O.type === "string" ? "$includes" : ee;
         }
         return "$includes";
-      }, [L]), w = useCompile(), O = useCallback(
+      }, [O]), w = useCompile(), L = useCallback(
         (K) => {
           try {
             return K.filter((X) => ["number", "string"].includes(typeof X[t.value]) || !X[t.value]).map((X) => {
               var Q;
               let ee = w(X[t.label]);
-              if ((Q = L == null ? void 0 : L.uiSchema) != null && Q.enum)
+              if ((Q = O == null ? void 0 : O.uiSchema) != null && Q.enum)
                 if (Array.isArray(ee))
                   ee = ee.map((te, ne) => {
-                    const se = L.uiSchema.enum.find((ae) => ae.value === te);
+                    const se = O.uiSchema.enum.find((ae) => ae.value === te);
                     return se ? /* @__PURE__ */ jsx(Tag, { role: "button", color: se.color, style: { marginRight: 3 }, children: (se == null ? void 0 : se.label) || te }, ne) : /* @__PURE__ */ jsx(Tag, { role: "button", children: te }, te);
                   }).reverse();
                 else {
-                  const te = L.uiSchema.enum.find((ne) => ne.value === ee);
+                  const te = O.uiSchema.enum.find((ne) => ne.value === ee);
                   te && (ee = /* @__PURE__ */ jsx(Tag, { role: "button", color: te.color, children: te.label }));
                 }
-              return (L == null ? void 0 : L.type) === "date" && (ee = dayjs(ee).format("YYYY-MM-DD")), c ? c({
+              return (O == null ? void 0 : O.type) === "date" && (ee = dayjs(ee).format("YYYY-MM-DD")), c ? c({
                 [t.label]: ee || EMPTY$1,
                 [t.value]: X[t.value]
               }) : P(x({}, omit(X, "style")), {
@@ -40696,7 +40711,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
             return console.error(X), K;
           }
         },
-        [L == null ? void 0 : L.uiSchema, t]
+        [O == null ? void 0 : O.uiSchema, t]
       ), { data: N, run: k, loading: M } = useRequest(
         P(x({
           action: "list"
@@ -40768,7 +40783,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
           defaultValue: a
         }, C), {
           loading: N ? M : !0,
-          options: h(O(H)),
+          options: h(L(H)),
           rawOptions: H,
           dropdownRender: (K) => {
             const X = H.some((ee) => ee[t.label] === R.current);
@@ -40846,9 +40861,9 @@ const useFormDataTemplates = () => {
     d(R), m(null), t == null || t.reset();
   }), []), I = useCallback((R, T, D) => z(void 0, null, function* () {
     const B = P(x({}, T), { dataId: R });
-    m(T), fetchTemplateData(h, B, D).then(($) => (t && $ && (t.reset(), t.__template = !0, forEach($, (L, j) => {
+    m(T), fetchTemplateData(h, B, D).then(($) => (t && $ && (t.reset(), t.__template = !0, forEach($, (O, j) => {
       var w;
-      L && (t.values[j] = L, (w = t == null ? void 0 : t.setInitialValuesIn) == null || w.call(t, j, L));
+      O && (t.values[j] = O, (w = t == null ? void 0 : t.setInitialValuesIn) == null || w.call(t, j, O));
     })), $)).catch(($) => {
       console.error($);
     });
@@ -41779,10 +41794,10 @@ const insertPositionToMethod = {
     [(D = c == null ? void 0 : c["x-component-props"]) == null ? void 0 : D.onSelect]
   ), h = useMemo(() => toItems$1(c == null ? void 0 : c.properties, { t: l, compile: u }), [c == null ? void 0 : c.properties, l, u]), g = useCallback(
     ($) => {
-      onFieldChange("target", (L) => {
-        var w, O;
-        const [, j] = ((O = (w = L == null ? void 0 : L.value) == null ? void 0 : w.split) == null ? void 0 : O.call(w, "||")) || [];
-        L.query("position").take((N) => {
+      onFieldChange("target", (O) => {
+        var w, L;
+        const [, j] = ((L = (w = O == null ? void 0 : O.value) == null ? void 0 : w.split) == null ? void 0 : L.call(w, "||")) || [];
+        O.query("position").take((N) => {
           N.dataSource = j === "Menu.SubMenu" ? [
             { label: l("Before"), value: "beforeBegin" },
             { label: l("After"), value: "afterEnd" },
@@ -41830,9 +41845,9 @@ const insertPositionToMethod = {
   }), [n.componentProps.tooltip]);
   o["x-component"] === "Menu.URL" && (f.properties.href = d, f.properties.params = p, C.href = n.componentProps.href, C.params = n.componentProps.params);
   const y = useCallback(
-    ({ title: $, icon: L, href: j, params: w }) => {
+    ({ title: $, icon: O, href: j, params: w }) => {
       var N;
-      const O = {
+      const L = {
         "x-uid": o["x-uid"],
         "x-server-hooks": [
           {
@@ -41841,11 +41856,11 @@ const insertPositionToMethod = {
           }
         ]
       };
-      $ && (o.title = $, n.title = $, O.title = $, i()), n.componentProps.icon = L, n.componentProps.href = j, n.componentProps.params = w, O["x-component-props"] = { icon: L, href: j, params: w }, o["x-component-props"] = o["x-component-props"] || {}, o["x-component-props"].icon = L, o["x-component-props"].href = j, o["x-component-props"].params = w, m == null || m({ item: { props: { schema: o } } }), a.emit("patch", {
-        schema: O
+      $ && (o.title = $, n.title = $, L.title = $, i()), n.componentProps.icon = O, n.componentProps.href = j, n.componentProps.params = w, L["x-component-props"] = { icon: O, href: j, params: w }, o["x-component-props"] = o["x-component-props"] || {}, o["x-component-props"].icon = O, o["x-component-props"].href = j, o["x-component-props"].params = w, m == null || m({ item: { props: { schema: o } } }), a.emit("patch", {
+        schema: L
       }), (N = o.__route__) != null && N.id && e(o.__route__.id, {
         title: $,
-        icon: L,
+        icon: O,
         options: j || w ? {
           href: j,
           params: w
@@ -41855,8 +41870,8 @@ const insertPositionToMethod = {
     [o, n, a, i, m]
   ), v = useCallback(
     ({ tooltip: $ }) => {
-      var L;
-      (L = o.__route__) != null && L.id && e(o.__route__.id, {
+      var O;
+      (O = o.__route__) != null && O.id && e(o.__route__.id, {
         tooltip: $
       });
     },
@@ -41886,31 +41901,31 @@ const insertPositionToMethod = {
       }
     }
   }), [h, l]), { moveRoute: F } = useNocoBaseRoutes(), R = useCallback(
-    (j) => z(void 0, [j], function* ({ target: $, position: L }) {
+    (j) => z(void 0, [j], function* ({ target: $, position: O }) {
       var q;
       const [w] = ((q = $ == null ? void 0 : $.split) == null ? void 0 : q.call($, "||")) || [];
       if (!w)
         return;
-      const O = findByUid(c, w), N = createDesignable({
+      const L = findByUid(c, w), N = createDesignable({
         t: l,
         api: r,
         refresh: i,
-        current: O
+        current: L
       }), k = {
         beforeBegin: "insertBefore",
         afterEnd: "insertAfter"
-      }, M = L === "beforeEnd" ? {
+      }, M = O === "beforeEnd" ? {
         targetScope: {
-          parentId: O.__route__.id
+          parentId: L.__route__.id
         }
       } : {
-        targetId: O.__route__.id
+        targetId: L.__route__.id
       };
       yield F(x({
         sourceId: o.__route__.id,
         sortField: "sort",
-        method: k[L]
-      }, M)), N.loadAPIClientEvents(), N.insertAdjacent(L, o);
+        method: k[O]
+      }, M)), N.loadAPIClientEvents(), N.insertAdjacent(O, o);
     }),
     [c, l, r, i, F, o]
   ), T = useMemo(() => ({
@@ -42364,14 +42379,14 @@ const useMenuDragEnd = () => {
     theme: m
   } = useProps(e), { t: h } = useTranslation(), g = useDesigner(), f = useFieldSchema(), C = useAPIClient(), { render: b } = useSchemaInitializerRender(f["x-initializer"], f["x-initializer-props"]), S = useSideMenuRef(), [y, v] = useState(), [I, F] = useState(() => a || (r ? findKeysByUid(f, r) : [])), [R, T] = useState(() => ["inline", "mix"].includes(n) ? i || I : i), D = useMemo(() => {
     var j;
-    let L;
+    let O;
     if (o) {
       const w = findKeysByUid(f, o);
-      L = (w == null ? void 0 : w[0]) || null;
+      O = (w == null ? void 0 : w[0]) || null;
     } else
-      L = (I == null ? void 0 : I[0]) || null;
-    if (n === "mix" && L) {
-      const w = (j = f.properties) == null ? void 0 : j[L];
+      O = (I == null ? void 0 : I[0]) || null;
+    if (n === "mix" && O) {
+      const w = (j = f.properties) == null ? void 0 : j[O];
       if ((w == null ? void 0 : w["x-component"]) === "Menu.SubMenu")
         return w;
     }
@@ -42382,8 +42397,8 @@ const useMenuDragEnd = () => {
       v(void 0);
       return;
     }
-    const L = findKeysByUid(f, o);
-    v(L), ["inline", "mix"].includes(n) && T(i || L);
+    const O = findKeysByUid(f, o);
+    v(O), ["inline", "mix"].includes(n) && T(i || O);
   }, [o]), useEffect(() => {
     ["inline", "mix"].includes(n) && T(I);
   }, [I]);
@@ -43192,7 +43207,7 @@ function loadChildren(e) {
   return t.length && t.some((n) => isAssociation(n.field)) || (e.isLeaf = !0), t;
 }
 function isAssociation(e) {
-  return e.target && e.interface;
+  return ["belongsTo", "hasMany", "hasOne", "belongsToMany", "belongsToArray"].includes(e.type) && e.target && e.interface;
 }
 function trueFilter(e) {
   return !0;
@@ -43216,7 +43231,7 @@ function getCollectionFieldOptions(e, t) {
   });
 }
 const FieldsTreeSelect = (e) => {
-  const L = e, {
+  const O = e, {
     title: t,
     value: n,
     onChange: o,
@@ -43226,7 +43241,7 @@ const FieldsTreeSelect = (e) => {
     rootOption: l,
     loadData: c,
     includeFieldPaths: u
-  } = L, d = W(L, [
+  } = O, d = W(O, [
     "title",
     "value",
     "onChange",
@@ -43237,15 +43252,15 @@ const FieldsTreeSelect = (e) => {
     "loadData",
     "includeFieldPaths"
   ]), p = useCompile(), { t: m } = useTranslation(), [h, g] = useState({}), f = a({ collection: r }), [C, b] = parseCollectionName(f), S = useApp(), { collectionManager: y } = S.dataSourceManager.getDataSource(C), v = (j, w) => {
-    const O = y.getCollection(j);
-    return O ? O.getAllFields(w) : [];
+    const L = y.getCollection(j);
+    return L ? L.getAllFields(w) : [];
   }, I = Object.values(h), F = useMemo(() => e.multiple ? (n || []).map((j) => h[j]).filter(Boolean) : n, [n, e.multiple, h]), R = useCallback(
     (j) => z(void 0, null, function* () {
       if (c != null)
         return c(j);
       if (!j.isLeaf && j.loadChildren) {
         const w = j.loadChildren(j);
-        g((O) => w.reduce((N, k) => Object.assign(N, { [k.value]: k }), x({}, O)));
+        g((L) => w.reduce((N, k) => Object.assign(N, { [k.value]: k }), x({}, L)));
       }
     }),
     [c]
@@ -43257,15 +43272,15 @@ const FieldsTreeSelect = (e) => {
       title: l.label,
       fullTitle: l.label,
       isLeaf: !1
-    }) : null, O = (c === null ? [] : getCollectionFieldOptions.call({ compile: p, getCollectionFields: v, filter: i }, b, j)).reduce((N, k) => Object.assign(N, { [k.value]: k }), {});
-    j && (O[j.value] = j), g(O);
+    }) : null, L = (c === null ? [] : getCollectionFieldOptions.call({ compile: p, getCollectionFields: v, filter: i }, b, j)).reduce((N, k) => Object.assign(N, { [k.value]: k }), {});
+    j && (L[j.value] = j), g(L);
   }, [f, l, i, c]), useEffect(() => {
     const j = e.multiple ? n : n ? [n] : [];
-    if (!(j != null && j.length) || j.every((O) => !!h[O]))
+    if (!(j != null && j.length) || j.every((L) => !!h[L]))
       return;
     const w = [];
-    j.forEach((O) => {
-      const N = O.split(".");
+    j.forEach((L) => {
+      const N = L.split(".");
       let k = h[N[0]];
       for (let M = 1; M < N.length && k; M++) {
         const q = N.slice(0, M + 1).join(".");
@@ -43278,7 +43293,7 @@ const FieldsTreeSelect = (e) => {
           E != null && E.length && (w.push(...E), k = E.find((V) => V.value === N.slice(0, M + 1).join(".")));
         }
       }
-    }), g((O) => w.reduce((N, k) => Object.assign(N, { [k.value]: k }), x({}, O)));
+    }), g((L) => w.reduce((N, k) => Object.assign(N, { [k.value]: k }), x({}, L)));
   }, [n, I.length, e.multiple]);
   const T = useCallback(
     (j) => {
@@ -43286,30 +43301,30 @@ const FieldsTreeSelect = (e) => {
         o(j);
         return;
       }
-      const w = j.map((k) => k.value).filter(Boolean), O = new Set(w), N = F.find((k) => !O.has(k.value));
+      const w = j.map((k) => k.value).filter(Boolean), L = new Set(w), N = F.find((k) => !L.has(k.value));
       if (N) {
         const k = `${N.value}.`;
         Object.keys(h).forEach((M) => {
-          M.startsWith(k) && O.delete(M);
+          M.startsWith(k) && L.delete(M);
         });
       } else
         u && w.forEach((k) => {
           const M = k.split(".");
           if (M.length)
             for (let q = 1; q <= M.length; q++)
-              O.add(M.slice(0, q).join("."));
+              L.add(M.slice(0, q).join("."));
         });
-      o(Array.from(O));
+      o(Array.from(L));
     },
     [e.multiple, F, o, h]
   ), D = useCallback(
     (j) => {
       var q;
-      const { value: w, onClose: O, disabled: N, closable: k } = j;
+      const { value: w, onClose: L, disabled: N, closable: k } = j;
       if (!w)
         return null;
       const { fullTitle: M } = (q = h[w]) != null ? q : {};
-      return /* @__PURE__ */ jsx(Tag, { closable: k && !N, onClose: O, children: M == null ? void 0 : M.join(" / ") });
+      return /* @__PURE__ */ jsx(Tag, { closable: k && !N, onClose: L, children: M == null ? void 0 : M.join(" / ") });
     },
     [h]
   ), B = Array.isArray(F) ? F.filter((j) => j.value in h) : F, $ = e.multiple ? n : n != null ? [n] : [];
@@ -43361,27 +43376,27 @@ const InternalAssociationSelect$1 = observer$1(
     var B;
     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 $ = isVariable$1(r.value) ? void 0 : r.value, L = Array.isArray($) ? $.filter(Boolean) : $, j = removeIfKeyEmpty(L, F);
+      const $ = isVariable$1(r.value) ? void 0 : r.value, O = Array.isArray($) ? $.filter(Boolean) : $, j = removeIfKeyEmpty(O, F);
       p(j), isEqual(r.value, j) || (r.value = j);
     }, [r.value, F]), useEffect(() => {
       const $ = uid();
       return f.addEffects($, () => {
-        onFieldInputValueChange("*", (L) => {
+        onFieldInputValueChange("*", (O) => {
           var N, k, M, q, E, V;
-          const j = filterAnalyses((M = (k = (N = r.componentProps) == null ? void 0 : N.service) == null ? void 0 : k.params) == null ? void 0 : M.filter) || [], w = getFieldPath(L.address.entire), O = getFieldPath(r.address.entire);
-          j.includes((q = L == null ? void 0 : L.props) == null ? void 0 : q.name) && r.value && isEqual(L == null ? void 0 : L.indexes, r == null ? void 0 : r.indexes) && ((E = L == null ? void 0 : L.props) == null ? void 0 : E.name) !== r.props.name && (!((V = r == null ? void 0 : r.indexes) != null && V.length) || isEqual(w, O)) && (r.setValue(null), p(null));
+          const j = filterAnalyses((M = (k = (N = r.componentProps) == null ? void 0 : N.service) == null ? void 0 : k.params) == null ? void 0 : M.filter) || [], w = getFieldPath(O.address.entire), L = getFieldPath(r.address.entire);
+          j.includes((q = O == null ? void 0 : O.props) == null ? void 0 : q.name) && r.value && isEqual(O == null ? void 0 : O.indexes, r == null ? void 0 : r.indexes) && ((E = O == null ? void 0 : O.props) == null ? void 0 : E.name) !== r.props.name && (!((V = r == null ? void 0 : r.indexes) != null && V.length) || isEqual(w, L)) && (r.setValue(null), p(null));
         });
       }), () => {
         f.removeEffects($);
       };
     }, []);
     const R = ($) => z(void 0, null, function* () {
-      var O, N;
-      const { search: L, callBack: j } = $, {
+      var L, N;
+      const { search: O, callBack: j } = $, {
         data: { data: w }
       } = yield b.create({
         values: {
-          [((N = (O = r == null ? void 0 : r.componentProps) == null ? void 0 : O.fieldNames) == null ? void 0 : N.label) || "id"]: L
+          [((N = (L = r == null ? void 0 : r.componentProps) == null ? void 0 : L.fieldNames) == null ? void 0 : N.label) || "id"]: O
         }
       });
       if (w) {
@@ -43415,8 +43430,8 @@ const InternalAssociationSelect$1 = observer$1(
           service: i,
           onChange: ($) => {
             var j;
-            const L = Array.isArray($) && $.length === 0 ? null : $;
-            (j = e.onChange) == null || j.call(e, L);
+            const O = Array.isArray($) && $.length === 0 ? null : $;
+            (j = e.onChange) == null || j.call(e, O);
           },
           CustomDropdownRender: m === "quickAdd" && T
         })
@@ -44016,32 +44031,32 @@ function Uploader(n) {
   }, [f, p, h]);
   const S = useCallback(
     (B) => {
-      var L;
+      var O;
       const $ = B.fileList.filter((j) => j.status !== "done").map(normalizeFile);
       if (m($), a) {
         const j = B.fileList.filter((w) => w.status === "done");
         if (j.length) {
-          const w = [...u, ...j.map((O) => {
+          const w = [...u, ...j.map((L) => {
             var N;
-            return c((N = O.response) == null ? void 0 : N.data);
+            return c((N = L.response) == null ? void 0 : N.data);
           })];
           $.length ? d(w) : (l == null || l([...i || [], ...w]), d([]));
         }
       } else {
         const j = B.fileList.find((w) => w.uid === B.file.uid);
-        j.status === "done" && (l == null || l(c((L = j.response) == null ? void 0 : L.data)), m([]));
+        j.status === "done" && (l == null || l(c((O = j.response) == null ? void 0 : O.data)), m([]));
       }
     },
     [a, i, u, c, l]
   ), y = useCallback((B) => {
     m(($) => {
-      const L = $.indexOf(B);
-      return $.splice(L, 1), [...$];
+      const O = $.indexOf(B);
+      return $.splice(O, 1), [...$];
     });
   }, []), v = useCallback((B) => {
     d(($) => {
-      const L = $.indexOf(B);
-      return $.splice(L, 1), [...$];
+      const O = $.indexOf(B);
+      return $.splice(O, 1), [...$];
     });
   }, []), I = useComponent("QRCodeUploader"), { mimetype: F, size: R } = e != null ? e : {}, T = useSizeHint(R), D = !r && (a || (!i || Array.isArray(i) && !i.length) && !p.length);
   return /* @__PURE__ */ jsxs(Fragment$1, { children: [
@@ -44362,9 +44377,9 @@ const InternalFileManager = (e) => {
   };
   useEffect(() => {
     if (t && Object.keys(t).length > 0) {
-      const $ = (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((L) => {
-        const j = L[p.label];
-        return P(x({}, L), {
+      const $ = (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((O) => {
+        const j = O[p.label];
+        return P(x({}, O), {
           [p.label]: getLabelFormatValue$1(y(S), y(j))
         });
       });
@@ -44385,10 +44400,10 @@ const InternalFileManager = (e) => {
     setSelectedRows: u,
     collectionField: b
   }, R = () => {
-    const { setVisible: $ } = useActionContext(), { multiple: L, selectedRows: j, onChange: w, options: O, collectionField: N } = useContext(RecordPickerContext);
+    const { setVisible: $ } = useActionContext(), { multiple: O, selectedRows: j, onChange: w, options: L, collectionField: N } = useContext(RecordPickerContext);
     return {
       onClick() {
-        w(L ? unionBy(j, O, (N == null ? void 0 : N.targetKey) || "id") : (j == null ? void 0 : j[0]) || null), $(!1);
+        w(O ? unionBy(j, L, (N == null ? void 0 : N.targetKey) || "id") : (j == null ? void 0 : j[0]) || null), $(!1);
       }
     };
   };
@@ -44440,22 +44455,22 @@ const InternalFileManager = (e) => {
     FormItem: FormItem$1
   }
 }), CascadeSelect = connect((e) => {
-  var L;
+  var O;
   const { data: t, mapOptions: n, onChange: o, value: r } = e, [a, i] = useState([
     { key: void 0, children: [], value: null }
-  ]), [l, c] = useState(t), [u, d] = useState(!1), p = useCompile(), m = useAPIClient(), h = useServiceOptions$1(e), { options: g, field: f } = useAssociationFieldContext(), C = m.resource(g.target), { getCollectionJoinField: b, getInterface: S } = useCollectionManager_deprecated(), y = (L = f == null ? void 0 : f.componentProps) == null ? void 0 : L.fieldNames, v = (g == null ? void 0 : g.target) && (y == null ? void 0 : y.label) && b(`${g.target}.${y.label}`), I = useMemo(() => {
+  ]), [l, c] = useState(t), [u, d] = useState(!1), p = useCompile(), m = useAPIClient(), h = useServiceOptions$1(e), { options: g, field: f } = useAssociationFieldContext(), C = m.resource(g.target), { getCollectionJoinField: b, getInterface: S } = useCollectionManager_deprecated(), y = (O = f == null ? void 0 : f.componentProps) == null ? void 0 : O.fieldNames, v = (g == null ? void 0 : g.target) && (y == null ? void 0 : y.label) && b(`${g.target}.${y.label}`), I = useMemo(() => {
     var j, w;
     return v != null && v.interface && ((w = (j = S(v.interface)) == null ? void 0 : j.filterable) == null ? void 0 : w.operators[0].value) || "$includes";
   }, [v]), F = useField();
   useEffect(() => {
     var j;
     if (r) {
-      const w = Array.isArray(r) ? extractLastNonNullValueObjects(r == null ? void 0 : r.filter((N) => N.value), !0) : transformNestedData(r), O = (j = w == null ? void 0 : w.map) == null ? void 0 : j.call(w, (N) => ({
+      const w = Array.isArray(r) ? extractLastNonNullValueObjects(r == null ? void 0 : r.filter((N) => N.value), !0) : transformNestedData(r), L = (j = w == null ? void 0 : w.map) == null ? void 0 : j.call(w, (N) => ({
         key: N.parentId,
         children: [],
         value: N
       }));
-      i(O);
+      i(L);
     }
   }, []);
   const R = useCallback(
@@ -44463,23 +44478,23 @@ const InternalFileManager = (e) => {
       try {
         return j == null ? void 0 : j.filter((w) => ["number", "string"].includes(typeof w[y.value])).map((w) => {
           var N, k, M;
-          let O = p(w[y.label]);
+          let L = p(w[y.label]);
           if ((N = v == null ? void 0 : v.uiSchema) != null && N.enum)
-            if (Array.isArray(O))
-              O = O.map((q, E) => {
+            if (Array.isArray(L))
+              L = L.map((q, E) => {
                 var H, U;
                 const V = (U = (H = v.uiSchema.enum).find) == null ? void 0 : U.call(H, (G) => G.value === q);
                 return V ? /* @__PURE__ */ jsx(Tag, { color: V.color, style: { marginRight: 3 }, children: (V == null ? void 0 : V.label) || q }, E) : /* @__PURE__ */ jsx(Tag, { children: q }, q);
               }).reverse();
             else {
-              const q = (M = (k = v.uiSchema.enum).find) == null ? void 0 : M.call(k, (E) => E.value === O);
-              q && (O = /* @__PURE__ */ jsx(Tag, { color: q.color, children: q.label }));
+              const q = (M = (k = v.uiSchema.enum).find) == null ? void 0 : M.call(k, (E) => E.value === L);
+              q && (L = /* @__PURE__ */ jsx(Tag, { color: q.color, children: q.label }));
             }
-          return (v == null ? void 0 : v.type) === "date" && (O = dayjs(O).format("YYYY-MM-DD")), n ? n({
-            [y.label]: O || EMPTY,
+          return (v == null ? void 0 : v.type) === "date" && (L = dayjs(L).format("YYYY-MM-DD")), n ? n({
+            [y.label]: L || EMPTY,
             [y.value]: w[y.value]
           }) : P(x({}, w), {
-            [y.label]: O || EMPTY,
+            [y.label]: L || EMPTY,
             [y.value]: w[y.value]
           });
         }).filter(Boolean);
@@ -44489,46 +44504,46 @@ const InternalFileManager = (e) => {
     },
     [v == null ? void 0 : v.uiSchema, y]
   ), T = (j) => z(void 0, null, function* () {
-    var O, N;
+    var L, N;
     const w = yield C.list({
       pageSize: 200,
       params: h == null ? void 0 : h.params,
-      filter: mergeFilter([j, (O = h == null ? void 0 : h.params) == null ? void 0 : O.filter]),
+      filter: mergeFilter([j, (L = h == null ? void 0 : h.params) == null ? void 0 : L.filter]),
       tree: j.parentId ? void 0 : !0
     });
     return (N = w == null ? void 0 : w.data) == null ? void 0 : N.data;
-  }), D = (j, w, O) => z(void 0, null, function* () {
+  }), D = (j, w, L) => z(void 0, null, function* () {
     const N = yield T({ parentId: w == null ? void 0 : w.id }), k = [...a];
-    if (k.splice(O + 1), k[O] = P(x({}, k[O]), { value: w }), w != null && w.id && (k[O + 1] = { key: w == null ? void 0 : w.id, children: (N == null ? void 0 : N.length) > 0 ? N : null }), i(k), ["o2m", "m2m"].includes(g.interface)) {
+    if (k.splice(L + 1), k[L] = P(x({}, k[L]), { value: w }), w != null && w.id && (k[L + 1] = { key: w == null ? void 0 : w.id, children: (N == null ? void 0 : N.length) > 0 ? N : null }), i(k), ["o2m", "m2m"].includes(g.interface)) {
       const M = Array.isArray(f.fieldValue) ? f.fieldValue : [];
       M[F.index] = w, f.fieldValue = M;
     } else
       f.value = w;
     k.length === 1 && !k[0].value ? o == null || o(null) : o == null || o(k);
-  }), B = (j, w, O) => z(void 0, null, function* () {
+  }), B = (j, w, L) => z(void 0, null, function* () {
     var N, k, M;
     if (j) {
       d(!0);
       const q = yield T({ parentId: w == null ? void 0 : w.key });
-      if (d(!1), c(q), O === (a == null ? void 0 : a.length) - 1 && ((N = w == null ? void 0 : w.value) != null && N.id)) {
+      if (d(!1), c(q), L === (a == null ? void 0 : a.length) - 1 && ((N = w == null ? void 0 : w.value) != null && N.id)) {
         const E = yield T({ parentId: (k = w == null ? void 0 : w.value) == null ? void 0 : k.id }), V = [...a];
-        V.splice(O + 1), V[O] = P(x({}, V[O]), { value: w == null ? void 0 : w.value }), V[O + 1] = { key: (M = w == null ? void 0 : w.value) == null ? void 0 : M.id, children: (E == null ? void 0 : E.length) > 0 ? E : null }, i(V), o == null || o(V);
+        V.splice(L + 1), V[L] = P(x({}, V[L]), { value: w == null ? void 0 : w.value }), V[L + 1] = { key: (M = w == null ? void 0 : w.value) == null ? void 0 : M.id, children: (E == null ? void 0 : E.length) > 0 ? E : null }, i(V), o == null || o(V);
       }
     }
   }), $ = (j, w) => z(void 0, null, function* () {
-    const O = j ? {
+    const L = j ? {
       [y.label]: {
         [I]: j
       }
     } : {};
     d(!0);
-    const N = yield T(P(x({}, O), {
+    const N = yield T(P(x({}, L), {
       parentId: w == null ? void 0 : w.key
     }));
     d(!1), c(N);
   });
   return /* @__PURE__ */ jsx(Space$1, { wrap: !0, children: a.map((j, w) => {
-    var O, N, k;
+    var L, N, k;
     return j.children && /* @__PURE__ */ jsx(
       Select$1,
       {
@@ -44539,7 +44554,7 @@ const InternalFileManager = (e) => {
         filterOption: !1,
         filterSort: null,
         defaultValue: {
-          label: (O = j == null ? void 0 : j.value) == null ? void 0 : O[y.label],
+          label: (L = j == null ? void 0 : j.value) == null ? void 0 : L[y.label],
           value: (N = j == null ? void 0 : j.value) == null ? void 0 : N[y.value]
         },
         labelInValue: !0,
@@ -44789,7 +44804,7 @@ const InternalNesterCardCss = css`
 }, InternalPicker = observer$1(
   (e) => {
     var N;
-    const O = e, { value: t, multiple: n, openSize: o, onChange: r, quickUpload: a, selectFile: i, shouldMountElement: l } = O, c = W(O, ["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(), R = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((M) => {
+    const L = e, { value: t, multiple: n, openSize: o, onChange: r, quickUpload: a, selectFile: i, shouldMountElement: l } = L, c = W(L, ["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(), R = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((M) => {
       const q = M == null ? void 0 : M[d.label];
       return P(x({}, M), {
         [d.label]: getLabelFormatValue$1(b(S), b(q))
@@ -44817,7 +44832,7 @@ const InternalNesterCardCss = css`
     useEffect(() => {
       t || I([]);
     }, [t]);
-    const L = () => {
+    const O = () => {
       const { setVisible: k } = useActionContext(), { multiple: M, selectedRows: q, onChange: E, options: V, collectionField: H } = useContext(RecordPickerContext);
       return {
         onClick() {
@@ -44829,7 +44844,7 @@ const InternalNesterCardCss = css`
       };
     }, j = useMemo(
       () => ({
-        usePickActionProps: L,
+        usePickActionProps: O,
         useTableSelectorProps: useTableSelectorProps$2
       }),
       []
@@ -44935,10 +44950,10 @@ const RenderRecord = React.memo(
     const R = useCallback(() => F.current, []);
     return useEffect(() => {
       const T = toArr$3(h).map((D, B, $) => {
-        const L = D == null ? void 0 : D[(e == null ? void 0 : e.label) || "label"], j = t ? transformNestedData(D).map((k) => k == null ? void 0 : k[(e == null ? void 0 : e.label) || "label"]).join(" / ") : isObject(L) ? JSON.stringify(L) : L, w = toValue$4(n(j), "N/A"), O = o(
+        const O = D == null ? void 0 : D[(e == null ? void 0 : e.label) || "label"], j = t ? transformNestedData(D).map((k) => k == null ? void 0 : k[(e == null ? void 0 : e.label) || "label"]).join(" / ") : isObject(O) ? JSON.stringify(O) : O, w = toValue$4(n(j), "N/A"), L = o(
           (D == null ? void 0 : D.__collection) || (r == null ? void 0 : r.target),
           (e == null ? void 0 : e.label) || "label"
-        ), N = getLabelFormatValue$1(n(O), w, !0);
+        ), N = getLabelFormatValue$1(n(L), w, !0);
         return /* @__PURE__ */ jsxs(Fragment, { children: [
           /* @__PURE__ */ jsx("span", { children: a ? N : i !== !1 ? /* @__PURE__ */ jsx(
             "a",
@@ -45019,8 +45034,8 @@ const getSourceData = (e, t) => {
   return n ? _.get(e, n) : e;
 }, ReadPrettyInternalViewer = (e) => {
   var B, $;
-  const { value: t, ButtonList: n = ButtonLinkList } = e, o = useFieldSchema(), { enableLink: r, openMode: a, openSize: i } = o["x-component-props"] || {}, l = useField(), [c, u] = useState(!1), { options: d } = useAssociationFieldContext(), p = useAssociationName(), { visibleWithURL: m, setVisibleWithURL: h } = usePopupUtils(), [g, f] = useState(!!m), { defaultOpenMode: C } = useOpenModeContext(), b = useCollectionRecordData(), [S, y] = useState(null), { isPopupVisibleControlledByURL: v } = usePopupSettings(), I = useCollection(), F = useCallback((L) => {
-    y(L.recordData);
+  const { value: t, ButtonList: n = ButtonLinkList } = e, o = useFieldSchema(), { enableLink: r, openMode: a, openSize: i } = o["x-component-props"] || {}, l = useField(), [c, u] = useState(!1), { options: d } = useAssociationFieldContext(), p = useAssociationName(), { visibleWithURL: m, setVisibleWithURL: h } = usePopupUtils(), [g, f] = useState(!!m), { defaultOpenMode: C } = useOpenModeContext(), b = useCollectionRecordData(), [S, y] = useState(null), { isPopupVisibleControlledByURL: v } = usePopupSettings(), I = useCollection(), F = useCallback((O) => {
+    y(O.recordData);
   }, []), R = /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: (B = e.ellipsis) != null ? B : !0, children: /* @__PURE__ */ jsx(CollectionRecordProvider, { isNew: !1, record: getSourceData(b, o), children: /* @__PURE__ */ jsx(
     n,
     {
@@ -45033,8 +45048,8 @@ const getSourceData = (e, t) => {
   ) }) }), T = useMemo(
     () => ({
       visible: c || m,
-      setVisible: (L) => {
-        u == null || u(L), h == null || h(L);
+      setVisible: (O) => {
+        u == null || u(O), h == null || h(O);
       },
       openMode: a || C,
       snapshot: (d == null ? void 0 : d.interface) === "snapshot",
@@ -45053,7 +45068,7 @@ const getSourceData = (e, t) => {
           schema: o,
           onlyRenderProperties: !0,
           basePath: l.address,
-          filterProperties: (L) => L["x-component"] === "AssociationField.Viewer"
+          filterProperties: (O) => O["x-component"] === "AssociationField.Viewer"
         }
       ) }) })
     ) : /* @__PURE__ */ jsx(
@@ -45072,7 +45087,7 @@ const getSourceData = (e, t) => {
             schema: o,
             onlyRenderProperties: !0,
             basePath: l.address,
-            filterProperties: (L) => L["x-component"] === "AssociationField.Viewer"
+            filterProperties: (O) => O["x-component"] === "AssociationField.Viewer"
           }
         ) }) }) })
       }
@@ -45519,8 +45534,8 @@ function FinallyButton(h) {
   } = g;
   var v, I, F, R, T, D;
   const { getCollection: b } = useCollectionManager_deprecated(), S = useACLActionParamsContext(), y = useMemo(() => {
-    var L;
-    const B = m && (((L = d == null ? void 0 : d.data) == null ? void 0 : L.hidden) || !S);
+    var O;
+    const B = m && (((O = d == null ? void 0 : d.data) == null ? void 0 : O.hidden) || !S);
     return {
       opacity: a !== "link" && B ? 0.1 : 1
     };
@@ -45534,7 +45549,7 @@ function FinallyButton(h) {
       danger: r.danger,
       icon: u,
       onClick: (B) => {
-        const $ = getLinkageCollection(t, p, d), L = e.find((w) => w.name === $) ? $ : c.name, j = b(L);
+        const $ = getLinkageCollection(t, p, d), O = e.find((w) => w.name === $) ? $ : c.name, j = b(O);
         l == null || l(j);
       },
       style: x({
@@ -45697,22 +45712,22 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
       }
     });
     Array.isArray(o.value) || (o.value = []);
-    const D = useCallback(({ form: w, fieldSchema: O, collectionField: N, getInterface: k }) => {
+    const D = useCallback(({ form: w, fieldSchema: L, collectionField: N, getInterface: k }) => {
       var M;
-      return !N || N.target && ((M = O["x-component-props"]) != null && M.mode) && !["Picker", "Select"].includes(O["x-component-props"].mode) ? !1 : !(w != null && w.readPretty) && !isPatternDisabled(O) && !interfacesOfUnsupportedDefaultValue.includes(N == null ? void 0 : N.interface) && !isSystemField(N, k);
+      return !N || N.target && ((M = L["x-component-props"]) != null && M.mode) && !["Picker", "Select"].includes(L["x-component-props"].mode) ? !1 : !(w != null && w.readPretty) && !isPatternDisabled(L) && !interfacesOfUnsupportedDefaultValue.includes(N == null ? void 0 : N.interface) && !isSystemField(N, k);
     }, []), B = () => {
-      const { setVisible: w } = useActionContext(), { selectedRows: O, setSelectedRows: N } = useContext(RecordPickerContext);
+      const { setVisible: w } = useActionContext(), { selectedRows: L, setSelectedRows: N } = useContext(RecordPickerContext);
       return {
         onClick() {
-          O.map((k) => o.value.push(markRecordAsNew(k))), o.onInput(o.value), o.initialValue = o.value, N([]), w(!1);
+          L.map((k) => o.value.push(markRecordAsNew(k))), o.onInput(o.value), o.initialValue = o.value, N([]), w(!1);
         }
       };
-    }, $ = useMemo(() => o.value && Object.keys(o.value).length > 0 ? (Array.isArray(o.value) ? o.value : o.value ? [o.value] : []).filter(Boolean).map((O) => {
-      const N = O == null ? void 0 : O[I.label];
-      return P(x({}, O), {
+    }, $ = useMemo(() => o.value && Object.keys(o.value).length > 0 ? (Array.isArray(o.value) ? o.value : o.value ? [o.value] : []).filter(Boolean).map((L) => {
+      const N = L == null ? void 0 : L[I.label];
+      return P(x({}, L), {
         [I.label]: getLabelFormatValue$1(F(R), F(N))
       });
-    }) : [], [o.value, I == null ? void 0 : I.label]), L = {
+    }) : [], [o.value, I == null ? void 0 : I.label]), O = {
       size: "small",
       fieldNames: o.componentProps.fieldNames,
       multiple: !0,
@@ -45725,8 +45740,8 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
       setSelectedRows: v,
       collectionField: n
     }, j = () => {
-      const w = (n == null ? void 0 : n.targetKey) || "id", O = (o.value || []).map((k) => k == null ? void 0 : k[w]).filter(Boolean);
-      return O.length ? { $and: [{ [`${w}.$ne`]: O }] } : {};
+      const w = (n == null ? void 0 : n.targetKey) || "id", L = (o.value || []).map((k) => k == null ? void 0 : k[w]).filter(Boolean);
+      return L.length ? { $and: [{ [`${w}.$ne`]: L }] } : {};
     };
     return o.value.length > 0 ? /* @__PURE__ */ jsxs(
       Card,
@@ -45740,31 +45755,31 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
         `,
         children: [
           /* @__PURE__ */ jsxs(RefreshComponentProvider, { refresh: C, children: [
-            o.value.map((w, O) => {
+            o.value.map((w, L) => {
               let N = a;
               return a || (N = !(w != null && w[n.targetKey])), /* @__PURE__ */ jsxs(React.Fragment, { children: [
-                /* @__PURE__ */ jsx("div", { style: { textAlign: "right" }, children: !o.readPretty && N && (!t["x-template-uid"] || O > 0) && /* @__PURE__ */ jsx(Tooltip, { title: c("Remove"), children: /* @__PURE__ */ jsx(
+                /* @__PURE__ */ jsx("div", { style: { textAlign: "right" }, children: !o.readPretty && N && (!t["x-template-uid"] || L > 0) && /* @__PURE__ */ jsx(Tooltip, { title: c("Remove"), children: /* @__PURE__ */ jsx(
                   CloseOutlined,
                   {
                     style: { zIndex: 1e3, color: "#a8a3a3" },
                     onClick: () => {
                       action(() => (spliceArrayState(o, {
-                        startIndex: O,
+                        startIndex: L,
                         deleteCount: 1
-                      }), o.value.splice(O, 1), Array.isArray(o.initialValue) && o.initialValue.splice(O, 1), o.onInput(o.value)));
+                      }), o.value.splice(L, 1), Array.isArray(o.initialValue) && o.initialValue.splice(L, 1), o.onInput(o.value)));
                     }
                   }
                 ) }, "remove") }),
-                /* @__PURE__ */ jsx(FormActiveFieldsProvider, { name: "nester", children: /* @__PURE__ */ jsx(SubFormProvider, { value: { value: w, collection: d, fieldSchema: t.parent }, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: isNewRecord(w), record: w, parent: u, children: /* @__PURE__ */ jsx(RecordIndexProvider, { index: O, children: /* @__PURE__ */ jsx(DefaultValueProvider, { isAllowToSetDefaultValue: D, children: /* @__PURE__ */ jsx(
+                /* @__PURE__ */ jsx(FormActiveFieldsProvider, { name: "nester", children: /* @__PURE__ */ jsx(SubFormProvider, { value: { value: w, collection: d, fieldSchema: t.parent }, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: isNewRecord(w), record: w, parent: u, children: /* @__PURE__ */ jsx(RecordIndexProvider, { index: L, children: /* @__PURE__ */ jsx(DefaultValueProvider, { isAllowToSetDefaultValue: D, children: /* @__PURE__ */ jsx(
                   NocoBaseRecursionField,
                   {
                     onlyRenderProperties: !0,
-                    basePath: o.address.concat(O),
+                    basePath: o.address.concat(L),
                     schema: h
                   }
                 ) }) }) }) }) }),
                 /* @__PURE__ */ jsx(Divider$1, {})
-              ] }, O);
+              ] }, L);
             }),
             /* @__PURE__ */ jsxs(Space$1, { children: [
               o.editable && r && /* @__PURE__ */ jsx(
@@ -45775,8 +45790,8 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
                       action(() => {
                         Array.isArray(o.value) || (o.value = []);
                         const w = o.value.length;
-                        return o.value.splice(w, 0, markRecordAsNew({})), each(o.form.fields, (O, N) => {
-                          O || delete o.form.fields[N];
+                        return o.value.splice(w, 0, markRecordAsNew({})), each(o.form.fields, (L, N) => {
+                          L || delete o.form.fields[N];
                         }), o.onInput(o.value);
                       });
                     }
@@ -45810,7 +45825,7 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
                 visible: b,
                 setVisible: S
               },
-              children: /* @__PURE__ */ jsx(RecordPickerProvider, P(x({}, L), { children: /* @__PURE__ */ jsx(CollectionProvider, { name: n == null ? void 0 : n.target, children: /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(TableSelectorParamsProvider, { params: { filter: j() }, children: /* @__PURE__ */ jsx(
+              children: /* @__PURE__ */ jsx(RecordPickerProvider, P(x({}, O), { children: /* @__PURE__ */ jsx(CollectionProvider, { name: n == null ? void 0 : n.target, children: /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(TableSelectorParamsProvider, { params: { filter: j() }, children: /* @__PURE__ */ jsx(
                 SchemaComponentOptions,
                 {
                   scope: {
@@ -45857,7 +45872,7 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
     S.current = t;
     const y = useCallback(() => S.current, []);
     return /* @__PURE__ */ jsx(Fragment$1, { children: toArr$3(e.value).map((I, F, R) => {
-      const T = I == null ? void 0 : I[(r == null ? void 0 : r.label) || "label"], D = g ? transformNestedData(I).map((L) => L == null ? void 0 : L[(r == null ? void 0 : r.label) || "label"]).join(" / ") : isObject(T) ? JSON.stringify(T) : T, B = toValue$3(l(D), "N/A"), $ = getTabFormatValue(l(u), B, I[o]);
+      const T = I == null ? void 0 : I[(r == null ? void 0 : r.label) || "label"], D = g ? transformNestedData(I).map((O) => O == null ? void 0 : O[(r == null ? void 0 : r.label) || "label"]).join(" / ") : isObject(T) ? JSON.stringify(T) : T, B = toValue$3(l(D), "N/A"), $ = getTabFormatValue(l(u), B, I[o]);
       return /* @__PURE__ */ jsxs(Fragment, { children: [
         /* @__PURE__ */ jsx("span", { children: d ? $ : n !== !1 ? /* @__PURE__ */ jsx(
           "a",
@@ -45865,9 +45880,9 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
             onMouseEnter: () => {
               e.setBtnHover(!0);
             },
-            onClick: (L) => {
+            onClick: (O) => {
               var j;
-              e.setBtnHover(!0), L.stopPropagation(), L.preventDefault(), c && !t.properties && (a(schema$1.Viewer), b.current = !0), b.current ? setTimeout(() => {
+              e.setBtnHover(!0), O.stopPropagation(), O.preventDefault(), c && !t.properties && (a(schema$1.Viewer), b.current = !0), b.current ? setTimeout(() => {
                 f({
                   recordData: I,
                   parentRecordData: C,
@@ -45958,8 +45973,8 @@ const useColumnsDeepMemoized = (e) => {
         width: I && !i ? 0 : ((D = S["x-component-props"]) == null ? void 0 : D.width) || 100,
         render: (B, $) => {
           var w;
-          const L = (w = o.value) == null ? void 0 : w.indexOf($), j = o.address.concat($.__index || L);
-          return /* @__PURE__ */ jsx(SubFormProvider, { value: { value: $, collection: f, fieldSchema: r.parent }, children: /* @__PURE__ */ jsx(RecordIndexProvider, { index: $.__index || L, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: isNewRecord($), record: $, parent: u, children: /* @__PURE__ */ jsx(ColumnFieldProvider, { schema: S, basePath: j, children: /* @__PURE__ */ jsx("span", { role: "button", className: g, children: /* @__PURE__ */ jsx(RecursionField, { basePath: j, schema: S, onlyRenderProperties: !0 }) }, L) }) }) }) });
+          const O = (w = o.value) == null ? void 0 : w.indexOf($), j = o.address.concat($.__index || O);
+          return /* @__PURE__ */ jsx(SubFormProvider, { value: { value: $, collection: f, fieldSchema: r.parent }, children: /* @__PURE__ */ jsx(RecordIndexProvider, { index: $.__index || O, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: isNewRecord($), record: $, parent: u, children: /* @__PURE__ */ jsx(ColumnFieldProvider, { schema: S, basePath: j, children: /* @__PURE__ */ jsx("span", { role: "button", className: g, children: /* @__PURE__ */ jsx(RecursionField, { basePath: j, schema: S, onlyRenderProperties: !0 }) }, O) }) }) }) });
         },
         onCell: (B, $) => ({
           record: B,
@@ -46298,7 +46313,7 @@ const Table$1 = withDynamicSchemaProps(
       "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, $ = useMemoizedFn(S.onRowDragEnd || (() => {
-    })), L = usePaginationProps$2(n, a), j = useTableColumns$1(S, L), [w, O] = useState(() => D ? B : []), [N, k] = useState(((be = y == null ? void 0 : y.data) == null ? void 0 : be.selectedRowKeys) || []), [M, q] = useState([]), E = (p == null ? void 0 : p.type) !== "none", V = useRef(/* @__PURE__ */ new Map()), H = useMemo(() => css`
+    })), O = usePaginationProps$2(n, a), j = useTableColumns$1(S, O), [w, L] = useState(() => D ? B : []), [N, k] = useState(((be = y == null ? void 0 : y.data) == null ? void 0 : be.selectedRowKeys) || []), [M, q] = useState([]), E = (p == null ? void 0 : p.type) !== "none", V = useRef(/* @__PURE__ */ new Map()), H = useMemo(() => css`
         & > td {
           background-color: ${t.controlItemBgActive} !important;
         }
@@ -46313,7 +46328,7 @@ const Table$1 = withDynamicSchemaProps(
     }) : null, [C, M]);
     useDeepCompareEffect(() => {
       const Z = D ? B : [];
-      _.isEqual(Z, w) || O(Z);
+      _.isEqual(Z, w) || L(Z);
     }, [D, B]);
     const Y = useCallback((Z) => {
       if (m)
@@ -46372,7 +46387,7 @@ const Table$1 = withDynamicSchemaProps(
           renderCell: (Z, oe, re, ie) => {
             if (!l && !c)
               return ie;
-            const ce = L == null ? void 0 : L.current, fe = (L == null ? void 0 : L.pageSize) || 20;
+            const ce = O == null ? void 0 : O.current, fe = (O == null ? void 0 : O.pageSize) || 20;
             return ce ? re = re + (ce - 1) * fe + 1 : re = re + 1, oe.__index && (re = extractIndex(oe.__index)), /* @__PURE__ */ jsxs(
               "div",
               {
@@ -46413,7 +46428,7 @@ const Table$1 = withDynamicSchemaProps(
         J,
         E,
         Q,
-        L,
+        O,
         b
       ]
     ), ne = useCallback(
@@ -46439,7 +46454,7 @@ const Table$1 = withDynamicSchemaProps(
     ), he = useCallback(
       (Z, oe) => {
         const re = Z ? [...w, oe[F.getPrimaryKey()]] : w.filter((ie) => oe[F.getPrimaryKey()] !== ie);
-        O(re), g == null || g(Z, oe);
+        L(re), g == null || g(Z, oe);
       },
       [w, g, F]
     ), ge = useMemo(() => ({
@@ -46457,7 +46472,7 @@ const Table$1 = withDynamicSchemaProps(
           defaultRowKey: Y,
           dataSource: K
         }, S), te), {
-          paginationProps: L,
+          paginationProps: O,
           components: ee,
           onTableChange: d,
           onRow: G,
@@ -46568,10 +46583,10 @@ const Table$1 = withDynamicSchemaProps(
     }, T = () => {
       const E = (o == null ? void 0 : o.targetKey) || "id", V = (n.value || []).map((U) => U == null ? void 0 : U[E]).filter(Boolean);
       return V.length ? { $and: [{ [`${E}.$ne`]: V }] } : {};
-    }, [D, B] = useState(1), [$, L] = useState(((k = n.componentProps) == null ? void 0 : k.pageSize) || 10), { setFormValueChanged: j } = useActionContext();
+    }, [D, B] = useState(1), [$, O] = useState(((k = n.componentProps) == null ? void 0 : k.pageSize) || 10), { setFormValueChanged: j } = useActionContext();
     useEffect(() => {
       var E;
-      L((E = n.componentProps) == null ? void 0 : E.pageSize);
+      O((E = n.componentProps) == null ? void 0 : E.pageSize);
     }, [(M = n.componentProps) == null ? void 0 : M.pageSize]);
     const w = useMemo(() => {
       var V;
@@ -46581,13 +46596,13 @@ const Table$1 = withDynamicSchemaProps(
         pageSize: $ || 10,
         total: n == null ? void 0 : n.value,
         onChange: (H, U) => {
-          B(H), L(U), n.componentProps.pageSize = U, n.onInput(n.value), j == null || j(!1);
+          B(H), O(U), n.componentProps.pageSize = U, n.onInput(n.value), j == null || j(!1);
         },
         showSizeChanger: !0,
         pageSizeOptions: ["10", "20", "50", "100"],
         hideOnSinglePage: !1
       };
-    }, [(q = n.value) == null ? void 0 : q.length, $, D]), O = () => {
+    }, [(q = n.value) == null ? void 0 : q.length, $, D]), L = () => {
       const { field: E } = useAssociationFieldContext();
       return {
         run() {
@@ -46632,7 +46647,7 @@ const Table$1 = withDynamicSchemaProps(
                 b !== !1 && /* @__PURE__ */ jsx(
                   Action.Link,
                   {
-                    useAction: O,
+                    useAction: L,
                     title: /* @__PURE__ */ jsxs(Space$1, { style: { gap: 2 }, className: "nb-sub-table-addNew", children: [
                       /* @__PURE__ */ jsx(PlusOutlined, {}),
                       " ",
@@ -46778,8 +46793,8 @@ const ReadPretty$7 = observer$1(
 InternalAssociationSelect.displayName = "InternalAssociationSelect";
 const AssociationSelect = InternalAssociationSelect;
 AssociationSelect.Designer = function e() {
-  var O, N, k, M, q, E, V, H, U, G, Y;
-  const { getCollectionFields: t, getInterface: n, getCollectionJoinField: o, getCollection: r, isTitleField: a } = useCollectionManager_deprecated(), { getField: i } = useCollection_deprecated(), { form: l } = useFormBlockContext(), c = useField(), u = useFieldSchema(), { t: d } = useTranslation(), p = useFilterByTk(), { dn: m, refresh: h, insertAdjacent: g } = useDesignable(), f = useCompile(), C = useIsShowMultipleSwitch(), { isAllowToSetDefaultValue: b } = useIsAllowToSetDefaultValue(), S = i(u.name) || o(u["x-collection-field"]), y = useFieldComponentOptions(), v = c.address.segments.includes("__form_grid"), I = n(S == null ? void 0 : S.interface), F = (O = I == null ? void 0 : I.validateSchema) == null ? void 0 : O.call(I, u), R = (N = S == null ? void 0 : S.uiSchema) == null ? void 0 : N.title, T = S != null && S.target ? t(S == null ? void 0 : S.target) : [];
+  var L, N, k, M, q, E, V, H, U, G, Y;
+  const { getCollectionFields: t, getInterface: n, getCollectionJoinField: o, getCollection: r, isTitleField: a } = useCollectionManager_deprecated(), { getField: i } = useCollection_deprecated(), { form: l } = useFormBlockContext(), c = useField(), u = useFieldSchema(), { t: d } = useTranslation(), p = useFilterByTk(), { dn: m, refresh: h, insertAdjacent: g } = useDesignable(), f = useCompile(), C = useIsShowMultipleSwitch(), { isAllowToSetDefaultValue: b } = useIsAllowToSetDefaultValue(), S = i(u.name) || o(u["x-collection-field"]), y = useFieldComponentOptions(), v = c.address.segments.includes("__form_grid"), I = n(S == null ? void 0 : S.interface), F = (L = I == null ? void 0 : I.validateSchema) == null ? void 0 : L.call(I, u), R = (N = S == null ? void 0 : S.uiSchema) == null ? void 0 : N.title, T = S != null && S.target ? t(S == null ? void 0 : S.target) : [];
   c.title === R || c.title;
   const D = useSortFields(S == null ? void 0 : S.target), B = ((q = (M = (k = c.componentProps) == null ? void 0 : k.service) == null ? void 0 : M.params) == null ? void 0 : q.sort) || [];
   useEffect(() => {
@@ -46793,7 +46808,7 @@ AssociationSelect.Designer = function e() {
     direction: "asc"
   });
   c.readPretty || c.required;
-  const L = T.filter((J) => a(J)).map((J) => {
+  const O = T.filter((J) => a(J)).map((J) => {
     var K;
     return {
       value: J == null ? void 0 : J.name,
@@ -47144,7 +47159,7 @@ AssociationSelect.Designer = function e() {
       SchemaSettingsSelectItem,
       {
         title: d("Title field"),
-        options: L,
+        options: O,
         value: (Y = (G = c == null ? void 0 : c.componentProps) == null ? void 0 : G.fieldNames) == null ? void 0 : Y.label,
         onChange: (J) => {
           var ee, Q;
@@ -47177,7 +47192,7 @@ AssociationSelect.Designer = function e() {
   ] });
 };
 AssociationSelect.FilterDesigner = function e() {
-  var I, F, R, T, D, B, $, L, j, w, O;
+  var I, F, R, T, D, B, $, O, j, w, L;
   const { getCollectionFields: t, getInterface: n, getCollectionJoinField: o } = useCollectionManager_deprecated(), { getField: r } = useCollection_deprecated(), { form: a } = useFormBlockContext(), i = useField(), l = useFieldSchema(), { t: c } = useTranslation(), { dn: u, refresh: d } = useDesignable(), p = useCompile(), m = r(l.name) || o(l["x-collection-field"]), h = n(m == null ? void 0 : m.interface), g = (I = h == null ? void 0 : h.validateSchema) == null ? void 0 : I.call(h, l), f = (F = m == null ? void 0 : m.uiSchema) == null ? void 0 : F.title, C = m != null && m.target ? t(m == null ? void 0 : m.target) : [];
   i.title === f || i.title;
   const b = useSortFields(m == null ? void 0 : m.target), S = ((D = (T = (R = i.componentProps) == null ? void 0 : R.service) == null ? void 0 : T.params) == null ? void 0 : D.sort) || [], y = S == null ? void 0 : S.map((N) => N.startsWith("-") ? {
@@ -47332,7 +47347,7 @@ AssociationSelect.FilterDesigner = function e() {
       SchemaSettingsDataScope,
       {
         collectionName: m == null ? void 0 : m.target,
-        defaultFilter: ((j = (L = ($ = i.componentProps) == null ? void 0 : $.service) == null ? void 0 : L.params) == null ? void 0 : j.filter) || {},
+        defaultFilter: ((j = (O = ($ = i.componentProps) == null ? void 0 : $.service) == null ? void 0 : O.params) == null ? void 0 : j.filter) || {},
         form: a,
         onSubmit: ({ filter: N }) => {
           N = removeNullCondition(N), _.set(i.componentProps, "service.params.filter", N), l["x-component-props"] = i.componentProps, u.emit("patch", {
@@ -47434,7 +47449,7 @@ AssociationSelect.FilterDesigner = function e() {
       {
         title: c("Title field"),
         options: v,
-        value: (O = (w = i == null ? void 0 : i.componentProps) == null ? void 0 : w.fieldNames) == null ? void 0 : O.label,
+        value: (L = (w = i == null ? void 0 : i.componentProps) == null ? void 0 : w.fieldNames) == null ? void 0 : L.label,
         onChange: (N) => {
           var q, E;
           const k = {
@@ -47787,13 +47802,16 @@ const DataSourceSelect = connect((e) => {
               "#1677FF",
               "#F5222D",
               "#FADB14",
+              "#E6F4FF",
+              "#fff1f0",
+              "#F6FFED",
+              "#E6FFFB",
               "#FA8C164D",
               "#FADB144D",
               "#52C41A4D",
               "#1677FF4D",
               "#2F54EB4D",
-              "#722ED14D",
-              "#EB2F964D"
+              "#722ED14D"
             ]
           }
         ],
@@ -48883,8 +48901,8 @@ const InternalListBlockProvider = (e) => {
           }
         },
         onSubmit: ({ sort: $ }) => {
-          const L = $.map((j) => j.direction === "desc" ? `-${j.field}` : j.field);
-          _.set(i, "x-decorator-props.params.sort", L), c.decoratorProps.params = P(x({}, i["x-decorator-props"].params), { page: 1 }), u.emit("patch", {
+          const O = $.map((j) => j.direction === "desc" ? `-${j.field}` : j.field);
+          _.set(i, "x-decorator-props.params.sort", O), c.decoratorProps.params = P(x({}, i["x-decorator-props"].params), { page: 1 }), u.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
               "x-decorator-props": i["x-decorator-props"]
@@ -49017,7 +49035,7 @@ const InternalListBlockProvider = (e) => {
   return e - u - n.paddingLG - l;
 }, InternalList = withSkeletonComponent(
   (e) => {
-    var j, w, O, N;
+    var j, w, L, N;
     const { service: t } = useListBlockContext(), { run: n, params: o } = t, r = useFieldSchema(), a = useDesigner(), i = (j = t == null ? void 0 : t.data) == null ? void 0 : j.meta, { pageSize: l, count: c, hasNext: u, page: d } = i || {}, p = useField(), [m] = useState(/* @__PURE__ */ new Map()), { wrapSSR: h, componentCls: g, hashId: f } = useStyles$3(), C = useListBlockHeight(), { token: b } = theme.useToken(), S = useCallback(
       (k) => (m.has(k) || m.set(
         k,
@@ -49081,7 +49099,7 @@ const InternalListBlockProvider = (e) => {
           }
         ) : E
       };
-    })(), { isMobileLayout: L } = useMobileLayout();
+    })(), { isMobileLayout: O } = useMobileLayout();
     return h(
       /* @__PURE__ */ jsx(
         SchemaComponentOptions,
@@ -49119,7 +49137,7 @@ const InternalListBlockProvider = (e) => {
                     children: /* @__PURE__ */ jsx(
                       List$1,
                       P(x({}, e), {
-                        pagination: !i || !((w = p.value) != null && w.length) || c <= ((O = p.value) == null ? void 0 : O.length) ? !1 : $,
+                        pagination: !i || !((w = p.value) != null && w.length) || c <= ((L = p.value) == null ? void 0 : L.length) ? !1 : $,
                         loading: t == null ? void 0 : t.loading,
                         children: (N = p.value) != null && N.length ? p.value.map((k, M) => /* @__PURE__ */ jsx(
                           NocoBaseRecursionField,
@@ -49127,7 +49145,7 @@ const InternalListBlockProvider = (e) => {
                             basePath: p.address,
                             name: M,
                             onlyRenderProperties: !0,
-                            schema: L ? transformMultiColumnToSingleColumn(S(M)) : S(M)
+                            schema: O ? transformMultiColumnToSingleColumn(S(M)) : S(M)
                           },
                           M
                         )) : null
@@ -49566,8 +49584,8 @@ const toValue$1 = (e, t) => e == null ? t : e, ReadPrettyRecordPicker = observer
           "a",
           {
             onClick: ($) => {
-              var L;
-              $.stopPropagation(), $.preventDefault(), l(!0), p(F), (L = C == null ? void 0 : C.current) == null || L.setPopoverVisible(!1);
+              var O;
+              $.stopPropagation(), $.preventDefault(), l(!0), p(F), (O = C == null ? void 0 : C.current) == null || O.setPopoverVisible(!1);
             },
             children: B
           }
@@ -50985,7 +51003,7 @@ const TableActionColumnDesigner = (e) => {
     "sort-field"
   );
 }, TableBlockDesigner = () => {
-  var I, F, R, T, D, B, $, L, j, w, O, N;
+  var I, F, R, T, D, B, $, O, j, w, L, N;
   const { name: e, title: t } = useCollection_deprecated(), { getCollectionField: n, getCollection: o } = useCollectionManager_deprecated(), r = useField(), a = useFieldSchema(), { form: i } = useFormBlockContext(), l = useSortFields(e), { service: c } = useTableBlockContext(), { t: u } = useTranslation(), { dn: d } = useDesignable();
   useBlockTemplateContext();
   const p = ((F = (I = a == null ? void 0 : a["x-decorator-props"]) == null ? void 0 : I.params) == null ? void 0 : F.sort) || [];
@@ -51071,7 +51089,7 @@ const TableActionColumnDesigner = (e) => {
       SchemaSettingsDataScope,
       {
         collectionName: e,
-        defaultFilter: ((j = (L = a == null ? void 0 : a["x-decorator-props"]) == null ? void 0 : L.params) == null ? void 0 : j.filter) || {},
+        defaultFilter: ((j = (O = a == null ? void 0 : a["x-decorator-props"]) == null ? void 0 : O.params) == null ? void 0 : j.filter) || {},
         form: i,
         onSubmit: y
       }
@@ -51168,7 +51186,7 @@ const TableActionColumnDesigner = (e) => {
       SchemaSettingsSelectItem,
       {
         title: u("Records per page"),
-        value: ((O = (w = r.decoratorProps) == null ? void 0 : w.params) == null ? void 0 : O.pageSize) || 20,
+        value: ((L = (w = r.decoratorProps) == null ? void 0 : w.params) == null ? void 0 : L.pageSize) || 20,
         options: [
           { label: "5", value: 5 },
           { label: "10", value: 10 },
@@ -51242,7 +51260,7 @@ TableField.ActionBar = observer$1(
   { displayName: "TableField.ActionBar" }
 );
 const TableSelectorDesigner = () => {
-  var R, T, D, B, $, L;
+  var R, T, D, B, $, O;
   const { name: e, title: t } = useCollection_deprecated(), { getCollectionJoinField: n, getAllCollectionsInheritChain: o } = useCollectionManager_deprecated(), r = useField(), a = useFieldSchema(), { form: i } = useFormBlockContext(), l = useSortFields(e), { service: c, extraFilter: u } = useTableSelectorContext(), { t: d } = useTranslation(), { dn: p } = useDesignable(), m = ((T = (R = a == null ? void 0 : a["x-decorator-props"]) == null ? void 0 : R.params) == null ? void 0 : T.sort) || [], h = recursiveParent(a, "CollectionField"), g = n(h == null ? void 0 : h["x-collection-field"]), f = m == null ? void 0 : m.map((j) => j.startsWith("-") ? {
     field: j.substring(1),
     direction: "desc"
@@ -51261,10 +51279,10 @@ const TableSelectorDesigner = () => {
           j = removeNullCondition(j);
           const w = r.decoratorProps.params || {};
           w.filter = j, r.decoratorProps.params = w, a["x-decorator-props"].params = w;
-          let O = _.cloneDeep(j);
-          u && (O ? O = {
-            $and: [u, O]
-          } : O = u), c.run(P(x({}, (N = c.params) == null ? void 0 : N[0]), { filter: O, page: 1 })), p.emit("patch", {
+          let L = _.cloneDeep(j);
+          u && (L ? L = {
+            $and: [u, L]
+          } : L = u), c.run(P(x({}, (N = c.params) == null ? void 0 : N[0]), { filter: L, page: 1 })), p.emit("patch", {
             schema: {
               "x-uid": a["x-uid"],
               "x-decorator-props": a["x-decorator-props"]
@@ -51297,9 +51315,9 @@ const TableSelectorDesigner = () => {
         defaultChecked: !0,
         checked: r.decoratorProps.treeTable,
         onChange: (j) => {
-          var O;
+          var L;
           r.form.clearFormGraph(`${r.address}.*`), r.decoratorProps.treeTable = j, a["x-decorator-props"].treeTable = j;
-          const w = P(x({}, (O = c.params) == null ? void 0 : O[0]), {
+          const w = P(x({}, (L = c.params) == null ? void 0 : L[0]), {
             tree: j ? !0 : null
           });
           p.emit("patch", {
@@ -51386,8 +51404,8 @@ const TableSelectorDesigner = () => {
         },
         onSubmit: ({ sort: j }) => {
           var N;
-          const w = j.map((k) => k.direction === "desc" ? `-${k.field}` : k.field), O = r.decoratorProps.params || {};
-          O.sort = w, r.decoratorProps.params = O, a["x-decorator-props"].params = O, p.emit("patch", {
+          const w = j.map((k) => k.direction === "desc" ? `-${k.field}` : k.field), L = r.decoratorProps.params || {};
+          L.sort = w, r.decoratorProps.params = L, a["x-decorator-props"].params = L, p.emit("patch", {
             schema: {
               "x-uid": a["x-uid"],
               "x-decorator-props": a["x-decorator-props"]
@@ -51400,7 +51418,7 @@ const TableSelectorDesigner = () => {
       SchemaSettingsSelectItem,
       {
         title: d("Records per page"),
-        value: ((L = ($ = r.decoratorProps) == null ? void 0 : $.params) == null ? void 0 : L.pageSize) || 20,
+        value: ((O = ($ = r.decoratorProps) == null ? void 0 : $.params) == null ? void 0 : O.pageSize) || 20,
         options: [
           { label: "5", value: 5 },
           { label: "10", value: 10 },
@@ -51410,9 +51428,9 @@ const TableSelectorDesigner = () => {
           { label: "200", value: 200 }
         ],
         onChange: (j) => {
-          var O;
+          var L;
           const w = r.decoratorProps.params || {};
-          w.pageSize = j, r.decoratorProps.params = w, a["x-decorator-props"].params = w, c.run(P(x({}, (O = c.params) == null ? void 0 : O[0]), { pageSize: j, page: 1 })), p.emit("patch", {
+          w.pageSize = j, r.decoratorProps.params = w, a["x-decorator-props"].params = w, c.run(P(x({}, (L = c.params) == null ? void 0 : L[0]), { pageSize: j, page: 1 })), p.emit("patch", {
             schema: {
               "x-uid": a["x-uid"],
               "x-decorator-props": a["x-decorator-props"]
@@ -53213,11 +53231,11 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           if (D && I) {
             const $ = ((B = r(D)) == null ? void 0 : B.fields) || [];
             o(
-              $ == null ? void 0 : $.filter((L) => supportTypes.includes(L.type)).map((L) => {
+              $ == null ? void 0 : $.filter((O) => supportTypes.includes(O.type)).map((O) => {
                 var j;
                 return {
-                  value: L.name,
-                  label: g(((j = L.uiSchema) == null ? void 0 : j.title) || L.name)
+                  value: O.name,
+                  label: g(((j = O.uiSchema) == null ? void 0 : j.title) || O.name)
                 };
               })
             );
@@ -53406,12 +53424,12 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   const t = useRecord();
   return /* @__PURE__ */ jsx(AddFieldAction, x({ item: t }, e));
 }, AddFieldAction = (e) => {
-  var L, j;
-  const { scope: t, getContainer: n, item: o, children: r, trigger: a, align: i, database: l } = e, { getInterface: c, getTemplate: u, collections: d, getCollection: p } = useCollectionManager_deprecated(), [m, h] = useState(!1), [g, f] = useState(), [C, b] = useState({}), S = useCompile(), { t: y } = useTranslation(), { isDialect: v } = useDialect(), I = useFieldInterfaceOptions(), F = ((j = (L = p(o.name)) == null ? void 0 : L.options) == null ? void 0 : j.fields) || o.fields || [], R = useMemo(() => d.map((w) => ({
+  var O, j;
+  const { scope: t, getContainer: n, item: o, children: r, trigger: a, align: i, database: l } = e, { getInterface: c, getTemplate: u, collections: d, getCollection: p } = useCollectionManager_deprecated(), [m, h] = useState(!1), [g, f] = useState(), [C, b] = useState({}), S = useCompile(), { t: y } = useTranslation(), { isDialect: v } = useDialect(), I = useFieldInterfaceOptions(), F = ((j = (O = p(o.name)) == null ? void 0 : O.options) == null ? void 0 : j.fields) || o.fields || [], R = useMemo(() => d.map((w) => ({
     label: S(w.title),
     value: w.name
   })), []), T = useCallback(() => {
-    const { availableFieldInterfaces: w } = u(o.template) || {}, { exclude: O, include: N } = w || {}, k = [];
+    const { availableFieldInterfaces: w } = u(o.template) || {}, { exclude: L, include: N } = w || {}, k = [];
     return I.forEach((M) => {
       var q;
       if (M.key === "systemInfo")
@@ -53426,14 +53444,14 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           H && E.push(P(x({}, H), {
             targetScope: V == null ? void 0 : V.targetScope
           }));
-        }) : O != null && O.length ? E = (q = M == null ? void 0 : M.children) == null ? void 0 : q.filter((V) => !O.includes(V.name)) : E = M == null ? void 0 : M.children, E != null && E.length && k.push(P(x({}, M), {
+        }) : L != null && L.length ? E = (q = M == null ? void 0 : M.children) == null ? void 0 : q.filter((V) => !L.includes(V.name)) : E = M == null ? void 0 : M.children, E != null && E.length && k.push(P(x({}, M), {
           children: E
         }));
       }
     }), k;
   }, [u, o]), D = useMemo(() => T().map((w) => {
-    var O;
-    return ((O = w == null ? void 0 : w.children) == null ? void 0 : O.length) === 0 ? null : o.template === "view" ? {
+    var L;
+    return ((L = w == null ? void 0 : w.children) == null ? void 0 : L.length) === 0 ? null : o.template === "view" ? {
       type: "group",
       label: S(w.label),
       title: S(w.label),
@@ -53457,25 +53475,25 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       }))
     };
   }).filter((w) => {
-    var O;
-    return (O = w == null ? void 0 : w.children) == null ? void 0 : O.length;
+    var L;
+    return (L = w == null ? void 0 : w.children) == null ? void 0 : L.length;
   }), [T]), B = useMemo(() => ({
     style: {
       maxHeight: "60vh",
       overflow: "auto"
     },
     onClick: (w) => {
-      const O = w.item.props["data-targetScope"];
-      O && f(O);
+      const L = w.item.props["data-targetScope"];
+      L && f(L);
       const N = getSchema$8(c(w.key), o, S);
       N && (b(N), h(!0));
     },
     items: D
   }), [c, D, o]), $ = useMemo(() => F.filter((w) => ["string", "bigInt", "integer"].includes(w.type)).map((w) => {
-    var O;
+    var L;
     return {
       value: w.name,
-      label: S((O = w.uiSchema) == null ? void 0 : O.title)
+      label: S((L = w.uiSchema) == null ? void 0 : L.title)
     };
   }), [F == null ? void 0 : F.length]);
   return o.template !== "sql" && /* @__PURE__ */ jsx(RecordProvider, { record: o, children: /* @__PURE__ */ jsxs(ActionContextProvider, { value: { visible: m, setVisible: h }, children: [
@@ -53605,14 +53623,14 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       "a",
       P(x({}, i), {
         onClick: () => z(void 0, null, function* () {
-          var $, L;
+          var $, O;
           const { data: R } = yield g.resource("collections.fields", o.collectionName).get({
             filterByTk: o.name,
             appends: ["reverseField"]
           });
           S(R == null ? void 0 : R.data);
           const T = l(o.interface), D = cloneDeep(R == null ? void 0 : R.data) || {};
-          D != null && D.reverseField ? D.autoCreateReverseField = !0 : (D.autoCreateReverseField = !1, D.reverseField = ($ = T == null ? void 0 : T.default) == null ? void 0 : $.reverseField, set$1(D.reverseField, "name", `f_${uid()}`), set$1(D.reverseField, "uiSchema.title", (L = o.__parent) == null ? void 0 : L.title));
+          D != null && D.reverseField ? D.autoCreateReverseField = !0 : (D.autoCreateReverseField = !1, D.reverseField = ($ = T == null ? void 0 : T.default) == null ? void 0 : $.reverseField, set$1(D.reverseField, "name", `f_${uid()}`), set$1(D.reverseField, "uiSchema.title", (O = o.__parent) == null ? void 0 : O.title));
           const B = getSchema$7(T, D, o, C);
           h(B), p(!0);
         }),
@@ -53707,13 +53725,13 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   return /* @__PURE__ */ jsx(OverridingFieldAction, x({ item: t, parentItem: n }, e));
 }, getIsOverriding = (e, t, n) => t.find((r) => r.name === n.name).collectionName === e, OverridingFieldAction = (e) => {
   const { scope: t, getContainer: n, item: o, parentItem: r, children: a, currentCollection: i } = e, { target: l, through: c } = o, { getInterface: u, getCollection: d, getCurrentCollectionFields: p, getChildrenCollections: m, collections: h } = useCollectionManager_deprecated(), [g, f] = useState(!1), [C, b] = useState({}), S = useAPIClient(), { t: y } = useTranslation(), v = useCompile(), I = (j) => {
-    var O;
-    return j && ((O = m(j)) == null ? void 0 : O.map((N) => N.name).concat([j]));
+    var L;
+    return j && ((L = m(j)) == null ? void 0 : L.map((N) => N.name).concat([j]));
   }, [F, R] = useState({}), T = p(i), D = getIsOverriding(i, T, o), B = useMemo(() => h.map((j) => ({
     label: v(j.title),
     value: j.name
   })), []), $ = () => {
-    const j = useForm(), { refresh: w } = useResourceActionContext(), { refreshCM: O } = useCollectionManager_deprecated(), N = useActionContext(), { resource: k } = useResourceContext();
+    const j = useForm(), { refresh: w } = useResourceActionContext(), { refreshCM: L } = useCollectionManager_deprecated(), N = useActionContext(), { resource: k } = useResourceContext();
     return {
       run() {
         return z(this, null, function* () {
@@ -53732,17 +53750,17 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           ]);
           yield k.create({
             values: E
-          }), yield j.reset(), yield O(), yield w(), N.setVisible(!1);
+          }), yield j.reset(), yield L(), yield w(), N.setVisible(!1);
         });
       }
     };
-  }, L = useMemo(() => {
+  }, O = useMemo(() => {
     var j;
     return (o == null ? void 0 : o.fields) || ((j = d(o.collectionName)) == null ? void 0 : j.options.fields.filter((w) => ["string", "bigInt", "integer"].includes(w.type)).map((w) => {
-      var O;
+      var L;
       return {
         value: w.name,
-        label: v((O = w.uiSchema) == null ? void 0 : O.title)
+        label: v((L = w.uiSchema) == null ? void 0 : L.title)
       };
     }));
   }, [o.name]);
@@ -53759,10 +53777,10 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
               appends: ["reverseField"]
             });
             R(w == null ? void 0 : w.data);
-            const O = u(o.interface), N = cloneDeep(w == null ? void 0 : w.data) || {};
-            N != null && N.reverseField || (N.autoCreateReverseField = !1, N.reverseField = (j = O.default) == null ? void 0 : j.reverseField, set(N.reverseField, "name", `f_${uid()}`), set(N.reverseField, "uiSchema.title", o.__parent.title));
+            const L = u(o.interface), N = cloneDeep(w == null ? void 0 : w.data) || {};
+            N != null && N.reverseField || (N.autoCreateReverseField = !1, N.reverseField = (j = L.default) == null ? void 0 : j.reverseField, set(N.reverseField, "name", `f_${uid()}`), set(N.reverseField, "uiSchema.title", o.__parent.title));
             const k = getSchema$6(
-              P(x({}, O), {
+              P(x({}, L), {
                 default: N
               }),
               o,
@@ -53789,7 +53807,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           isOverride: !0,
           targetScope: { target: I(l), through: I(c) },
           collections: B,
-          scopeKeyOptions: L
+          scopeKeyOptions: O
         }, t)
       }
     )
@@ -54224,10 +54242,10 @@ const getSchema$4 = (e, t, n) => {
   const { databaseView: t, viewName: n, sources: o, schema: r } = e, { data: a } = useContext(ResourceActionContext), i = useAPIClient(), { t: l } = useTranslation(), [c, u] = useState(!1), [d, p] = useState([]), [m, h] = useState([]), [g, f] = useState(o), [C, b] = useState([]), S = useField(), y = useForm(), { getCollection: v, getInterface: I, getCollectionFields: F, getInheritCollections: R, getParentCollectionFields: T } = useCollectionManager_deprecated(), D = useCompile(), $ = useFieldInterfaceOptions().filter((w) => !["relation", "systemInfo"].includes(w.key));
   useEffect(() => {
     const w = [];
-    g.forEach((O) => {
+    g.forEach((L) => {
       var E;
-      const N = v(O), M = R(O).map((V) => {
-        const H = T(V, O);
+      const N = v(L), M = R(L).map((V) => {
+        const H = T(V, L);
         return {
           type: "group",
           key: V,
@@ -54245,17 +54263,17 @@ const getSchema$4 = (e, t, n) => {
         return { value: V.name, key: V.name, label: l(((H = V.uiSchema) == null ? void 0 : H.title) || V.name) };
       }).concat(M);
       w.push({
-        value: O,
+        value: L,
         label: l(N.title || N.name),
         children: q
       });
     }), h(w);
   }, [g, t]), useEffect(() => {
     t && (u(!0), i.resource("dbViews").get({ filterByTk: n, schema: r }).then(({ data: w }) => {
-      var O, N;
+      var L, N;
       if (w) {
         u(!1), p([]);
-        const k = (N = Object.values((O = w == null ? void 0 : w.data) == null ? void 0 : O.fields)) == null ? void 0 : N.map((M) => {
+        const k = (N = Object.values((L = w == null ? void 0 : w.data) == null ? void 0 : L.fields)) == null ? void 0 : N.map((M) => {
           var q, E;
           if (M.source) {
             const V = (a == null ? void 0 : a.data.find((H) => H.name === M.name)) || M;
@@ -54276,9 +54294,9 @@ const getSchema$4 = (e, t, n) => {
       }
     }).catch);
   }, [t]);
-  const L = (w, O) => {
+  const O = (w, L) => {
     const N = _.cloneDeep(d);
-    N[O] = w, p(N), S.value = N.map((k) => {
+    N[L] = w, p(N), S.value = N.map((k) => {
       var q, E, V;
       const M = typeof k.source == "string" ? k.source : (V = (E = (q = k.source) == null ? void 0 : q.filter) == null ? void 0 : E.call(q, Boolean)) == null ? void 0 : V.join(".");
       return P(x({}, k), {
@@ -54297,7 +54315,7 @@ const getSchema$4 = (e, t, n) => {
       dataIndex: "source",
       key: "source",
       width: 200,
-      render: (w, O, N) => /* @__PURE__ */ jsx(
+      render: (w, L, N) => /* @__PURE__ */ jsx(
         Cascader$1,
         {
           defaultValue: typeof w == "string" ? w == null ? void 0 : w.split(".") : w,
@@ -54307,7 +54325,7 @@ const getSchema$4 = (e, t, n) => {
           onChange: (k, M) => {
             var E;
             const q = (E = F(k == null ? void 0 : k[0])) == null ? void 0 : E.find((V) => V.name === last(k));
-            L(P(x({}, O), { source: k, uiSchema: q == null ? void 0 : q.uiSchema }), N);
+            O(P(x({}, L), { source: k, uiSchema: q == null ? void 0 : q.uiSchema }), N);
           },
           placeholder: l("Select field source")
         }
@@ -54318,7 +54336,7 @@ const getSchema$4 = (e, t, n) => {
       dataIndex: "type",
       width: 140,
       key: "type",
-      render: (w, O, N) => {
+      render: (w, L, N) => {
         const k = d[N];
         return k != null && k.source || !(k != null && k.possibleTypes) ? /* @__PURE__ */ jsx(Tag, { children: w }) : /* @__PURE__ */ jsx(
           Select$1,
@@ -54327,7 +54345,7 @@ const getSchema$4 = (e, t, n) => {
             popupMatchSelectWidth: !1,
             style: { width: "100%" },
             options: (k == null ? void 0 : k.possibleTypes.map((M) => ({ label: M, value: M }))) || [],
-            onChange: (M) => L(P(x({}, k), { type: M }), N)
+            onChange: (M) => O(P(x({}, k), { type: M }), N)
           }
         );
       }
@@ -54337,7 +54355,7 @@ const getSchema$4 = (e, t, n) => {
       dataIndex: "interface",
       key: "interface",
       width: 150,
-      render: (w, O, N) => {
+      render: (w, L, N) => {
         const k = d[N], M = getInterfaceOptions($, k.type);
         return k.source ? w : /* @__PURE__ */ jsx(
           Select$1,
@@ -54346,7 +54364,7 @@ const getSchema$4 = (e, t, n) => {
             style: { width: "100%" },
             popupMatchSelectWidth: !1,
             onChange: (q) => {
-              L(P(x({}, k), { interface: q }), N);
+              O(P(x({}, k), { interface: q }), N);
             },
             children: M.map((q) => /* @__PURE__ */ jsx(Select$1.OptGroup, { label: D(q.label), children: q.children.map((E) => /* @__PURE__ */ jsx(Select$1.Option, { value: E.name, children: D(E.label) }, E.value)) }, q.key))
           }
@@ -54358,14 +54376,14 @@ const getSchema$4 = (e, t, n) => {
       dataIndex: "title",
       key: "title",
       width: 180,
-      render: (w, O, N) => {
+      render: (w, L, N) => {
         var M;
         const k = d[N];
         return /* @__PURE__ */ jsx(
           Input$3,
           {
             defaultValue: ((M = k == null ? void 0 : k.uiSchema) == null ? void 0 : M.title) || w,
-            onChange: (q) => L(
+            onChange: (q) => O(
               P(x({}, k), { uiSchema: P(x({}, omit(k == null ? void 0 : k.uiSchema, "rawTitle")), { title: q.target.value }) }),
               N
             )
@@ -54420,8 +54438,8 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
   }, S = (y) => {
     var v;
     return (v = y.filter((I) => I.source || I.interface)) == null ? void 0 : v.map((I) => {
-      var B, $, L, j, w, O;
-      const F = typeof (I == null ? void 0 : I.source) == "string" ? (B = I == null ? void 0 : I.source) == null ? void 0 : B.split(".") : I == null ? void 0 : I.source, R = (L = ($ = h(F == null ? void 0 : F[0])) == null ? void 0 : $.find((N) => N.name === (F == null ? void 0 : F[1]))) == null ? void 0 : L.uiSchema, T = ((j = I == null ? void 0 : I.uiSchema) == null ? void 0 : j.title) || (R == null ? void 0 : R.title) || I.name, D = I.source ? R : (O = (w = m(I.interface)) == null ? void 0 : w.default) == null ? void 0 : O.uiSchema;
+      var B, $, O, j, w, L;
+      const F = typeof (I == null ? void 0 : I.source) == "string" ? (B = I == null ? void 0 : I.source) == null ? void 0 : B.split(".") : I == null ? void 0 : I.source, R = (O = ($ = h(F == null ? void 0 : F[0])) == null ? void 0 : $.find((N) => N.name === (F == null ? void 0 : F[1]))) == null ? void 0 : O.uiSchema, T = ((j = I == null ? void 0 : I.uiSchema) == null ? void 0 : j.title) || (R == null ? void 0 : R.title) || I.name, D = I.source ? R : (L = (w = m(I.interface)) == null ? void 0 : w.default) == null ? void 0 : L.uiSchema;
       return {
         title: u(T),
         dataIndex: I.name,
@@ -54671,26 +54689,26 @@ const AsyncDataProvider = (e) => {
     if (useEffect(() => {
       var B;
       const T = /* @__PURE__ */ new Map();
-      a || (i && i.length ? Object.entries((i == null ? void 0 : i[0]) || {}).forEach(([$, L]) => {
+      a || (i && i.length ? Object.entries((i == null ? void 0 : i[0]) || {}).forEach(([$, O]) => {
         var k;
-        const j = l[$], w = inferInterface($, L), O = (k = C.current(w)) == null ? void 0 : k.default, N = (j == null ? void 0 : j.uiSchema) || (O == null ? void 0 : O.uiSchema) || {};
+        const j = l[$], w = inferInterface($, O), L = (k = C.current(w)) == null ? void 0 : k.default, N = (j == null ? void 0 : j.uiSchema) || (L == null ? void 0 : L.uiSchema) || {};
         T.set($, {
           name: $,
           interface: (j == null ? void 0 : j.interface) || w,
-          type: (j == null ? void 0 : j.type) || (O == null ? void 0 : O.type),
+          type: (j == null ? void 0 : j.type) || (L == null ? void 0 : L.type),
           source: j == null ? void 0 : j.source,
           uiSchema: x({
             title: $
           }, N)
         });
       }) : Object.entries(l || {}).forEach(
-        ([$, L]) => T.set($, P(x({
+        ([$, O]) => T.set($, P(x({
           name: $,
           type: "string"
-        }, L), {
+        }, O), {
           uiSchema: x({
             title: $
-          }, (L == null ? void 0 : L.uiSchema) || {})
+          }, (O == null ? void 0 : O.uiSchema) || {})
         }))
       )), (B = c.value) != null && B.length && c.value.forEach(($) => {
         T.has($.name) && T.set($.name, $);
@@ -54711,9 +54729,9 @@ const AsyncDataProvider = (e) => {
       const B = [...t];
       B.splice(D, 1, T), n(B), c.setValue(
         B.map(($) => {
-          var L, j, w;
+          var O, j, w;
           return P(x({}, $), {
-            source: typeof $.source == "string" ? $.source : ((w = (j = (L = $.source) == null ? void 0 : L.filter) == null ? void 0 : j.call(L, Boolean)) == null ? void 0 : w.join(".")) || null
+            source: typeof $.source == "string" ? $.source : ((w = (j = (O = $.source) == null ? void 0 : O.filter) == null ? void 0 : j.call(O, Boolean)) == null ? void 0 : w.join(".")) || null
           });
         })
       );
@@ -54738,11 +54756,11 @@ const AsyncDataProvider = (e) => {
               allowClear: !0,
               options: d(f),
               placeholder: e("Select field source"),
-              onChange: (L) => {
-                let j = l[L == null ? void 0 : L[1]];
-                j != null && j.interface || (j = m((L == null ? void 0 : L.join(".")) || "")), S(
+              onChange: (O) => {
+                let j = l[O == null ? void 0 : O[1]];
+                j != null && j.interface || (j = m((O == null ? void 0 : O.join(".")) || "")), S(
                   P(x({}, $), {
-                    source: L,
+                    source: O,
                     interface: j == null ? void 0 : j.interface,
                     type: j == null ? void 0 : j.type,
                     uiSchema: j == null ? void 0 : j.uiSchema
@@ -54760,21 +54778,21 @@ const AsyncDataProvider = (e) => {
         key: "interface",
         width: 150,
         render: (T, D, B) => {
-          var L;
+          var O;
           const $ = t[B];
-          return $.source ? /* @__PURE__ */ jsx(Tag, { children: d((L = p(T)) == null ? void 0 : L.title) || T }) : /* @__PURE__ */ jsx(
+          return $.source ? /* @__PURE__ */ jsx(Tag, { children: d((O = p(T)) == null ? void 0 : O.title) || T }) : /* @__PURE__ */ jsx(
             Select$1,
             {
               defaultValue: $.interface || "input",
               style: { width: "100%" },
               popupMatchSelectWidth: !1,
               onChange: (j) => {
-                var O, N, k, M, q;
+                var L, N, k, M, q;
                 const w = p(j);
                 S(
                   P(x({}, $), {
                     interface: j || null,
-                    uiSchema: P(x({}, (O = w == null ? void 0 : w.default) == null ? void 0 : O.uiSchema), {
+                    uiSchema: P(x({}, (L = w == null ? void 0 : w.default) == null ? void 0 : L.uiSchema), {
                       title: ((k = (N = w == null ? void 0 : w.default) == null ? void 0 : N.uiSchema) == null ? void 0 : k.title) || ((M = $.uiSchema) == null ? void 0 : M.title)
                     }),
                     type: (q = w == null ? void 0 : w.default) == null ? void 0 : q.type
@@ -54794,12 +54812,12 @@ const AsyncDataProvider = (e) => {
         key: "title",
         width: 180,
         render: (T, D, B) => {
-          var L, j;
+          var O, j;
           const $ = t[B];
           return /* @__PURE__ */ jsx(
             Input$3,
             {
-              value: ((L = $.uiSchema) == null ? void 0 : L.title) || T,
+              value: ((O = $.uiSchema) == null ? void 0 : O.title) || T,
               defaultValue: ((j = $.uiSchema) == null ? void 0 : j.title) !== void 0 ? $.uiSchema.title : $ == null ? void 0 : $.name,
               onChange: (w) => S(P(x({}, $), { uiSchema: P(x({}, $ == null ? void 0 : $.uiSchema), { title: w.target.value }) }), B)
             }
@@ -60816,8 +60834,8 @@ const RolesResourcesActions = connect((e) => {
                       name: F.name
                     }, $ = B.fields || [];
                     if (T) {
-                      const L = $.indexOf(D.name);
-                      $.splice(L, 1);
+                      const O = $.indexOf(D.name);
+                      $.splice(O, 1);
                     } else
                       $.push(D.name);
                     B.fields = $, p[F.name] = B, t(Object.values(p));
@@ -63309,17 +63327,17 @@ const ActionInitializerItem = (e) => {
     ), F = C || (a == null ? void 0 : a.targetKey) || "id", R = b || ((U = (H = i["x-component-props"]) == null ? void 0 : H.fieldNames) == null ? void 0 : U.label) || F, T = {
       title: R || F,
       key: F
-    }, [D, B] = useState([]), [$, L] = useState(i.default || []), [j, w] = useState(!0), O = useLabelUiSchema(a, (T == null ? void 0 : T.title) || "label");
+    }, [D, B] = useState([]), [$, O] = useState(i.default || []), [j, w] = useState(!0), L = useLabelUiSchema(a, (T == null ? void 0 : T.title) || "label");
     if (useEffect(() => {
       i.default && setTimeout(() => {
-        d(i.default), L(i.default);
+        d(i.default), O(i.default);
       }, 100);
     }, [i.default, d]), !a)
       return null;
     const N = (J) => {
       B(J), w(!1);
     }, k = (J) => {
-      L(J), d(J), p == null || p(J);
+      O(J), d(J), p == null || p(J);
     }, M = (J) => {
       var X;
       const K = (X = h == null ? void 0 : h[0]) == null ? void 0 : X.filter;
@@ -63380,7 +63398,7 @@ const ActionInitializerItem = (e) => {
                 treeData: u,
                 onSelect: k,
                 fieldNames: T,
-                titleRender: (J) => /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: getLabelFormatValue(O, c(J[R])) }),
+                titleRender: (J) => /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: getLabelFormatValue(L, c(J[R])) }),
                 selectedKeys: $,
                 blockNode: !0
               }
@@ -63839,9 +63857,9 @@ const DataBlockInitializer = (e) => {
     onClick: D,
     currentText: b,
     otherText: S
-  }), $ = useGetSchemaInitializerMenuItems(D), L = useMemo(() => $(B, a), [$, B, a]), [j, w] = useState([]), O = useMenuSearch({ data: L, openKeys: j, hideSearch: u }), N = useMemo(() => {
-    let q = O.filter((E) => E.key !== "search" && E.key !== "empty");
-    return p && q.length === 1 ? q = q[0].children : q = O, [
+  }), $ = useGetSchemaInitializerMenuItems(D), O = useMemo(() => $(B, a), [$, B, a]), [j, w] = useState([]), L = useMenuSearch({ data: O, openKeys: j, hideSearch: u }), N = useMemo(() => {
+    let q = L.filter((E) => E.key !== "search" && E.key !== "empty");
+    return p && q.length === 1 ? q = q[0].children : q = L, [
       {
         key: a,
         label: F(i),
@@ -63852,8 +63870,8 @@ const DataBlockInitializer = (e) => {
         children: q
       }
     ];
-  }, [O, p, a, F, i, r, D, e]);
-  return L.length > 1 || L.length === 1 && ((M = (k = L[0]) == null ? void 0 : k.children) == null ? void 0 : M.length) > 0 || y ? /* @__PURE__ */ jsx(
+  }, [L, p, a, F, i, r, D, e]);
+  return O.length > 1 || O.length === 1 && ((M = (k = O[0]) == null ? void 0 : k.children) == null ? void 0 : M.length) > 0 || y ? /* @__PURE__ */ jsx(
     SchemaInitializerMenu,
     {
       onOpenChange: (q) => {
@@ -68752,6 +68770,7 @@ export {
   useDateVariable,
   useDatetimeVariable,
   useDatetimeVariableContext,
+  useDeleteRouteSchema,
   useDesignable,
   useDesigner,
   useDestroyAction,