@nocobase/client 1.8.24 → 1.8.26

package/es/index.mjs

@@ -1,16 +1,16 @@
-var Le = Object.defineProperty, Oe = Object.defineProperties;
-var Ve = Object.getOwnPropertyDescriptors;
+var Oe = Object.defineProperty, Le = Object.defineProperties;
+var Ee = Object.getOwnPropertyDescriptors;
 var Te = Object.getOwnPropertySymbols;
 var Be = Object.prototype.hasOwnProperty, Ne = Object.prototype.propertyIsEnumerable;
 var $e = (e, t) => (t = Symbol[e]) ? t : Symbol.for("Symbol." + e);
-var we = (e, t, o) => t in e ? Le(e, t, { enumerable: !0, configurable: !0, writable: !0, value: o }) : e[t] = o, x = (e, t) => {
+var we = (e, t, o) => t in e ? Oe(e, t, { enumerable: !0, configurable: !0, writable: !0, value: o }) : e[t] = o, x = (e, t) => {
   for (var o in t || (t = {}))
     Be.call(t, o) && we(e, o, t[o]);
   if (Te)
     for (var o of Te(t))
       Ne.call(t, o) && we(e, o, t[o]);
   return e;
-}, P = (e, t) => Oe(e, Ve(t));
+}, P = (e, t) => Le(e, Ee(t));
 var Y = (e, t) => {
   var o = {};
   for (var n in e)
@@ -537,6 +537,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get HTMLEncode() {
     return HTMLEncode;
   },
+  get ICON_POPUP_Z_INDEX() {
+    return ICON_POPUP_Z_INDEX;
+  },
   get IconPicker() {
     return IconPicker;
   },
@@ -1879,6 +1882,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get HeightMode() {
     return HeightMode;
   },
+  get ICON_POPUP_Z_INDEX() {
+    return ICON_POPUP_Z_INDEX;
+  },
   get Icon() {
     return Icon;
   },
@@ -6313,7 +6319,7 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
     getOnCheck: C,
     getScopeDataSource: (S) => {
       const v = n(S), F = (T, D) => {
-        var O, M;
+        var L, M;
         if (!T.interface)
           return;
         const $ = i(T.interface);
@@ -6321,7 +6327,7 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
           return;
         const { nested: B, children: N, operators: j } = $.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: ((M = j == null ? void 0 : j.filter) == null ? void 0 : M.call(j, (k) => !(k != null && k.visible) || k.visible(T))) || [],
           interface: T.interface
@@ -6330,8 +6336,8 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
           if (D > 2)
             return w;
           if (N != null && N.length && (w.children = N), B) {
-            const k = n(T.target), L = I(k, D + 1).filter(Boolean);
-            w.children = w.children || [], w.children.push(...L);
+            const k = n(T.target), O = I(k, D + 1).filter(Boolean);
+            w.children = w.children || [], w.children.push(...O);
           }
           return w;
         }
@@ -7089,7 +7095,7 @@ const collectFieldStateOfLinkageRules = ({
   action: l,
   conditionType: c
 }, u) => {
-  var y, S, v, F, I, R, T, D, $, B, N, j, w, O;
+  var y, S, v, F, I, R, T, D, $, B, N, j, w, L;
   const d = ((y = o == null ? void 0 : o.stateOfLinkageRules) == null ? void 0 : y.required) || [(S = o == null ? void 0 : o.initStateOfLinkageRules) == null ? void 0 : S.required], p = ((v = o == null ? void 0 : o.stateOfLinkageRules) == null ? void 0 : v.display) || [(F = o == null ? void 0 : o.initStateOfLinkageRules) == null ? void 0 : F.display], m = ((I = o == null ? void 0 : o.stateOfLinkageRules) == null ? void 0 : I.pattern) || [(R = o == null ? void 0 : o.initStateOfLinkageRules) == null ? void 0 : R.pattern], h = ((T = o == null ? void 0 : o.stateOfLinkageRules) == null ? void 0 : T.value) || [(D = o == null ? void 0 : o.initStateOfLinkageRules) == null ? void 0 : D.value], g = (($ = o == null ? void 0 : o.stateOfLinkageRules) == null ? void 0 : $.dataSource) || [(B = o == null ? void 0 : o.initStateOfLinkageRules) == null ? void 0 : B.dataSource], { evaluate: f } = evaluators.get("formula.js"), C = {
     ruleGroup: n,
     variables: r,
@@ -7129,14 +7135,14 @@ const collectFieldStateOfLinkageRules = ({
           if ((t == null ? void 0 : t.mode) === "express") {
             if ((t.value || t.result) == null)
               return;
-            const { exp: L, scope: q } = yield replaceVariables(t.value || t.result, {
+            const { exp: O, scope: q } = yield replaceVariables(t.value || t.result, {
               variables: r,
               localVariables: a
             });
             try {
-              return f(L, x({ now: () => (/* @__PURE__ */ new Date()).toString() }, q));
-            } catch (E) {
-              console.error(E);
+              return f(O, x({ now: () => (/* @__PURE__ */ new Date()).toString() }, q));
+            } catch (V) {
+              console.error(V);
             }
           } else
             return (t == null ? void 0 : t.mode) === "constant" ? (k = t == null ? void 0 : t.value) != null ? k : t : null;
@@ -7148,7 +7154,7 @@ const collectFieldStateOfLinkageRules = ({
       break;
     case ActionType.Options:
       {
-        const M = (O = (w = o.data) == null ? void 0 : w.dataSource) == null ? void 0 : O.filter((k) => t.value.includes(k.value));
+        const M = (L = (w = o.data) == null ? void 0 : w.dataSource) == null ? void 0 : L.filter((k) => t.value.includes(k.value));
         g.push(getTempFieldState(conditionAnalyses(C, u), M || [])), o.stateOfLinkageRules = P(x({}, o.stateOfLinkageRules), {
           dataSource: g
         });
@@ -8315,8 +8321,8 @@ function withInitializer(e) {
         style: C,
         componentProps: b
       } = o, y = l ? l() : i, S = c(u), v = useCallback(
-        (O) => {
-          y ? y(S(O, { isInSubTable: a })) : r(d, S(O, { isInSubTable: a }), { onSuccess: p });
+        (L) => {
+          y ? y(S(L, { isInSubTable: a })) : r(d, S(L, { isInSubTable: a }), { onSuccess: p });
         },
         [y, S, a, r, d, p]
       ), { wrapSSR: F, hashId: I, componentCls: R } = useSchemaInitializerStyles(), [T, D] = useState(!1), { token: $ } = theme.useToken(), B = useNiceDropdownMaxHeight([T]), N = useMemo(
@@ -8779,7 +8785,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.8.24", 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.26", 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",
@@ -8800,9 +8806,9 @@ const name = "@nocobase/client", version = "1.8.24", 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.24",
-  "@nocobase/sdk": "1.8.24",
-  "@nocobase/utils": "1.8.24",
+  "@nocobase/evaluators": "1.8.26",
+  "@nocobase/sdk": "1.8.26",
+  "@nocobase/utils": "1.8.26",
   ahooks: "^3.7.2",
   antd: "5.24.2",
   "antd-style": "3.7.1",
@@ -9971,7 +9977,7 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: o, filterProper
       }
     `, [n.paddingContentVerticalLG, n.marginSM, n.margin]), b = useCollection(), y = useMemo(() => withTooltipComponent(NocoBaseRecursionField), []), S = useMemo(
     () => d == null ? void 0 : d.map((F) => {
-      var N, j, w, O;
+      var N, j, w, L;
       const I = F.reduceProperties((M, k) => {
         if (isCollectionFieldComponent(k))
           return M.concat([k]);
@@ -9984,7 +9990,7 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: o, filterProper
             schema: F,
             onlyRenderSelf: !0,
             isUseFormilyField: !1,
-            tooltip: (j = F == null ? void 0 : F["x-component-props"]) == null ? void 0 : j.tooltip
+            tooltip: o((j = F == null ? void 0 : F["x-component-props"]) == null ? void 0 : j.tooltip, { ns: NAMESPACE_UI_SCHEMA })
           }
         ) }),
         dataIndex: R,
@@ -9992,8 +9998,8 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: o, filterProper
         sorter: (w = F["x-component-props"]) == null ? void 0 : w.sorter,
         columnHidden: T
       }, F["x-component-props"]), {
-        width: T && !l ? 0 : ((O = F["x-component-props"]) == null ? void 0 : O.width) || 100,
-        render: (M, k, L) => /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: g, children: /* @__PURE__ */ jsx(
+        width: T && !l ? 0 : ((L = F["x-component-props"]) == null ? void 0 : L.width) || 100,
+        render: (M, k, O) => /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: g, children: /* @__PURE__ */ jsx(
           TableCellRender,
           {
             record: k,
@@ -10002,7 +10008,7 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: o, filterProper
             filterProperties: f,
             schemaToolbarBigger: C,
             field: r,
-            index: L
+            index: O
           }
         ) }),
         onCell: (M, k) => ({
@@ -10376,7 +10382,7 @@ const Table$2 = withDynamicSchemaProps(
         "onClickRow",
         "value"
       ]), S = useArrayField$1(y), v = useFieldSchema(), { size: F = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, I = useCollection(), T = ((Se = v == null ? void 0 : v.parent) == null ? void 0 : Se["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: $, enableIndexColumn: B } = T, N = useMemoizedFn(y.onRowDragEnd || (() => {
-      })), j = usePaginationProps$3(o, a, e), w = useTableColumns$2(y, j), [O, M] = useState(() => D ? $ : []), [k, L] = useState(((se = S == null ? void 0 : S.data) == null ? void 0 : se.selectedRowKeys) || []), [q, E] = useState([]), V = (p == null ? void 0 : p.type) !== "none", G = useRef(/* @__PURE__ */ new Map()), U = useMemo(() => css`
+      })), j = usePaginationProps$3(o, a, e), w = useTableColumns$2(y, j), [L, M] = useState(() => D ? $ : []), [k, O] = useState(((se = S == null ? void 0 : S.data) == null ? void 0 : se.selectedRowKeys) || []), [q, V] = useState([]), E = (p == null ? void 0 : p.type) !== "none", G = useRef(/* @__PURE__ */ new Map()), U = useMemo(() => css`
           & > td {
             background-color: ${t.controlItemBgActive} !important;
           }
@@ -10387,12 +10393,12 @@ const Table$2 = withDynamicSchemaProps(
       K.current = b, useEffect(() => {
         var te;
         H != null && H.field && (H.field.data = ((te = H.field) == null ? void 0 : te.data) || {}, H.field.data.clearSelectedRowKeys = () => {
-          H.field.data.selectedRowKeys = [], L([]);
-        }, H.field.data.setSelectedRowKeys = L);
+          H.field.data.selectedRowKeys = [], O([]);
+        }, H.field.data.setSelectedRowKeys = O);
       }, [H == null ? void 0 : H.field]);
-      const J = useMemo(() => C ? U : "", [U, C]), W = useMemo(() => C ? (te, ne) => ({
+      const X = useMemo(() => C ? U : "", [U, C]), W = useMemo(() => C ? (te, ne) => ({
         onClick: (ae) => {
-          isPortalInBody(ae.target) || C(te, E, q);
+          isPortalInBody(ae.target) || C(te, V, q);
         },
         rowIndex: ne,
         record: te
@@ -10402,9 +10408,9 @@ const Table$2 = withDynamicSchemaProps(
       }), [C, q]);
       useDeepCompareEffect(() => {
         const te = D ? $ : [];
-        _.isEqual(te, O) || M(te);
+        _.isEqual(te, L) || M(te);
       }, [D, $]);
-      const X = useCallback((te) => {
+      const J = useCallback((te) => {
         if (m)
           return Z(te);
         if (te.key)
@@ -10419,9 +10425,9 @@ const Table$2 = withDynamicSchemaProps(
           return Array.isArray(m) ? m.map((ae) => {
             var le;
             return ((le = te[ae]) == null ? void 0 : le.toString()) || "";
-          }).join("-") : typeof m == "string" ? te[m] : (ne = (m != null ? m : X)(te)) == null ? void 0 : ne.toString();
+          }).join("-") : typeof m == "string" ? te[m] : (ne = (m != null ? m : J)(te)) == null ? void 0 : ne.toString();
         },
-        [JSON.stringify(m), X]
+        [JSON.stringify(m), J]
       ), Q = useMemo(() => (Array.isArray(b) ? b : []).filter(Boolean), [b, b == null ? void 0 : b.length]), ee = useMemo(() => (te) => {
         const ne = useCallback((ae) => {
           var ve, Pe, Fe, Ie, Ae, De, je, Me;
@@ -10451,7 +10457,7 @@ const Table$2 = withDynamicSchemaProps(
             type: "checkbox",
             selectedRowKeys: k,
             onChange(te, ne) {
-              S.data = S.data || {}, S.data.selectedRowKeys = te, S.data.selectedRowData = ne, L(te), u == null || u(te, ne, L);
+              S.data = S.data || {}, S.data.selectedRowKeys = te, S.data.selectedRowData = ne, O(te), u == null || u(te, ne, O);
             },
             onSelect: (te, ne, ae, le) => {
               var ue;
@@ -10472,14 +10478,14 @@ const Table$2 = withDynamicSchemaProps(
                   role: "button",
                   "aria-label": `table-index-${ae}`,
                   className: cls(te ? "checked" : null, rowSelectCheckboxWrapperClass$1, {
-                    [rowSelectCheckboxWrapperClassHover$1]: V
+                    [rowSelectCheckboxWrapperClassHover$1]: E
                   }),
                   children: [
                     /* @__PURE__ */ jsxs("div", { className: cls(te ? "checked" : null, rowSelectCheckboxContentClass$1), children: [
                       l && /* @__PURE__ */ jsx(SortHandle$2, { id: Z(ne) }),
                       c && /* @__PURE__ */ jsx(TableIndex$3, { index: ae })
                     ] }),
-                    V && /* @__PURE__ */ jsx(
+                    E && /* @__PURE__ */ jsx(
                       "div",
                       {
                         className: cls(
@@ -10504,7 +10510,7 @@ const Table$2 = withDynamicSchemaProps(
           l,
           S,
           Z,
-          V,
+          E,
           re,
           j,
           H,
@@ -10527,18 +10533,18 @@ const Table$2 = withDynamicSchemaProps(
         x: "max-content",
         y: ce
       }), [ce, Q]), Ce = useCallback(
-        (te) => q.includes(te[m]) ? J : "",
-        [q, J, JSON.stringify(m)]
+        (te) => q.includes(te[m]) ? X : "",
+        [q, X, JSON.stringify(m)]
       ), me = useCallback(
         (te, ne) => {
-          const ae = te ? [...O, ne[I.getPrimaryKey()]] : O.filter((le) => ne[I.getPrimaryKey()] !== le);
+          const ae = te ? [...L, ne[I.getPrimaryKey()]] : L.filter((le) => ne[I.getPrimaryKey()] !== le);
           M(ae), g == null || g(te, ne);
         },
-        [O, g, I]
+        [L, g, I]
       ), xe = useMemo(() => ({
         onExpand: me,
-        expandedRowKeys: O
-      }), [O, me]);
+        expandedRowKeys: L
+      }), [L, me]);
       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.
@@ -10548,7 +10554,7 @@ const Table$2 = withDynamicSchemaProps(
             tableHeight: ce,
             SortableWrapper: pe,
             tableSizeRefCallback: fe,
-            defaultRowKey: X,
+            defaultRowKey: J,
             dataSource: Q
           }, y), ie), {
             paginationProps: j,
@@ -10719,22 +10725,22 @@ const InternalTableBlockProvider = (e) => {
   const t = useDataSourceManager(), o = useDataSource(), n = useCollectionManager(), r = e || (o == null ? void 0 : o.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, M) => (O[M.name] = M, O), {});
+      return (w = t == null ? void 0 : t.collectionFieldInterfaceManager) == null ? void 0 : w.getFieldInterfaces().reduce((L, M) => (L[M.name] = M, 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((M) => M.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((M) => M.getOptions());
   }, [t, o]), p = useCallback(
     (w) => {
-      var O;
-      return n && !w ? n : (O = t == null ? void 0 : t.getDataSource(w || r)) == null ? void 0 : O.collectionManager;
+      var L;
+      return n && !w ? n : (L = t == null ? void 0 : t.getDataSource(w || r)) == null ? void 0 : L.collectionManager;
     },
     [n, 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(
@@ -10748,102 +10754,102 @@ const InternalTableBlockProvider = (e) => {
     }),
     [t]
   ), f = useCompile(), C = useCallback(
-    (w, O) => {
+    (w, L) => {
       var M, k;
-      return ((k = (M = p(O)) == null ? void 0 : M.getCollection(w)) == null ? void 0 : k.getInheritedFields()) || [];
+      return ((k = (M = p(L)) == null ? void 0 : M.getCollection(w)) == null ? void 0 : k.getInheritedFields()) || [];
     },
     [t, p]
   ), b = useCallback(
-    (w, O) => {
-      var k, L;
+    (w, L) => {
+      var k, O;
       if (!w)
         return [];
-      const M = (k = p(O)) == null ? void 0 : k.getCollection(w);
-      return ((L = M == null ? void 0 : M.getAllFields) == null ? void 0 : L.call(M)) || (M == null ? void 0 : M.getFields()) || [];
+      const M = (k = p(L)) == null ? void 0 : k.getCollection(w);
+      return ((O = M == null ? void 0 : M.getAllFields) == null ? void 0 : O.call(M)) || (M == null ? void 0 : M.getFields()) || [];
     },
     [t, p]
   ), y = useCallback(
-    (w, O) => {
+    (w, L) => {
       var M;
       if (!(!w || w.split(".").length < 2))
-        return (M = p(O)) == null ? void 0 : M.getCollectionField(w);
+        return (M = p(L)) == null ? void 0 : M.getCollectionField(w);
     },
     [t, p]
   ), S = useCallback(
-    (w, O) => {
+    (w, L) => {
       var M, k;
-      return w ? ((k = (M = p(O)) == null ? void 0 : M.getCollection(w)) == null ? void 0 : k.getParentCollectionsName()) || [] : [];
+      return w ? ((k = (M = p(L)) == null ? void 0 : M.getCollection(w)) == null ? void 0 : k.getParentCollectionsName()) || [] : [];
     },
     [t, p]
   ), v = useCallback(
-    (w, O = !1, M) => {
+    (w, L = !1, M) => {
       var q;
       if (!w)
         return [];
       const k = (q = p(M)) == null ? void 0 : q.getCollection(w);
-      return (k == null ? void 0 : k.getChildrenCollections(O)) || [];
+      return (k == null ? void 0 : k.getChildrenCollections(L)) || [];
     },
     [t, p]
   ), F = useCallback(
-    (w, O) => {
+    (w, L) => {
       var M, k;
-      return w ? ((k = (M = p(O)) == null ? void 0 : M.getCollection(w)) == null ? void 0 : k.getCurrentFields()) || [] : [];
+      return w ? ((k = (M = p(L)) == null ? void 0 : M.getCollection(w)) == null ? void 0 : k.getCurrentFields()) || [] : [];
     },
     [t, p]
   ), I = useCallback(
-    (w, O, M, k) => {
+    (w, L, M, k) => {
       var Z;
       const {
-        association: L = !1,
+        association: O = !1,
         cached: q = {},
-        collectionNames: E = [w],
-        maxDepth: V = 1,
+        collectionNames: V = [w],
+        maxDepth: E = 1,
         allowAllTypes: G = !1,
         exceptInterfaces: U = [],
         prefixFieldValue: H = "",
         usePrefix: K = !1,
-        dataSource: J
+        dataSource: X
       } = k || {};
-      if (E.length - 1 > V)
+      if (V.length - 1 > E)
         return;
       if (q[w])
         return _.cloneDeep(q[w]);
-      O && typeof O == "string" && (O = [O]), M && typeof M == "string" && (M = [M]);
-      const W = b(w, J), X = (Z = W == null ? void 0 : W.filter(
-        (Q) => Q.interface && !U.includes(Q.interface) && (G || O && O.includes(Q.type) || M && M.includes(Q.interface) || (L && Q.target && Q.target !== w && Array.isArray(L) ? L.includes(Q.interface) : !1))
+      L && typeof L == "string" && (L = [L]), M && typeof M == "string" && (M = [M]);
+      const W = b(w, X), J = (Z = W == null ? void 0 : W.filter(
+        (Q) => Q.interface && !U.includes(Q.interface) && (G || L && L.includes(Q.type) || M && M.includes(Q.interface) || (O && Q.target && Q.target !== w && Array.isArray(O) ? O.includes(Q.interface) : !1))
       )) == null ? void 0 : Z.map((Q) => {
         var oe, re;
         const ee = x({
           value: K && H ? `${H}.${Q.name}` : Q.name,
           label: f((oe = Q == null ? void 0 : Q.uiSchema) == null ? void 0 : oe.title) || Q.name
         }, Q);
-        return L && Q.target && (ee.children = E.includes(Q.target) ? [] : I(Q.target, O, M, P(x({}, k), {
+        return O && Q.target && (ee.children = V.includes(Q.target) ? [] : I(Q.target, L, M, P(x({}, k), {
           cached: q,
-          dataSource: J,
-          collectionNames: [...E, Q.target],
+          dataSource: X,
+          collectionNames: [...V, Q.target],
           prefixFieldValue: K ? H ? `${H}.${Q.name}` : Q.name : "",
           usePrefix: K
         })), !((re = ee.children) != null && re.length)) ? null : ee;
       }).filter(Boolean);
-      return q[w] = X, X;
+      return q[w] = J, J;
     },
     [b]
   ), R = useCallback(
-    (w, O) => {
+    (w, L) => {
       var M;
-      return (M = p(O)) == null ? void 0 : M.getCollection(w);
+      return (M = p(L)) == null ? void 0 : M.getCollection(w);
     },
     [t, p]
   ), T = useCallback(
-    (w, O) => {
+    (w, L) => {
       var M, k;
-      return (k = (M = p(O)) == null ? void 0 : M.getCollection(w)) == null ? void 0 : k.getAllCollectionsInheritChain();
+      return (k = (M = p(L)) == null ? void 0 : M.getCollection(w)) == null ? void 0 : k.getAllCollectionsInheritChain();
     },
     [t, p]
   ), D = useCallback(
-    (w, O) => () => {
+    (w, L) => () => {
       var M, k;
-      return (k = (M = p(O)) == null ? void 0 : M.getCollection(w)) == null ? void 0 : k.getInheritCollectionsChain();
+      return (k = (M = p(L)) == null ? void 0 : M.getCollection(w)) == null ? void 0 : k.getInheritCollectionsChain();
     },
     [t, p]
   ), $ = useCallback(
@@ -10851,14 +10857,14 @@ const InternalTableBlockProvider = (e) => {
     [t]
   ), B = useCallback(
     (w) => {
-      var O;
-      return (O = $(w.interface)) == null ? void 0 : O.titleUsable;
+      var L;
+      return (L = $(w.interface)) == null ? void 0 : L.titleUsable;
     },
     [$]
   ), N = useCallback(
-    (w, O, M) => {
-      var k, L;
-      return (L = (k = p(M)) == null ? void 0 : k.getCollection(O)) == null ? void 0 : L.getParentCollectionFields(w);
+    (w, L, M) => {
+      var k, O;
+      return (O = (k = p(M)) == null ? void 0 : k.getCollection(L)) == null ? void 0 : O.getParentCollectionFields(w);
     },
     [t, p]
   ), j = useCallback(
@@ -11088,25 +11094,25 @@ const popupsContextStorage = {}, defaultPopupsContextStorage = {}, getStoredPopu
 }, usePopupUtils = (e = {}) => {
   const t = useNavigateNoUpdate(), o = useLocationNoUpdate(), n = 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(), y = useCurrentPopupContext(), S = 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(), F = useTableBlockContextBasicValue() || {}, I = e.setVisible || C, R = useCallback(
     ({
       tabKey: w,
-      popupUid: O,
+      popupUid: L,
       recordData: M,
       sourceId: k,
-      collection: L,
+      collection: O,
       puid: q
     }) => {
-      const E = c.getFilterByTK(u || l, M);
+      const V = c.getFilterByTK(u || l, M);
       return getPopupPathFromParams({
-        popupuid: O,
+        popupuid: L,
         puid: q,
-        collection: L,
-        filterbytk: E,
+        collection: O,
+        filterbytk: V,
         sourceid: k,
         tab: w
       });
@@ -11122,34 +11128,34 @@ const popupsContextStorage = {}, defaultPopupsContextStorage = {}, getStoredPopu
   }, [r, l, u]), D = useCallback(
     ({
       recordData: w,
-      parentRecordData: O,
+      parentRecordData: L,
       collectionNameUsedInURL: M,
       popupUidUsedInURL: k,
-      customActionSchema: L
+      customActionSchema: O
     } = {}) => {
       if (!f())
         return I == null ? void 0 : I(!0);
-      const q = L || n, E = q == null ? void 0 : q["x-uid"], V = S(O);
+      const q = O || n, V = q == null ? void 0 : q["x-uid"], E = S(L);
       w = w || (a == null ? void 0 : a.data);
       const G = R({
-        popupUid: E,
+        popupUid: V,
         recordData: w,
-        sourceId: V,
+        sourceId: E,
         collection: M,
         puid: k
       });
       let U = o.pathname;
-      if (_.last(U) === "/" && (U = U.slice(0, -1)), storePopupContext(E, {
+      if (_.last(U) === "/" && (U = U.slice(0, -1)), storePopupContext(V, {
         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,
         association: u,
-        sourceId: V,
+        sourceId: E,
         tableBlockContext: P(x({}, F), { collection: l == null ? void 0 : l.name, blockData: v })
-      }), b(T(), L), q.properties) {
+      }), b(T(), O), q.properties) {
         const H = h + 1;
         if (getPopupLayerState(H))
           return;
@@ -11192,11 +11198,11 @@ ${JSON.stringify(q, null, 2)}`
     m == null ? void 0 : m.popupuid
   ]), B = useCallback(
     (w) => {
-      const O = S(), M = R({
+      const L = S(), M = R({
         tabKey: w,
         popupUid: m == null ? void 0 : m.popupuid,
         recordData: a == null ? void 0 : a.data,
-        sourceId: O
+        sourceId: L
       });
       let k = removeLastPopupPath(o.pathname);
       _.last(k) === "/" && (k = k.slice(0, -1)), t(`${k}${M}`, {
@@ -11204,8 +11210,8 @@ ${JSON.stringify(q, null, 2)}`
       });
     },
     [R, t, m == null ? void 0 : m.popupuid, a == null ? void 0 : a.data, o]
-  ), N = useCallback((w, O) => {
-    O.__popup = w;
+  ), N = useCallback((w, L) => {
+    L.__popup = w;
   }, []), j = useCallback((w) => w.__popup, []);
   return {
     /**
@@ -13915,14 +13921,14 @@ const ParentCollectionProvider = (e) => {
   targetFieldSchema: a,
   record: i
 }) => {
-  var L, q;
-  const l = useApp(), c = ((L = l == null ? void 0 : l.getVariables) == null ? void 0 : L.call(l).map((E) => {
-    const { visible: V = !0, option: G } = E.useOption();
+  var O, q;
+  const l = useApp(), c = ((O = l == null ? void 0 : l.getVariables) == null ? void 0 : O.call(l).map((V) => {
+    const { visible: E = !0, option: G } = V.useOption();
     return {
-      visible: V,
+      visible: E,
       option: G
     };
-  }).filter(({ visible: E }) => E)) || [], { filterVariables: u = () => !0 } = useVariables$1() || {}, d = (q = i == null ? void 0 : i.__parent) == null ? void 0 : q.__collectionName, { currentUserSettings: p } = useCurrentUserVariable({
+  }).filter(({ visible: V }) => V)) || [], { filterVariables: u = () => !0 } = useVariables$1() || {}, d = (q = i == null ? void 0 : i.__parent) == null ? void 0 : q.__collectionName, { currentUserSettings: p } = useCurrentUserVariable({
     maxDepth: 3,
     uiSchema: o,
     collectionField: e,
@@ -13975,7 +13981,7 @@ const ParentCollectionProvider = (e) => {
     collectionField: e,
     noDisabled: r,
     targetFieldSchema: a
-  }), { urlSearchParamsSettings: O, shouldDisplay: M } = useURLSearchParamsVariable();
+  }), { urlSearchParamsSettings: L, shouldDisplay: M } = useURLSearchParamsVariable();
   return [...useMemo(() => [
     p,
     m,
@@ -13989,7 +13995,7 @@ const ParentCollectionProvider = (e) => {
     w && j,
     $ && D,
     N && B,
-    M && O
+    M && L
   ].filter(Boolean).filter(u), [
     p,
     m,
@@ -14008,8 +14014,8 @@ const ParentCollectionProvider = (e) => {
     $,
     D,
     M,
-    O
-  ]), ...c.map(({ option: E }) => E)];
+    L
+  ]), ...c.map(({ option: V }) => V)];
 }, VariableInput = (e) => {
   const {
     value: t,
@@ -14393,29 +14399,29 @@ const getActionContext = (e) => {
   var o;
   return ((o = e.fieldSchema) == null ? void 0 : o["x-action-context"]) || {};
 }, SchemaSettingsDefaultValue = function(t) {
-  var L, q, E;
-  const o = useFieldSchema(), n = (L = t == null ? void 0 : t.fieldSchema) != null ? L : o, r = useField(), { dn: a } = useDesignable(), { t: i } = useTranslation(), l = useActionContext(), c = getActionContext(l).collection;
+  var O, q, V;
+  const o = useFieldSchema(), n = (O = t == null ? void 0 : t.fieldSchema) != null ? O : o, r = useField(), { dn: a } = useDesignable(), { t: i } = useTranslation(), l = useActionContext(), c = getActionContext(l).collection;
   let u;
   const { getField: d } = useCollection_deprecated(), { getCollectionJoinField: p, getCollectionFields: m, getAllCollectionsInheritChain: h } = useCollectionManager_deprecated(), g = useVariables$1(), f = useLocalVariables$1(), C = useCollection_deprecated(), b = useRecord(), { form: y, type: S } = useFormBlockContext(), { getFields: v } = useCollectionFilterOptionsV2(C), { isInSubForm: F, isInSubTable: I } = useFlag() || {}, { name: R } = C, T = useMemo(
     () => d(n.name) || p(n["x-collection-field"]),
     [n, p, d]
   ), D = _.omit(n, "required");
   T != null && T.target && (u = p(
-    `${T.target}.${((E = (q = n["x-component-props"]) == null ? void 0 : q.fieldNames) == null ? void 0 : E.label) || "id"}`
+    `${T.target}.${((V = (q = n["x-component-props"]) == null ? void 0 : q.fieldNames) == null ? void 0 : V.label) || "id"}`
   ));
   const $ = (T == null ? void 0 : T.interface) === "m2o" && findParentFieldSchema(n), B = $ && p($ == null ? void 0 : $["x-collection-field"]), N = useTableBlockContext(), j = (T == null ? void 0 : T.interface) === "m2m" || (T == null ? void 0 : T.interface) === "mbm" || (B == null ? void 0 : B.type) === "hasMany" && (T == null ? void 0 : T.interface) === "m2o", w = useCallback(
-    (V) => {
-      const G = V.find((H) => H.value === "$nForm"), U = m(R);
-      return !(U != null && U.length) && G && (G.children = formatVariableScop(v())), V;
+    (E) => {
+      const G = E.find((H) => H.value === "$nForm"), U = m(R);
+      return !(U != null && U.length) && G && (G.children = formatVariableScop(v())), E;
     },
     [v, R]
-  ), O = useMemo(() => ({
+  ), L = useMemo(() => ({
     ArrayCollapse: ArrayCollapse$2,
     FormLayout,
-    VariableInput: (V) => /* @__PURE__ */ jsx(SchemaComponentContext.Provider, { value: { designable: !1 }, children: /* @__PURE__ */ jsx(
+    VariableInput: (E) => /* @__PURE__ */ jsx(SchemaComponentContext.Provider, { value: { designable: !1 }, children: /* @__PURE__ */ jsx(
       VariableInput,
-      P(x({}, V), {
-        value: V.value || void 0,
+      P(x({}, E), {
+        value: E.value || void 0,
         hideVariableButton: t == null ? void 0 : t.hideVariableButton
       })
     ) })
@@ -14485,12 +14491,12 @@ const getActionContext = (e) => {
     u,
     g
   ]), k = useCallback(
-    (V) => {
+    (E) => {
       var U, H, K;
       const G = {
         "x-uid": n["x-uid"]
       };
-      n.default = (U = V.default) != null ? U : null, isVariable$1(V.default) || (b.__isNewRecord__ || S === "create") && ((H = r.setInitialValue) == null || H.call(r, V.default)), G.default = (K = V.default) != null ? K : null, a.emit("patch", {
+      n.default = (U = E.default) != null ? U : null, isVariable$1(E.default) || (b.__isNewRecord__ || S === "create") && ((H = r.setInitialValue) == null || H.call(r, E.default)), G.default = (K = E.default) != null ? K : null, a.emit("patch", {
         schema: G,
         currentSchema: o
       });
@@ -14501,18 +14507,18 @@ const getActionContext = (e) => {
     SchemaSettingsModalItem,
     {
       title: i("Set default value"),
-      components: O,
+      components: L,
       width: 800,
       schema: M,
       onSubmit: k,
-      ModalContextProvider: (V) => /* @__PURE__ */ jsx(
+      ModalContextProvider: (E) => /* @__PURE__ */ jsx(
         FlagProvider,
         {
           isInSubForm: F,
           isInSubTable: I,
           isInSetDefaultValueDialog: !0,
           collectionField: T,
-          children: V.children
+          children: E.children
         }
       )
     }
@@ -14778,7 +14784,7 @@ const useFilterableFields = (e) => {
 }, zIndexContext = React.createContext(100), useZIndexContext = () => React.useContext(zIndexContext), getZIndex = (e, t, o) => {
   let n = t;
   return e === "page" && !window.location.pathname.includes("/embed/") ? (n = t + o, n > 200 ? n - 200 : n) : (n = t + o, n < 200 ? n + 200 : n);
-}, StablePopover = (e) => {
+}, ICON_POPUP_Z_INDEX = 2e3, StablePopover = (e) => {
   const t = useZIndexContext(), o = getZIndex("drawer", t, 1), n = useRef(null), r = useCallback((i) => {
     n.current = i.target;
   }, []), a = useCallback(
@@ -15374,10 +15380,10 @@ const useGetFilterOptions = () => {
     };
   });
 }, TableColumnDesigner$1 = (e) => {
-  var B, N, j, w, O, M, k, L, q, E, V, G;
+  var B, N, j, w, L, M, k, O, q, V, E, G;
   const { uiSchema: t, fieldSchema: o, collectionField: n } = e, { form: r } = useFormBlockContext(), { getInterface: a, getCollection: i } = useCollectionManager_deprecated(), l = useField(), { t: c } = useTranslation(), u = useFieldSchema(), { dn: d } = useDesignable(), p = ((B = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : B.fieldNames) || ((N = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : N.fieldNames), m = useLabelFields$1((j = n == null ? void 0 : n.target) != null ? j : n == null ? void 0 : n.targetCollection), h = useColorFields((w = n == null ? void 0 : n.target) != null ? w : n == null ? void 0 : n.targetCollection), g = a(n == null ? void 0 : n.interface), f = i(n == null ? void 0 : n.target), C = isFileCollection$2(f), b = ["QuickEdit", "FormItem"].includes(o["x-decorator"]), { currentMode: y } = useAssociationFieldContext(), { isAllowToSetDefaultValue: S } = useIsAllowToSetDefaultValue({ collectionField: n, fieldSchema: o }), v = ["datetime", "createdAt", "updatedAt"].includes(n == null ? void 0 : n.interface), F = ["obo", "oho", "o2o", "o2m", "m2m", "m2o", "snapshot"].includes(
     n == null ? void 0 : n.interface
-  ), I = useFieldModeOptions({ fieldSchema: o }), R = ((O = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : O.mode) || "Select";
+  ), I = useFieldModeOptions({ fieldSchema: o }), R = ((L = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : L.mode) || "Select";
   let T = "editable";
   o["x-disabled"] === !0 && (T = "readonly"), o["x-read-pretty"] === !0 && (T = "read-pretty");
   const D = F && R === "Select", $ = () => {
@@ -15417,12 +15423,12 @@ const useGetFilterOptions = () => {
       SchemaSettingsDataScope,
       {
         collectionName: n == null ? void 0 : n.target,
-        defaultFilter: ((q = (L = (k = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : k.service) == null ? void 0 : L.params) == null ? void 0 : q.filter) || {},
+        defaultFilter: ((q = (O = (k = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : k.service) == null ? void 0 : O.params) == null ? void 0 : q.filter) || {},
         form: r,
         onSubmit: ({ filter: U }) => {
-          var K, J;
+          var K, X;
           U = removeNullCondition(U), set(l.componentProps, "service.params.filter", U), o["x-component-props"] = l.componentProps;
-          const H = (J = l.path) == null ? void 0 : J.splice(((K = l.path) == null ? void 0 : K.length) - 1, 1);
+          const H = (X = l.path) == null ? void 0 : X.splice(((K = l.path) == null ? void 0 : K.length) - 1, 1);
           l.form.query(`${H.concat("*." + o.name)}`).forEach((W) => {
             W.componentProps.service = W.componentProps.service || { params: {} }, W.componentProps.service.params.filter = U;
           }), d.emit("patch", {
@@ -15443,7 +15449,7 @@ const useGetFilterOptions = () => {
           title: c("Column width"),
           properties: {
             width: {
-              default: ((E = u == null ? void 0 : u["x-component-props"]) == null ? void 0 : E.width) || 100,
+              default: ((V = u == null ? void 0 : u["x-component-props"]) == null ? void 0 : V.width) || 100,
               "x-decorator": "FormItem",
               "x-component": "InputNumber",
               "x-component-props": {}
@@ -15486,7 +15492,7 @@ const useGetFilterOptions = () => {
       SchemaSettingsSwitchItem,
       {
         title: c("Enable link"),
-        checked: ((V = o["x-component-props"]) == null ? void 0 : V.enableLink) !== !1,
+        checked: ((E = o["x-component-props"]) == null ? void 0 : E.enableLink) !== !1,
         onChange: (U) => {
           o["x-component-props"] = P(x({}, o == null ? void 0 : o["x-component-props"]), {
             enableLink: U
@@ -15508,8 +15514,8 @@ const useGetFilterOptions = () => {
         options: m,
         value: p == null ? void 0 : p.label,
         onChange: (U) => {
-          var J, W, X, Z, Q;
-          const H = P(x(x({}, (W = (J = n == null ? void 0 : n.uiSchema) == null ? void 0 : J["x-component-props"]) == null ? void 0 : W.fieldNames), (X = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : X.fieldNames), {
+          var X, W, J, Z, Q;
+          const H = P(x(x({}, (W = (X = n == null ? void 0 : n.uiSchema) == null ? void 0 : X["x-component-props"]) == null ? void 0 : W.fieldNames), (J = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : J.fieldNames), {
             label: U
           });
           _.set(o, "x-component-props.fieldNames", H);
@@ -15569,14 +15575,14 @@ const useGetFilterOptions = () => {
         title: c("Required"),
         checked: o.required,
         onChange: (U) => {
-          var J, W;
+          var X, W;
           const H = {
             "x-uid": o["x-uid"]
           };
           o.required = U, H.required = U;
-          const K = (W = l.path) == null ? void 0 : W.splice(((J = l.path) == null ? void 0 : J.length) - 1, 1);
-          l.form.query(`${K.concat("*." + o.name)}`).forEach((X) => {
-            X.required = U;
+          const K = (W = l.path) == null ? void 0 : W.splice(((X = l.path) == null ? void 0 : X.length) - 1, 1);
+          l.form.query(`${K.concat("*." + o.name)}`).forEach((J) => {
+            J.required = U;
           }), d.emit("patch", {
             schema: H
           }), d.refresh();
@@ -15595,26 +15601,26 @@ const useGetFilterOptions = () => {
         ],
         value: T,
         onChange: (U) => {
-          var J, W;
+          var X, W;
           const H = {
             "x-uid": o["x-uid"]
-          }, K = (W = l.path) == null ? void 0 : W.splice(((J = l.path) == null ? void 0 : J.length) - 1, 1);
+          }, K = (W = l.path) == null ? void 0 : W.splice(((X = l.path) == null ? void 0 : X.length) - 1, 1);
           switch (U) {
             case "readonly": {
-              o["x-read-pretty"] = !1, o["x-disabled"] = !0, H["x-read-pretty"] = !1, H["x-disabled"] = !0, l.form.query(`${K.concat("*." + o.name)}`).forEach((X) => {
-                X.readonly = !0, X.disabled = !0;
+              o["x-read-pretty"] = !1, o["x-disabled"] = !0, H["x-read-pretty"] = !1, H["x-disabled"] = !0, l.form.query(`${K.concat("*." + o.name)}`).forEach((J) => {
+                J.readonly = !0, J.disabled = !0;
               });
               break;
             }
             case "read-pretty": {
-              o["x-read-pretty"] = !0, o["x-disabled"] = !1, H["x-read-pretty"] = !0, H["x-disabled"] = !1, l.form.query(`${K.concat("*." + o.name)}`).forEach((X) => {
-                X.readPretty = !0;
+              o["x-read-pretty"] = !0, o["x-disabled"] = !1, H["x-read-pretty"] = !0, H["x-disabled"] = !1, l.form.query(`${K.concat("*." + o.name)}`).forEach((J) => {
+                J.readPretty = !0;
               });
               break;
             }
             default: {
-              o["x-read-pretty"] = !1, o["x-disabled"] = !1, H["x-read-pretty"] = !1, H["x-disabled"] = !1, l.form.query(`${K.concat("*." + o.name)}`).forEach((X) => {
-                X.readPretty = !1, X.disabled + !1;
+              o["x-read-pretty"] = !1, o["x-disabled"] = !1, H["x-read-pretty"] = !1, H["x-disabled"] = !1, l.form.query(`${K.concat("*." + o.name)}`).forEach((J) => {
+                J.readPretty = !1, J.disabled + !1;
               });
               break;
             }
@@ -15632,8 +15638,8 @@ const useGetFilterOptions = () => {
       {
         fieldSchema: o,
         onSubmitCallBack: (U) => {
-          var K, J;
-          const H = (J = l.path) == null ? void 0 : J.splice(((K = l.path) == null ? void 0 : K.length) - 1, 1);
+          var K, X;
+          const H = (X = l.path) == null ? void 0 : X.splice(((K = l.path) == null ? void 0 : K.length) - 1, 1);
           l.form.query(`${H.concat("*." + o.name)}`).forEach((W) => {
             W.componentProps.service = W.componentProps.service || { params: {} }, W.componentProps.service.params.sort = U;
           });
@@ -18009,7 +18015,7 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
     }
   ) })) : null;
 }, InternalSchemaToolbar = React.memo((e) => {
-  var J;
+  var X;
   const t = useFieldSchema(), {
     title: o,
     initializer: n,
@@ -18036,38 +18042,38 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
   }, [o, 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: M } = useSchemaInitializerRender(
+  ), { render: L, exists: M } = useSchemaInitializerRender(
     n || (t == null ? void 0 : t["x-initializer"]),
     t == null ? void 0 : t["x-initializer-props"]
-  ), k = useGridRowContext(), L = useGridContext(), q = useMemo(() => {
+  ), k = useGridRowContext(), O = useGridContext(), q = useMemo(() => {
     var W;
     return {
       insertPosition: "afterEnd",
       wrap: ((W = k == null ? void 0 : k.cols) == null ? void 0 : W.length) === 1 ? gridRowColWrap : void 0,
-      Component: (X) => /* @__PURE__ */ jsx(
+      Component: (J) => /* @__PURE__ */ jsx(
         PlusOutlined,
-        P(x({}, X), {
+        P(x({}, J), {
           role: "button",
           "aria-label": v("schema-initializer"),
           style: { cursor: "pointer", fontSize: 14 }
         })
       )
     };
-  }, [v, (J = k == null ? void 0 : k.cols) == null ? void 0 : J.length]), E = useMemo(() => u === !1 || C === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": v("drag-handler") }) }), [u, v, C]), V = useMemo(() => {
+  }, [v, (X = k == null ? void 0 : k.cols) == null ? void 0 : X.length]), V = useMemo(() => u === !1 || C === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": v("drag-handler") }) }), [u, v, C]), E = useMemo(() => {
     var W;
     if (n === !1)
       return null;
     if (M)
-      return O(q);
-    if (L != null && L.InitializerComponent || L != null && L.renderSchemaInitializer)
-      return L != null && L.InitializerComponent ? /* @__PURE__ */ jsx(L.InitializerComponent, x({}, q)) : (W = L.renderSchemaInitializer) == null ? void 0 : W.call(L, q);
-  }, [L, n, q, M, O]), G = useMemo(() => r !== !1 && w ? j() : null, [w, j, r]), U = useRef(null), H = "hidden";
+      return L(q);
+    if (O != null && O.InitializerComponent || O != null && O.renderSchemaInitializer)
+      return O != null && O.InitializerComponent ? /* @__PURE__ */ jsx(O.InitializerComponent, x({}, q)) : (W = O.renderSchemaInitializer) == null ? void 0 : W.call(O, q);
+  }, [O, n, q, M, L]), G = useMemo(() => r !== !1 && w ? j() : null, [w, j, r]), U = useRef(null), H = "hidden";
   useEffect(() => {
     const W = U.current;
-    let X = W == null ? void 0 : W.parentElement;
-    for (; X && X.clientHeight === 0; )
-      X = X.parentElement;
-    const Z = g || X;
+    let J = W == null ? void 0 : W.parentElement;
+    for (; J && J.clientHeight === 0; )
+      J = J.parentElement;
+    const Z = g || J;
     if (!Z)
       return;
     function Q() {
@@ -18101,8 +18107,8 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
           N[1] && /* @__PURE__ */ jsx("span", { className: "toolbar-title-tag", children: `${$.current}: ${`${N[1]}` || S("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,
-          /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: B, children: V }),
+          V,
+          /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: B, children: E }),
           G
         ] }) })
       ]
@@ -18482,8 +18488,8 @@ const breakRemoveOnGrid = (e) => e["x-component"] === "Grid", breakRemoveOnRow =
   }), [v, F] = useState([0, 0]);
   return useDndMonitor({
     onDragStart(D) {
-      var w, O, M;
-      const $ = (M = (O = (w = D.active) == null ? void 0 : w.data) == null ? void 0 : O.current) == null ? void 0 : M.dividerRef;
+      var w, L, M;
+      const $ = (M = (L = (w = D.active) == null ? void 0 : w.data) == null ? void 0 : L.current) == null ? void 0 : M.dividerRef;
       if (!$ || !r)
         return;
       o.current = D.active.id;
@@ -18503,8 +18509,8 @@ const breakRemoveOnGrid = (e) => e["x-component"] === "Grid", breakRemoveOnRow =
         return;
       const $ = l.current, B = $.previousElementSibling, N = $.nextElementSibling;
       h["x-component-props"] = h["x-component-props"] || {}, g["x-component-props"] = g["x-component-props"] || {};
-      const j = $.clientWidth * (e.cols.length + 1) / e.cols.length, w = (100 * (B.getBoundingClientRect().width + j) / $.parentElement.clientWidth).toFixed(2), O = (100 * (N.getBoundingClientRect().width + j) / $.parentElement.clientWidth).toFixed(2);
-      _.set(h, "x-component-props.width", w), _.set(g, "x-component-props.width", O), n.emit("batchPatch", {
+      const j = $.clientWidth * (e.cols.length + 1) / e.cols.length, w = (100 * (B.getBoundingClientRect().width + j) / $.parentElement.clientWidth).toFixed(2), L = (100 * (N.getBoundingClientRect().width + j) / $.parentElement.clientWidth).toFixed(2);
+      _.set(h, "x-component-props.width", w), _.set(g, "x-component-props.width", L), n.emit("batchPatch", {
         schemas: [
           {
             "x-uid": h["x-uid"],
@@ -18818,8 +18824,8 @@ const useTableBlockProps = () => {
     ),
     onChange: useCallback(
       ({ current: y, pageSize: S }, v, F) => {
-        var $, B, N, j, w, O, M, k, L, q;
-        const I = (N = (B = ($ = t.parent) == null ? void 0 : $["x-decorator-props"]) == null ? void 0 : B.params) == null ? void 0 : N.sort, R = F.order ? F.order === "ascend" ? [F.field] : [`-${F.field}`] : I || a.dragSortBy, T = S || ((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({}, (L = (k = (M = i.current) == null ? void 0 : M.service) == null ? void 0 : k.params) == null ? void 0 : L[0]), { page: y || 1, pageSize: T });
+        var $, B, N, j, w, L, M, k, O, q;
+        const I = (N = (B = ($ = t.parent) == null ? void 0 : $["x-decorator-props"]) == null ? void 0 : B.params) == null ? void 0 : N.sort, R = F.order ? F.order === "ascend" ? [F.field] : [`-${F.field}`] : I || a.dragSortBy, T = S || ((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({}, (O = (k = (M = i.current) == null ? void 0 : M.service) == null ? void 0 : k.params) == null ? void 0 : O[0]), { page: y || 1, pageSize: T });
         R && (D.sort = R), (q = i.current) == null || q.service.run(D);
       },
       [t.parent]
@@ -18833,11 +18839,11 @@ const useTableBlockProps = () => {
         }
         const T = R.find((D) => D.uid === t.parent["x-uid"]);
         R.forEach((D) => {
-          var M, k, L, q;
-          const $ = F.find((E) => E.uid === D.uid);
+          var M, k, O, q;
+          const $ = F.find((V) => V.uid === D.uid);
           if (!$)
             return;
-          const B = getSourceKey(T, $.field) || a.rowKey || "id", N = [y[B]], j = ((M = D.service.params) == null ? void 0 : M[0]) || {}, w = ((L = (k = D.service.params) == null ? void 0 : k[1]) == null ? void 0 : L.filters) || {};
+          const B = getSourceKey(T, $.field) || a.rowKey || "id", N = [y[B]], j = ((M = D.service.params) == null ? void 0 : M[0]) || {}, w = ((O = (k = D.service.params) == null ? void 0 : k[1]) == null ? void 0 : O.filters) || {};
           if (v.includes(y[a.rowKey])) {
             if ((q = D.clearSelection) == null || q.call(D), D.dataLoadingMode === "manual")
               return D.clearData();
@@ -18852,14 +18858,14 @@ const useTableBlockProps = () => {
                 }
               ]
             };
-          const O = mergeFilter([
-            ...Object.values(w).map((E) => removeNullCondition(E)),
+          const L = mergeFilter([
+            ...Object.values(w).map((V) => removeNullCondition(V)),
             D.defaultFilter
           ]);
           return D.doFilter(
             P(x({}, j), {
               page: 1,
-              filter: O
+              filter: L
             }),
             { filters: w }
           );
@@ -19216,10 +19222,10 @@ const useTableSelectorParams = () => useContext(TableSelectorParamsContext), Tab
   var i, l, c, u, d, p, m, h, g, f, C, b, y, S, v, F;
   const e = useField(), t = useTableSelectorContext(), o = useFieldSchema(), { getCollectionJoinField: n } = useCollectionManager_deprecated(), r = recursiveParent(o, "CollectionField"), a = n(r == null ? void 0 : r["x-collection-field"]);
   return useEffect(() => {
-    var R, T, D, $, B, N, j, w, O, M, k, L, q;
+    var R, T, D, $, B, N, j, w, L, M, k, O, 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, ($ = e == null ? void 0 : e.setInitialValue) == null || $.call(e, E), e.data = e.data || {}, e.data.selectedRowKeys = [], e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (j = (N = (B = t == null ? void 0 : t.service) == null ? void 0 : B.data) == null ? void 0 : N.meta) == null ? void 0 : j.pageSize, e.componentProps.pagination.total = (M = (O = (w = t == null ? void 0 : t.service) == null ? void 0 : w.data) == null ? void 0 : O.meta) == null ? void 0 : M.count, e.componentProps.pagination.current = (q = (L = (k = t == null ? void 0 : t.service) == null ? void 0 : k.data) == null ? void 0 : L.meta) == null ? void 0 : q.page;
+      const V = (D = (T = t == null ? void 0 : t.service) == null ? void 0 : T.data) == null ? void 0 : D.data.map((E) => E);
+      e.value = V, ($ = e == null ? void 0 : e.setInitialValue) == null || $.call(e, V), e.data = e.data || {}, e.data.selectedRowKeys = [], e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (j = (N = (B = t == null ? void 0 : t.service) == null ? void 0 : B.data) == null ? void 0 : N.meta) == null ? void 0 : j.pageSize, e.componentProps.pagination.total = (M = (L = (w = t == null ? void 0 : t.service) == null ? void 0 : w.data) == null ? void 0 : L.meta) == null ? void 0 : M.count, e.componentProps.pagination.current = (q = (O = (k = t == null ? void 0 : t.service) == null ? void 0 : k.data) == null ? void 0 : O.meta) == null ? void 0 : q.page;
     }
   }, [
     a == null ? void 0 : a.foreignKey,
@@ -19771,7 +19777,28 @@ const CollectionTitle = (e) => {
     /* @__PURE__ */ jsx(PageHeader, { style: { backgroundColor: "white" }, ghost: !1, title: e("Block templates") }),
     /* @__PURE__ */ jsx("div", { style: { margin: "var(--nb-spacing)" }, children: /* @__PURE__ */ jsx(SchemaComponent, { schema: uiSchemaTemplatesSchema }) })
   ] });
-}, BlockTemplatesPane = () => /* @__PURE__ */ jsx(SchemaComponent, { schema: uiSchemaTemplatesSchema }), useSystemSettingsVariable = () => {
+}, BlockTemplatesPane = () => /* @__PURE__ */ jsx(SchemaComponent, { schema: uiSchemaTemplatesSchema }), VariableScopeContext$1 = createContext({
+  scopeId: "",
+  type: ""
+}), VariableScope = (e) => {
+  const t = React.useContext(VariableScopeContext$1), o = useMemo(() => ({
+    scopeId: e.scopeId,
+    type: e.type,
+    parent: t
+  }), [e.scopeId, e.type, t]);
+  return /* @__PURE__ */ jsx(VariableScopeContext$1.Provider, { value: o, children: e.children });
+}, useVariableScopeInfo = () => {
+  let e = React.useContext(VariableScopeContext$1);
+  return {
+    getVariableScopeInfo: useCallback(() => {
+      if (e.scopeId)
+        return e;
+      for (; e.parent && !e.scopeId; )
+        e = e.parent;
+      return e;
+    }, [e])
+  };
+}, useSystemSettingsVariable = () => {
   const { t: e } = useTranslation();
   return {
     /** 变量的配置项 */
@@ -21575,27 +21602,6 @@ const transformDefaultValue = (e, t) => e.map((o) => {
       h && p.push(h);
     }), p;
   })(r, 1);
-}, VariableScopeContext$1 = createContext({
-  scopeId: "",
-  type: ""
-}), VariableScope = (e) => {
-  const t = React.useContext(VariableScopeContext$1), o = useMemo(() => ({
-    scopeId: e.scopeId,
-    type: e.type,
-    parent: t
-  }), [e.scopeId, e.type, t]);
-  return /* @__PURE__ */ jsx(VariableScopeContext$1.Provider, { value: o, children: e.children });
-}, useVariableScopeInfo = () => {
-  let e = React.useContext(VariableScopeContext$1);
-  return {
-    getVariableScopeInfo: useCallback(() => {
-      if (e.scopeId)
-        return e;
-      for (; e.parent && !e.scopeId; )
-        e = e.parent;
-      return e;
-    }, [e])
-  };
 }, SchemaSettingsContext = createContext(null);
 SchemaSettingsContext.displayName = "SchemaSettingsContext";
 function useSchemaSettings() {
@@ -21938,14 +21944,14 @@ const SchemaSettingsSwitchItem = (e) => {
   }, [D]), B = useCallback(() => z(void 0, null, function* () {
     yield D.submit();
     try {
-      const O = D.values, M = Object.keys(O).reduce((k, L) => (D.query(L).take() && (k[L] = O[L]), k), {});
+      const L = D.values, M = Object.keys(L).reduce((k, O) => (D.query(O).take() && (k[O] = L[O]), k), {});
       h(!1), yield o == null ? void 0 : o(cloneDeep$1(M));
-    } catch (O) {
-      console.error(O);
+    } catch (L) {
+      console.error(L);
     }
   }), [D, o]), N = useCallback(() => z(void 0, null, function* () {
     !g && (i != null && i["x-uid"]) && (b["x-action-settings"].schemaUid = i["x-uid"], S.emit("patch", { schema: b }), yield F.resource("uiSchemas").insert({ values: i }), f(i["x-uid"])), typeof a == "function" && (a == null || a()), y.setVisible(!1), h(!0);
-  }), [F, y, S, b, i, g]), j = useCallback((O) => O.stopPropagation(), []);
+  }), [F, y, S, b, i, g]), j = useCallback((L) => L.stopPropagation(), []);
   return /* @__PURE__ */ jsxs(zIndexContext.Provider, { value: T, children: [
     /* @__PURE__ */ jsx(
       SchemaSettingsItem,
@@ -22012,17 +22018,17 @@ const SchemaSettingsModalItem = (e) => {
     "noRecord",
     "ModalContextProvider",
     "dialogRootClassName"
-  ]), g = useContext(SchemaOptionsContext), f = useCollection(), C = useAPIClient(), b = useApp(), { theme: y } = useGlobalTheme(), S = useBlockRequestContext(), v = useFormActiveFields(), { locale: F } = useContext(ConfigProvider.ConfigContext), I = useDataSourceManager(), R = useDataSourceKey(), T = useCollectionRecord(), { association: D } = useDataBlockProps() || {}, $ = useCurrentRecord(), B = useFormBlockContext(), N = useBlockContext(), { getOperators: j } = useOperators(), w = useLocationSearch(), O = useVariables$1(), M = useContext(AllDataBlocksContext), k = useContext(SchemaComponentContext), L = useContext(VariableScopeContext$1), { formValue: q, collection: E, parent: V } = useSubFormValue(), G = useCurrentPopupRecord(), U = useParentPopupRecord();
+  ]), g = useContext(SchemaOptionsContext), f = useCollection(), C = useAPIClient(), b = useApp(), { theme: y } = useGlobalTheme(), S = useBlockRequestContext(), v = useFormActiveFields(), { locale: F } = useContext(ConfigProvider.ConfigContext), I = useDataSourceManager(), R = useDataSourceKey(), T = useCollectionRecord(), { association: D } = useDataBlockProps() || {}, $ = useCurrentRecord(), B = useFormBlockContext(), N = useBlockContext(), { getOperators: j } = useOperators(), w = useLocationSearch(), L = useVariables$1(), M = useContext(AllDataBlocksContext), k = useContext(SchemaComponentContext), O = useContext(VariableScopeContext$1), { formValue: q, collection: V, parent: E } = useSubFormValue(), G = useCurrentPopupRecord(), U = useParentPopupRecord();
   return t ? null : /* @__PURE__ */ jsx(
     SchemaSettingsItem,
     P(x({
       title: o
     }, h), {
       onClick: () => z(void 0, null, function* () {
-        const K = l ? yield l() : c, J = _.isFunction(e.schema) ? e.schema() : e.schema;
+        const K = l ? yield l() : c, X = _.isFunction(e.schema) ? e.schema() : e.schema;
         FormDialog(
-          { title: J.title || o, width: u, rootClassName: m },
-          () => /* @__PURE__ */ jsx(VariableScopeContext$1.Provider, { value: L, children: /* @__PURE__ */ jsx(SchemaComponentContext.Provider, { value: k, children: /* @__PURE__ */ jsx(AllDataBlocksContext.Provider, { value: M, children: /* @__PURE__ */ jsx(p, { children: /* @__PURE__ */ jsx(CollectOperators, { defaultOperators: j(), children: /* @__PURE__ */ jsx(VariablesContext.Provider, { value: O, children: /* @__PURE__ */ jsx(BlockContext.Provider, { value: N, children: /* @__PURE__ */ jsx(
+          { title: X.title || o, width: u, rootClassName: m },
+          () => /* @__PURE__ */ jsx(VariableScopeContext$1.Provider, { value: O, children: /* @__PURE__ */ jsx(SchemaComponentContext.Provider, { value: k, children: /* @__PURE__ */ jsx(AllDataBlocksContext.Provider, { value: M, children: /* @__PURE__ */ jsx(p, { children: /* @__PURE__ */ jsx(CollectOperators, { defaultOperators: j(), children: /* @__PURE__ */ jsx(VariablesContext.Provider, { value: L, children: /* @__PURE__ */ jsx(BlockContext.Provider, { value: N, children: /* @__PURE__ */ jsx(
             VariablePopupRecordProvider,
             {
               recordData: G == null ? void 0 : G.value,
@@ -22034,7 +22040,7 @@ const SchemaSettingsModalItem = (e) => {
               children: /* @__PURE__ */ jsx(CollectionRecordProvider, { record: d ? null : T, children: /* @__PURE__ */ jsx(CurrentRecordContextProvider, P(x({}, $), { children: /* @__PURE__ */ jsx(FormBlockContext$1.Provider, { value: B, children: /* @__PURE__ */ jsx(
                 SubFormProvider,
                 {
-                  value: { value: q, collection: E, parent: V },
+                  value: { value: q, collection: V, parent: E },
                   children: /* @__PURE__ */ jsx(
                     FormActiveFieldsProvider,
                     {
@@ -22071,14 +22077,14 @@ const SchemaSettingsModalItem = (e) => {
                                                         min-width: 320px;
                                                       }
                                                     `,
-                                      children: /* @__PURE__ */ jsx(ApplicationContext.Provider, { value: b, children: /* @__PURE__ */ jsx(APIClientProvider, { apiClient: C, children: /* @__PURE__ */ jsx(ConfigProvider, { locale: F, children: /* @__PURE__ */ jsx(
+                                      children: /* @__PURE__ */ jsx(ApplicationContext.Provider, { value: b, children: /* @__PURE__ */ jsx(APIClientProvider, { apiClient: C, children: /* @__PURE__ */ jsx(ConfigProvider, { locale: F, children: /* @__PURE__ */ jsx(zIndexContext.Provider, { value: ICON_POPUP_Z_INDEX, children: /* @__PURE__ */ jsx(
                                         SchemaComponent,
                                         {
                                           components: n,
                                           scope: r,
-                                          schema: J
+                                          schema: X
                                         }
-                                      ) }) }) })
+                                      ) }) }) }) })
                                     }
                                   )
                                 }
@@ -22233,12 +22239,12 @@ const SchemaSettingsModalItem = (e) => {
     }),
     [o, c, u, S, g, f, p, h, T, r]
   ), N = useMemo(() => ({ ArrayCollapse: ArrayCollapse$2, FormLayout }), []), j = useCallback(
-    (O) => {
-      var E;
+    (L) => {
+      var V;
       const M = [];
-      for (const V of O.fieldReaction.rules)
-        M.push(_.omit(_.pickBy(V, _.identity), ["conditionBasic", "conditionAdvanced"]));
-      const k = S["x-component"] === "BlockTemplate" && ((E = S["x-component-props"]) == null ? void 0 : E.templateId), q = {
+      for (const E of L.fieldReaction.rules)
+        M.push(_.omit(_.pickBy(E, _.identity), ["conditionBasic", "conditionAdvanced"]));
+      const k = S["x-component"] === "BlockTemplate" && ((V = S["x-component-props"]) == null ? void 0 : V.templateId), q = {
         "x-uid": b !== LinkageRuleCategory.block ? k && m(k).uid || S["x-uid"] : c["x-uid"]
       };
       S[R] = M, q[R] = M, c[R] = M, d.emit("patch", {
@@ -22255,7 +22261,7 @@ const SchemaSettingsModalItem = (e) => {
       width: 960,
       schema: B,
       onSubmit: j,
-      ModalContextProvider: (O) => /* @__PURE__ */ jsx(FlagProvider, P(x({}, $), { children: O.children }))
+      ModalContextProvider: (L) => /* @__PURE__ */ jsx(FlagProvider, P(x({}, $), { children: L.children }))
     }
   );
 }, useDataTemplates = (e) => {
@@ -23355,8 +23361,8 @@ function getTypedConstantOption(e, t, o) {
   };
 }
 function Input$1(e) {
-  var W, X, Z;
-  const J = e, {
+  var W, J, Z;
+  const X = e, {
     value: t = "",
     onChange: o,
     children: n,
@@ -23370,7 +23376,7 @@ function Input$1(e) {
     parseOptions: p,
     hideVariableButton: m,
     constantAbel: h = !0
-  } = J, g = Y(J, [
+  } = X, g = Y(X, [
     "value",
     "onChange",
     "children",
@@ -23388,22 +23394,22 @@ function Input$1(e) {
   useAntdInputStyle(`${S}-input`);
   const v = useCompile(), { t: F } = useTranslation(), I = useForm(), [R, T] = React.useState([]), [D, $] = React.useState([]), [B, N] = React.useState(
     m || !!(n && t != null)
-  ), j = useMemo(() => parseValue(t, p), [p, t]), w = typeof j == "string", O = w ? j : "", M = w ? null : j, k = Object.assign(
+  ), j = useMemo(() => parseValue(t, p), [p, t]), w = typeof j == "string", L = w ? j : "", M = w ? null : j, k = Object.assign(
     {
       label: "label",
       value: "value",
       children: "children"
     },
     d != null ? d : {}
-  ), L = useMemo(() => h ? n ? {
+  ), O = useMemo(() => h ? n ? {
     value: "$",
     label: F("Constant"),
     [k.value]: "$",
     [k.label]: F("Constant")
-  } : a ? getTypedConstantOption(O, a, k) : null : null, [O, a]), q = (W = L == null ? void 0 : L.component) != null ? W : NullComponent, E = Array.isArray(a) ? (Z = (X = a.find((Q) => Array.isArray(Q) && Q[0] === O)) == null ? void 0 : X[1]) != null ? Z : {} : {};
-  let V;
-  t == null ? i ? n && B ? V = ["$"] : V = [""] : n ? V = ["$"] : V = [" ", O] : V = n ? ["$"] : [" ", O], m && (V = ["$"]), useEffect(() => {
-    const re = L != null ? L : {}, { component: Q } = re, ee = Y(re, ["component"]), oe = [
+  } : a ? getTypedConstantOption(L, a, k) : null : null, [L, a]), q = (W = O == null ? void 0 : O.component) != null ? W : NullComponent, V = Array.isArray(a) ? (Z = (J = a.find((Q) => Array.isArray(Q) && Q[0] === L)) == null ? void 0 : J[1]) != null ? Z : {} : {};
+  let E;
+  t == null ? i ? n && B ? E = ["$"] : E = [""] : n ? E = ["$"] : E = [" ", L] : E = n ? ["$"] : [" ", L], m && (E = ["$"]), useEffect(() => {
+    const re = O != null ? O : {}, { component: Q } = re, ee = Y(re, ["component"]), oe = [
       ...i ? [
         {
           value: "",
@@ -23412,11 +23418,11 @@ function Input$1(e) {
           [k.label]: F("Null")
         }
       ] : [],
-      ...L ? [v(ee)] : [],
+      ...O ? [v(ee)] : [],
       ...f ? [...f] : []
     ].filter((ie) => !ie.deprecated || (M == null ? void 0 : M[0]) === ie[k.value]);
     T(oe);
-  }, [f, M, L, i]);
+  }, [f, M, O, i]);
   const G = (Q) => z(this, null, function* () {
     var oe;
     const ee = Q[Q.length - 1];
@@ -23444,20 +23450,20 @@ function Input$1(e) {
         return;
       }
       if (Q[0] === " ") {
-        Q[1] ? Q[1] !== O && o((ie = (re = (oe = ConstantTypes[Q[1]]) == null ? void 0 : oe.default) == null ? void 0 : re.call(oe)) != null ? ie : null, ee) : M && o(null, ee);
+        Q[1] ? Q[1] !== L && o((ie = (re = (oe = ConstantTypes[Q[1]]) == null ? void 0 : oe.default) == null ? void 0 : re.call(oe)) != null ? ie : null, ee) : M && o(null, ee);
         return;
       }
       o(`{{${Q.join(".")}}}`, ee);
     },
-    [O, M, o]
+    [L, M, o]
   ), H = useCallback(() => {
     var Q;
-    if (N(!!n), (Q = L == null ? void 0 : L.children) != null && Q.length) {
-      const ee = L.children[0].default();
+    if (N(!!n), (Q = O == null ? void 0 : O.children) != null && Q.length) {
+      const ee = O.children[0].default();
       return o(ee);
     }
     o(null);
-  }, [L]);
+  }, [O]);
   useEffect(() => {
     z(this, null, function* () {
       var re;
@@ -23544,7 +23550,7 @@ function Input$1(e) {
           P(x({
             role: "button",
             "aria-label": "variable-constant"
-          }, E), {
+          }, V), {
             value: t,
             onChange: o
           })
@@ -23553,7 +23559,7 @@ function Input$1(e) {
           Cascader$1,
           {
             options: R,
-            value: M != null ? M : V,
+            value: M != null ? M : E,
             onChange: U,
             loadData: G,
             changeOnSelect: u != null ? u : !0,
@@ -23837,23 +23843,23 @@ function TextArea(e) {
   ), [y, S] = useState(!1), [v, F] = useState(!1), [I, R] = useState(() => renderHTML(p != null ? p : "", b, c)), [T, D] = useState([-1, 0, -1, 0]);
   useAntdInputStyle("ant-input");
   const { token: $ } = theme.useToken(), B = c.join(" "), N = useCallback(
-    (V) => {
+    (E) => {
       var U;
-      const G = getValue(V, c);
+      const G = getValue(E, c);
       (U = e.onChange) == null || U.call(e, d ? G.trim() : G);
     },
     [B, e.onChange, d]
   );
   useEffect(() => {
-    preloadOptions(r, m).then((V) => {
-      f(V);
+    preloadOptions(r, m).then((E) => {
+      f(E);
     }).catch(console.error);
   }, [r, JSON.stringify(m)]), useEffect(() => {
     R(renderHTML(p != null ? p : "", b, c)), v || D([-1, 0, -1, 0]);
   }, [p, b, B]), useEffect(() => {
     var U;
-    const { current: V } = h;
-    if (!V)
+    const { current: E } = h;
+    if (!E)
       return;
     const G = new Range();
     if (v) {
@@ -23862,22 +23868,22 @@ function TextArea(e) {
       const H = (U = window.getSelection) == null ? void 0 : U.call(window);
       if (H)
         try {
-          const K = Array.from(V.childNodes);
+          const K = Array.from(E.childNodes);
           K.length && (T[0] === -1 ? T[1] && G.setStartAfter(K[T[1] - 1]) : G.setStart(K[T[0]], T[1]), T[2] === -1 ? T[3] && G.setEndAfter(K[T[3] - 1]) : G.setEnd(K[T[2]], T[3])), G.collapse(!0), H.removeAllRanges(), H.addRange(G);
         } catch (K) {
         }
     } else {
-      const { lastChild: H } = V;
+      const { lastChild: H } = E;
       if (H) {
         G.setStartAfter(H), G.setEndAfter(H);
-        const K = Array.from(V.childNodes), J = G.startContainer === V ? -1 : K.indexOf(H), W = G.startContainer === V ? -1 : K.indexOf(H);
-        D([J, G.startOffset, W, G.endOffset]);
+        const K = Array.from(E.childNodes), X = G.startContainer === E ? -1 : K.indexOf(H), W = G.startContainer === E ? -1 : K.indexOf(H);
+        D([X, G.startOffset, W, G.endOffset]);
       }
     }
   }, [I]);
   const j = useCallback(
-    function(V) {
-      const G = V.filter((K) => !!K.trim()), { current: U } = h;
+    function(E) {
+      const G = E.filter((K) => !!K.trim()), { current: U } = h;
       if (!U || !G)
         return;
       U.focus();
@@ -23888,25 +23894,25 @@ function TextArea(e) {
     },
     [b, N, T]
   ), w = useCallback(
-    function({ currentTarget: V }) {
-      y || (F(!0), D(getCurrentRange(V)), N(V));
+    function({ currentTarget: E }) {
+      y || (F(!0), D(getCurrentRange(E)), N(E));
     },
     [y, N]
-  ), O = useCallback(function({ currentTarget: V }) {
-    D(getCurrentRange(V));
-  }, []), M = useCallback(function(V) {
-    V.key === "Enter" && V.preventDefault();
+  ), L = useCallback(function({ currentTarget: E }) {
+    D(getCurrentRange(E));
+  }, []), M = useCallback(function(E) {
+    E.key === "Enter" && E.preventDefault();
   }, []), k = useCallback(function() {
     S(!0);
-  }, []), L = useCallback(
-    ({ currentTarget: V }) => {
-      S(!1), F(!0), D(getCurrentRange(V)), N(V);
+  }, []), O = useCallback(
+    ({ currentTarget: E }) => {
+      S(!1), F(!0), D(getCurrentRange(E)), N(E);
     },
     [N]
   ), q = useCallback(
-    function(V) {
-      V.preventDefault();
-      const G = V.clipboardData.getData("text/html") || V.clipboardData.getData("text"), U = sanitizeHTML(G, {
+    function(E) {
+      E.preventDefault();
+      const G = E.clipboardData.getData("text/html") || E.clipboardData.getData("text"), U = sanitizeHTML(G, {
         allowedTags: ["span"],
         allowedAttributes: {
           span: ["data-variable", "contenteditable"]
@@ -23923,10 +23929,10 @@ function TextArea(e) {
           }
         }
       }).replace(/\n/g, " ");
-      F(!0), pasteHTML(V.currentTarget, U), D(getCurrentRange(V.currentTarget)), N(V.currentTarget);
+      F(!0), pasteHTML(E.currentTarget, U), D(getCurrentRange(E.currentTarget)), N(E.currentTarget);
     },
     [N]
-  ), E = e.disabled || C.disabled;
+  ), V = e.disabled || C.disabled;
   return t(
     /* @__PURE__ */ jsxs(Fragment$1, { children: [
       /* @__PURE__ */ jsxs(
@@ -23976,17 +23982,17 @@ function TextArea(e) {
                 role: "button",
                 "aria-label": "textbox",
                 onInput: w,
-                onBlur: O,
+                onBlur: L,
                 onKeyDown: M,
                 onPaste: q,
                 onCompositionStart: k,
-                onCompositionEnd: L,
+                onCompositionEnd: O,
                 placeholder: e.placeholder,
                 style: i,
                 className: cx(
                   o,
                   "ant-input ant-input-outlined",
-                  { "ant-input-disabled": E },
+                  { "ant-input-disabled": V },
                   // NOTE: `pre-wrap` here for avoid the `&nbsp;` (\x160) issue when paste content, we need normal space (\x32).
                   css`
               min-height: ${$.controlHeight}px;
@@ -24008,7 +24014,7 @@ function TextArea(e) {
             `
                 ),
                 ref: h,
-                contentEditable: !E,
+                contentEditable: !V,
                 dangerouslySetInnerHTML: { __html: I }
               }
             ),
@@ -24020,7 +24026,7 @@ function TextArea(e) {
                 onInsert: j,
                 changeOnSelect: a,
                 fieldNames: l || defaultFieldNames$2,
-                disabled: E
+                disabled: V
               }
             )
           ]
@@ -24240,7 +24246,7 @@ const getVariableComponentWithScope = (e, t = []) => (o) => {
       () => {
         var v;
         const S = createMemoryHistory();
-        return /* @__PURE__ */ jsx(DataSourceManagerProvider, { dataSourceManager: d, children: /* @__PURE__ */ jsx(CollectionManagerProvider, { instance: p, dataSource: (v = p == null ? void 0 : p.dataSource) == null ? void 0 : v.key, children: /* @__PURE__ */ jsx(Router, { location: S.location, navigator: S, children: /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: t.scope, components: x({}, t.components), children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(
+        return /* @__PURE__ */ jsx(DataSourceManagerProvider, { dataSourceManager: d, children: /* @__PURE__ */ jsx(CollectionManagerProvider, { instance: p, dataSource: (v = p == null ? void 0 : p.dataSource) == null ? void 0 : v.key, children: /* @__PURE__ */ jsx(Router, { location: S.location, navigator: S, children: /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: t.scope, components: x({}, t.components), children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(zIndexContext.Provider, { value: ICON_POPUP_Z_INDEX, children: /* @__PURE__ */ jsx(
           SchemaComponent,
           {
             schema: {
@@ -24262,7 +24268,7 @@ const getVariableComponentWithScope = (e, t = []) => (o) => {
               }
             }
           }
-        ) }) }) }) }) });
+        ) }) }) }) }) }) });
       },
       o
     ).open({
@@ -24297,7 +24303,7 @@ const getVariableComponentWithScope = (e, t = []) => (o) => {
   const { t: e } = useTranslation(), t = useContext(SchemaOptionsContext), { theme: o } = useGlobalTheme(), { componentCls: n, hashId: r } = useStyles$h(), a = useParentRoute(), { createRoute: i } = useNocoBaseRoutes(), l = useInsertPageSchema(), c = useCallback(() => z(void 0, null, function* () {
     const u = yield FormDialog(
       e("Add page"),
-      () => /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: t.scope, components: x({}, t.components), children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(
+      () => /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: t.scope, components: x({}, t.components), children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(zIndexContext.Provider, { value: ICON_POPUP_Z_INDEX, children: /* @__PURE__ */ jsx(
         SchemaComponent,
         {
           schema: {
@@ -24316,7 +24322,7 @@ const getVariableComponentWithScope = (e, t = []) => (o) => {
             }
           }
         }
-      ) }) }),
+      ) }) }) }),
       o
     ).open({
       initialValues: {}
@@ -24362,7 +24368,7 @@ const GroupItem$1 = () => {
   const { t: e } = useTranslation(), t = useContext(SchemaOptionsContext), { theme: o } = useGlobalTheme(), { componentCls: n, hashId: r } = useStyles$h(), a = useParentRoute(), { createRoute: i } = useNocoBaseRoutes(), l = useCallback(() => z(void 0, null, function* () {
     const c = yield FormDialog(
       e("Add group"),
-      () => /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: t.scope, components: x({}, t.components), children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(
+      () => /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: t.scope, components: x({}, t.components), children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(zIndexContext.Provider, { value: ICON_POPUP_Z_INDEX, children: /* @__PURE__ */ jsx(
         SchemaComponent,
         {
           schema: {
@@ -24381,7 +24387,7 @@ const GroupItem$1 = () => {
             }
           }
         }
-      ) }) }),
+      ) }) }) }),
       o
     ).open({
       initialValues: {}
@@ -26976,86 +26982,86 @@ https://requirejs.org/docs/errors.html#` + e);
       config: {}
     }, l = {}, c = {}, u = {}, d = [], p = {}, m = {}, h = {}, g = 1, f = 1;
     function C(k) {
-      var L, q;
-      for (L = 0; L < k.length; L++)
-        if (q = k[L], q === ".")
-          k.splice(L, 1), L -= 1;
+      var O, q;
+      for (O = 0; O < k.length; O++)
+        if (q = k[O], q === ".")
+          k.splice(O, 1), O -= 1;
         else if (q === "..") {
-          if (L === 0 || L === 1 && k[2] === ".." || k[L - 1] === "..")
+          if (O === 0 || O === 1 && k[2] === ".." || k[O - 1] === "..")
             continue;
-          L > 0 && (k.splice(L - 1, 2), L -= 2);
+          O > 0 && (k.splice(O - 1, 2), O -= 2);
         }
     }
-    function b(k, L, q) {
-      var E, V, G, U, H, K, J, W, X, Z, Q, ee, oe = L && L.split("/"), re = i.map, ie = re && re["*"];
-      if (k && (k = k.split("/"), J = k.length - 1, i.nodeIdCompat && jsSuffixRegExp.test(k[J]) && (k[J] = k[J].replace(jsSuffixRegExp, "")), k[0].charAt(0) === "." && oe && (ee = oe.slice(0, oe.length - 1), k = ee.concat(k)), C(k), k = k.join("/")), q && re && (oe || ie)) {
+    function b(k, O, q) {
+      var V, E, G, U, H, K, X, W, J, Z, Q, ee, oe = O && O.split("/"), re = i.map, ie = re && re["*"];
+      if (k && (k = k.split("/"), X = k.length - 1, i.nodeIdCompat && jsSuffixRegExp.test(k[X]) && (k[X] = k[X].replace(jsSuffixRegExp, "")), k[0].charAt(0) === "." && oe && (ee = oe.slice(0, oe.length - 1), k = ee.concat(k)), C(k), k = k.join("/")), q && re && (oe || ie)) {
         G = k.split("/");
         e:
           for (U = G.length; U > 0; U -= 1) {
             if (K = G.slice(0, U).join("/"), oe) {
               for (H = oe.length; H > 0; H -= 1)
-                if (V = getOwn(re, oe.slice(0, H).join("/")), V && (V = getOwn(V, K), V)) {
-                  W = V, X = U;
+                if (E = getOwn(re, oe.slice(0, H).join("/")), E && (E = getOwn(E, K), E)) {
+                  W = E, J = U;
                   break e;
                 }
             }
             !Z && ie && getOwn(ie, K) && (Z = getOwn(ie, K), Q = U);
           }
-        !W && Z && (W = Z, X = Q), W && (G.splice(0, X, W), k = G.join("/"));
+        !W && Z && (W = Z, J = Q), W && (G.splice(0, J, W), k = G.join("/"));
       }
-      return E = getOwn(i.pkgs, k), E || k;
+      return V = getOwn(i.pkgs, k), V || k;
     }
     function y(k) {
-      isBrowser && each(scripts(), function(L) {
-        if (L.getAttribute("data-requiremodule") === k && L.getAttribute("data-requirecontext") === n.contextName)
-          return L.parentNode.removeChild(L), !0;
+      isBrowser && each(scripts(), function(O) {
+        if (O.getAttribute("data-requiremodule") === k && O.getAttribute("data-requirecontext") === n.contextName)
+          return O.parentNode.removeChild(O), !0;
       });
     }
     function S(k) {
-      var L = getOwn(i.paths, k);
-      if (L && isArray(L) && L.length > 1)
-        return L.shift(), n.require.undef(k), n.makeRequire(null, {
+      var O = getOwn(i.paths, k);
+      if (O && isArray(O) && O.length > 1)
+        return O.shift(), n.require.undef(k), n.makeRequire(null, {
           skipMap: !0
         })([k]), !0;
     }
     function v(k) {
-      var L, q = k ? k.indexOf("!") : -1;
-      return q > -1 && (L = k.substring(0, q), k = k.substring(q + 1, k.length)), [L, k];
-    }
-    function F(k, L, q, E) {
-      var V, G, U, H, K = null, J = L ? L.name : null, W = k, X = !0, Z = "";
-      return k || (X = !1, k = "_@r" + (g += 1)), H = v(k), K = H[0], k = H[1], K && (K = b(K, J, E), G = getOwn(p, K)), k && (K ? q ? Z = k : G && G.normalize ? Z = G.normalize(k, function(Q) {
-        return b(Q, J, E);
-      }) : Z = k.indexOf("!") === -1 ? b(k, J, E) : k : (Z = b(k, J, E), H = v(Z), K = H[0], Z = H[1], q = !0, V = n.nameToUrl(Z))), U = K && !G && !q ? "_unnormalized" + (f += 1) : "", {
+      var O, q = k ? k.indexOf("!") : -1;
+      return q > -1 && (O = k.substring(0, q), k = k.substring(q + 1, k.length)), [O, k];
+    }
+    function F(k, O, q, V) {
+      var E, G, U, H, K = null, X = O ? O.name : null, W = k, J = !0, Z = "";
+      return k || (J = !1, k = "_@r" + (g += 1)), H = v(k), K = H[0], k = H[1], K && (K = b(K, X, V), G = getOwn(p, K)), k && (K ? q ? Z = k : G && G.normalize ? Z = G.normalize(k, function(Q) {
+        return b(Q, X, V);
+      }) : Z = k.indexOf("!") === -1 ? b(k, X, V) : k : (Z = b(k, X, V), H = v(Z), K = H[0], Z = H[1], q = !0, E = n.nameToUrl(Z))), U = K && !G && !q ? "_unnormalized" + (f += 1) : "", {
         prefix: K,
         name: Z,
-        parentMap: L,
+        parentMap: O,
         unnormalized: !!U,
-        url: V,
+        url: E,
         originalName: W,
-        isDefine: X,
+        isDefine: J,
         id: (K ? K + "!" + Z : Z) + U
       };
     }
     function I(k) {
-      var L = k.id, q = getOwn(l, L);
-      return q || (q = l[L] = new n.Module(k)), q;
+      var O = k.id, q = getOwn(l, O);
+      return q || (q = l[O] = new n.Module(k)), q;
     }
-    function R(k, L, q) {
-      var E = k.id, V = getOwn(l, E);
-      hasProp(p, E) && (!V || V.defineEmitComplete) ? L === "defined" && q(p[E]) : (V = I(k), V.error && L === "error" ? q(V.error) : V.on(L, q));
+    function R(k, O, q) {
+      var V = k.id, E = getOwn(l, V);
+      hasProp(p, V) && (!E || E.defineEmitComplete) ? O === "defined" && q(p[V]) : (E = I(k), E.error && O === "error" ? q(E.error) : E.on(O, q));
     }
-    function T(k, L) {
-      var q = k.requireModules, E = !1;
-      L ? L(k) : (each(q, function(V) {
-        var G = getOwn(l, V);
-        G && (G.error = k, G.events.error && (E = !0, G.emit("error", k)));
-      }), E || req.onError(k));
+    function T(k, O) {
+      var q = k.requireModules, V = !1;
+      O ? O(k) : (each(q, function(E) {
+        var G = getOwn(l, E);
+        G && (G.error = k, G.events.error && (V = !0, G.emit("error", k)));
+      }), V || req.onError(k));
     }
     function D() {
       globalDefQueue.length && (each(globalDefQueue, function(k) {
-        var L = k[0];
-        typeof L == "string" && (n.defQueueMap[L] = !0), d.push(k);
+        var O = k[0];
+        typeof O == "string" && (n.defQueueMap[O] = !0), d.push(k);
       }), globalDefQueue = []);
     }
     r = {
@@ -27080,29 +27086,29 @@ https://requirejs.org/docs/errors.html#` + e);
     function $(k) {
       delete l[k], delete c[k];
     }
-    function B(k, L, q) {
-      var E = k.map.id;
-      k.error ? k.emit("error", k.error) : (L[E] = !0, each(k.depMaps, function(V, G) {
-        var U = V.id, H = getOwn(l, U);
-        H && !k.depMatched[G] && !q[U] && (getOwn(L, U) ? (k.defineDep(G, p[U]), k.check()) : B(H, L, q));
-      }), q[E] = !0);
+    function B(k, O, q) {
+      var V = k.map.id;
+      k.error ? k.emit("error", k.error) : (O[V] = !0, each(k.depMaps, function(E, G) {
+        var U = E.id, H = getOwn(l, U);
+        H && !k.depMatched[G] && !q[U] && (getOwn(O, U) ? (k.defineDep(G, p[U]), k.check()) : B(H, O, q));
+      }), q[V] = !0);
     }
     function N() {
-      var k, L, q = i.waitSeconds * 1e3, E = q && n.startTime + q < (/* @__PURE__ */ new Date()).getTime(), V = [], G = [], U = !1, H = !0;
+      var k, O, q = i.waitSeconds * 1e3, V = q && n.startTime + q < (/* @__PURE__ */ new Date()).getTime(), E = [], G = [], U = !1, H = !0;
       if (!t) {
         if (t = !0, eachProp(c, function(K) {
-          var J = K.map, W = J.id;
-          if (K.enabled && (J.isDefine || G.push(K), !K.error)) {
-            if (!K.inited && E)
-              S(W) ? (L = !0, U = !0) : (V.push(W), y(W));
-            else if (!K.inited && K.fetched && J.isDefine && (U = !0, !J.prefix))
+          var X = K.map, W = X.id;
+          if (K.enabled && (X.isDefine || G.push(K), !K.error)) {
+            if (!K.inited && V)
+              S(W) ? (O = !0, U = !0) : (E.push(W), y(W));
+            else if (!K.inited && K.fetched && X.isDefine && (U = !0, !X.prefix))
               return H = !1;
           }
-        }), E && V.length)
-          return k = makeError("timeout", "Load timeout for modules: " + V, null, V), k.contextName = n.contextName, T(k);
+        }), V && E.length)
+          return k = makeError("timeout", "Load timeout for modules: " + E, null, E), k.contextName = n.contextName, T(k);
         H && each(G, function(K) {
           B(K, {}, {});
-        }), (!E || L) && U && (isBrowser || isWebWorker) && !a && (a = setTimeout(function() {
+        }), (!V || O) && U && (isBrowser || isWebWorker) && !a && (a = setTimeout(function() {
           a = 0, N();
         }, 50)), t = !1;
       }
@@ -27110,13 +27116,13 @@ https://requirejs.org/docs/errors.html#` + e);
     o = function(k) {
       this.events = getOwn(u, k.id) || {}, this.map = k, this.shim = getOwn(i.shim, k.id), this.depExports = [], this.depMaps = [], this.depMatched = [], this.pluginMaps = {}, this.depCount = 0;
     }, o.prototype = {
-      init: function(k, L, q, E) {
-        E = E || {}, !this.inited && (this.factory = L, q ? this.on("error", q) : this.events.error && (q = bind(this, function(V) {
-          this.emit("error", V);
-        })), this.depMaps = k && k.slice(0), this.errback = q, this.inited = !0, this.ignore = E.ignore, E.enabled || this.enabled ? this.enable() : this.check());
+      init: function(k, O, q, V) {
+        V = V || {}, !this.inited && (this.factory = O, q ? this.on("error", q) : this.events.error && (q = bind(this, function(E) {
+          this.emit("error", E);
+        })), this.depMaps = k && k.slice(0), this.errback = q, this.inited = !0, this.ignore = V.ignore, V.enabled || this.enabled ? this.enable() : this.check());
       },
-      defineDep: function(k, L) {
-        this.depMatched[k] || (this.depMatched[k] = !0, this.depCount -= 1, this.depExports[k] = L);
+      defineDep: function(k, O) {
+        this.depMatched[k] || (this.depMatched[k] = !0, this.depCount -= 1, this.depExports[k] = O);
       },
       fetch: function() {
         if (!this.fetched) {
@@ -27142,7 +27148,7 @@ https://requirejs.org/docs/errors.html#` + e);
        */
       check: function() {
         if (!(!this.enabled || this.enabling)) {
-          var k, L, q = this.map.id, E = this.depExports, V = this.exports, G = this.factory;
+          var k, O, q = this.map.id, V = this.depExports, E = this.exports, G = this.factory;
           if (!this.inited)
             hasProp(n.defQueueMap, q) || this.fetch();
           else if (this.error)
@@ -27152,17 +27158,17 @@ https://requirejs.org/docs/errors.html#` + e);
               if (isFunction(G)) {
                 if (this.events.error && this.map.isDefine || req.onError !== defaultOnError)
                   try {
-                    V = n.execCb(q, G, E, V);
+                    E = n.execCb(q, G, V, E);
                   } catch (H) {
                     k = H;
                   }
                 else
-                  V = n.execCb(q, G, E, V);
-                if (this.map.isDefine && V === void 0 && (L = this.module, L ? V = L.exports : this.usingExports && (V = this.exports)), k)
+                  E = n.execCb(q, G, V, E);
+                if (this.map.isDefine && E === void 0 && (O = this.module, O ? E = O.exports : this.usingExports && (E = this.exports)), k)
                   return k.requireMap = this.map, k.requireModules = this.map.isDefine ? [this.map.id] : null, k.requireType = this.map.isDefine ? "define" : "require", T(this.error = k);
               } else
-                V = G;
-              if (this.exports = V, this.map.isDefine && !this.ignore && (p[q] = V, req.onResourceLoad)) {
+                E = G;
+              if (this.exports = E, this.map.isDefine && !this.ignore && (p[q] = E, req.onResourceLoad)) {
                 var U = [];
                 each(this.depMaps, function(H) {
                   U.push(H.normalizedMap || H);
@@ -27175,14 +27181,14 @@ https://requirejs.org/docs/errors.html#` + e);
         }
       },
       callPlugin: function() {
-        var k = this.map, L = k.id, q = F(k.prefix);
-        this.depMaps.push(q), R(q, "defined", bind(this, function(E) {
-          var V, G, U, H = getOwn(h, this.map.id), K = this.map.name, J = this.map.parentMap ? this.map.parentMap.name : null, W = n.makeRequire(k.parentMap, {
+        var k = this.map, O = k.id, q = F(k.prefix);
+        this.depMaps.push(q), R(q, "defined", bind(this, function(V) {
+          var E, G, U, H = getOwn(h, this.map.id), K = this.map.name, X = this.map.parentMap ? this.map.parentMap.name : null, W = n.makeRequire(k.parentMap, {
             enableBuildCallback: !0
           });
           if (this.map.unnormalized) {
-            E.normalize && (K = E.normalize(K, function(X) {
-              return b(X, J, !0);
+            V.normalize && (K = V.normalize(K, function(J) {
+              return b(J, X, !0);
             }) || ""), G = F(
               k.prefix + "!" + K,
               this.map.parentMap,
@@ -27190,16 +27196,16 @@ https://requirejs.org/docs/errors.html#` + e);
             ), R(
               G,
               "defined",
-              bind(this, function(X) {
+              bind(this, function(J) {
                 this.map.normalizedMap = G, this.init([], function() {
-                  return X;
+                  return J;
                 }, null, {
                   enabled: !0,
                   ignore: !0
                 });
               })
-            ), U = getOwn(l, G.id), U && (this.depMaps.push(G), this.events.error && U.on("error", bind(this, function(X) {
-              this.emit("error", X);
+            ), U = getOwn(l, G.id), U && (this.depMaps.push(G), this.events.error && U.on("error", bind(this, function(J) {
+              this.emit("error", J);
             })), U.enable());
             return;
           }
@@ -27207,79 +27213,79 @@ https://requirejs.org/docs/errors.html#` + e);
             this.map.url = n.nameToUrl(H), this.load();
             return;
           }
-          V = bind(this, function(X) {
+          E = bind(this, function(J) {
             this.init([], function() {
-              return X;
+              return J;
             }, null, {
               enabled: !0
             });
-          }), V.error = bind(this, function(X) {
-            this.inited = !0, this.error = X, X.requireModules = [L], eachProp(l, function(Z) {
-              Z.map.id.indexOf(L + "_unnormalized") === 0 && $(Z.map.id);
-            }), T(X);
-          }), V.fromText = bind(this, function(X, Z) {
+          }), E.error = bind(this, function(J) {
+            this.inited = !0, this.error = J, J.requireModules = [O], eachProp(l, function(Z) {
+              Z.map.id.indexOf(O + "_unnormalized") === 0 && $(Z.map.id);
+            }), T(J);
+          }), E.fromText = bind(this, function(J, Z) {
             var Q = k.name, ee = F(Q), oe = useInteractive;
-            Z && (X = Z), oe && (useInteractive = !1), I(ee), hasProp(i.config, L) && (i.config[Q] = i.config[L]);
+            Z && (J = Z), oe && (useInteractive = !1), I(ee), hasProp(i.config, O) && (i.config[Q] = i.config[O]);
             try {
-              req.exec(X);
+              req.exec(J);
             } catch (re) {
               return T(makeError(
                 "fromtexteval",
-                "fromText eval for " + L + " failed: " + re,
+                "fromText eval for " + O + " failed: " + re,
                 re,
-                [L]
+                [O]
               ));
             }
-            oe && (useInteractive = !0), this.depMaps.push(ee), n.completeLoad(Q), W([Q], V);
-          }), E.load(k.name, W, V, i);
+            oe && (useInteractive = !0), this.depMaps.push(ee), n.completeLoad(Q), W([Q], E);
+          }), V.load(k.name, W, E, i);
         })), n.enable(q, this), this.pluginMaps[q.id] = q;
       },
       enable: function() {
-        c[this.map.id] = this, this.enabled = !0, this.enabling = !0, each(this.depMaps, bind(this, function(k, L) {
-          var q, E, V;
+        c[this.map.id] = this, this.enabled = !0, this.enabling = !0, each(this.depMaps, bind(this, function(k, O) {
+          var q, V, E;
           if (typeof k == "string") {
             if (k = F(
               k,
               this.map.isDefine ? this.map : this.map.parentMap,
               !1,
               !this.skipMap
-            ), this.depMaps[L] = k, V = getOwn(r, k.id), V) {
-              this.depExports[L] = V(this);
+            ), this.depMaps[O] = k, E = getOwn(r, k.id), E) {
+              this.depExports[O] = E(this);
               return;
             }
             this.depCount += 1, R(k, "defined", bind(this, function(G) {
-              this.undefed || (this.defineDep(L, G), this.check());
+              this.undefed || (this.defineDep(O, G), this.check());
             })), this.errback ? R(k, "error", bind(this, this.errback)) : this.events.error && R(k, "error", bind(this, function(G) {
               this.emit("error", G);
             }));
           }
-          q = k.id, E = l[q], !hasProp(r, q) && E && !E.enabled && n.enable(k, this);
+          q = k.id, V = l[q], !hasProp(r, q) && V && !V.enabled && n.enable(k, this);
         })), eachProp(this.pluginMaps, bind(this, function(k) {
-          var L = getOwn(l, k.id);
-          L && !L.enabled && n.enable(k, this);
+          var O = getOwn(l, k.id);
+          O && !O.enabled && n.enable(k, this);
         })), this.enabling = !1, this.check();
       },
-      on: function(k, L) {
+      on: function(k, O) {
         var q = this.events[k];
-        q || (q = this.events[k] = []), q.push(L);
+        q || (q = this.events[k] = []), q.push(O);
       },
-      emit: function(k, L) {
+      emit: function(k, O) {
         each(this.events[k], function(q) {
-          q(L);
+          q(O);
         }), k === "error" && delete this.events[k];
       }
     };
     function j(k) {
       hasProp(p, k[0]) || I(F(k[0], null, !0)).init(k[1], k[2]);
     }
-    function w(k, L, q, E) {
-      k.detachEvent && !isOpera ? E && k.detachEvent(E, L) : k.removeEventListener(q, L, !1);
+    function w(k, O, q, V) {
+      k.detachEvent && !isOpera ? V && k.detachEvent(V, O) : k.removeEventListener(q, O, !1);
     }
-    function O(k) {
-      var L = k.currentTarget || k.srcElement;
-      return w(L, n.onScriptLoad, "load", "onreadystatechange"), w(L, n.onScriptError, "error"), {
-        node: L,
-        id: L && L.getAttribute("data-requiremodule")
+    function L(k) {
+      var O = k.currentTarget || k.srcElement;
+      return w(O, n.onScriptLoad, "load", "onreadystatechange"), w(O, n.onScriptError, "error"), {
+        node: O,
+        id: O && O.getAttribute("data-requiremodule")
       };
     }
     function M() {
@@ -27309,47 +27315,47 @@ https://requirejs.org/docs/errors.html#` + e);
        */
       configure: function(k) {
         if (k.baseUrl && k.baseUrl.charAt(k.baseUrl.length - 1) !== "/" && (k.baseUrl += "/"), typeof k.urlArgs == "string") {
-          var L = k.urlArgs;
-          k.urlArgs = function(V, G) {
-            return (G.indexOf("?") === -1 ? "?" : "&") + L;
+          var O = k.urlArgs;
+          k.urlArgs = function(E, G) {
+            return (G.indexOf("?") === -1 ? "?" : "&") + O;
           };
         }
-        var q = i.shim, E = {
+        var q = i.shim, V = {
           paths: !0,
           bundles: !0,
           config: !0,
           map: !0
         };
-        eachProp(k, function(V, G) {
-          E[G] ? (i[G] || (i[G] = {}), mixin(i[G], V, !0, !0)) : i[G] = V;
-        }), k.bundles && eachProp(k.bundles, function(V, G) {
-          each(V, function(U) {
+        eachProp(k, function(E, G) {
+          V[G] ? (i[G] || (i[G] = {}), mixin(i[G], E, !0, !0)) : i[G] = E;
+        }), k.bundles && eachProp(k.bundles, function(E, G) {
+          each(E, function(U) {
             U !== G && (h[U] = G);
           });
-        }), k.shim && (eachProp(k.shim, function(V, G) {
-          isArray(V) && (V = {
-            deps: V
-          }), (V.exports || V.init) && !V.exportsFn && (V.exportsFn = n.makeShimExports(V)), q[G] = V;
-        }), i.shim = q), k.packages && each(k.packages, function(V) {
+        }), k.shim && (eachProp(k.shim, function(E, G) {
+          isArray(E) && (E = {
+            deps: E
+          }), (E.exports || E.init) && !E.exportsFn && (E.exportsFn = n.makeShimExports(E)), q[G] = E;
+        }), i.shim = q), k.packages && each(k.packages, function(E) {
           var G, U;
-          V = typeof V == "string" ? { name: V } : V, U = V.name, G = V.location, G && (i.paths[U] = V.location), i.pkgs[U] = V.name + "/" + (V.main || "main").replace(currDirRegExp, "").replace(jsSuffixRegExp, "");
-        }), eachProp(l, function(V, G) {
-          !V.inited && !V.map.unnormalized && (V.map = F(G, null, !0));
+          E = typeof E == "string" ? { name: E } : E, U = E.name, G = E.location, G && (i.paths[U] = E.location), i.pkgs[U] = E.name + "/" + (E.main || "main").replace(currDirRegExp, "").replace(jsSuffixRegExp, "");
+        }), eachProp(l, function(E, G) {
+          !E.inited && !E.map.unnormalized && (E.map = F(G, null, !0));
         }), (k.deps || k.callback) && n.require(k.deps || [], k.callback);
       },
       makeShimExports: function(k) {
-        function L() {
+        function O() {
           var q;
           return k.init && (q = k.init.apply(global, arguments)), q || k.exports && getGlobal(k.exports);
         }
-        return L;
+        return O;
       },
-      makeRequire: function(k, L) {
-        L = L || {};
-        function q(E, V, G) {
+      makeRequire: function(k, O) {
+        O = O || {};
+        function q(V, E, G) {
           var U, H, K;
-          return L.enableBuildCallback && V && isFunction(V) && (V.__requireJsBuild = !0), typeof E == "string" ? isFunction(V) ? T(makeError("requireargs", "Invalid require call"), G) : k && hasProp(r, E) ? r[E](l[k.id]) : req.get ? req.get(n, E, k, q) : (H = F(E, k, !1, !0), U = H.id, hasProp(p, U) ? p[U] : T(makeError("notloaded", 'Module name "' + U + '" has not been loaded yet for context: ' + e + (k ? "" : ". Use require([])")))) : (M(), n.nextTick(function() {
-            M(), K = I(F(null, k)), K.skipMap = L.skipMap, K.init(E, V, G, {
+          return O.enableBuildCallback && E && isFunction(E) && (E.__requireJsBuild = !0), typeof V == "string" ? isFunction(E) ? T(makeError("requireargs", "Invalid require call"), G) : k && hasProp(r, V) ? r[V](l[k.id]) : req.get ? req.get(n, V, k, q) : (H = F(V, k, !1, !0), U = H.id, hasProp(p, U) ? p[U] : T(makeError("notloaded", 'Module name "' + U + '" has not been loaded yet for context: ' + e + (k ? "" : ". Use require([])")))) : (M(), n.nextTick(function() {
+            M(), K = I(F(null, k)), K.skipMap = O.skipMap, K.init(V, E, G, {
               enabled: !0
             }), N();
           }), q);
@@ -27361,26 +27367,26 @@ https://requirejs.org/docs/errors.html#` + e);
            * *Requires* the use of a module name. It does not support using
            * plain URLs like nameToUrl.
            */
-          toUrl: function(E) {
-            var V, G = E.lastIndexOf("."), U = E.split("/")[0], H = U === "." || U === "..";
-            return G !== -1 && (!H || G > 1) && (V = E.substring(G, E.length), E = E.substring(0, G)), n.nameToUrl(b(
-              E,
+          toUrl: function(V) {
+            var E, G = V.lastIndexOf("."), U = V.split("/")[0], H = U === "." || U === "..";
+            return G !== -1 && (!H || G > 1) && (E = V.substring(G, V.length), V = V.substring(0, G)), n.nameToUrl(b(
+              V,
               k && k.id,
               !0
-            ), V, !0);
+            ), E, !0);
           },
-          defined: function(E) {
-            return hasProp(p, F(E, k, !1, !0).id);
+          defined: function(V) {
+            return hasProp(p, F(V, k, !1, !0).id);
           },
-          specified: function(E) {
-            return E = F(E, k, !1, !0).id, hasProp(p, E) || hasProp(l, E);
+          specified: function(V) {
+            return V = F(V, k, !1, !0).id, hasProp(p, V) || hasProp(l, V);
           }
-        }), k || (q.undef = function(E) {
+        }), k || (q.undef = function(V) {
           D();
-          var V = F(E, k, !0), G = getOwn(l, E);
-          G.undefed = !0, y(E), delete p[E], delete m[V.url], delete u[E], eachReverse(d, function(U, H) {
-            U[0] === E && d.splice(H, 1);
-          }), delete n.defQueueMap[E], G && (G.events.defined && (u[E] = G.events), $(E));
+          var E = F(V, k, !0), G = getOwn(l, V);
+          G.undefed = !0, y(V), delete p[V], delete m[E.url], delete u[V], eachReverse(d, function(U, H) {
+            U[0] === V && d.splice(H, 1);
+          }), delete n.defQueueMap[V], G && (G.events.defined && (u[V] = G.events), $(V));
         }), q;
       },
       /**
@@ -27390,8 +27396,8 @@ https://requirejs.org/docs/errors.html#` + e);
        * the optimizer. Not shown here to keep code compact.
        */
       enable: function(k) {
-        var L = getOwn(l, k.id);
-        L && I(k).enable();
+        var O = getOwn(l, k.id);
+        O && I(k).enable();
       },
       /**
        * Internal method used by environment adapters to complete a load event.
@@ -27400,17 +27406,17 @@ https://requirejs.org/docs/errors.html#` + e);
        * @param {String} moduleName the name of the module to potentially complete.
        */
       completeLoad: function(k) {
-        var L, q, E, V = getOwn(i.shim, k) || {}, G = V.exports;
+        var O, q, V, E = getOwn(i.shim, k) || {}, G = E.exports;
         for (D(); d.length; ) {
           if (q = d.shift(), q[0] === null) {
-            if (q[0] = k, L)
+            if (q[0] = k, O)
               break;
-            L = !0;
+            O = !0;
           } else
-            q[0] === k && (L = !0);
+            q[0] === k && (O = !0);
           j(q);
         }
-        if (n.defQueueMap = {}, E = getOwn(l, k), !L && !hasProp(p, k) && E && !E.inited) {
+        if (n.defQueueMap = {}, V = getOwn(l, k), !O && !hasProp(p, k) && V && !V.inited) {
           if (i.enforceDefine && (!G || !getGlobal(G)))
             return S(k) ? void 0 : T(makeError(
               "nodefine",
@@ -27418,7 +27424,7 @@ https://requirejs.org/docs/errors.html#` + e);
               null,
               [k]
             ));
-          j([k, V.deps || [], V.exportsFn]);
+          j([k, E.deps || [], E.exportsFn]);
         }
         N();
       },
@@ -27429,26 +27435,26 @@ https://requirejs.org/docs/errors.html#` + e);
        * it is assumed to have already been normalized. This is an
        * internal API, not a public one. Use toUrl for the public API.
        */
-      nameToUrl: function(k, L, q) {
-        var E, V, G, U, H, K, J, W = getOwn(i.pkgs, k);
-        if (W && (k = W), J = getOwn(h, k), J)
-          return n.nameToUrl(J, L, q);
+      nameToUrl: function(k, O, q) {
+        var V, E, G, U, H, K, X, W = getOwn(i.pkgs, k);
+        if (W && (k = W), X = getOwn(h, k), X)
+          return n.nameToUrl(X, O, q);
         if (req.jsExtRegExp.test(k))
-          H = k + (L || "");
+          H = k + (O || "");
         else {
-          for (E = i.paths, V = k.split("/"), G = V.length; G > 0; G -= 1)
-            if (U = V.slice(0, G).join("/"), K = getOwn(E, U), K) {
-              isArray(K) && (K = K[0]), V.splice(0, G, K);
+          for (V = i.paths, E = k.split("/"), G = E.length; G > 0; G -= 1)
+            if (U = E.slice(0, G).join("/"), K = getOwn(V, U), K) {
+              isArray(K) && (K = K[0]), E.splice(0, G, K);
               break;
             }
-          H = V.join("/"), H += L || (/^data\:|^blob\:|\?/.test(H) || q ? "" : ".js"), H = (H.charAt(0) === "/" || H.match(/^[\w\+\.\-]+:/) ? "" : i.baseUrl) + H;
+          H = E.join("/"), H += O || (/^data\:|^blob\:|\?/.test(H) || q ? "" : ".js"), H = (H.charAt(0) === "/" || H.match(/^[\w\+\.\-]+:/) ? "" : i.baseUrl) + H;
         }
         return i.urlArgs && !/^blob\:/.test(H) ? H + i.urlArgs(k, H) : H;
       },
       //Delegates to req.load. Broken out as a separate function to
       //allow overriding in the optimizer.
-      load: function(k, L) {
-        req.load(n, k, L);
+      load: function(k, O) {
+        req.load(n, k, O);
       },
       /**
        * Executes a module callback function. Broken out as a separate function
@@ -27457,8 +27463,8 @@ https://requirejs.org/docs/errors.html#` + e);
        *
        * @private
        */
-      execCb: function(k, L, q, E) {
-        return L.apply(E, q);
+      execCb: function(k, O, q, V) {
+        return O.apply(V, q);
       },
       /**
        * callback for script loads, used to check status of loading.
@@ -27469,23 +27475,23 @@ https://requirejs.org/docs/errors.html#` + e);
       onScriptLoad: function(k) {
         if (k.type === "load" || readyRegExp.test((k.currentTarget || k.srcElement).readyState)) {
           interactiveScript = null;
-          var L = O(k);
-          n.completeLoad(L.id);
+          var O = L(k);
+          n.completeLoad(O.id);
         }
       },
       /**
        * Callback for script errors.
        */
       onScriptError: function(k) {
-        var L = O(k);
-        if (!S(L.id)) {
+        var O = L(k);
+        if (!S(O.id)) {
           var q = [];
-          return eachProp(l, function(E, V) {
-            V.indexOf("_@r") !== 0 && each(E.depMaps, function(G) {
-              if (G.id === L.id)
-                return q.push(V), !0;
+          return eachProp(l, function(V, E) {
+            E.indexOf("_@r") !== 0 && each(V.depMaps, function(G) {
+              if (G.id === O.id)
+                return q.push(E), !0;
             });
-          }), T(makeError("scripterror", 'Script error for "' + L.id + (q.length ? '", needed by: ' + q.join(", ") : '"'), k, [L.id]));
+          }), T(makeError("scripterror", 'Script error for "' + O.id + (q.length ? '", needed by: ' + q.join(", ") : '"'), k, [O.id]));
         }
       }
     }, n.require = n.makeRequire(), n;
@@ -29340,8 +29346,8 @@ const useCreateActionProps = () => {
   return {
     onClick() {
       return z(this, null, function* () {
-        var O, M;
-        const { onSuccess: I, skipValidator: R, triggerWorkflows: T } = (O = u == null ? void 0 : u["x-action-settings"]) != null ? O : {}, {
+        var L, M;
+        const { onSuccess: I, skipValidator: R, triggerWorkflows: T } = (L = u == null ? void 0 : u["x-action-settings"]) != null ? L : {}, {
           manualClose: D,
           redirecting: $,
           redirectTo: B,
@@ -29360,20 +29366,20 @@ const useCreateActionProps = () => {
             triggerWorkflows: T != null && T.length ? T.map((q) => [q.workflowKey, q.context].filter(Boolean).join("!")).join(",") : void 0,
             updateAssociationValues: g
           });
-          let L = B;
-          if (B && (L = yield getVariableValue(B, {
+          let O = B;
+          if (B && (O = yield getVariableValue(B, {
             variables: S,
             localVariables: [...y, { name: "$record", ctx: new Proxy((M = k == null ? void 0 : k.data) == null ? void 0 : M.data, {}) }]
           })), (j === "previous" || !j && $ !== !0) && (a == null || a(!1)), i == null || i(!0), l == null || l(!1), d.data.loading = !1, d.data.data = k, !N) {
-            message.success(h("Saved successfully")), yield resetFormCorrectly(o), ($ && !j || j === "redirect") && L && (isURL(L) ? window.location.href = L : c(L));
+            message.success(h("Saved successfully")), yield resetFormCorrectly(o), ($ && !j || j === "redirect") && O && (isURL(O) ? window.location.href = O : c(O));
             return;
           }
           D ? m.success({
             title: p(N),
             onOk: () => z(this, null, function* () {
-              yield resetFormCorrectly(o), ($ && !j || j === "redirect") && L && (isURL(L) ? window.location.href = L : c(L));
+              yield resetFormCorrectly(o), ($ && !j || j === "redirect") && O && (isURL(O) ? window.location.href = O : c(O));
             })
-          }) : (message.success(p(N)), yield resetFormCorrectly(o), ($ && !j || j === "redirect") && L && (isURL(L) ? window.location.href = L : c(L)));
+          }) : (message.success(p(N)), yield resetFormCorrectly(o), ($ && !j || j === "redirect") && O && (isURL(O) ? window.location.href = O : c(O)));
         } catch (k) {
           d.data.loading = !1;
         }
@@ -29386,20 +29392,20 @@ const useCreateActionProps = () => {
   return {
     onClick() {
       return z(this, null, function* () {
-        var L, q, E, V, G, U;
+        var O, q, V, E, G, U;
         const R = u.map((H) => H.name), {
           assignedValues: T = {},
           onSuccess: D,
           overwriteValues: $,
           skipValidator: B,
           triggerWorkflows: N
-        } = (L = l == null ? void 0 : l["x-action-settings"]) != null ? L : {}, j = (q = a == null ? void 0 : a["x-component-props"]) == null ? void 0 : q.addChild, { successMessage: w } = D || {}, O = {}, M = Object.keys(T).map((H) => z(this, null, function* () {
-          const K = T[H], J = d(H);
+        } = (O = l == null ? void 0 : l["x-action-settings"]) != null ? O : {}, j = (q = a == null ? void 0 : a["x-component-props"]) == null ? void 0 : q.addChild, { successMessage: w } = D || {}, L = {}, M = Object.keys(T).map((H) => z(this, null, function* () {
+          const K = T[H], X = d(H);
           if (isVariable$1(K)) {
             const { value: W } = (yield C == null ? void 0 : C.parseVariable(K, b)) || {};
-            O[H] = transformVariableValue(W, { targetCollectionField: J });
+            L[H] = transformVariableValue(W, { targetCollectionField: X });
           } else
-            K !== "" && (O[H] = K);
+            K !== "" && (L[H] = K);
         }));
         yield Promise.all(M), B || (yield e.submit());
         const k = getFormValues({
@@ -29413,12 +29419,12 @@ const useCreateActionProps = () => {
         });
         if (j) {
           const H = p();
-          k[(E = H == null ? void 0 : H.name) != null ? E : "parent"] = f, k[(V = H == null ? void 0 : H.foreignKey) != null ? V : "parentId"] = f.id;
+          k[(V = H == null ? void 0 : H.name) != null ? V : "parent"] = f, k[(E = H == null ? void 0 : H.foreignKey) != null ? E : "parentId"] = f.id;
         }
         c.data = t.data || {}, c.data.loading = !0;
         try {
           const H = yield o[S]({
-            values: x(x(x({}, k), $), O),
+            values: x(x(x({}, k), $), L),
             filterKeys: v,
             // TODO(refactor): should change to inject by plugin
             triggerWorkflows: N != null && N.length ? N.map((K) => [K.workflowKey, K.context].filter(Boolean).join("!")).join(",") : void 0
@@ -29530,7 +29536,7 @@ const useCreateActionProps = () => {
   return {
     onClick(f, C) {
       return z(this, null, function* () {
-        var w, O, M, k;
+        var w, L, M, k;
         const {
           assignedValues: b = {},
           onSuccess: y,
@@ -29542,25 +29548,25 @@ const useCreateActionProps = () => {
           redirectTo: R,
           successMessage: T,
           actionAfterSuccess: D
-        } = y || {}, $ = {}, B = Object.keys(b).map((L) => z(this, null, function* () {
-          const q = b[L], E = m(L);
+        } = y || {}, $ = {}, B = Object.keys(b).map((O) => z(this, null, function* () {
+          const q = b[O], V = m(O);
           if (isVariable$1(q)) {
-            const { value: V } = (yield u == null ? void 0 : u.parseVariable(q, d)) || {};
-            $[L] = transformVariableValue(V, { targetCollectionField: E });
+            const { value: E } = (yield u == null ? void 0 : u.parseVariable(q, d)) || {};
+            $[O] = transformVariableValue(E, { targetCollectionField: V });
           } else
-            q !== "" && ($[L] = q);
+            q !== "" && ($[O] = q);
         }));
         yield Promise.all(B), S === !1 && (yield l.submit());
         const N = yield e.update({
           filterByTk: n,
           values: x({}, $),
           // TODO(refactor): should change to inject by plugin
-          triggerWorkflows: v != null && v.length ? v.map((L) => [L.workflowKey, L.context].filter(Boolean).join("!")).join(",") : void 0
+          triggerWorkflows: v != null && v.length ? v.map((O) => [O.workflowKey, O.context].filter(Boolean).join("!")).join(",") : void 0
         });
         let j = R;
         R && (j = yield getVariableValue(R, {
           variables: u,
-          localVariables: [...d, { name: "$record", ctx: new Proxy((O = N == null ? void 0 : N.data) == null ? void 0 : O.data, {}) }]
+          localVariables: [...d, { name: "$record", ctx: new Proxy((L = N == null ? void 0 : N.data) == null ? void 0 : L.data, {}) }]
         })), (D === "previous" || !D && I !== !0) && (h == null || h(!1)), C && (C == null || C()), e instanceof TableFieldResource || (k = (M = t == null ? void 0 : t.service) == null ? void 0 : M.refresh) == null || k.call(M), T && (F ? c.success({
           title: i(T),
           onOk: () => z(this, null, function* () {
@@ -29578,30 +29584,30 @@ const useCreateActionProps = () => {
   return {
     onClick() {
       return z(this, null, function* () {
-        var L;
+        var O;
         const {
           assignedValues: T = {},
           onSuccess: D,
           updateMode: $
-        } = (L = a == null ? void 0 : a["x-action-settings"]) != null ? L : {}, { manualClose: B, redirecting: N, redirectTo: j, successMessage: w, actionAfterSuccess: O } = D || {};
+        } = (O = a == null ? void 0 : a["x-action-settings"]) != null ? O : {}, { manualClose: B, redirecting: N, redirectTo: j, successMessage: w, actionAfterSuccess: L } = D || {};
         m.data = e.data || {}, m.data.loading = !0;
-        const M = {}, k = Object.keys(T).map((E) => z(this, null, function* () {
-          const V = T[E], G = C(E);
-          if (isVariable$1(V)) {
-            const { value: U } = (yield g == null ? void 0 : g.parseVariable(V, b)) || {};
-            M[E] = transformVariableValue(U, { targetCollectionField: G });
+        const M = {}, k = Object.keys(T).map((V) => z(this, null, function* () {
+          const E = T[V], G = C(V);
+          if (isVariable$1(E)) {
+            const { value: U } = (yield g == null ? void 0 : g.parseVariable(E, b)) || {};
+            M[V] = transformVariableValue(U, { targetCollectionField: G });
           } else
-            V !== "" && (M[E] = V);
+            E !== "" && (M[V] = E);
         }));
-        yield Promise.all(k), (O === "previous" || !O && N !== !0) && (y == null || y(!1)), h.confirm({
+        yield Promise.all(k), (L === "previous" || !L && N !== !0) && (y == null || y(!1)), h.confirm({
           title: p("Bulk update"),
           content: p($ === "selected" ? "Update selected data?" : "Update all data?"),
           onOk() {
             return z(this, null, function* () {
               var G, U, H, K;
-              const { filter: E } = (U = (G = n.params) == null ? void 0 : G[0]) != null ? U : {}, V = {
+              const { filter: V } = (U = (G = n.params) == null ? void 0 : G[0]) != null ? U : {}, E = {
                 values: x({}, M),
-                filter: E,
+                filter: V,
                 forceUpdate: !1
               };
               if ($ === "selected") {
@@ -29609,21 +29615,21 @@ const useCreateActionProps = () => {
                   message.error(p("Please select the records to be updated")), m.data.loading = !1;
                   return;
                 }
-                V.filter = { $and: [{ [l || "id"]: { $in: c } }] };
+                E.filter = { $and: [{ [l || "id"]: { $in: c } }] };
               }
-              V.filter || (V.forceUpdate = !0);
+              E.filter || (E.forceUpdate = !0);
               try {
-                yield t.update(V);
-              } catch (J) {
+                yield t.update(E);
+              } catch (X) {
               } finally {
                 m.data.loading = !1;
               }
               t instanceof TableFieldResource || (K = (H = o == null ? void 0 : o.service) == null ? void 0 : H.refresh) == null || K.call(H), w && (B ? h.success({
                 title: d(w),
                 onOk: () => z(this, null, function* () {
-                  (N && !O || O === "redirect") && j && (isURL(j) ? window.location.href = j : u(j));
+                  (N && !L || L === "redirect") && j && (isURL(j) ? window.location.href = j : u(j));
                 })
-              }) : (message.success(d(w)), (N && !O || O === "redirect") && j && (isURL(j) ? window.location.href = j : u(j))));
+              }) : (message.success(d(w)), (N && !L || L === "redirect") && j && (isURL(j) ? window.location.href = j : u(j))));
             });
           },
           onCancel() {
@@ -29641,14 +29647,14 @@ const useCreateActionProps = () => {
   return {
     onClick() {
       return z(this, null, function* () {
-        var E, V, G, U;
-        const { skipValidator: I, onSuccess: R, requestSettings: T } = (E = n == null ? void 0 : n["x-action-settings"]) != null ? E : {}, { manualClose: D, redirecting: $, redirectTo: B, successMessage: N, actionAfterSuccess: j } = R || {}, w = n == null ? void 0 : n["x-action"];
+        var V, E, G, U;
+        const { skipValidator: I, onSuccess: R, requestSettings: T } = (V = n == null ? void 0 : n["x-action-settings"]) != null ? V : {}, { manualClose: D, redirecting: $, redirectTo: B, successMessage: N, actionAfterSuccess: j } = R || {}, w = n == null ? void 0 : n["x-action"];
         if (!T.url)
           return;
         I !== !0 && w === "customize:form:request" && (yield a.submit());
-        const O = T.headers ? JSON.parse(T.headers) : {}, M = T.params ? JSON.parse(T.params) : {}, k = T.data ? JSON.parse(T.data) : {};
+        const L = T.headers ? JSON.parse(T.headers) : {}, M = 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 H = i.map((J) => J.name), K = getFormValues({
+          const H = i.map((X) => X.name), K = getFormValues({
             filterByTk: o,
             field: c,
             form: a,
@@ -29662,13 +29668,13 @@ 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(M)({ 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 || (G = (V = d == null ? void 0 : d.service) == null ? void 0 : V.refresh) == null || G.call(V), (U = p == null ? void 0 : p.refresh) == null || U.call(p), w === "customize:form:request" && (j === "previous" || !j && $ !== !0) && (b == null || b(!1)), N || (message.success(C("Saved successfully")), yield resetFormCorrectly(a), ($ && !j || j === "redirect") && B && (isURL(B) ? window.location.href = B : t(B))), D ? y.success({
+          yield e.request(x({}, q)), f.data.loading = !1, u instanceof TableFieldResource || (G = (E = d == null ? void 0 : d.service) == null ? void 0 : E.refresh) == null || G.call(E), (U = p == null ? void 0 : p.refresh) == null || U.call(p), w === "customize:form:request" && (j === "previous" || !j && $ !== !0) && (b == null || b(!1)), N || (message.success(C("Saved successfully")), yield resetFormCorrectly(a), ($ && !j || j === "redirect") && B && (isURL(B) ? window.location.href = B : t(B))), D ? y.success({
             title: r(N),
             onOk: () => z(this, null, function* () {
               ($ && !j || j === "redirect") && B && (isURL(B) ? window.location.href = B : t(B));
@@ -29685,29 +29691,29 @@ const useCreateActionProps = () => {
   return {
     onClick(F, I) {
       return z(this, null, function* () {
-        var V, G;
+        var E, G;
         const {
           assignedValues: R = {},
           onSuccess: T,
           overwriteValues: D,
           skipValidator: $,
           triggerWorkflows: B
-        } = (V = l == null ? void 0 : l["x-action-settings"]) != null ? V : {}, {
+        } = (E = l == null ? void 0 : l["x-action-settings"]) != null ? E : {}, {
           manualClose: N,
           redirecting: j,
           redirectTo: w,
-          successMessage: O,
+          successMessage: L,
           actionAfterSuccess: M
-        } = T || {}, k = {}, L = Object.keys(R).map((U) => z(this, null, function* () {
+        } = T || {}, k = {}, O = Object.keys(R).map((U) => z(this, null, function* () {
           const H = R[U], K = d(U);
           if (isVariable$1(H)) {
-            const { value: J } = (yield b == null ? void 0 : b.parseVariable(H, y)) || {};
-            k[U] = transformVariableValue(J, { targetCollectionField: K });
+            const { value: X } = (yield b == null ? void 0 : b.parseVariable(H, y)) || {};
+            k[U] = transformVariableValue(X, { targetCollectionField: K });
           } else
             H !== "" && (k[U] = H);
         }));
-        yield Promise.all(L), $ || (yield e.submit());
-        const q = u.map((U) => U.name), E = getFormValues({
+        yield Promise.all(O), $ || (yield e.submit());
+        const q = u.map((U) => U.name), V = getFormValues({
           filterByTk: t,
           field: o,
           form: e,
@@ -29720,7 +29726,7 @@ const useCreateActionProps = () => {
         try {
           const U = yield n.update(P(x({
             filterByTk: t,
-            values: x(x(x({}, E), D), k)
+            values: x(x(x({}, V), D), k)
           }, C), {
             updateAssociationValues: g,
             // TODO(refactor): should change to inject by plugin
@@ -29731,14 +29737,14 @@ const useCreateActionProps = () => {
           if (w && (H = yield getVariableValue(w, {
             variables: b,
             localVariables: [...y, { name: "$record", ctx: new Proxy((G = U == null ? void 0 : U.data) == null ? void 0 : G.data, {}) }]
-          })), (M === "previous" || !M && j !== !0) && (a == null || a(!1)), i == null || i(!1), !O)
+          })), (M === "previous" || !M && j !== !0) && (a == null || a(!1)), i == null || i(!1), !L)
             return;
           N ? f.success({
-            title: m(O),
+            title: m(L),
             onOk: () => z(this, null, function* () {
               yield e.reset(), (j && !M || M === "redirect") && H && (isURL(H) ? window.location.href = H : c(H));
             })
-          }) : (message.success(m(O)), (j && !M || M === "redirect" || M === "redirect") && H && (isURL(H) ? window.location.href = H : c(H)));
+          }) : (message.success(m(L)), (j && !M || M === "redirect" || M === "redirect") && H && (isURL(H) ? window.location.href = H : c(H)));
         } catch (U) {
           h.data.loading = !1;
         }
@@ -29963,30 +29969,30 @@ const useCreateActionProps = () => {
   ]);
   const S = useCallback(
     (w) => {
-      const { targets: O, uid: M } = findFilterTargets(t);
+      const { targets: L, uid: M } = findFilterTargets(t);
       n().forEach((k) => {
-        var U, H, K, J;
-        if (!O.find((W) => W.uid === k.uid))
+        var U, H, K, X;
+        if (!L.find((W) => W.uid === k.uid))
           return;
-        const q = `${M}${t.name}`, E = ((U = k.service.params) == null ? void 0 : U[0]) || {};
+        const q = `${M}${t.name}`, V = ((U = k.service.params) == null ? void 0 : U[0]) || {};
         (K = (H = k.service.params) == null ? void 0 : H[1]) != null && K.filters || _.set(k.service.params, "[1].filters", {});
-        const V = k.service.params[1].filters;
+        const E = k.service.params[1].filters;
         if (w.length)
-          V[q] = {
+          E[q] = {
             [y]: w
           };
         else {
-          if ((J = k.clearSelection) == null || J.call(k), k.dataLoadingMode === "manual")
+          if ((X = k.clearSelection) == null || X.call(k), k.dataLoadingMode === "manual")
             return k.clearData();
-          delete V[q];
+          delete E[q];
         }
-        const G = mergeFilter([...Object.values(V), k.defaultFilter]);
+        const G = mergeFilter([...Object.values(E), k.defaultFilter]);
         return k.doFilter(
-          P(x({}, E), {
+          P(x({}, V), {
             page: 1,
             filter: G
           }),
-          { filters: V }
+          { filters: E }
         );
       });
     },
@@ -29995,20 +30001,20 @@ const useCreateActionProps = () => {
   if (!e)
     return {};
   if (isOptionalField(e)) {
-    const w = o.find((k) => k.name === t.name), O = {
+    const w = o.find((k) => k.name === t.name), L = {
       select: "$in",
       multipleSelect: "$anyOf",
       checkbox: "$in",
       checkboxGroup: "$anyOf"
     }, M = ((j = w == null ? void 0 : w.uiSchema) == null ? void 0 : j.enum) || [];
     C = "value", b = "label", p = M, h = {}, g = () => {
-    }, y = `${w.name}.${O[w.interface]}`, m = (k) => {
-      const L = k.target.value;
-      if (!L) {
+    }, y = `${w.name}.${L[w.interface]}`, m = (k) => {
+      const O = k.target.value;
+      if (!O) {
         p = M;
         return;
       }
-      p = M.filter((q) => q.label.includes(L));
+      p = M.filter((q) => q.label.includes(O));
     };
   } else
     y = `${r}.${C}.$in`, p = (f == null ? void 0 : f.data) || [], m = (w) => {
@@ -30305,7 +30311,7 @@ const useSyncFromForm = (e, t, o) => {
         isLeaf: !0,
         field: $,
         disabled: F
-      }), j = I.find((O) => O.name === N.key);
+      }), j = I.find((L) => L.name === N.key);
       if (["belongsTo", "belongsToMany"].includes($.type) && (!j || ["Select", "Picker"].includes(j == null ? void 0 : j.fieldMode)))
         B.type = "reference", N.type = "reference", N.title = React.createElement(TreeNode, P(x({}, B), { type: "reference" })), N.isLeaf = !1, N.children = m($.target, {
           depth: y + 1,
@@ -30314,15 +30320,15 @@ const useSyncFromForm = (e, t, o) => {
           exclude: systemKeys
         });
       else if (["hasOne", "hasMany"].includes($.type) || ["Nester", "SubTable"].includes(j == null ? void 0 : j.fieldMode)) {
-        let O = !1;
-        ["hasOne", "hasMany"].includes($.type) && ["Select", "Picker"].includes(j == null ? void 0 : j.fieldMode) && (O = !0), N.disabled = !0, N.isLeaf = !1, N.children = p(
+        let L = !1;
+        ["hasOne", "hasMany"].includes($.type) && ["Select", "Picker"].includes(j == null ? void 0 : j.fieldMode) && (L = !0), N.disabled = !0, N.isLeaf = !1, N.children = p(
           $.target,
           {
             depth: y + 1,
             maxDepth: S,
             prefix: N.key,
             exclude: ["id", ...systemKeys],
-            disabled: O
+            disabled: L
           },
           I
         );
@@ -30376,12 +30382,12 @@ const useSyncFromForm = (e, t, o) => {
         const f = /* @__PURE__ */ new Set([]), C = /* @__PURE__ */ new Set([]), b = (v, F) => {
           var I;
           (I = v == null ? void 0 : v.reduceProperties) == null || I.call(v, (R, T) => {
-            var O, M, k;
+            var L, M, k;
             const D = R || F, $ = T["x-collection-field"] && n(T["x-collection-field"]), B = T.name.includes("."), N = $ && ["hasOne", "hasMany", "belongsTo", "belongsToMany"].includes($.type), j = !N && B ? getAssociationPath(T.name) : T.name, w = D === "" || !D ? j : D + "." + j;
-            if ($ && !(["hasOne", "hasMany"].includes($.type) || ["SubForm", "Nester"].includes((O = T["x-component-props"]) == null ? void 0 : O.mode)) && C.add(w), $ && (N || B) && T["x-component"] !== "TableField") {
+            if ($ && !(["hasOne", "hasMany"].includes($.type) || ["SubForm", "Nester"].includes((L = T["x-component-props"]) == null ? void 0 : L.mode)) && C.add(w), $ && (N || B) && T["x-component"] !== "TableField") {
               if (f.add({ name: w, fieldMode: ((M = T["x-component-props"]) == null ? void 0 : M.mode) || "Select" }), ["Nester", "SubTable"].includes((k = T["x-component-props"]) == null ? void 0 : k.mode)) {
-                const L = D && D !== "" ? D + "." + T.name : T.name;
-                b(T, L);
+                const O = D && D !== "" ? D + "." + T.name : T.name;
+                b(T, O);
               }
             } else
               [
@@ -37704,10 +37710,10 @@ const enabledIndexColumn$1 = {
   name: "fieldSettings:component:CascadeSelect",
   items: [fieldComponent$6, titleField$1, ellipsisSettingsItem, setTheDataScope]
 }), SchemaSettingsDateRange = function e(t) {
-  var R, T, D, $, B, N, j, w, O, M, k, L, q, E, V, G;
-  const { fieldSchema: o } = t, n = useField(), { dn: r } = useDesignable(), { t: a } = useTranslation(), { getCollectionJoinField: i } = useCollectionManager_deprecated(), { isInSubForm: l, isInSubTable: c } = useFlag() || {}, u = i(o == null ? void 0 : o["x-collection-field"]) || {}, d = ((R = o == null ? void 0 : o["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 = (($ = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : $.dateFormat) || ((N = (B = u == null ? void 0 : u.uiSchema) == null ? void 0 : B["x-component-props"]) == null ? void 0 : N.dateFormat) || "YYYY-MM-DD", m = ((j = o == null ? void 0 : o["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 = ((M = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : M.picker) || ((L = (k = u == null ? void 0 : u.uiSchema) == null ? void 0 : k["x-component-props"]) == null ? void 0 : L.picker) || "date";
+  var R, T, D, $, B, N, j, w, L, M, k, O, q, V, E, G;
+  const { fieldSchema: o } = t, n = useField(), { dn: r } = useDesignable(), { t: a } = useTranslation(), { getCollectionJoinField: i } = useCollectionManager_deprecated(), { isInSubForm: l, isInSubTable: c } = useFlag() || {}, u = i(o == null ? void 0 : o["x-collection-field"]) || {}, d = ((R = o == null ? void 0 : o["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 = (($ = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : $.dateFormat) || ((N = (B = u == null ? void 0 : u.uiSchema) == null ? void 0 : B["x-component-props"]) == null ? void 0 : N.dateFormat) || "YYYY-MM-DD", m = ((j = o == null ? void 0 : o["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 = ((M = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : M.picker) || ((O = (k = u == null ? void 0 : u.uiSchema) == null ? void 0 : k["x-component-props"]) == null ? void 0 : O.picker) || "date";
   o["x-read-pretty"] || n.readOnly || n.readPretty;
-  const g = (q = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : q._minDate, f = (E = o == null ? void 0 : o["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 = ((G = u == null ? void 0 : u.uiSchema) == null ? void 0 : G["x-component-props"].utc) || !1, y = useRecord(), { form: S } = useFormBlockContext(), v = useCallback(
+  const g = (q = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : q._minDate, f = (V = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : V._maxDate, C = ((E = u == null ? void 0 : u.uiSchema) == null ? void 0 : E["x-component-props"].gmt) || !1, b = ((G = u == null ? void 0 : u.uiSchema) == null ? void 0 : G["x-component-props"].utc) || !1, y = useRecord(), { form: S } = useFormBlockContext(), v = useCallback(
     (U) => /* @__PURE__ */ jsx(
       SchemaComponent,
       {
@@ -37794,8 +37800,8 @@ const enabledIndexColumn$1 = {
         }), H["x-component-props"] = o["x-component-props"], n.componentProps = o["x-component-props"];
         const K = n.path.entire.split(".");
         K.pop();
-        const J = K.join(".");
-        n.query(`${J}.*[0:].${o.name}`).forEach((W) => {
+        const X = K.join(".");
+        n.query(`${X}.*[0:].${o.name}`).forEach((W) => {
           W.props.name === o.name && W.setComponentProps({
             _maxDate: I(U == null ? void 0 : U._maxDate),
             _minDate: I(U == null ? void 0 : U._minDate)
@@ -39187,7 +39193,7 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
     _.isFunction(C) ? o.current = C(o.current) : o.current = C;
   }, []), u = useCallback(
     (C, b, y) => z(void 0, null, function* () {
-      var w, O;
+      var w, L;
       const S = C.split("."), v = S[0], F = mergeVariableToCollectionNameWithLocalVariables(variablesStore, b);
       let I = mergeCtxWithLocalVariables(o.current, b);
       const { fieldPath: R, dataSource: T, variableOption: D } = getFieldPath$1(v, F);
@@ -39204,11 +39210,11 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
           };
         if (_.isFunction(I))
           break;
-        const k = S[M], L = S.slice(0, M + 1).join("."), { fieldPath: q } = getFieldPath$1(L, F), E = r(q, T), V = (O = a($, T)) == null ? void 0 : O.getPrimaryKey();
+        const k = S[M], O = S.slice(0, M + 1).join("."), { fieldPath: q } = getFieldPath$1(O, F), V = r(q, T), E = (L = a($, T)) == null ? void 0 : L.getPrimaryKey();
         if (Array.isArray(I)) {
           const G = I.map((U) => {
-            if (!(y != null && y.doNotRequest) && shouldToRequest(U == null ? void 0 : U[k], U, L) && (U == null ? void 0 : U[V]) != null && E != null && E.target) {
-              const H = `/${$}/${U[E.sourceKey || V]}/${k}:${getAction(E.type)}`;
+            if (!(y != null && y.doNotRequest) && shouldToRequest(U == null ? void 0 : U[k], U, O) && (U == null ? void 0 : U[E]) != null && V != null && V.target) {
+              const H = `/${$}/${U[V.sourceKey || E]}/${k}:${getAction(V.type)}`;
               if (hasRequested(H))
                 return getRequested(H);
               const K = n.request({
@@ -39217,14 +39223,14 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
                 params: {
                   appends: y == null ? void 0 : y.appends
                 }
-              }).then((J) => (clearRequested(H), J.data.data));
+              }).then((X) => (clearRequested(H), X.data.data));
               return stashRequested(H, K), K;
             }
             return U == null ? void 0 : U[k];
           });
-          I = removeThroughCollectionFields(_.flatten(yield Promise.all(G)), E);
-        } else if (!(y != null && y.doNotRequest) && shouldToRequest(I[k], I, L) && I[V] != null && (E != null && E.target)) {
-          const G = `/${$}/${I[E.sourceKey || V]}/${k}:${getAction(E.type)}`;
+          I = removeThroughCollectionFields(_.flatten(yield Promise.all(G)), V);
+        } else if (!(y != null && y.doNotRequest) && shouldToRequest(I[k], I, O) && I[E] != null && (V != null && V.target)) {
+          const G = `/${$}/${I[V.sourceKey || E]}/${k}:${getAction(V.type)}`;
           let U = null;
           if (hasRequested(G))
             U = yield getRequested(G);
@@ -39239,10 +39245,10 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
             stashRequested(G, K), U = yield K, clearRequested(G);
           }
           const H = U.data.data;
-          I = removeThroughCollectionFields(H, E);
+          I = removeThroughCollectionFields(H, V);
         } else
-          I = removeThroughCollectionFields(getValuesByPath(I, k), E);
-        E != null && E.target && ($ = E.target);
+          I = removeThroughCollectionFields(getValuesByPath(I, k), V);
+        V != null && V.target && ($ = V.target);
       }
       const j = i(
         _.isFunction(I) ? yield I({
@@ -39791,7 +39797,7 @@ const ActionLink = withDynamicSchemaProps(
   }
 }), handleError = console.log, Action = withDynamicSchemaProps(
   React.memo((e) => {
-    var J;
+    var X;
     const K = useProps(e), {
       popover: t,
       containerRefKey: o,
@@ -39831,20 +39837,20 @@ const ActionLink = withDynamicSchemaProps(
       "onMouseEnter",
       "refreshDataBlockRequest",
       "confirmTitle"
-    ]), v = useDesigner(), F = useField(), I = useFieldSchema(), R = useCompile(), T = useCollectionRecordData(), D = R((J = I["x-component-props"]) == null ? void 0 : J.confirm) || g, $ = useMemo(
+    ]), v = useDesigner(), F = useField(), I = useFieldSchema(), R = useCompile(), T = useCollectionRecordData(), D = R((X = I["x-component-props"]) == null ? void 0 : X.confirm) || g, $ = useMemo(
       () => {
         var W;
-        return ((W = I == null ? void 0 : I["x-linkage-rules"]) == null ? void 0 : W.filter((X) => !X.disabled)) || [];
+        return ((W = I == null ? void 0 : I["x-linkage-rules"]) == null ? void 0 : W.filter((J) => !J.disabled)) || [];
       },
       [I == null ? void 0 : I["x-linkage-rules"]]
-    ), { designable: B } = useDesignable(), N = useComponent(n) || n, j = useVariables$1(), w = useLocalVariables$1(), { visibleWithURL: O, setVisibleWithURL: M } = usePopupUtils(), { setSubmitted: k } = useActionContext(), { getAriaLabel: L } = useGetAriaLabelOfAction(l), q = useCollectionParentRecordData(), E = useApp(), { getAllDataBlocks: V } = useAllDataBlocks(), G = useForm();
+    ), { designable: B } = useDesignable(), N = useComponent(n) || n, j = useVariables$1(), w = useLocalVariables$1(), { visibleWithURL: L, setVisibleWithURL: M } = usePopupUtils(), { setSubmitted: k } = useActionContext(), { getAriaLabel: O } = useGetAriaLabelOfAction(l), q = useCollectionParentRecordData(), V = useApp(), { getAllDataBlocks: E } = useAllDataBlocks(), G = useForm();
     useEffect(() => {
       F.stateOfLinkageRules && setInitialActionState(F);
-      const W = uid(), X = [];
+      const W = uid(), J = [];
       return setTimeout(() => {
         G.addEffects(W, () => {
           forEachLinkageRule($, (Z, Q) => {
-            X.push(
+            J.push(
               reaction(
                 () => [getVariableValuesInCondition({ linkageRules: $, localVariables: w })].map((re) => JSON.stringify(re)).join(","),
                 () => {
@@ -39858,7 +39864,7 @@ const ActionLink = withDynamicSchemaProps(
                       conditionType: Q.conditionType,
                       variableNameOfLeftCondition: "$nRecord"
                     },
-                    E.jsonLogic
+                    V.jsonLogic
                   );
                 },
                 { fireImmediately: !0, equals: isEqual }
@@ -39867,7 +39873,7 @@ const ActionLink = withDynamicSchemaProps(
           });
         });
       }), () => {
-        G.removeEffects(W), X.forEach((Z) => {
+        G.removeEffects(W), J.forEach((Z) => {
           Z();
         });
       };
@@ -39877,11 +39883,11 @@ const ActionLink = withDynamicSchemaProps(
         C == null || C(W);
       },
       [C]
-    ), H = useMemo(() => c && ((W, X) => z(void 0, null, function* () {
+    ), H = useMemo(() => c && ((W, J) => z(void 0, null, function* () {
       var Q, ee;
-      yield c == null ? void 0 : c(W, X);
+      yield c == null ? void 0 : c(W, J);
       const Z = ((ee = (Q = I["x-action-settings"]) == null ? void 0 : Q.onSuccess) == null ? void 0 : ee.blocksToRefresh) || [];
-      Z.length > 0 && V().forEach((oe) => {
+      Z.length > 0 && E().forEach((oe) => {
         var re;
         if (Z.includes(oe.uid))
           try {
@@ -39890,7 +39896,7 @@ const ActionLink = withDynamicSchemaProps(
             console.error("Failed to refresh block:", oe.uid, ie);
           }
       });
-    })), [c, I, V]);
+    })), [c, I, E]);
     return /* @__PURE__ */ jsx(VariableScope, { scopeId: I == null ? void 0 : I["x-uid"], type: "action", children: /* @__PURE__ */ jsx(
       InternalAction,
       x({
@@ -39915,10 +39921,10 @@ const ActionLink = withDynamicSchemaProps(
         style: u,
         propsDisabled: m,
         useAction: r,
-        visibleWithURL: O,
+        visibleWithURL: L,
         setVisibleWithURL: M,
         setSubmitted: k,
-        getAriaLabel: L,
+        getAriaLabel: O,
         parentRecordData: q,
         actionCallback: h
       }, S)
@@ -39983,12 +39989,12 @@ const ActionLink = withDynamicSchemaProps(
     "setSubmitted",
     "getAriaLabel",
     "parentRecordData"
-  ]), [w, O] = useState(!1), { wrapSSR: M, componentCls: k, hashId: L } = useStyles$8(), [q, E] = useState(!1), V = n["x-toolbar-props"] || n["x-designer-props"], G = (ge = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : ge.openMode, U = (Ce = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : Ce.openSize, H = (me = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : me.refreshDataBlockRequest, { modal: K } = App.useApp(), J = useForm(), W = useACLActionParamsContext(), {
-    run: X,
+  ]), [w, L] = useState(!1), { wrapSSR: M, componentCls: k, hashId: O } = useStyles$8(), [q, V] = useState(!1), E = n["x-toolbar-props"] || n["x-designer-props"], G = (ge = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : ge.openMode, U = (Ce = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : Ce.openSize, H = (me = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : me.refreshDataBlockRequest, { modal: K } = App.useApp(), X = useForm(), W = useACLActionParamsContext(), {
+    run: J,
     element: Z,
     disabled: Q,
     loading: ee
-  } = (I == null ? void 0 : I(R)) || {}, oe = J.disabled || a.disabled || ((xe = a.data) == null ? void 0 : xe.disabled) || F || Q, re = useMemo(() => {
+  } = (I == null ? void 0 : I(R)) || {}, oe = X.disabled || a.disabled || ((xe = a.data) == null ? void 0 : xe.disabled) || F || Q, re = useMemo(() => {
     var de;
     return P(x({}, v), {
       opacity: r && (((de = a == null ? void 0 : a.data) == null ? void 0 : de.hidden) || !W) && 0.1,
@@ -40004,9 +40010,9 @@ const ActionLink = withDynamicSchemaProps(
     buttonStyle: re,
     handleMouseEnter: c,
     tarComponent: u,
-    designerProps: V,
+    designerProps: E,
     componentCls: k,
-    hashId: L,
+    hashId: O,
     className: d,
     others: j,
     getAriaLabel: B,
@@ -40015,8 +40021,8 @@ const ActionLink = withDynamicSchemaProps(
     onClick: h,
     refreshDataBlockRequest: H,
     fieldSchema: n,
-    setVisible: O,
-    run: X,
+    setVisible: L,
+    run: J,
     confirm: g,
     modal: K,
     setSubmitted: $,
@@ -40024,7 +40030,7 @@ const ActionLink = withDynamicSchemaProps(
     title: S
   }, pe = useCallback(
     (de) => {
-      O == null || O(de), D == null || D(de);
+      L == null || L(de), D == null || D(de);
     },
     [D]
   );
@@ -40035,7 +40041,7 @@ const ActionLink = withDynamicSchemaProps(
       visible: w || T,
       setVisible: pe,
       formValueChanged: q,
-      setFormValueChanged: E,
+      setFormValueChanged: V,
       openMode: G,
       openSize: U,
       containerRefKey: o,
@@ -40123,26 +40129,26 @@ const RenderButton = ({
   confirmTitle: D,
   title: $
 }) => {
-  const { getDataBlockRequest: B } = useDataBlockRequestGetter(), { t: N } = useTranslation(), { isPopupVisibleControlledByURL: j } = usePopupSettings(), { openPopup: w } = usePopupUtils(), O = useVariables$1(), M = useLocalVariables$1(), k = useRef(null), L = useCompile(), q = useForm();
+  const { getDataBlockRequest: B } = useDataBlockRequestGetter(), { t: N } = useTranslation(), { isPopupVisibleControlledByURL: j } = usePopupSettings(), { openPopup: w } = usePopupUtils(), L = useVariables$1(), M = useLocalVariables$1(), k = useRef(null), O = useCompile(), q = useForm();
   k.current = w;
-  const E = {
-    variables: O,
+  const V = {
+    variables: L,
     localVariables: M
-  }, V = useCallback(
+  }, E = useCallback(
     (G, U = !0) => z(void 0, null, function* () {
-      var J;
+      var X;
       if (U && isPortalInBody(G.target))
         return;
       G.preventDefault(), G.stopPropagation();
-      const H = yield getVariableValue(N(I == null ? void 0 : I.title, { title: L(S.title) }), E), K = yield getVariableValue(N(I == null ? void 0 : I.content, { title: L(S.title) }), E);
+      const H = yield getVariableValue(N(I == null ? void 0 : I.title, { title: O(S.title) }), V), K = yield getVariableValue(N(I == null ? void 0 : I.content, { title: O(S.title) }), V);
       if (!a && o) {
         const W = () => {
           b ? b(G, () => {
-            var X, Z;
-            y !== !1 && (T == null || T(!0), (Z = (X = B()) == null ? void 0 : X.refresh) == null || Z.call(X));
+            var J, Z;
+            y !== !1 && (T == null || T(!0), (Z = (J = B()) == null ? void 0 : J.refresh) == null || Z.call(J));
           }) : isBulkEditAction(S) || !j() ? (v(!0), F == null || F()) : ["view", "update", "create", "customize:popup"].includes(S["x-action"]) && S["x-uid"] ? k.current() : (v(!0), F == null || F());
         };
-        (I == null ? void 0 : I.enable) !== !1 && (I != null && I.content) ? (yield (J = q == null ? void 0 : q.submit) == null ? void 0 : J.call(q), R.confirm({
+        (I == null ? void 0 : I.enable) !== !1 && (I != null && I.content) ? (yield (X = q == null ? void 0 : q.submit) == null ? void 0 : X.call(q), R.confirm({
           title: N(H, { title: D || $ || (t == null ? void 0 : t.title) }),
           content: N(K, { title: D || $ || (t == null ? void 0 : t.title) }),
           onOk: W
@@ -40182,7 +40188,7 @@ const RenderButton = ({
       buttonStyle: i,
       handleMouseEnter: l,
       getAriaLabel: g,
-      handleButtonClick: V,
+      handleButtonClick: E,
       tarComponent: c,
       componentCls: d,
       hashId: p,
@@ -40197,8 +40203,8 @@ const RenderButton = ({
 RenderButton.displayName = "RenderButton";
 const RenderButtonInner = observer$1(
   (e) => {
-    var M, L;
-    const O = e, {
+    var M, O;
+    const L = e, {
       designable: t,
       field: o,
       aclCtx: n,
@@ -40219,7 +40225,7 @@ const RenderButtonInner = observer$1(
       title: y,
       isLink: S,
       onlyIcon: v
-    } = O, F = Y(O, [
+    } = L, F = Y(L, [
       "designable",
       "field",
       "aclCtx",
@@ -40242,8 +40248,8 @@ const RenderButtonInner = observer$1(
       "onlyIcon"
     ]), { t: I } = useTranslation(), R = useCallback(
       debounce$1(
-        (q, E = !0) => {
-          d(q, E);
+        (q, V = !0) => {
+          d(q, V);
         },
         300,
         { leading: !0, trailing: !1 }
@@ -40256,9 +40262,9 @@ const RenderButtonInner = observer$1(
     const T = useMemo(
       () => React.forwardRef(
         (K, H) => {
-          var J = K, { component: q = p || Button, icon: E, onlyIcon: V, children: G } = J, U = Y(J, ["component", "icon", "onlyIcon", "children"]);
+          var X = K, { component: q = p || Button, icon: V, onlyIcon: E, children: G } = X, U = Y(X, ["component", "icon", "onlyIcon", "children"]);
           return /* @__PURE__ */ jsxs(q, P(x({ ref: H }, U), { children: [
-            v ? /* @__PURE__ */ jsx(Tooltip, { title: U.title, children: /* @__PURE__ */ jsx("span", { style: { padding: 3 }, children: E && typeof E == "string" ? /* @__PURE__ */ jsx(Icon, { type: E }) : E }) }) : /* @__PURE__ */ jsx("span", { style: { paddingRight: 3 }, children: E && typeof E == "string" ? /* @__PURE__ */ jsx(Icon, { type: E }) : E }),
+            v ? /* @__PURE__ */ jsx(Tooltip, { title: U.title, children: /* @__PURE__ */ jsx("span", { style: { padding: 3 }, children: V && typeof V == "string" ? /* @__PURE__ */ jsx(Icon, { type: V }) : V }) }) : /* @__PURE__ */ jsx("span", { style: { paddingRight: 3 }, children: V && typeof V == "string" ? /* @__PURE__ */ jsx(Icon, { type: V }) : V }),
             v ? G[1] : G
           ] }));
         }
@@ -40275,7 +40281,7 @@ const RenderButtonInner = observer$1(
         "aria-label": u()
       }, F), {
         onMouseEnter: c,
-        loading: ((L = o == null ? void 0 : o.data) == null ? void 0 : L.loading) || a,
+        loading: ((O = o == null ? void 0 : o.data) == null ? void 0 : O.loading) || a,
         icon: typeof r == "string" ? /* @__PURE__ */ jsx(Icon, { type: r, style: j }) : r,
         disabled: i,
         style: S ? N : l,
@@ -40727,7 +40733,7 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
 ), EMPTY$1 = "N/A", InternalRemoteSelect = withDynamicSchemaProps(
   connect(
     (e) => {
-      var K, J;
+      var K, X;
       const H = e, {
         fieldNames: t = {},
         service: o = {},
@@ -40763,16 +40769,16 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
       ]), b = useDataSourceKey(), y = useDataSourceHeaders(m || b), S = useRef(!1), v = useFieldSchema(), F = ((K = v["x-component-props"]) == null ? void 0 : K.addMode) === "quickAdd", { getField: I } = useCollection_deprecated(), R = useRef(null), { getCollectionJoinField: T, getInterface: D } = useCollectionManager_deprecated(), $ = v["x-collection-field"] || v.name, B = I($) || T($), N = u || (B == null ? void 0 : B.target) && (t == null ? void 0 : t.label) && T(`${B.target}.${t.label}`), j = useMemo(() => {
         var W;
         if (N != null && N.interface) {
-          const X = D(N.interface), Z = ((W = X == null ? void 0 : X.filterable) == null ? void 0 : W.operators[0].value) || "$includes";
+          const J = D(N.interface), Z = ((W = J == null ? void 0 : J.filterable) == null ? void 0 : W.operators[0].value) || "$includes";
           return N.type === "string" || N.dataType === "string" ? "$includes" : Z;
         }
         return "$includes";
-      }, [N]), w = useCompile(), O = useCallback(
+      }, [N]), w = useCompile(), L = useCallback(
         (W) => {
           try {
-            return W.filter((X) => ["number", "string"].includes(typeof X[t.value]) || !X[t.value]).map((X) => {
+            return W.filter((J) => ["number", "string"].includes(typeof J[t.value]) || !J[t.value]).map((J) => {
               var Q;
-              let Z = w(X[t.label]);
+              let Z = w(J[t.label]);
               if ((Q = N == null ? void 0 : N.uiSchema) != null && Q.enum)
                 if (Array.isArray(Z))
                   Z = Z.map((ee, oe) => {
@@ -40785,18 +40791,18 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
                 }
               return (N == null ? void 0 : N.type) === "date" && (Z = dayjs(Z).format("YYYY-MM-DD")), c ? c({
                 [t.label]: Z || EMPTY$1,
-                [t.value]: X[t.value]
-              }) : P(x({}, omit(X, "style")), {
+                [t.value]: J[t.value]
+              }) : P(x({}, omit(J, "style")), {
                 [t.label]: Z || EMPTY$1,
-                [t.value]: X[t.value]
+                [t.value]: J[t.value]
               });
             }).filter(Boolean);
-          } catch (X) {
-            return console.error(X), W;
+          } catch (J) {
+            return console.error(J), W;
           }
         },
         [N == null ? void 0 : N.uiSchema, t]
-      ), { data: M, run: k, loading: L } = useRequest(
+      ), { data: M, run: k, loading: O } = useRequest(
         P(x({
           action: "list"
         }, o), {
@@ -40804,7 +40810,7 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
           params: P(x({
             pageSize: 200
           }, o == null ? void 0 : o.params), {
-            filter: (J = o == null ? void 0 : o.params) == null ? void 0 : J.filter
+            filter: (X = o == null ? void 0 : o.params) == null ? void 0 : X.filter
           })
         }),
         x({
@@ -40818,7 +40824,7 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
           fieldNames: t
         }),
         [o, t]
-      ), E = useCallback(() => R.current && d ? /* @__PURE__ */ jsx(
+      ), V = useCallback(() => R.current && d ? /* @__PURE__ */ jsx(
         d,
         {
           search: R.current,
@@ -40830,8 +40836,8 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
       useEffect(() => {
         S.current && k();
       }, [q]);
-      const V = (W) => z(void 0, null, function* () {
-        var X;
+      const E = (W) => z(void 0, null, function* () {
+        var J;
         k({
           filter: mergeFilter([
             W ? {
@@ -40839,7 +40845,7 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
                 [j]: W
               }
             } : {},
-            (X = o == null ? void 0 : o.params) == null ? void 0 : X.filter
+            (J = o == null ? void 0 : o.params) == null ? void 0 : J.filter
           ])
         }), R.current = W;
       }), G = useMemo(() => {
@@ -40847,8 +40853,8 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
         const W = r || a;
         if (!((Q = M == null ? void 0 : M.data) != null && Q.length))
           return W != null ? Array.isArray(W) ? W : [W] : [];
-        const X = W != null && (Array.isArray(W) ? W.map((ee) => P(x({}, ee), { [t.value]: ee[t.value] || ee })) : [P(x({}, W), { [t.value]: W[t.value] || W })]) || [], Z = typeof p == "function" ? M.data.filter(p) : M.data;
-        return uniqBy(Z.concat(X != null ? X : []), t.value);
+        const J = W != null && (Array.isArray(W) ? W.map((ee) => P(x({}, ee), { [t.value]: ee[t.value] || ee })) : [P(x({}, W), { [t.value]: W[t.value] || W })]) || [], Z = typeof p == "function" ? M.data.filter(p) : M.data;
+        return uniqBy(Z.concat(J != null ? J : []), t.value);
       }, [r, a, M == null ? void 0 : M.data, t.value, p]);
       return /* @__PURE__ */ jsx(
         Select,
@@ -40858,7 +40864,7 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
           filterOption: !1,
           filterSort: null,
           fieldNames: t,
-          onSearch: V,
+          onSearch: E,
           onDropdownVisibleChange: (W) => {
             R.current = null, W && k(), S.current = !0;
           },
@@ -40866,15 +40872,15 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
           value: r,
           defaultValue: a
         }, C), {
-          loading: M ? L : !0,
-          options: h(O(G)),
+          loading: M ? O : !0,
+          options: h(L(G)),
           rawOptions: G,
           dropdownRender: (W) => {
-            const X = G.some((Z) => Z[t.label] === R.current);
+            const J = G.some((Z) => Z[t.label] === R.current);
             return /* @__PURE__ */ jsx(Fragment$1, { children: F ? /* @__PURE__ */ jsxs(Fragment$1, { children: [
               !((M == null ? void 0 : M.data.length) === 0 && (R != null && R.current)) && W,
-              (M == null ? void 0 : M.data.length) > 0 && (R == null ? void 0 : R.current) && !X && /* @__PURE__ */ jsx(Divider$1, { style: { margin: 0 } }),
-              !X && /* @__PURE__ */ jsx(E, {})
+              (M == null ? void 0 : M.data.length) > 0 && (R == null ? void 0 : R.current) && !J && /* @__PURE__ */ jsx(Divider$1, { style: { margin: 0 } }),
+              !J && /* @__PURE__ */ jsx(V, {})
             ] }) : W });
           }
         })
@@ -41885,8 +41891,8 @@ const insertPositionToMethod = {
   ), h = useMemo(() => toItems$1(c == null ? void 0 : c.properties, { t: l, compile: u }), [c == null ? void 0 : c.properties, l, u]), g = useCallback(
     (B) => {
       onFieldChange("target", (N) => {
-        var w, O;
-        const [, j] = ((O = (w = N == null ? void 0 : N.value) == null ? void 0 : w.split) == null ? void 0 : O.call(w, "||")) || [];
+        var w, L;
+        const [, j] = ((L = (w = N == null ? void 0 : N.value) == null ? void 0 : w.split) == null ? void 0 : L.call(w, "||")) || [];
         N.query("position").take((M) => {
           M.dataSource = j === "Menu.SubMenu" ? [
             { label: l("Before"), value: "beforeBegin" },
@@ -41937,7 +41943,7 @@ const insertPositionToMethod = {
   const S = useCallback(
     ({ title: B, icon: N, href: j, params: w }) => {
       var M;
-      const O = {
+      const L = {
         "x-uid": n["x-uid"],
         "x-server-hooks": [
           {
@@ -41946,8 +41952,8 @@ const insertPositionToMethod = {
           }
         ]
       };
-      B && (n.title = B, o.title = B, O.title = B, i()), o.componentProps.icon = N, o.componentProps.href = j, o.componentProps.params = w, O["x-component-props"] = { icon: N, href: j, params: w }, n["x-component-props"] = n["x-component-props"] || {}, n["x-component-props"].icon = N, n["x-component-props"].href = j, n["x-component-props"].params = w, m == null || m({ item: { props: { schema: n } } }), a.emit("patch", {
-        schema: O
+      B && (n.title = B, o.title = B, L.title = B, i()), o.componentProps.icon = N, o.componentProps.href = j, o.componentProps.params = w, L["x-component-props"] = { icon: N, href: j, params: w }, n["x-component-props"] = n["x-component-props"] || {}, n["x-component-props"].icon = N, n["x-component-props"].href = j, n["x-component-props"].params = w, m == null || m({ item: { props: { schema: n } } }), a.emit("patch", {
+        schema: L
       }), (M = n.__route__) != null && M.id && e(n.__route__.id, {
         title: B,
         icon: N,
@@ -41996,26 +42002,26 @@ const insertPositionToMethod = {
       const [w] = ((q = B == null ? void 0 : B.split) == null ? void 0 : q.call(B, "||")) || [];
       if (!w)
         return;
-      const O = findByUid(c, w), M = createDesignable({
+      const L = findByUid(c, w), M = createDesignable({
         t: l,
         api: r,
         refresh: i,
-        current: O
+        current: L
       }), k = {
         beforeBegin: "insertBefore",
         afterEnd: "insertAfter"
-      }, L = N === "beforeEnd" ? {
+      }, O = N === "beforeEnd" ? {
         targetScope: {
-          parentId: O.__route__.id
+          parentId: L.__route__.id
         }
       } : {
-        targetId: O.__route__.id
+        targetId: L.__route__.id
       };
       yield I(x({
         sourceId: n.__route__.id,
         sortField: "sort",
         method: k[N]
-      }, L)), M.loadAPIClientEvents(), M.insertAdjacent(N, n);
+      }, O)), M.loadAPIClientEvents(), M.insertAdjacent(N, n);
     }),
     [c, l, r, i, I, n]
   ), T = useMemo(() => ({
@@ -43342,15 +43348,15 @@ const FieldsTreeSelect = (e) => {
     "loadData",
     "includeFieldPaths"
   ]), p = useCompile(), { t: m } = useTranslation(), [h, g] = useState({}), f = a({ collection: r }), [C, b] = parseCollectionName(f), y = useApp(), { collectionManager: S } = y.dataSourceManager.getDataSource(C), v = (j, w) => {
-    const O = S.getCollection(j);
-    return O ? O.getAllFields(w) : [];
+    const L = S.getCollection(j);
+    return L ? L.getAllFields(w) : [];
   }, F = Object.values(h), I = useMemo(() => e.multiple ? (o || []).map((j) => h[j]).filter(Boolean) : o, [o, 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((M, k) => Object.assign(M, { [k.value]: k }), x({}, O)));
+        g((L) => w.reduce((M, k) => Object.assign(M, { [k.value]: k }), x({}, L)));
       }
     }),
     [c]
@@ -43362,28 +43368,28 @@ 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((M, k) => Object.assign(M, { [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((M, k) => Object.assign(M, { [k.value]: k }), {});
+    j && (L[j.value] = j), g(L);
   }, [f, l, i, c]), useEffect(() => {
     const j = e.multiple ? o : o ? [o] : [];
-    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 M = O.split(".");
+    j.forEach((L) => {
+      const M = L.split(".");
       let k = h[M[0]];
-      for (let L = 1; L < M.length && k; L++) {
-        const q = M.slice(0, L + 1).join(".");
+      for (let O = 1; O < M.length && k; O++) {
+        const q = M.slice(0, O + 1).join(".");
         if (h[q]) {
           k = h[q];
           break;
         }
         if (!k.isLeaf && k.loadChildren) {
-          const E = k.loadChildren(k);
-          E != null && E.length && (w.push(...E), k = E.find((V) => V.value === M.slice(0, L + 1).join(".")));
+          const V = k.loadChildren(k);
+          V != null && V.length && (w.push(...V), k = V.find((E) => E.value === M.slice(0, O + 1).join(".")));
         }
       }
-    }), g((O) => w.reduce((M, k) => Object.assign(M, { [k.value]: k }), x({}, O)));
+    }), g((L) => w.reduce((M, k) => Object.assign(M, { [k.value]: k }), x({}, L)));
   }, [o, F.length, e.multiple]);
   const T = useCallback(
     (j) => {
@@ -43391,30 +43397,30 @@ const FieldsTreeSelect = (e) => {
         n(j);
         return;
       }
-      const w = j.map((k) => k.value).filter(Boolean), O = new Set(w), M = I.find((k) => !O.has(k.value));
+      const w = j.map((k) => k.value).filter(Boolean), L = new Set(w), M = I.find((k) => !L.has(k.value));
       if (M) {
         const k = `${M.value}.`;
-        Object.keys(h).forEach((L) => {
-          L.startsWith(k) && O.delete(L);
+        Object.keys(h).forEach((O) => {
+          O.startsWith(k) && L.delete(O);
         });
       } else
         u && w.forEach((k) => {
-          const L = k.split(".");
-          if (L.length)
-            for (let q = 1; q <= L.length; q++)
-              O.add(L.slice(0, q).join("."));
+          const O = k.split(".");
+          if (O.length)
+            for (let q = 1; q <= O.length; q++)
+              L.add(O.slice(0, q).join("."));
         });
-      n(Array.from(O));
+      n(Array.from(L));
     },
     [e.multiple, I, n, h]
   ), D = useCallback(
     (j) => {
       var q;
-      const { value: w, onClose: O, disabled: M, closable: k } = j;
+      const { value: w, onClose: L, disabled: M, closable: k } = j;
       if (!w)
         return null;
-      const { fullTitle: L } = (q = h[w]) != null ? q : {};
-      return /* @__PURE__ */ jsx(Tag, { closable: k && !M, onClose: O, children: L == null ? void 0 : L.join(" / ") });
+      const { fullTitle: O } = (q = h[w]) != null ? q : {};
+      return /* @__PURE__ */ jsx(Tag, { closable: k && !M, onClose: L, children: O == null ? void 0 : O.join(" / ") });
     },
     [h]
   ), $ = Array.isArray(I) ? I.filter((j) => j.value in h) : I, B = e.multiple ? o : o != null ? [o] : [];
@@ -43472,21 +43478,21 @@ const InternalAssociationSelect$1 = observer$1(
       const B = uid();
       return f.addEffects(B, () => {
         onFieldInputValueChange("*", (N) => {
-          var M, k, L, q, E, V;
-          const j = filterAnalyses((L = (k = (M = r.componentProps) == null ? void 0 : M.service) == null ? void 0 : k.params) == null ? void 0 : L.filter) || [], w = getFieldPath(N.address.entire), O = getFieldPath(r.address.entire);
-          j.includes((q = N == null ? void 0 : N.props) == null ? void 0 : q.name) && r.value && isEqual(N == null ? void 0 : N.indexes, r == null ? void 0 : r.indexes) && ((E = N == null ? void 0 : N.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));
+          var M, k, O, q, V, E;
+          const j = filterAnalyses((O = (k = (M = r.componentProps) == null ? void 0 : M.service) == null ? void 0 : k.params) == null ? void 0 : O.filter) || [], w = getFieldPath(N.address.entire), L = getFieldPath(r.address.entire);
+          j.includes((q = N == null ? void 0 : N.props) == null ? void 0 : q.name) && r.value && isEqual(N == null ? void 0 : N.indexes, r == null ? void 0 : r.indexes) && ((V = N == null ? void 0 : N.props) == null ? void 0 : V.name) !== r.props.name && (!((E = r == null ? void 0 : r.indexes) != null && E.length) || isEqual(w, L)) && (r.setValue(null), p(null));
         });
       }), () => {
         f.removeEffects(B);
       };
     }, []);
     const R = (B) => z(void 0, null, function* () {
-      var O, M;
+      var L, M;
       const { search: N, callBack: j } = B, {
         data: { data: w }
       } = yield b.create({
         values: {
-          [((M = (O = r == null ? void 0 : r.componentProps) == null ? void 0 : O.fieldNames) == null ? void 0 : M.label) || "id"]: N
+          [((M = (L = r == null ? void 0 : r.componentProps) == null ? void 0 : L.fieldNames) == null ? void 0 : M.label) || "id"]: N
         }
       });
       if (w) {
@@ -44134,9 +44140,9 @@ function Uploader(o) {
       if (m(B), a) {
         const j = $.fileList.filter((w) => w.status === "done");
         if (j.length) {
-          const w = [...u, ...j.map((O) => {
+          const w = [...u, ...j.map((L) => {
             var M;
-            return c((M = O.response) == null ? void 0 : M.data);
+            return c((M = L.response) == null ? void 0 : M.data);
           })];
           B.length ? d(w) : (l == null || l([...i || [], ...w]), d([]));
         }
@@ -44498,10 +44504,10 @@ const InternalFileManager = (e) => {
     setSelectedRows: u,
     collectionField: b
   }, R = () => {
-    const { setVisible: B } = useActionContext(), { multiple: N, selectedRows: j, onChange: w, options: O, collectionField: M } = useContext(RecordPickerContext);
+    const { setVisible: B } = useActionContext(), { multiple: N, selectedRows: j, onChange: w, options: L, collectionField: M } = useContext(RecordPickerContext);
     return {
       onClick() {
-        w(N ? unionBy(j, O, (M == null ? void 0 : M.targetKey) || "id") : (j == null ? void 0 : j[0]) || null), B(!1);
+        w(N ? unionBy(j, L, (M == null ? void 0 : M.targetKey) || "id") : (j == null ? void 0 : j[0]) || null), B(!1);
       }
     };
   };
@@ -44563,36 +44569,36 @@ const InternalFileManager = (e) => {
   useEffect(() => {
     var j;
     if (r) {
-      const w = Array.isArray(r) ? extractLastNonNullValueObjects(r == null ? void 0 : r.filter((M) => M.value), !0) : transformNestedData(r), O = (j = w == null ? void 0 : w.map) == null ? void 0 : j.call(w, (M) => ({
+      const w = Array.isArray(r) ? extractLastNonNullValueObjects(r == null ? void 0 : r.filter((M) => M.value), !0) : transformNestedData(r), L = (j = w == null ? void 0 : w.map) == null ? void 0 : j.call(w, (M) => ({
         key: M.parentId,
         children: [],
         value: M
       }));
-      i(O);
+      i(L);
     }
   }, []);
   const R = useCallback(
     (j) => {
       try {
         return j == null ? void 0 : j.filter((w) => ["number", "string"].includes(typeof w[S.value])).map((w) => {
-          var M, k, L;
-          let O = p(w[S.label]);
+          var M, k, O;
+          let L = p(w[S.label]);
           if ((M = v == null ? void 0 : v.uiSchema) != null && M.enum)
-            if (Array.isArray(O))
-              O = O.map((q, E) => {
+            if (Array.isArray(L))
+              L = L.map((q, V) => {
                 var G, U;
-                const V = (U = (G = v.uiSchema.enum).find) == null ? void 0 : U.call(G, (H) => H.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);
+                const E = (U = (G = v.uiSchema.enum).find) == null ? void 0 : U.call(G, (H) => H.value === q);
+                return E ? /* @__PURE__ */ jsx(Tag, { color: E.color, style: { marginRight: 3 }, children: (E == null ? void 0 : E.label) || q }, V) : /* @__PURE__ */ jsx(Tag, { children: q }, q);
               }).reverse();
             else {
-              const q = (L = (k = v.uiSchema.enum).find) == null ? void 0 : L.call(k, (E) => E.value === O);
-              q && (O = /* @__PURE__ */ jsx(Tag, { color: q.color, children: q.label }));
+              const q = (O = (k = v.uiSchema.enum).find) == null ? void 0 : O.call(k, (V) => V.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")), o ? o({
-            [S.label]: O || EMPTY,
+          return (v == null ? void 0 : v.type) === "date" && (L = dayjs(L).format("YYYY-MM-DD")), o ? o({
+            [S.label]: L || EMPTY,
             [S.value]: w[S.value]
           }) : P(x({}, w), {
-            [S.label]: O || EMPTY,
+            [S.label]: L || EMPTY,
             [S.value]: w[S.value]
           });
         }).filter(Boolean);
@@ -44602,46 +44608,46 @@ const InternalFileManager = (e) => {
     },
     [v == null ? void 0 : v.uiSchema, S]
   ), T = (j) => z(void 0, null, function* () {
-    var O, M;
+    var L, M;
     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 (M = w == null ? void 0 : w.data) == null ? void 0 : M.data;
-  }), D = (j, w, O) => z(void 0, null, function* () {
+  }), D = (j, w, L) => z(void 0, null, function* () {
     const M = 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: (M == null ? void 0 : M.length) > 0 ? M : null }), i(k), ["o2m", "m2m"].includes(g.interface)) {
-      const L = Array.isArray(f.fieldValue) ? f.fieldValue : [];
-      L[I.index] = w, f.fieldValue = L;
+    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: (M == null ? void 0 : M.length) > 0 ? M : null }), i(k), ["o2m", "m2m"].includes(g.interface)) {
+      const O = Array.isArray(f.fieldValue) ? f.fieldValue : [];
+      O[I.index] = w, f.fieldValue = O;
     } else
       f.value = w;
     k.length === 1 && !k[0].value ? n == null || n(null) : n == null || n(k);
-  }), $ = (j, w, O) => z(void 0, null, function* () {
-    var M, k, L;
+  }), $ = (j, w, L) => z(void 0, null, function* () {
+    var M, k, O;
     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 && ((M = w == null ? void 0 : w.value) != null && M.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: (L = w == null ? void 0 : w.value) == null ? void 0 : L.id, children: (E == null ? void 0 : E.length) > 0 ? E : null }, i(V), n == null || n(V);
+      if (d(!1), c(q), L === (a == null ? void 0 : a.length) - 1 && ((M = w == null ? void 0 : w.value) != null && M.id)) {
+        const V = yield T({ parentId: (k = w == null ? void 0 : w.value) == null ? void 0 : k.id }), E = [...a];
+        E.splice(L + 1), E[L] = P(x({}, E[L]), { value: w == null ? void 0 : w.value }), E[L + 1] = { key: (O = w == null ? void 0 : w.value) == null ? void 0 : O.id, children: (V == null ? void 0 : V.length) > 0 ? V : null }, i(E), n == null || n(E);
       }
     }
   }), B = (j, w) => z(void 0, null, function* () {
-    const O = j ? {
+    const L = j ? {
       [S.label]: {
         [F]: j
       }
     } : {};
     d(!0);
-    const M = yield T(P(x({}, O), {
+    const M = yield T(P(x({}, L), {
       parentId: w == null ? void 0 : w.key
     }));
     d(!1), c(M);
   });
   return /* @__PURE__ */ jsx(Space$1, { wrap: !0, children: a.map((j, w) => {
-    var O, M, k;
+    var L, M, k;
     return j.children && /* @__PURE__ */ jsx(
       Select$1,
       {
@@ -44652,16 +44658,16 @@ const InternalFileManager = (e) => {
         filterOption: !1,
         filterSort: null,
         defaultValue: {
-          label: (O = j == null ? void 0 : j.value) == null ? void 0 : O[S.label],
+          label: (L = j == null ? void 0 : j.value) == null ? void 0 : L[S.label],
           value: (M = j == null ? void 0 : j.value) == null ? void 0 : M[S.value]
         },
         labelInValue: !0,
-        onSearch: (L) => B(L, j),
+        onSearch: (O) => B(O, j),
         fieldNames: S,
         style: { minWidth: 150 },
-        onChange: (L, q) => D(L, q, w),
+        onChange: (O, q) => D(O, q, w),
         options: u ? [] : R(l),
-        onDropdownVisibleChange: (L) => $(L, j, w),
+        onDropdownVisibleChange: (O) => $(O, j, w),
         notFoundContent: u ? /* @__PURE__ */ jsx(Spin, { size: "small" }) : null
       },
       `${(k = j.value) == null ? void 0 : k.id}+ ${j.key} + ${S.label}`
@@ -44962,9 +44968,9 @@ const useTableSelectorProps$2 = () => {
 }, InternalPicker = observer$1(
   (e) => {
     var q;
-    const L = e, { value: t, multiple: o, openSize: n, onChange: r, quickUpload: a, selectFile: i, shouldMountElement: l } = L, c = Y(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(), y = useLabelUiSchema$1(f, (d == null ? void 0 : d.label) || "label"), S = h["x-add-new"], [v, F] = useState([]), I = useCollectionRecordData(), R = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((V) => {
-      const G = V == null ? void 0 : V[d.label];
-      return P(x({}, V), {
+    const O = e, { value: t, multiple: o, openSize: n, onChange: r, quickUpload: a, selectFile: i, shouldMountElement: l } = O, c = Y(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(), y = useLabelUiSchema$1(f, (d == null ? void 0 : d.label) || "label"), S = h["x-add-new"], [v, F] = useState([]), I = useCollectionRecordData(), R = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((E) => {
+      const G = E == null ? void 0 : E[d.label];
+      return P(x({}, E), {
         [d.label]: getLabelFormatValue$1(b(y), b(G))
       });
     }) : [], [t == null ? void 0 : t.length, d.label]), T = {
@@ -44981,29 +44987,29 @@ const useTableSelectorProps$2 = () => {
       collectionField: f,
       currentFormCollection: C
     }, { isMobileLayout: D } = useMobileLayout(), $ = () => {
-      var E;
-      return o == null ? null : Array.isArray(t) ? (E = t.filter(Boolean)) == null ? void 0 : E.map((V) => V == null ? void 0 : V[d.value]) : t == null ? void 0 : t[d.value];
+      var V;
+      return o == null ? null : Array.isArray(t) ? (V = t.filter(Boolean)) == null ? void 0 : V.map((E) => E == null ? void 0 : E[d.value]) : t == null ? void 0 : t[d.value];
     }, B = () => {
-      var E;
-      return o == null ? null : Array.isArray(t) ? (E = t.filter(Boolean)) == null ? void 0 : E.map((V) => ({
-        [d.label]: b(V == null ? void 0 : V[d.label]),
-        [d.value]: V == null ? void 0 : V[d.value]
+      var V;
+      return o == null ? null : Array.isArray(t) ? (V = t.filter(Boolean)) == null ? void 0 : V.map((E) => ({
+        [d.label]: b(E == null ? void 0 : E[d.label]),
+        [d.value]: E == null ? void 0 : E[d.value]
       })) : [{ [d.label]: b(t == null ? void 0 : t[d.label]), [d.value]: t == null ? void 0 : t[d.value] }];
     }, N = () => {
-      const E = (f == null ? void 0 : f.targetKey) || "id", V = R.map((U) => U[E]).filter(Boolean);
-      return V.length ? { $and: [{ [`${E}.$ne`]: V }] } : {};
+      const V = (f == null ? void 0 : f.targetKey) || "id", E = R.map((U) => U[V]).filter(Boolean);
+      return E.length ? { $and: [{ [`${V}.$ne`]: E }] } : {};
     };
     useEffect(() => {
       t || F([]);
     }, [t]);
     const j = () => {
-      const { setVisible: E } = useActionContext(), { multiple: V, selectedRows: G, onChange: U, options: H, collectionField: K } = useContext(RecordPickerContext);
+      const { setVisible: V } = useActionContext(), { multiple: E, selectedRows: G, onChange: U, options: H, collectionField: K } = useContext(RecordPickerContext);
       return {
         onClick() {
-          U(V ? unionBy(G, H, (K == null ? void 0 : K.targetKey) || "id") : (G == null ? void 0 : G[0]) || null), E(!1);
+          U(E ? unionBy(G, H, (K == null ? void 0 : K.targetKey) || "id") : (G == null ? void 0 : G[0]) || null), V(!1);
         },
         style: {
-          display: V === !1 ? "none" : "block"
+          display: E === !1 ? "none" : "block"
         }
       };
     }, w = useMemo(
@@ -45012,7 +45018,7 @@ const useTableSelectorProps$2 = () => {
         useTableSelectorProps: useTableSelectorProps$2
       }),
       []
-    ), O = useMemo(
+    ), L = useMemo(
       () => D ? transformMultiColumnToSingleColumn(h) : h,
       [D, h]
     ), M = useSchemaOptionsContext(), k = P(x({}, M.components), {
@@ -45032,23 +45038,23 @@ const useTableSelectorProps$2 = () => {
           }, c), {
             mode: o ? "multiple" : e.mode,
             fieldNames: d,
-            onDropdownVisibleChange: (E) => {
+            onDropdownVisibleChange: (V) => {
               g(schema$1.Selector), m(!0);
             },
             allowClear: !0,
-            onChange: (E) => {
-              if (E) {
-                if (Array.isArray(E)) {
-                  if (!E.length) {
+            onChange: (V) => {
+              if (V) {
+                if (Array.isArray(V)) {
+                  if (!V.length) {
                     r([]), F([]);
                     return;
                   }
-                  const V = R == null ? void 0 : R.filter((G) => E.includes(G[d.value]));
-                  r(V), F(V);
+                  const E = R == null ? void 0 : R.filter((G) => V.includes(G[d.value]));
+                  r(E), F(E);
                 }
               } else {
-                const V = o ? [] : null;
-                r(V), F(V);
+                const E = o ? [] : null;
+                r(E), F(E);
               }
             },
             options: B(),
@@ -45062,7 +45068,7 @@ const useTableSelectorProps$2 = () => {
             onlyRenderProperties: !0,
             basePath: u.address,
             schema: h,
-            filterProperties: (E) => E["x-component"] === "Action"
+            filterProperties: (V) => V["x-component"] === "Action"
           }
         ) }) })
       ] }),
@@ -45080,8 +45086,8 @@ const useTableSelectorProps$2 = () => {
             {
               onlyRenderProperties: !0,
               basePath: u.address,
-              schema: O,
-              filterProperties: (E) => E["x-component"] === "AssociationField.Selector"
+              schema: L,
+              filterProperties: (V) => V["x-component"] === "AssociationField.Selector"
             }
           ) }) }) }) }) }))
         }
@@ -45118,10 +45124,10 @@ const RenderRecord = React.memo(
     const R = useCallback(() => I.current, []);
     return useEffect(() => {
       const T = toArr$3(h).map((D, $, B) => {
-        const N = 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(N) ? JSON.stringify(N) : N, w = toValue$4(o(j), "N/A"), O = n(
+        const N = 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(N) ? JSON.stringify(N) : N, w = toValue$4(o(j), "N/A"), L = n(
           (D == null ? void 0 : D.__collection) || (r == null ? void 0 : r.target),
           (e == null ? void 0 : e.label) || "label"
-        ), M = getLabelFormatValue$1(o(O), w, !0);
+        ), M = getLabelFormatValue$1(o(L), w, !0);
         return /* @__PURE__ */ jsxs(Fragment, { children: [
           /* @__PURE__ */ jsx("span", { children: a ? M : i !== !1 ? /* @__PURE__ */ jsx(
             "a",
@@ -45130,7 +45136,7 @@ const RenderRecord = React.memo(
                 g(!0);
               },
               onClick: (k) => {
-                var L;
+                var O;
                 g(!0), k.stopPropagation(), k.preventDefault(), l && !hasAddedViewer(u.properties) && (c(schema$1.Viewer), F.current = !0), F.current ? (setTimeout(() => {
                   f == null || f({ recordData: D }), d({
                     recordData: D,
@@ -45140,7 +45146,7 @@ const RenderRecord = React.memo(
                 }), F.current = !1) : u.properties && (f == null || f({ recordData: D }), d({
                   recordData: D,
                   parentRecordData: p
-                })), (L = m == null ? void 0 : m.current) == null || L.setPopoverVisible(!1);
+                })), (O = m == null ? void 0 : m.current) == null || O.setPopoverVisible(!1);
               },
               children: M
             }
@@ -45912,19 +45918,19 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
       }
     });
     Array.isArray(n.value) || (n.value = []);
-    const D = useCallback(({ form: w, fieldSchema: O, collectionField: M, getInterface: k }) => {
-      var L;
-      return !M || M.target && ((L = O["x-component-props"]) != null && L.mode) && !["Picker", "Select"].includes(O["x-component-props"].mode) ? !1 : !(w != null && w.readPretty) && !isPatternDisabled(O) && !interfacesOfUnsupportedDefaultValue.includes(M == null ? void 0 : M.interface) && !isSystemField(M, k);
+    const D = useCallback(({ form: w, fieldSchema: L, collectionField: M, getInterface: k }) => {
+      var O;
+      return !M || M.target && ((O = L["x-component-props"]) != null && O.mode) && !["Picker", "Select"].includes(L["x-component-props"].mode) ? !1 : !(w != null && w.readPretty) && !isPatternDisabled(L) && !interfacesOfUnsupportedDefaultValue.includes(M == null ? void 0 : M.interface) && !isSystemField(M, k);
     }, []), $ = () => {
-      const { setVisible: w } = useActionContext(), { selectedRows: O, setSelectedRows: M } = useContext(RecordPickerContext);
+      const { setVisible: w } = useActionContext(), { selectedRows: L, setSelectedRows: M } = useContext(RecordPickerContext);
       return {
         onClick() {
-          O.map((k) => n.value.push(markRecordAsNew(k))), n.onInput(n.value), n.initialValue = n.value, M([]), w(!1);
+          L.map((k) => n.value.push(markRecordAsNew(k))), n.onInput(n.value), n.initialValue = n.value, M([]), w(!1);
         }
       };
-    }, B = useMemo(() => n.value && Object.keys(n.value).length > 0 ? (Array.isArray(n.value) ? n.value : n.value ? [n.value] : []).filter(Boolean).map((O) => {
-      const M = O == null ? void 0 : O[F.label];
-      return P(x({}, O), {
+    }, B = useMemo(() => n.value && Object.keys(n.value).length > 0 ? (Array.isArray(n.value) ? n.value : n.value ? [n.value] : []).filter(Boolean).map((L) => {
+      const M = L == null ? void 0 : L[F.label];
+      return P(x({}, L), {
         [F.label]: getLabelFormatValue$1(I(R), I(M))
       });
     }) : [], [n.value, F == null ? void 0 : F.label]), N = {
@@ -45940,8 +45946,8 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
       setSelectedRows: v,
       collectionField: o
     }, j = () => {
-      const w = (o == null ? void 0 : o.targetKey) || "id", O = (n.value || []).map((k) => k == null ? void 0 : k[w]).filter(Boolean);
-      return O.length ? { $and: [{ [`${w}.$ne`]: O }] } : {};
+      const w = (o == null ? void 0 : o.targetKey) || "id", L = (n.value || []).map((k) => k == null ? void 0 : k[w]).filter(Boolean);
+      return L.length ? { $and: [{ [`${w}.$ne`]: L }] } : {};
     };
     return n.value.length > 0 ? /* @__PURE__ */ jsxs(
       Card,
@@ -45955,31 +45961,31 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
         `,
         children: [
           /* @__PURE__ */ jsxs(RefreshComponentProvider, { refresh: C, children: [
-            n.value.map((w, O) => {
+            n.value.map((w, L) => {
               let M = a;
               return a || (M = !(w != null && w[o.targetKey])), /* @__PURE__ */ jsxs(React.Fragment, { children: [
-                /* @__PURE__ */ jsx("div", { style: { textAlign: "right" }, children: !n.readPretty && M && (!t["x-template-uid"] || O > 0) && /* @__PURE__ */ jsx(Tooltip, { title: c("Remove"), children: /* @__PURE__ */ jsx(
+                /* @__PURE__ */ jsx("div", { style: { textAlign: "right" }, children: !n.readPretty && M && (!t["x-template-uid"] || L > 0) && /* @__PURE__ */ jsx(Tooltip, { title: c("Remove"), children: /* @__PURE__ */ jsx(
                   CloseOutlined,
                   {
                     style: { zIndex: 1e3, color: "#a8a3a3" },
                     onClick: () => {
                       action(() => (spliceArrayState(n, {
-                        startIndex: O,
+                        startIndex: L,
                         deleteCount: 1
-                      }), n.value.splice(O, 1), Array.isArray(n.initialValue) && n.initialValue.splice(O, 1), n.onInput(n.value)));
+                      }), n.value.splice(L, 1), Array.isArray(n.initialValue) && n.initialValue.splice(L, 1), n.onInput(n.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: n.address.concat(O),
+                    basePath: n.address.concat(L),
                     schema: h
                   }
                 ) }) }) }) }) }),
                 /* @__PURE__ */ jsx(Divider$1, {})
-              ] }, O);
+              ] }, L);
             }),
             /* @__PURE__ */ jsxs(Space$1, { children: [
               n.editable && r && /* @__PURE__ */ jsx(
@@ -45990,8 +45996,8 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
                       action(() => {
                         Array.isArray(n.value) || (n.value = []);
                         const w = n.value.length;
-                        return n.value.splice(w, 0, markRecordAsNew({})), each(n.form.fields, (O, M) => {
-                          O || delete n.form.fields[M];
+                        return n.value.splice(w, 0, markRecordAsNew({})), each(n.form.fields, (L, M) => {
+                          L || delete n.form.fields[M];
                         }), n.onInput(n.value);
                       });
                     }
@@ -46144,8 +46150,8 @@ const useColumnsDeepMemoized = (e) => {
         width: I && !l ? 0 : ((B = S["x-component-props"]) == null ? void 0 : B.width) || 100,
         render: (N, j) => {
           var M;
-          const w = (M = r.value) == null ? void 0 : M.indexOf(j), O = r.address.concat(j.__index || w);
-          return /* @__PURE__ */ jsx(SubFormProvider, { value: { value: j, collection: C, fieldSchema: a.parent }, children: /* @__PURE__ */ jsx(RecordIndexProvider, { index: j.__index || w, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: isNewRecord(j), record: j, parent: d, children: /* @__PURE__ */ jsx(ColumnFieldProvider, { schema: S, basePath: O, children: /* @__PURE__ */ jsx("span", { role: "button", className: f, children: /* @__PURE__ */ jsx(RecursionField, { basePath: O, schema: S, onlyRenderProperties: !0 }) }, w) }) }) }) });
+          const w = (M = r.value) == null ? void 0 : M.indexOf(j), L = r.address.concat(j.__index || w);
+          return /* @__PURE__ */ jsx(SubFormProvider, { value: { value: j, collection: C, fieldSchema: a.parent }, children: /* @__PURE__ */ jsx(RecordIndexProvider, { index: j.__index || w, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: isNewRecord(j), record: j, parent: d, children: /* @__PURE__ */ jsx(ColumnFieldProvider, { schema: S, basePath: L, children: /* @__PURE__ */ jsx("span", { role: "button", className: f, children: /* @__PURE__ */ jsx(RecursionField, { basePath: L, schema: S, onlyRenderProperties: !0 }) }, w) }) }) }) });
         },
         onCell: (N, j) => ({
           record: N,
@@ -46484,7 +46490,7 @@ const Table$1 = withDynamicSchemaProps(
       "onClickRow",
       "enableIndexColumn"
     ]), S = useArrayField(y), v = useFieldSchema(), { size: F = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, I = useCollection(), T = ((de = v == null ? void 0 : v.parent) == null ? void 0 : de["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: $ } = T, B = useMemoizedFn(y.onRowDragEnd || (() => {
-    })), N = usePaginationProps$2(o, a), j = useTableColumns$1(y, N), [w, O] = useState(() => D ? $ : []), [M, k] = useState(((be = S == null ? void 0 : S.data) == null ? void 0 : be.selectedRowKeys) || []), [L, q] = useState([]), E = (p == null ? void 0 : p.type) !== "none", V = useRef(/* @__PURE__ */ new Map()), G = useMemo(() => css`
+    })), N = usePaginationProps$2(o, a), j = useTableColumns$1(y, N), [w, L] = useState(() => D ? $ : []), [M, k] = useState(((be = S == null ? void 0 : S.data) == null ? void 0 : be.selectedRowKeys) || []), [O, q] = useState([]), V = (p == null ? void 0 : p.type) !== "none", E = useRef(/* @__PURE__ */ new Map()), G = useMemo(() => css`
         & > td {
           background-color: ${t.controlItemBgActive} !important;
         }
@@ -46493,24 +46499,24 @@ const Table$1 = withDynamicSchemaProps(
         }
       `, [t.controlItemBgActive, t.controlItemBgActiveHover]), U = useMemo(() => C ? G : "", [G, C]), H = useMemo(() => C ? (se, te) => ({
       onClick: (ne) => {
-        isPortalInBody(ne.target) || C(se, q, L);
+        isPortalInBody(ne.target) || C(se, q, O);
       },
       rowIndex: te
-    }) : null, [C, L]);
+    }) : null, [C, O]);
     useDeepCompareEffect(() => {
       const se = D ? $ : [];
-      _.isEqual(se, w) || O(se);
+      _.isEqual(se, w) || L(se);
     }, [D, $]);
     const K = useCallback((se) => {
       if (m)
-        return J(se);
+        return X(se);
       if (se.key)
         return se.key;
-      if (V.current.has(se))
-        return V.current.get(se);
+      if (E.current.has(se))
+        return E.current.get(se);
       const te = uid();
-      return V.current.set(se, te), te;
-    }, []), J = useCallback(
+      return E.current.set(se, te), te;
+    }, []), X = useCallback(
       (se) => {
         var te;
         return Array.isArray(m) ? m.map((ne) => {
@@ -46519,7 +46525,7 @@ const Table$1 = withDynamicSchemaProps(
         }).join("-") : typeof m == "string" ? se[m] : (te = (m != null ? m : K)(se)) == null ? void 0 : te.toString();
       },
       [JSON.stringify(m), K]
-    ), W = useMemo(() => (Array.isArray(S == null ? void 0 : S.value) ? S.value : []).filter(Boolean), [S == null ? void 0 : S.value, (Se = S == null ? void 0 : S.value) == null ? void 0 : Se.length]), X = useMemo(() => (se) => {
+    ), W = useMemo(() => (Array.isArray(S == null ? void 0 : S.value) ? S.value : []).filter(Boolean), [S == null ? void 0 : S.value, (Se = S == null ? void 0 : S.value) == null ? void 0 : Se.length]), J = useMemo(() => (se) => {
       const te = useCallback((ne) => {
         var ke, ve, Pe, Fe, Ie, Ae;
         if (!ne.active || !ne.over) {
@@ -46531,18 +46537,18 @@ const Table$1 = withDynamicSchemaProps(
       }, []);
       return /* @__PURE__ */ jsx(DndContext, { onDragEnd: te, children: /* @__PURE__ */ jsx("tbody", x({}, se)) });
     }, [S, B]);
-    X.displayName = "BodyWrapperComponent";
+    J.displayName = "BodyWrapperComponent";
     const Z = useMemo(() => ({
       header: {
         wrapper: HeaderWrapperComponent,
         cell: HeaderCellComponent
       },
       body: {
-        wrapper: X,
+        wrapper: J,
         row: BodyRowComponent,
         cell: BodyCellComponent
       }
-    }), [X]), Q = useMemo(() => p, [JSON.stringify(p)]), ee = useMemo(
+    }), [J]), Q = useMemo(() => p, [JSON.stringify(p)]), ee = useMemo(
       () => ({
         rowSelection: b && Q ? x({
           type: "checkbox",
@@ -46565,14 +46571,14 @@ const Table$1 = withDynamicSchemaProps(
                 role: "button",
                 "aria-label": `table-index-${ne}`,
                 className: cls(se ? "checked" : null, rowSelectCheckboxWrapperClass, {
-                  [rowSelectCheckboxWrapperClassHover]: E
+                  [rowSelectCheckboxWrapperClassHover]: V
                 }),
                 children: [
                   /* @__PURE__ */ jsxs("div", { className: cls(se ? "checked" : null, rowSelectCheckboxContentClass), children: [
-                    l && /* @__PURE__ */ jsx(SortHandle$1, { id: J(te) }),
+                    l && /* @__PURE__ */ jsx(SortHandle$1, { id: X(te) }),
                     c && /* @__PURE__ */ jsx(TableIndex$2, { index: ne })
                   ] }),
-                  E && /* @__PURE__ */ jsx(
+                  V && /* @__PURE__ */ jsx(
                     "div",
                     {
                       className: cls(
@@ -46596,8 +46602,8 @@ const Table$1 = withDynamicSchemaProps(
         c,
         l,
         S,
-        J,
-        E,
+        X,
+        V,
         Q,
         N,
         b
@@ -46608,24 +46614,24 @@ const Table$1 = withDynamicSchemaProps(
         return l ? React.createElement(
           SortableContext$1,
           {
-            items: ((ne = (te = S.value) == null ? void 0 : te.map) == null ? void 0 : ne.call(te, J)) || []
+            items: ((ne = (te = S.value) == null ? void 0 : te.map) == null ? void 0 : ne.call(te, X)) || []
           },
           se
         ) : React.createElement(React.Fragment, {}, se);
       },
-      [S, l, J]
+      [S, l, X]
     ), { height: re, tableSizeRefCallback: ie } = useTableSize(), pe = useMemo(() => ({
       x: "max-content"
     }), []), ce = useMemo(() => ({
       x: "max-content",
       y: W.length > 0 ? re : void 0
     }), [re, pe, W]), fe = useCallback(
-      (se) => L.includes(se[m]) ? U : "",
-      [L, U, JSON.stringify(m)]
+      (se) => O.includes(se[m]) ? U : "",
+      [O, U, JSON.stringify(m)]
     ), ge = useCallback(
       (se, te) => {
         const ne = se ? [...w, te[I.getPrimaryKey()]] : w.filter((ae) => te[I.getPrimaryKey()] !== ae);
-        O(ne), g == null || g(se, te);
+        L(ne), g == null || g(se, te);
       },
       [w, g, I]
     ), Ce = useMemo(() => ({
@@ -46710,23 +46716,23 @@ const Table$1 = withDynamicSchemaProps(
   }
 `, SubTable = observer$1(
   (e) => {
-    var k, L, q;
+    var k, O, q;
     const { openSize: t } = e, { field: o, options: n, fieldSchema: r } = useAssociationFieldContext(), { t: a } = useTranslation(), [i, l] = useState(!1), [c, u] = useState([]), d = useFieldNames$1(e), p = useFieldSchema(), m = useCompile(), h = useLabelUiSchema$1(n, (d == null ? void 0 : d.label) || "label"), g = useCollectionRecord(), f = useCollection(), { allowSelectExistingRecord: C, allowAddnew: b, allowDisassociation: y, enableIndexColumn: S } = o.componentProps;
     useSubTableSpecialCase({ rootField: o, rootSchema: r });
-    const v = (E, V) => {
-      if (V !== void 0 && isArr(o.value) && E !== V)
+    const v = (V, E) => {
+      if (E !== void 0 && isArr(o.value) && V !== E)
         return action(() => {
-          const G = o.value[E];
-          return o.value.splice(E, 1), o.value.splice(V, 0, G), exchangeArrayState(o, {
-            fromIndex: E,
-            toIndex: V
+          const G = o.value[V];
+          return o.value.splice(V, 1), o.value.splice(E, 0, G), exchangeArrayState(o, {
+            fromIndex: V,
+            toIndex: E
           }), o.onInput(o.value);
         });
     };
     o.move = v;
-    const F = useMemo(() => o.value && Object.keys(o.value).length > 0 ? (Array.isArray(o.value) ? o.value : o.value ? [o.value] : []).filter(Boolean).map((V) => {
-      const G = V == null ? void 0 : V[d.label];
-      return P(x({}, V), {
+    const F = useMemo(() => o.value && Object.keys(o.value).length > 0 ? (Array.isArray(o.value) ? o.value : o.value ? [o.value] : []).filter(Boolean).map((E) => {
+      const G = E == null ? void 0 : E[d.label];
+      return P(x({}, E), {
         [d.label]: getLabelFormatValue$1(m(h), m(G))
       });
     }) : [], [o.value, d == null ? void 0 : d.label]), I = {
@@ -46742,28 +46748,28 @@ const Table$1 = withDynamicSchemaProps(
       setSelectedRows: u,
       collectionField: n
     }, R = () => {
-      const { setVisible: E } = useActionContext(), { selectedRows: V, setSelectedRows: G } = useContext(RecordPickerContext);
+      const { setVisible: V } = useActionContext(), { selectedRows: E, setSelectedRows: G } = useContext(RecordPickerContext);
       return {
         onClick() {
           var H;
-          Array.isArray(o.value) || (o.value = []), V.forEach((K) => o.value.push(markRecordAsNew(K))), o.onInput(o.value), o.initialValue = o.value, G([]), E(!1);
+          Array.isArray(o.value) || (o.value = []), E.forEach((K) => o.value.push(markRecordAsNew(K))), o.onInput(o.value), o.initialValue = o.value, G([]), V(!1);
           const U = Math.ceil(o.value.length / (((H = o.componentProps) == null ? void 0 : H.pageSize) || 10));
           $(U);
         }
       };
     }, T = () => {
-      const E = (n == null ? void 0 : n.targetKey) || "id", V = (o.value || []).map((U) => U == null ? void 0 : U[E]).filter(Boolean);
-      return V.length ? { $and: [{ [`${E}.$ne`]: V }] } : {};
+      const V = (n == null ? void 0 : n.targetKey) || "id", E = (o.value || []).map((U) => U == null ? void 0 : U[V]).filter(Boolean);
+      return E.length ? { $and: [{ [`${V}.$ne`]: E }] } : {};
     }, [D, $] = useState(1), [B, N] = useState(((k = o.componentProps) == null ? void 0 : k.pageSize) || 10), { setFormValueChanged: j } = useActionContext();
     useEffect(() => {
-      var E;
-      N((E = o.componentProps) == null ? void 0 : E.pageSize);
-    }, [(L = o.componentProps) == null ? void 0 : L.pageSize]);
-    const w = useMemo(() => {
       var V;
-      const E = Math.ceil(((V = o.value) == null ? void 0 : V.length) / 10);
+      N((V = o.componentProps) == null ? void 0 : V.pageSize);
+    }, [(O = o.componentProps) == null ? void 0 : O.pageSize]);
+    const w = useMemo(() => {
+      var E;
+      const V = Math.ceil(((E = o.value) == null ? void 0 : E.length) / 10);
       return {
-        current: D > E ? E : D,
+        current: D > V ? V : D,
         pageSize: B || 10,
         total: o == null ? void 0 : o.value,
         onChange: (G, U) => {
@@ -46773,14 +46779,14 @@ const Table$1 = withDynamicSchemaProps(
         pageSizeOptions: ["10", "20", "50", "100"],
         hideOnSinglePage: !1
       };
-    }, [(q = o.value) == null ? void 0 : q.length, B, D]), O = () => {
-      const { field: E } = useAssociationFieldContext();
+    }, [(q = o.value) == null ? void 0 : q.length, B, D]), L = () => {
+      const { field: V } = useAssociationFieldContext();
       return {
         run() {
           var G;
-          E.value = E.value || [], E.value.push(markRecordAsNew({}));
-          const V = Math.ceil(E.value.length / (((G = E.componentProps) == null ? void 0 : G.pageSize) || 10));
-          return $(V), E.onInput(E.value);
+          V.value = V.value || [], V.value.push(markRecordAsNew({}));
+          const E = Math.ceil(V.value.length / (((G = V.componentProps) == null ? void 0 : G.pageSize) || 10));
+          return $(E), V.onInput(V.value);
         }
       };
     }, M = () => ({
@@ -46797,7 +46803,7 @@ const Table$1 = withDynamicSchemaProps(
           field: o,
           showIndex: !0,
           dragSort: !1,
-          showDel: o.editable && (b !== !1 || C !== !1 || y !== !1) ? (E) => o.editable ? y !== !1 ? !0 : E == null ? void 0 : E.__isNewRecord__ : !1 : !1,
+          showDel: o.editable && (b !== !1 || C !== !1 || y !== !1) ? (V) => o.editable ? y !== !1 ? !0 : V == null ? void 0 : V.__isNewRecord__ : !1 : !1,
           pagination: w,
           rowSelection: { type: "none", hideSelectAll: !0 },
           isSubTable: !0,
@@ -46818,7 +46824,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, {}),
                       " ",
@@ -46865,7 +46871,7 @@ const Table$1 = withDynamicSchemaProps(
                   onlyRenderProperties: !0,
                   basePath: o.address,
                   schema: p.parent,
-                  filterProperties: (E) => E["x-component"] === "AssociationField.Selector"
+                  filterProperties: (V) => V["x-component"] === "AssociationField.Selector"
                 }
               )
             }
@@ -46964,26 +46970,26 @@ const ReadPretty$6 = observer$1(
 InternalAssociationSelect.displayName = "InternalAssociationSelect";
 const AssociationSelect = InternalAssociationSelect;
 AssociationSelect.Designer = function e() {
-  var O, M, k, L, q, E, V, G, U, H, K;
-  const { getCollectionFields: t, getInterface: o, getCollectionJoinField: n, 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(), y = i(u.name) || n(u["x-collection-field"]), S = useFieldComponentOptions(), v = c.address.segments.includes("__form_grid"), F = o(y == null ? void 0 : y.interface), I = (O = F == null ? void 0 : F.validateSchema) == null ? void 0 : O.call(F, u), R = (M = y == null ? void 0 : y.uiSchema) == null ? void 0 : M.title, T = y != null && y.target ? t(y == null ? void 0 : y.target) : [];
+  var L, M, k, O, q, V, E, G, U, H, K;
+  const { getCollectionFields: t, getInterface: o, getCollectionJoinField: n, 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(), y = i(u.name) || n(u["x-collection-field"]), S = useFieldComponentOptions(), v = c.address.segments.includes("__form_grid"), F = o(y == null ? void 0 : y.interface), I = (L = F == null ? void 0 : F.validateSchema) == null ? void 0 : L.call(F, u), R = (M = y == null ? void 0 : y.uiSchema) == null ? void 0 : M.title, T = y != null && y.target ? t(y == null ? void 0 : y.target) : [];
   c.title === R || c.title;
-  const D = useSortFields(y == null ? void 0 : y.target), $ = ((q = (L = (k = c.componentProps) == null ? void 0 : k.service) == null ? void 0 : L.params) == null ? void 0 : q.sort) || [];
+  const D = useSortFields(y == null ? void 0 : y.target), $ = ((q = (O = (k = c.componentProps) == null ? void 0 : k.service) == null ? void 0 : O.params) == null ? void 0 : q.sort) || [];
   useEffect(() => {
     c.readPretty !== u["x-read-pretty"] && (c.readPretty = !!u["x-read-pretty"]);
   }, [u["x-read-pretty"]]);
-  const B = $ == null ? void 0 : $.map((J) => J.startsWith("-") ? {
-    field: J.substring(1),
+  const B = $ == null ? void 0 : $.map((X) => X.startsWith("-") ? {
+    field: X.substring(1),
     direction: "desc"
   } : {
-    field: J,
+    field: X,
     direction: "asc"
   });
   c.readPretty || c.required;
-  const N = T.filter((J) => a(J)).map((J) => {
+  const N = T.filter((X) => a(X)).map((X) => {
     var W;
     return {
-      value: J == null ? void 0 : J.name,
-      label: f((W = J == null ? void 0 : J.uiSchema) == null ? void 0 : W.title) || (J == null ? void 0 : J.name)
+      value: X == null ? void 0 : X.name,
+      label: f((W = X == null ? void 0 : X.uiSchema) == null ? void 0 : W.title) || (X == null ? void 0 : X.name)
     };
   });
   let j = "editable";
@@ -47077,11 +47083,11 @@ AssociationSelect.Designer = function e() {
             }
           }
         },
-        onSubmit: (J) => {
+        onSubmit: (X) => {
           var ee;
-          const W = [], X = (oe) => oe != null && !Number.isNaN(oe);
-          for (const oe of J.rules)
-            W.push(_.pickBy(oe, X));
+          const W = [], J = (oe) => oe != null && !Number.isNaN(oe);
+          for (const oe of X.rules)
+            W.push(_.pickBy(oe, J));
           const Z = {
             "x-uid": u["x-uid"]
           };
@@ -47121,11 +47127,11 @@ AssociationSelect.Designer = function e() {
             })
           }
         },
-        onSubmit: (J) => {
+        onSubmit: (X) => {
           const W = {
             "x-uid": u["x-uid"]
           };
-          c.value !== J.default && (c.value = J.default), u.default = J.default, W.default = J.default, m.emit("patch", {
+          c.value !== X.default && (c.value = X.default), u.default = X.default, W.default = X.default, m.emit("patch", {
             schema: W
           }), h();
         }
@@ -47137,8 +47143,8 @@ AssociationSelect.Designer = function e() {
         title: d("Field component"),
         options: S,
         value: u["x-component"],
-        onChange: (J) => {
-          var X, Z;
+        onChange: (X) => {
+          var J, Z;
           const W = {
             name: y == null ? void 0 : y.name,
             type: "void",
@@ -47149,11 +47155,11 @@ AssociationSelect.Designer = function e() {
             // 'x-designer': 'FormItem.Designer',
             "x-toolbar": "FormItemSchemaToolbar",
             "x-settings": "fieldSettings:FormItem",
-            "x-component": J,
+            "x-component": X,
             "x-validator": u["x-validator"],
             "x-collection-field": u["x-collection-field"],
             "x-decorator-props": u["x-decorator-props"],
-            "x-component-props": x(x({}, (X = y == null ? void 0 : y.uiSchema) == null ? void 0 : X["x-component-props"]), u["x-component-props"])
+            "x-component-props": x(x({}, (J = y == null ? void 0 : y.uiSchema) == null ? void 0 : J["x-component-props"]), u["x-component-props"])
           };
           (Z = F == null ? void 0 : F.schemaInitialize) == null || Z.call(F, W, {
             field: y,
@@ -47161,7 +47167,7 @@ AssociationSelect.Designer = function e() {
             readPretty: c.readPretty,
             action: p ? "get" : null,
             targetCollection: r(y == null ? void 0 : y.target)
-          }), J === "CollectionField" && (W.type = "string"), g("beforeBegin", divWrap(W), {
+          }), X === "CollectionField" && (W.type = "string"), g("beforeBegin", divWrap(W), {
             onSuccess: () => {
               m.remove(null, {
                 removeParentsIfNoChildren: !0,
@@ -47178,12 +47184,12 @@ AssociationSelect.Designer = function e() {
       SchemaSettingsSwitchItem,
       {
         title: d("Allow multiple"),
-        checked: ((E = u["x-component-props"]) == null ? void 0 : E.multiple) === void 0 ? !0 : u["x-component-props"].multiple,
-        onChange: (J) => {
+        checked: ((V = u["x-component-props"]) == null ? void 0 : V.multiple) === void 0 ? !0 : u["x-component-props"].multiple,
+        onChange: (X) => {
           const W = {
             "x-uid": u["x-uid"]
           };
-          u["x-component-props"] = u["x-component-props"] || {}, c.componentProps = c.componentProps || {}, u["x-component-props"].multiple = J, c.componentProps.multiple = J, W["x-component-props"] = u["x-component-props"], m.emit("patch", {
+          u["x-component-props"] = u["x-component-props"] || {}, c.componentProps = c.componentProps || {}, u["x-component-props"].multiple = X, c.componentProps.multiple = X, W["x-component-props"] = u["x-component-props"], m.emit("patch", {
             schema: W
           }), h();
         }
@@ -47194,10 +47200,10 @@ AssociationSelect.Designer = function e() {
       SchemaSettingsDataScope,
       {
         collectionName: y == null ? void 0 : y.target,
-        defaultFilter: ((U = (G = (V = c.componentProps) == null ? void 0 : V.service) == null ? void 0 : G.params) == null ? void 0 : U.filter) || {},
+        defaultFilter: ((U = (G = (E = c.componentProps) == null ? void 0 : E.service) == null ? void 0 : G.params) == null ? void 0 : U.filter) || {},
         form: l,
-        onSubmit: ({ filter: J }) => {
-          J = removeNullCondition(J), _.set(c.componentProps, "service.params.filter", J), u["x-component-props"] = c.componentProps, m.emit("patch", {
+        onSubmit: ({ filter: X }) => {
+          X = removeNullCondition(X), _.set(c.componentProps, "service.params.filter", X), u["x-component-props"] = c.componentProps, m.emit("patch", {
             schema: {
               "x-uid": u["x-uid"],
               "x-component-props": c.componentProps
@@ -47280,8 +47286,8 @@ AssociationSelect.Designer = function e() {
             }
           }
         },
-        onSubmit: ({ sort: J }) => {
-          const W = J.map((X) => X.direction === "desc" ? `-${X.field}` : X.field);
+        onSubmit: ({ sort: X }) => {
+          const W = X.map((J) => J.direction === "desc" ? `-${J.field}` : J.field);
           _.set(c.componentProps, "service.params.sort", W), u["x-component-props"] = c.componentProps, m.emit("patch", {
             schema: {
               "x-uid": u["x-uid"],
@@ -47301,11 +47307,11 @@ AssociationSelect.Designer = function e() {
           { label: d("Easy-reading"), value: "read-pretty" }
         ],
         value: j,
-        onChange: (J) => {
+        onChange: (X) => {
           const W = {
             "x-uid": u["x-uid"]
           };
-          switch (J) {
+          switch (X) {
             case "readonly": {
               u["x-read-pretty"] = !1, u["x-disabled"] = !0, W["x-read-pretty"] = !1, W["x-disabled"] = !0, c.readPretty = !1, c.disabled = !0;
               break;
@@ -47332,14 +47338,14 @@ AssociationSelect.Designer = function e() {
         title: d("Title field"),
         options: N,
         value: (K = (H = c == null ? void 0 : c.componentProps) == null ? void 0 : H.fieldNames) == null ? void 0 : K.label,
-        onChange: (J) => {
+        onChange: (X) => {
           var Z, Q;
           const W = {
             "x-uid": u["x-uid"]
-          }, X = P(x(x({}, (Q = (Z = y == null ? void 0 : y.uiSchema) == null ? void 0 : Z["x-component-props"]) == null ? void 0 : Q.fieldNames), c.componentProps.fieldNames), {
-            label: J
+          }, J = P(x(x({}, (Q = (Z = y == null ? void 0 : y.uiSchema) == null ? void 0 : Z["x-component-props"]) == null ? void 0 : Q.fieldNames), c.componentProps.fieldNames), {
+            label: X
           });
-          c.componentProps.fieldNames = X, u["x-component-props"] = u["x-component-props"] || {}, u["x-component-props"].fieldNames = X, W["x-component-props"] = u["x-component-props"], m.emit("patch", {
+          c.componentProps.fieldNames = J, u["x-component-props"] = u["x-component-props"] || {}, u["x-component-props"].fieldNames = J, W["x-component-props"] = u["x-component-props"], m.emit("patch", {
             schema: W
           }), m.refresh();
         }
@@ -47363,7 +47369,7 @@ AssociationSelect.Designer = function e() {
   ] });
 };
 AssociationSelect.FilterDesigner = function e() {
-  var F, I, R, T, D, $, B, N, j, w, O;
+  var F, I, R, T, D, $, B, N, j, w, L;
   const { getCollectionFields: t, getInterface: o, getCollectionJoinField: n } = 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) || n(l["x-collection-field"]), h = o(m == null ? void 0 : m.interface), g = (F = h == null ? void 0 : h.validateSchema) == null ? void 0 : F.call(h, l), f = (I = m == null ? void 0 : m.uiSchema) == null ? void 0 : I.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), y = ((D = (T = (R = i.componentProps) == null ? void 0 : R.service) == null ? void 0 : T.params) == null ? void 0 : D.sort) || [], S = y == null ? void 0 : y.map((M) => M.startsWith("-") ? {
@@ -47470,19 +47476,19 @@ AssociationSelect.FilterDesigner = function e() {
           }
         },
         onSubmit: (M) => {
-          var E;
+          var V;
           const k = [];
-          for (const V of M.rules)
-            k.push(_.pickBy(V, _.identity));
-          const L = {
+          for (const E of M.rules)
+            k.push(_.pickBy(E, _.identity));
+          const O = {
             "x-uid": l["x-uid"]
           };
           if (["percent"].includes(m == null ? void 0 : m.interface))
-            for (const V of k)
-              (V.maxValue || V.minValue) && (V.percentMode = !0), V.percentFormat && (V.percentFormats = !0);
-          const q = _.concat([], ((E = m == null ? void 0 : m.uiSchema) == null ? void 0 : E["x-validator"]) || [], k);
-          i.validator = q, l["x-validator"] = k, L["x-validator"] = k, u.emit("patch", {
-            schema: L
+            for (const E of k)
+              (E.maxValue || E.minValue) && (E.percentMode = !0), E.percentFormat && (E.percentFormats = !0);
+          const q = _.concat([], ((V = m == null ? void 0 : m.uiSchema) == null ? void 0 : V["x-validator"]) || [], k);
+          i.validator = q, l["x-validator"] = k, O["x-validator"] = k, u.emit("patch", {
+            schema: O
           }), d();
         }
       }
@@ -47605,7 +47611,7 @@ AssociationSelect.FilterDesigner = function e() {
           }
         },
         onSubmit: ({ sort: M }) => {
-          const k = M.map((L) => L.direction === "desc" ? `-${L.field}` : L.field);
+          const k = M.map((O) => O.direction === "desc" ? `-${O.field}` : O.field);
           _.set(i.componentProps, "service.params.sort", k), l["x-component-props"] = i.componentProps, u.emit("patch", {
             schema: {
               "x-uid": l["x-uid"],
@@ -47620,15 +47626,15 @@ 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: (M) => {
-          var q, E;
+          var q, V;
           const k = {
             "x-uid": l["x-uid"]
-          }, L = P(x(x({}, (E = (q = m == null ? void 0 : m.uiSchema) == null ? void 0 : q["x-component-props"]) == null ? void 0 : E.fieldNames), i.componentProps.fieldNames), {
+          }, O = P(x(x({}, (V = (q = m == null ? void 0 : m.uiSchema) == null ? void 0 : q["x-component-props"]) == null ? void 0 : V.fieldNames), i.componentProps.fieldNames), {
             label: M
           });
-          i.componentProps.fieldNames = L, l["x-component-props"] = l["x-component-props"] || {}, l["x-component-props"].fieldNames = L, k["x-component-props"] = l["x-component-props"], u.emit("patch", {
+          i.componentProps.fieldNames = O, l["x-component-props"] = l["x-component-props"] || {}, l["x-component-props"].fieldNames = O, k["x-component-props"] = l["x-component-props"], u.emit("patch", {
             schema: k
           }), u.refresh();
         }
@@ -48109,8 +48115,8 @@ const CronSetInternal = (e) => {
   { displayName: "NocoBaseDetails" }
 ), Divider = connect(
   (e) => {
-    const { color: t, borderColor: o } = e;
-    return /* @__PURE__ */ jsx(Divider$1, P(x({}, e), { type: "horizontal", style: { color: t, borderColor: o }, orientationMargin: "0" }));
+    const { color: t, borderColor: o } = e, { t: n } = useTranslation(), r = useFieldSchema(), a = useCompile(), i = (r == null ? void 0 : r["x-component-props"].children) || e.children, l = typeof i == "string" ? n(a(i), { ns: NAMESPACE_UI_SCHEMA }) : i;
+    return /* @__PURE__ */ jsx(Divider$1, P(x({}, e), { type: "horizontal", style: { color: t, borderColor: o }, orientationMargin: "0", children: l }));
   },
   mapProps((e) => x({
     orientation: "left"
@@ -49173,7 +49179,7 @@ const InternalListBlockProvider = (e) => {
   return e - u - o.paddingLG - l;
 }, InternalList = withSkeletonComponent(
   (e) => {
-    var N, j, w, O;
+    var N, j, w, L;
     const { service: t } = useListBlockContext(), { run: o, params: n } = t, r = useFieldSchema(), a = useDesigner(), i = (N = t == null ? void 0 : t.data) == null ? void 0 : N.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(), y = useCallback(
       (M) => (m.has(M) || m.set(
         M,
@@ -49220,7 +49226,7 @@ const InternalListBlockProvider = (e) => {
               display: none !important;
             }
           `,
-        itemRender: (k, L, q) => L === "prev" ? /* @__PURE__ */ jsxs(
+        itemRender: (k, O, q) => O === "prev" ? /* @__PURE__ */ jsxs(
           "div",
           {
             style: { display: "flex" },
@@ -49277,7 +49283,7 @@ const InternalListBlockProvider = (e) => {
                       P(x({}, e), {
                         pagination: !i || !((j = p.value) != null && j.length) || c <= ((w = p.value) == null ? void 0 : w.length) ? !1 : B,
                         loading: t == null ? void 0 : t.loading,
-                        children: (O = p.value) != null && O.length ? p.value.map((M, k) => /* @__PURE__ */ jsx(ListItemField, { field: p, index: k, schema: y(k) }, k)) : null
+                        children: (L = p.value) != null && L.length ? p.value.map((M, k) => /* @__PURE__ */ jsx(ListItemField, { field: p, index: k, schema: y(k) }, k)) : null
                       })
                     )
                   }
@@ -51131,7 +51137,7 @@ const TableActionColumnDesigner = (e) => {
     "sort-field"
   );
 }, TableBlockDesigner = () => {
-  var F, I, R, T, D, $, B, N, j, w, O, M;
+  var F, I, R, T, D, $, B, N, j, w, L, M;
   const { name: e, title: t } = useCollection_deprecated(), { getCollectionField: o, getCollection: n } = useCollectionManager_deprecated(), r = useField(), a = useFieldSchema(), { form: i } = useFormBlockContext(), l = useSortFields(e), { service: c } = useTableBlockContext(), { t: u } = useTranslation(), { dn: d } = useDesignable();
   useBlockTemplateContext();
   const p = ((I = (F = a == null ? void 0 : a["x-decorator-props"]) == null ? void 0 : F.params) == null ? void 0 : I.sort) || [];
@@ -51145,8 +51151,8 @@ const TableActionColumnDesigner = (e) => {
   }), h = useSchemaTemplate(), g = useCollection_deprecated(), { dragSort: f, resource: C } = r.decoratorProps, b = C && o(C), y = C != null && C.includes(".") ? ($ = n(b == null ? void 0 : b.target)) == null ? void 0 : $.tree : !!(g != null && g.tree), S = useCallback(
     ({ filter: k }) => {
       k = removeNullCondition(k);
-      const L = r.decoratorProps.params || {};
-      L.filter = k, r.decoratorProps.params = L, a["x-decorator-props"].params = L, d.emit("patch", {
+      const O = r.decoratorProps.params || {};
+      O.filter = k, r.decoratorProps.params = O, a["x-decorator-props"].params = O, d.emit("patch", {
         schema: {
           "x-uid": a["x-uid"],
           "x-decorator-props": a["x-decorator-props"]
@@ -51168,12 +51174,12 @@ const TableActionColumnDesigner = (e) => {
         onChange: (k) => {
           var q;
           r.decoratorProps.treeTable = k, a["x-decorator-props"].treeTable = k;
-          const L = P(x({}, (q = c.params) == null ? void 0 : q[0]), {
+          const O = P(x({}, (q = c.params) == null ? void 0 : q[0]), {
             tree: k ? !0 : null
           });
           d.emit("patch", {
             schema: a
-          }), d.refresh(), c.run(L);
+          }), d.refresh(), c.run(O);
         }
       }
     ),
@@ -51298,14 +51304,14 @@ const TableActionColumnDesigner = (e) => {
           }
         },
         onSubmit: ({ sort: k }) => {
-          var E;
-          const L = k.map((V) => V.direction === "desc" ? `-${V.field}` : V.field), q = r.decoratorProps.params || {};
-          q.sort = L, r.decoratorProps.params = q, a["x-decorator-props"].params = q, d.emit("patch", {
+          var V;
+          const O = k.map((E) => E.direction === "desc" ? `-${E.field}` : E.field), q = r.decoratorProps.params || {};
+          q.sort = O, r.decoratorProps.params = q, a["x-decorator-props"].params = q, d.emit("patch", {
             schema: {
               "x-uid": a["x-uid"],
               "x-decorator-props": a["x-decorator-props"]
             }
-          }), c.run(P(x({}, (E = c.params) == null ? void 0 : E[0]), { sort: L }));
+          }), c.run(P(x({}, (V = c.params) == null ? void 0 : V[0]), { sort: O }));
         }
       }
     ),
@@ -51314,7 +51320,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 },
@@ -51325,8 +51331,8 @@ const TableActionColumnDesigner = (e) => {
         ],
         onChange: (k) => {
           var q;
-          const L = r.decoratorProps.params || {};
-          L.pageSize = k, r.decoratorProps.params = L, a["x-decorator-props"].params = L, c.run(P(x({}, (q = c.params) == null ? void 0 : q[0]), { pageSize: k, page: 1 })), d.emit("patch", {
+          const O = r.decoratorProps.params || {};
+          O.pageSize = k, r.decoratorProps.params = O, a["x-decorator-props"].params = O, c.run(P(x({}, (q = c.params) == null ? void 0 : q[0]), { pageSize: k, page: 1 })), d.emit("patch", {
             schema: {
               "x-uid": a["x-uid"],
               "x-decorator-props": a["x-decorator-props"]
@@ -51346,14 +51352,14 @@ const TableActionColumnDesigner = (e) => {
           { label: u("Small"), value: "small" }
         ],
         onChange: (k) => {
-          const L = a.reduceProperties((q, E) => {
-            if (E["x-component"] === "TableV2")
-              return E;
+          const O = a.reduceProperties((q, V) => {
+            if (V["x-component"] === "TableV2")
+              return V;
           }, null);
-          L["x-component-props"] = L["x-component-props"] || {}, L["x-component-props"].size = k, d.emit("patch", {
+          O["x-component-props"] = O["x-component-props"] || {}, O["x-component-props"].size = k, d.emit("patch", {
             schema: {
-              "x-uid": L["x-uid"],
-              "x-decorator-props": L["x-component-props"]
+              "x-uid": O["x-uid"],
+              "x-decorator-props": O["x-component-props"]
             }
           });
         }
@@ -51407,10 +51413,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({}, (M = c.params) == null ? void 0 : M[0]), { filter: O, page: 1 })), p.emit("patch", {
+          let L = _.cloneDeep(j);
+          u && (L ? L = {
+            $and: [u, L]
+          } : L = u), c.run(P(x({}, (M = c.params) == null ? void 0 : M[0]), { filter: L, page: 1 })), p.emit("patch", {
             schema: {
               "x-uid": a["x-uid"],
               "x-decorator-props": a["x-decorator-props"]
@@ -51443,9 +51449,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", {
@@ -51532,8 +51538,8 @@ const TableSelectorDesigner = () => {
         },
         onSubmit: ({ sort: j }) => {
           var M;
-          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"]
@@ -51556,9 +51562,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"]
@@ -53557,29 +53563,29 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
     label: y(w.title),
     value: w.name
   })), []), T = useCallback(() => {
-    const { availableFieldInterfaces: w } = u(n.template) || {}, { exclude: O, include: M } = w || {}, k = [];
-    return F.forEach((L) => {
+    const { availableFieldInterfaces: w } = u(n.template) || {}, { exclude: L, include: M } = w || {}, k = [];
+    return F.forEach((O) => {
       var q;
-      if (L.key === "systemInfo")
-        k.push(P(x({}, L), {
-          children: L.children.filter((E) => E.hidden ? !1 : E.value === "tableoid" ? M != null && M.length ? M.includes(E.value) : (l == null ? void 0 : l.dialect) === "postgres" : typeof n[E.value] == "boolean" ? n[E.value] : !0)
+      if (O.key === "systemInfo")
+        k.push(P(x({}, O), {
+          children: O.children.filter((V) => V.hidden ? !1 : V.value === "tableoid" ? M != null && M.length ? M.includes(V.value) : (l == null ? void 0 : l.dialect) === "postgres" : typeof n[V.value] == "boolean" ? n[V.value] : !0)
         }));
       else {
-        let E = [];
-        M != null && M.length ? M.forEach((V) => {
+        let V = [];
+        M != null && M.length ? M.forEach((E) => {
           var U;
-          const G = (U = L == null ? void 0 : L.children) == null ? void 0 : U.find((H) => [V, V.interface].includes(H.name));
-          G && E.push(P(x({}, G), {
-            targetScope: V == null ? void 0 : V.targetScope
+          const G = (U = O == null ? void 0 : O.children) == null ? void 0 : U.find((H) => [E, E.interface].includes(H.name));
+          G && V.push(P(x({}, G), {
+            targetScope: E == null ? void 0 : E.targetScope
           }));
-        }) : O != null && O.length ? E = (q = L == null ? void 0 : L.children) == null ? void 0 : q.filter((V) => !O.includes(V.name)) : E = L == null ? void 0 : L.children, E != null && E.length && k.push(P(x({}, L), {
-          children: E
+        }) : L != null && L.length ? V = (q = O == null ? void 0 : O.children) == null ? void 0 : q.filter((E) => !L.includes(E.name)) : V = O == null ? void 0 : O.children, V != null && V.length && k.push(P(x({}, O), {
+          children: V
         }));
       }
     }), k;
   }, [u, n]), D = useMemo(() => T().map((w) => {
-    var O;
-    return ((O = w == null ? void 0 : w.children) == null ? void 0 : O.length) === 0 ? null : n.template === "view" ? {
+    var L;
+    return ((L = w == null ? void 0 : w.children) == null ? void 0 : L.length) === 0 ? null : n.template === "view" ? {
       type: "group",
       label: y(w.label),
       title: y(w.label),
@@ -53603,25 +53609,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]), $ = 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 M = getSchema$8(c(w.key), n, y);
       M && (b(M), h(!0));
     },
     items: D
   }), [c, D, n]), B = useMemo(() => I.filter((w) => ["string", "bigInt", "integer"].includes(w.type)).map((w) => {
-    var O;
+    var L;
     return {
       value: w.name,
-      label: y((O = w.uiSchema) == null ? void 0 : O.title)
+      label: y((L = w.uiSchema) == null ? void 0 : L.title)
     };
   }), [I == null ? void 0 : I.length]);
   return n.template !== "sql" && /* @__PURE__ */ jsx(RecordProvider, { record: n, children: /* @__PURE__ */ jsxs(ActionContextProvider, { value: { visible: m, setVisible: h }, children: [
@@ -53853,18 +53859,18 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   return /* @__PURE__ */ jsx(OverridingFieldAction, x({ item: t, parentItem: o }, e));
 }, getIsOverriding = (e, t, o) => t.find((r) => r.name === o.name).collectionName === e, OverridingFieldAction = (e) => {
   const { scope: t, getContainer: o, item: n, parentItem: r, children: a, currentCollection: i } = e, { target: l, through: c } = n, { getInterface: u, getCollection: d, getCurrentCollectionFields: p, getChildrenCollections: m, collections: h } = useCollectionManager_deprecated(), [g, f] = useState(!1), [C, b] = useState({}), y = useAPIClient(), { t: S } = useTranslation(), v = useCompile(), F = (j) => {
-    var O;
-    return j && ((O = m(j)) == null ? void 0 : O.map((M) => M.name).concat([j]));
+    var L;
+    return j && ((L = m(j)) == null ? void 0 : L.map((M) => M.name).concat([j]));
   }, [I, R] = useState({}), T = p(i), D = getIsOverriding(i, T, n), $ = useMemo(() => h.map((j) => ({
     label: v(j.title),
     value: j.name
   })), []), B = () => {
-    const j = useForm(), { refresh: w } = useResourceActionContext(), { refreshCM: O } = useCollectionManager_deprecated(), M = useActionContext(), { resource: k } = useResourceContext();
+    const j = useForm(), { refresh: w } = useResourceActionContext(), { refreshCM: L } = useCollectionManager_deprecated(), M = useActionContext(), { resource: k } = useResourceContext();
     return {
       run() {
         return z(this, null, function* () {
           yield j.submit();
-          const q = cloneDeep(j.values), E = omit(q, [
+          const q = cloneDeep(j.values), V = omit(q, [
             "key",
             "uiSchemaUid",
             "collectionName",
@@ -53877,18 +53883,18 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
             // 'reverseField.uiSchemaUid',
           ]);
           yield k.create({
-            values: E
-          }), yield j.reset(), yield O(), yield w(), M.setVisible(!1);
+            values: V
+          }), yield j.reset(), yield L(), yield w(), M.setVisible(!1);
         });
       }
     };
   }, N = useMemo(() => {
     var j;
     return (n == null ? void 0 : n.fields) || ((j = d(n.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)
       };
     }));
   }, [n.name]);
@@ -53905,10 +53911,10 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
               appends: ["reverseField"]
             });
             R(w == null ? void 0 : w.data);
-            const O = u(n.interface), M = cloneDeep(w == null ? void 0 : w.data) || {};
-            M != null && M.reverseField || (M.autoCreateReverseField = !1, M.reverseField = (j = O.default) == null ? void 0 : j.reverseField, set(M.reverseField, "name", `f_${uid()}`), set(M.reverseField, "uiSchema.title", n.__parent.title));
+            const L = u(n.interface), M = cloneDeep(w == null ? void 0 : w.data) || {};
+            M != null && M.reverseField || (M.autoCreateReverseField = !1, M.reverseField = (j = L.default) == null ? void 0 : j.reverseField, set(M.reverseField, "name", `f_${uid()}`), set(M.reverseField, "uiSchema.title", n.__parent.title));
             const k = getSchema$6(
-              P(x({}, O), {
+              P(x({}, L), {
                 default: M
               }),
               n,
@@ -54370,14 +54376,14 @@ const getSchema$4 = (e, t, o) => {
   const { databaseView: t, viewName: o, sources: n, 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(n), [C, b] = useState([]), y = useField(), S = useForm(), { getCollection: v, getInterface: F, getCollectionFields: I, getInheritCollections: R, getParentCollectionFields: T } = useCollectionManager_deprecated(), D = useCompile(), B = useFieldInterfaceOptions().filter((w) => !["relation", "systemInfo"].includes(w.key));
   useEffect(() => {
     const w = [];
-    g.forEach((O) => {
-      var E;
-      const M = v(O), L = R(O).map((V) => {
-        const G = T(V, O);
+    g.forEach((L) => {
+      var V;
+      const M = v(L), O = R(L).map((E) => {
+        const G = T(E, L);
         return {
           type: "group",
-          key: V,
-          label: l("Parent collection fields") + l(`(${v(V).title})`),
+          key: E,
+          label: l("Parent collection fields") + l(`(${v(E).title})`),
           children: G.filter((U) => !["hasOne", "hasMany", "belongsToMany"].includes(U == null ? void 0 : U.type)).map((U) => {
             var H;
             return {
@@ -54386,48 +54392,48 @@ const getSchema$4 = (e, t, o) => {
             };
           })
         };
-      }), q = (E = M.fields.filter((V) => !["obo", "oho", "m2m", "o2m"].includes(V == null ? void 0 : V.interface))) == null ? void 0 : E.map((V) => {
+      }), q = (V = M.fields.filter((E) => !["obo", "oho", "m2m", "o2m"].includes(E == null ? void 0 : E.interface))) == null ? void 0 : V.map((E) => {
         var G;
-        return { value: V.name, key: V.name, label: l(((G = V.uiSchema) == null ? void 0 : G.title) || V.name) };
-      }).concat(L);
+        return { value: E.name, key: E.name, label: l(((G = E.uiSchema) == null ? void 0 : G.title) || E.name) };
+      }).concat(O);
       w.push({
-        value: O,
+        value: L,
         label: l(M.title || M.name),
         children: q
       });
     }), h(w);
   }, [g, t]), useEffect(() => {
     t && (u(!0), i.resource("dbViews").get({ filterByTk: o, schema: r }).then(({ data: w }) => {
-      var O, M;
+      var L, M;
       if (w) {
         u(!1), p([]);
-        const k = (M = Object.values((O = w == null ? void 0 : w.data) == null ? void 0 : O.fields)) == null ? void 0 : M.map((L) => {
-          var E, V;
-          const q = (a == null ? void 0 : a.data.find((G) => G.name === L.name)) || L;
+        const k = (M = Object.values((L = w == null ? void 0 : w.data) == null ? void 0 : L.fields)) == null ? void 0 : M.map((O) => {
+          var V, E;
+          const q = (a == null ? void 0 : a.data.find((G) => G.name === O.name)) || O;
           if (!(q != null && q.uiSchema)) {
-            const G = F(L.interface);
+            const G = F(O.interface);
             q.uiSchema = (G == null ? void 0 : G.default.uiSchema) || {};
           }
-          return L.source ? P(x({}, L), {
-            uiSchema: P(x({}, omit(q.uiSchema, "rawTitle")), { title: ((E = q.uiSchema) == null ? void 0 : E.title) || q.name })
-          }) : P(x({}, q), {
+          return O.source ? P(x({}, O), {
             uiSchema: P(x({}, omit(q.uiSchema, "rawTitle")), { title: ((V = q.uiSchema) == null ? void 0 : V.title) || q.name })
+          }) : P(x({}, q), {
+            uiSchema: P(x({}, omit(q.uiSchema, "rawTitle")), { title: ((E = q.uiSchema) == null ? void 0 : E.title) || q.name })
           });
         });
         y.value = k, setTimeout(() => {
-          var L, q, E;
-          p(k), S.setValuesIn("sources", (L = w.data) == null ? void 0 : L.sources), f((q = w.data) == null ? void 0 : q.sources), b((E = w == null ? void 0 : w.data) == null ? void 0 : E.unsupportedFields);
+          var O, q, V;
+          p(k), S.setValuesIn("sources", (O = w.data) == null ? void 0 : O.sources), f((q = w.data) == null ? void 0 : q.sources), b((V = w == null ? void 0 : w.data) == null ? void 0 : V.unsupportedFields);
         });
       }
     }).catch);
   }, [t]);
-  const N = (w, O) => {
+  const N = (w, L) => {
     const M = _.cloneDeep(d);
-    M[O] = w, p(M), y.value = M.map((k) => {
-      var q, E, V;
-      const L = 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(".");
+    M[L] = w, p(M), y.value = M.map((k) => {
+      var q, V, E;
+      const O = typeof k.source == "string" ? k.source : (E = (V = (q = k.source) == null ? void 0 : q.filter) == null ? void 0 : V.call(q, Boolean)) == null ? void 0 : E.join(".");
       return P(x({}, k), {
-        source: L
+        source: O
       });
     });
   }, j = [
@@ -54442,17 +54448,17 @@ const getSchema$4 = (e, t, o) => {
       dataIndex: "source",
       key: "source",
       width: 200,
-      render: (w, O, M) => /* @__PURE__ */ jsx(
+      render: (w, L, M) => /* @__PURE__ */ jsx(
         Cascader$1,
         {
           defaultValue: typeof w == "string" ? w == null ? void 0 : w.split(".") : w,
           allowClear: !0,
           style: { width: "100%" },
           options: D(m),
-          onChange: (k, L) => {
-            var E;
-            const q = (E = I(k == null ? void 0 : k[0])) == null ? void 0 : E.find((V) => V.name === last(k));
-            N(P(x({}, O), { source: k, uiSchema: q == null ? void 0 : q.uiSchema }), M);
+          onChange: (k, O) => {
+            var V;
+            const q = (V = I(k == null ? void 0 : k[0])) == null ? void 0 : V.find((E) => E.name === last(k));
+            N(P(x({}, L), { source: k, uiSchema: q == null ? void 0 : q.uiSchema }), M);
           },
           placeholder: l("Select field source")
         }
@@ -54463,7 +54469,7 @@ const getSchema$4 = (e, t, o) => {
       dataIndex: "type",
       width: 140,
       key: "type",
-      render: (w, O, M) => {
+      render: (w, L, M) => {
         const k = d[M];
         return k != null && k.source || !(k != null && k.possibleTypes) ? /* @__PURE__ */ jsx(Tag, { children: w }) : /* @__PURE__ */ jsx(
           Select$1,
@@ -54471,8 +54477,8 @@ const getSchema$4 = (e, t, o) => {
             defaultValue: w,
             popupMatchSelectWidth: !1,
             style: { width: "100%" },
-            options: (k == null ? void 0 : k.possibleTypes.map((L) => ({ label: L, value: L }))) || [],
-            onChange: (L) => N(P(x({}, k), { type: L }), M)
+            options: (k == null ? void 0 : k.possibleTypes.map((O) => ({ label: O, value: O }))) || [],
+            onChange: (O) => N(P(x({}, k), { type: O }), M)
           }
         );
       }
@@ -54482,8 +54488,8 @@ const getSchema$4 = (e, t, o) => {
       dataIndex: "interface",
       key: "interface",
       width: 150,
-      render: (w, O, M) => {
-        const k = d[M], L = getInterfaceOptions(B, k.type);
+      render: (w, L, M) => {
+        const k = d[M], O = getInterfaceOptions(B, k.type);
         return k.source ? w : /* @__PURE__ */ jsx(
           Select$1,
           {
@@ -54493,7 +54499,7 @@ const getSchema$4 = (e, t, o) => {
             onChange: (q) => {
               N(P(x({}, k), { interface: q }), M);
             },
-            children: L.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))
+            children: O.map((q) => /* @__PURE__ */ jsx(Select$1.OptGroup, { label: D(q.label), children: q.children.map((V) => /* @__PURE__ */ jsx(Select$1.Option, { value: V.name, children: D(V.label) }, V.value)) }, q.key))
           }
         );
       }
@@ -54503,13 +54509,13 @@ const getSchema$4 = (e, t, o) => {
       dataIndex: "title",
       key: "title",
       width: 180,
-      render: (w, O, M) => {
-        var L;
+      render: (w, L, M) => {
+        var O;
         const k = d[M];
         return /* @__PURE__ */ jsx(
           Input$3,
           {
-            defaultValue: ((L = k == null ? void 0 : k.uiSchema) == null ? void 0 : L.title) || w,
+            defaultValue: ((O = k == null ? void 0 : k.uiSchema) == null ? void 0 : O.title) || w,
             onChange: (q) => N(
               P(x({}, k), { uiSchema: P(x({}, omit(k == null ? void 0 : k.uiSchema, "rawTitle")), { title: q.target.value }) }),
               M
@@ -54565,15 +54571,15 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
   }, y = (S) => {
     var v;
     return (v = S.filter((F) => F.source || F.interface)) == null ? void 0 : v.map((F) => {
-      var $, B, N, j, w, O;
-      const I = typeof (F == null ? void 0 : F.source) == "string" ? ($ = F == null ? void 0 : F.source) == null ? void 0 : $.split(".") : F == null ? void 0 : F.source, R = (N = (B = h(I == null ? void 0 : I[0])) == null ? void 0 : B.find((M) => M.name === (I == null ? void 0 : I[1]))) == null ? void 0 : N.uiSchema, T = ((j = F == null ? void 0 : F.uiSchema) == null ? void 0 : j.title) || (R == null ? void 0 : R.title) || F.name, D = F.source ? R : (O = (w = m(F.interface)) == null ? void 0 : w.default) == null ? void 0 : O.uiSchema;
+      var $, B, N, j, w, L;
+      const I = typeof (F == null ? void 0 : F.source) == "string" ? ($ = F == null ? void 0 : F.source) == null ? void 0 : $.split(".") : F == null ? void 0 : F.source, R = (N = (B = h(I == null ? void 0 : I[0])) == null ? void 0 : B.find((M) => M.name === (I == null ? void 0 : I[1]))) == null ? void 0 : N.uiSchema, T = ((j = F == null ? void 0 : F.uiSchema) == null ? void 0 : j.title) || (R == null ? void 0 : R.title) || F.name, D = F.source ? R : (L = (w = m(F.interface)) == null ? void 0 : w.default) == null ? void 0 : L.uiSchema;
       return {
         title: u(T),
         dataIndex: F.name,
         key: F.name,
         width: 200,
-        render: (M, k, L) => {
-          const q = k[F.name], E = {
+        render: (M, k, O) => {
+          const q = k[F.name], V = {
             type: "object",
             properties: {
               [F.name]: {
@@ -54585,7 +54591,7 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
               }
             }
           };
-          return /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: /* @__PURE__ */ jsx(RecursionField, { schema: E, name: L, onlyRenderProperties: !0 }) });
+          return /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: /* @__PURE__ */ jsx(RecursionField, { schema: V, name: O, onlyRenderProperties: !0 }) });
         }
       };
     });
@@ -54818,11 +54824,11 @@ const AsyncDataProvider = (e) => {
       const T = /* @__PURE__ */ new Map();
       a || (i && i.length ? Object.entries((i == null ? void 0 : i[0]) || {}).forEach(([B, N]) => {
         var k;
-        const j = l[B], w = inferInterface(B, N), O = (k = C.current(w)) == null ? void 0 : k.default, M = (j == null ? void 0 : j.uiSchema) || (O == null ? void 0 : O.uiSchema) || {};
+        const j = l[B], w = inferInterface(B, N), L = (k = C.current(w)) == null ? void 0 : k.default, M = (j == null ? void 0 : j.uiSchema) || (L == null ? void 0 : L.uiSchema) || {};
         T.set(B, {
           name: B,
           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: B
@@ -54914,13 +54920,13 @@ const AsyncDataProvider = (e) => {
               style: { width: "100%" },
               popupMatchSelectWidth: !1,
               onChange: (j) => {
-                var O, M, k, L, q;
+                var L, M, k, O, q;
                 const w = p(j);
                 y(
                   P(x({}, B), {
                     interface: j || null,
-                    uiSchema: P(x({}, (O = w == null ? void 0 : w.default) == null ? void 0 : O.uiSchema), {
-                      title: ((k = (M = w == null ? void 0 : w.default) == null ? void 0 : M.uiSchema) == null ? void 0 : k.title) || ((L = B.uiSchema) == null ? void 0 : L.title)
+                    uiSchema: P(x({}, (L = w == null ? void 0 : w.default) == null ? void 0 : L.uiSchema), {
+                      title: ((k = (M = w == null ? void 0 : w.default) == null ? void 0 : M.uiSchema) == null ? void 0 : k.title) || ((O = B.uiSchema) == null ? void 0 : O.title)
                     }),
                     type: (q = w == null ? void 0 : w.default) == null ? void 0 : q.type
                   }),
@@ -56046,7 +56052,7 @@ const isValidateEmpty = (e) => {
 };
 registerValidateRules({
   username(e) {
-    return /^[^@.<>"'/]{1,50}$/.test(e) || i18n.t(`Must be 1-50 characters in length (excluding @.<>"'/)`);
+    return /^[^@<>"'/]{1,50}$/.test(e) || i18n.t(`Must be 1-50 characters in length (excluding @<>"'/)`);
   },
   required(e, t) {
     return t.required === !1 ? "" : (typeof e == "string" && (e = e.trim()), isValidateEmpty(e) ? t.message : "");
@@ -63452,28 +63458,28 @@ const ActionInitializerItem = (e) => {
     ), I = C || (a == null ? void 0 : a.targetKey) || "id", R = b || ((U = (G = i["x-component-props"]) == null ? void 0 : G.fieldNames) == null ? void 0 : U.label) || I, T = {
       title: R || I,
       key: I
-    }, [D, $] = useState([]), [B, N] = useState(i.default || []), [j, w] = useState(!0), O = useLabelUiSchema(a, (T == null ? void 0 : T.title) || "label");
+    }, [D, $] = useState([]), [B, N] = 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), N(i.default);
       }, 100);
     }, [i.default, d]), !a)
       return null;
-    const M = (J) => {
-      $(J), w(!1);
-    }, k = (J) => {
-      N(J), d(J), p == null || p(J);
-    }, L = (J) => {
-      var X;
-      const W = (X = h == null ? void 0 : h[0]) == null ? void 0 : X.filter;
+    const M = (X) => {
+      $(X), w(!1);
+    }, k = (X) => {
+      N(X), d(X), p == null || p(X);
+    }, O = (X) => {
+      var J;
+      const W = (J = h == null ? void 0 : h[0]) == null ? void 0 : J.filter;
       (S || W) && g(P(x({}, h == null ? void 0 : h[0]), {
         filter: f
-      })), v(!S), J.stopPropagation();
-    }, q = (J) => {
-      J.stopPropagation();
-    }, E = (J) => {
-      m(J);
-    }, V = (K = i.title) != null ? K : (H = a == null ? void 0 : a.uiSchema) == null ? void 0 : H.title;
+      })), v(!S), X.stopPropagation();
+    }, q = (X) => {
+      X.stopPropagation();
+    }, V = (X) => {
+      m(X);
+    }, E = (K = i.title) != null ? K : (H = a == null ? void 0 : a.uiSchema) == null ? void 0 : H.title;
     return t(
       /* @__PURE__ */ jsxs(SortableItem, { className: cls(o, n, "nb-block-item", e.className, "SortableItem"), children: [
         /* @__PURE__ */ jsx(l, {}),
@@ -63490,7 +63496,7 @@ const ActionInitializerItem = (e) => {
                 },
                 gutter: 5,
                 children: [
-                  /* @__PURE__ */ jsx(Col, { title: c(V), className: "headerCol", children: S ? /* @__PURE__ */ jsx(
+                  /* @__PURE__ */ jsx(Col, { title: c(E), className: "headerCol", children: S ? /* @__PURE__ */ jsx(
                     Input$3,
                     {
                       bordered: !1,
@@ -63498,16 +63504,16 @@ const ActionInitializerItem = (e) => {
                       placeholder: "Search...",
                       className: "search",
                       onClick: q,
-                      onChange: E
+                      onChange: V
                     }
-                  ) : c(V) }),
+                  ) : c(E) }),
                   /* @__PURE__ */ jsx(
                     Col,
                     {
                       style: {
                         flex: "0 0 auto"
                       },
-                      children: S ? /* @__PURE__ */ jsx(CloseOutlined, { className: "CloseOutlined", onClick: L }) : /* @__PURE__ */ jsx(SearchOutlined, { className: "SearchOutlined", onClick: L })
+                      children: S ? /* @__PURE__ */ jsx(CloseOutlined, { className: "CloseOutlined", onClick: O }) : /* @__PURE__ */ jsx(SearchOutlined, { className: "SearchOutlined", onClick: O })
                     }
                   )
                 ]
@@ -63523,7 +63529,7 @@ const ActionInitializerItem = (e) => {
                 treeData: u,
                 onSelect: k,
                 fieldNames: T,
-                titleRender: (J) => /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: getLabelFormatValue(O, c(J[R])) }),
+                titleRender: (X) => /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: getLabelFormatValue(L, c(X[R])) }),
                 selectedKeys: B,
                 blockNode: !0
               }
@@ -63918,7 +63924,7 @@ function useMenuSearch({
   })) : g, [e, c, u, g]);
 }
 const DataBlockInitializer = (e) => {
-  var k, L;
+  var k, O;
   const {
     templateWrap: t,
     onCreateBlockSchema: o,
@@ -63947,14 +63953,14 @@ const DataBlockInitializer = (e) => {
         componentType: n,
         menuName: a
       });
-      const { item: E, fromOthersInPopup: V } = q;
+      const { item: V, fromOthersInPopup: E } = q;
       if (f)
         return f(q);
-      if (E.template) {
-        const G = yield R(E);
-        v(t ? t(G, { item: E, fromOthersInPopup: V }) : G);
+      if (V.template) {
+        const G = yield R(V);
+        v(t ? t(G, { item: V, fromOthersInPopup: E }) : G);
       } else
-        E.schemaInsertor ? yield E.schemaInsertor(v, { item: E, name: a, fromOthersInPopup: V }) : o && o({ item: E, fromOthersInPopup: V });
+        V.schemaInsertor ? yield V.schemaInsertor(v, { item: V, name: a, fromOthersInPopup: E }) : o && o({ item: V, fromOthersInPopup: E });
       F(!1);
     }),
     [
@@ -63982,21 +63988,21 @@ const DataBlockInitializer = (e) => {
     onClick: D,
     currentText: b,
     otherText: y
-  }), B = useGetSchemaInitializerMenuItems(D), N = useMemo(() => B($, a), [B, $, a]), [j, w] = useState([]), O = useMenuSearch({ data: N, openKeys: j, hideSearch: u }), M = useMemo(() => {
-    let q = O.filter((E) => E.key !== "search" && E.key !== "empty");
-    return p && q.length === 1 ? q = q[0].children : q = O, [
+  }), B = useGetSchemaInitializerMenuItems(D), N = useMemo(() => B($, a), [B, $, a]), [j, w] = useState([]), L = useMenuSearch({ data: N, openKeys: j, hideSearch: u }), M = useMemo(() => {
+    let q = L.filter((V) => V.key !== "search" && V.key !== "empty");
+    return p && q.length === 1 ? q = q[0].children : q = L, [
       {
         key: a,
         label: I(i),
         icon: typeof r == "string" ? /* @__PURE__ */ jsx(antIcons__default, { type: r }) : r,
-        onClick: (E) => {
-          E.key === a && D(P(x({}, E), { item: e }));
+        onClick: (V) => {
+          V.key === a && D(P(x({}, V), { item: e }));
         },
         children: q
       }
     ];
-  }, [O, p, a, I, i, r, D, e]);
-  return N.length > 1 || N.length === 1 && ((L = (k = N[0]) == null ? void 0 : k.children) == null ? void 0 : L.length) > 0 || S ? /* @__PURE__ */ jsx(
+  }, [L, p, a, I, i, r, D, e]);
+  return N.length > 1 || N.length === 1 && ((O = (k = N[0]) == null ? void 0 : k.children) == null ? void 0 : O.length) > 0 || S ? /* @__PURE__ */ jsx(
     SchemaInitializerMenu,
     {
       onOpenChange: (q) => {
@@ -68296,6 +68302,7 @@ export {
   GridRowContext,
   HTMLEncode,
   HeightMode,
+  ICON_POPUP_Z_INDEX,
   Icon,
   IconFieldInterface,
   IconPicker,