@nocobase/client 1.5.0-beta.13 → 1.5.0-beta.15

package/es/index.mjs

@@ -5811,24 +5811,24 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
     const D = {
       type: "duplicate",
       tag: c((z = T.uiSchema) == null ? void 0 : z.title) || T.name
-    }, N = P(x({}, D), {
+    }, $ = P(x({}, D), {
       role: "button",
       title: React.createElement(TreeNode, P(x({}, D), { displayType: t })),
       key: R ? `${R}.${T.name}` : T.name,
       isLeaf: !0,
       field: T
     });
-    return ["belongsTo", "belongsToMany"].includes(T.type) ? (D.type = "reference", N.type = "reference", N.title = React.createElement(TreeNode, P(x({}, D), { type: "reference", displayType: t })), N.isLeaf = !1, N.children = m(T.target, {
+    return ["belongsTo", "belongsToMany"].includes(T.type) ? (D.type = "reference", $.type = "reference", $.title = React.createElement(TreeNode, P(x({}, D), { type: "reference", displayType: t })), $.isLeaf = !1, $.children = m(T.target, {
       depth: F + 1,
       maxDepth: A,
-      prefix: N.key,
+      prefix: $.key,
       exclude: systemKeys
-    })) : ["hasOne", "hasMany"].includes(T.type) && (N.isLeaf = !1, N.children = p(T.target, {
+    })) : ["hasOne", "hasMany"].includes(T.type) && ($.isLeaf = !1, $.children = p(T.target, {
       depth: F + 1,
       maxDepth: A,
-      prefix: N.key,
+      prefix: $.key,
       exclude: ["id", ...systemKeys]
-    })), N;
+    })), $;
   }).filter(Boolean), m = (y, { prefix: v, maxDepth: F, depth: A = 0, exclude: R = [] }) => A > F ? [] : o(y).map((T) => {
     var z;
     if (!T.target || !T.interface || R.includes(T.name))
@@ -5836,15 +5836,15 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
     const D = {
       type: "preloading",
       tag: c((z = T.uiSchema) == null ? void 0 : z.title) || T.name
-    }, N = v ? `${v}.${T.name}` : T.name;
+    }, $ = v ? `${v}.${T.name}` : T.name;
     return {
       role: "button",
       title: React.createElement(TreeNode, P(x({}, D), { displayType: t })),
-      key: N,
+      key: $,
       isLeaf: !1,
       field: T,
       children: m(T.target, {
-        prefix: N,
+        prefix: $,
         depth: A + 1,
         maxDepth: F,
         exclude: R
@@ -5863,8 +5863,8 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
       return h(F || R.treeData);
     try {
       return p(y, { exclude: ["id", ...systemKeys], maxDepth: 1 });
-    } catch (N) {
-      return console.error(N), [];
+    } catch ($) {
+      return console.error($), [];
     }
   }, []), f = useCallback((y) => (v) => new Promise((F) => {
     if (v.children.length)
@@ -5882,17 +5882,17 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
     getOnCheck: C,
     getScopeDataSource: (y) => {
       const v = o(y), F = (T, D) => {
-        var M, B;
+        var M, N;
         if (!T.interface)
           return;
-        const N = a(T.interface);
-        if (!(N != null && N.filterable))
+        const $ = a(T.interface);
+        if (!($ != null && $.filterable))
           return;
-        const { nested: z, children: L, operators: $ } = N.filterable, w = {
+        const { nested: z, children: L, operators: B } = $.filterable, w = {
           name: T.name,
           title: ((M = T == null ? void 0 : T.uiSchema) == null ? void 0 : M.title) || T.name,
           schema: T == null ? void 0 : T.uiSchema,
-          operators: ((B = $ == null ? void 0 : $.filter) == null ? void 0 : B.call($, (k) => !(k != null && k.visible) || k.visible(T))) || [],
+          operators: ((N = B == null ? void 0 : B.filter) == null ? void 0 : N.call(B, (k) => !(k != null && k.visible) || k.visible(T))) || [],
           interface: T.interface
         };
         if (!(T.target && D > 2)) {
@@ -5905,11 +5905,11 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
           return w;
         }
       }, A = (T, D) => {
-        const N = [];
+        const $ = [];
         return T.forEach((z) => {
           const L = F(z, D);
-          L && N.push(L);
-        }), N;
+          L && $.push(L);
+        }), $;
       };
       return A(v, 1);
     },
@@ -8996,15 +8996,15 @@ function withInitializer(e) {
           S ? S(y(M, { isInSubTable: i })) : r(d, y(M, { isInSubTable: i }), { onSuccess: p });
         },
         [S, y, i, r, d, p]
-      ), { wrapSSR: F, hashId: A, componentCls: R } = useSchemaInitializerStyles(), [T, D] = useState(!1), { token: N } = theme$1.useToken(), z = useNiceDropdownMaxHeight([T]), L = useMemo(
+      ), { wrapSSR: F, hashId: A, componentCls: R } = useSchemaInitializerStyles(), [T, D] = useState(!1), { token: $ } = theme$1.useToken(), z = useNiceDropdownMaxHeight([T]), L = useMemo(
         () => x({
           options: n,
           style: C
         }, b),
         [b, n, C]
-      ), $ = useMemo(() => css`
+      ), B = useMemo(() => css`
           .ant-popover-inner {
-            padding: ${`${N.paddingXXS}px 0`};
+            padding: ${`${$.paddingXXS}px 0`};
             .ant-menu-submenu-title {
               margin-block: 0;
             }
@@ -9012,7 +9012,7 @@ function withInitializer(e) {
               padding: 0;
             }
           }
-        `, [N.paddingXXS]), w = useMemo(
+        `, [$.paddingXXS]), w = useMemo(
         () => ({
           maxHeight: z,
           overflowY: "auto"
@@ -9034,7 +9034,7 @@ function withInitializer(e) {
               placement: "bottomLeft"
             }, h), {
               arrow: !1,
-              overlayClassName: $,
+              overlayClassName: B,
               open: T,
               onOpenChange: D,
               content: F(
@@ -9044,10 +9044,10 @@ function withInitializer(e) {
                     theme: {
                       components: {
                         Menu: {
-                          itemHeight: N.marginXL,
-                          borderRadius: N.borderRadiusSM,
-                          itemBorderRadius: N.borderRadiusSM,
-                          subMenuItemBorderRadius: N.borderRadiusSM
+                          itemHeight: $.marginXL,
+                          borderRadius: $.borderRadiusSM,
+                          itemBorderRadius: $.borderRadiusSM,
+                          subMenuItemBorderRadius: $.borderRadiusSM
                         }
                       }
                     },
@@ -10086,11 +10086,11 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
       }
     `, [n.paddingContentVerticalLG, n.marginSM, n.margin]), b = useCollection(), S = useMemo(
     () => u == null ? void 0 : u.map((v) => {
-      var z, L, $;
+      var z, L, B;
       const F = v.reduceProperties((w, M) => {
         if (isCollectionFieldComponent(M))
           return w.concat([M]);
-      }, []), A = (F == null ? void 0 : F.length) > 0 ? F[0].name : v.name, R = !!((z = v["x-component-props"]) != null && z.columnHidden), { uiSchema: T, defaultValue: D, interface: N } = (b == null ? void 0 : b.getField(A)) || {};
+      }, []), A = (F == null ? void 0 : F.length) > 0 ? F[0].name : v.name, R = !!((z = v["x-component-props"]) != null && z.columnHidden), { uiSchema: T, defaultValue: D, interface: $ } = (b == null ? void 0 : b.getField(A)) || {};
       return T && (T.default = D), P(x({
         title: /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: h, children: /* @__PURE__ */ jsx(
           NocoBaseRecursionField,
@@ -10106,11 +10106,11 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
         sorter: (L = v["x-component-props"]) == null ? void 0 : L.sorter,
         columnHidden: R
       }, v["x-component-props"]), {
-        width: R && !a ? 0 : (($ = v["x-component-props"]) == null ? void 0 : $.width) || 100,
-        render: (w, M, B) => {
+        width: R && !a ? 0 : ((B = v["x-component-props"]) == null ? void 0 : B.width) || 100,
+        render: (w, M, N) => {
           var j, O;
           const { enableLink: k } = Object.values(v.properties)[0]["x-component-props"] || {};
-          return !k && ["sequence", "input", "textarea", "phone", "email"].includes(N) ? /* @__PURE__ */ jsx(
+          return !k && ["sequence", "input", "textarea", "phone", "email"].includes($) ? /* @__PURE__ */ jsx(
             RenderTextInCell,
             {
               value: g(w || _.get(M, Object.keys(v.properties)[0])),
@@ -10125,7 +10125,7 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
               filterProperties: f,
               schemaToolbarBigger: C,
               field: o,
-              index: B
+              index: N
             }
           ) });
         },
@@ -10246,7 +10246,7 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
             display: none !important;
           }
         `,
-      itemRender: (D, N, z) => N === "prev" ? /* @__PURE__ */ jsxs(
+      itemRender: (D, $, z) => $ === "prev" ? /* @__PURE__ */ jsxs(
         "div",
         {
           style: { display: "flex" },
@@ -10492,8 +10492,8 @@ const Table$2 = withDynamicSchemaProps(
         "loading",
         "onClickRow",
         "value"
-      ]), y = useArrayField$1(S), v = useFieldSchema(), { size: F = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, A = useCollection(), T = ((ce = v == null ? void 0 : v.parent) == null ? void 0 : ce["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: N } = T, z = useMemoizedFn(S.onRowDragEnd || (() => {
-      })), L = usePaginationProps$3(n, i, e), $ = useTableColumns$2(S, L), [w, M] = useState(() => D ? N : []), [B, k] = useState(((Ce = y == null ? void 0 : y.data) == null ? void 0 : Ce.selectedRowKeys) || []), [j, O] = useState([]), q = (p == null ? void 0 : p.type) !== "none", E = useRef(/* @__PURE__ */ new Map()), U = useMemo(() => css`
+      ]), y = useArrayField$1(S), v = useFieldSchema(), { size: F = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, A = useCollection(), T = ((ce = v == null ? void 0 : v.parent) == null ? void 0 : ce["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: $ } = T, z = useMemoizedFn(S.onRowDragEnd || (() => {
+      })), L = usePaginationProps$3(n, i, e), B = useTableColumns$2(S, L), [w, M] = useState(() => D ? $ : []), [N, k] = useState(((Ce = y == null ? void 0 : y.data) == null ? void 0 : Ce.selectedRowKeys) || []), [j, O] = useState([]), q = (p == null ? void 0 : p.type) !== "none", E = useRef(/* @__PURE__ */ new Map()), U = useMemo(() => css`
           & > td {
             background-color: ${t.controlItemBgActive} !important;
           }
@@ -10511,9 +10511,9 @@ const Table$2 = withDynamicSchemaProps(
         record: re
       }), [C, j]);
       useDeepCompareEffect(() => {
-        const re = D ? N : [];
+        const re = D ? $ : [];
         _.isEqual(re, w) || M(re);
-      }, [D, N]);
+      }, [D, $]);
       const W = useCallback((re) => {
         if (m)
           return X(re);
@@ -10559,7 +10559,7 @@ const Table$2 = withDynamicSchemaProps(
         () => ({
           rowSelection: ee ? x({
             type: "checkbox",
-            selectedRowKeys: B,
+            selectedRowKeys: N,
             onChange(re, Z) {
               y.data = y.data || {}, y.data.selectedRowKeys = re, y.data.selectedRowData = Z, k(re), u == null || u(re, Z);
             },
@@ -10604,7 +10604,7 @@ const Table$2 = withDynamicSchemaProps(
         }),
         [
           ee,
-          B,
+          N,
           u,
           c,
           l,
@@ -10661,7 +10661,7 @@ const Table$2 = withDynamicSchemaProps(
             onRow: H,
             rowClassName: xe,
             scroll: ue,
-            columns: $,
+            columns: B,
             expandable: fe,
             field: y,
             size: F
@@ -10874,12 +10874,12 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
     ({
       tabKey: w,
       popupUid: M,
-      recordData: B,
+      recordData: N,
       sourceId: k,
       collection: j,
       puid: O
     }) => {
-      const q = c.getFilterByTK(u || l, B);
+      const q = c.getFilterByTK(u || l, N);
       return getPopupPathFromParams({
         popupuid: M,
         puid: O,
@@ -10901,7 +10901,7 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
     ({
       recordData: w,
       parentRecordData: M,
-      collectionNameUsedInURL: B,
+      collectionNameUsedInURL: N,
       popupUidUsedInURL: k,
       customActionSchema: j
     } = {}) => {
@@ -10913,7 +10913,7 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
         popupUid: q,
         recordData: w,
         sourceId: E,
-        collection: B,
+        collection: N,
         puid: k
       });
       let G = n.pathname;
@@ -10957,27 +10957,27 @@ ${JSON.stringify(O, null, 2)}`
       F,
       h
     ]
-  ), N = useCallback(() => {
+  ), $ = useCallback(() => {
     if (!f())
       return A == null ? void 0 : A(!1);
     t(withSearchParams(removeLastPopupPath(n.pathname)), { replace: !0 }), removePopupLayerState(h);
   }, [f, A, t, n == null ? void 0 : n.pathname, h]), z = useCallback(
     (w) => {
-      const M = y(), B = R({
+      const M = y(), N = R({
         tabKey: w,
         popupUid: m == null ? void 0 : m.popupuid,
         recordData: i == null ? void 0 : i.data,
         sourceId: M
       });
       let k = removeLastPopupPath(n.pathname);
-      _.last(k) === "/" && (k = k.slice(0, -1)), t(`${k}${B}`, {
+      _.last(k) === "/" && (k = k.slice(0, -1)), t(`${k}${N}`, {
         replace: !0
       });
     },
     [R, t, m == null ? void 0 : m.popupuid, i == null ? void 0 : i.data, n]
   ), L = useCallback((w, M) => {
     M.__popup = w;
-  }, []), $ = useCallback((w) => w.__popup, []);
+  }, []), B = useCallback((w) => w.__popup, []);
   return {
     /**
      * used to open popup by changing the url
@@ -10986,9 +10986,9 @@ ${JSON.stringify(O, null, 2)}`
     /**
      * used to close popup by changing the url
      */
-    closePopup: N,
+    closePopup: $,
     savePopupSchemaToSchema: L,
-    getPopupSchemaFromSchema: $,
+    getPopupSchemaFromSchema: B,
     context: S,
     /**
      * @deprecated
@@ -12034,24 +12034,24 @@ const breakRemoveOnGrid = (e) => e["x-component"] === "Grid", breakRemoveOnRow =
       if (!r || !S)
         return;
       n.current = T.active.id;
-      const D = l.current, N = D.previousElementSibling, z = D.nextElementSibling;
-      v([N.clientWidth, z.clientWidth]);
+      const D = l.current, $ = D.previousElementSibling, z = D.nextElementSibling;
+      v([$.clientWidth, z.clientWidth]);
     },
     onDragMove(T) {
       if (!r || !S)
         return;
       n.current === T.active.id && (n.current = n.current + "_move");
-      const D = l.current, N = D.previousElementSibling, z = D.nextElementSibling;
-      N.style.width = `${y[0] + T.delta.x}px`, z.style.width = `${y[1] - T.delta.x}px`;
+      const D = l.current, $ = D.previousElementSibling, z = D.nextElementSibling;
+      $.style.width = `${y[0] + T.delta.x}px`, z.style.width = `${y[1] - T.delta.x}px`;
     },
     onDragEnd(T) {
       var M;
       if (!r || !n.current || (M = n.current) != null && M.startsWith(T.active.id) && !n.current.endsWith("_move") || y[0] <= 0 || y[1] <= 0 || (v([0, 0]), !h || !g))
         return;
-      const D = l.current, N = D.previousElementSibling, z = D.nextElementSibling;
+      const D = l.current, $ = D.previousElementSibling, z = D.nextElementSibling;
       h["x-component-props"] = h["x-component-props"] || {}, g["x-component-props"] = g["x-component-props"] || {};
-      const L = D.clientWidth * (e.cols.length + 1) / e.cols.length, $ = (100 * (N.getBoundingClientRect().width + L) / D.parentElement.clientWidth).toFixed(2), w = (100 * (z.getBoundingClientRect().width + L) / D.parentElement.clientWidth).toFixed(2);
-      _.set(h, "x-component-props.width", $), _.set(g, "x-component-props.width", w), o.emit("batchPatch", {
+      const L = D.clientWidth * (e.cols.length + 1) / e.cols.length, B = (100 * ($.getBoundingClientRect().width + L) / D.parentElement.clientWidth).toFixed(2), w = (100 * (z.getBoundingClientRect().width + L) / D.parentElement.clientWidth).toFixed(2);
+      _.set(h, "x-component-props.width", B), _.set(g, "x-component-props.width", w), o.emit("batchPatch", {
         schemas: [
           {
             "x-uid": h["x-uid"],
@@ -12362,8 +12362,8 @@ const useTableBlockProps = () => {
     ),
     onChange: useCallback(
       ({ current: S, pageSize: y }, v, F) => {
-        var N, z, L, $, w, M, B, k, j, O;
-        const A = (L = (z = (N = t.parent) == null ? void 0 : N["x-decorator-props"]) == null ? void 0 : z.params) == null ? void 0 : L.sort, R = F.order ? F.order === "ascend" ? [F.field] : [`-${F.field}`] : A || i.dragSortBy, T = y || ((M = (w = ($ = t.parent) == null ? void 0 : $["x-decorator-props"]) == null ? void 0 : w.params) == null ? void 0 : M.pageSize), D = P(x({}, (j = (k = (B = a.current) == null ? void 0 : B.service) == null ? void 0 : k.params) == null ? void 0 : j[0]), { page: S || 1, pageSize: T });
+        var $, z, L, B, w, M, N, k, j, O;
+        const A = (L = (z = ($ = t.parent) == null ? void 0 : $["x-decorator-props"]) == null ? void 0 : z.params) == null ? void 0 : L.sort, R = F.order ? F.order === "ascend" ? [F.field] : [`-${F.field}`] : A || i.dragSortBy, T = y || ((M = (w = (B = t.parent) == null ? void 0 : B["x-decorator-props"]) == null ? void 0 : w.params) == null ? void 0 : M.pageSize), D = P(x({}, (j = (k = (N = a.current) == null ? void 0 : N.service) == null ? void 0 : k.params) == null ? void 0 : j[0]), { page: S || 1, pageSize: T });
         R && (D.sort = R), (O = a.current) == null || O.service.run(D);
       },
       [t.parent]
@@ -12371,17 +12371,17 @@ const useTableBlockProps = () => {
     onClickRow: useCallback(
       (S, y, v) => {
         const { targets: F, uid: A } = findFilterTargets(t), R = r();
-        if (!F || !F.some((D) => R.some((N) => N.uid === D.uid))) {
+        if (!F || !F.some((D) => R.some(($) => $.uid === D.uid))) {
           y((D) => D.length ? [] : D);
           return;
         }
         const T = R.find((D) => D.uid === t.parent["x-uid"]);
         R.forEach((D) => {
-          var B, k, j;
-          const N = F.find((O) => O.uid === D.uid);
-          if (!N)
+          var N, k, j;
+          const $ = F.find((O) => O.uid === D.uid);
+          if (!$)
             return;
-          const z = getSourceKey(T, N.field) || i.rowKey || "id", L = [S[z]], $ = ((B = D.service.params) == null ? void 0 : B[0]) || {}, w = ((j = (k = D.service.params) == null ? void 0 : k[1]) == null ? void 0 : j.filters) || {};
+          const z = getSourceKey(T, $.field) || i.rowKey || "id", L = [S[z]], B = ((N = D.service.params) == null ? void 0 : N[0]) || {}, w = ((j = (k = D.service.params) == null ? void 0 : k[1]) == null ? void 0 : j.filters) || {};
           if (v.includes(S[i.rowKey])) {
             if (D.dataLoadingMode === "manual")
               return D.clearData();
@@ -12390,8 +12390,8 @@ const useTableBlockProps = () => {
             w[A] = {
               $and: [
                 {
-                  [N.field || i.rowKey]: {
-                    [N.field ? "$in" : "$eq"]: L
+                  [$.field || i.rowKey]: {
+                    [$.field ? "$in" : "$eq"]: L
                   }
                 }
               ]
@@ -12401,7 +12401,7 @@ const useTableBlockProps = () => {
             D.defaultFilter
           ]);
           return D.doFilter(
-            P(x({}, $), {
+            P(x({}, B), {
               page: 1,
               filter: M
             }),
@@ -12768,10 +12768,10 @@ const useTableSelectorParams = () => useContext(TableSelectorParamsContext), Tab
   var a, l, c, u, d, p, m, h, g, f, C, b, S, y, v, F;
   const e = useField(), t = useTableSelectorContext(), n = useFieldSchema(), { getCollectionJoinField: o } = useCollectionManager_deprecated(), r = recursiveParent$1(n, "CollectionField"), i = o(r == null ? void 0 : r["x-collection-field"]);
   return useEffect(() => {
-    var R, T, D, N, z, L, $, w, M, B, k, j, O;
+    var R, T, D, $, z, L, B, w, M, N, k, j, O;
     if (!((R = t == null ? void 0 : t.service) != null && R.loading)) {
       const q = (D = (T = t == null ? void 0 : t.service) == null ? void 0 : T.data) == null ? void 0 : D.data.map((E) => E);
-      e.value = q, (N = e == null ? void 0 : e.setInitialValue) == null || N.call(e, q), e.data = e.data || {}, e.data.selectedRowKeys = [], e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = ($ = (L = (z = t == null ? void 0 : t.service) == null ? void 0 : z.data) == null ? void 0 : L.meta) == null ? void 0 : $.pageSize, e.componentProps.pagination.total = (B = (M = (w = t == null ? void 0 : t.service) == null ? void 0 : w.data) == null ? void 0 : M.meta) == null ? void 0 : B.count, e.componentProps.pagination.current = (O = (j = (k = t == null ? void 0 : t.service) == null ? void 0 : k.data) == null ? void 0 : j.meta) == null ? void 0 : O.page;
+      e.value = q, ($ = e == null ? void 0 : e.setInitialValue) == null || $.call(e, q), e.data = e.data || {}, e.data.selectedRowKeys = [], e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (B = (L = (z = t == null ? void 0 : t.service) == null ? void 0 : z.data) == null ? void 0 : L.meta) == null ? void 0 : B.pageSize, e.componentProps.pagination.total = (N = (M = (w = t == null ? void 0 : t.service) == null ? void 0 : w.data) == null ? void 0 : M.meta) == null ? void 0 : N.count, e.componentProps.pagination.current = (O = (j = (k = t == null ? void 0 : t.service) == null ? void 0 : k.data) == null ? void 0 : j.meta) == null ? void 0 : O.page;
     }
   }, [
     i == null ? void 0 : i.foreignKey,
@@ -13542,8 +13542,8 @@ const useFormItemInitializerFields = (e) => {
       Component: "CollectionFieldInitializer",
       remove: removeGridFormItem,
       schemaInitialize: (D) => {
-        var N;
-        (N = h == null ? void 0 : h.schemaInitialize) == null || N.call(h, D, {
+        var $;
+        ($ = h == null ? void 0 : h.schemaInitialize) == null || $.call(h, D, {
           field: m,
           block: l,
           readPretty: a,
@@ -13553,9 +13553,9 @@ const useFormItemInitializerFields = (e) => {
       },
       schema: S
     };
-    return l == "Kanban" && (y.find = (D, N, z) => {
+    return l == "Kanban" && (y.find = (D, $, z) => {
       const L = findSchema(D, "x-component", l);
-      return findSchema(L, N, z);
+      return findSchema(L, $, z);
     }), y;
   });
 }, useFilterFormItemInitializerFields = (e) => {
@@ -13918,8 +13918,8 @@ const useFormItemInitializerFields = (e) => {
         t: h,
         componentNamePrefix: m
       }).sort((D) => {
-        const N = _.toArray((C == null ? void 0 : C.inherits) || []);
-        if (D.name === (C == null ? void 0 : C.name) || N.some((z) => z === D.name))
+        const $ = _.toArray((C == null ? void 0 : C.inherits) || []);
+        if (D.name === (C == null ? void 0 : C.name) || $.some((z) => z === D.name))
           return -1;
       })
     ]
@@ -13981,33 +13981,33 @@ const useFormItemInitializerFields = (e) => {
         hideChildrenIfSingleCollection: !1,
         fromOthersInPopup: !0,
         componentType: T[t] || t,
-        filter({ collection: $, associationField: w }) {
-          return u ? u($) : !0;
+        filter({ collection: B, associationField: w }) {
+          return u ? u(B) : !0;
         },
-        onClick($) {
-          c(P(x({}, $), { fromOthersInPopup: !0 }));
+        onClick(B) {
+          c(P(x({}, B), { fromOthersInPopup: !0 }));
         }
       })
     };
-    let N;
+    let $;
     const z = b.length ? R : null;
     if (F[0].children.length && b.length)
-      l ? N = [A, z] : N = [A, z, D];
+      l ? $ = [A, z] : $ = [A, z, D];
     else if (F[0].children.length)
       if (l) {
         if (F[0].children.length <= 1)
           return F[0].children = ((L = F[0].children[0]) == null ? void 0 : L.children) || [], F;
-        N = [A];
+        $ = [A];
       } else
-        N = [A, D];
+        $ = [A, D];
     else
-      l ? N = [z] : N = [z, D];
+      l ? $ = [z] : $ = [z, D];
     return [
       {
         name: "records",
         label: h("Records"),
         type: "subMenu",
-        children: N.filter(Boolean)
+        children: $.filter(Boolean)
       }
     ];
   }, [
@@ -14722,7 +14722,7 @@ const useGetAriaLabelOfDesigner = () => {
     display: block !important;
   }
 `, GeneralSchemaDesigner = (e) => {
-  var N, z;
+  var $, z;
   const t = useFieldSchema(), {
     disableInitializer: n,
     title: o,
@@ -14743,16 +14743,16 @@ const useGetAriaLabelOfDesigner = () => {
     return {
       insertPosition: "afterEnd",
       wrap: ((L = S == null ? void 0 : S.cols) == null ? void 0 : L.length) > 1 ? void 0 : gridRowColWrap,
-      Component: ($) => /* @__PURE__ */ jsx(
+      Component: (B) => /* @__PURE__ */ jsx(
         PlusOutlined,
-        P(x({}, $), {
+        P(x({}, B), {
           role: "button",
           "aria-label": g("schema-initializer"),
           style: { cursor: "pointer", fontSize: 14 }
         })
       )
     };
-  }, [g, (N = S == null ? void 0 : S.cols) == null ? void 0 : N.length]);
+  }, [g, ($ = S == null ? void 0 : S.cols) == null ? void 0 : $.length]);
   return d ? /* @__PURE__ */ jsx(SchemaToolbarProvider, P(x({}, a), { children: /* @__PURE__ */ jsxs("div", { className: cls("general-schema-designer", overrideAntdCSS), children: [
     o && /* @__PURE__ */ jsx("div", { className: cls("general-schema-designer-title", titleCss), children: /* @__PURE__ */ jsxs(Space$1, { size: 2, children: [
       /* @__PURE__ */ jsx("span", { className: "title-tag", children: c && R ? `${h(R == null ? void 0 : R.displayName)} > ${h(o)}` : h(o) }),
@@ -14806,13 +14806,13 @@ const useGetAriaLabelOfDesigner = () => {
       if (Array.isArray(n))
         return g(n);
     }
-  }, [n]), { render: N, exists: z } = useSchemaSettingsRender(
+  }, [n]), { render: $, exists: z } = useSchemaSettingsRender(
     r || (t == null ? void 0 : t["x-settings"]),
     t == null ? void 0 : t["x-settings-props"]
-  ), { render: L, exists: $ } = useSchemaInitializerRender(
+  ), { render: L, exists: B } = useSchemaInitializerRender(
     o || (t == null ? void 0 : t["x-initializer"]),
     t == null ? void 0 : t["x-initializer-props"]
-  ), w = useGridRowContext(), M = useGridContext(), B = useMemo(() => {
+  ), w = useGridRowContext(), M = useGridContext(), N = useMemo(() => {
     var H;
     return {
       insertPosition: "afterEnd",
@@ -14830,11 +14830,11 @@ const useGetAriaLabelOfDesigner = () => {
     var H;
     if (o === !1)
       return null;
-    if ($)
-      return L(B);
+    if (B)
+      return L(N);
     if (M != null && M.InitializerComponent || M != null && M.renderSchemaInitializer)
-      return M != null && M.InitializerComponent ? /* @__PURE__ */ jsx(M.InitializerComponent, x({}, B)) : (H = M.renderSchemaInitializer) == null ? void 0 : H.call(M, B);
-  }, [M, o, B, $, L]), O = useMemo(() => r !== !1 && z ? N() : null, [z, N, r]), q = useRef(null), E = "hidden";
+      return M != null && M.InitializerComponent ? /* @__PURE__ */ jsx(M.InitializerComponent, x({}, N)) : (H = M.renderSchemaInitializer) == null ? void 0 : H.call(M, N);
+  }, [M, o, N, B, L]), O = useMemo(() => r !== !1 && z ? $() : null, [z, $, r]), q = useRef(null), E = "hidden";
   useEffect(() => {
     const H = q.current;
     let W = H == null ? void 0 : H.parentElement;
@@ -16318,21 +16318,21 @@ const ActionLink = withDynamicSchemaProps(
       "onMouseEnter",
       "refreshDataBlockRequest",
       "confirmTitle"
-    ]), v = useDesigner(), F = useField(), A = useFieldSchema(), R = useCompile(), T = useCollectionRecordData(), D = R((U = A["x-component-props"]) == null ? void 0 : U.confirm) || g, N = useMemo(() => (A == null ? void 0 : A["x-linkage-rules"]) || [], [A == null ? void 0 : A["x-linkage-rules"]]), { designable: z } = useDesignable(), L = useComponent(o) || o, $ = useVariables$1(), w = useLocalVariables$1({ currentForm: { values: T, readPretty: !1 } }), { visibleWithURL: M, setVisibleWithURL: B } = usePopupUtils(), { setSubmitted: k } = useActionContext(), { getAriaLabel: j } = useGetAriaLabelOfAction(l), O = useCollectionParentRecordData();
+    ]), v = useDesigner(), F = useField(), A = useFieldSchema(), R = useCompile(), T = useCollectionRecordData(), D = R((U = A["x-component-props"]) == null ? void 0 : U.confirm) || g, $ = useMemo(() => (A == null ? void 0 : A["x-linkage-rules"]) || [], [A == null ? void 0 : A["x-linkage-rules"]]), { designable: z } = useDesignable(), L = useComponent(o) || o, B = useVariables$1(), w = useLocalVariables$1({ currentForm: { values: T, readPretty: !1 } }), { visibleWithURL: M, setVisibleWithURL: N } = usePopupUtils(), { setSubmitted: k } = useActionContext(), { getAriaLabel: j } = useGetAriaLabelOfAction(l), O = useCollectionParentRecordData();
     useEffect(() => {
-      F.stateOfLinkageRules && setInitialActionState(F), F.stateOfLinkageRules = {}, N.filter((G) => !G.disabled).forEach((G) => {
+      F.stateOfLinkageRules && setInitialActionState(F), F.stateOfLinkageRules = {}, $.filter((G) => !G.disabled).forEach((G) => {
         var H;
         (H = G.actions) == null || H.forEach((W) => {
           linkageAction({
             operator: W.operator,
             field: F,
             condition: G.condition,
-            variables: $,
+            variables: B,
             localVariables: w
           });
         });
       });
-    }, [F, N, w, $]);
+    }, [F, $, w, B]);
     const q = useCallback(
       (G) => {
         C == null || C(G);
@@ -16364,7 +16364,7 @@ const ActionLink = withDynamicSchemaProps(
         propsDisabled: m,
         useAction: r,
         visibleWithURL: M,
-        setVisibleWithURL: B,
+        setVisibleWithURL: N,
         setSubmitted: k,
         getAriaLabel: j,
         parentRecordData: O,
@@ -16400,10 +16400,10 @@ const ActionLink = withDynamicSchemaProps(
     actionCallback: R,
     visibleWithURL: T,
     setVisibleWithURL: D,
-    setSubmitted: N,
+    setSubmitted: $,
     getAriaLabel: z,
     parentRecordData: L
-  } = xe, $ = K(xe, [
+  } = xe, B = K(xe, [
     "containerRefKey",
     "fieldSchema",
     "designable",
@@ -16431,7 +16431,7 @@ const ActionLink = withDynamicSchemaProps(
     "setSubmitted",
     "getAriaLabel",
     "parentRecordData"
-  ]), [w, M] = useState(!1), { wrapSSR: B, componentCls: k, hashId: j } = useStyles$e(), [O, q] = useState(!1), E = o["x-toolbar-props"] || o["x-designer-props"], U = (pe = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : pe.openMode, G = (fe = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : fe.openSize, H = (me = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : me.refreshDataBlockRequest, { modal: W } = App.useApp(), X = useForm(), Y = useACLActionParamsContext(), { run: J, element: Q, disabled: ee } = (A == null ? void 0 : A(R)) || {}, oe = X.disabled || i.disabled || ((he = i.data) == null ? void 0 : he.disabled) || F || ee, te = useMemo(() => {
+  ]), [w, M] = useState(!1), { wrapSSR: N, componentCls: k, hashId: j } = useStyles$e(), [O, q] = useState(!1), E = o["x-toolbar-props"] || o["x-designer-props"], U = (pe = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : pe.openMode, G = (fe = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : fe.openSize, H = (me = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : me.refreshDataBlockRequest, { modal: W } = App.useApp(), X = useForm(), Y = useACLActionParamsContext(), { run: J, element: Q, disabled: ee } = (A == null ? void 0 : A(R)) || {}, oe = X.disabled || i.disabled || ((he = i.data) == null ? void 0 : he.disabled) || F || ee, te = useMemo(() => {
     var ce;
     return P(x({}, v), {
       opacity: r && (((ce = i == null ? void 0 : i.data) == null ? void 0 : ce.hidden) || !Y) && 0.1,
@@ -16451,7 +16451,7 @@ const ActionLink = withDynamicSchemaProps(
     componentCls: k,
     hashId: j,
     className: d,
-    others: $,
+    others: B,
     getAriaLabel: z,
     type: p,
     Designer: m,
@@ -16462,7 +16462,7 @@ const ActionLink = withDynamicSchemaProps(
     run: J,
     confirm: g,
     modal: W,
-    setSubmitted: N,
+    setSubmitted: $,
     confirmTitle: f,
     title: y
   }, ae = useCallback(
@@ -16483,7 +16483,7 @@ const ActionLink = withDynamicSchemaProps(
       openSize: G,
       containerRefKey: n,
       fieldSchema: o,
-      setSubmitted: N,
+      setSubmitted: $,
       children: [
         C && /* @__PURE__ */ jsx(NocoBaseRecursionField, { basePath: i.address, onlyRenderProperties: !0, schema: o }),
         !C && /* @__PURE__ */ jsx(RenderButton, x({}, ie)),
@@ -16492,7 +16492,7 @@ const ActionLink = withDynamicSchemaProps(
       ]
     }
   ) });
-  return isBulkEditAction(o) && (ue = /* @__PURE__ */ jsx(TabsContextProvider, { children: ue })), B(
+  return isBulkEditAction(o) && (ue = /* @__PURE__ */ jsx(TabsContextProvider, { children: ue })), N(
     b ? /* @__PURE__ */ jsx(RecordProvider, { record: null, parent: L, children: /* @__PURE__ */ jsx(TreeRecordProvider, { parent: S, children: ue }) }) : ue
   );
 });
@@ -16562,22 +16562,22 @@ const RenderButton = ({
   modal: R,
   setSubmitted: T,
   confirmTitle: D,
-  title: N
+  title: $
 }) => {
-  const { getDataBlockRequest: z } = useDataBlockRequestGetter(), { t: L } = useTranslation(), { isPopupVisibleControlledByURL: $ } = usePopupSettings(), { openPopup: w } = usePopupUtils(), M = useRef(null);
+  const { getDataBlockRequest: z } = useDataBlockRequestGetter(), { t: L } = useTranslation(), { isPopupVisibleControlledByURL: B } = usePopupSettings(), { openPopup: w } = usePopupUtils(), M = useRef(null);
   M.current = w;
-  const B = useCallback(
+  const N = useCallback(
     (k, j = !0) => {
       if (!(j && isPortalInBody(k.target)) && (k.preventDefault(), k.stopPropagation(), !i && n)) {
         const O = () => {
           b ? b(k, () => {
             var q, E;
             S !== !1 && (T == null || T(!0), (E = (q = z()) == null ? void 0 : q.refresh) == null || E.call(q));
-          }) : isBulkEditAction(y) || !$() ? (v(!0), F == null || F()) : ["view", "update", "create", "customize:popup"].includes(y["x-action"]) && y["x-uid"] ? M.current() : (v(!0), F == null || F());
+          }) : isBulkEditAction(y) || !B() ? (v(!0), F == null || F()) : ["view", "update", "create", "customize:popup"].includes(y["x-action"]) && y["x-uid"] ? M.current() : (v(!0), F == null || F());
         };
         (A == null ? void 0 : A.enable) !== !1 && (A != null && A.content) ? R.confirm({
-          title: L(A.title, { title: D || N || (t == null ? void 0 : t.title) }),
-          content: L(A.content, { title: D || N || (t == null ? void 0 : t.title) }),
+          title: L(A.title, { title: D || $ || (t == null ? void 0 : t.title) }),
+          content: L(A.content, { title: D || $ || (t == null ? void 0 : t.title) }),
           onOk: O
         }) : O();
       }
@@ -16591,7 +16591,7 @@ const RenderButton = ({
       i,
       t,
       y,
-      $,
+      B,
       R,
       b,
       S,
@@ -16599,7 +16599,7 @@ const RenderButton = ({
       T,
       v,
       L,
-      N,
+      $,
       z
     ]
   );
@@ -16615,7 +16615,7 @@ const RenderButton = ({
       buttonStyle: a,
       handleMouseEnter: l,
       getAriaLabel: g,
-      handleButtonClick: B,
+      handleButtonClick: N,
       tarComponent: c,
       componentCls: d,
       hashId: p,
@@ -16623,7 +16623,7 @@ const RenderButton = ({
       type: f,
       Designer: C,
       designerProps: u,
-      title: N
+      title: $
     }, h)
   );
 };
@@ -17732,7 +17732,7 @@ https://requirejs.org/docs/errors.html#` + e);
         };
       }
     };
-    function N(k) {
+    function $(k) {
       delete l[k], delete c[k];
     }
     function z(k, j, O) {
@@ -17823,7 +17823,7 @@ https://requirejs.org/docs/errors.html#` + e);
                   G.push(H.normalizedMap || H);
                 }), req.onResourceLoad(o, this.map, G);
               }
-              N(O), this.defined = !0;
+              $(O), this.defined = !0;
             }
             this.defining = !1, this.defined && !this.defineEmitted && (this.defineEmitted = !0, this.emit("defined", this.exports), this.defineEmitComplete = !0);
           }
@@ -17870,7 +17870,7 @@ https://requirejs.org/docs/errors.html#` + e);
             });
           }), E.error = bind(this, function(J) {
             this.inited = !0, this.error = J, J.requireModules = [j], eachProp(l, function(Q) {
-              Q.map.id.indexOf(j + "_unnormalized") === 0 && N(Q.map.id);
+              Q.map.id.indexOf(j + "_unnormalized") === 0 && $(Q.map.id);
             }), T(J);
           }), E.fromText = bind(this, function(J, Q) {
             var ee = k.name, oe = F(ee), te = useInteractive;
@@ -17924,7 +17924,7 @@ https://requirejs.org/docs/errors.html#` + e);
         }), k === "error" && delete this.events[k];
       }
     };
-    function $(k) {
+    function B(k) {
       hasProp(p, k[0]) || A(F(k[0], null, !0)).init(k[1], k[2]);
     }
     function w(k, j, O, q) {
@@ -17937,12 +17937,12 @@ https://requirejs.org/docs/errors.html#` + e);
         id: j && j.getAttribute("data-requiremodule")
       };
     }
-    function B() {
+    function N() {
       var k;
       for (D(); d.length; ) {
         if (k = d.shift(), k[0] === null)
           return T(makeError("mismatch", "Mismatched anonymous define() module: " + k[k.length - 1]));
-        $(k);
+        B(k);
       }
       o.defQueueMap = {};
     }
@@ -18003,8 +18003,8 @@ https://requirejs.org/docs/errors.html#` + e);
         j = j || {};
         function O(q, E, U) {
           var G, H, W;
-          return j.enableBuildCallback && E && isFunction(E) && (E.__requireJsBuild = !0), typeof q == "string" ? isFunction(E) ? T(makeError("requireargs", "Invalid require call"), U) : k && hasProp(r, q) ? r[q](l[k.id]) : req.get ? req.get(o, q, k, O) : (H = F(q, k, !1, !0), G = H.id, hasProp(p, G) ? p[G] : T(makeError("notloaded", 'Module name "' + G + '" has not been loaded yet for context: ' + e + (k ? "" : ". Use require([])")))) : (B(), o.nextTick(function() {
-            B(), W = A(F(null, k)), W.skipMap = j.skipMap, W.init(q, E, U, {
+          return j.enableBuildCallback && E && isFunction(E) && (E.__requireJsBuild = !0), typeof q == "string" ? isFunction(E) ? T(makeError("requireargs", "Invalid require call"), U) : k && hasProp(r, q) ? r[q](l[k.id]) : req.get ? req.get(o, q, k, O) : (H = F(q, k, !1, !0), G = H.id, hasProp(p, G) ? p[G] : T(makeError("notloaded", 'Module name "' + G + '" has not been loaded yet for context: ' + e + (k ? "" : ". Use require([])")))) : (N(), o.nextTick(function() {
+            N(), W = A(F(null, k)), W.skipMap = j.skipMap, W.init(q, E, U, {
               enabled: !0
             }), L();
           }), O);
@@ -18035,7 +18035,7 @@ https://requirejs.org/docs/errors.html#` + e);
           var E = F(q, k, !0), U = getOwn(l, q);
           U.undefed = !0, S(q), delete p[q], delete m[E.url], delete u[q], eachReverse(d, function(G, H) {
             G[0] === q && d.splice(H, 1);
-          }), delete o.defQueueMap[q], U && (U.events.defined && (u[q] = U.events), N(q));
+          }), delete o.defQueueMap[q], U && (U.events.defined && (u[q] = U.events), $(q));
         }), O;
       },
       /**
@@ -18063,7 +18063,7 @@ https://requirejs.org/docs/errors.html#` + e);
             j = !0;
           } else
             O[0] === k && (j = !0);
-          $(O);
+          B(O);
         }
         if (o.defQueueMap = {}, q = getOwn(l, k), !j && !hasProp(p, k) && q && !q.inited) {
           if (a.enforceDefine && (!U || !getGlobal(U)))
@@ -18073,7 +18073,7 @@ https://requirejs.org/docs/errors.html#` + e);
               null,
               [k]
             ));
-          $([k, E.deps || [], E.exportsFn]);
+          B([k, E.deps || [], E.exportsFn]);
         }
         L();
       },
@@ -18632,12 +18632,12 @@ const useCollectionManager_deprecated = (e) => {
   const t = useDataSourceManager(), n = useDataSource(), o = useCollectionManager(), r = e || (n == null ? void 0 : n.key) || void 0, [i, a] = useState(uid()), { refresh: l } = useSchemaComponentContext(), c = useMemo(
     () => {
       var w;
-      return (w = t == null ? void 0 : t.collectionFieldInterfaceManager) == null ? void 0 : w.getFieldInterfaces().reduce((M, B) => (M[B.name] = B, M), {});
+      return (w = t == null ? void 0 : t.collectionFieldInterfaceManager) == null ? void 0 : w.getFieldInterfaces().reduce((M, N) => (M[N.name] = N, M), {});
     },
     [t, i]
   ), u = useMemo(() => t == null ? void 0 : t.collectionTemplateManager.getCollectionTemplates(), [t, i]), d = useCallback(() => {
     var w, M;
-    return (M = (w = t == null ? void 0 : t.getDataSource(r)) == null ? void 0 : w.collectionManager) == null ? void 0 : M.getCollections().map((B) => B.getOptions());
+    return (M = (w = t == null ? void 0 : t.getDataSource(r)) == null ? void 0 : w.collectionManager) == null ? void 0 : M.getCollections().map((N) => N.getOptions());
   }, [t, n]), p = useCallback(
     (w) => {
       var M;
@@ -18662,8 +18662,8 @@ const useCollectionManager_deprecated = (e) => {
     [t]
   ), f = useCompile(), C = useCallback(
     (w, M) => {
-      var B, k;
-      return ((k = (B = p(M)) == null ? void 0 : B.getCollection(w)) == null ? void 0 : k.getInheritedFields()) || [];
+      var N, k;
+      return ((k = (N = p(M)) == null ? void 0 : N.getCollection(w)) == null ? void 0 : k.getInheritedFields()) || [];
     },
     [t, p]
   ), b = useCallback(
@@ -18671,40 +18671,40 @@ const useCollectionManager_deprecated = (e) => {
       var k, j;
       if (!w)
         return [];
-      const B = (k = p(M)) == null ? void 0 : k.getCollection(w);
-      return ((j = B == null ? void 0 : B.getAllFields) == null ? void 0 : j.call(B)) || (B == null ? void 0 : B.getFields()) || [];
+      const N = (k = p(M)) == null ? void 0 : k.getCollection(w);
+      return ((j = N == null ? void 0 : N.getAllFields) == null ? void 0 : j.call(N)) || (N == null ? void 0 : N.getFields()) || [];
     },
     [t, p]
   ), S = useCallback(
     (w, M) => {
-      var B;
+      var N;
       if (!(!w || w.split(".").length < 2))
-        return (B = p(M)) == null ? void 0 : B.getCollectionField(w);
+        return (N = p(M)) == null ? void 0 : N.getCollectionField(w);
     },
     [t, p]
   ), y = useCallback(
     (w, M) => {
-      var B, k;
-      return w ? ((k = (B = p(M)) == null ? void 0 : B.getCollection(w)) == null ? void 0 : k.getParentCollectionsName()) || [] : [];
+      var N, k;
+      return w ? ((k = (N = p(M)) == null ? void 0 : N.getCollection(w)) == null ? void 0 : k.getParentCollectionsName()) || [] : [];
     },
     [t, p]
   ), v = useCallback(
-    (w, M = !1, B) => {
+    (w, M = !1, N) => {
       var O;
       if (!w)
         return [];
-      const k = (O = p(B)) == null ? void 0 : O.getCollection(w);
+      const k = (O = p(N)) == null ? void 0 : O.getCollection(w);
       return (k == null ? void 0 : k.getChildrenCollections(M)) || [];
     },
     [t, p]
   ), F = useCallback(
     (w, M) => {
-      var B, k;
-      return w ? ((k = (B = p(M)) == null ? void 0 : B.getCollection(w)) == null ? void 0 : k.getCurrentFields()) || [] : [];
+      var N, k;
+      return w ? ((k = (N = p(M)) == null ? void 0 : N.getCollection(w)) == null ? void 0 : k.getCurrentFields()) || [] : [];
     },
     [t, p]
   ), A = useCallback(
-    (w, M = "string", B) => {
+    (w, M = "string", N) => {
       var J;
       const {
         association: k = !1,
@@ -18716,7 +18716,7 @@ const useCollectionManager_deprecated = (e) => {
         prefixFieldValue: G = "",
         usePrefix: H = !1,
         dataSource: W
-      } = B || {};
+      } = N || {};
       if (O.length - 1 > q)
         return;
       if (j[w])
@@ -18730,7 +18730,7 @@ const useCollectionManager_deprecated = (e) => {
           value: H && G ? `${G}.${Q.name}` : Q.name,
           label: f((oe = Q == null ? void 0 : Q.uiSchema) == null ? void 0 : oe.title) || Q.name
         }, Q);
-        return k && Q.target && (ee.children = O.includes(Q.target) ? [] : A(Q.target, M, P(x({}, B), {
+        return k && Q.target && (ee.children = O.includes(Q.target) ? [] : A(Q.target, M, P(x({}, N), {
           cached: j,
           dataSource: W,
           collectionNames: [...O, Q.target],
@@ -18743,38 +18743,38 @@ const useCollectionManager_deprecated = (e) => {
     [b]
   ), R = useCallback(
     (w, M) => {
-      var B;
-      return (B = p(M)) == null ? void 0 : B.getCollection(w);
+      var N;
+      return (N = p(M)) == null ? void 0 : N.getCollection(w);
     },
     [t, p]
   ), T = useCallback(
     (w, M) => {
-      var B, k;
-      return (k = (B = p(M)) == null ? void 0 : B.getCollection(w)) == null ? void 0 : k.getAllCollectionsInheritChain();
+      var N, k;
+      return (k = (N = p(M)) == null ? void 0 : N.getCollection(w)) == null ? void 0 : k.getAllCollectionsInheritChain();
     },
     [t, p]
   ), D = useCallback(
     (w, M) => () => {
-      var B, k;
-      return (k = (B = p(M)) == null ? void 0 : B.getCollection(w)) == null ? void 0 : k.getInheritCollectionsChain();
+      var N, k;
+      return (k = (N = p(M)) == null ? void 0 : N.getCollection(w)) == null ? void 0 : k.getInheritCollectionsChain();
     },
     [t, p]
-  ), N = useCallback(
+  ), $ = useCallback(
     (w) => t == null ? void 0 : t.collectionFieldInterfaceManager.getFieldInterface(w),
     [t]
   ), z = useCallback(
     (w) => {
       var M;
-      return (M = N(w.interface)) == null ? void 0 : M.titleUsable;
+      return (M = $(w.interface)) == null ? void 0 : M.titleUsable;
     },
-    [N]
+    [$]
   ), L = useCallback(
-    (w, M, B) => {
+    (w, M, N) => {
       var k, j;
-      return (j = (k = p(B)) == null ? void 0 : k.getCollection(M)) == null ? void 0 : j.getParentCollectionFields(w);
+      return (j = (k = p(N)) == null ? void 0 : k.getCollection(M)) == null ? void 0 : j.getParentCollectionFields(w);
     },
     [t, p]
-  ), $ = useCallback(
+  ), B = useCallback(
     (w = "general") => t == null ? void 0 : t.collectionTemplateManager.getCollectionTemplate(w),
     [t]
   );
@@ -18783,8 +18783,8 @@ const useCollectionManager_deprecated = (e) => {
     interfaces: c,
     collections: m,
     templates: u,
-    getTemplate: $,
-    getInterface: N,
+    getTemplate: B,
+    getInterface: $,
     getCollections: d,
     getParentCollectionFields: L,
     getInheritCollections: y,
@@ -19081,7 +19081,7 @@ const BaseVariableContext = React.createContext(null), BaseVariableProvider = (e
           isDisabled: f || isDisabledDefault,
           getCollectionField: C.getCollectionField,
           deprecated: p
-        }) || []).sort((D, N) => D.isLeaf && !N.isLeaf ? -1 : !D.isLeaf && N.isLeaf ? 1 : 0).sort((D, N) => D.disabled && !N.disabled ? 1 : !D.disabled && N.disabled ? -1 : 0);
+        }) || []).sort((D, $) => D.isLeaf && !$.isLeaf ? -1 : !D.isLeaf && $.isLeaf ? 1 : 0).sort((D, $) => D.disabled && !$.disabled ? 1 : !D.disabled && $.disabled ? -1 : 0);
         if (T.length === 0) {
           y.disabled = !0, y.isLeaf = !0, A();
           return;
@@ -19244,12 +19244,42 @@ const DatePickerContext = React.createContext({ utc: !0 }), useDatePickerContext
   mapProps(mapRangePicker()),
   mapReadPretty(ReadPretty$d.DateRangePicker)
 ), DatePicker = (e) => {
-  const { utc: t = !0 } = useDatePickerContext(), n = Array.isArray(e.value) ? e.value[0] : e.value, o = P(x({
+  const { utc: t = !0 } = useDatePickerContext(), n = Array.isArray(e.value) ? e.value[0] : e.value, { parseVariable: o } = useVariables$1() || {}, r = useLocalVariables$1(), [i, a] = useState(null), [l, c] = useState(null), u = useRef(null);
+  useEffect(() => (u.current && u.current(), u.current = autorun(() => {
+    d();
+  }), () => {
+    u.current();
+  }), [e._maxDate, e._minDate, r, o]);
+  const d = () => V(void 0, null, function* () {
+    let m = e._minDate ? Promise.resolve(dayjs(e._minDate)) : Promise.resolve(null), h = e._maxDate ? Promise.resolve(dayjs(e._maxDate)) : Promise.resolve(null);
+    isVariable(e._maxDate) && (h = o(e._maxDate, r).then((y) => dayjs(y.value))), isVariable(e._minDate) && (m = o(e._minDate, r).then((y) => dayjs(y.value)));
+    const [g, f] = yield Promise.all([m, h]), C = Array.from({ length: 60 }, (y, v) => v), b = (y) => {
+      if (!y || !g && !f)
+        return !1;
+      const v = dayjs(y);
+      return v.isBefore(g, "minute") || v.isAfter(f, "minute");
+    }, S = (y) => {
+      if (!y || !g && !f)
+        return { disabledHours: () => [], disabledMinutes: () => [], disabledSeconds: () => [] };
+      const v = dayjs(y), F = v.isSame(g, "day"), A = v.isSame(f, "day");
+      return {
+        disabledHours: () => {
+          const $ = [];
+          return F && $.push(...Array.from({ length: g.hour() }, (z, L) => L)), A && $.push(...Array.from({ length: 24 - f.hour() }, (z, L) => L + f.hour() + 1)), $;
+        },
+        disabledMinutes: ($) => F && $ === g.hour() ? C.filter((z) => z < g.minute()) : A && $ === f.hour() ? C.filter((z) => z > f.minute()) : [],
+        disabledSeconds: ($, z) => F && $ === g.hour() && z === g.minute() ? C.filter((L) => L < g.second()) : A && $ === f.hour() && z === f.minute() ? C.filter((L) => L > f.second()) : []
+      };
+    };
+    a(() => b), c(() => S);
+  }), p = P(x({
     utc: t
   }, e), {
+    disabledDate: i,
+    disabledTime: l,
     showTime: e.showTime ? { defaultValue: dayjs("00:00:00", "HH:mm:ss") } : !1
   });
-  return /* @__PURE__ */ jsx(InternalDatePicker, P(x({}, o), { value: n }));
+  return /* @__PURE__ */ jsx(InternalDatePicker, P(x({}, p), { value: n }));
 };
 DatePicker.ReadPretty = ReadPretty$d.DatePicker;
 DatePicker.RangePicker = function e(t) {
@@ -19809,19 +19839,13 @@ const useDateVariable = ({ operator: e, schema: t, noDisabled: n }) => {
     /** 变量的值 */
     currentUserCtx: (c = a == null ? void 0 : a.data) == null ? void 0 : c.data
   };
-}, useCurrentFormData = () => {
-  var t, n;
-  const e = useDataBlockRequestData();
-  if (!(((t = e == null ? void 0 : e.data) == null ? void 0 : t.length) > 1))
-    return ((n = e == null ? void 0 : e.data) == null ? void 0 : n[0]) || (e == null ? void 0 : e.data);
 }, useCurrentFormContext = ({ form: e } = {}) => {
-  var i;
-  const { form: t } = useFormBlockContext(), n = useCurrentFormData(), { isVariableParsedInOtherContext: o } = useFlag(), r = e || t;
+  const { form: t } = useFormBlockContext(), { isVariableParsedInOtherContext: n } = useFlag(), o = e || t;
   return {
     /** 变量值 */
-    currentFormCtx: (r == null ? void 0 : r.readPretty) === !1 && (r != null && r.values) && ((i = Object.keys(r == null ? void 0 : r.values)) != null && i.length) ? r == null ? void 0 : r.values : n || (r == null ? void 0 : r.values),
+    currentFormCtx: o == null ? void 0 : o.values,
     /** 用来判断是否可以显示`当前表单`变量 */
-    shouldDisplayCurrentForm: r && !r.readPretty && !o
+    shouldDisplayCurrentForm: o && !o.readPretty && !n
   };
 }, useCurrentFormVariable = ({
   collectionField: e,
@@ -20077,8 +20101,8 @@ const ParentCollectionProvider = (e) => {
   targetFieldSchema: i,
   record: a
 }) => {
-  var $;
-  const { filterVariables: l = () => !0 } = useVariables$1() || {}, c = ($ = a == null ? void 0 : a.__parent) == null ? void 0 : $.__collectionName, { currentUserSettings: u } = useCurrentUserVariable({
+  var B;
+  const { filterVariables: l = () => !0 } = useVariables$1() || {}, c = (B = a == null ? void 0 : a.__parent) == null ? void 0 : B.__collectionName, { currentUserSettings: u } = useCurrentUserVariable({
     maxDepth: 3,
     uiSchema: n,
     collectionField: e,
@@ -20120,7 +20144,7 @@ const ParentCollectionProvider = (e) => {
     collectionField: e,
     noDisabled: r,
     targetFieldSchema: i
-  }), { currentParentRecordSettings: D, shouldDisplayCurrentParentRecord: N } = useCurrentParentRecordVariable({
+  }), { currentParentRecordSettings: D, shouldDisplayCurrentParentRecord: $ } = useCurrentParentRecordVariable({
     schema: n,
     collectionName: c,
     collectionField: e,
@@ -20136,7 +20160,7 @@ const ParentCollectionProvider = (e) => {
     C && f,
     S && b,
     v && y,
-    N && D,
+    $ && D,
     A && F,
     T && R,
     L && z
@@ -20153,7 +20177,7 @@ const ParentCollectionProvider = (e) => {
     b,
     v,
     y,
-    N,
+    $,
     D,
     A,
     F,
@@ -22232,19 +22256,19 @@ const SchemaSettingsSwitchItem = (e) => {
   useEffect(() => {
     D.setInitialValues(cloneDeep$1(r));
   }, [JSON.stringify(r || {})]);
-  const N = useCallback(() => {
+  const $ = useCallback(() => {
     h(!1), D.reset();
   }, [D]), z = useCallback(() => V(void 0, null, function* () {
     yield D.submit();
     try {
-      const M = D.values, B = Object.keys(M).reduce((k, j) => (D.query(j).take() && (k[j] = M[j]), k), {});
-      yield n == null ? void 0 : n(cloneDeep$1(B)), h(!1);
+      const M = D.values, N = Object.keys(M).reduce((k, j) => (D.query(j).take() && (k[j] = M[j]), k), {});
+      yield n == null ? void 0 : n(cloneDeep$1(N)), h(!1);
     } catch (M) {
       console.error(M);
     }
   }), [D, n]), L = useCallback(() => V(void 0, null, function* () {
     !g && (a != null && a["x-uid"]) && (b["x-action-settings"].schemaUid = a["x-uid"], y.emit("patch", { schema: b }), yield F.resource("uiSchemas").insert({ values: a }), f(a["x-uid"])), typeof i == "function" && (i == null || i()), S.setVisible(!1), h(!0);
-  }), [F, S, y, b, a, g]), $ = useCallback((M) => M.stopPropagation(), []);
+  }), [F, S, y, b, a, g]), B = useCallback((M) => M.stopPropagation(), []);
   return /* @__PURE__ */ jsxs(zIndexContext.Provider, { value: T, children: [
     /* @__PURE__ */ jsx(
       SchemaSettingsItem,
@@ -22252,7 +22276,7 @@ const SchemaSettingsSwitchItem = (e) => {
         title: v(t)
       }, p), {
         onClick: L,
-        onKeyDown: $,
+        onKeyDown: B,
         children: e.children || e.title
       })
     ),
@@ -22265,10 +22289,10 @@ const SchemaSettingsSwitchItem = (e) => {
         }, p), {
           destroyOnClose: !0,
           open: m,
-          onCancel: N,
+          onCancel: $,
           zIndex: T,
           footer: /* @__PURE__ */ jsxs(Space$1, { children: [
-            /* @__PURE__ */ jsx(Button, { onClick: N, children: C("Cancel") }),
+            /* @__PURE__ */ jsx(Button, { onClick: $, children: C("Cancel") }),
             /* @__PURE__ */ jsx(Button, { type: "primary", onClick: z, children: C("Submit") })
           ] }),
           children: /* @__PURE__ */ jsx(FormActiveFieldsProvider, { name: "form", getActiveFieldsName: A == null ? void 0 : A.getActiveFieldsName, children: /* @__PURE__ */ jsx(FormProvider, { form: D, children: /* @__PURE__ */ jsxs(FormLayout, { layout: "vertical", children: [
@@ -22309,7 +22333,7 @@ const SchemaSettingsModalItem = (e) => {
     "width",
     "noRecord",
     "ModalContextProvider"
-  ]), h = useContext(SchemaOptionsContext), g = useCollection(), f = useAPIClient(), C = useApp(), { theme: b } = useGlobalTheme(), S = useBlockRequestContext(), y = useFormActiveFields(), { locale: v } = useContext(ConfigProvider.ConfigContext), F = useDataSourceManager(), A = useDataSourceKey(), R = useCollectionRecord(), { association: T } = useDataBlockProps() || {}, D = useFormBlockContext(), N = useBlockContext(), { getOperators: z } = useOperators(), L = useLocationSearch(), $ = useVariables$1(), { formValue: w, collection: M, parent: B } = useSubFormValue(), k = useCurrentPopupRecord(), j = useParentPopupRecord();
+  ]), h = useContext(SchemaOptionsContext), g = useCollection(), f = useAPIClient(), C = useApp(), { theme: b } = useGlobalTheme(), S = useBlockRequestContext(), y = useFormActiveFields(), { locale: v } = useContext(ConfigProvider.ConfigContext), F = useDataSourceManager(), A = useDataSourceKey(), R = useCollectionRecord(), { association: T } = useDataBlockProps() || {}, D = useFormBlockContext(), $ = useBlockContext(), { getOperators: z } = useOperators(), L = useLocationSearch(), B = useVariables$1(), { formValue: w, collection: M, parent: N } = useSubFormValue(), k = useCurrentPopupRecord(), j = useParentPopupRecord();
   return t ? null : /* @__PURE__ */ jsx(
     SchemaSettingsItem,
     P(x({
@@ -22319,7 +22343,7 @@ const SchemaSettingsModalItem = (e) => {
         const q = l ? yield l() : c, E = _.isFunction(e.schema) ? e.schema() : e.schema;
         FormDialog(
           { title: E.title || n, width: u },
-          () => /* @__PURE__ */ jsx(p, { children: /* @__PURE__ */ jsx(CollectOperators, { defaultOperators: z(), children: /* @__PURE__ */ jsx(VariablesContext.Provider, { value: $, children: /* @__PURE__ */ jsx(BlockContext.Provider, { value: N, children: /* @__PURE__ */ jsx(
+          () => /* @__PURE__ */ jsx(p, { children: /* @__PURE__ */ jsx(CollectOperators, { defaultOperators: z(), children: /* @__PURE__ */ jsx(VariablesContext.Provider, { value: B, children: /* @__PURE__ */ jsx(BlockContext.Provider, { value: $, children: /* @__PURE__ */ jsx(
             VariablePopupRecordProvider,
             {
               recordData: k == null ? void 0 : k.value,
@@ -22328,7 +22352,7 @@ const SchemaSettingsModalItem = (e) => {
                 recordData: j == null ? void 0 : j.value,
                 collection: j == null ? void 0 : j.collection
               },
-              children: /* @__PURE__ */ jsx(CollectionRecordProvider, { record: d ? null : R, children: /* @__PURE__ */ jsx(FormBlockContext$1.Provider, { value: D, children: /* @__PURE__ */ jsx(SubFormProvider, { value: { value: w, collection: M, parent: B }, children: /* @__PURE__ */ jsx(
+              children: /* @__PURE__ */ jsx(CollectionRecordProvider, { record: d ? null : R, children: /* @__PURE__ */ jsx(FormBlockContext$1.Provider, { value: D, children: /* @__PURE__ */ jsx(SubFormProvider, { value: { value: w, collection: M, parent: N }, children: /* @__PURE__ */ jsx(
                 FormActiveFieldsProvider,
                 {
                   name: "form",
@@ -22508,22 +22532,22 @@ const SchemaSettingsModalItem = (e) => {
       }
     }),
     [n, a, l, b, m, h, u, p, A, r]
-  ), D = useMemo(() => ({ ArrayCollapse: ArrayCollapse$2, FormLayout }), []), N = useCallback(
+  ), D = useMemo(() => ({ ArrayCollapse: ArrayCollapse$2, FormLayout }), []), $ = useCallback(
     (L) => {
       var k;
-      const $ = [];
+      const B = [];
       for (const j of L.fieldReaction.rules)
-        $.push(_.pickBy(j, _.identity));
-      const w = b["x-component"] === "BlockTemplate" && ((k = b["x-component-props"]) == null ? void 0 : k.templateId), B = {
+        B.push(_.pickBy(j, _.identity));
+      const w = b["x-component"] === "BlockTemplate" && ((k = b["x-component-props"]) == null ? void 0 : k.templateId), N = {
         "x-uid": w && d(w).uid || b["x-uid"]
       };
-      b[F] = $, B[F] = $, c.emit("patch", {
-        schema: B
+      b[F] = B, N[F] = B, c.emit("patch", {
+        schema: N
       }), c.refresh(), i == null || i();
     },
     [c, d, b, F, i]
   );
-  return /* @__PURE__ */ jsx(SchemaSettingsModalItem, { title: R, components: D, width: 770, schema: T, onSubmit: N });
+  return /* @__PURE__ */ jsx(SchemaSettingsModalItem, { title: R, components: D, width: 770, schema: T, onSubmit: $ });
 }, useDataTemplates = (e) => {
   const t = useFieldSchema();
   if (e)
@@ -23171,17 +23195,17 @@ const designerCss$4 = ({ margin: e = "-18px -16px", padding: t = "18px 16px" } =
         }
       },
       onSubmit: (D) => {
-        const N = {
+        const $ = {
           "x-uid": n["x-uid"]
         };
-        (o.componentProps.picker || "date") !== D.picker && !m && o.value && (o.value = void 0, o.initialValue = void 0, n.default = void 0, N.default = void 0), N["x-component-props"] = o.componentProps || {}, n["x-component-props"] = x(x({}, o.componentProps || {}), D), N["x-component-props"] = n["x-component-props"], o.componentProps = n["x-component-props"];
+        (o.componentProps.picker || "date") !== D.picker && !m && o.value && (o.value = void 0, o.initialValue = void 0, n.default = void 0, $.default = void 0), $["x-component-props"] = o.componentProps || {}, n["x-component-props"] = x(x({}, o.componentProps || {}), D), $["x-component-props"] = n["x-component-props"], o.componentProps = n["x-component-props"];
         const z = o.path.entire.split(".");
         z.pop();
         const L = z.join(".");
-        o.query(`${L}.*[0:].${n.name}`).forEach(($) => {
-          $.props.name === n.name && ((o.componentProps.picker || "date") !== D.picker && !m && ($.value = void 0, $.initialValue = void 0), $.setComponentProps(x({}, D)));
+        o.query(`${L}.*[0:].${n.name}`).forEach((B) => {
+          B.props.name === n.name && ((o.componentProps.picker || "date") !== D.picker && !m && (B.value = void 0, B.initialValue = void 0), B.setComponentProps(x({}, D)));
         }), r.emit("patch", {
-          schema: N
+          schema: $
         }), r.refresh();
       }
     }
@@ -23210,7 +23234,7 @@ const getActionContext = (e) => {
   R != null && R.target && (u = p(
     `${R.target}.${((O = (j = o["x-component-props"]) == null ? void 0 : j.fieldNames) == null ? void 0 : O.label) || "id"}`
   ));
-  const D = (R == null ? void 0 : R.interface) === "m2o" && findParentFieldSchema(o), N = D && p(D == null ? void 0 : D["x-collection-field"]), z = useTableBlockContext(), L = (R == null ? void 0 : R.interface) === "m2m" || (N == null ? void 0 : N.type) === "hasMany" && (R == null ? void 0 : R.interface) === "m2o", $ = useCallback(
+  const D = (R == null ? void 0 : R.interface) === "m2o" && findParentFieldSchema(o), $ = D && p(D == null ? void 0 : D["x-collection-field"]), z = useTableBlockContext(), L = (R == null ? void 0 : R.interface) === "m2m" || ($ == null ? void 0 : $.type) === "hasMany" && (R == null ? void 0 : R.interface) === "m2o", B = useCallback(
     (q) => {
       const E = q.find((G) => G.value === "$nForm"), U = m(A);
       return !(U != null && U.length) && E && (E.children = formatVariableScop(y())), q;
@@ -23241,7 +23265,7 @@ const getActionContext = (e) => {
           className: defaultInputStyle,
           form: S,
           record: b,
-          returnScope: $,
+          returnScope: B,
           shouldChange: getShouldChange({
             collectionField: R,
             variables: g,
@@ -23286,12 +23310,12 @@ const getActionContext = (e) => {
     L,
     f,
     b,
-    $,
+    B,
     a,
     z.collection,
     u,
     g
-  ]), B = useCallback(
+  ]), N = useCallback(
     (q) => {
       var U, G, H;
       const E = {
@@ -23311,7 +23335,7 @@ const getActionContext = (e) => {
       components: w,
       width: 800,
       schema: M,
-      onSubmit: B,
+      onSubmit: N,
       ModalContextProvider: (q) => /* @__PURE__ */ jsx(FlagProvider, { isInSubForm: v, isInSubTable: F, isInSetDefaultValueDialog: !0, children: q.children })
     }
   );
@@ -24080,13 +24104,13 @@ const useGetFilterOptions = () => {
     };
   });
 }, TableColumnDesigner$1 = (e) => {
-  var z, L, $, w, M, B, k, j, O, q, E, U;
-  const { uiSchema: t, fieldSchema: n, collectionField: o } = e, { form: r } = useFormBlockContext(), { getInterface: i, getCollection: a } = useCollectionManager_deprecated(), l = useField(), { t: c } = useTranslation(), u = useFieldSchema(), { dn: d } = useDesignable(), p = ((z = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : z.fieldNames) || ((L = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : L.fieldNames), m = useLabelFields$1(($ = o == null ? void 0 : o.target) != null ? $ : o == null ? void 0 : o.targetCollection), h = useColorFields((w = o == null ? void 0 : o.target) != null ? w : o == null ? void 0 : o.targetCollection), g = i(o == null ? void 0 : o.interface), f = a(o == null ? void 0 : o.target), C = isFileCollection$2(f), b = ["QuickEdit", "FormItem"].includes(n["x-decorator"]), { currentMode: S } = useAssociationFieldContext(), { isAllowToSetDefaultValue: y } = useIsAllowToSetDefaultValue({ collectionField: o, fieldSchema: n }), v = ["datetime", "createdAt", "updatedAt"].includes(o == null ? void 0 : o.interface), F = ["obo", "oho", "o2o", "o2m", "m2m", "m2o", "snapshot"].includes(
+  var z, L, B, w, M, N, k, j, O, q, E, U;
+  const { uiSchema: t, fieldSchema: n, collectionField: o } = e, { form: r } = useFormBlockContext(), { getInterface: i, getCollection: a } = useCollectionManager_deprecated(), l = useField(), { t: c } = useTranslation(), u = useFieldSchema(), { dn: d } = useDesignable(), p = ((z = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : z.fieldNames) || ((L = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : L.fieldNames), m = useLabelFields$1((B = o == null ? void 0 : o.target) != null ? B : o == null ? void 0 : o.targetCollection), h = useColorFields((w = o == null ? void 0 : o.target) != null ? w : o == null ? void 0 : o.targetCollection), g = i(o == null ? void 0 : o.interface), f = a(o == null ? void 0 : o.target), C = isFileCollection$2(f), b = ["QuickEdit", "FormItem"].includes(n["x-decorator"]), { currentMode: S } = useAssociationFieldContext(), { isAllowToSetDefaultValue: y } = useIsAllowToSetDefaultValue({ collectionField: o, fieldSchema: n }), v = ["datetime", "createdAt", "updatedAt"].includes(o == null ? void 0 : o.interface), F = ["obo", "oho", "o2o", "o2m", "m2m", "m2o", "snapshot"].includes(
     o == null ? void 0 : o.interface
   ), A = useFieldModeOptions({ fieldSchema: n }), R = ((M = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : M.mode) || "Select";
   let T = "editable";
   n["x-disabled"] === !0 && (T = "readonly"), n["x-read-pretty"] === !0 && (T = "read-pretty");
-  const D = F && R === "Select", N = () => {
+  const D = F && R === "Select", $ = () => {
     const { name: G } = useCollection(), { linkageRulesProps: H } = useSchemaToolbar();
     return /* @__PURE__ */ jsx(SchemaSettingsLinkageRules, x({ category: "style" }, P(x({}, H), { collectionName: G })));
   };
@@ -24102,7 +24126,7 @@ const useGetFilterOptions = () => {
             title: {
               title: c("Column title"),
               default: u == null ? void 0 : u.title,
-              description: `${c("Original field title: ")}${((B = o == null ? void 0 : o.uiSchema) == null ? void 0 : B.title) || (n == null ? void 0 : n.title)}`,
+              description: `${c("Original field title: ")}${((N = o == null ? void 0 : o.uiSchema) == null ? void 0 : N.title) || (n == null ? void 0 : n.title)}`,
               "x-decorator": "FormItem",
               "x-component": "Input",
               "x-component-props": {}
@@ -24168,7 +24192,7 @@ const useGetFilterOptions = () => {
         }
       }
     ),
-    /* @__PURE__ */ jsx(N, {}),
+    /* @__PURE__ */ jsx($, {}),
     g && g.sortable === !0 && !S && /* @__PURE__ */ jsx(
       SchemaSettingsSwitchItem,
       {
@@ -25318,12 +25342,12 @@ function useCollectValuesToSubmit() {
       resource: o,
       actionFields: (d == null ? void 0 : d("form")) || []
     }), S = {}, y = Object.keys(f).map((D) => V(this, null, function* () {
-      const N = f[D], z = i(D);
-      if (isVariable(N)) {
-        const { value: L } = (yield p == null ? void 0 : p.parseVariable(N, m)) || {};
+      const $ = f[D], z = i(D);
+      if (isVariable($)) {
+        const { value: L } = (yield p == null ? void 0 : p.parseVariable($, m)) || {};
         L != null && (S[D] = transformVariableValue(L, { targetCollectionField: z }));
       } else
-        N != null && N !== "" && (S[D] = N);
+        $ != null && $ !== "" && (S[D] = $);
     }));
     if (yield Promise.all(y), (A = u == null ? void 0 : u["x-component-props"]) == null ? void 0 : A.addChild) {
       const D = a();
@@ -25353,8 +25377,8 @@ const useCreateActionProps = () => {
   return {
     onClick() {
       return V(this, null, function* () {
-        var $;
-        const { onSuccess: v, skipValidator: F, triggerWorkflows: A } = ($ = u == null ? void 0 : u["x-action-settings"]) != null ? $ : {}, { manualClose: R, redirecting: T, redirectTo: D, successMessage: N, actionAfterSuccess: z } = v || {};
+        var B;
+        const { onSuccess: v, skipValidator: F, triggerWorkflows: A } = (B = u == null ? void 0 : u["x-action-settings"]) != null ? B : {}, { manualClose: R, redirecting: T, redirectTo: D, successMessage: $, actionAfterSuccess: z } = v || {};
         F || (yield n.submit());
         const L = yield f();
         d.data = o.data || {}, d.data.loading = !0;
@@ -25367,16 +25391,16 @@ const useCreateActionProps = () => {
             triggerWorkflows: A != null && A.length ? A.map((M) => [M.workflowKey, M.context].filter(Boolean).join("!")).join(",") : void 0,
             updateAssociationValues: g
           });
-          if ((z === "previous" || !z && T !== !0) && (i == null || i(!1)), a == null || a(!0), l == null || l(!1), d.data.loading = !1, d.data.data = w, !N) {
+          if ((z === "previous" || !z && T !== !0) && (i == null || i(!1)), a == null || a(!0), l == null || l(!1), d.data.loading = !1, d.data.data = w, !$) {
             message.success(h("Saved successfully")), yield resetFormCorrectly(n), (T && !z || z === "redirect") && D && (isURL(D) ? window.location.href = D : c(D));
             return;
           }
           R ? m.success({
-            title: p(N),
+            title: p($),
             onOk: () => V(this, null, function* () {
               yield resetFormCorrectly(n), (T && !z || z === "redirect") && D && (isURL(D) ? window.location.href = D : c(D));
             })
-          }) : (message.success(p(N)), yield resetFormCorrectly(n), (T && !z || z === "redirect") && D && (isURL(D) ? window.location.href = D : c(D)));
+          }) : (message.success(p($)), yield resetFormCorrectly(n), (T && !z || z === "redirect") && D && (isURL(D) ? window.location.href = D : c(D)));
         } catch (w) {
           d.data.loading = !1;
         }
@@ -25393,10 +25417,10 @@ const useCreateActionProps = () => {
         const R = u.map((H) => H.name), {
           assignedValues: T = {},
           onSuccess: D,
-          overwriteValues: N,
+          overwriteValues: $,
           skipValidator: z,
           triggerWorkflows: L
-        } = (j = l == null ? void 0 : l["x-action-settings"]) != null ? j : {}, $ = (O = i == null ? void 0 : i["x-component-props"]) == null ? void 0 : O.addChild, { successMessage: w } = D || {}, M = {}, B = Object.keys(T).map((H) => V(this, null, function* () {
+        } = (j = l == null ? void 0 : l["x-action-settings"]) != null ? j : {}, B = (O = i == null ? void 0 : i["x-component-props"]) == null ? void 0 : O.addChild, { successMessage: w } = D || {}, M = {}, N = Object.keys(T).map((H) => V(this, null, function* () {
           const W = T[H], X = d(H);
           if (isVariable(W)) {
             const { value: Y } = (yield C == null ? void 0 : C.parseVariable(W, b)) || {};
@@ -25404,7 +25428,7 @@ const useCreateActionProps = () => {
           } else
             W != null && W !== "" && (M[H] = W);
         }));
-        yield Promise.all(B), z || (yield e.submit());
+        yield Promise.all(N), z || (yield e.submit());
         const k = getFormValues({
           filterByTk: g,
           field: t,
@@ -25414,14 +25438,14 @@ const useCreateActionProps = () => {
           resource: n,
           actionFields: (S == null ? void 0 : S("form")) || []
         });
-        if ($) {
+        if (B) {
           const H = p();
           k[(q = H == null ? void 0 : H.name) != null ? q : "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 n[y]({
-            values: x(x(x({}, k), N), M),
+            values: x(x(x({}, k), $), M),
             filterKeys: v,
             // TODO(refactor): should change to inject by plugin
             triggerWorkflows: L != null && L.length ? L.map((W) => [W.workflowKey, W.context].filter(Boolean).join("!")).join(",") : void 0
@@ -25533,26 +25557,26 @@ const useCreateActionProps = () => {
   return {
     onClick(f, C) {
       return V(this, null, function* () {
-        var L, $, w;
+        var L, B, w;
         const {
           assignedValues: b = {},
           onSuccess: S,
           skipValidator: y,
           triggerWorkflows: v
-        } = (L = r == null ? void 0 : r["x-action-settings"]) != null ? L : {}, { manualClose: F, redirecting: A, redirectTo: R, successMessage: T, actionAfterSuccess: D } = S || {}, N = {}, z = Object.keys(b).map((M) => V(this, null, function* () {
-          const B = b[M], k = m(M);
-          if (isVariable(B)) {
-            const { value: j } = (yield u == null ? void 0 : u.parseVariable(B, d)) || {};
-            j && (N[M] = transformVariableValue(j, { targetCollectionField: k }));
+        } = (L = r == null ? void 0 : r["x-action-settings"]) != null ? L : {}, { manualClose: F, redirecting: A, redirectTo: R, successMessage: T, actionAfterSuccess: D } = S || {}, $ = {}, z = Object.keys(b).map((M) => V(this, null, function* () {
+          const N = b[M], k = m(M);
+          if (isVariable(N)) {
+            const { value: j } = (yield u == null ? void 0 : u.parseVariable(N, d)) || {};
+            j && ($[M] = transformVariableValue(j, { targetCollectionField: k }));
           } else
-            B != null && B !== "" && (N[M] = B);
+            N != null && N !== "" && ($[M] = N);
         }));
         yield Promise.all(z), y === !1 && (yield l.submit()), yield e.update({
           filterByTk: o,
-          values: x({}, N),
+          values: x({}, $),
           // TODO(refactor): should change to inject by plugin
           triggerWorkflows: v != null && v.length ? v.map((M) => [M.workflowKey, M.context].filter(Boolean).join("!")).join(",") : void 0
-        }), (D === "previous" || !D && A !== !0) && (h == null || h(!1)), C && (C == null || C()), e instanceof TableFieldResource || (w = ($ = t == null ? void 0 : t.service) == null ? void 0 : $.refresh) == null || w.call($), T && (F ? c.success({
+        }), (D === "previous" || !D && A !== !0) && (h == null || h(!1)), C && (C == null || C()), e instanceof TableFieldResource || (w = (B = t == null ? void 0 : t.service) == null ? void 0 : B.refresh) == null || w.call(B), T && (F ? c.success({
           title: a(T),
           onOk: () => V(this, null, function* () {
             (A && !D || D === "redirect") && R && (isURL(R) ? window.location.href = R : i(R));
@@ -25573,29 +25597,29 @@ const useCreateActionProps = () => {
         const {
           assignedValues: T = {},
           onSuccess: D,
-          updateMode: N
-        } = (j = i == null ? void 0 : i["x-action-settings"]) != null ? j : {}, { manualClose: z, redirecting: L, redirectTo: $, successMessage: w, actionAfterSuccess: M } = D || {};
+          updateMode: $
+        } = (j = i == null ? void 0 : i["x-action-settings"]) != null ? j : {}, { manualClose: z, redirecting: L, redirectTo: B, successMessage: w, actionAfterSuccess: M } = D || {};
         m.data = e.data || {}, m.data.loading = !0;
-        const B = {}, k = Object.keys(T).map((q) => V(this, null, function* () {
+        const N = {}, k = Object.keys(T).map((q) => V(this, null, function* () {
           const E = T[q], U = C(q);
           if (isVariable(E)) {
             const { value: G } = (yield g == null ? void 0 : g.parseVariable(E, b)) || {};
-            G && (B[q] = transformVariableValue(G, { targetCollectionField: U }));
+            G && (N[q] = transformVariableValue(G, { targetCollectionField: U }));
           } else
-            E != null && E !== "" && (B[q] = E);
+            E != null && E !== "" && (N[q] = E);
         }));
         yield Promise.all(k), (M === "previous" || !M && L !== !0) && (S == null || S(!1)), h.confirm({
           title: p("Bulk update"),
-          content: p(N === "selected" ? "Update selected data?" : "Update all data?"),
+          content: p($ === "selected" ? "Update selected data?" : "Update all data?"),
           onOk() {
             return V(this, null, function* () {
               var U, G, H, W;
               const { filter: q } = (G = (U = o.params) == null ? void 0 : U[0]) != null ? G : {}, E = {
-                values: x({}, B),
+                values: x({}, N),
                 filter: q,
                 forceUpdate: !1
               };
-              if (N === "selected") {
+              if ($ === "selected") {
                 if (!(c != null && c.length)) {
                   message.error(p("Please select the records to be updated")), m.data.loading = !1;
                   return;
@@ -25612,9 +25636,9 @@ const useCreateActionProps = () => {
               t instanceof TableFieldResource || (W = (H = n == null ? void 0 : n.service) == null ? void 0 : H.refresh) == null || W.call(H), w && (z ? h.success({
                 title: d(w),
                 onOk: () => V(this, null, function* () {
-                  (L && !M || M === "redirect") && $ && (isURL($) ? window.location.href = $ : u($));
+                  (L && !M || M === "redirect") && B && (isURL(B) ? window.location.href = B : u(B));
                 })
-              }) : (message.success(d(w)), (L && !M || M === "redirect") && $ && (isURL($) ? window.location.href = $ : u($))));
+              }) : (message.success(d(w)), (L && !M || M === "redirect") && B && (isURL(B) ? window.location.href = B : u(B))));
             });
           },
           onCancel() {
@@ -25633,11 +25657,11 @@ const useCreateActionProps = () => {
     onClick() {
       return V(this, null, function* () {
         var q, E, U, G;
-        const { skipValidator: A, onSuccess: R, requestSettings: T } = (q = o == null ? void 0 : o["x-action-settings"]) != null ? q : {}, { manualClose: D, redirecting: N, redirectTo: z, successMessage: L, actionAfterSuccess: $ } = R || {}, w = o == null ? void 0 : o["x-action"];
+        const { skipValidator: A, onSuccess: R, requestSettings: T } = (q = o == null ? void 0 : o["x-action-settings"]) != null ? q : {}, { manualClose: D, redirecting: $, redirectTo: z, successMessage: L, actionAfterSuccess: B } = R || {}, w = o == null ? void 0 : o["x-action"];
         if (!T.url)
           return;
         A !== !0 && w === "customize:form:request" && (yield i.submit());
-        const M = T.headers ? JSON.parse(T.headers) : {}, B = T.params ? JSON.parse(T.params) : {}, k = T.data ? JSON.parse(T.data) : {};
+        const M = T.headers ? JSON.parse(T.headers) : {}, N = T.params ? JSON.parse(T.params) : {}, k = T.data ? JSON.parse(T.data) : {};
         if (w === "customize:form:request" && ["POST", "PUT", "PATCH"].includes(T.method)) {
           const H = a.map((X) => X.name), W = getFormValues({
             filterByTk: n,
@@ -25654,15 +25678,15 @@ const useCreateActionProps = () => {
           url: renderTemplate(T.url, { currentRecord: m, currentUser: g }),
           method: T.method,
           headers: parse(M)({ currentRecord: m, currentUser: g }),
-          params: parse(B)({ currentRecord: m, currentUser: g }),
+          params: parse(N)({ currentRecord: m, currentUser: g }),
           data: parse(k)({ currentRecord: m, currentUser: g })
         };
         f.data = c.data || {}, f.data.loading = !0;
         try {
-          yield e.request(x({}, O)), f.data.loading = !1, u instanceof TableFieldResource || (U = (E = d == null ? void 0 : d.service) == null ? void 0 : E.refresh) == null || U.call(E), (G = p == null ? void 0 : p.refresh) == null || G.call(p), w === "customize:form:request" && ($ === "previous" || !$ && N !== !0) && (b == null || b(!1)), L || (message.success(C("Saved successfully")), yield resetFormCorrectly(i), (N && !$ || $ === "redirect") && z && (isURL(z) ? window.location.href = z : t(z))), D ? S.success({
+          yield e.request(x({}, O)), f.data.loading = !1, u instanceof TableFieldResource || (U = (E = d == null ? void 0 : d.service) == null ? void 0 : E.refresh) == null || U.call(E), (G = p == null ? void 0 : p.refresh) == null || G.call(p), w === "customize:form:request" && (B === "previous" || !B && $ !== !0) && (b == null || b(!1)), L || (message.success(C("Saved successfully")), yield resetFormCorrectly(i), ($ && !B || B === "redirect") && z && (isURL(z) ? window.location.href = z : t(z))), D ? S.success({
             title: r(L),
             onOk: () => V(this, null, function* () {
-              (N && !$ || $ === "redirect") && z && (isURL(z) ? window.location.href = z : t(z));
+              ($ && !B || B === "redirect") && z && (isURL(z) ? window.location.href = z : t(z));
             })
           }) : message.success(r(L));
         } finally {
@@ -25681,9 +25705,9 @@ const useCreateActionProps = () => {
           assignedValues: R = {},
           onSuccess: T,
           overwriteValues: D,
-          skipValidator: N,
+          skipValidator: $,
           triggerWorkflows: z
-        } = (E = l == null ? void 0 : l["x-action-settings"]) != null ? E : {}, { manualClose: L, redirecting: $, redirectTo: w, successMessage: M, actionAfterSuccess: B } = T || {}, k = {}, j = Object.keys(R).map((U) => V(this, null, function* () {
+        } = (E = l == null ? void 0 : l["x-action-settings"]) != null ? E : {}, { manualClose: L, redirecting: B, redirectTo: w, successMessage: M, actionAfterSuccess: N } = T || {}, k = {}, j = Object.keys(R).map((U) => V(this, null, function* () {
           const G = R[U], H = d(U);
           if (isVariable(G)) {
             const { value: W } = (yield b == null ? void 0 : b.parseVariable(G, S)) || {};
@@ -25691,7 +25715,7 @@ const useCreateActionProps = () => {
           } else
             G != null && G !== "" && (k[U] = G);
         }));
-        yield Promise.all(j), N || (yield e.submit());
+        yield Promise.all(j), $ || (yield e.submit());
         const O = u.map((U) => U.name), q = getFormValues({
           filterByTk: t,
           field: n,
@@ -25710,14 +25734,14 @@ const useCreateActionProps = () => {
             updateAssociationValues: g,
             // TODO(refactor): should change to inject by plugin
             triggerWorkflows: z != null && z.length ? z.map((U) => [U.workflowKey, U.context].filter(Boolean).join("!")).join(",") : void 0
-          })), h.data.loading = !1, A && (A == null || A()), (B === "previous" || !B && $ !== !0) && (i == null || i(!1)), a == null || a(!1), !M)
+          })), h.data.loading = !1, A && (A == null || A()), (N === "previous" || !N && B !== !0) && (i == null || i(!1)), a == null || a(!1), !M)
             return;
           L ? f.success({
             title: m(M),
             onOk: () => V(this, null, function* () {
-              yield e.reset(), ($ && !B || B === "redirect") && w && (isURL(w) ? window.location.href = w : c(w));
+              yield e.reset(), (B && !N || N === "redirect") && w && (isURL(w) ? window.location.href = w : c(w));
             })
-          }) : (message.success(m(M)), ($ && !B || B === "redirect" || B === "redirect") && w && (isURL(w) ? window.location.href = w : c(w)));
+          }) : (message.success(m(M)), (B && !N || N === "redirect" || N === "redirect") && w && (isURL(w) ? window.location.href = w : c(w)));
         } catch (U) {
           h.data.loading = !1;
         }
@@ -25874,7 +25898,7 @@ const useCreateActionProps = () => {
     /** 渲染 Collapse 的列表数据 */
     list: (d == null ? void 0 : d.data) || [],
     onSelected: (F) => {
-      var R, T, D, N;
+      var R, T, D, $;
       const A = ((T = (R = t.params) == null ? void 0 : R[1]) == null ? void 0 : T.filters) || {};
       F.length ? A[`af.${c}`] = {
         [`${c}.${i}.$in`]: F
@@ -25882,7 +25906,7 @@ const useCreateActionProps = () => {
         P(x({}, (D = t.params) == null ? void 0 : D[0]), {
           pageSize: 200,
           page: 1,
-          filter: mergeFilter([...Object.values(A), (N = n == null ? void 0 : n.params) == null ? void 0 : N.filter])
+          filter: mergeFilter([...Object.values(A), ($ = n == null ? void 0 : n.params) == null ? void 0 : $.filter])
         }),
         { filters: A }
       );
@@ -25904,7 +25928,7 @@ const useCreateActionProps = () => {
   var n;
   return ["select", "multipleSelect", "checkbox", "checkboxGroup", "chinaRegion"].includes(e == null ? void 0 : e.interface) && ((n = e == null ? void 0 : e.uiSchema) == null ? void 0 : n.enum);
 }, useAssociationFilterBlockProps = () => {
-  var v, F, A, R, T, D, N, z, L, $;
+  var v, F, A, R, T, D, $, z, L, B;
   const e = AssociationFilter.useAssociationField(), t = useFieldSchema(), n = useOptionalFieldList(), { getDataBlocks: o } = useFilterBlock(), r = e == null ? void 0 : e.name, i = useField(), { props: a } = useBlockRequestContext(), l = useDataSourceHeaders(a == null ? void 0 : a.dataSource), c = useCollectionManager(), { filter: u, parseVariableLoading: d } = useParsedFilter({ filterOption: (F = (v = i.componentProps) == null ? void 0 : v.params) == null ? void 0 : F.filter });
   let p, m, h, g, f, C, b, S;
   C = e != null && e.target ? (A = c == null ? void 0 : c.getCollection(e.target)) == null ? void 0 : A.getPrimaryKey() : "id", b = ((T = (R = t["x-component-props"]) == null ? void 0 : R.fieldNames) == null ? void 0 : T.label) || C, { data: f, params: h, run: g } = useRequest(
@@ -25932,18 +25956,18 @@ const useCreateActionProps = () => {
     b,
     g,
     C,
-    (N = i.componentProps) == null ? void 0 : N.params,
+    ($ = i.componentProps) == null ? void 0 : $.params,
     (L = (z = i.componentProps) == null ? void 0 : z.params) == null ? void 0 : L.sort,
     d
   ]);
   const y = useCallback(
     (w) => {
-      const { targets: M, uid: B } = findFilterTargets(t);
+      const { targets: M, uid: N } = findFilterTargets(t);
       o().forEach((k) => {
         var G, H, W;
         if (!M.find((X) => X.uid === k.uid))
           return;
-        const O = `${B}${t.name}`, q = ((G = k.service.params) == null ? void 0 : G[0]) || {};
+        const O = `${N}${t.name}`, q = ((G = k.service.params) == null ? void 0 : G[0]) || {};
         (W = (H = k.service.params) == null ? void 0 : H[1]) != null && W.filters || _.set(k.service.params, "[1].filters", {});
         const E = k.service.params[1].filters;
         if (w.length)
@@ -25975,15 +25999,15 @@ const useCreateActionProps = () => {
       multipleSelect: "$anyOf",
       checkbox: "$in",
       checkboxGroup: "$anyOf"
-    }, B = (($ = w == null ? void 0 : w.uiSchema) == null ? void 0 : $.enum) || [];
-    C = "value", b = "label", p = B, h = {}, g = () => {
+    }, N = ((B = w == null ? void 0 : w.uiSchema) == null ? void 0 : B.enum) || [];
+    C = "value", b = "label", p = N, h = {}, g = () => {
     }, S = `${w.name}.${M[w.interface]}`, m = (k) => {
       const j = k.target.value;
       if (!j) {
-        p = B;
+        p = N;
         return;
       }
-      p = B.filter((O) => O.label.includes(j));
+      p = N.filter((O) => O.label.includes(j));
     };
   } else
     S = `${r}.${C}.$in`, p = (f == null ? void 0 : f.data) || [], m = (w) => {
@@ -26265,31 +26289,31 @@ const useSyncFromForm = (e, t, n) => {
       return T;
     if (S > y)
       return [];
-    const D = r(C).map((N) => {
+    const D = r(C).map(($) => {
       var w;
-      if (b.includes(N.name) || !N.interface || ["sort", "password", "sequence"].includes(N.type))
+      if (b.includes($.name) || !$.interface || ["sort", "password", "sequence"].includes($.type))
         return;
       const z = {
         type: "duplicate",
-        tag: c((w = N.uiSchema) == null ? void 0 : w.title) || N.name
+        tag: c((w = $.uiSchema) == null ? void 0 : w.title) || $.name
       }, L = P(x({}, z), {
         title: React.createElement(TreeNode, z),
-        key: v ? `${v}.${N.name}` : N.name,
+        key: v ? `${v}.${$.name}` : $.name,
         isLeaf: !0,
-        field: N,
+        field: $,
         disabled: F
-      }), $ = A.find((M) => M.name === L.key);
-      if (["belongsTo", "belongsToMany"].includes(N.type) && (!$ || ["Select", "Picker"].includes($ == null ? void 0 : $.fieldMode)))
-        z.type = "reference", L.type = "reference", L.title = React.createElement(TreeNode, P(x({}, z), { type: "reference" })), L.isLeaf = !1, L.children = m(N.target, {
+      }), B = A.find((M) => M.name === L.key);
+      if (["belongsTo", "belongsToMany"].includes($.type) && (!B || ["Select", "Picker"].includes(B == null ? void 0 : B.fieldMode)))
+        z.type = "reference", L.type = "reference", L.title = React.createElement(TreeNode, P(x({}, z), { type: "reference" })), L.isLeaf = !1, L.children = m($.target, {
           depth: S + 1,
           maxDepth: y,
           prefix: L.key,
           exclude: systemKeys
         });
-      else if (["hasOne", "hasMany"].includes(N.type) || ["Nester", "SubTable"].includes($ == null ? void 0 : $.fieldMode)) {
+      else if (["hasOne", "hasMany"].includes($.type) || ["Nester", "SubTable"].includes(B == null ? void 0 : B.fieldMode)) {
         let M = !1;
-        ["hasOne", "hasMany"].includes(N.type) && ["Select", "Picker"].includes($ == null ? void 0 : $.fieldMode) && (M = !0), L.disabled = !0, L.isLeaf = !1, L.children = p(
-          N.target,
+        ["hasOne", "hasMany"].includes($.type) && ["Select", "Picker"].includes(B == null ? void 0 : B.fieldMode) && (M = !0), L.disabled = !0, L.isLeaf = !1, L.children = p(
+          $.target,
           {
             depth: S + 1,
             maxDepth: y,
@@ -26316,16 +26340,16 @@ const useSyncFromForm = (e, t, n) => {
       const D = {
         type: "preloading",
         tag: c((z = T.uiSchema) == null ? void 0 : z.title) || T.name
-      }, N = b ? `${b}.${T.name}` : T.name;
+      }, $ = b ? `${b}.${T.name}` : T.name;
       return {
         type: "preloading",
         tag: c((L = T.uiSchema) == null ? void 0 : L.title) || T.name,
         title: React.createElement(TreeNode, D),
-        key: N,
+        key: $,
         isLeaf: !1,
         field: T,
         children: m(T.target, {
-          prefix: N,
+          prefix: $,
           depth: y + 1,
           maxDepth: S,
           exclude: v
@@ -26349,10 +26373,10 @@ const useSyncFromForm = (e, t, n) => {
         const f = /* @__PURE__ */ new Set([]), C = /* @__PURE__ */ new Set([]), b = (v, F) => {
           var A;
           (A = v == null ? void 0 : v.reduceProperties) == null || A.call(v, (R, T) => {
-            var M, B, k;
-            const D = R || F, N = T["x-collection-field"] && o(T["x-collection-field"]), z = T.name.includes("."), L = N && ["hasOne", "hasMany", "belongsTo", "belongsToMany"].includes(N.type), $ = !L && z ? getAssociationPath(T.name) : T.name, w = D === "" || !D ? $ : D + "." + $;
-            if (N && !(["hasOne", "hasMany"].includes(N.type) || ["SubForm", "Nester"].includes((M = T["x-component-props"]) == null ? void 0 : M.mode)) && C.add(w), N && (L || z) && T["x-component"] !== "TableField") {
-              if (f.add({ name: w, fieldMode: ((B = T["x-component-props"]) == null ? void 0 : B.mode) || "Select" }), ["Nester", "SubTable"].includes((k = T["x-component-props"]) == null ? void 0 : k.mode)) {
+            var M, N, k;
+            const D = R || F, $ = T["x-collection-field"] && o(T["x-collection-field"]), z = T.name.includes("."), L = $ && ["hasOne", "hasMany", "belongsTo", "belongsToMany"].includes($.type), B = !L && z ? getAssociationPath(T.name) : T.name, w = D === "" || !D ? B : D + "." + B;
+            if ($ && !(["hasOne", "hasMany"].includes($.type) || ["SubForm", "Nester"].includes((M = T["x-component-props"]) == null ? void 0 : M.mode)) && C.add(w), $ && (L || z) && T["x-component"] !== "TableField") {
+              if (f.add({ name: w, fieldMode: ((N = T["x-component-props"]) == null ? void 0 : N.mode) || "Select" }), ["Nester", "SubTable"].includes((k = T["x-component-props"]) == null ? void 0 : k.mode)) {
                 const j = D && D !== "" ? D + "." + T.name : T.name;
                 b(T, j);
               }
@@ -27349,7 +27373,7 @@ const useParseDefaultValue = () => {
       if (n && e && (isVariable(t.default) && e.value == null || e.value === t.default || R)) {
         isVariable(e.value) && (yield e.reset({ forceClear: !0 })), e.loading = !0;
         const D = !t.name.toString().includes(".") && (d == null ? void 0 : d.getField(t.name)), {
-          value: N,
+          value: $,
           collectionName: z,
           dataSource: L = "main"
         } = yield n.parseVariable(t.default, o, {
@@ -27364,10 +27388,10 @@ const useParseDefaultValue = () => {
           e.loading = !1;
           return;
         }
-        const $ = transformVariableValue(N, {
+        const B = transformVariableValue($, {
           targetCollectionField: D
         });
-        $ == null || $ === "" ? e.mounted && (e.setInitialValue(null), yield e.reset({ forceClear: !0 })) : p() ? h === 0 && m($) : e.setInitialValue($), e.loading = !1;
+        B == null || B === "" ? e.mounted && (e.setInitialValue(null), yield e.reset({ forceClear: !0 })) : p() ? h === 0 && m(B) : e.setInitialValue(B), e.loading = !1;
       } else
         !/\{\{.+\}\}/g.test(t.default) && e.setInitialValue && e.setInitialValue(t.default);
     }), v = _.debounce(y, DEBOUNCE_WAIT);
@@ -27375,7 +27399,7 @@ const useParseDefaultValue = () => {
       const R = getVariableName(t.default), T = S(R);
       return T ? (y(), reaction(
         () => {
-          const N = { [R]: (T == null ? void 0 : T.ctx) || {} }, z = getPath(t.default), L = getValuesByPath(N, z);
+          const $ = { [R]: (T == null ? void 0 : T.ctx) || {} }, z = getPath(t.default), L = getValuesByPath($, z);
           return L === void 0 ? Math.random() : L;
         },
         () => v({ forceUpdate: !0 }),
@@ -28754,24 +28778,24 @@ function Input$1(e) {
     hideVariableButton: m
   } = e, h = typeof e.scope == "function" ? e.scope() : e.scope, { wrapSSR: g, hashId: f, componentCls: C, rootPrefixCls: b } = useStyles$b({ hideVariableButton: m });
   useAntdInputStyle(`${b}-input`);
-  const S = useCompile(), { t: y } = useTranslation(), v = useForm(), [F, A] = React.useState([]), [R, T] = React.useState([]), [D, N] = React.useState(
+  const S = useCompile(), { t: y } = useTranslation(), v = useForm(), [F, A] = React.useState([]), [R, T] = React.useState([]), [D, $] = React.useState(
     m || !!(o && t != null)
-  ), z = useMemo(() => parseValue(t, p), [p, t]), L = typeof z == "string", $ = L ? z : "", w = L ? null : z, M = Object.assign(
+  ), z = useMemo(() => parseValue(t, p), [p, t]), L = typeof z == "string", B = L ? z : "", w = L ? null : z, M = Object.assign(
     {
       label: "label",
       value: "value",
       children: "children"
     },
     d != null ? d : {}
-  ), B = useMemo(() => o ? {
+  ), N = useMemo(() => o ? {
     value: "$",
     label: y("Constant"),
     [M.value]: "$",
     [M.label]: y("Constant")
-  } : i ? getTypedConstantOption($, i, M) : null, [$, i]), k = (H = B == null ? void 0 : B.component) != null ? H : NullComponent, j = Array.isArray(i) ? (X = (W = i.find((Y) => Array.isArray(Y) && Y[0] === $)) == null ? void 0 : W[1]) != null ? X : {} : {};
+  } : i ? getTypedConstantOption(B, i, M) : null, [B, i]), k = (H = N == null ? void 0 : N.component) != null ? H : NullComponent, j = Array.isArray(i) ? (X = (W = i.find((Y) => Array.isArray(Y) && Y[0] === B)) == null ? void 0 : W[1]) != null ? X : {} : {};
   let O;
-  t == null ? a ? o && D ? O = ["$"] : O = [""] : o ? O = ["$"] : O = [" ", $] : O = o ? ["$"] : [" ", $], m && (O = ["$"]), useEffect(() => {
-    const ee = B != null ? B : {}, { component: Y } = ee, J = K(ee, ["component"]), Q = [
+  t == null ? a ? o && D ? O = ["$"] : O = [""] : o ? O = ["$"] : O = [" ", B] : O = o ? ["$"] : [" ", B], m && (O = ["$"]), useEffect(() => {
+    const ee = N != null ? N : {}, { component: Y } = ee, J = K(ee, ["component"]), Q = [
       ...a ? [
         {
           value: "",
@@ -28780,11 +28804,11 @@ function Input$1(e) {
           [M.label]: y("Null")
         }
       ] : [],
-      ...B ? [S(J)] : [],
+      ...N ? [S(J)] : [],
       ...h ? [...h] : []
     ].filter((oe) => !oe.deprecated || (w == null ? void 0 : w[0]) === oe[M.value]);
     A(Q);
-  }, [h, w, B, a]);
+  }, [h, w, N, a]);
   const q = (Y) => V(this, null, function* () {
     var Q;
     const J = Y[Y.length - 1];
@@ -28803,29 +28827,29 @@ function Input$1(e) {
     (Y, J) => {
       var Q, ee, oe;
       if (Y[0] === "$") {
-        N(!0), w && n(null, J);
+        $(!0), w && n(null, J);
         return;
       } else
-        N(!1);
+        $(!1);
       if (Y[0] === "") {
         n(null);
         return;
       }
       if (Y[0] === " ") {
-        Y[1] ? Y[1] !== $ && n((oe = (ee = (Q = ConstantTypes[Y[1]]) == null ? void 0 : Q.default) == null ? void 0 : ee.call(Q)) != null ? oe : null, J) : w && n(null, J);
+        Y[1] ? Y[1] !== B && n((oe = (ee = (Q = ConstantTypes[Y[1]]) == null ? void 0 : Q.default) == null ? void 0 : ee.call(Q)) != null ? oe : null, J) : w && n(null, J);
         return;
       }
       n(`{{${Y.join(".")}}}`, J);
     },
-    [$, w, n]
+    [B, w, n]
   ), U = useCallback(() => {
     var Y;
-    if (N(!!o), (Y = B == null ? void 0 : B.children) != null && Y.length) {
-      const J = B.children[0].default();
+    if ($(!!o), (Y = N == null ? void 0 : N.children) != null && Y.length) {
+      const J = N.children[0].default();
       return n(J);
     }
     n(null);
-  }, [B]);
+  }, [N]);
   useEffect(() => {
     V(this, null, function* () {
       var ee;
@@ -29230,7 +29254,7 @@ function TextArea(e) {
       }
     }
   }, [F]);
-  const N = useCallback(
+  const $ = useCallback(
     function(j) {
       const O = j.filter((U) => !!U.trim()), { current: q } = m;
       if (!q || !O)
@@ -29249,7 +29273,7 @@ function TextArea(e) {
     [b, i, D]
   ), L = useCallback(function({ currentTarget: j }) {
     T(getCurrentRange(j));
-  }, []), $ = useCallback(function(j) {
+  }, []), B = useCallback(function(j) {
     j.key === "Enter" && j.preventDefault();
   }, []), w = useCallback(function() {
     S(!0);
@@ -29258,7 +29282,7 @@ function TextArea(e) {
       S(!1), v(!0), T(getCurrentRange(j)), i(getValue(j, u));
     },
     [i, D]
-  ), B = useCallback(
+  ), N = useCallback(
     function(j) {
       j.preventDefault();
       const O = j.clipboardData.getData("text/html") || j.clipboardData.getData("text"), q = sanitizeHTML(O, {
@@ -29316,8 +29340,8 @@ function TextArea(e) {
               "aria-label": "textbox",
               onInput: z,
               onBlur: L,
-              onKeyDown: $,
-              onPaste: B,
+              onKeyDown: B,
+              onPaste: N,
               onCompositionStart: w,
               onCompositionEnd: M,
               placeholder: e.placeholder,
@@ -29355,7 +29379,7 @@ function TextArea(e) {
             {
               options: h,
               setOptions: g,
-              onInsert: N,
+              onInsert: $,
               changeOnSelect: a,
               fieldNames: c || defaultFieldNames$2
             }
@@ -32903,7 +32927,111 @@ const tableBlockSettings = new SchemaSettings({
 }, cascadeSelectComponentFieldSettings = new SchemaSettings({
   name: "fieldSettings:component:CascadeSelect",
   items: [fieldComponent$7, titleField$2, ellipsisSettingsItem]
-}), datePickerComponentFieldSettings = new SchemaSettings({
+}), SchemaSettingsDateRange = function e(t) {
+  var R, T, D, $, z, L, B, w, M, N, k, j, O, q, E, U;
+  const { fieldSchema: n } = t, o = useField(), { dn: r } = useDesignable(), { t: i } = useTranslation(), { getCollectionJoinField: a } = useCollectionManager_deprecated(), { isInSubForm: l, isInSubTable: c } = useFlag() || {}, u = a(n == null ? void 0 : n["x-collection-field"]) || {}, d = ((R = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : R.showTime) || ((D = (T = u == null ? void 0 : u.uiSchema) == null ? void 0 : T["x-component-props"]) == null ? void 0 : D.showTime) || !1, p = (($ = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : $.dateFormat) || ((L = (z = u == null ? void 0 : u.uiSchema) == null ? void 0 : z["x-component-props"]) == null ? void 0 : L.dateFormat) || "YYYY-MM-DD", m = ((B = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : B.timeFormat) || ((M = (w = u == null ? void 0 : u.uiSchema) == null ? void 0 : w["x-component-props"]) == null ? void 0 : M.timeFormat) || "HH:mm:ss", h = ((N = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : N.picker) || ((j = (k = u == null ? void 0 : u.uiSchema) == null ? void 0 : k["x-component-props"]) == null ? void 0 : j.picker) || "date";
+  n["x-read-pretty"] || o.readOnly || o.readPretty;
+  const g = (O = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : O._minDate, f = (q = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : q._maxDate, C = ((E = u == null ? void 0 : u.uiSchema) == null ? void 0 : E["x-component-props"].gmt) || !1, b = ((U = u == null ? void 0 : u.uiSchema) == null ? void 0 : U["x-component-props"].utc) || !1, S = useRecord(), { form: y } = useFormBlockContext(), v = useCallback(
+    (G) => /* @__PURE__ */ jsx(
+      SchemaComponent,
+      {
+        schema: {
+          "x-component": "DatePicker",
+          "x-component-props": {
+            dateFormat: p,
+            timeFormat: m,
+            gmt: C,
+            utc: b,
+            picker: h,
+            showTime: d,
+            placeholder: '{{t("Please select time or variable")}}',
+            style: {
+              minWidth: 385
+            }
+          },
+          name: "value",
+          "x-read-pretty": !1,
+          "x-validator": void 0,
+          "x-decorator": void 0
+        }
+      }
+    ),
+    [p, C, h, d, m, b]
+  ), F = useCallback(
+    (G) => /* @__PURE__ */ jsx(
+      VariableInput,
+      P(x({}, G), {
+        form: y,
+        record: S,
+        noDisabled: !0,
+        renderSchemaComponent: v
+      })
+    ),
+    [n, y, S, v]
+  );
+  function A(G) {
+    if (G != null) {
+      if (typeof G == "string")
+        return G;
+      if (typeof G == "object" && Object.prototype.hasOwnProperty.call(G, "value"))
+        return A(G.value);
+    }
+  }
+  return /* @__PURE__ */ jsx(
+    SchemaSettingsModalItem,
+    {
+      title: i("Date range limit"),
+      schema: {
+        type: "object",
+        "x-decorator": "",
+        properties: {
+          _minDate: {
+            type: "string",
+            title: '{{t("MinDate")}}',
+            "x-decorator": "FormItem",
+            "x-component": F,
+            "x-component-props": {
+              name: "_minDate"
+            },
+            //日期和使用变量设置的默认值不同
+            default: isVariable(g) ? g : { value: g }
+          },
+          _maxDate: {
+            type: "string",
+            title: '{{t("MaxDate")}}',
+            "x-decorator": "FormItem",
+            "x-component": F,
+            "x-component-props": {
+              name: "_maxDate"
+            },
+            default: isVariable(f) ? f : { value: f }
+          }
+        }
+      },
+      onSubmit: (G) => {
+        const H = {
+          "x-uid": n["x-uid"]
+        };
+        H["x-component-props"] = o.componentProps || {}, n["x-component-props"] = P(x({}, o.componentProps || {}), {
+          _maxDate: A(G == null ? void 0 : G._maxDate),
+          _minDate: A(G == null ? void 0 : G._minDate)
+        }), H["x-component-props"] = n["x-component-props"], o.componentProps = n["x-component-props"];
+        const W = o.path.entire.split(".");
+        W.pop();
+        const X = W.join(".");
+        o.query(`${X}.*[0:].${n.name}`).forEach((Y) => {
+          Y.props.name === n.name && Y.setComponentProps({
+            _maxDate: A(G == null ? void 0 : G._maxDate),
+            _minDate: A(G == null ? void 0 : G._minDate)
+          });
+        }), r.emit("patch", {
+          schema: H
+        }), r.refresh();
+      },
+      ModalContextProvider: (G) => /* @__PURE__ */ jsx(FlagProvider, { isInSubForm: l, isInSubTable: c, isInFormDataTemplate: !0, children: G.children })
+    }
+  );
+}, datePickerComponentFieldSettings = new SchemaSettings({
   name: "fieldSettings:component:DatePicker",
   items: [
     {
@@ -32916,6 +33044,20 @@ const tableBlockSettings = new SchemaSettings({
         };
       }
     },
+    {
+      name: "dateScopeSelect",
+      Component: SchemaSettingsDateRange,
+      useComponentProps() {
+        const e = useFieldSchema(), { fieldSchema: t } = useColumnSchema$1();
+        return {
+          fieldSchema: t || e
+        };
+      },
+      useVisible() {
+        const { fieldSchema: e } = useColumnSchema$1(), t = useFieldSchema(), n = e || t;
+        return !(n != null && n["x-read-pretty"]);
+      }
+    },
     ellipsisSettingsItem,
     enableLinkSettingsItem,
     openModeSettingsItem
@@ -34391,22 +34533,22 @@ const variablesStore = {}, getFieldPath = (e, t) => {
       const y = C.split("."), v = y[0], F = mergeVariableToCollectionNameWithLocalVariables(variablesStore, b);
       let A = mergeCtxWithLocalVariables(n.current, b);
       const { fieldPath: R, dataSource: T, variableOption: D } = getFieldPath(v, F);
-      let N = R;
+      let $ = R;
       const { fieldPath: z } = getFieldPath(C, F), L = y.length === 1 ? D == null ? void 0 : D.collectionName : (w = r(z, T)) == null ? void 0 : w.target;
       if (!(v in A))
         throw new Error(`VariablesProvider: ${v} is not found`);
-      for (let B = 0; B < y.length; B++) {
+      for (let N = 0; N < y.length; N++) {
         if (A == null)
           return {
             value: A === void 0 ? D == null ? void 0 : D.defaultValue : A,
             dataSource: T,
             collectionName: L
           };
-        const k = y[B], { fieldPath: j } = getFieldPath(y.slice(0, B + 1).join("."), F), O = r(j, T), q = (M = i(N, T)) == null ? void 0 : M.getPrimaryKey();
+        const k = y[N], { fieldPath: j } = getFieldPath(y.slice(0, N + 1).join("."), F), O = r(j, T), q = (M = i($, T)) == null ? void 0 : M.getPrimaryKey();
         if (Array.isArray(A)) {
           const E = A.map((U) => {
             if (!(S != null && S.doNotRequest) && shouldToRequest(U == null ? void 0 : U[k]) && (U == null ? void 0 : U[q]) != null && O != null && O.target) {
-              const G = `/${N}/${U[O.sourceKey || q]}/${k}:${getAction(O.type)}`;
+              const G = `/${$}/${U[O.sourceKey || q]}/${k}:${getAction(O.type)}`;
               if (hasRequested(G))
                 return getRequested(G);
               const H = o.request({
@@ -34422,7 +34564,7 @@ const variablesStore = {}, getFieldPath = (e, t) => {
           });
           A = removeThroughCollectionFields(_.flatten(yield Promise.all(E)), O);
         } else if (!(S != null && S.doNotRequest) && shouldToRequest(A[k]) && A[q] != null && (O != null && O.target)) {
-          const E = `/${N}/${A[O.sourceKey || q]}/${k}:${getAction(O.type)}`;
+          const E = `/${$}/${A[O.sourceKey || q]}/${k}:${getAction(O.type)}`;
           let U = null;
           if (hasRequested(E))
             U = yield getRequested(E);
@@ -34439,13 +34581,13 @@ const variablesStore = {}, getFieldPath = (e, t) => {
           raw(A)[k] || (raw(A)[k] = U.data.data), A = removeThroughCollectionFields(getValuesByPath(A, k), O);
         } else
           A = removeThroughCollectionFields(getValuesByPath(A, k), O);
-        O != null && O.target && (N = O.target);
+        O != null && O.target && ($ = O.target);
       }
-      const $ = a(
+      const B = a(
         _.isFunction(A) ? A({ fieldOperator: S == null ? void 0 : S.fieldOperator, isParsingVariable: !0 }) : A
       );
       return {
-        value: $ === void 0 ? D.defaultValue : $,
+        value: B === void 0 ? D.defaultValue : B,
         dataSource: T,
         collectionName: L
       };
@@ -34809,7 +34951,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.5.0-beta.13", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.5.0-beta.15", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
   "@ahooksjs/use-url-state": "3.5.1",
   "@ant-design/cssinjs": "^1.11.1",
   "@ant-design/icons": "^5.1.4",
@@ -34831,9 +34973,9 @@ const name = "@nocobase/client", version = "1.5.0-beta.13", license = "AGPL-3.0"
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.5.0-beta.13",
-  "@nocobase/sdk": "1.5.0-beta.13",
-  "@nocobase/utils": "1.5.0-beta.13",
+  "@nocobase/evaluators": "1.5.0-beta.15",
+  "@nocobase/sdk": "1.5.0-beta.15",
+  "@nocobase/utils": "1.5.0-beta.15",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -35600,8 +35742,8 @@ const useFieldComponentOptions = () => {
   const { refresh: t } = useDesignable(), n = useAPIClient(), { t: o } = useTranslation();
   return useCallback(
     (r) => {
-      var f, C, b, S, y, v, F, A, R, T, D, N, z, L, $;
-      const { active: i, over: a } = r, l = (C = (f = i == null ? void 0 : i.data) == null ? void 0 : f.current) == null ? void 0 : C.schema, c = (S = (b = a == null ? void 0 : a.data) == null ? void 0 : b.current) == null ? void 0 : S.schema, u = (v = (y = a == null ? void 0 : a.data) == null ? void 0 : y.current) == null ? void 0 : v.insertAdjacent, d = (A = (F = a == null ? void 0 : a.data) == null ? void 0 : F.current) == null ? void 0 : A.breakRemoveOn, p = (T = (R = a == null ? void 0 : a.data) == null ? void 0 : R.current) == null ? void 0 : T.wrapSchema, m = (N = (D = a == null ? void 0 : a.data) == null ? void 0 : D.current) == null ? void 0 : N.onSuccess, h = ($ = (L = (z = a == null ? void 0 : a.data) == null ? void 0 : z.current) == null ? void 0 : L.removeParentsIfNoChildren) != null ? $ : !0;
+      var f, C, b, S, y, v, F, A, R, T, D, $, z, L, B;
+      const { active: i, over: a } = r, l = (C = (f = i == null ? void 0 : i.data) == null ? void 0 : f.current) == null ? void 0 : C.schema, c = (S = (b = a == null ? void 0 : a.data) == null ? void 0 : b.current) == null ? void 0 : S.schema, u = (v = (y = a == null ? void 0 : a.data) == null ? void 0 : y.current) == null ? void 0 : v.insertAdjacent, d = (A = (F = a == null ? void 0 : a.data) == null ? void 0 : F.current) == null ? void 0 : A.breakRemoveOn, p = (T = (R = a == null ? void 0 : a.data) == null ? void 0 : R.current) == null ? void 0 : T.wrapSchema, m = ($ = (D = a == null ? void 0 : a.data) == null ? void 0 : D.current) == null ? void 0 : $.onSuccess, h = (B = (L = (z = a == null ? void 0 : a.data) == null ? void 0 : z.current) == null ? void 0 : L.removeParentsIfNoChildren) != null ? B : !0;
       if (!l || !c) {
         e == null || e(r);
         return;
@@ -36136,30 +36278,30 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
         "dataSource",
         "toOptionsItem",
         "popupMatchSelectWidth"
-      ]), C = useDataSourceKey(), b = useDataSourceHeaders(m || C), [S, y] = useState(!1), v = useRef(!1), F = useFieldSchema(), A = ((X = F["x-component-props"]) == null ? void 0 : X.addMode) === "quickAdd", { getField: R } = useCollection_deprecated(), T = useRef(null), { getCollectionJoinField: D, getInterface: N } = useCollectionManager_deprecated(), z = F["x-collection-field"] || F.name, L = R(z) || D(z), $ = u || (L == null ? void 0 : L.target) && (t == null ? void 0 : t.label) && D(`${L.target}.${t.label}`), w = useMemo(() => {
+      ]), C = useDataSourceKey(), b = useDataSourceHeaders(m || C), [S, y] = useState(!1), v = useRef(!1), F = useFieldSchema(), A = ((X = F["x-component-props"]) == null ? void 0 : X.addMode) === "quickAdd", { getField: R } = useCollection_deprecated(), T = useRef(null), { getCollectionJoinField: D, getInterface: $ } = useCollectionManager_deprecated(), z = F["x-collection-field"] || F.name, L = R(z) || D(z), B = u || (L == null ? void 0 : L.target) && (t == null ? void 0 : t.label) && D(`${L.target}.${t.label}`), w = useMemo(() => {
         var J;
-        if ($ != null && $.interface) {
-          const Q = N($.interface), ee = ((J = Q == null ? void 0 : Q.filterable) == null ? void 0 : J.operators[0].value) || "$includes";
-          return $.type === "string" ? "$includes" : ee;
+        if (B != null && B.interface) {
+          const Q = $(B.interface), ee = ((J = Q == null ? void 0 : Q.filterable) == null ? void 0 : J.operators[0].value) || "$includes";
+          return B.type === "string" ? "$includes" : ee;
         }
         return "$includes";
-      }, [$]), M = useCompile(), B = useCallback(
+      }, [B]), M = useCompile(), N = useCallback(
         (J) => {
           try {
             return J.filter((Q) => ["number", "string"].includes(typeof Q[t.value]) || !Q[t.value]).map((Q) => {
               var oe;
               let ee = M(Q[t.label]);
-              if ((oe = $ == null ? void 0 : $.uiSchema) != null && oe.enum)
+              if ((oe = B == null ? void 0 : B.uiSchema) != null && oe.enum)
                 if (Array.isArray(ee))
                   ee = ee.map((te, ie) => {
-                    const ae = $.uiSchema.enum.find((ue) => ue.value === te);
+                    const ae = B.uiSchema.enum.find((ue) => ue.value === te);
                     return ae ? /* @__PURE__ */ jsx(Tag, { role: "button", color: ae.color, style: { marginRight: 3 }, children: (ae == null ? void 0 : ae.label) || te }, ie) : /* @__PURE__ */ jsx(Tag, { role: "button", children: te }, te);
                   }).reverse();
                 else {
-                  const te = $.uiSchema.enum.find((ie) => ie.value === ee);
+                  const te = B.uiSchema.enum.find((ie) => ie.value === ee);
                   te && (ee = /* @__PURE__ */ jsx(Tag, { role: "button", color: te.color, children: te.label }));
                 }
-              return ($ == null ? void 0 : $.type) === "date" && (ee = dayjs(ee).format("YYYY-MM-DD")), c ? c({
+              return (B == null ? void 0 : B.type) === "date" && (ee = dayjs(ee).format("YYYY-MM-DD")), c ? c({
                 [t.label]: ee || EMPTY$1,
                 [t.value]: Q[t.value]
               }) : P(x({}, Q), {
@@ -36171,7 +36313,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
             return console.error(Q), J;
           }
         },
-        [$ == null ? void 0 : $.uiSchema, t]
+        [B == null ? void 0 : B.uiSchema, t]
       ), { data: k, run: j, loading: O } = useRequest(
         P(x({
           action: "list"
@@ -36243,7 +36385,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
           defaultValue: i
         }, f), {
           loading: k ? O : !0,
-          options: h(B(G)),
+          options: h(N(G)),
           rawOptions: G,
           dropdownRender: (J) => {
             const Q = G.some((ee) => ee[t.label] === T.current);
@@ -36321,11 +36463,11 @@ const useFormDataTemplates = () => {
     d(A), m(null), t == null || t.reset();
   }), []), v = useCallback((A, R, T) => V(void 0, null, function* () {
     const D = P(x({}, R), { dataId: A });
-    m(R), fetchTemplateData(h, D, T).then((N) => (t && N && (t.reset(), t.__template = !0, forEach(N, (z, L) => {
-      var $;
-      z && (t.values[L] = z, ($ = t == null ? void 0 : t.setInitialValuesIn) == null || $.call(t, L, z));
-    })), N)).catch((N) => {
-      console.error(N);
+    m(R), fetchTemplateData(h, D, T).then(($) => (t && $ && (t.reset(), t.__template = !0, forEach($, (z, L) => {
+      var B;
+      z && (t.values[L] = z, (B = t == null ? void 0 : t.setInitialValuesIn) == null || B.call(t, L, z));
+    })), $)).catch(($) => {
+      console.error($);
     });
   }), []);
   if (!i || !r)
@@ -36445,45 +36587,49 @@ const useFormBlockHeight = () => {
     n["x-linkage-rules"] && (t = n["x-linkage-rules"]);
   }), t;
 }, WithForm = (e) => {
-  var c, u;
-  const { form: t } = e, n = useFieldSchema(), { setFormValueChanged: o } = useActionContext(), r = useVariables$1(), i = useLocalVariables$1({ currentForm: t }), { templateFinished: a } = useTemplateBlockContext(), l = ((u = getLinkageRules(n) || ((c = n.parent) == null ? void 0 : c["x-linkage-rules"])) == null ? void 0 : u.filter((d) => !d.disabled)) || [];
+  var u, d;
+  const { form: t } = e, n = useFieldSchema(), { setFormValueChanged: o } = useActionContext(), r = useVariables$1(), i = useLocalVariables$1({ currentForm: t }), { templateFinished: a } = useTemplateBlockContext(), { loading: l } = useDataBlockRequest() || {}, c = ((d = getLinkageRules(n) || ((u = n.parent) == null ? void 0 : u["x-linkage-rules"])) == null ? void 0 : d.filter((p) => !p.disabled)) || [];
   return useEffect(() => {
-    const d = uid();
-    return t.addEffects(d, () => {
+    const p = uid();
+    return t.addEffects(p, () => {
       onFormInputChange(() => {
         o == null || o(!0);
       });
     }), e.disabled && (t.disabled = e.disabled), () => {
-      t.removeEffects(d);
+      t.removeEffects(p);
     };
   }, [t, e.disabled, o]), useEffect(() => {
-    const d = uid(), p = [];
-    return t.addEffects(d, () => {
-      forEachLinkageRule(l, (m, h) => {
-        var g;
-        if ((g = m.targetFields) != null && g.length) {
-          const f = m.targetFields.join(",");
-          onFieldInit(`*(${f})`, (C, b) => {
-            p.push(
-              bindLinkageRulesToFiled({
-                field: C,
-                linkageRules: l,
-                formValues: b.values,
-                localVariables: i,
-                action: m,
-                rule: h,
-                variables: r
-              })
-            );
-          });
-        }
+    if (l)
+      return;
+    const p = uid(), m = [];
+    return setTimeout(() => {
+      t.addEffects(p, () => {
+        forEachLinkageRule(c, (h, g) => {
+          var f;
+          if ((f = h.targetFields) != null && f.length) {
+            const C = h.targetFields.join(",");
+            onFieldInit(`*(${C})`, (b, S) => {
+              m.push(
+                bindLinkageRulesToFiled({
+                  field: b,
+                  linkageRules: c,
+                  formValues: S.values,
+                  localVariables: i,
+                  action: h,
+                  rule: g,
+                  variables: r
+                })
+              );
+            });
+          }
+        });
       });
     }), () => {
-      t.removeEffects(d), p.forEach((m) => {
-        m();
+      t.removeEffects(p), m.forEach((h) => {
+        h();
       });
     };
-  }, [l, a]), n["x-decorator"] === "FormV2" ? /* @__PURE__ */ jsx(FormDecorator, x({}, e)) : /* @__PURE__ */ jsx(FormComponent, x({}, e));
+  }, [c, a, l]), n["x-decorator"] === "FormV2" ? /* @__PURE__ */ jsx(FormDecorator, x({}, e)) : /* @__PURE__ */ jsx(FormComponent, x({}, e));
 }, WithoutForm = (e) => {
   const t = useFieldSchema(), { setFormValueChanged: n } = useActionContext(), o = useMemo(
     () => createForm({
@@ -37621,16 +37767,16 @@ const AppendsTreeSelect = (e) => {
     "filter",
     "rootOption",
     "loadData"
-  ]), d = useCompile(), { t: p } = useTranslation(), [m, h] = useState({}), g = i({ collection: r }), [f, C] = parseCollectionName(g), b = useApp(), { collectionManager: S } = b.dataSourceManager.getDataSource(f), y = (L, $) => {
+  ]), d = useCompile(), { t: p } = useTranslation(), [m, h] = useState({}), g = i({ collection: r }), [f, C] = parseCollectionName(g), b = useApp(), { collectionManager: S } = b.dataSourceManager.getDataSource(f), y = (L, B) => {
     const w = S.getCollection(L);
-    return w ? w.getAllFields($) : [];
+    return w ? w.getAllFields(B) : [];
   }, v = Object.values(m), F = useMemo(() => e.multiple ? (n || []).map((L) => m[L]).filter(Boolean) : n, [n, e.multiple, m]), A = useCallback(
     (L) => V(void 0, null, function* () {
       if (c != null)
         return c(L);
       if (!L.isLeaf && L.loadChildren) {
-        const $ = L.loadChildren(L);
-        h((w) => $.reduce((M, B) => Object.assign(M, { [B.value]: B }), x({}, w)));
+        const B = L.loadChildren(L);
+        h((w) => B.reduce((M, N) => Object.assign(M, { [N.value]: N }), x({}, w)));
       }
     }),
     [c]
@@ -37642,28 +37788,28 @@ const AppendsTreeSelect = (e) => {
       title: l.label,
       fullTitle: l.label,
       isLeaf: !1
-    }) : null, w = (c === null ? [] : getCollectionFieldOptions.call({ compile: d, getCollectionFields: y, filter: a }, C, L)).reduce((M, B) => Object.assign(M, { [B.value]: B }), {});
+    }) : null, w = (c === null ? [] : getCollectionFieldOptions.call({ compile: d, getCollectionFields: y, filter: a }, C, L)).reduce((M, N) => Object.assign(M, { [N.value]: N }), {});
     L && (w[L.value] = L), h(w);
   }, [g, l, a, c]), useEffect(() => {
     const L = e.multiple ? n : n ? [n] : [];
     if (!(L != null && L.length) || L.every((w) => !!m[w]))
       return;
-    const $ = [];
+    const B = [];
     L.forEach((w) => {
       const M = w.split(".");
-      let B = m[M[0]];
-      for (let k = 1; k < M.length && B; k++) {
+      let N = m[M[0]];
+      for (let k = 1; k < M.length && N; k++) {
         const j = M.slice(0, k + 1).join(".");
         if (m[j]) {
-          B = m[j];
+          N = m[j];
           break;
         }
-        if (!B.isLeaf && B.loadChildren) {
-          const O = B.loadChildren(B);
-          O != null && O.length && ($.push(...O), B = O.find((q) => q.value === M.slice(0, k + 1).join(".")));
+        if (!N.isLeaf && N.loadChildren) {
+          const O = N.loadChildren(N);
+          O != null && O.length && (B.push(...O), N = O.find((q) => q.value === M.slice(0, k + 1).join(".")));
         }
       }
-    }), h((w) => $.reduce((M, B) => Object.assign(M, { [B.value]: B }), x({}, w)));
+    }), h((w) => B.reduce((M, N) => Object.assign(M, { [N.value]: N }), x({}, w)));
   }, [n, v.length, e.multiple]);
   const R = useCallback(
     (L) => {
@@ -37671,15 +37817,15 @@ const AppendsTreeSelect = (e) => {
         o(L);
         return;
       }
-      const $ = L.map((B) => B.value).filter(Boolean), w = new Set($), M = F.find((B) => !w.has(B.value));
+      const B = L.map((N) => N.value).filter(Boolean), w = new Set(B), M = F.find((N) => !w.has(N.value));
       if (M) {
-        const B = `${M.value}.`;
+        const N = `${M.value}.`;
         Object.keys(m).forEach((k) => {
-          k.startsWith(B) && w.delete(k);
+          k.startsWith(N) && w.delete(k);
         });
       } else
-        $.forEach((B) => {
-          const k = B.split(".");
+        B.forEach((N) => {
+          const k = N.split(".");
           if (k.length)
             for (let j = 1; j <= k.length; j++)
               w.add(k.slice(0, j).join("."));
@@ -37690,14 +37836,14 @@ const AppendsTreeSelect = (e) => {
   ), T = useCallback(
     (L) => {
       var j;
-      const { value: $, onClose: w, disabled: M, closable: B } = L;
-      if (!$)
+      const { value: B, onClose: w, disabled: M, closable: N } = L;
+      if (!B)
         return null;
-      const { fullTitle: k } = (j = m[$]) != null ? j : {};
-      return /* @__PURE__ */ jsx(Tag, { closable: B && !M, onClose: w, children: k == null ? void 0 : k.join(" / ") });
+      const { fullTitle: k } = (j = m[B]) != null ? j : {};
+      return /* @__PURE__ */ jsx(Tag, { closable: N && !M, onClose: w, children: k == null ? void 0 : k.join(" / ") });
     },
     [m]
-  ), D = Array.isArray(F) ? F.filter((L) => L.value in m) : F, N = e.multiple ? n : n != null ? [n] : [];
+  ), D = Array.isArray(F) ? F.filter((L) => L.value in m) : F, $ = e.multiple ? n : n != null ? [n] : [];
   return /* @__PURE__ */ jsx(
     TreeSelect$2,
     x({
@@ -37706,7 +37852,7 @@ const AppendsTreeSelect = (e) => {
       value: D,
       placeholder: p("Select field"),
       showCheckedStrategy: TreeSelect$2.SHOW_ALL,
-      treeDefaultExpandedKeys: N,
+      treeDefaultExpandedKeys: $,
       allowClear: {
         clearIcon: /* @__PURE__ */ jsx(CloseCircleFilled, { role: "button", "aria-label": "icon-close" })
       },
@@ -37742,8 +37888,8 @@ const AppendsTreeSelect = (e) => {
       const R = uid();
       return f.addEffects(R, () => {
         onFieldInputValueChange("*", (T) => {
-          var N, z, L, $, w;
-          (filterAnalyses((L = (z = (N = r.componentProps) == null ? void 0 : N.service) == null ? void 0 : z.params) == null ? void 0 : L.filter) || []).includes(($ = T == null ? void 0 : T.props) == null ? void 0 : $.name) && r.value && isEqual(T == null ? void 0 : T.indexes, r == null ? void 0 : r.indexes) && ((w = T == null ? void 0 : T.props) == null ? void 0 : w.name) !== r.props.name && (r.setValue(void 0), p(void 0));
+          var $, z, L, B, w;
+          (filterAnalyses((L = (z = ($ = r.componentProps) == null ? void 0 : $.service) == null ? void 0 : z.params) == null ? void 0 : L.filter) || []).includes((B = T == null ? void 0 : T.props) == null ? void 0 : B.name) && r.value && isEqual(T == null ? void 0 : T.indexes, r == null ? void 0 : r.indexes) && ((w = T == null ? void 0 : T.props) == null ? void 0 : w.name) !== r.props.name && (r.setValue(void 0), p(void 0));
         });
       }), () => {
         f.removeEffects(R);
@@ -37752,18 +37898,18 @@ const AppendsTreeSelect = (e) => {
     const y = (R) => V(void 0, null, function* () {
       var z, L;
       const { search: T, callBack: D } = R, {
-        data: { data: N }
+        data: { data: $ }
       } = yield b.create({
         values: {
           [((L = (z = r == null ? void 0 : r.componentProps) == null ? void 0 : z.fieldNames) == null ? void 0 : L.label) || "id"]: T
         }
       });
-      if (N) {
+      if ($) {
         if (["m2m", "o2m"].includes(l == null ? void 0 : l.interface) && g !== !1) {
-          const $ = f.getValuesIn(r.path) || [];
-          $.push(N), f.setValuesIn(r.path, $), r.onInput($);
+          const B = f.getValuesIn(r.path) || [];
+          B.push($), f.setValuesIn(r.path, B), r.onInput(B);
         } else
-          f.setValuesIn(r.path, N), r.onInput(N);
+          f.setValuesIn(r.path, $), r.onInput($);
         isFunction(D) && (D == null || D()), message.success(h("Saved successfully"));
       }
     }), v = (R) => /* @__PURE__ */ jsxs(
@@ -38349,17 +38495,17 @@ function Uploader(n) {
     (R) => {
       var T;
       if (i) {
-        const D = R.fileList.filter((N) => N.status === "done");
+        const D = R.fileList.filter(($) => $.status === "done");
         if (D.length) {
-          const N = [...a != null ? a : [], ...D.map((z) => {
+          const $ = [...a != null ? a : [], ...D.map((z) => {
             var L;
             return c((L = z.response) == null ? void 0 : L.data);
           })];
-          l == null || l(N);
+          l == null || l($);
         }
-        d(R.fileList.filter((N) => N.status !== "done").map(normalizeFile));
+        d(R.fileList.filter(($) => $.status !== "done").map(normalizeFile));
       } else {
-        const D = R.fileList.find((N) => N.uid === R.file.uid);
+        const D = R.fileList.find(($) => $.uid === R.file.uid);
         D.status === "done" ? (l == null || l(c((T = D.response) == null ? void 0 : T.data)), d([])) : d([normalizeFile(D)]);
       }
     },
@@ -38681,16 +38827,16 @@ function FileSelector(e) {
   );
 }
 const InternalFileManager = (e) => {
-  var D, N;
+  var D, $;
   const T = e, { value: t, multiple: n, onChange: o } = T, r = K(T, ["value", "multiple", "onChange"]), i = useFieldSchema(), [a, l] = useState(!1), [c, u] = useState([]), d = useInsertSchema$1("Selector"), p = useFieldNames$1(e), { designable: m } = useDesignable(), h = useField(), [g, f] = useState([]), { getField: C } = useCollection_deprecated(), b = C(h.props.name), S = useLabelUiSchema$1(b == null ? void 0 : b.target, (p == null ? void 0 : p.label) || "label"), y = useCompile(), { modalProps: v } = useActionContext(), F = (z) => {
-    z.stopPropagation(), z.preventDefault(), m ? d(schema$1.Selector) : i.reduceProperties(($, w) => w["x-component"] === "AssociationField.Selector" ? w : $, null) || i.addProperty("selector", schema$1.Selector), l(!0), u([]);
+    z.stopPropagation(), z.preventDefault(), m ? d(schema$1.Selector) : i.reduceProperties((B, w) => w["x-component"] === "AssociationField.Selector" ? w : B, null) || i.addProperty("selector", schema$1.Selector), l(!0), u([]);
   };
   useEffect(() => {
     if (t && Object.keys(t).length > 0) {
       const z = (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((L) => {
-        const $ = L[p.label];
+        const B = L[p.label];
         return P(x({}, L), {
-          [p.label]: getLabelFormatValue$1(y(S), y($))
+          [p.label]: getLabelFormatValue$1(y(S), y(B))
         });
       });
       f(z);
@@ -38710,10 +38856,10 @@ const InternalFileManager = (e) => {
     setSelectedRows: u,
     collectionField: b
   }, R = () => {
-    const { setVisible: z } = useActionContext(), { multiple: L, selectedRows: $, onChange: w, options: M, collectionField: B } = useContext(RecordPickerContext);
+    const { setVisible: z } = useActionContext(), { multiple: L, selectedRows: B, onChange: w, options: M, collectionField: N } = useContext(RecordPickerContext);
     return {
       onClick() {
-        w(L ? unionBy($, M, (B == null ? void 0 : B.targetKey) || "id") : ($ == null ? void 0 : $[0]) || null), z(!1);
+        w(L ? unionBy(B, M, (N == null ? void 0 : N.targetKey) || "id") : (B == null ? void 0 : B[0]) || null), z(!1);
       }
     };
   };
@@ -38724,7 +38870,7 @@ const InternalFileManager = (e) => {
         value: n ? g : g == null ? void 0 : g[0],
         multiple: n,
         quickUpload: ((D = i["x-component-props"]) == null ? void 0 : D.quickUpload) !== !1,
-        selectFile: ((N = i["x-component-props"]) == null ? void 0 : N.selectFile) !== !1,
+        selectFile: (($ = i["x-component-props"]) == null ? void 0 : $.selectFile) !== !1,
         action: `${b == null ? void 0 : b.target}:create`,
         onSelect: F,
         onChange: o
@@ -38769,27 +38915,27 @@ const InternalFileManager = (e) => {
   const { data: t, mapOptions: n, onChange: o, value: r } = e, [i, a] = useState([
     { key: void 0, children: [], value: null }
   ]), [l, c] = useState(t), [u, d] = useState(!1), p = useCompile(), m = useAPIClient(), h = useServiceOptions$1(e), { options: g, field: f } = useAssociationFieldContext(), C = m.resource(g.target), { getCollectionJoinField: b, getInterface: S } = useCollectionManager_deprecated(), y = (L = f == null ? void 0 : f.componentProps) == null ? void 0 : L.fieldNames, v = (g == null ? void 0 : g.target) && (y == null ? void 0 : y.label) && b(`${g.target}.${y.label}`), F = useMemo(() => {
-    var $, w;
-    return v != null && v.interface && ((w = ($ = S(v.interface)) == null ? void 0 : $.filterable) == null ? void 0 : w.operators[0].value) || "$includes";
+    var B, w;
+    return v != null && v.interface && ((w = (B = S(v.interface)) == null ? void 0 : B.filterable) == null ? void 0 : w.operators[0].value) || "$includes";
   }, [v]), A = useField();
   useEffect(() => {
-    var $;
+    var B;
     if (r) {
-      const w = Array.isArray(r) ? extractLastNonNullValueObjects(r == null ? void 0 : r.filter((B) => B.value), !0) : transformNestedData(r), M = ($ = w == null ? void 0 : w.map) == null ? void 0 : $.call(w, (B) => ({
-        key: B.parentId,
+      const w = Array.isArray(r) ? extractLastNonNullValueObjects(r == null ? void 0 : r.filter((N) => N.value), !0) : transformNestedData(r), M = (B = w == null ? void 0 : w.map) == null ? void 0 : B.call(w, (N) => ({
+        key: N.parentId,
         children: [],
-        value: B
+        value: N
       }));
       a(M);
     }
   }, []);
   const R = useCallback(
-    ($) => {
+    (B) => {
       try {
-        return $ == null ? void 0 : $.filter((w) => ["number", "string"].includes(typeof w[y.value])).map((w) => {
-          var B, k, j;
+        return B == null ? void 0 : B.filter((w) => ["number", "string"].includes(typeof w[y.value])).map((w) => {
+          var N, k, j;
           let M = p(w[y.label]);
-          if ((B = v == null ? void 0 : v.uiSchema) != null && B.enum)
+          if ((N = v == null ? void 0 : v.uiSchema) != null && N.enum)
             if (Array.isArray(M))
               M = M.map((O, q) => {
                 var U, G;
@@ -38809,52 +38955,52 @@ const InternalFileManager = (e) => {
           });
         }).filter(Boolean);
       } catch (w) {
-        return console.error(w), $;
+        return console.error(w), B;
       }
     },
     [v == null ? void 0 : v.uiSchema, y]
-  ), T = ($) => V(void 0, null, function* () {
+  ), T = (B) => V(void 0, null, function* () {
     var M;
     const w = yield C.list({
       pageSize: 200,
       params: h == null ? void 0 : h.params,
-      filter: mergeFilter([$]),
-      tree: $.parentId ? void 0 : !0
+      filter: mergeFilter([B]),
+      tree: B.parentId ? void 0 : !0
     });
     return (M = w == null ? void 0 : w.data) == null ? void 0 : M.data;
-  }), D = ($, w, M) => V(void 0, null, function* () {
-    const B = yield T({ parentId: w == null ? void 0 : w.id }), k = [...i];
-    if (k.splice(M + 1), k[M] = P(x({}, k[M]), { value: w }), w != null && w.id && (k[M + 1] = { key: w == null ? void 0 : w.id, children: (B == null ? void 0 : B.length) > 0 ? B : null }), a(k), ["o2m", "m2m"].includes(g.interface)) {
+  }), D = (B, w, M) => V(void 0, null, function* () {
+    const N = yield T({ parentId: w == null ? void 0 : w.id }), k = [...i];
+    if (k.splice(M + 1), k[M] = P(x({}, k[M]), { value: w }), w != null && w.id && (k[M + 1] = { key: w == null ? void 0 : w.id, children: (N == null ? void 0 : N.length) > 0 ? N : null }), a(k), ["o2m", "m2m"].includes(g.interface)) {
       const j = Array.isArray(f.fieldValue) ? f.fieldValue : [];
       j[A.index] = w, f.fieldValue = j;
     } else
       f.value = w;
     o == null || o(k);
-  }), N = ($, w, M) => V(void 0, null, function* () {
-    var B, k, j;
-    if ($) {
+  }), $ = (B, w, M) => V(void 0, null, function* () {
+    var N, k, j;
+    if (B) {
       d(!0);
       const O = yield T({ parentId: w == null ? void 0 : w.key });
-      if (d(!1), c(O), M === (i == null ? void 0 : i.length) - 1 && ((B = w == null ? void 0 : w.value) != null && B.id)) {
+      if (d(!1), c(O), M === (i == null ? void 0 : i.length) - 1 && ((N = w == null ? void 0 : w.value) != null && N.id)) {
         const q = yield T({ parentId: (k = w == null ? void 0 : w.value) == null ? void 0 : k.id }), E = [...i];
         E.splice(M + 1), E[M] = P(x({}, E[M]), { value: w == null ? void 0 : w.value }), E[M + 1] = { key: (j = w == null ? void 0 : w.value) == null ? void 0 : j.id, children: (q == null ? void 0 : q.length) > 0 ? q : null }, a(E), o == null || o(E);
       }
     }
-  }), z = ($, w) => V(void 0, null, function* () {
-    const M = $ ? {
+  }), z = (B, w) => V(void 0, null, function* () {
+    const M = B ? {
       [y.label]: {
-        [F]: $
+        [F]: B
       }
     } : {};
     d(!0);
-    const B = yield T(P(x({}, M), {
+    const N = yield T(P(x({}, M), {
       parentId: w == null ? void 0 : w.key
     }));
-    d(!1), c(B);
+    d(!1), c(N);
   });
-  return /* @__PURE__ */ jsx(Space$1, { wrap: !0, children: i.map(($, w) => {
-    var M, B, k;
-    return $.children && /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsx(Space$1, { wrap: !0, children: i.map((B, w) => {
+    var M, N, k;
+    return B.children && /* @__PURE__ */ jsx(
       Select$1,
       {
         disabled: f.disabled,
@@ -38864,19 +39010,19 @@ const InternalFileManager = (e) => {
         filterOption: !1,
         filterSort: null,
         defaultValue: {
-          label: (M = $ == null ? void 0 : $.value) == null ? void 0 : M[y.label],
-          value: (B = $ == null ? void 0 : $.value) == null ? void 0 : B[y.value]
+          label: (M = B == null ? void 0 : B.value) == null ? void 0 : M[y.label],
+          value: (N = B == null ? void 0 : B.value) == null ? void 0 : N[y.value]
         },
         labelInValue: !0,
-        onSearch: (j) => z(j, $),
+        onSearch: (j) => z(j, B),
         fieldNames: y,
         style: { minWidth: 150 },
         onChange: (j, O) => D(j, O, w),
         options: u ? [] : R(l),
-        onDropdownVisibleChange: (j) => N(j, $, w),
+        onDropdownVisibleChange: (j) => $(j, B, w),
         notFoundContent: u ? /* @__PURE__ */ jsx(Spin, { size: "small" }) : null
       },
-      `${(k = $.value) == null ? void 0 : k.id}+ ${$.key} + ${y.label}`
+      `${(k = B.value) == null ? void 0 : k.id}+ ${B.key} + ${y.label}`
     );
   }) });
 }), AssociationCascadeSelect = connect((e) => /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(CascadeSelect, x({}, e)) })), InternalCascadeSelect = observer$1(
@@ -39086,11 +39232,11 @@ const InternalNesterCss = css`
   });
 }, InternalPicker = observer$1(
   (e) => {
-    var $;
+    var B;
     const L = e, { value: t, multiple: n, openSize: o, onChange: r, quickUpload: i, selectFile: a, shouldMountElement: l } = L, c = K(L, ["value", "multiple", "openSize", "onChange", "quickUpload", "selectFile", "shouldMountElement"]), u = useField(), d = useFieldNames$1(e), [p, m] = useState(!1), h = useFieldSchema(), g = useInsertSchema$1("Selector"), { options: f } = useAssociationFieldContext(), { collectionName: C } = useFormBlockContext(), b = useCompile(), S = useLabelUiSchema$1(f, (d == null ? void 0 : d.label) || "label"), y = h["x-add-new"], [v, F] = useState([]), A = useCollectionRecordData(), R = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((M) => {
-      const B = M == null ? void 0 : M[d.label];
+      const N = M == null ? void 0 : M[d.label];
       return P(x({}, M), {
-        [d.label]: getLabelFormatValue$1(b(S), b(B))
+        [d.label]: getLabelFormatValue$1(b(S), b(N))
       });
     }) : [], [t, d == null ? void 0 : d.label]), T = {
       size: "small",
@@ -39108,14 +39254,14 @@ const InternalNesterCss = css`
     }, D = () => {
       var w;
       return n == null ? null : Array.isArray(t) ? (w = t.filter(Boolean)) == null ? void 0 : w.map((M) => M == null ? void 0 : M[d.value]) : t == null ? void 0 : t[d.value];
-    }, N = () => {
+    }, $ = () => {
       const w = (f == null ? void 0 : f.targetKey) || "id", M = R.map((k) => k[w]).filter(Boolean);
       return M.length ? { $and: [{ [`${w}.$ne`]: M }] } : {};
     }, z = () => {
-      const { setVisible: w } = useActionContext(), { multiple: M, selectedRows: B, onChange: k, options: j, collectionField: O } = useContext(RecordPickerContext);
+      const { setVisible: w } = useActionContext(), { multiple: M, selectedRows: N, onChange: k, options: j, collectionField: O } = useContext(RecordPickerContext);
       return {
         onClick() {
-          k(M ? unionBy(B, j, (O == null ? void 0 : O.targetKey) || "id") : (B == null ? void 0 : B[0]) || null), w(!1);
+          k(M ? unionBy(N, j, (O == null ? void 0 : O.targetKey) || "id") : (N == null ? void 0 : N[0]) || null), w(!1);
         },
         style: {
           display: M !== !1 && ["o2m", "m2m", "mbm"].includes(O == null ? void 0 : O.interface) ? "block" : "none"
@@ -39145,7 +39291,7 @@ const InternalNesterCss = css`
                     r([]), F([]);
                     return;
                   }
-                  const M = R == null ? void 0 : R.filter((B) => w.includes(B[d.value]));
+                  const M = R == null ? void 0 : R.filter((N) => w.includes(N[d.value]));
                   r(M), F(M);
                 }
               } else {
@@ -39172,12 +39318,12 @@ const InternalNesterCss = css`
         ActionContextProvider,
         {
           value: {
-            openSize: (($ = h["x-component-props"]) == null ? void 0 : $.openSize) || o,
+            openSize: ((B = h["x-component-props"]) == null ? void 0 : B.openSize) || o,
             openMode: "drawer",
             visible: p,
             setVisible: m
           },
-          children: /* @__PURE__ */ jsx(RecordPickerProvider, P(x({}, T), { children: /* @__PURE__ */ jsx(CollectionProvider_deprecated, { name: f == null ? void 0 : f.target, children: /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(TableSelectorParamsProvider, { params: { filter: N() }, children: /* @__PURE__ */ jsx(
+          children: /* @__PURE__ */ jsx(RecordPickerProvider, P(x({}, T), { children: /* @__PURE__ */ jsx(CollectionProvider_deprecated, { name: f == null ? void 0 : f.target, children: /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(TableSelectorParamsProvider, { params: { filter: $() }, children: /* @__PURE__ */ jsx(
             SchemaComponentOptions,
             {
               scope: {
@@ -39227,10 +39373,10 @@ const RenderRecord = React.memo(
     const F = useCallback(() => v.current, []);
     return useEffect(() => {
       const A = toArr$3(h).map((R, T, D) => {
-        const N = R == null ? void 0 : R[(e == null ? void 0 : e.label) || "label"], z = t ? transformNestedData(R).map((M) => M == null ? void 0 : M[(e == null ? void 0 : e.label) || "label"]).join(" / ") : isObject(N) ? JSON.stringify(N) : N, L = toValue$3(n(z), "N/A"), $ = o(
+        const $ = R == null ? void 0 : R[(e == null ? void 0 : e.label) || "label"], z = t ? transformNestedData(R).map((M) => M == null ? void 0 : M[(e == null ? void 0 : e.label) || "label"]).join(" / ") : isObject($) ? JSON.stringify($) : $, L = toValue$3(n(z), "N/A"), B = o(
           (R == null ? void 0 : R.__collection) || (r == null ? void 0 : r.target),
           (e == null ? void 0 : e.label) || "label"
-        ), w = getLabelFormatValue$1(n($), L, !0);
+        ), w = getLabelFormatValue$1(n(B), L, !0);
         return /* @__PURE__ */ jsxs(Fragment$1, { children: [
           /* @__PURE__ */ jsx("span", { children: i ? w : a !== !1 ? /* @__PURE__ */ jsx(
             "a",
@@ -39239,7 +39385,7 @@ const RenderRecord = React.memo(
                 g(!0);
               },
               onClick: (M) => {
-                var B;
+                var N;
                 g(!0), M.stopPropagation(), M.preventDefault(), l && !u.properties && (c(schema$1.Viewer), y.current = !0), y.current ? (setTimeout(() => {
                   d({
                     recordData: R,
@@ -39249,7 +39395,7 @@ const RenderRecord = React.memo(
                 }), y.current = !1) : u.properties && d({
                   recordData: R,
                   parentRecordData: p
-                }), (B = m == null ? void 0 : m.current) == null || B.setPopoverVisible(!1);
+                }), (N = m == null ? void 0 : m.current) == null || N.setPopoverVisible(!1);
               },
               children: w
             }
@@ -39653,7 +39799,7 @@ const CreateAction = observer$1(
     const { onClick: t } = e, n = useCollection_deprecated(), o = useFieldSchema(), r = useField(), i = useForm(), a = useVariables$1(), l = useAclCheckFn(), c = o["x-enable-children"] || [], u = o == null ? void 0 : o["x-allow-add-to-current"], d = (R = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : R.linkageFromForm, p = r.componentProps.type === "danger" ? void 0 : r.componentProps.type || "primary", { getChildrenCollections: m } = useCollectionManager_deprecated(), h = m(n.name), g = useMemo(() => c.map((T) => {
       if (!T)
         return;
-      const D = h.find((N) => N.name === T.collection);
+      const D = h.find(($) => $.name === T.collection);
       if (D)
         return P(x({}, D.getOptions()), {
           title: T.title || D.title
@@ -39668,9 +39814,9 @@ const CreateAction = observer$1(
     return useEffect(() => {
       r.stateOfLinkageRules = {}, f.filter((T) => !T.disabled).forEach((T) => {
         var D;
-        (D = T.actions) == null || D.forEach((N) => {
+        (D = T.actions) == null || D.forEach(($) => {
           linkageAction({
-            operator: N.operator,
+            operator: $.operator,
             field: r,
             condition: T.condition,
             variables: a,
@@ -39939,7 +40085,7 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
     S.current = t;
     const y = useCallback(() => S.current, []);
     return /* @__PURE__ */ jsx(Fragment, { children: toArr$3(e.value).map((F, A, R) => {
-      const T = F == null ? void 0 : F[(r == null ? void 0 : r.label) || "label"], D = g ? transformNestedData(F).map((L) => L == null ? void 0 : L[(r == null ? void 0 : r.label) || "label"]).join(" / ") : isObject(T) ? JSON.stringify(T) : T, N = toValue$2(l(D), "N/A"), z = getTabFormatValue(l(u), N, F[o]);
+      const T = F == null ? void 0 : F[(r == null ? void 0 : r.label) || "label"], D = g ? transformNestedData(F).map((L) => L == null ? void 0 : L[(r == null ? void 0 : r.label) || "label"]).join(" / ") : isObject(T) ? JSON.stringify(T) : T, $ = toValue$2(l(D), "N/A"), z = getTabFormatValue(l(u), $, F[o]);
       return /* @__PURE__ */ jsxs(Fragment$1, { children: [
         /* @__PURE__ */ jsx("span", { children: d ? z : n !== !1 ? /* @__PURE__ */ jsx(
           "a",
@@ -39948,7 +40094,7 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
               e.setBtnHover(!0);
             },
             onClick: (L) => {
-              var $;
+              var B;
               e.setBtnHover(!0), L.stopPropagation(), L.preventDefault(), c && !t.properties && (i(schema$1.Viewer), b.current = !0), b.current ? setTimeout(() => {
                 f({
                   recordData: F,
@@ -39958,7 +40104,7 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
               }) : f({
                 recordData: F,
                 parentRecordData: C
-              }), ($ = p == null ? void 0 : p.current) == null || $.setPopoverVisible(!1);
+              }), (B = p == null ? void 0 : p.current) == null || B.setPopoverVisible(!1);
             },
             children: z
           }
@@ -40023,9 +40169,9 @@ const useColumnsDeepMemoized = (e) => {
     `, [n.paddingContentVerticalLG, n.marginSM]), f = useCollection(), C = useMemo(
     () => d == null ? void 0 : d.map((S) => {
       var A, R, T;
-      const y = S.reduceProperties((D, N) => {
-        if (isCollectionFieldComponent(N))
-          return D.concat([N]);
+      const y = S.reduceProperties((D, $) => {
+        if (isCollectionFieldComponent($))
+          return D.concat([$]);
       }, []), v = (y == null ? void 0 : y.length) > 0 ? y[0].name : S.name, F = !!((A = S["x-component-props"]) != null && A.columnHidden);
       return P(x({
         title: /* @__PURE__ */ jsx(RecursionField, { name: S.name, schema: S, onlyRenderSelf: !0 }),
@@ -40035,15 +40181,15 @@ const useColumnsDeepMemoized = (e) => {
         columnHidden: F
       }, S["x-component-props"]), {
         width: F && !a ? 0 : ((T = S["x-component-props"]) == null ? void 0 : T.width) || 100,
-        render: (D, N) => {
-          var $;
-          const z = ($ = o.value) == null ? void 0 : $.indexOf(N), L = o.address.concat(N.__index || z);
-          return /* @__PURE__ */ jsx(SubFormProvider, { value: { value: N, collection: f, fieldSchema: r.parent }, children: /* @__PURE__ */ jsx(RecordIndexProvider, { index: N.__index || z, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: isNewRecord(N), record: N, parent: u, children: /* @__PURE__ */ jsx(ColumnFieldProvider, { schema: S, basePath: L, children: /* @__PURE__ */ jsx("span", { role: "button", className: g, children: /* @__PURE__ */ jsx(RecursionField, { basePath: L, schema: S, onlyRenderProperties: !0 }) }) }) }) }) });
+        render: (D, $) => {
+          var B;
+          const z = (B = o.value) == null ? void 0 : B.indexOf($), L = o.address.concat($.__index || z);
+          return /* @__PURE__ */ jsx(SubFormProvider, { value: { value: $, collection: f, fieldSchema: r.parent }, children: /* @__PURE__ */ jsx(RecordIndexProvider, { index: $.__index || z, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: isNewRecord($), record: $, parent: u, children: /* @__PURE__ */ jsx(ColumnFieldProvider, { schema: S, basePath: L, children: /* @__PURE__ */ jsx("span", { role: "button", className: g, children: /* @__PURE__ */ jsx(RecursionField, { basePath: L, schema: S, onlyRenderProperties: !0 }) }) }) }) }) });
         },
-        onCell: (D, N) => ({
+        onCell: (D, $) => ({
           record: D,
           schema: S,
-          rowIndex: N,
+          rowIndex: $,
           isSubTable: e.isSubTable,
           columnHidden: F
         }),
@@ -40163,7 +40309,7 @@ const useColumnsDeepMemoized = (e) => {
             display: none !important;
           }
         `,
-      itemRender: (D, N, z) => N === "prev" ? /* @__PURE__ */ jsxs(
+      itemRender: (D, $, z) => $ === "prev" ? /* @__PURE__ */ jsxs(
         "div",
         {
           style: { display: "flex" },
@@ -40379,8 +40525,8 @@ const Table$1 = withDynamicSchemaProps(
       "onExpand",
       "loading",
       "onClickRow"
-    ]), S = useArrayField(b), y = useFieldSchema(), { size: v = "small" } = (y == null ? void 0 : y["x-component-props"]) || {}, F = useCollection(), R = ((ce = y == null ? void 0 : y.parent) == null ? void 0 : ce["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: T, allIncludesChildren: D } = R, N = useMemoizedFn(b.onRowDragEnd || (() => {
-    })), z = usePaginationProps$2(n, i), L = useTableColumns$1(b, z), [$, w] = useState(() => T ? D : []), [M, B] = useState(((Ce = S == null ? void 0 : S.data) == null ? void 0 : Ce.selectedRowKeys) || []), [k, j] = useState([]), O = (p == null ? void 0 : p.type) !== "none", q = useRef(/* @__PURE__ */ new Map()), E = useMemo(() => css`
+    ]), S = useArrayField(b), y = useFieldSchema(), { size: v = "small" } = (y == null ? void 0 : y["x-component-props"]) || {}, F = useCollection(), R = ((ce = y == null ? void 0 : y.parent) == null ? void 0 : ce["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: T, allIncludesChildren: D } = R, $ = useMemoizedFn(b.onRowDragEnd || (() => {
+    })), z = usePaginationProps$2(n, i), L = useTableColumns$1(b, z), [B, w] = useState(() => T ? D : []), [M, N] = useState(((Ce = S == null ? void 0 : S.data) == null ? void 0 : Ce.selectedRowKeys) || []), [k, j] = useState([]), O = (p == null ? void 0 : p.type) !== "none", q = useRef(/* @__PURE__ */ new Map()), E = useMemo(() => css`
         & > td {
           background-color: ${t.controlItemBgActive} !important;
         }
@@ -40395,7 +40541,7 @@ const Table$1 = withDynamicSchemaProps(
     }) : null, [C, k]);
     useDeepCompareEffect(() => {
       const Z = T ? D : [];
-      _.isEqual(Z, $) || w(Z);
+      _.isEqual(Z, B) || w(Z);
     }, [T, D]);
     const H = useCallback((Z) => {
       if (m)
@@ -40423,10 +40569,10 @@ const Table$1 = withDynamicSchemaProps(
           return;
         }
         const le = (ve = (ye = (Se = se.active) == null ? void 0 : Se.data.current) == null ? void 0 : ye.sortable) == null ? void 0 : ve.index, de = (Re = (Fe = (Pe = se.over) == null ? void 0 : Pe.data.current) == null ? void 0 : Fe.sortable) == null ? void 0 : Re.index, be = S.value[le] || se.active, Ie = S.value[de] || se.over;
-        S.move(le, de), N({ from: be, to: Ie });
+        S.move(le, de), $({ from: be, to: Ie });
       }, []);
       return /* @__PURE__ */ jsx(DndContext, { onDragEnd: ne, children: /* @__PURE__ */ jsx("tbody", x({}, Z)) });
-    }, [S, N]);
+    }, [S, $]);
     Y.displayName = "BodyWrapperComponent";
     const J = useMemo(() => ({
       header: {
@@ -40444,7 +40590,7 @@ const Table$1 = withDynamicSchemaProps(
           type: "checkbox",
           selectedRowKeys: M,
           onChange(Z, ne) {
-            S.data = S.data || {}, S.data.selectedRowKeys = Z, S.data.selectedRowData = ne, B(Z), u == null || u(Z, ne);
+            S.data = S.data || {}, S.data.selectedRowKeys = Z, S.data.selectedRowData = ne, N(Z), u == null || u(Z, ne);
           },
           getCheckboxProps(Z) {
             return {
@@ -40519,14 +40665,14 @@ const Table$1 = withDynamicSchemaProps(
       [k, U, JSON.stringify(m)]
     ), pe = useCallback(
       (Z, ne) => {
-        const se = Z ? [...$, ne[F.getPrimaryKey()]] : $.filter((le) => ne[F.getPrimaryKey()] !== le);
+        const se = Z ? [...B, ne[F.getPrimaryKey()]] : B.filter((le) => ne[F.getPrimaryKey()] !== le);
         w(se), g == null || g(Z, ne);
       },
-      [$, g, F]
+      [B, g, F]
     ), fe = useMemo(() => ({
       onExpand: pe,
-      expandedRowKeys: $
-    }), [$, pe]);
+      expandedRowKeys: B
+    }), [B, pe]);
     return (
       // If spinning is set to undefined, it will cause the subtable to always display loading, so we need to convert it here
       /* @__PURE__ */ jsx(Spin, { spinning: !!f, children: /* @__PURE__ */ jsx(
@@ -40594,7 +40740,7 @@ const Table$1 = withDynamicSchemaProps(
   }
 `, SubTable = observer$1(
   (e) => {
-    var w, M, B, k;
+    var w, M, N, k;
     const { openSize: t } = e, { field: n, options: o } = useAssociationFieldContext(), { t: r } = useTranslation(), [i, a] = useState(!1), [l, c] = useState([]), u = useFieldNames$1(e), d = useFieldSchema(), p = useCompile(), m = useLabelUiSchema$1(o, (u == null ? void 0 : u.label) || "label"), h = useCollectionRecord(), g = useCollection(), { allowSelectExistingRecord: f, allowAddnew: C, allowDisassociation: b } = n.componentProps;
     useSubTableSpecialCase({ field: n });
     const S = (j, O) => {
@@ -40638,10 +40784,10 @@ const Table$1 = withDynamicSchemaProps(
     }, A = () => {
       const j = (o == null ? void 0 : o.targetKey) || "id", O = (n.value || []).map((E) => E == null ? void 0 : E[j]).filter(Boolean);
       return O.length ? { $and: [{ [`${j}.$ne`]: O }] } : {};
-    }, [R, T] = useState(1), [D, N] = useState(((w = n.componentProps) == null ? void 0 : w.pageSize) || 10);
+    }, [R, T] = useState(1), [D, $] = useState(((w = n.componentProps) == null ? void 0 : w.pageSize) || 10);
     useEffect(() => {
       var j;
-      N((j = n.componentProps) == null ? void 0 : j.pageSize);
+      $((j = n.componentProps) == null ? void 0 : j.pageSize);
     }, [(M = n.componentProps) == null ? void 0 : M.pageSize]);
     const z = useMemo(() => {
       var O;
@@ -40651,13 +40797,13 @@ const Table$1 = withDynamicSchemaProps(
         pageSize: D || 10,
         total: n == null ? void 0 : n.value,
         onChange: (q, E) => {
-          T(q), N(E), n.onInput(n.value);
+          T(q), $(E), n.onInput(n.value);
         },
         showSizeChanger: !0,
         pageSizeOptions: ["10", "20", "50", "100"],
         hideOnSinglePage: !1
       };
-    }, [(B = n.value) == null ? void 0 : B.length, D, R]), L = () => {
+    }, [(N = n.value) == null ? void 0 : N.length, D, R]), L = () => {
       const { field: j } = useAssociationFieldContext();
       return {
         run() {
@@ -40667,7 +40813,7 @@ const Table$1 = withDynamicSchemaProps(
           return T(O), j.onInput(j.value);
         }
       };
-    }, $ = () => ({
+    }, B = () => ({
       run() {
         a(!0);
       }
@@ -40718,7 +40864,7 @@ const Table$1 = withDynamicSchemaProps(
               f && /* @__PURE__ */ jsx(
                 Action.Link,
                 {
-                  useAction: $,
+                  useAction: B,
                   title: /* @__PURE__ */ jsxs(Space$1, { style: { gap: 2 }, children: [
                     /* @__PURE__ */ jsx(ZoomInOutlined, {}),
                     " ",
@@ -40852,14 +40998,14 @@ const ReadPretty$7 = observer$1(
 InternalAssociationSelect.displayName = "InternalAssociationSelect";
 const AssociationSelect = InternalAssociationSelect;
 AssociationSelect.Designer = function e() {
-  var M, B, k, j, O, q, E, U, G, H, W;
-  const { getCollectionFields: t, getInterface: n, getCollectionJoinField: o, getCollection: r, isTitleField: i } = useCollectionManager_deprecated(), { getField: a } = useCollection_deprecated(), { form: l } = useFormBlockContext(), c = useField(), u = useFieldSchema(), { t: d } = useTranslation(), p = useFilterByTk(), { dn: m, refresh: h, insertAdjacent: g } = useDesignable(), f = useCompile(), C = useIsShowMultipleSwitch(), { isAllowToSetDefaultValue: b } = useIsAllowToSetDefaultValue(), S = a(u.name) || o(u["x-collection-field"]), y = useFieldComponentOptions(), v = c.address.segments.includes("__form_grid"), F = n(S == null ? void 0 : S.interface), A = (M = F == null ? void 0 : F.validateSchema) == null ? void 0 : M.call(F, u), R = (B = S == null ? void 0 : S.uiSchema) == null ? void 0 : B.title, T = S != null && S.target ? t(S == null ? void 0 : S.target) : [];
+  var M, N, k, j, O, q, E, U, G, H, W;
+  const { getCollectionFields: t, getInterface: n, getCollectionJoinField: o, getCollection: r, isTitleField: i } = useCollectionManager_deprecated(), { getField: a } = useCollection_deprecated(), { form: l } = useFormBlockContext(), c = useField(), u = useFieldSchema(), { t: d } = useTranslation(), p = useFilterByTk(), { dn: m, refresh: h, insertAdjacent: g } = useDesignable(), f = useCompile(), C = useIsShowMultipleSwitch(), { isAllowToSetDefaultValue: b } = useIsAllowToSetDefaultValue(), S = a(u.name) || o(u["x-collection-field"]), y = useFieldComponentOptions(), v = c.address.segments.includes("__form_grid"), F = n(S == null ? void 0 : S.interface), A = (M = F == null ? void 0 : F.validateSchema) == null ? void 0 : M.call(F, u), R = (N = S == null ? void 0 : S.uiSchema) == null ? void 0 : N.title, T = S != null && S.target ? t(S == null ? void 0 : S.target) : [];
   c.title === R || c.title;
-  const D = useSortFields(S == null ? void 0 : S.target), N = ((O = (j = (k = c.componentProps) == null ? void 0 : k.service) == null ? void 0 : j.params) == null ? void 0 : O.sort) || [];
+  const D = useSortFields(S == null ? void 0 : S.target), $ = ((O = (j = (k = c.componentProps) == null ? void 0 : k.service) == null ? void 0 : j.params) == null ? void 0 : O.sort) || [];
   useEffect(() => {
     c.readPretty !== u["x-read-pretty"] && (c.readPretty = !!u["x-read-pretty"]);
   }, [u["x-read-pretty"]]);
-  const z = N == null ? void 0 : N.map((X) => X.startsWith("-") ? {
+  const z = $ == null ? void 0 : $.map((X) => X.startsWith("-") ? {
     field: X.substring(1),
     direction: "desc"
   } : {
@@ -40874,8 +41020,8 @@ AssociationSelect.Designer = function e() {
       label: f((Y = X == null ? void 0 : X.uiSchema) == null ? void 0 : Y.title) || (X == null ? void 0 : X.name)
     };
   });
-  let $ = "editable";
-  u["x-disabled"] === !0 && ($ = "readonly"), u["x-read-pretty"] === !0 && ($ = "read-pretty");
+  let B = "editable";
+  u["x-disabled"] === !0 && (B = "readonly"), u["x-read-pretty"] === !0 && (B = "read-pretty");
   const w = _.omit(u, "required");
   return /* @__PURE__ */ jsxs(GeneralSchemaDesigner, { children: [
     /* @__PURE__ */ jsx(GeneralSchemaItems, {}),
@@ -41188,7 +41334,7 @@ AssociationSelect.Designer = function e() {
           { label: d("Readonly"), value: "readonly" },
           { label: d("Easy-reading"), value: "read-pretty" }
         ],
-        value: $,
+        value: B,
         onChange: (X) => {
           const Y = {
             "x-uid": u["x-uid"]
@@ -41251,22 +41397,22 @@ AssociationSelect.Designer = function e() {
   ] });
 };
 AssociationSelect.FilterDesigner = function e() {
-  var F, A, R, T, D, N, z, L, $, w, M;
+  var F, A, R, T, D, $, z, L, B, w, M;
   const { getCollectionFields: t, getInterface: n, getCollectionJoinField: o } = useCollectionManager_deprecated(), { getField: r } = useCollection_deprecated(), { form: i } = useFormBlockContext(), a = useField(), l = useFieldSchema(), { t: c } = useTranslation(), { dn: u, refresh: d } = useDesignable(), p = useCompile(), m = r(l.name) || o(l["x-collection-field"]), h = n(m == null ? void 0 : m.interface), g = (F = h == null ? void 0 : h.validateSchema) == null ? void 0 : F.call(h, l), f = (A = m == null ? void 0 : m.uiSchema) == null ? void 0 : A.title, C = m != null && m.target ? t(m == null ? void 0 : m.target) : [];
   a.title === f || a.title;
-  const b = useSortFields(m == null ? void 0 : m.target), S = ((D = (T = (R = a.componentProps) == null ? void 0 : R.service) == null ? void 0 : T.params) == null ? void 0 : D.sort) || [], y = S == null ? void 0 : S.map((B) => B.startsWith("-") ? {
-    field: B.substring(1),
+  const b = useSortFields(m == null ? void 0 : m.target), S = ((D = (T = (R = a.componentProps) == null ? void 0 : R.service) == null ? void 0 : T.params) == null ? void 0 : D.sort) || [], y = S == null ? void 0 : S.map((N) => N.startsWith("-") ? {
+    field: N.substring(1),
     direction: "desc"
   } : {
-    field: B,
+    field: N,
     direction: "asc"
   });
   a.readPretty || a.required;
-  const v = C.filter((B) => !(B != null && B.target) && B.type !== "boolean").map((B) => {
+  const v = C.filter((N) => !(N != null && N.target) && N.type !== "boolean").map((N) => {
     var k;
     return {
-      value: B == null ? void 0 : B.name,
-      label: p((k = B == null ? void 0 : B.uiSchema) == null ? void 0 : k.title) || (B == null ? void 0 : B.name)
+      value: N == null ? void 0 : N.name,
+      label: p((k = N == null ? void 0 : N.uiSchema) == null ? void 0 : k.title) || (N == null ? void 0 : N.name)
     };
   });
   return l["x-disabled"], l["x-read-pretty"], /* @__PURE__ */ jsxs(GeneralSchemaDesigner, { children: [
@@ -41357,10 +41503,10 @@ AssociationSelect.FilterDesigner = function e() {
             }
           }
         },
-        onSubmit: (B) => {
+        onSubmit: (N) => {
           var q;
           const k = [];
-          for (const E of B.rules)
+          for (const E of N.rules)
             k.push(_.pickBy(E, _.identity));
           const j = {
             "x-uid": l["x-uid"]
@@ -41375,7 +41521,7 @@ AssociationSelect.FilterDesigner = function e() {
         }
       }
     ),
-    i && !(i != null && i.readPretty) && ((N = m == null ? void 0 : m.uiSchema) == null ? void 0 : N.type) && /* @__PURE__ */ jsx(
+    i && !(i != null && i.readPretty) && (($ = m == null ? void 0 : m.uiSchema) == null ? void 0 : $.type) && /* @__PURE__ */ jsx(
       SchemaSettingsModalItem,
       {
         title: c("Set default value"),
@@ -41392,11 +41538,11 @@ AssociationSelect.FilterDesigner = function e() {
             })
           }
         },
-        onSubmit: (B) => {
+        onSubmit: (N) => {
           const k = {
             "x-uid": l["x-uid"]
           };
-          a.value !== B.default && (a.value = B.default), l.default = B.default, k.default = B.default, u.emit("patch", {
+          a.value !== N.default && (a.value = N.default), l.default = N.default, k.default = N.default, u.emit("patch", {
             schema: k
           }), d();
         }
@@ -41406,10 +41552,10 @@ AssociationSelect.FilterDesigner = function e() {
       SchemaSettingsDataScope,
       {
         collectionName: m == null ? void 0 : m.target,
-        defaultFilter: (($ = (L = (z = a.componentProps) == null ? void 0 : z.service) == null ? void 0 : L.params) == null ? void 0 : $.filter) || {},
+        defaultFilter: ((B = (L = (z = a.componentProps) == null ? void 0 : z.service) == null ? void 0 : L.params) == null ? void 0 : B.filter) || {},
         form: i,
-        onSubmit: ({ filter: B }) => {
-          B = removeNullCondition(B), _.set(a.componentProps, "service.params.filter", B), l["x-component-props"] = a.componentProps, u.emit("patch", {
+        onSubmit: ({ filter: N }) => {
+          N = removeNullCondition(N), _.set(a.componentProps, "service.params.filter", N), l["x-component-props"] = a.componentProps, u.emit("patch", {
             schema: {
               "x-uid": l["x-uid"],
               "x-component-props": a.componentProps
@@ -41492,8 +41638,8 @@ AssociationSelect.FilterDesigner = function e() {
             }
           }
         },
-        onSubmit: ({ sort: B }) => {
-          const k = B.map((j) => j.direction === "desc" ? `-${j.field}` : j.field);
+        onSubmit: ({ sort: N }) => {
+          const k = N.map((j) => j.direction === "desc" ? `-${j.field}` : j.field);
           _.set(a.componentProps, "service.params.sort", k), l["x-component-props"] = a.componentProps, u.emit("patch", {
             schema: {
               "x-uid": l["x-uid"],
@@ -41509,12 +41655,12 @@ AssociationSelect.FilterDesigner = function e() {
         title: c("Title field"),
         options: v,
         value: (M = (w = a == null ? void 0 : a.componentProps) == null ? void 0 : w.fieldNames) == null ? void 0 : M.label,
-        onChange: (B) => {
+        onChange: (N) => {
           var O, q;
           const k = {
             "x-uid": l["x-uid"]
           }, j = P(x(x({}, (q = (O = m == null ? void 0 : m.uiSchema) == null ? void 0 : O["x-component-props"]) == null ? void 0 : q.fieldNames), a.componentProps.fieldNames), {
-            label: B
+            label: N
           });
           a.componentProps.fieldNames = j, l["x-component-props"] = l["x-component-props"] || {}, l["x-component-props"].fieldNames = j, k["x-component-props"] = l["x-component-props"], u.emit("patch", {
             schema: k
@@ -43045,7 +43191,7 @@ const InternalListBlockProvider = (e) => {
   return e - m - h - d;
 }, InternalList = withSkeletonComponent(
   (e) => {
-    var L, $, w;
+    var L, B, w;
     const { service: t } = useListBlockContext(), { run: n, params: o } = t, r = useFieldSchema(), i = useDesigner(), a = (L = t == null ? void 0 : t.data) == null ? void 0 : L.meta, { pageSize: l, count: c, hasNext: u, page: d } = a || {}, p = useField(), [m] = useState(/* @__PURE__ */ new Map()), { wrapSSR: h, componentCls: g, hashId: f } = useStyles$5(), C = useListBlockHeight(), { token: b } = theme$1.useToken(), S = useCallback(
       (M) => (m.has(M) || m.set(
         M,
@@ -43058,10 +43204,10 @@ const InternalListBlockProvider = (e) => {
       ), m.get(M)),
       [r.properties, m]
     ), y = [5, 10, 20, 50, 100, 200], v = useCallback(
-      (M, B) => {
+      (M, N) => {
         n(P(x({}, o == null ? void 0 : o[0]), {
           page: M,
-          pageSize: B
+          pageSize: N
         }));
       },
       [n, o]
@@ -43092,7 +43238,7 @@ const InternalListBlockProvider = (e) => {
               display: none !important;
             }
           `,
-        itemRender: (B, k, j) => k === "prev" ? /* @__PURE__ */ jsxs(
+        itemRender: (N, k, j) => k === "prev" ? /* @__PURE__ */ jsxs(
           "div",
           {
             style: { display: "flex" },
@@ -43147,17 +43293,17 @@ const InternalListBlockProvider = (e) => {
                     children: /* @__PURE__ */ jsx(
                       List$1,
                       P(x({}, e), {
-                        pagination: !a || !(($ = p.value) != null && $.length) ? !1 : z,
+                        pagination: !a || !((B = p.value) != null && B.length) ? !1 : z,
                         loading: t == null ? void 0 : t.loading,
-                        children: (w = p.value) != null && w.length ? p.value.map((M, B) => /* @__PURE__ */ jsx(
+                        children: (w = p.value) != null && w.length ? p.value.map((M, N) => /* @__PURE__ */ jsx(
                           NocoBaseRecursionField,
                           {
                             basePath: p.address,
-                            name: B,
+                            name: N,
                             onlyRenderProperties: !0,
-                            schema: S(B)
+                            schema: S(N)
                           },
-                          B
+                          N
                         )) : null
                       })
                     )
@@ -43723,8 +43869,8 @@ const useMenuTranslation = () => useTranslation("lm-menus"), toItems$1 = (e = {}
       onFieldChange("target", (A) => {
         var T, D;
         const [, R] = ((D = (T = A == null ? void 0 : A.value) == null ? void 0 : T.split) == null ? void 0 : D.call(T, "||")) || [];
-        A.query("position").take((N) => {
-          N.dataSource = R === "Menu.SubMenu" ? [
+        A.query("position").take(($) => {
+          $.dataSource = R === "Menu.SubMenu" ? [
             { label: i("Before"), value: "beforeBegin" },
             { label: i("After"), value: "afterEnd" },
             { label: i("Inner"), value: "beforeEnd" }
@@ -43800,8 +43946,8 @@ const useMenuTranslation = () => useTranslation("lm-menus"), toItems$1 = (e = {}
     }
   }), [p, i]), b = useCallback(
     ({ target: F, position: A }) => {
-      var N;
-      const [R] = ((N = F == null ? void 0 : F.split) == null ? void 0 : N.call(F, "||")) || [];
+      var $;
+      const [R] = (($ = F == null ? void 0 : F.split) == null ? void 0 : $.call(F, "||")) || [];
       if (!R)
         return;
       const T = findByUid(a, R), D = createDesignable({
@@ -44210,14 +44356,14 @@ const Menu = React.memo((e) => {
     var L;
     let z;
     if (o) {
-      const $ = findKeysByUid(f, o);
-      z = ($ == null ? void 0 : $[0]) || null;
+      const B = findKeysByUid(f, o);
+      z = (B == null ? void 0 : B[0]) || null;
     } else
       z = (F == null ? void 0 : F[0]) || null;
     if (n === "mix" && z) {
-      const $ = (L = f.properties) == null ? void 0 : L[z];
-      if (($ == null ? void 0 : $["x-component"]) === "Menu.SubMenu")
-        return $;
+      const B = (L = f.properties) == null ? void 0 : L[z];
+      if ((B == null ? void 0 : B["x-component"]) === "Menu.SubMenu")
+        return B;
     }
     return null;
   }, [F, n, f, o]);
@@ -44231,7 +44377,7 @@ const Menu = React.memo((e) => {
   }, [o]), useEffect(() => {
     ["inline", "mix"].includes(n) && T(F);
   }, [F]);
-  const N = useContext(SchemaComponentContext);
+  const $ = useContext(SchemaComponentContext);
   return /* @__PURE__ */ jsx(DndContext, { children: /* @__PURE__ */ jsx(MenuItemDesignerContext.Provider, { value: g, children: /* @__PURE__ */ jsxs(MenuModeContext.Provider, { value: n, children: [
     /* @__PURE__ */ jsx(
       HeaderMenu,
@@ -44248,7 +44394,7 @@ const Menu = React.memo((e) => {
         defaultSelectedKeys: F,
         defaultOpenKeys: R,
         selectedKeys: y,
-        designable: N.designable,
+        designable: $.designable,
         render: b,
         children: l
       }
@@ -44266,7 +44412,7 @@ const Menu = React.memo((e) => {
         render: b,
         t: h,
         api: C,
-        designable: N.designable
+        designable: $.designable
       }
     )
   ] }) }) });
@@ -44782,16 +44928,16 @@ const toValue = (e, t) => e == null ? t : e, ReadPrettyRecordPicker = observer$1
     if (isShowFilePicker(h))
       return u ? /* @__PURE__ */ jsx(Preview, x({}, e)) : null;
     const b = () => toArr$3(e.value).map((A, R, T) => {
-      const D = toValue(m(A == null ? void 0 : A[(i == null ? void 0 : i.label) || "label"]), "N/A"), N = getLabelFormatValue(h, D, !0);
+      const D = toValue(m(A == null ? void 0 : A[(i == null ? void 0 : i.label) || "label"]), "N/A"), $ = getLabelFormatValue(h, D, !0);
       return /* @__PURE__ */ jsxs(Fragment$1, { children: [
-        /* @__PURE__ */ jsx("span", { className: "test-record-picker-read-pretty-item", children: g || f ? N : /* @__PURE__ */ jsx(
+        /* @__PURE__ */ jsx("span", { className: "test-record-picker-read-pretty-item", children: g || f ? $ : /* @__PURE__ */ jsx(
           "a",
           {
             onClick: (z) => {
               var L;
               z.stopPropagation(), z.preventDefault(), l(!0), p(A), (L = C == null ? void 0 : C.current) == null || L.setPopoverVisible(!1);
             },
-            children: N
+            children: $
           }
         ) }),
         R < T.length - 1 ? /* @__PURE__ */ jsx("span", { style: { marginRight: 4, color: "#aaa" }, children: "," }) : null
@@ -45619,8 +45765,8 @@ const useStyles$2 = genStyleHook("nb-rich-text", (e) => {
           "aria-label": `checkbox-${y.name}`
         }),
         renderCell: (y, v, F, A) => {
-          var D, N;
-          const R = (D = e == null ? void 0 : e.pagination) == null ? void 0 : D.current, T = ((N = e == null ? void 0 : e.pagination) == null ? void 0 : N.pageSize) || 20;
+          var D, $;
+          const R = (D = e == null ? void 0 : e.pagination) == null ? void 0 : D.current, T = (($ = e == null ? void 0 : e.pagination) == null ? void 0 : $.pageSize) || 20;
           return R && (F = F + (R - 1) * T), /* @__PURE__ */ jsxs(
             "div",
             {
@@ -46205,14 +46351,14 @@ const TableActionColumnDesigner = (e) => {
     "sort-field"
   );
 }, TableBlockDesigner = () => {
-  var T, D, N, z, L, $, w, M, B, k, j;
-  const { name: e, title: t } = useCollection_deprecated(), { getCollectionField: n, getCollection: o } = useCollectionManager_deprecated(), r = useField(), i = useFieldSchema(), { form: a } = useFormBlockContext(), l = useSortFields(e), { service: c } = useTableBlockContext(), { t: u } = useTranslation(), { dn: d } = useDesignable(), { componentNamePrefix: p } = useBlockTemplateContext(), m = ((D = (T = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : T.params) == null ? void 0 : D.sort) || [], h = ((N = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : N.resource) || ((z = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : z.association), g = !((L = i == null ? void 0 : i["x-decorator-props"]) != null && L.disableTemplate), f = m == null ? void 0 : m.map((O) => O != null && O.startsWith("-") ? {
+  var T, D, $, z, L, B, w, M, N, k, j;
+  const { name: e, title: t } = useCollection_deprecated(), { getCollectionField: n, getCollection: o } = useCollectionManager_deprecated(), r = useField(), i = useFieldSchema(), { form: a } = useFormBlockContext(), l = useSortFields(e), { service: c } = useTableBlockContext(), { t: u } = useTranslation(), { dn: d } = useDesignable(), { componentNamePrefix: p } = useBlockTemplateContext(), m = ((D = (T = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : T.params) == null ? void 0 : D.sort) || [], h = (($ = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : $.resource) || ((z = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : z.association), g = !((L = i == null ? void 0 : i["x-decorator-props"]) != null && L.disableTemplate), f = m == null ? void 0 : m.map((O) => O != null && O.startsWith("-") ? {
     field: O.substring(1),
     direction: "desc"
   } : {
     field: O,
     direction: "asc"
-  }), C = useSchemaTemplate(), b = useCollection_deprecated(), { dragSort: S, resource: y } = r.decoratorProps, v = y && n(y), F = y != null && y.includes(".") ? ($ = o(v == null ? void 0 : v.target)) == null ? void 0 : $.tree : !!(b != null && b.tree), A = useCallback(
+  }), C = useSchemaTemplate(), b = useCollection_deprecated(), { dragSort: S, resource: y } = r.decoratorProps, v = y && n(y), F = y != null && y.includes(".") ? (B = o(v == null ? void 0 : v.target)) == null ? void 0 : B.tree : !!(b != null && b.tree), A = useCallback(
     ({ filter: O }) => {
       O = removeNullCondition(O);
       const q = r.decoratorProps.params || {};
@@ -46368,7 +46514,7 @@ const TableActionColumnDesigner = (e) => {
       SchemaSettingsSelectItem,
       {
         title: u("Records per page"),
-        value: ((k = (B = r.decoratorProps) == null ? void 0 : B.params) == null ? void 0 : k.pageSize) || 20,
+        value: ((k = (N = r.decoratorProps) == null ? void 0 : N.params) == null ? void 0 : k.pageSize) || 20,
         options: [
           { label: "5", value: 5 },
           { label: "10", value: 10 },
@@ -46451,29 +46597,29 @@ TableField.ActionBar = observer$1(
   { displayName: "TableField.ActionBar" }
 );
 const TableSelectorDesigner = () => {
-  var R, T, D, N, z, L;
-  const { name: e, title: t } = useCollection_deprecated(), { getCollectionJoinField: n, getAllCollectionsInheritChain: o } = useCollectionManager_deprecated(), r = useField(), i = useFieldSchema(), { form: a } = useFormBlockContext(), l = useSortFields(e), { service: c, extraFilter: u } = useTableSelectorContext(), { t: d } = useTranslation(), { dn: p } = useDesignable(), m = ((T = (R = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : R.params) == null ? void 0 : T.sort) || [], h = recursiveParent$1(i, "CollectionField"), g = n(h == null ? void 0 : h["x-collection-field"]), f = m == null ? void 0 : m.map(($) => $.startsWith("-") ? {
-    field: $.substring(1),
+  var R, T, D, $, z, L;
+  const { name: e, title: t } = useCollection_deprecated(), { getCollectionJoinField: n, getAllCollectionsInheritChain: o } = useCollectionManager_deprecated(), r = useField(), i = useFieldSchema(), { form: a } = useFormBlockContext(), l = useSortFields(e), { service: c, extraFilter: u } = useTableSelectorContext(), { t: d } = useTranslation(), { dn: p } = useDesignable(), m = ((T = (R = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : R.params) == null ? void 0 : T.sort) || [], h = recursiveParent$1(i, "CollectionField"), g = n(h == null ? void 0 : h["x-collection-field"]), f = m == null ? void 0 : m.map((B) => B.startsWith("-") ? {
+    field: B.substring(1),
     direction: "desc"
   } : {
-    field: $,
+    field: B,
     direction: "asc"
   }), C = useSchemaTemplate(), b = useCollection_deprecated(), { dragSort: S } = r.decoratorProps, y = useRecord(), v = useVariables$1(), { currentFormCollection: F } = useContext(RecordPickerContext), A = useLocalVariables$1({ collectionName: F });
   return /* @__PURE__ */ jsxs(GeneralSchemaDesigner, { template: C, title: t || e, disableInitializer: !0, children: [
     /* @__PURE__ */ jsx(
       SchemaSettingsDataScope,
       {
-        defaultFilter: ((N = (D = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : D.params) == null ? void 0 : N.filter) || {},
+        defaultFilter: (($ = (D = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : D.params) == null ? void 0 : $.filter) || {},
         form: a,
-        onSubmit: ({ filter: $ }) => {
-          var B;
-          $ = removeNullCondition($);
+        onSubmit: ({ filter: B }) => {
+          var N;
+          B = removeNullCondition(B);
           const w = r.decoratorProps.params || {};
-          w.filter = $, r.decoratorProps.params = w, i["x-decorator-props"].params = w;
-          let M = _.cloneDeep($);
+          w.filter = B, r.decoratorProps.params = w, i["x-decorator-props"].params = w;
+          let M = _.cloneDeep(B);
           u && (M ? M = {
             $and: [u, M]
-          } : M = u), c.run(P(x({}, (B = c.params) == null ? void 0 : B[0]), { filter: M, page: 1 })), p.emit("patch", {
+          } : M = u), c.run(P(x({}, (N = c.params) == null ? void 0 : N[0]), { filter: M, page: 1 })), p.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
               "x-decorator-props": i["x-decorator-props"]
@@ -46481,14 +46627,14 @@ const TableSelectorDesigner = () => {
           });
         },
         collectionName: e,
-        dynamicComponent: ($) => /* @__PURE__ */ jsx(
+        dynamicComponent: (B) => /* @__PURE__ */ jsx(
           VariableInput,
-          P(x({}, $), {
+          P(x({}, B), {
             form: a,
-            collectionField: $.collectionField,
+            collectionField: B.collectionField,
             record: y,
             shouldChange: getShouldChange({
-              collectionField: $.collectionField,
+              collectionField: B.collectionField,
               variables: v,
               localVariables: A,
               getAllCollectionsInheritChain: o
@@ -46505,11 +46651,11 @@ const TableSelectorDesigner = () => {
         title: d("Tree table"),
         defaultChecked: !0,
         checked: r.decoratorProps.treeTable,
-        onChange: ($) => {
+        onChange: (B) => {
           var M;
-          r.form.clearFormGraph(`${r.address}.*`), r.decoratorProps.treeTable = $, i["x-decorator-props"].treeTable = $;
+          r.form.clearFormGraph(`${r.address}.*`), r.decoratorProps.treeTable = B, i["x-decorator-props"].treeTable = B;
           const w = P(x({}, (M = c.params) == null ? void 0 : M[0]), {
-            tree: $ ? !0 : null
+            tree: B ? !0 : null
           });
           p.emit("patch", {
             schema: i
@@ -46593,15 +46739,15 @@ const TableSelectorDesigner = () => {
             }
           }
         },
-        onSubmit: ({ sort: $ }) => {
-          var B;
-          const w = $.map((k) => k.direction === "desc" ? `-${k.field}` : k.field), M = r.decoratorProps.params || {};
+        onSubmit: ({ sort: B }) => {
+          var N;
+          const w = B.map((k) => k.direction === "desc" ? `-${k.field}` : k.field), M = r.decoratorProps.params || {};
           M.sort = w, r.decoratorProps.params = M, i["x-decorator-props"].params = M, p.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
               "x-decorator-props": i["x-decorator-props"]
             }
-          }), c.run(P(x({}, (B = c.params) == null ? void 0 : B[0]), { sort: w }));
+          }), c.run(P(x({}, (N = c.params) == null ? void 0 : N[0]), { sort: w }));
         }
       }
     ),
@@ -46618,10 +46764,10 @@ const TableSelectorDesigner = () => {
           { label: "100", value: 100 },
           { label: "200", value: 200 }
         ],
-        onChange: ($) => {
+        onChange: (B) => {
           var M;
           const w = r.decoratorProps.params || {};
-          w.pageSize = $, r.decoratorProps.params = w, i["x-decorator-props"].params = w, c.run(P(x({}, (M = c.params) == null ? void 0 : M[0]), { pageSize: $, page: 1 })), p.emit("patch", {
+          w.pageSize = B, r.decoratorProps.params = w, i["x-decorator-props"].params = w, c.run(P(x({}, (M = c.params) == null ? void 0 : M[0]), { pageSize: B, page: 1 })), p.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
               "x-decorator-props": i["x-decorator-props"]
@@ -48048,11 +48194,11 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           if (R && y) {
             const D = ((T = r(R)) == null ? void 0 : T.fields) || [];
             o(
-              D == null ? void 0 : D.filter((N) => supportTypes.includes(N.type)).map((N) => {
+              D == null ? void 0 : D.filter(($) => supportTypes.includes($.type)).map(($) => {
                 var z;
                 return {
-                  value: N.name,
-                  label: g(((z = N.uiSchema) == null ? void 0 : z.title) || N.name)
+                  value: $.name,
+                  label: g(((z = $.uiSchema) == null ? void 0 : z.title) || $.name)
                 };
               })
             );
@@ -48234,21 +48380,21 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   const t = useRecord();
   return /* @__PURE__ */ jsx(AddFieldAction, x({ item: t }, e));
 }, AddFieldAction = (e) => {
-  var L, $;
-  const { scope: t, getContainer: n, item: o, children: r, trigger: i, align: a, database: l } = e, { getInterface: c, getTemplate: u, collections: d, getCollection: p } = useCollectionManager_deprecated(), [m, h] = useState(!1), [g, f] = useState(), [C, b] = useState({}), S = useCompile(), { t: y } = useTranslation(), { isDialect: v } = useDialect(), F = useFieldInterfaceOptions(), A = (($ = (L = p(o.name)) == null ? void 0 : L.options) == null ? void 0 : $.fields) || o.fields || [], R = useMemo(() => d.map((w) => ({
+  var L, B;
+  const { scope: t, getContainer: n, item: o, children: r, trigger: i, align: a, database: l } = e, { getInterface: c, getTemplate: u, collections: d, getCollection: p } = useCollectionManager_deprecated(), [m, h] = useState(!1), [g, f] = useState(), [C, b] = useState({}), S = useCompile(), { t: y } = useTranslation(), { isDialect: v } = useDialect(), F = useFieldInterfaceOptions(), A = ((B = (L = p(o.name)) == null ? void 0 : L.options) == null ? void 0 : B.fields) || o.fields || [], R = useMemo(() => d.map((w) => ({
     label: S(w.title),
     value: w.name
   })), []), T = useCallback(() => {
-    const { availableFieldInterfaces: w } = u(o.template) || {}, { exclude: M, include: B } = w || {}, k = [];
+    const { availableFieldInterfaces: w } = u(o.template) || {}, { exclude: M, include: N } = w || {}, k = [];
     return F.forEach((j) => {
       var O;
       if (j.key === "systemInfo")
         k.push(P(x({}, j), {
-          children: j.children.filter((q) => q.hidden ? !1 : q.value === "tableoid" ? B != null && B.length ? B.includes(q.value) : (l == null ? void 0 : l.dialect) === "postgres" : typeof o[q.value] == "boolean" ? o[q.value] : !0)
+          children: j.children.filter((q) => q.hidden ? !1 : q.value === "tableoid" ? N != null && N.length ? N.includes(q.value) : (l == null ? void 0 : l.dialect) === "postgres" : typeof o[q.value] == "boolean" ? o[q.value] : !0)
         }));
       else {
         let q = [];
-        B != null && B.length ? B.forEach((E) => {
+        N != null && N.length ? N.forEach((E) => {
           var G;
           const U = (G = j == null ? void 0 : j.children) == null ? void 0 : G.find((H) => [E, E.interface].includes(H.name));
           U && q.push(P(x({}, U), {
@@ -48266,28 +48412,28 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       label: S(w.label),
       title: S(w.label),
       key: w.label,
-      children: w.children.filter((B) => ["m2o"].includes(B.name)).map((B) => ({
-        label: S(B.title),
-        title: S(B.title),
-        key: B.name,
-        dataTargetScope: B.targetScope
+      children: w.children.filter((N) => ["m2o"].includes(N.name)).map((N) => ({
+        label: S(N.title),
+        title: S(N.title),
+        key: N.name,
+        dataTargetScope: N.targetScope
       }))
     } : {
       type: "group",
       label: S(w.label),
       title: S(w.label),
       key: w.label,
-      children: w == null ? void 0 : w.children.filter((B) => !["o2o", "subTable", "linkTo"].includes(B.name)).map((B) => ({
-        label: S(B.title),
-        title: S(B.title),
-        key: B.name,
-        dataTargetScope: B.targetScope
+      children: w == null ? void 0 : w.children.filter((N) => !["o2o", "subTable", "linkTo"].includes(N.name)).map((N) => ({
+        label: S(N.title),
+        title: S(N.title),
+        key: N.name,
+        dataTargetScope: N.targetScope
       }))
     };
   }).filter((w) => {
     var M;
     return (M = w == null ? void 0 : w.children) == null ? void 0 : M.length;
-  }), [T]), N = useMemo(() => ({
+  }), [T]), $ = useMemo(() => ({
     style: {
       maxHeight: "60vh",
       overflow: "auto"
@@ -48295,8 +48441,8 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
     onClick: (w) => {
       const M = w.item.props["data-targetScope"];
       M && f(M);
-      const B = getSchema$8(c(w.key), o, S);
-      B && (b(B), h(!0));
+      const N = getSchema$8(c(w.key), o, S);
+      N && (b(N), h(!0));
     },
     items: D
   }), [c, D, o]), z = useMemo(() => A.filter((w) => ["string", "bigInt", "integer"].includes(w.type)).map((w) => {
@@ -48307,7 +48453,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
     };
   }), [A == null ? void 0 : A.length]);
   return o.template !== "sql" && /* @__PURE__ */ jsx(RecordProvider, { record: o, children: /* @__PURE__ */ jsxs(ActionContextProvider, { value: { visible: m, setVisible: h }, children: [
-    /* @__PURE__ */ jsx(Dropdown, { getPopupContainer: n, trigger: i, align: a, menu: N, children: r || /* @__PURE__ */ jsx(Button, { icon: /* @__PURE__ */ jsx(PlusOutlined, {}), type: "primary", children: y("Add field") }) }),
+    /* @__PURE__ */ jsx(Dropdown, { getPopupContainer: n, trigger: i, align: a, menu: $, children: r || /* @__PURE__ */ jsx(Button, { icon: /* @__PURE__ */ jsx(PlusOutlined, {}), type: "primary", children: y("Add field") }) }),
     /* @__PURE__ */ jsx(
       SchemaComponent,
       {
@@ -48441,8 +48587,8 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           S(R == null ? void 0 : R.data);
           const T = l(o.interface), D = cloneDeep(R == null ? void 0 : R.data) || {};
           D != null && D.reverseField || (D.autoCreateReverseField = !1, D.reverseField = (z = T == null ? void 0 : T.default) == null ? void 0 : z.reverseField, set$1(D.reverseField, "name", `f_${uid()}`), set$1(D.reverseField, "uiSchema.title", (L = o.__parent) == null ? void 0 : L.title));
-          const N = getSchema$7(T, D, o, C);
-          h(N), p(!0);
+          const $ = getSchema$7(T, D, o, C);
+          h($), p(!0);
         }),
         children: i || f("Edit")
       })
@@ -48534,19 +48680,19 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   const t = useRecord(), n = useCollectionParentRecordData();
   return /* @__PURE__ */ jsx(OverridingFieldAction, x({ item: t, parentItem: n }, e));
 }, getIsOverriding = (e, t, n) => t.find((r) => r.name === n.name).collectionName === e, OverridingFieldAction = (e) => {
-  const { scope: t, getContainer: n, item: o, parentItem: r, children: i, currentCollection: a } = e, { target: l, through: c } = o, { getInterface: u, getCollection: d, getCurrentCollectionFields: p, getChildrenCollections: m, collections: h } = useCollectionManager_deprecated(), [g, f] = useState(!1), [C, b] = useState({}), S = useAPIClient(), { t: y } = useTranslation(), v = useCompile(), F = ($) => {
+  const { scope: t, getContainer: n, item: o, parentItem: r, children: i, currentCollection: a } = e, { target: l, through: c } = o, { getInterface: u, getCollection: d, getCurrentCollectionFields: p, getChildrenCollections: m, collections: h } = useCollectionManager_deprecated(), [g, f] = useState(!1), [C, b] = useState({}), S = useAPIClient(), { t: y } = useTranslation(), v = useCompile(), F = (B) => {
     var M;
-    return $ && ((M = m($)) == null ? void 0 : M.map((B) => B.name).concat([$]));
-  }, [A, R] = useState({}), T = p(a), D = getIsOverriding(a, T, o), N = useMemo(() => h.map(($) => ({
-    label: v($.title),
-    value: $.name
+    return B && ((M = m(B)) == null ? void 0 : M.map((N) => N.name).concat([B]));
+  }, [A, R] = useState({}), T = p(a), D = getIsOverriding(a, T, o), $ = useMemo(() => h.map((B) => ({
+    label: v(B.title),
+    value: B.name
   })), []), z = () => {
-    const $ = useForm(), { refresh: w } = useResourceActionContext(), { refreshCM: M } = useCollectionManager_deprecated(), B = useActionContext(), { resource: k } = useResourceContext();
+    const B = useForm(), { refresh: w } = useResourceActionContext(), { refreshCM: M } = useCollectionManager_deprecated(), N = useActionContext(), { resource: k } = useResourceContext();
     return {
       run() {
         return V(this, null, function* () {
-          yield $.submit();
-          const O = cloneDeep($.values), q = omit(O, [
+          yield B.submit();
+          const O = cloneDeep(B.values), q = omit(O, [
             "key",
             "uiSchemaUid",
             "collectionName",
@@ -48560,13 +48706,13 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           ]);
           yield k.create({
             values: q
-          }), yield $.reset(), yield M(), yield w(), B.setVisible(!1);
+          }), yield B.reset(), yield M(), yield w(), N.setVisible(!1);
         });
       }
     };
   }, L = useMemo(() => {
-    var $;
-    return (o == null ? void 0 : o.fields) || (($ = d(o.collectionName)) == null ? void 0 : $.options.fields.filter((w) => ["string", "bigInt", "integer"].includes(w.type)).map((w) => {
+    var B;
+    return (o == null ? void 0 : o.fields) || ((B = d(o.collectionName)) == null ? void 0 : B.options.fields.filter((w) => ["string", "bigInt", "integer"].includes(w.type)).map((w) => {
       var M;
       return {
         value: w.name,
@@ -48580,18 +48726,18 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       {
         disabled: D,
         onClick: () => V(void 0, null, function* () {
-          var $;
+          var B;
           if (!D) {
             const { data: w } = yield S.resource("collections.fields", o.collectionName).get({
               filterByTk: o.name,
               appends: ["reverseField"]
             });
             R(w == null ? void 0 : w.data);
-            const M = u(o.interface), B = cloneDeep(w == null ? void 0 : w.data) || {};
-            B != null && B.reverseField || (B.autoCreateReverseField = !1, B.reverseField = ($ = M.default) == null ? void 0 : $.reverseField, set(B.reverseField, "name", `f_${uid()}`), set(B.reverseField, "uiSchema.title", o.__parent.title));
+            const M = u(o.interface), N = cloneDeep(w == null ? void 0 : w.data) || {};
+            N != null && N.reverseField || (N.autoCreateReverseField = !1, N.reverseField = (B = M.default) == null ? void 0 : B.reverseField, set(N.reverseField, "name", `f_${uid()}`), set(N.reverseField, "uiSchema.title", o.__parent.title));
             const k = getSchema$6(
               P(x({}, M), {
-                default: B
+                default: N
               }),
               o,
               v
@@ -48616,7 +48762,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           override: !0,
           isOverride: !0,
           targetScope: { target: F(l), through: F(c) },
-          collections: N,
+          collections: $,
           scopeKeyOptions: L
         }, t)
       }
@@ -49054,7 +49200,7 @@ const getSchema$4 = (e, t, n) => {
     const w = [];
     g.forEach((M) => {
       var q;
-      const B = v(M), j = R(M).map((E) => {
+      const N = v(M), j = R(M).map((E) => {
         const U = T(E, M);
         return {
           type: "group",
@@ -49068,22 +49214,22 @@ const getSchema$4 = (e, t, n) => {
             };
           })
         };
-      }), O = (q = B.fields.filter((E) => !["obo", "oho", "m2m", "o2m"].includes(E == null ? void 0 : E.interface))) == null ? void 0 : q.map((E) => {
+      }), O = (q = N.fields.filter((E) => !["obo", "oho", "m2m", "o2m"].includes(E == null ? void 0 : E.interface))) == null ? void 0 : q.map((E) => {
         var U;
         return { value: E.name, key: E.name, label: l(((U = E.uiSchema) == null ? void 0 : U.title) || E.name) };
       }).concat(j);
       w.push({
         value: M,
-        label: l(B.title || B.name),
+        label: l(N.title || N.name),
         children: O
       });
     }), h(w);
   }, [g, t]), useEffect(() => {
     t && (u(!0), a.resource("dbViews").get({ filterByTk: n, schema: r }).then(({ data: w }) => {
-      var M, B;
+      var M, N;
       if (w) {
         u(!1), p([]);
-        const k = (B = Object.values((M = w == null ? void 0 : w.data) == null ? void 0 : M.fields)) == null ? void 0 : B.map((j) => {
+        const k = (N = Object.values((M = w == null ? void 0 : w.data) == null ? void 0 : M.fields)) == null ? void 0 : N.map((j) => {
           var O, q;
           if (j.source) {
             const E = (i == null ? void 0 : i.data.find((U) => U.name === j.name)) || j;
@@ -49105,14 +49251,14 @@ const getSchema$4 = (e, t, n) => {
     }).catch);
   }, [t]);
   const L = (w, M) => {
-    d.splice(M, 1, w), p(d), S.value = d.map((B) => {
+    d.splice(M, 1, w), p(d), S.value = d.map((N) => {
       var j, O, q;
-      const k = typeof B.source == "string" ? B.source : (q = (O = (j = B.source) == null ? void 0 : j.filter) == null ? void 0 : O.call(j, Boolean)) == null ? void 0 : q.join(".");
-      return P(x({}, B), {
+      const k = typeof N.source == "string" ? N.source : (q = (O = (j = N.source) == null ? void 0 : j.filter) == null ? void 0 : O.call(j, Boolean)) == null ? void 0 : q.join(".");
+      return P(x({}, N), {
         source: k
       });
     });
-  }, $ = [
+  }, B = [
     {
       title: l("Field name"),
       dataIndex: "name",
@@ -49124,7 +49270,7 @@ const getSchema$4 = (e, t, n) => {
       dataIndex: "source",
       key: "source",
       width: 200,
-      render: (w, M, B) => /* @__PURE__ */ jsx(
+      render: (w, M, N) => /* @__PURE__ */ jsx(
         Cascader$1,
         {
           defaultValue: typeof w == "string" ? w == null ? void 0 : w.split(".") : w,
@@ -49134,7 +49280,7 @@ const getSchema$4 = (e, t, n) => {
           onChange: (k, j) => {
             var q;
             const O = (q = A(k == null ? void 0 : k[0])) == null ? void 0 : q.find((E) => E.name === last(k));
-            L(P(x({}, M), { source: k, uiSchema: O == null ? void 0 : O.uiSchema }), B);
+            L(P(x({}, M), { source: k, uiSchema: O == null ? void 0 : O.uiSchema }), N);
           },
           placeholder: l("Select field source")
         }
@@ -49145,8 +49291,8 @@ const getSchema$4 = (e, t, n) => {
       dataIndex: "type",
       width: 140,
       key: "type",
-      render: (w, M, B) => {
-        const k = d[B];
+      render: (w, M, N) => {
+        const k = d[N];
         return k != null && k.source || !(k != null && k.possibleTypes) ? /* @__PURE__ */ jsx(Tag, { children: w }) : /* @__PURE__ */ jsx(
           Select$1,
           {
@@ -49154,7 +49300,7 @@ const getSchema$4 = (e, t, n) => {
             popupMatchSelectWidth: !1,
             style: { width: "100%" },
             options: (k == null ? void 0 : k.possibleTypes.map((j) => ({ label: j, value: j }))) || [],
-            onChange: (j) => L(P(x({}, k), { type: j }), B)
+            onChange: (j) => L(P(x({}, k), { type: j }), N)
           }
         );
       }
@@ -49164,8 +49310,8 @@ const getSchema$4 = (e, t, n) => {
       dataIndex: "interface",
       key: "interface",
       width: 150,
-      render: (w, M, B) => {
-        const k = d[B], j = getInterfaceOptions(z, k.type);
+      render: (w, M, N) => {
+        const k = d[N], j = getInterfaceOptions(z, k.type);
         return k.source ? w : /* @__PURE__ */ jsx(
           Select$1,
           {
@@ -49175,7 +49321,7 @@ const getSchema$4 = (e, t, n) => {
             onChange: (O) => {
               var E;
               const q = F(O);
-              L(P(x({}, k), { interface: O, uiSchema: (E = q == null ? void 0 : q.default) == null ? void 0 : E.uiSchema }), B);
+              L(P(x({}, k), { interface: O, uiSchema: (E = q == null ? void 0 : q.default) == null ? void 0 : E.uiSchema }), N);
             },
             children: j.map((O) => /* @__PURE__ */ jsx(Select$1.OptGroup, { label: D(O.label), children: O.children.map((q) => /* @__PURE__ */ jsx(Select$1.Option, { value: q.name, children: D(q.label) }, q.value)) }, O.key))
           }
@@ -49187,16 +49333,16 @@ const getSchema$4 = (e, t, n) => {
       dataIndex: "title",
       key: "title",
       width: 180,
-      render: (w, M, B) => {
+      render: (w, M, N) => {
         var j;
-        const k = d[B];
+        const k = d[N];
         return /* @__PURE__ */ jsx(
           Input$3,
           {
             defaultValue: ((j = k == null ? void 0 : k.uiSchema) == null ? void 0 : j.title) || w,
             onChange: (O) => L(
               P(x({}, k), { uiSchema: P(x({}, omit(k == null ? void 0 : k.uiSchema, "rawTitle")), { title: O.target.value }) }),
-              B
+              N
             )
           }
         );
@@ -49214,7 +49360,7 @@ const getSchema$4 = (e, t, n) => {
         {
           bordered: !0,
           size: "middle",
-          columns: $,
+          columns: B,
           dataSource: d,
           scroll: { y: 300 },
           pagination: !1,
@@ -49249,14 +49395,14 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
   }, S = (y) => {
     var v;
     return (v = y.filter((F) => F.source || F.interface)) == null ? void 0 : v.map((F) => {
-      var N, z, L, $, w, M;
-      const A = typeof (F == null ? void 0 : F.source) == "string" ? (N = F == null ? void 0 : F.source) == null ? void 0 : N.split(".") : F == null ? void 0 : F.source, R = (L = (z = h(A == null ? void 0 : A[0])) == null ? void 0 : z.find((B) => B.name === (A == null ? void 0 : A[1]))) == null ? void 0 : L.uiSchema, T = (($ = F == null ? void 0 : F.uiSchema) == null ? void 0 : $.title) || (R == null ? void 0 : R.title) || F.name, D = F.source ? R : (M = (w = m(F.interface)) == null ? void 0 : w.default) == null ? void 0 : M.uiSchema;
+      var $, z, L, B, w, M;
+      const A = 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 = (L = (z = h(A == null ? void 0 : A[0])) == null ? void 0 : z.find((N) => N.name === (A == null ? void 0 : A[1]))) == null ? void 0 : L.uiSchema, T = ((B = F == null ? void 0 : F.uiSchema) == null ? void 0 : B.title) || (R == null ? void 0 : R.title) || F.name, D = F.source ? R : (M = (w = m(F.interface)) == null ? void 0 : w.default) == null ? void 0 : M.uiSchema;
       return {
         title: u(T),
         dataIndex: F.name,
         key: F.name,
         width: 200,
-        render: (B, k, j) => {
+        render: (N, k, j) => {
           const O = k[F.name], q = {
             type: "object",
             properties: {
@@ -49489,28 +49635,28 @@ const AsyncDataProvider = (e) => {
       () => h.filter((T) => !["relation"].includes(T.key)).map((T, D) => ({
         key: D,
         label: d(T.label),
-        options: T.children.map((N, z) => ({
-          value: N.name,
+        options: T.children.map(($, z) => ({
+          value: $.name,
           key: `${D}-${z}`,
-          label: d(N.label)
+          label: d($.label)
         }))
       })),
       [d]
     ), f = useSourceFieldsOptions(), C = useRef(p);
     if (useEffect(() => {
-      var N;
+      var $;
       const T = /* @__PURE__ */ new Map();
       i || (a && a.length ? Object.entries((a == null ? void 0 : a[0]) || {}).forEach(([z, L]) => {
         var k;
-        const $ = l[z], w = inferInterface(z, L), M = (k = C.current(w)) == null ? void 0 : k.default, B = ($ == null ? void 0 : $.uiSchema) || (M == null ? void 0 : M.uiSchema) || {};
+        const B = l[z], w = inferInterface(z, L), M = (k = C.current(w)) == null ? void 0 : k.default, N = (B == null ? void 0 : B.uiSchema) || (M == null ? void 0 : M.uiSchema) || {};
         T.set(z, {
           name: z,
-          interface: ($ == null ? void 0 : $.interface) || w,
-          type: ($ == null ? void 0 : $.type) || (M == null ? void 0 : M.type),
-          source: $ == null ? void 0 : $.source,
+          interface: (B == null ? void 0 : B.interface) || w,
+          type: (B == null ? void 0 : B.type) || (M == null ? void 0 : M.type),
+          source: B == null ? void 0 : B.source,
           uiSchema: x({
             title: z
-          }, B)
+          }, N)
         });
       }) : Object.entries(l || {}).forEach(
         ([z, L]) => T.set(z, P(x({
@@ -49521,7 +49667,7 @@ const AsyncDataProvider = (e) => {
             title: z
           }, (L == null ? void 0 : L.uiSchema) || {})
         }))
-      )), (N = c.value) != null && N.length && c.value.forEach((z) => {
+      )), ($ = c.value) != null && $.length && c.value.forEach((z) => {
         T.has(z.name) && T.set(z.name, z);
       });
       const D = Array.from(T.values());
@@ -49537,12 +49683,12 @@ const AsyncDataProvider = (e) => {
       return /* @__PURE__ */ jsx(Alert, { showIcon: !0, message: `${e("SQL error: ")}${T}`, type: "error" });
     }
     const S = (T, D) => {
-      const N = [...t];
-      N.splice(D, 1, T), n(N), c.setValue(
-        N.map((z) => {
-          var L, $, w;
+      const $ = [...t];
+      $.splice(D, 1, T), n($), c.setValue(
+        $.map((z) => {
+          var L, B, w;
           return P(x({}, z), {
-            source: typeof z.source == "string" ? z.source : ((w = ($ = (L = z.source) == null ? void 0 : L.filter) == null ? void 0 : $.call(L, Boolean)) == null ? void 0 : w.join(".")) || null
+            source: typeof z.source == "string" ? z.source : ((w = (B = (L = z.source) == null ? void 0 : L.filter) == null ? void 0 : B.call(L, Boolean)) == null ? void 0 : w.join(".")) || null
           });
         })
       );
@@ -49558,8 +49704,8 @@ const AsyncDataProvider = (e) => {
         dataIndex: "source",
         key: "source",
         width: 200,
-        render: (T, D, N) => {
-          const z = t[N];
+        render: (T, D, $) => {
+          const z = t[$];
           return /* @__PURE__ */ jsx(
             Cascader$1,
             {
@@ -49568,15 +49714,15 @@ const AsyncDataProvider = (e) => {
               options: d(f),
               placeholder: e("Select field source"),
               onChange: (L) => {
-                let $ = l[L == null ? void 0 : L[1]];
-                $ != null && $.interface || ($ = m((L == null ? void 0 : L.join(".")) || "")), S(
+                let B = l[L == null ? void 0 : L[1]];
+                B != null && B.interface || (B = m((L == null ? void 0 : L.join(".")) || "")), S(
                   P(x({}, z), {
                     source: L,
-                    interface: $ == null ? void 0 : $.interface,
-                    type: $ == null ? void 0 : $.type,
-                    uiSchema: $ == null ? void 0 : $.uiSchema
+                    interface: B == null ? void 0 : B.interface,
+                    type: B == null ? void 0 : B.type,
+                    uiSchema: B == null ? void 0 : B.uiSchema
                   }),
-                  N
+                  $
                 );
               }
             }
@@ -49588,27 +49734,27 @@ const AsyncDataProvider = (e) => {
         dataIndex: "interface",
         key: "interface",
         width: 150,
-        render: (T, D, N) => {
+        render: (T, D, $) => {
           var L;
-          const z = t[N];
+          const z = t[$];
           return z.source ? /* @__PURE__ */ jsx(Tag, { children: d((L = p(T)) == null ? void 0 : L.title) || T }) : /* @__PURE__ */ jsx(
             Select$1,
             {
               defaultValue: z.interface || "input",
               style: { width: "100%" },
               popupMatchSelectWidth: !1,
-              onChange: ($) => {
-                var M, B, k, j, O;
-                const w = p($);
+              onChange: (B) => {
+                var M, N, k, j, O;
+                const w = p(B);
                 S(
                   P(x({}, z), {
-                    interface: $ || null,
+                    interface: B || null,
                     uiSchema: P(x({}, (M = w == null ? void 0 : w.default) == null ? void 0 : M.uiSchema), {
-                      title: ((k = (B = w == null ? void 0 : w.default) == null ? void 0 : B.uiSchema) == null ? void 0 : k.title) || ((j = z.uiSchema) == null ? void 0 : j.title)
+                      title: ((k = (N = w == null ? void 0 : w.default) == null ? void 0 : N.uiSchema) == null ? void 0 : k.title) || ((j = z.uiSchema) == null ? void 0 : j.title)
                     }),
                     type: (O = w == null ? void 0 : w.default) == null ? void 0 : O.type
                   }),
-                  N
+                  $
                 );
               },
               allowClear: !0,
@@ -49622,15 +49768,15 @@ const AsyncDataProvider = (e) => {
         dataIndex: "title",
         key: "title",
         width: 180,
-        render: (T, D, N) => {
-          var L, $;
-          const z = t[N];
+        render: (T, D, $) => {
+          var L, B;
+          const z = t[$];
           return /* @__PURE__ */ jsx(
             Input$3,
             {
               value: ((L = z.uiSchema) == null ? void 0 : L.title) || T,
-              defaultValue: (($ = z.uiSchema) == null ? void 0 : $.title) !== void 0 ? z.uiSchema.title : z == null ? void 0 : z.name,
-              onChange: (w) => S(P(x({}, z), { uiSchema: P(x({}, z == null ? void 0 : z.uiSchema), { title: w.target.value }) }), N)
+              defaultValue: ((B = z.uiSchema) == null ? void 0 : B.title) !== void 0 ? z.uiSchema.title : z == null ? void 0 : z.name,
+              onChange: (w) => S(P(x({}, z), { uiSchema: P(x({}, z == null ? void 0 : z.uiSchema), { title: w.target.value }) }), $)
             }
           );
         }
@@ -55701,7 +55847,7 @@ const RolesResourcesActions = connect((e) => {
                       const T = p[A.name] || {
                         name: A.name
                       };
-                      R ? T.fields = [] : T.fields = (D = l == null ? void 0 : l.map) == null ? void 0 : D.call(l, (N) => N.name), p[A.name] = T, t(Object.values(p));
+                      R ? T.fields = [] : T.fields = (D = l == null ? void 0 : l.map) == null ? void 0 : D.call(l, ($) => $.name), p[A.name] = T, t(Object.values(p));
                     }
                   }
                 ),
@@ -55714,15 +55860,15 @@ const RolesResourcesActions = connect((e) => {
                   checked: T,
                   "aria-label": `${A.name}_checkbox`,
                   onChange: () => {
-                    const N = p[A.name] || {
+                    const $ = p[A.name] || {
                       name: A.name
-                    }, z = N.fields || [];
+                    }, z = $.fields || [];
                     if (T) {
                       const L = z.indexOf(D.name);
                       z.splice(L, 1);
                     } else
                       z.push(D.name);
-                    N.fields = z, p[A.name] = N, t(Object.values(p));
+                    $.fields = z, p[A.name] = $, t(Object.values(p));
                   }
                 }
               )
@@ -56477,9 +56623,9 @@ function PluginInfo(e) {
                     y.silent().request({
                       url: "__health_check",
                       method: "get"
-                    }).then((N) => {
-                      (N == null ? void 0 : N.data) === "ok" && window.location.reload();
-                    }).catch((N) => {
+                    }).then(($) => {
+                      ($ == null ? void 0 : $.data) === "ok" && window.location.reload();
+                    }).catch(($) => {
                     });
                   }
                   setInterval(D, 1e3);
@@ -58494,14 +58640,14 @@ const ActionInitializerItem = (e) => {
     ), F = f || (i == null ? void 0 : i.targetKey) || "id", A = C || ((U = (E = a["x-component-props"]) == null ? void 0 : E.fieldNames) == null ? void 0 : U.label) || F, R = {
       title: A || F,
       key: F
-    }, [T, D] = useState([]), [N, z] = useState(a.default || []), [L, $] = useState(!0), w = useLabelUiSchema(i, (R == null ? void 0 : R.title) || "label");
+    }, [T, D] = useState([]), [$, z] = useState(a.default || []), [L, B] = useState(!0), w = useLabelUiSchema(i, (R == null ? void 0 : R.title) || "label");
     if (useEffect(() => {
       a.default && (d(a.default), z(a.default));
     }, [a.default, d]), !i)
       return null;
     const M = (W) => {
-      D(W), $(!1);
-    }, B = (W) => {
+      D(W), B(!1);
+    }, N = (W) => {
       z(W), d(W), p == null || p(W);
     }, k = (W) => {
       var Y;
@@ -58561,10 +58707,10 @@ const ActionInitializerItem = (e) => {
                 expandedKeys: T,
                 autoExpandParent: L,
                 treeData: u,
-                onSelect: B,
+                onSelect: N,
                 fieldNames: R,
                 titleRender: (W) => /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: getLabelFormatValue(w, c(W[A])) }),
-                selectedKeys: N,
+                selectedKeys: $,
                 blockNode: !0
               }
             )
@@ -58966,10 +59112,10 @@ const DataBlockInitializer = (e) => {
     currentText: b,
     otherText: S
   } = e, { insert: y, setVisible: v } = useSchemaInitializer(), F = useCompile(), { getTemplateSchemaByMode: A } = useSchemaTemplateManager(), R = useCallback(
-    (B) => V(void 0, null, function* () {
-      const { item: k, fromOthersInPopup: j } = B;
+    (N) => V(void 0, null, function* () {
+      const { item: k, fromOthersInPopup: j } = N;
       if (f)
-        return f(B);
+        return f(N);
       if (k.template) {
         const O = yield A(k);
         y(t ? t(O, { item: k, fromOthersInPopup: j }) : O);
@@ -58992,9 +59138,9 @@ const DataBlockInitializer = (e) => {
     onClick: R,
     currentText: b,
     otherText: S
-  }), D = useGetSchemaInitializerMenuItems(R), N = useMemo(() => D(T, i), [D, T, i]), [z, L] = useState([]), $ = useMenuSearch({ data: N, openKeys: z, hideSearch: u }), w = useMemo(() => {
-    let B = $.filter((k) => k.key !== "search" && k.key !== "empty");
-    return p && B.length === 1 ? B = B[0].children : B = $, [
+  }), D = useGetSchemaInitializerMenuItems(R), $ = useMemo(() => D(T, i), [D, T, i]), [z, L] = useState([]), B = useMenuSearch({ data: $, openKeys: z, hideSearch: u }), w = useMemo(() => {
+    let N = B.filter((k) => k.key !== "search" && k.key !== "empty");
+    return p && N.length === 1 ? N = N[0].children : N = B, [
       {
         key: i,
         label: F(a),
@@ -59002,15 +59148,15 @@ const DataBlockInitializer = (e) => {
         onClick: (k) => {
           k.key === i && R(P(x({}, k), { item: e }));
         },
-        children: B
+        children: N
       }
     ];
-  }, [$, p, i, F, a, r, R, e]);
-  return N.length > 1 || N.length === 1 && ((M = N[0].children) == null ? void 0 : M.length) > 0 ? /* @__PURE__ */ jsx(
+  }, [B, p, i, F, a, r, R, e]);
+  return $.length > 1 || $.length === 1 && ((M = $[0].children) == null ? void 0 : M.length) > 0 ? /* @__PURE__ */ jsx(
     SchemaInitializerMenu,
     {
-      onOpenChange: (B) => {
-        L(B);
+      onOpenChange: (N) => {
+        L(N);
       },
       items: w
     }