@nocobase/client 1.6.36 → 1.6.38

package/es/index.mjs

@@ -6052,24 +6052,24 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
     const D = {
       type: "duplicate",
       tag: c((j = T.uiSchema) == null ? void 0 : j.title) || T.name
-    }, O = P(x({}, D), {
+    }, N = 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", O.type = "reference", O.title = React.createElement(TreeNode, P(x({}, D), { type: "reference", displayType: t })), O.isLeaf = !1, O.children = m(T.target, {
+    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, {
       depth: F + 1,
       maxDepth: I,
-      prefix: O.key,
+      prefix: N.key,
       exclude: systemKeys
-    })) : ["hasOne", "hasMany"].includes(T.type) && (O.isLeaf = !1, O.children = p(T.target, {
+    })) : ["hasOne", "hasMany"].includes(T.type) && (N.isLeaf = !1, N.children = p(T.target, {
       depth: F + 1,
       maxDepth: I,
-      prefix: O.key,
+      prefix: N.key,
       exclude: ["id", ...systemKeys]
-    })), O;
+    })), N;
   }).filter(Boolean), m = (y, { prefix: v, maxDepth: F, depth: I = 0, exclude: R = [] }) => I > F ? [] : o(y).map((T) => {
     var j;
     if (!T.target || !T.interface || R.includes(T.name))
@@ -6077,15 +6077,15 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
     const D = {
       type: "preloading",
       tag: c((j = T.uiSchema) == null ? void 0 : j.title) || T.name
-    }, O = v ? `${v}.${T.name}` : T.name;
+    }, N = v ? `${v}.${T.name}` : T.name;
     return {
       role: "button",
       title: React.createElement(TreeNode, P(x({}, D), { displayType: t })),
-      key: O,
+      key: N,
       isLeaf: !1,
       field: T,
       children: m(T.target, {
-        prefix: O,
+        prefix: N,
         depth: I + 1,
         maxDepth: F,
         exclude: R
@@ -6104,8 +6104,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 (O) {
-      return console.error(O), [];
+    } catch (N) {
+      return console.error(N), [];
     }
   }, []), f = useCallback((y) => (v) => new Promise((F) => {
     if (v.children.length)
@@ -6126,10 +6126,10 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
         var M, $;
         if (!T.interface)
           return;
-        const O = a(T.interface);
-        if (!(O != null && O.filterable))
+        const N = a(T.interface);
+        if (!(N != null && N.filterable))
           return;
-        const { nested: j, children: N, operators: B } = O.filterable, w = {
+        const { nested: j, children: O, operators: B } = N.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,
@@ -6139,18 +6139,18 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
         if (!(T.target && D > 2)) {
           if (D > 2)
             return w;
-          if (N != null && N.length && (w.children = N), j) {
+          if (O != null && O.length && (w.children = O), j) {
             const k = o(T.target), z = I(k, D + 1).filter(Boolean);
             w.children = w.children || [], w.children.push(...z);
           }
           return w;
         }
       }, I = (T, D) => {
-        const O = [];
+        const N = [];
         return T.forEach((j) => {
-          const N = F(j, D);
-          N && O.push(N);
-        }), O;
+          const O = F(j, D);
+          O && N.push(O);
+        }), N;
       };
       return I(v, 1);
     },
@@ -7425,8 +7425,8 @@ const collectFieldStateOfLinkageRules = ({ operator: e, value: t, field: n, cond
             });
             try {
               return m(T, x({ now: () => (/* @__PURE__ */ new Date()).toString() }, D));
-            } catch (O) {
-              console.error(O);
+            } catch (N) {
+              console.error(N);
             }
           } else
             return (t == null ? void 0 : t.mode) === "constant" ? (R = t == null ? void 0 : t.value) != null ? R : t : null;
@@ -7463,7 +7463,7 @@ function replaceVariables(o, r) {
       return;
     const l = (c = e.match(REGEX_OF_VARIABLE_IN_EXPRESSION)) == null ? void 0 : c.map((u) => V(this, null, function* () {
       const { value: d } = yield t.parseVariable(u, n, {
-        doNotRequest: u.includes("$nForm")
+        doNotRequest: u.includes("$nForm") || u.includes("$iteration")
       }), p = `_${uid$1()}`;
       return a[p] = d, i[u] = p, d;
     }));
@@ -8545,7 +8545,7 @@ 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: I, componentCls: R } = useSchemaInitializerStyles(), [T, D] = useState(!1), { token: O } = theme.useToken(), j = useNiceDropdownMaxHeight([T]), N = useMemo(
+      ), { wrapSSR: F, hashId: I, componentCls: R } = useSchemaInitializerStyles(), [T, D] = useState(!1), { token: N } = theme.useToken(), j = useNiceDropdownMaxHeight([T]), O = useMemo(
         () => x({
           options: n,
           style: C
@@ -8553,7 +8553,7 @@ function withInitializer(e) {
         [b, n, C]
       ), B = useMemo(() => css`
           .ant-popover-inner {
-            padding: ${`${O.paddingXXS}px 0`};
+            padding: ${`${N.paddingXXS}px 0`};
             .ant-menu-submenu-title {
               margin-block: 0;
             }
@@ -8561,7 +8561,7 @@ function withInitializer(e) {
               padding: 0;
             }
           }
-        `, [O.paddingXXS]), w = useMemo(
+        `, [N.paddingXXS]), w = useMemo(
         () => ({
           maxHeight: j,
           overflowY: "auto"
@@ -8585,7 +8585,7 @@ function withInitializer(e) {
                 options: n,
                 insert: v
               },
-              children: f === !1 ? React.createElement(e, N) : /* @__PURE__ */ jsx(
+              children: f === !1 ? React.createElement(e, O) : /* @__PURE__ */ jsx(
                 Popover,
                 P(x({
                   zIndex: 9999,
@@ -8602,10 +8602,10 @@ function withInitializer(e) {
                         theme: {
                           components: {
                             Menu: {
-                              itemHeight: O.marginXL,
-                              borderRadius: O.borderRadiusSM,
-                              itemBorderRadius: O.borderRadiusSM,
-                              subMenuItemBorderRadius: O.borderRadiusSM
+                              itemHeight: N.marginXL,
+                              borderRadius: N.borderRadiusSM,
+                              itemBorderRadius: N.borderRadiusSM,
+                              subMenuItemBorderRadius: N.borderRadiusSM
                             }
                           }
                         },
@@ -8613,7 +8613,7 @@ function withInitializer(e) {
                       }
                     ) })
                   ),
-                  children: React.createElement(e, N)
+                  children: React.createElement(e, O)
                 })
               )
             }
@@ -9210,7 +9210,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.6.36", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.6.38", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
   "@ahooksjs/use-url-state": "3.5.1",
   "@ant-design/cssinjs": "^1.11.1",
   "@ant-design/icons": "^5.6.1",
@@ -9231,9 +9231,9 @@ const name = "@nocobase/client", version = "1.6.36", license = "AGPL-3.0", main
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.6.36",
-  "@nocobase/sdk": "1.6.36",
-  "@nocobase/utils": "1.6.36",
+  "@nocobase/evaluators": "1.6.38",
+  "@nocobase/sdk": "1.6.38",
+  "@nocobase/utils": "1.6.38",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -10256,11 +10256,11 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
       }
     `, [n.paddingContentVerticalLG, n.marginSM, n.margin]), C = useCollection(), b = useMemo(() => withTooltipComponent(NocoBaseRecursionField), []), S = useMemo(
     () => u == null ? void 0 : u.map((v) => {
-      var j, N, B, w;
+      var j, O, B, w;
       const F = v.reduceProperties((M, $) => {
         if (isCollectionFieldComponent($))
           return M.concat([$]);
-      }, []), I = (F == null ? void 0 : F.length) > 0 ? F[0].name : v.name, R = !!((j = v["x-component-props"]) != null && j.columnHidden), { uiSchema: T, defaultValue: D, interface: O } = (C == null ? void 0 : C.getField(I)) || {};
+      }, []), I = (F == null ? void 0 : F.length) > 0 ? F[0].name : v.name, R = !!((j = v["x-component-props"]) != null && j.columnHidden), { uiSchema: T, defaultValue: D, interface: N } = (C == null ? void 0 : C.getField(I)) || {};
       return T && (T.default = D), P(x({
         title: /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: h, children: /* @__PURE__ */ jsx(
           b,
@@ -10269,7 +10269,7 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
             schema: v,
             onlyRenderSelf: !0,
             isUseFormilyField: !1,
-            tooltip: (N = v == null ? void 0 : v["x-component-props"]) == null ? void 0 : N.tooltip
+            tooltip: (O = v == null ? void 0 : v["x-component-props"]) == null ? void 0 : O.tooltip
           }
         ) }),
         dataIndex: I,
@@ -10416,7 +10416,7 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
             display: none !important;
           }
         `,
-      itemRender: (D, O, j) => O === "prev" ? /* @__PURE__ */ jsxs(
+      itemRender: (D, N, j) => N === "prev" ? /* @__PURE__ */ jsxs(
         "div",
         {
           style: { display: "flex" },
@@ -10657,8 +10657,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"]) || {}, I = useCollection(), T = ((Ce = v == null ? void 0 : v.parent) == null ? void 0 : Ce["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: O } = T, j = useMemoizedFn(S.onRowDragEnd || (() => {
-      })), N = usePaginationProps$3(n, i, e), B = useTableColumns$2(S, N), [w, M] = useState(() => D ? O : []), [$, k] = useState(((be = y == null ? void 0 : y.data) == null ? void 0 : be.selectedRowKeys) || []), [z, L] = useState([]), q = (p == null ? void 0 : p.type) !== "none", E = useRef(/* @__PURE__ */ new Map()), G = useMemo(() => css`
+      ]), y = useArrayField$1(S), v = useFieldSchema(), { size: F = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, I = useCollection(), T = ((Ce = v == null ? void 0 : v.parent) == null ? void 0 : Ce["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: N } = T, j = useMemoizedFn(S.onRowDragEnd || (() => {
+      })), O = usePaginationProps$3(n, i, e), B = useTableColumns$2(S, O), [w, M] = useState(() => D ? N : []), [$, k] = useState(((be = y == null ? void 0 : y.data) == null ? void 0 : be.selectedRowKeys) || []), [z, L] = useState([]), q = (p == null ? void 0 : p.type) !== "none", E = useRef(/* @__PURE__ */ new Map()), G = useMemo(() => css`
           & > td {
             background-color: ${t.controlItemBgActive} !important;
           }
@@ -10683,9 +10683,9 @@ const Table$2 = withDynamicSchemaProps(
         record: Q
       }), [C, z]);
       useDeepCompareEffect(() => {
-        const Q = D ? O : [];
+        const Q = D ? N : [];
         _.isEqual(Q, w) || M(Q);
-      }, [D, O]);
+      }, [D, N]);
       const K = useCallback((Q) => {
         if (m)
           return W(Q);
@@ -10747,7 +10747,7 @@ const Table$2 = withDynamicSchemaProps(
             renderCell: (Q, te, oe, ie) => {
               if (!l && !c)
                 return ie;
-              const ae = N == null ? void 0 : N.current, xe = (N == null ? void 0 : N.pageSize) || 20;
+              const ae = O == null ? void 0 : O.current, xe = (O == null ? void 0 : O.pageSize) || 20;
               return ae ? oe = oe + (ae - 1) * xe + 1 : oe = oe + 1, te.__index && (oe = extractIndex(te.__index)), /* @__PURE__ */ jsxs(
                 "div",
                 {
@@ -10788,7 +10788,7 @@ const Table$2 = withDynamicSchemaProps(
           W,
           q,
           ne,
-          N,
+          O,
           U
         ]
       ), se = useCallback(
@@ -10832,7 +10832,7 @@ const Table$2 = withDynamicSchemaProps(
             defaultRowKey: K,
             dataSource: X
           }, S), re), {
-            paginationProps: N,
+            paginationProps: O,
             components: Z,
             onTableChange: d,
             onRow: J,
@@ -11505,7 +11505,7 @@ ${JSON.stringify(L, null, 2)}`
       F,
       h
     ]
-  ), O = useCallback(() => {
+  ), N = useCallback(() => {
     if (!f())
       return I == null ? void 0 : I(!1);
     t(withSearchParams(removeLastPopupPath(n.pathname)), { replace: !0 }), removePopupLayerState(h), m != null && m.popupuid && deletePopupContext(m.popupuid);
@@ -11530,7 +11530,7 @@ ${JSON.stringify(L, null, 2)}`
       });
     },
     [R, t, m == null ? void 0 : m.popupuid, i == null ? void 0 : i.data, n]
-  ), N = useCallback((w, M) => {
+  ), O = useCallback((w, M) => {
     M.__popup = w;
   }, []), B = useCallback((w) => w.__popup, []);
   return {
@@ -11541,8 +11541,8 @@ ${JSON.stringify(L, null, 2)}`
     /**
      * used to close popup by changing the url
      */
-    closePopup: O,
-    savePopupSchemaToSchema: N,
+    closePopup: N,
+    savePopupSchemaToSchema: O,
     getPopupSchemaFromSchema: B,
     context: S,
     /**
@@ -13135,7 +13135,7 @@ https://requirejs.org/docs/errors.html#` + e);
         };
       }
     };
-    function O(k) {
+    function N(k) {
       delete l[k], delete c[k];
     }
     function j(k, z, L) {
@@ -13145,7 +13145,7 @@ https://requirejs.org/docs/errors.html#` + e);
         H && !k.depMatched[G] && !L[U] && (getOwn(z, U) ? (k.defineDep(G, p[U]), k.check()) : j(H, z, L));
       }), L[q] = !0);
     }
-    function N() {
+    function O() {
       var k, z, L = a.waitSeconds * 1e3, q = L && o.startTime + L < (/* @__PURE__ */ new Date()).getTime(), E = [], G = [], U = !1, H = !0;
       if (!t) {
         if (t = !0, eachProp(c, function(J) {
@@ -13161,7 +13161,7 @@ https://requirejs.org/docs/errors.html#` + e);
         H && each(G, function(J) {
           j(J, {}, {});
         }), (!q || z) && U && (isBrowser || isWebWorker) && !i && (i = setTimeout(function() {
-          i = 0, N();
+          i = 0, O();
         }, 50)), t = !1;
       }
     }
@@ -13226,7 +13226,7 @@ https://requirejs.org/docs/errors.html#` + e);
                   U.push(H.normalizedMap || H);
                 }), req.onResourceLoad(o, this.map, U);
               }
-              O(L), this.defined = !0;
+              N(L), this.defined = !0;
             }
             this.defining = !1, this.defined && !this.defineEmitted && (this.defineEmitted = !0, this.emit("defined", this.exports), this.defineEmitComplete = !0);
           }
@@ -13273,7 +13273,7 @@ https://requirejs.org/docs/errors.html#` + e);
             });
           }), E.error = bind(this, function(X) {
             this.inited = !0, this.error = X, X.requireModules = [z], eachProp(l, function(ee) {
-              ee.map.id.indexOf(z + "_unnormalized") === 0 && O(ee.map.id);
+              ee.map.id.indexOf(z + "_unnormalized") === 0 && N(ee.map.id);
             }), T(X);
           }), E.fromText = bind(this, function(X, ee) {
             var Z = k.name, ne = F(Z), re = useInteractive;
@@ -13409,7 +13409,7 @@ https://requirejs.org/docs/errors.html#` + e);
           return z.enableBuildCallback && E && isFunction(E) && (E.__requireJsBuild = !0), typeof q == "string" ? isFunction(E) ? T(makeError("requireargs", "Invalid require call"), G) : k && hasProp(r, q) ? r[q](l[k.id]) : req.get ? req.get(o, q, k, L) : (H = F(q, k, !1, !0), U = H.id, hasProp(p, U) ? p[U] : T(makeError("notloaded", 'Module name "' + U + '" has not been loaded yet for context: ' + e + (k ? "" : ". Use require([])")))) : ($(), o.nextTick(function() {
             $(), J = I(F(null, k)), J.skipMap = z.skipMap, J.init(q, E, G, {
               enabled: !0
-            }), N();
+            }), O();
           }), L);
         }
         return mixin(L, {
@@ -13438,7 +13438,7 @@ https://requirejs.org/docs/errors.html#` + e);
           var E = F(q, k, !0), G = getOwn(l, q);
           G.undefed = !0, S(q), delete p[q], delete m[E.url], delete u[q], eachReverse(d, function(U, H) {
             U[0] === q && d.splice(H, 1);
-          }), delete o.defQueueMap[q], G && (G.events.defined && (u[q] = G.events), O(q));
+          }), delete o.defQueueMap[q], G && (G.events.defined && (u[q] = G.events), N(q));
         }), L;
       },
       /**
@@ -13478,7 +13478,7 @@ https://requirejs.org/docs/errors.html#` + e);
             ));
           B([k, E.deps || [], E.exportsFn]);
         }
-        N();
+        O();
       },
       /**
        * Converts a module name to a file path. Supports cases where
@@ -14830,7 +14830,7 @@ const BaseVariableContext = React.createContext(null), BaseVariableProvider = (e
           isDisabled: f || isDisabledDefault,
           getCollectionField: C.getCollectionField,
           deprecated: p
-        }) || []).sort((D, O) => D.isLeaf && !O.isLeaf ? -1 : !D.isLeaf && O.isLeaf ? 1 : 0).sort((D, O) => D.disabled && !O.disabled ? 1 : !D.disabled && O.disabled ? -1 : 0);
+        }) || []).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);
         if (T.length === 0) {
           y.disabled = !0, y.isLeaf = !0, I();
           return;
@@ -15054,8 +15054,8 @@ const useDragEnd = (e) => {
   const { refresh: t } = useDesignable(), n = useAPIClient(), { t: o } = useTranslation();
   return useCallback(
     (r) => {
-      var f, C, b, S, y, v, F, I, R, T, D, O, j, N, 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 = (I = (F = a == null ? void 0 : a.data) == null ? void 0 : F.current) == null ? void 0 : I.breakRemoveOn, p = (T = (R = a == null ? void 0 : a.data) == null ? void 0 : R.current) == null ? void 0 : T.wrapSchema, m = (O = (D = a == null ? void 0 : a.data) == null ? void 0 : D.current) == null ? void 0 : O.onSuccess, h = (B = (N = (j = a == null ? void 0 : a.data) == null ? void 0 : j.current) == null ? void 0 : N.removeParentsIfNoChildren) != null ? B : !0;
+      var f, C, b, S, y, v, F, I, R, T, D, N, j, O, 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 = (I = (F = a == null ? void 0 : a.data) == null ? void 0 : F.current) == null ? void 0 : I.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 = (B = (O = (j = a == null ? void 0 : a.data) == null ? void 0 : j.current) == null ? void 0 : O.removeParentsIfNoChildren) != null ? B : !0;
       if (!l || !c) {
         e == null || e(r);
         return;
@@ -15185,8 +15185,8 @@ const breakRemoveOnGrid = (e) => e["x-component"] === "Grid", breakRemoveOnRow =
     if (e.first)
       m = d !== e.cols[0];
     else {
-      const D = e.cols[e.index], O = e.cols[e.index + 1];
-      m = d !== D && O !== d;
+      const D = e.cols[e.index], N = e.cols[e.index + 1];
+      m = d !== D && N !== d;
     }
   const h = e.cols[e.index], g = e.cols[e.index + 1], f = e.first || e.last || !r, {
     attributes: C,
@@ -15208,27 +15208,27 @@ const breakRemoveOnGrid = (e) => e["x-component"] === "Grid", breakRemoveOnRow =
   return useDndMonitor({
     onDragStart(D) {
       var w, M, $;
-      const O = ($ = (M = (w = D.active) == null ? void 0 : w.data) == null ? void 0 : M.current) == null ? void 0 : $.dividerRef;
-      if (!O || !r)
+      const N = ($ = (M = (w = D.active) == null ? void 0 : w.data) == null ? void 0 : M.current) == null ? void 0 : $.dividerRef;
+      if (!N || !r)
         return;
       n.current = D.active.id;
-      const j = O.current, N = j.previousElementSibling, B = j.nextElementSibling;
-      F([N.clientWidth, B.clientWidth]);
+      const j = N.current, O = j.previousElementSibling, B = j.nextElementSibling;
+      F([O.clientWidth, B.clientWidth]);
     },
     onDragMove(D) {
       if (!r || !y)
         return;
       n.current === D.active.id && (n.current = n.current + "_move");
-      const O = l.current, j = O.previousElementSibling, N = O.nextElementSibling;
-      j.style.width = `${v[0] + D.delta.x}px`, N.style.width = `${v[1] - D.delta.x}px`;
+      const N = l.current, j = N.previousElementSibling, O = N.nextElementSibling;
+      j.style.width = `${v[0] + D.delta.x}px`, O.style.width = `${v[1] - D.delta.x}px`;
     },
     onDragEnd(D) {
       var $;
       if (!r || !n.current || ($ = n.current) != null && $.startsWith(D.active.id) && !n.current.endsWith("_move") || v[0] <= 0 || v[1] <= 0 || (F([0, 0]), !h || !g))
         return;
-      const O = l.current, j = O.previousElementSibling, N = O.nextElementSibling;
+      const N = l.current, j = N.previousElementSibling, O = N.nextElementSibling;
       h["x-component-props"] = h["x-component-props"] || {}, g["x-component-props"] = g["x-component-props"] || {};
-      const B = O.clientWidth * (e.cols.length + 1) / e.cols.length, w = (100 * (j.getBoundingClientRect().width + B) / O.parentElement.clientWidth).toFixed(2), M = (100 * (N.getBoundingClientRect().width + B) / O.parentElement.clientWidth).toFixed(2);
+      const B = N.clientWidth * (e.cols.length + 1) / e.cols.length, w = (100 * (j.getBoundingClientRect().width + B) / N.parentElement.clientWidth).toFixed(2), M = (100 * (O.getBoundingClientRect().width + B) / N.parentElement.clientWidth).toFixed(2);
       _.set(h, "x-component-props.width", w), _.set(g, "x-component-props.width", M), o.emit("batchPatch", {
         schemas: [
           {
@@ -15543,8 +15543,8 @@ const useTableBlockProps = () => {
     ),
     onChange: useCallback(
       ({ current: S, pageSize: y }, v, F) => {
-        var O, j, N, B, w, M, $, k, z, L;
-        const I = (N = (j = (O = t.parent) == null ? void 0 : O["x-decorator-props"]) == null ? void 0 : j.params) == null ? void 0 : N.sort, R = F.order ? F.order === "ascend" ? [F.field] : [`-${F.field}`] : I || 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({}, (z = (k = ($ = a.current) == null ? void 0 : $.service) == null ? void 0 : k.params) == null ? void 0 : z[0]), { page: S || 1, pageSize: T });
+        var N, j, O, B, w, M, $, k, z, L;
+        const I = (O = (j = (N = t.parent) == null ? void 0 : N["x-decorator-props"]) == null ? void 0 : j.params) == null ? void 0 : O.sort, R = F.order ? F.order === "ascend" ? [F.field] : [`-${F.field}`] : I || 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({}, (z = (k = ($ = a.current) == null ? void 0 : $.service) == null ? void 0 : k.params) == null ? void 0 : z[0]), { page: S || 1, pageSize: T });
         R && (D.sort = R), (L = a.current) == null || L.service.run(D);
       },
       [t.parent]
@@ -15552,17 +15552,17 @@ const useTableBlockProps = () => {
     onClickRow: useCallback(
       (S, y, v) => {
         const { targets: F, uid: I } = findFilterTargets(t), R = r();
-        if (!F || !F.some((D) => R.some((O) => O.uid === D.uid))) {
+        if (!F || !F.some((D) => R.some((N) => N.uid === D.uid))) {
           y((D) => D.length ? [] : D);
           return;
         }
         const T = R.find((D) => D.uid === t.parent["x-uid"]);
         R.forEach((D) => {
           var $, k, z, L;
-          const O = F.find((q) => q.uid === D.uid);
-          if (!O)
+          const N = F.find((q) => q.uid === D.uid);
+          if (!N)
             return;
-          const j = getSourceKey(T, O.field) || i.rowKey || "id", N = [S[j]], B = (($ = D.service.params) == null ? void 0 : $[0]) || {}, w = ((z = (k = D.service.params) == null ? void 0 : k[1]) == null ? void 0 : z.filters) || {};
+          const j = getSourceKey(T, N.field) || i.rowKey || "id", O = [S[j]], B = (($ = D.service.params) == null ? void 0 : $[0]) || {}, w = ((z = (k = D.service.params) == null ? void 0 : k[1]) == null ? void 0 : z.filters) || {};
           if (v.includes(S[i.rowKey])) {
             if ((L = D.clearSelection) == null || L.call(D), D.dataLoadingMode === "manual")
               return D.clearData();
@@ -15571,8 +15571,8 @@ const useTableBlockProps = () => {
             w[I] = {
               $and: [
                 {
-                  [O.field || i.rowKey]: {
-                    [O.field ? "$in" : "$eq"]: N
+                  [N.field || i.rowKey]: {
+                    [N.field ? "$in" : "$eq"]: O
                   }
                 }
               ]
@@ -15970,10 +15970,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, O, j, N, B, w, M, $, k, z, L;
+    var R, T, D, N, j, O, B, w, M, $, k, z, L;
     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, (O = e == null ? void 0 : e.setInitialValue) == null || O.call(e, q), e.data = e.data || {}, e.data.selectedRowKeys = [], e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (B = (N = (j = t == null ? void 0 : t.service) == null ? void 0 : j.data) == null ? void 0 : N.meta) == null ? void 0 : B.pageSize, e.componentProps.pagination.total = ($ = (M = (w = t == null ? void 0 : t.service) == null ? void 0 : w.data) == null ? void 0 : M.meta) == null ? void 0 : $.count, e.componentProps.pagination.current = (L = (z = (k = t == null ? void 0 : t.service) == null ? void 0 : k.data) == null ? void 0 : z.meta) == null ? void 0 : L.page;
+      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 = (B = (O = (j = t == null ? void 0 : t.service) == null ? void 0 : j.data) == null ? void 0 : O.meta) == null ? void 0 : B.pageSize, e.componentProps.pagination.total = ($ = (M = (w = t == null ? void 0 : t.service) == null ? void 0 : w.data) == null ? void 0 : M.meta) == null ? void 0 : $.count, e.componentProps.pagination.current = (L = (z = (k = t == null ? void 0 : t.service) == null ? void 0 : k.data) == null ? void 0 : z.meta) == null ? void 0 : L.page;
     }
   }, [
     i == null ? void 0 : i.foreignKey,
@@ -16781,8 +16781,8 @@ const useFormItemInitializerFields = (e) => {
       Component: "CollectionFieldInitializer",
       remove: removeGridFormItem,
       schemaInitialize: (D) => {
-        var O;
-        (O = h == null ? void 0 : h.schemaInitialize) == null || O.call(h, D, {
+        var N;
+        (N = h == null ? void 0 : h.schemaInitialize) == null || N.call(h, D, {
           field: m,
           block: l,
           readPretty: a,
@@ -16792,9 +16792,9 @@ const useFormItemInitializerFields = (e) => {
       },
       schema: S
     };
-    return l == "Kanban" && (y.find = (D, O, j) => {
-      const N = findSchema(D, "x-component", l);
-      return findSchema(N, O, j);
+    return l == "Kanban" && (y.find = (D, N, j) => {
+      const O = findSchema(D, "x-component", l);
+      return findSchema(O, N, j);
     }), y;
   });
 }, useFilterFormItemInitializerFields = (e) => {
@@ -17155,14 +17155,14 @@ const useFormItemInitializerFields = (e) => {
         t: h,
         componentNamePrefix: m
       }).sort((D) => {
-        const O = _.toArray((C == null ? void 0 : C.inherits) || []);
-        if (D.name === (C == null ? void 0 : C.name) || O.some((j) => j === D.name))
+        const N = _.toArray((C == null ? void 0 : C.inherits) || []);
+        if (D.name === (C == null ? void 0 : C.name) || N.some((j) => j === D.name))
           return -1;
       })
     ]
   })), [y, C == null ? void 0 : C.inherits, C == null ? void 0 : C.name, t, v, h]);
   return r ? useMemo(() => {
-    var N;
+    var O;
     const I = {
       name: "currentRecord",
       collectionName: C.name,
@@ -17226,25 +17226,25 @@ const useFormItemInitializerFields = (e) => {
         }
       })
     };
-    let O;
+    let N;
     const j = b.length ? R : null;
     if (F[0].children.length && b.length)
-      l ? O = [I, j] : O = [I, j, D];
+      l ? N = [I, j] : N = [I, j, D];
     else if (F[0].children.length)
       if (l) {
         if (F[0].children.length <= 1)
-          return F[0].children = ((N = F[0].children[0]) == null ? void 0 : N.children) || [], F;
-        O = [I];
+          return F[0].children = ((O = F[0].children[0]) == null ? void 0 : O.children) || [], F;
+        N = [I];
       } else
-        O = [I, D];
+        N = [I, D];
     else
-      l ? O = [j] : O = [j, D];
+      l ? N = [j] : N = [j, D];
     return [
       {
         name: "records",
         label: h("Records"),
         type: "subMenu",
-        children: O.filter(Boolean)
+        children: N.filter(Boolean)
       }
     ];
   }, [
@@ -17959,7 +17959,7 @@ const useGetAriaLabelOfDesigner = () => {
     display: block !important;
   }
 `, GeneralSchemaDesigner = (e) => {
-  var O, j;
+  var N, j;
   const t = useFieldSchema(), {
     disableInitializer: n,
     title: o,
@@ -17976,10 +17976,10 @@ const useGetAriaLabelOfDesigner = () => {
     t["x-settings"] || i,
     t["x-settings-props"]
   ), S = useGridRowContext(), y = useGridContext(), v = useDataSourceManager(), F = v == null ? void 0 : v.getDataSources(), I = useDataSource(), R = (F == null ? void 0 : F.length) > 1 && I, T = ["FormItem", "ReadPrettyFormItem"].includes(r == null ? void 0 : r.componentName) ? `${r == null ? void 0 : r.name} ${m("(Fields only)")}` : r == null ? void 0 : r.name, D = useMemo(() => {
-    var N;
+    var O;
     return {
       insertPosition: "afterEnd",
-      wrap: ((N = S == null ? void 0 : S.cols) == null ? void 0 : N.length) > 1 ? void 0 : gridRowColWrap,
+      wrap: ((O = S == null ? void 0 : S.cols) == null ? void 0 : O.length) > 1 ? void 0 : gridRowColWrap,
       Component: (B) => /* @__PURE__ */ jsx(
         PlusOutlined,
         P(x({}, B), {
@@ -17989,7 +17989,7 @@ const useGetAriaLabelOfDesigner = () => {
         })
       )
     };
-  }, [g, (O = S == null ? void 0 : S.cols) == null ? void 0 : O.length]);
+  }, [g, (N = S == null ? void 0 : S.cols) == null ? void 0 : N.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) }),
@@ -18035,7 +18035,7 @@ const useGetAriaLabelOfDesigner = () => {
     toolbarClassName: m,
     toolbarStyle: h = {},
     container: g
-  } = x(x({}, e), (t == null ? void 0 : t["x-toolbar-props"]) || {}), f = useCompile(), { draggable: C } = useContext(SchemaComponentContext), { componentCls: b, hashId: S } = useStyles$f(), { t: y } = useTranslation(), { getAriaLabel: v } = useGetAriaLabelOfDesigner(), F = useDataSourceManager(), I = F == null ? void 0 : F.getDataSources(), R = useDataSource(), T = (I == null ? void 0 : I.length) > 1 && R, D = useRefreshFieldSchema(), O = useCallback(() => {
+  } = x(x({}, e), (t == null ? void 0 : t["x-toolbar-props"]) || {}), f = useCompile(), { draggable: C } = useContext(SchemaComponentContext), { componentCls: b, hashId: S } = useStyles$f(), { t: y } = useTranslation(), { getAriaLabel: v } = useGetAriaLabelOfDesigner(), F = useDataSourceManager(), I = F == null ? void 0 : F.getDataSources(), R = useDataSource(), T = (I == null ? void 0 : I.length) > 1 && R, D = useRefreshFieldSchema(), N = useCallback(() => {
     D({ refreshParentSchema: !0 });
   }, [D]), j = useMemo(() => {
     if (n) {
@@ -18044,7 +18044,7 @@ const useGetAriaLabelOfDesigner = () => {
       if (Array.isArray(n))
         return f(n);
     }
-  }, [n]), { render: N, exists: B } = useSchemaSettingsRender(
+  }, [n]), { render: O, exists: B } = useSchemaSettingsRender(
     r || (t == null ? void 0 : t["x-settings"]),
     t == null ? void 0 : t["x-settings-props"]
   ), { render: w, exists: M } = useSchemaInitializerRender(
@@ -18072,7 +18072,7 @@ const useGetAriaLabelOfDesigner = () => {
       return w(z);
     if (k != null && k.InitializerComponent || k != null && k.renderSchemaInitializer)
       return k != null && k.InitializerComponent ? /* @__PURE__ */ jsx(k.InitializerComponent, x({}, z)) : (K = k.renderSchemaInitializer) == null ? void 0 : K.call(k, z);
-  }, [k, o, z, M, w]), E = useMemo(() => r !== !1 && B ? N() : null, [B, N, r]), G = useRef(null), U = "hidden";
+  }, [k, o, z, M, w]), E = useMemo(() => r !== !1 && B ? O() : null, [B, O, r]), G = useRef(null), U = "hidden";
   useEffect(() => {
     const K = G.current;
     let W = K == null ? void 0 : K.parentElement;
@@ -18113,7 +18113,7 @@ const useGetAriaLabelOfDesigner = () => {
         ] }) }),
         /* @__PURE__ */ jsx("div", { className: cls("toolbar-icons", a), style: l, children: /* @__PURE__ */ jsxs(Space$1, { size: 3, align: "center", className: d, style: p, children: [
           L,
-          /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: O, children: q }),
+          /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: N, children: q }),
           E
         ] }) })
       ]
@@ -18277,16 +18277,16 @@ const SchemaToolbarErrorFallback = (e) => {
       return (k = ($ = p(M)) == null ? void 0 : $.getCollection(w)) == null ? void 0 : k.getInheritCollectionsChain();
     },
     [t, p]
-  ), O = useCallback(
+  ), N = useCallback(
     (w) => t == null ? void 0 : t.collectionFieldInterfaceManager.getFieldInterface(w),
     [t]
   ), j = useCallback(
     (w) => {
       var M;
-      return (M = O(w.interface)) == null ? void 0 : M.titleUsable;
+      return (M = N(w.interface)) == null ? void 0 : M.titleUsable;
     },
-    [O]
-  ), N = useCallback(
+    [N]
+  ), O = useCallback(
     (w, M, $) => {
       var k, z;
       return (z = (k = p($)) == null ? void 0 : k.getCollection(M)) == null ? void 0 : z.getParentCollectionFields(w);
@@ -18302,9 +18302,9 @@ const SchemaToolbarErrorFallback = (e) => {
     collections: m,
     templates: u,
     getTemplate: B,
-    getInterface: O,
+    getInterface: N,
     getCollections: d,
-    getParentCollectionFields: N,
+    getParentCollectionFields: O,
     getInheritCollections: y,
     getChildrenCollections: v,
     refreshCM: g,
@@ -18627,11 +18627,11 @@ const DatePickerContext = React.createContext({ utc: !0 }), useDatePickerContext
       const v = dayjs(y), F = v.isSame(g, "day"), I = v.isSame(f, "day");
       return {
         disabledHours: () => {
-          const O = [];
-          return F && O.push(...Array.from({ length: g.hour() }, (j, N) => N)), I && O.push(...Array.from({ length: 24 - f.hour() }, (j, N) => N + f.hour() + 1)), O;
+          const N = [];
+          return F && N.push(...Array.from({ length: g.hour() }, (j, O) => O)), I && N.push(...Array.from({ length: 24 - f.hour() }, (j, O) => O + f.hour() + 1)), N;
         },
-        disabledMinutes: (O) => F && O === g.hour() ? C.filter((j) => j < g.minute()) : I && O === f.hour() ? C.filter((j) => j > f.minute()) : [],
-        disabledSeconds: (O, j) => F && O === g.hour() && j === g.minute() ? C.filter((N) => N < g.second()) : I && O === f.hour() && j === f.minute() ? C.filter((N) => N > f.second()) : []
+        disabledMinutes: (N) => F && N === g.hour() ? C.filter((j) => j < g.minute()) : I && N === f.hour() ? C.filter((j) => j > f.minute()) : [],
+        disabledSeconds: (N, j) => F && N === g.hour() && j === g.minute() ? C.filter((O) => O < g.second()) : I && N === f.hour() && j === f.minute() ? C.filter((O) => O > f.second()) : []
       };
     };
     a(() => b), c(() => S);
@@ -19473,13 +19473,13 @@ const ParentCollectionProvider = (e) => {
     collectionField: e,
     noDisabled: r,
     targetFieldSchema: i
-  }), { currentParentRecordSettings: D, shouldDisplayCurrentParentRecord: O } = useCurrentParentRecordVariable({
+  }), { currentParentRecordSettings: D, shouldDisplayCurrentParentRecord: N } = useCurrentParentRecordVariable({
     schema: n,
     collectionName: c,
     collectionField: e,
     noDisabled: r,
     targetFieldSchema: i
-  }), { urlSearchParamsSettings: j, shouldDisplay: N } = useURLSearchParamsVariable();
+  }), { urlSearchParamsSettings: j, shouldDisplay: O } = useURLSearchParamsVariable();
   return useMemo(() => [
     u,
     d,
@@ -19489,10 +19489,10 @@ const ParentCollectionProvider = (e) => {
     C && f,
     S && b,
     v && y,
-    O && D,
+    N && D,
     I && F,
     T && R,
-    N && j
+    O && j
   ].filter(Boolean).filter(l), [
     u,
     d,
@@ -19506,11 +19506,11 @@ const ParentCollectionProvider = (e) => {
     b,
     v,
     y,
-    O,
+    N,
     D,
     I,
     F,
-    N,
+    O,
     j
   ]);
 }, RemoveConditionContext = createContext(null);
@@ -21608,7 +21608,7 @@ const SchemaSettingsSwitchItem = (e) => {
   useEffect(() => {
     D.setInitialValues(cloneDeep$1(r));
   }, [JSON.stringify(r || {})]);
-  const O = useCallback(() => {
+  const N = useCallback(() => {
     h(!1), D.reset();
   }, [D]), j = useCallback(() => V(void 0, null, function* () {
     yield D.submit();
@@ -21618,7 +21618,7 @@ const SchemaSettingsSwitchItem = (e) => {
     } catch (M) {
       console.error(M);
     }
-  }), [D, n]), N = useCallback(() => V(void 0, null, function* () {
+  }), [D, n]), O = 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]), B = useCallback((M) => M.stopPropagation(), []);
   return /* @__PURE__ */ jsxs(zIndexContext.Provider, { value: T, children: [
@@ -21627,7 +21627,7 @@ const SchemaSettingsSwitchItem = (e) => {
       P(x({
         title: v(t)
       }, p), {
-        onClick: N,
+        onClick: O,
         onKeyDown: B,
         children: e.children || e.title
       })
@@ -21641,10 +21641,10 @@ const SchemaSettingsSwitchItem = (e) => {
         }, p), {
           destroyOnClose: !0,
           open: m,
-          onCancel: O,
+          onCancel: N,
           zIndex: T,
           footer: /* @__PURE__ */ jsxs(Space$1, { children: [
-            /* @__PURE__ */ jsx(Button, { onClick: O, children: C("Cancel") }),
+            /* @__PURE__ */ jsx(Button, { onClick: N, children: C("Cancel") }),
             /* @__PURE__ */ jsx(Button, { type: "primary", onClick: j, children: C("Submit") })
           ] }),
           children: /* @__PURE__ */ jsx(FormActiveFieldsProvider, { name: "form", getActiveFieldsName: I == null ? void 0 : I.getActiveFieldsName, children: /* @__PURE__ */ jsx(FormProvider, { form: D, children: /* @__PURE__ */ jsxs(FormLayout, { layout: "vertical", children: [
@@ -21685,7 +21685,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(), I = useDataSourceKey(), R = useCollectionRecord(), { association: T } = useDataBlockProps() || {}, D = useCurrentRecord(), O = useFormBlockContext(), j = useBlockContext(), { getOperators: N } = useOperators(), B = useLocationSearch(), w = useVariables$1(), { formValue: M, collection: $, parent: k } = useSubFormValue(), z = useCurrentPopupRecord(), L = useParentPopupRecord();
+  ]), h = useContext(SchemaOptionsContext), g = useCollection(), f = useAPIClient(), C = useApp(), { theme: b } = useGlobalTheme(), S = useBlockRequestContext(), y = useFormActiveFields(), { locale: v } = useContext(ConfigProvider.ConfigContext), F = useDataSourceManager(), I = useDataSourceKey(), R = useCollectionRecord(), { association: T } = useDataBlockProps() || {}, D = useCurrentRecord(), N = useFormBlockContext(), j = useBlockContext(), { getOperators: O } = useOperators(), B = useLocationSearch(), w = useVariables$1(), { formValue: M, collection: $, parent: k } = useSubFormValue(), z = useCurrentPopupRecord(), L = useParentPopupRecord();
   return t ? null : /* @__PURE__ */ jsx(
     SchemaSettingsItem,
     P(x({
@@ -21695,7 +21695,7 @@ const SchemaSettingsModalItem = (e) => {
         const E = l ? yield l() : c, G = _.isFunction(e.schema) ? e.schema() : e.schema;
         FormDialog(
           { title: G.title || n, width: u },
-          () => /* @__PURE__ */ jsx(p, { children: /* @__PURE__ */ jsx(CollectOperators, { defaultOperators: N(), children: /* @__PURE__ */ jsx(VariablesContext.Provider, { value: w, children: /* @__PURE__ */ jsx(BlockContext.Provider, { value: j, children: /* @__PURE__ */ jsx(
+          () => /* @__PURE__ */ jsx(p, { children: /* @__PURE__ */ jsx(CollectOperators, { defaultOperators: O(), children: /* @__PURE__ */ jsx(VariablesContext.Provider, { value: w, children: /* @__PURE__ */ jsx(BlockContext.Provider, { value: j, children: /* @__PURE__ */ jsx(
             VariablePopupRecordProvider,
             {
               recordData: z == null ? void 0 : z.value,
@@ -21704,7 +21704,7 @@ const SchemaSettingsModalItem = (e) => {
                 recordData: L == null ? void 0 : L.value,
                 collection: L == null ? void 0 : L.collection
               },
-              children: /* @__PURE__ */ jsx(CollectionRecordProvider, { record: d ? null : R, children: /* @__PURE__ */ jsx(CurrentRecordContextProvider, P(x({}, D), { children: /* @__PURE__ */ jsx(FormBlockContext$1.Provider, { value: O, children: /* @__PURE__ */ jsx(SubFormProvider, { value: { value: M, collection: $, parent: k }, children: /* @__PURE__ */ jsx(
+              children: /* @__PURE__ */ jsx(CollectionRecordProvider, { record: d ? null : R, children: /* @__PURE__ */ jsx(CurrentRecordContextProvider, P(x({}, D), { children: /* @__PURE__ */ jsx(FormBlockContext$1.Provider, { value: N, children: /* @__PURE__ */ jsx(SubFormProvider, { value: { value: M, collection: $, parent: k }, children: /* @__PURE__ */ jsx(
                 FormActiveFieldsProvider,
                 {
                   name: "form",
@@ -21884,11 +21884,11 @@ const SchemaSettingsModalItem = (e) => {
       }
     }),
     [n, a, l, b, m, h, u, p, I, r]
-  ), D = useMemo(() => ({ ArrayCollapse: ArrayCollapse$2, FormLayout }), []), O = useCallback(
-    (N) => {
+  ), D = useMemo(() => ({ ArrayCollapse: ArrayCollapse$2, FormLayout }), []), N = useCallback(
+    (O) => {
       var k;
       const B = [];
-      for (const z of N.fieldReaction.rules)
+      for (const z of O.fieldReaction.rules)
         B.push(_.pickBy(z, _.identity));
       const w = b["x-component"] === "BlockTemplate" && ((k = b["x-component-props"]) == null ? void 0 : k.templateId), $ = {
         "x-uid": w && d(w).uid || b["x-uid"]
@@ -21899,7 +21899,7 @@ const SchemaSettingsModalItem = (e) => {
     },
     [c, d, b, F, i]
   );
-  return /* @__PURE__ */ jsx(SchemaSettingsModalItem, { title: R, components: D, width: 770, schema: T, onSubmit: O });
+  return /* @__PURE__ */ jsx(SchemaSettingsModalItem, { title: R, components: D, width: 770, schema: T, onSubmit: N });
 }, useDataTemplates = (e) => {
   const t = useFieldSchema();
   if (e)
@@ -22557,17 +22557,17 @@ const designerCss$4 = ({ margin: e = "-18px -16px", padding: t = "18px 16px" } =
         }
       },
       onSubmit: (D) => {
-        const O = {
+        const N = {
           "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, O.default = void 0), O["x-component-props"] = o.componentProps || {}, n["x-component-props"] = x(x({}, o.componentProps || {}), D), O["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, 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"];
         const j = o.path.entire.split(".");
         j.pop();
-        const N = j.join(".");
-        o.query(`${N}.*[0:].${n.name}`).forEach((B) => {
+        const O = j.join(".");
+        o.query(`${O}.*[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: O
+          schema: N
         }), r.refresh();
       }
     }
@@ -22596,7 +22596,7 @@ const getActionContext = (e) => {
   R != null && R.target && (u = p(
     `${R.target}.${((L = (z = o["x-component-props"]) == null ? void 0 : z.fieldNames) == null ? void 0 : L.label) || "id"}`
   ));
-  const D = (R == null ? void 0 : R.interface) === "m2o" && findParentFieldSchema(o), O = D && p(D == null ? void 0 : D["x-collection-field"]), j = useTableBlockContext(), N = (R == null ? void 0 : R.interface) === "m2m" || (R == null ? void 0 : R.interface) === "mbm" || (O == null ? void 0 : O.type) === "hasMany" && (R == null ? void 0 : R.interface) === "m2o", B = useCallback(
+  const D = (R == null ? void 0 : R.interface) === "m2o" && findParentFieldSchema(o), N = D && p(D == null ? void 0 : D["x-collection-field"]), j = useTableBlockContext(), O = (R == null ? void 0 : R.interface) === "m2m" || (R == null ? void 0 : R.interface) === "mbm" || (N == null ? void 0 : N.type) === "hasMany" && (R == null ? void 0 : R.interface) === "m2o", B = useCallback(
     (q) => {
       const E = q.find((U) => U.value === "$nForm"), G = m(I);
       return !(G != null && G.length) && E && (E.children = formatVariableScop(y())), q;
@@ -22621,7 +22621,7 @@ const getActionContext = (e) => {
         "x-component": "VariableInput",
         "x-component-props": P(x({}, (o == null ? void 0 : o["x-component-props"]) || {}), {
           collectionField: R,
-          contextCollectionName: N ? c : "",
+          contextCollectionName: O ? c : "",
           schema: R == null ? void 0 : R.uiSchema,
           targetFieldSchema: o,
           className: defaultInputStyle,
@@ -22669,7 +22669,7 @@ const getActionContext = (e) => {
     T,
     S,
     h,
-    N,
+    O,
     f,
     b,
     B,
@@ -23102,7 +23102,15 @@ const DynamicComponent = (e) => {
       value: p,
       setValue: m,
       collectionField: h
-    } = useValues$1(), g = sortTree(i, "children", "children", !1), f = useMemo(() => ({ marginBottom: 8 }), []), C = useMemo(
+    } = useValues$1(), g = sortTree(
+      i,
+      (v) => {
+        var F;
+        return (F = v.children) != null && F.length ? 0 : 1;
+      },
+      "children",
+      !1
+    ), f = useMemo(() => ({ marginBottom: 8 }), []), C = useMemo(
       () => ({
         label: "title",
         value: "name",
@@ -23382,7 +23390,7 @@ const useGetFilterOptions = () => {
     if (t > 2)
       return u;
     if (l != null && l.length && (u.children = l), a) {
-      const m = r == null ? void 0 : r.getCollectionFields(e.target), h = getOptions$1(m, t + 1, n, o, r).filter(
+      const m = o.getDataSource(e.dataSourceKey).collectionManager.getCollectionFields(e.target), h = getOptions$1(m, t + 1, n, o).filter(
         Boolean
       );
       u.children = u.children || [], u.children.push(...h);
@@ -23392,13 +23400,15 @@ const useGetFilterOptions = () => {
 }, getOptions$1 = (e, t, n, o, r) => {
   const i = [];
   return e.forEach((a) => {
-    const l = field2option(a, t, n, o, r);
+    const l = field2option(a, t, n, o);
     l && i.push(l);
   }), i;
 }, useFilterFieldOptions = (e) => {
-  var i;
-  const t = useFieldSchema(), n = ((i = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : i.nonfilterable) || [], o = useCollectionManager(), r = useDataSourceManager();
-  return getOptions$1(e, 1, n, r, o);
+  var r;
+  const t = useFieldSchema(), n = ((r = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : r.nonfilterable) || [];
+  useCollectionManager();
+  const o = useDataSourceManager();
+  return getOptions$1(e, 1, n, o);
 }, isEmpty = (e) => Array.isArray(e) && e.length === 0 || e && Object.keys(e).length === 0 && Object.getPrototypeOf(e) === Object.prototype, removeNullCondition = (e, t = flat) => {
   const n = t(e || {}), o = {};
   for (const r in n) {
@@ -23472,13 +23482,13 @@ const useGetFilterOptions = () => {
     };
   });
 }, TableColumnDesigner$1 = (e) => {
-  var j, N, B, w, M, $, k, z, L, q, E, G;
-  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 = ((j = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : j.fieldNames) || ((N = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : N.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(
+  var j, O, B, w, M, $, k, z, L, q, E, G;
+  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 = ((j = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : j.fieldNames) || ((O = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : O.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
   ), I = 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", O = () => {
+  const D = F && R === "Select", N = () => {
     const { name: U } = useCollection(), { linkageRulesProps: H } = useSchemaToolbar();
     return /* @__PURE__ */ jsx(SchemaSettingsLinkageRules, x({ category: "style" }, P(x({}, H), { collectionName: U })));
   };
@@ -23560,7 +23570,7 @@ const useGetFilterOptions = () => {
         }
       }
     ),
-    /* @__PURE__ */ jsx(O, {}),
+    /* @__PURE__ */ jsx(N, {}),
     g && g.sortable === !0 && !S && /* @__PURE__ */ jsx(
       SchemaSettingsSwitchItem,
       {
@@ -24652,10 +24662,7 @@ function HTMLEncode(e) {
 }
 const ReadPretty$c = () => null;
 ReadPretty$c.Input = (e) => {
-  const t = usePrefixCls$1("description-input", e), n = useCompile(), o = useMemo(
-    () => e.value && typeof e.value == "object" ? JSON.stringify(e.value) : n(e.value),
-    [e.value]
-  );
+  const t = usePrefixCls$1("description-input", e), n = useCompile(), o = useMemo(() => Array.isArray(e.value) ? e.value.join(",") : e.value && typeof e.value == "object" ? JSON.stringify(e.value) : n(e.value), [e.value]);
   return /* @__PURE__ */ jsxs(
     "div",
     {
@@ -25541,9 +25548,9 @@ 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$a({ hideVariableButton: m });
   useAntdInputStyle(`${b}-input`);
-  const S = useCompile(), { t: y } = useTranslation(), v = useForm(), [F, I] = React.useState([]), [R, T] = React.useState([]), [D, O] = React.useState(
+  const S = useCompile(), { t: y } = useTranslation(), v = useForm(), [F, I] = React.useState([]), [R, T] = React.useState([]), [D, N] = React.useState(
     m || !!(o && t != null)
-  ), j = useMemo(() => parseValue(t, p), [p, t]), N = typeof j == "string", B = N ? j : "", w = N ? null : j, M = Object.assign(
+  ), j = useMemo(() => parseValue(t, p), [p, t]), O = typeof j == "string", B = O ? j : "", w = O ? null : j, M = Object.assign(
     {
       label: "label",
       value: "value",
@@ -25590,10 +25597,10 @@ function Input$1(e) {
     (W, X) => {
       var ee, Z, ne;
       if (W[0] === "$") {
-        O(!0), w && n(null, X);
+        N(!0), w && n(null, X);
         return;
       } else
-        O(!1);
+        N(!1);
       if (W[0] === "") {
         n(null);
         return;
@@ -25607,7 +25614,7 @@ function Input$1(e) {
     [B, w, n]
   ), G = useCallback(() => {
     var W;
-    if (O(!!o), (W = $ == null ? void 0 : $.children) != null && W.length) {
+    if (N(!!o), (W = $ == null ? void 0 : $.children) != null && W.length) {
       const X = $.children[0].default();
       return n(X);
     }
@@ -25901,7 +25908,7 @@ function TextArea(e) {
     [l, g]
   ), [S, y] = useState(!1), [v, F] = useState(!1), [I, R] = useState(() => renderHTML(p != null ? p : "", b, c)), [T, D] = useState([-1, 0, -1, 0]);
   useAntdInputStyle("ant-input");
-  const { token: O } = theme.useToken(), j = c.join(" "), N = useCallback(
+  const { token: N } = theme.useToken(), j = c.join(" "), O = useCallback(
     (E) => {
       var U;
       const G = getValue(E, c);
@@ -25949,14 +25956,14 @@ function TextArea(e) {
       const H = createVariableTagHTML(G.join("."), b);
       pasteHTML(U, H, {
         range: T
-      }), F(!0), D(getCurrentRange(U)), N(U);
+      }), F(!0), D(getCurrentRange(U)), O(U);
     },
-    [b, N, T]
+    [b, O, T]
   ), w = useCallback(
     function({ currentTarget: E }) {
-      S || (F(!0), D(getCurrentRange(E)), N(E));
+      S || (F(!0), D(getCurrentRange(E)), O(E));
     },
-    [S, N]
+    [S, O]
   ), M = useCallback(function({ currentTarget: E }) {
     D(getCurrentRange(E));
   }, []), $ = useCallback(function(E) {
@@ -25965,9 +25972,9 @@ function TextArea(e) {
     y(!0);
   }, []), z = useCallback(
     ({ currentTarget: E }) => {
-      y(!1), F(!0), D(getCurrentRange(E)), N(E);
+      y(!1), F(!0), D(getCurrentRange(E)), O(E);
     },
-    [N]
+    [O]
   ), L = useCallback(
     function(E) {
       E.preventDefault();
@@ -25988,9 +25995,9 @@ function TextArea(e) {
           }
         }
       }).replace(/\n/g, " ");
-      F(!0), pasteHTML(E.currentTarget, U), D(getCurrentRange(E.currentTarget)), N(E.currentTarget);
+      F(!0), pasteHTML(E.currentTarget, U), D(getCurrentRange(E.currentTarget)), O(E.currentTarget);
     },
-    [N]
+    [O]
   ), q = e.disabled || C.disabled;
   return t(
     /* @__PURE__ */ jsxs(
@@ -26053,7 +26060,7 @@ function TextArea(e) {
                 { "ant-input-disabled": q },
                 // NOTE: `pre-wrap` here for avoid the `&nbsp;` (\x160) issue when paste content, we need normal space (\x32).
                 css`
-            min-height: ${O.controlHeight}px;
+            min-height: ${N.controlHeight}px;
             overflow: auto;
             white-space: pre-wrap;
 
@@ -27502,12 +27509,12 @@ function useCollectValuesToSubmit() {
       resource: o,
       actionFields: (d == null ? void 0 : d("form")) || []
     }), S = {}, y = Object.keys(f).map((D) => V(this, null, function* () {
-      const O = f[D], j = i(D);
-      if (isVariable$1(O)) {
-        const { value: N } = (yield p == null ? void 0 : p.parseVariable(O, m)) || {};
-        N != null && (S[D] = transformVariableValue(N, { targetCollectionField: j }));
+      const N = f[D], j = i(D);
+      if (isVariable$1(N)) {
+        const { value: O } = (yield p == null ? void 0 : p.parseVariable(N, m)) || {};
+        O != null && (S[D] = transformVariableValue(O, { targetCollectionField: j }));
       } else
-        O !== "" && (S[D] = O);
+        N !== "" && (S[D] = N);
     }));
     if (yield Promise.all(y), (I = u == null ? void 0 : u["x-component-props"]) == null ? void 0 : I.addChild) {
       const D = a();
@@ -27538,29 +27545,29 @@ const useCreateActionProps = () => {
     onClick() {
       return V(this, null, function* () {
         var B;
-        const { onSuccess: v, skipValidator: F, triggerWorkflows: I } = (B = u == null ? void 0 : u["x-action-settings"]) != null ? B : {}, { manualClose: R, redirecting: T, redirectTo: D, successMessage: O, actionAfterSuccess: j } = v || {};
+        const { onSuccess: v, skipValidator: F, triggerWorkflows: I } = (B = u == null ? void 0 : u["x-action-settings"]) != null ? B : {}, { manualClose: R, redirecting: T, redirectTo: D, successMessage: N, actionAfterSuccess: j } = v || {};
         F || (yield n.submit());
-        const N = yield f();
+        const O = yield f();
         d.data = o.data || {}, d.data.loading = !0;
         try {
           const w = yield r[C]({
-            values: N,
+            values: O,
             filterKeys: b,
             filterByTk: e,
             // TODO(refactor): should change to inject by plugin
             triggerWorkflows: I != null && I.length ? I.map((M) => [M.workflowKey, M.context].filter(Boolean).join("!")).join(",") : void 0,
             updateAssociationValues: g
           });
-          if ((j === "previous" || !j && T !== !0) && (i == null || i(!1)), a == null || a(!0), l == null || l(!1), d.data.loading = !1, d.data.data = w, !O) {
+          if ((j === "previous" || !j && T !== !0) && (i == null || i(!1)), a == null || a(!0), l == null || l(!1), d.data.loading = !1, d.data.data = w, !N) {
             message.success(h("Saved successfully")), yield resetFormCorrectly(n), (T && !j || j === "redirect") && D && (isURL(D) ? window.location.href = D : c(D));
             return;
           }
           R ? m.success({
-            title: p(O),
+            title: p(N),
             onOk: () => V(this, null, function* () {
               yield resetFormCorrectly(n), (T && !j || j === "redirect") && D && (isURL(D) ? window.location.href = D : c(D));
             })
-          }) : (message.success(p(O)), yield resetFormCorrectly(n), (T && !j || j === "redirect") && D && (isURL(D) ? window.location.href = D : c(D)));
+          }) : (message.success(p(N)), yield resetFormCorrectly(n), (T && !j || j === "redirect") && D && (isURL(D) ? window.location.href = D : c(D)));
         } catch (w) {
           d.data.loading = !1;
         }
@@ -27577,9 +27584,9 @@ const useCreateActionProps = () => {
         const R = u.map((H) => H.name), {
           assignedValues: T = {},
           onSuccess: D,
-          overwriteValues: O,
+          overwriteValues: N,
           skipValidator: j,
-          triggerWorkflows: N
+          triggerWorkflows: O
         } = (z = l == null ? void 0 : l["x-action-settings"]) != null ? z : {}, B = (L = i == null ? void 0 : i["x-component-props"]) == null ? void 0 : L.addChild, { successMessage: w } = D || {}, M = {}, $ = Object.keys(T).map((H) => V(this, null, function* () {
           const J = T[H], K = d(H);
           if (isVariable$1(J)) {
@@ -27605,10 +27612,10 @@ const useCreateActionProps = () => {
         c.data = t.data || {}, c.data.loading = !0;
         try {
           const H = yield n[y]({
-            values: x(x(x({}, k), O), M),
+            values: x(x(x({}, k), N), M),
             filterKeys: v,
             // TODO(refactor): should change to inject by plugin
-            triggerWorkflows: N != null && N.length ? N.map((J) => [J.workflowKey, J.context].filter(Boolean).join("!")).join(",") : void 0
+            triggerWorkflows: O != null && O.length ? O.map((J) => [J.workflowKey, J.context].filter(Boolean).join("!")).join(",") : void 0
           });
           if (c.data.loading = !1, c.data.data = H, (U = (G = o == null ? void 0 : o.service) == null ? void 0 : G.refresh) == null || U.call(G), r == null || r(!1), a == null || a(!0), !w)
             return;
@@ -27671,8 +27678,8 @@ const useCreateActionProps = () => {
   return useEffect(() => {
     setTimeout(() => {
       u({ doNothingWhenFilterIsEmpty: !0 });
-    }, 100);
-  }, [t().length]), {
+    }, 500);
+  }, [u]), {
     /**
      * 用于执行筛选表单的筛选操作
      */
@@ -27719,23 +27726,23 @@ const useCreateActionProps = () => {
   return {
     onClick(f, C) {
       return V(this, null, function* () {
-        var N, B, w;
+        var O, B, w;
         const {
           assignedValues: b = {},
           onSuccess: S,
           skipValidator: y,
           triggerWorkflows: v
-        } = (N = r == null ? void 0 : r["x-action-settings"]) != null ? N : {}, { manualClose: F, redirecting: I, redirectTo: R, successMessage: T, actionAfterSuccess: D } = S || {}, O = {}, j = Object.keys(b).map((M) => V(this, null, function* () {
+        } = (O = r == null ? void 0 : r["x-action-settings"]) != null ? O : {}, { manualClose: F, redirecting: I, redirectTo: R, successMessage: T, actionAfterSuccess: D } = S || {}, N = {}, j = Object.keys(b).map((M) => V(this, null, function* () {
           const $ = b[M], k = m(M);
           if (isVariable$1($)) {
             const { value: z } = (yield u == null ? void 0 : u.parseVariable($, d)) || {};
-            z && (O[M] = transformVariableValue(z, { targetCollectionField: k }));
+            z && (N[M] = transformVariableValue(z, { targetCollectionField: k }));
           } else
-            $ !== "" && (O[M] = $);
+            $ !== "" && (N[M] = $);
         }));
         yield Promise.all(j), y === !1 && (yield l.submit()), yield e.update({
           filterByTk: o,
-          values: x({}, O),
+          values: x({}, N),
           // 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 && I !== !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({
@@ -27759,8 +27766,8 @@ const useCreateActionProps = () => {
         const {
           assignedValues: T = {},
           onSuccess: D,
-          updateMode: O
-        } = (z = i == null ? void 0 : i["x-action-settings"]) != null ? z : {}, { manualClose: j, redirecting: N, redirectTo: B, successMessage: w, actionAfterSuccess: M } = D || {};
+          updateMode: N
+        } = (z = i == null ? void 0 : i["x-action-settings"]) != null ? z : {}, { manualClose: j, redirecting: O, redirectTo: B, successMessage: w, actionAfterSuccess: M } = D || {};
         m.data = e.data || {}, m.data.loading = !0;
         const $ = {}, k = Object.keys(T).map((q) => V(this, null, function* () {
           const E = T[q], G = C(q);
@@ -27770,9 +27777,9 @@ const useCreateActionProps = () => {
           } else
             E !== "" && ($[q] = E);
         }));
-        yield Promise.all(k), (M === "previous" || !M && N !== !0) && (S == null || S(!1)), h.confirm({
+        yield Promise.all(k), (M === "previous" || !M && O !== !0) && (S == null || S(!1)), h.confirm({
           title: p("Bulk update"),
-          content: p(O === "selected" ? "Update selected data?" : "Update all data?"),
+          content: p(N === "selected" ? "Update selected data?" : "Update all data?"),
           onOk() {
             return V(this, null, function* () {
               var G, U, H, J;
@@ -27781,7 +27788,7 @@ const useCreateActionProps = () => {
                 filter: q,
                 forceUpdate: !1
               };
-              if (O === "selected") {
+              if (N === "selected") {
                 if (!(c != null && c.length)) {
                   message.error(p("Please select the records to be updated")), m.data.loading = !1;
                   return;
@@ -27798,9 +27805,9 @@ const useCreateActionProps = () => {
               t instanceof TableFieldResource || (J = (H = n == null ? void 0 : n.service) == null ? void 0 : H.refresh) == null || J.call(H), w && (j ? h.success({
                 title: d(w),
                 onOk: () => V(this, null, function* () {
-                  (N && !M || M === "redirect") && B && (isURL(B) ? window.location.href = B : u(B));
+                  (O && !M || M === "redirect") && B && (isURL(B) ? window.location.href = B : u(B));
                 })
-              }) : (message.success(d(w)), (N && !M || M === "redirect") && B && (isURL(B) ? window.location.href = B : u(B))));
+              }) : (message.success(d(w)), (O && !M || M === "redirect") && B && (isURL(B) ? window.location.href = B : u(B))));
             });
           },
           onCancel() {
@@ -27819,7 +27826,7 @@ const useCreateActionProps = () => {
     onClick() {
       return V(this, null, function* () {
         var q, E, G, U;
-        const { skipValidator: I, onSuccess: R, requestSettings: T } = (q = o == null ? void 0 : o["x-action-settings"]) != null ? q : {}, { manualClose: D, redirecting: O, redirectTo: j, successMessage: N, actionAfterSuccess: B } = R || {}, w = o == null ? void 0 : o["x-action"];
+        const { skipValidator: I, onSuccess: R, requestSettings: T } = (q = o == null ? void 0 : o["x-action-settings"]) != null ? q : {}, { manualClose: D, redirecting: N, redirectTo: j, successMessage: O, actionAfterSuccess: B } = R || {}, w = o == null ? void 0 : o["x-action"];
         if (!T.url)
           return;
         I !== !0 && w === "customize:form:request" && (yield i.submit());
@@ -27845,12 +27852,12 @@ const useCreateActionProps = () => {
         };
         f.data = c.data || {}, f.data.loading = !0;
         try {
-          yield e.request(x({}, L)), f.data.loading = !1, u instanceof TableFieldResource || (G = (E = d == null ? void 0 : d.service) == null ? void 0 : E.refresh) == null || G.call(E), (U = p == null ? void 0 : p.refresh) == null || U.call(p), w === "customize:form:request" && (B === "previous" || !B && O !== !0) && (b == null || b(!1)), N || (message.success(C("Saved successfully")), yield resetFormCorrectly(i), (O && !B || B === "redirect") && j && (isURL(j) ? window.location.href = j : t(j))), D ? S.success({
-            title: r(N),
+          yield e.request(x({}, L)), f.data.loading = !1, u instanceof TableFieldResource || (G = (E = d == null ? void 0 : d.service) == null ? void 0 : E.refresh) == null || G.call(E), (U = p == null ? void 0 : p.refresh) == null || U.call(p), w === "customize:form:request" && (B === "previous" || !B && N !== !0) && (b == null || b(!1)), O || (message.success(C("Saved successfully")), yield resetFormCorrectly(i), (N && !B || B === "redirect") && j && (isURL(j) ? window.location.href = j : t(j))), D ? S.success({
+            title: r(O),
             onOk: () => V(this, null, function* () {
-              (O && !B || B === "redirect") && j && (isURL(j) ? window.location.href = j : t(j));
+              (N && !B || B === "redirect") && j && (isURL(j) ? window.location.href = j : t(j));
             })
-          }) : message.success(r(N));
+          }) : message.success(r(O));
         } finally {
           f.data.loading = !1;
         }
@@ -27867,9 +27874,9 @@ const useCreateActionProps = () => {
           assignedValues: R = {},
           onSuccess: T,
           overwriteValues: D,
-          skipValidator: O,
+          skipValidator: N,
           triggerWorkflows: j
-        } = (E = l == null ? void 0 : l["x-action-settings"]) != null ? E : {}, { manualClose: N, redirecting: B, redirectTo: w, successMessage: M, actionAfterSuccess: $ } = T || {}, k = {}, z = Object.keys(R).map((G) => V(this, null, function* () {
+        } = (E = l == null ? void 0 : l["x-action-settings"]) != null ? E : {}, { manualClose: O, redirecting: B, redirectTo: w, successMessage: M, actionAfterSuccess: $ } = T || {}, k = {}, z = Object.keys(R).map((G) => V(this, null, function* () {
           const U = R[G], H = d(G);
           if (isVariable$1(U)) {
             const { value: J } = (yield b == null ? void 0 : b.parseVariable(U, S)) || {};
@@ -27877,7 +27884,7 @@ const useCreateActionProps = () => {
           } else
             U !== "" && (k[G] = U);
         }));
-        yield Promise.all(z), O || (yield e.submit());
+        yield Promise.all(z), N || (yield e.submit());
         const L = u.map((G) => G.name), q = getFormValues({
           filterByTk: t,
           field: n,
@@ -27898,7 +27905,7 @@ const useCreateActionProps = () => {
             triggerWorkflows: j != null && j.length ? j.map((G) => [G.workflowKey, G.context].filter(Boolean).join("!")).join(",") : void 0
           })), h.data.loading = !1, I && (I == null || I()), ($ === "previous" || !$ && B !== !0) && (i == null || i(!1)), a == null || a(!1), !M)
             return;
-          N ? f.success({
+          O ? f.success({
             title: m(M),
             onOk: () => V(this, null, function* () {
               yield e.reset(), (B && !$ || $ === "redirect") && w && (isURL(w) ? window.location.href = w : c(w));
@@ -28062,7 +28069,7 @@ const useCreateActionProps = () => {
     /** 渲染 Collapse 的列表数据 */
     list: (d == null ? void 0 : d.data) || [],
     onSelected: (F) => {
-      var R, T, D, O;
+      var R, T, D, N;
       const I = ((T = (R = t.params) == null ? void 0 : R[1]) == null ? void 0 : T.filters) || {};
       F.length ? I[`af.${c}`] = {
         [`${c}.${i}.$in`]: F
@@ -28070,7 +28077,7 @@ const useCreateActionProps = () => {
         P(x({}, (D = t.params) == null ? void 0 : D[0]), {
           pageSize: 200,
           page: 1,
-          filter: mergeFilter([...Object.values(I), (O = n == null ? void 0 : n.params) == null ? void 0 : O.filter])
+          filter: mergeFilter([...Object.values(I), (N = n == null ? void 0 : n.params) == null ? void 0 : N.filter])
         }),
         { filters: I }
       );
@@ -28092,7 +28099,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, I, R, T, D, O, j, N, B;
+  var v, F, I, R, T, D, N, j, O, 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 ? (I = c == null ? void 0 : c.getCollection(e.target)) == null ? void 0 : I.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(
@@ -28120,8 +28127,8 @@ const useCreateActionProps = () => {
     b,
     g,
     C,
-    (O = i.componentProps) == null ? void 0 : O.params,
-    (N = (j = i.componentProps) == null ? void 0 : j.params) == null ? void 0 : N.sort,
+    (N = i.componentProps) == null ? void 0 : N.params,
+    (O = (j = i.componentProps) == null ? void 0 : j.params) == null ? void 0 : O.sort,
     d
   ]);
   const y = useCallback(
@@ -28455,42 +28462,42 @@ const useSyncFromForm = (e, t, n) => {
       return T;
     if (S > y)
       return [];
-    const D = r(C).map((O) => {
+    const D = r(C).map((N) => {
       var w;
-      if (b.includes(O.name) || !O.interface || ["sort", "password", "sequence"].includes(O.type))
+      if (b.includes(N.name) || !N.interface || ["sort", "password", "sequence"].includes(N.type))
         return;
       const j = {
         type: "duplicate",
-        tag: c((w = O.uiSchema) == null ? void 0 : w.title) || O.name
-      }, N = P(x({}, j), {
+        tag: c((w = N.uiSchema) == null ? void 0 : w.title) || N.name
+      }, O = P(x({}, j), {
         title: React.createElement(TreeNode, j),
-        key: v ? `${v}.${O.name}` : O.name,
+        key: v ? `${v}.${N.name}` : N.name,
         isLeaf: !0,
-        field: O,
+        field: N,
         disabled: F
-      }), B = I.find((M) => M.name === N.key);
-      if (["belongsTo", "belongsToMany"].includes(O.type) && (!B || ["Select", "Picker"].includes(B == null ? void 0 : B.fieldMode)))
-        j.type = "reference", N.type = "reference", N.title = React.createElement(TreeNode, P(x({}, j), { type: "reference" })), N.isLeaf = !1, N.children = m(O.target, {
+      }), B = I.find((M) => M.name === O.key);
+      if (["belongsTo", "belongsToMany"].includes(N.type) && (!B || ["Select", "Picker"].includes(B == null ? void 0 : B.fieldMode)))
+        j.type = "reference", O.type = "reference", O.title = React.createElement(TreeNode, P(x({}, j), { type: "reference" })), O.isLeaf = !1, O.children = m(N.target, {
           depth: S + 1,
           maxDepth: y,
-          prefix: N.key,
+          prefix: O.key,
           exclude: systemKeys
         });
-      else if (["hasOne", "hasMany"].includes(O.type) || ["Nester", "SubTable"].includes(B == null ? void 0 : B.fieldMode)) {
+      else if (["hasOne", "hasMany"].includes(N.type) || ["Nester", "SubTable"].includes(B == null ? void 0 : B.fieldMode)) {
         let M = !1;
-        ["hasOne", "hasMany"].includes(O.type) && ["Select", "Picker"].includes(B == null ? void 0 : B.fieldMode) && (M = !0), N.disabled = !0, N.isLeaf = !1, N.children = p(
-          O.target,
+        ["hasOne", "hasMany"].includes(N.type) && ["Select", "Picker"].includes(B == null ? void 0 : B.fieldMode) && (M = !0), O.disabled = !0, O.isLeaf = !1, O.children = p(
+          N.target,
           {
             depth: S + 1,
             maxDepth: y,
-            prefix: N.key,
+            prefix: O.key,
             exclude: ["id", ...systemKeys],
             disabled: M
           },
           I
         );
       }
-      return N;
+      return O;
     }).filter(Boolean);
     return f.set(R, D), D;
   })(new LRUCache({ max: 100 })), m = /* @__PURE__ */ ((f) => (C, { prefix: b, maxDepth: S, depth: y = 0, exclude: v = [] }) => {
@@ -28500,22 +28507,22 @@ const useSyncFromForm = (e, t, n) => {
     if (y > S)
       return [];
     const R = r(C).map((T) => {
-      var j, N;
+      var j, O;
       if (!T.target || !T.interface || v.includes(T.name))
         return;
       const D = {
         type: "preloading",
         tag: c((j = T.uiSchema) == null ? void 0 : j.title) || T.name
-      }, O = b ? `${b}.${T.name}` : T.name;
+      }, N = b ? `${b}.${T.name}` : T.name;
       return {
         type: "preloading",
-        tag: c((N = T.uiSchema) == null ? void 0 : N.title) || T.name,
+        tag: c((O = T.uiSchema) == null ? void 0 : O.title) || T.name,
         title: React.createElement(TreeNode, D),
-        key: O,
+        key: N,
         isLeaf: !1,
         field: T,
         children: m(T.target, {
-          prefix: O,
+          prefix: N,
           depth: y + 1,
           maxDepth: S,
           exclude: v
@@ -28540,8 +28547,8 @@ const useSyncFromForm = (e, t, n) => {
           var I;
           (I = v == null ? void 0 : v.reduceProperties) == null || I.call(v, (R, T) => {
             var M, $, k;
-            const D = R || F, O = T["x-collection-field"] && o(T["x-collection-field"]), j = T.name.includes("."), N = O && ["hasOne", "hasMany", "belongsTo", "belongsToMany"].includes(O.type), B = !N && j ? getAssociationPath(T.name) : T.name, w = D === "" || !D ? B : D + "." + B;
-            if (O && !(["hasOne", "hasMany"].includes(O.type) || ["SubForm", "Nester"].includes((M = T["x-component-props"]) == null ? void 0 : M.mode)) && C.add(w), O && (N || j) && T["x-component"] !== "TableField") {
+            const D = R || F, N = T["x-collection-field"] && o(T["x-collection-field"]), j = T.name.includes("."), O = N && ["hasOne", "hasMany", "belongsTo", "belongsToMany"].includes(N.type), B = !O && j ? getAssociationPath(T.name) : T.name, w = D === "" || !D ? B : D + "." + B;
+            if (N && !(["hasOne", "hasMany"].includes(N.type) || ["SubForm", "Nester"].includes((M = T["x-component-props"]) == null ? void 0 : M.mode)) && C.add(w), N && (O || j) && T["x-component"] !== "TableField") {
               if (f.add({ name: w, fieldMode: (($ = T["x-component-props"]) == null ? void 0 : $.mode) || "Select" }), ["Nester", "SubTable"].includes((k = T["x-component-props"]) == null ? void 0 : k.mode)) {
                 const z = D && D !== "" ? D + "." + T.name : T.name;
                 b(T, z);
@@ -29662,9 +29669,9 @@ const useParseDefaultValue = () => {
       if (n && e && (isVariable$1(t.default) && e.value == null || e.value === t.default || R)) {
         e.loading = !0;
         const D = !t.name.toString().includes(".") && (d == null ? void 0 : d.getField(t.name)), {
-          value: O,
+          value: N,
           collectionName: j,
-          dataSource: N = "main"
+          dataSource: O = "main"
         } = yield n.parseVariable(t.default, o, {
           fieldOperator: C(t.name)
         });
@@ -29672,12 +29679,12 @@ const useParseDefaultValue = () => {
           collectionName: D.target,
           targetCollectionName: j,
           dm: b,
-          dataSource: N
+          dataSource: O
         })) {
           e.loading = !1;
           return;
         }
-        const B = transformVariableValue(O, {
+        const B = transformVariableValue(N, {
           targetCollectionField: D
         });
         B == null || B === "" ? e.mounted && (e.setInitialValue(null), yield e.reset({ forceClear: !0 })) : p() ? h === 0 && m(B) : e.setInitialValue(B), e.loading = !1;
@@ -29688,8 +29695,8 @@ const useParseDefaultValue = () => {
       const R = getVariableName(t.default), T = S(R);
       return T ? (y(), reaction(
         () => {
-          const O = { [R]: (T == null ? void 0 : T.ctx) || {} }, j = getPath(t.default), N = getValuesByPath(O, j);
-          return N === void 0 ? Math.random() : N;
+          const N = { [R]: (T == null ? void 0 : T.ctx) || {} }, j = getPath(t.default), O = getValuesByPath(N, j);
+          return O === void 0 ? Math.random() : O;
         },
         () => v({ forceUpdate: !0 }),
         {
@@ -35290,8 +35297,8 @@ const tableBlockSettings = new SchemaSettings({
   name: "fieldSettings:component:CascadeSelect",
   items: [fieldComponent$6, titleField$1, ellipsisSettingsItem, setTheDataScope]
 }), SchemaSettingsDateRange = function e(t) {
-  var R, T, D, O, j, N, B, w, M, $, k, z, L, q, E, G;
-  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 = ((O = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : O.dateFormat) || ((N = (j = u == null ? void 0 : u.uiSchema) == null ? void 0 : j["x-component-props"]) == null ? void 0 : N.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 == null ? void 0 : n["x-component-props"]) == null ? void 0 : $.picker) || ((z = (k = u == null ? void 0 : u.uiSchema) == null ? void 0 : k["x-component-props"]) == null ? void 0 : z.picker) || "date";
+  var R, T, D, N, j, O, B, w, M, $, k, z, L, q, E, G;
+  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 = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : N.dateFormat) || ((O = (j = u == null ? void 0 : u.uiSchema) == null ? void 0 : j["x-component-props"]) == null ? void 0 : O.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 == null ? void 0 : n["x-component-props"]) == null ? void 0 : $.picker) || ((z = (k = u == null ? void 0 : u.uiSchema) == null ? void 0 : k["x-component-props"]) == null ? void 0 : z.picker) || "date";
   n["x-read-pretty"] || o.readOnly || o.readPretty;
   const g = (L = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : L._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 = ((G = u == null ? void 0 : u.uiSchema) == null ? void 0 : G["x-component-props"].utc) || !1, S = useRecord(), { form: y } = useFormBlockContext(), v = useCallback(
     (U) => /* @__PURE__ */ jsx(
@@ -36743,8 +36750,8 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
       const y = C.split("."), v = y[0], F = mergeVariableToCollectionNameWithLocalVariables(variablesStore, b);
       let I = mergeCtxWithLocalVariables(n.current, b);
       const { fieldPath: R, dataSource: T, variableOption: D } = getFieldPath$1(v, F);
-      let O = R;
-      const { fieldPath: j } = getFieldPath$1(C, F), N = y.length === 1 ? D == null ? void 0 : D.collectionName : (w = r(j, T)) == null ? void 0 : w.target;
+      let N = R;
+      const { fieldPath: j } = getFieldPath$1(C, F), O = y.length === 1 ? D == null ? void 0 : D.collectionName : (w = r(j, T)) == null ? void 0 : w.target;
       if (!(v in I))
         throw new Error(`VariablesProvider: ${v} is not found`);
       for (let $ = 0; $ < y.length; $++) {
@@ -36752,13 +36759,13 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
           return {
             value: I === void 0 ? D == null ? void 0 : D.defaultValue : I,
             dataSource: T,
-            collectionName: N
+            collectionName: O
           };
-        const k = y[$], z = y.slice(0, $ + 1).join("."), { fieldPath: L } = getFieldPath$1(z, F), q = r(L, T), E = (M = i(O, T)) == null ? void 0 : M.getPrimaryKey();
+        const k = y[$], z = y.slice(0, $ + 1).join("."), { fieldPath: L } = getFieldPath$1(z, F), q = r(L, T), E = (M = i(N, T)) == null ? void 0 : M.getPrimaryKey();
         if (Array.isArray(I)) {
           const G = I.map((U) => {
             if (!(S != null && S.doNotRequest) && shouldToRequest(U == null ? void 0 : U[k]) && (U == null ? void 0 : U[E]) != null && q != null && q.target) {
-              const H = `/${O}/${U[q.sourceKey || E]}/${k}:${getAction(q.type)}`;
+              const H = `/${N}/${U[q.sourceKey || E]}/${k}:${getAction(q.type)}`;
               if (hasRequested(H))
                 return getRequested(H);
               const J = o.request({
@@ -36774,7 +36781,7 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
           });
           I = removeThroughCollectionFields(_.flatten(yield Promise.all(G)), q);
         } else if (!(S != null && S.doNotRequest) && shouldToRequest(I[k]) && I[E] != null && (q != null && q.target)) {
-          const G = `/${O}/${I[q.sourceKey || E]}/${k}:${getAction(q.type)}`;
+          const G = `/${N}/${I[q.sourceKey || E]}/${k}:${getAction(q.type)}`;
           let U = null;
           if (hasRequested(G))
             U = yield getRequested(G);
@@ -36792,7 +36799,7 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
           I = removeThroughCollectionFields(H, q);
         } else
           I = removeThroughCollectionFields(getValuesByPath(I, k), q);
-        q != null && q.target && (O = q.target);
+        q != null && q.target && (N = q.target);
       }
       const B = a(
         _.isFunction(I) ? I({ fieldOperator: S == null ? void 0 : S.fieldOperator, isParsingVariable: !0 }) : I
@@ -36800,7 +36807,7 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
       return {
         value: B === void 0 ? D.defaultValue : B,
         dataSource: T,
-        collectionName: N
+        collectionName: O
       };
     }),
     [r]
@@ -37080,7 +37087,7 @@ const NocoBaseField = (e) => {
     return h["x-component"] === "CollectionField" ? /* @__PURE__ */ jsx(IsInNocoBaseRecursionFieldContext.Provider, { value: !0, children: /* @__PURE__ */ jsx(CollectionFieldUISchemaProvider, { fieldSchema: h, children: g }) }, `${p}-${d}`) : /* @__PURE__ */ jsx(IsInNocoBaseRecursionFieldContext.Provider, { value: !1, children: /* @__PURE__ */ jsx(CollectionFieldUISchemaContext.Provider, { value: EMPTY_OBJECT, children: g }) }, `${p}-${d}`);
   }) }) : null;
 }, IsInNocoBaseRecursionFieldContext = React.createContext(!1), useIsInNocoBaseRecursionFieldContext = () => React.useContext(IsInNocoBaseRecursionFieldContext), NocoBaseRecursionField = React.memo((e) => {
-  var D, O;
+  var D, N;
   const {
     schema: t,
     name: n,
@@ -37094,11 +37101,11 @@ const NocoBaseField = (e) => {
     uiSchema: d,
     parentSchema: p
   } = e, m = useBasePath(e), h = useRef(null), g = useMemo(() => (h.current = null, new Schema(t)), [t]), { uiSchema: f, defaultValue: C } = useCollectionFieldUISchema(), b = useUpdate(), { onChange: S } = useContext(SchemaComponentOnChangeContext), y = h.current || g;
-  !y.parent && p && (y.parent = p, !((O = (D = y.parent) == null ? void 0 : D.properties) != null && O[y.name]) && y.name && _.set(y.parent, `properties.${y.name}`, y));
+  !y.parent && p && (y.parent = p, !((N = (D = y.parent) == null ? void 0 : D.properties) != null && N[y.name]) && y.name && _.set(y.parent, `properties.${y.name}`, y));
   const v = useCallback(() => {
     const j = y.parent;
-    h.current = new Schema(y.toJSON(), j), j != null && j.properties && Object.keys(j.properties).forEach((N) => {
-      N === y.name && (j.properties[N] = h.current);
+    h.current = new Schema(y.toJSON(), j), j != null && j.properties && Object.keys(j.properties).forEach((O) => {
+      O === y.name && (j.properties[O] = h.current);
     }), b(), S == null || S();
   }, [y, S, b]), F = useMemo(() => d ? createMergedSchemaInstance(y, d, o) : f ? (f.default = C, createMergedSchemaInstance(y, f, o)) : y, [f, C, y, o, d]), I = useFieldProps(F), R = (j) => {
     if (!r)
@@ -37245,9 +37252,9 @@ const ActionLink = withDynamicSchemaProps(
       "onMouseEnter",
       "refreshDataBlockRequest",
       "confirmTitle"
-    ]), v = useDesigner(), F = useField(), I = useFieldSchema(), R = useCompile(), T = useCollectionRecordData(), D = R((U = I["x-component-props"]) == null ? void 0 : U.confirm) || g, O = useMemo(() => (I == null ? void 0 : I["x-linkage-rules"]) || [], [I == null ? void 0 : I["x-linkage-rules"]]), { designable: j } = useDesignable(), N = useComponent(o) || o, B = useVariables$1(), w = useLocalVariables$1({ currentForm: { values: T, readPretty: !1 } }), { visibleWithURL: M, setVisibleWithURL: $ } = usePopupUtils(), { setSubmitted: k } = useActionContext(), { getAriaLabel: z } = useGetAriaLabelOfAction(l), L = useCollectionParentRecordData(), q = useApp();
+    ]), v = useDesigner(), F = useField(), I = useFieldSchema(), R = useCompile(), T = useCollectionRecordData(), D = R((U = I["x-component-props"]) == null ? void 0 : U.confirm) || g, N = useMemo(() => (I == null ? void 0 : I["x-linkage-rules"]) || [], [I == null ? void 0 : I["x-linkage-rules"]]), { designable: j } = useDesignable(), O = useComponent(o) || o, B = useVariables$1(), w = useLocalVariables$1({ currentForm: { values: T, readPretty: !1 } }), { visibleWithURL: M, setVisibleWithURL: $ } = usePopupUtils(), { setSubmitted: k } = useActionContext(), { getAriaLabel: z } = useGetAriaLabelOfAction(l), L = useCollectionParentRecordData(), q = useApp();
     useEffect(() => {
-      F.stateOfLinkageRules && setInitialActionState(F), F.stateOfLinkageRules = {}, O.filter((H) => !H.disabled).forEach((H) => {
+      F.stateOfLinkageRules && setInitialActionState(F), F.stateOfLinkageRules = {}, N.filter((H) => !H.disabled).forEach((H) => {
         var J;
         (J = H.actions) == null || J.forEach((K) => {
           linkageAction(
@@ -37262,7 +37269,7 @@ const ActionLink = withDynamicSchemaProps(
           );
         });
       });
-    }, [F, O, w, B]);
+    }, [F, N, w, B]);
     const E = useCallback(
       (H) => {
         C == null || C(H);
@@ -37279,7 +37286,7 @@ const ActionLink = withDynamicSchemaProps(
         icon: a,
         loading: d,
         handleMouseEnter: E,
-        tarComponent: N,
+        tarComponent: O,
         className: i,
         type: e.type,
         Designer: v,
@@ -37330,9 +37337,9 @@ const ActionLink = withDynamicSchemaProps(
     actionCallback: R,
     visibleWithURL: T,
     setVisibleWithURL: D,
-    setSubmitted: O,
+    setSubmitted: N,
     getAriaLabel: j,
-    parentRecordData: N
+    parentRecordData: O
   } = fe, B = Y(fe, [
     "containerRefKey",
     "fieldSchema",
@@ -37392,7 +37399,7 @@ const ActionLink = withDynamicSchemaProps(
     run: X,
     confirm: g,
     modal: J,
-    setSubmitted: O,
+    setSubmitted: N,
     confirmTitle: f,
     title: y
   }, le = useCallback(
@@ -37413,7 +37420,7 @@ const ActionLink = withDynamicSchemaProps(
       openSize: U,
       containerRefKey: n,
       fieldSchema: o,
-      setSubmitted: O,
+      setSubmitted: N,
       children: [
         C && /* @__PURE__ */ jsx(NocoBaseRecursionField, { basePath: i.address, onlyRenderProperties: !0, schema: o }),
         !C && /* @__PURE__ */ jsx(RenderButton, x({}, se)),
@@ -37490,9 +37497,9 @@ const RenderButton = ({
   modal: R,
   setSubmitted: T,
   confirmTitle: D,
-  title: O
+  title: N
 }) => {
-  const { getDataBlockRequest: j } = useDataBlockRequestGetter(), { t: N } = useTranslation(), { isPopupVisibleControlledByURL: B } = usePopupSettings(), { openPopup: w } = usePopupUtils(), M = useForm(), $ = useRef(null);
+  const { getDataBlockRequest: j } = useDataBlockRequestGetter(), { t: O } = useTranslation(), { isPopupVisibleControlledByURL: B } = usePopupSettings(), { openPopup: w } = usePopupUtils(), M = useForm(), $ = useRef(null);
   $.current = w;
   const k = useCallback(
     (z, L = !0) => V(void 0, null, function* () {
@@ -37505,8 +37512,8 @@ const RenderButton = ({
           }) : isBulkEditAction(y) || !B() ? (v(!0), F == null || F()) : ["view", "update", "create", "customize:popup"].includes(y["x-action"]) && y["x-uid"] ? $.current() : (v(!0), F == null || F());
         };
         (I == null ? void 0 : I.enable) !== !1 && (I != null && I.content) ? (yield (q = M == null ? void 0 : M.submit) == null ? void 0 : q.call(M), R.confirm({
-          title: N(I.title, { title: D || O || (t == null ? void 0 : t.title) }),
-          content: N(I.content, { title: D || O || (t == null ? void 0 : t.title) }),
+          title: O(I.title, { title: D || N || (t == null ? void 0 : t.title) }),
+          content: O(I.content, { title: D || N || (t == null ? void 0 : t.title) }),
           onOk: E
         })) : E();
       }
@@ -37527,8 +37534,8 @@ const RenderButton = ({
       F,
       T,
       v,
-      N,
       O,
+      N,
       j
     ]
   );
@@ -37552,7 +37559,7 @@ const RenderButton = ({
       type: f,
       Designer: C,
       designerProps: u,
-      title: O
+      title: N
     }, h)
   );
 };
@@ -37560,7 +37567,7 @@ RenderButton.displayName = "RenderButton";
 const RenderButtonInner = observer$1(
   (e) => {
     var j, B;
-    const O = e, {
+    const N = e, {
       designable: t,
       field: n,
       aclCtx: o,
@@ -37580,7 +37587,7 @@ const RenderButtonInner = observer$1(
       designerProps: b,
       title: S,
       isLink: y
-    } = O, v = Y(O, [
+    } = N, v = Y(N, [
       "designable",
       "field",
       "aclCtx",
@@ -37614,7 +37621,7 @@ const RenderButtonInner = observer$1(
       F.cancel();
     }, []), !t && ((j = n == null ? void 0 : n.data) != null && j.hidden || !o))
       return null;
-    const I = S || (n == null ? void 0 : n.title), N = l, { opacity: R } = N, T = Y(N, ["opacity"]), D = y && R ? { opacity: R } : void 0;
+    const I = S || (n == null ? void 0 : n.title), O = l, { opacity: R } = O, T = Y(O, ["opacity"]), D = y && R ? { opacity: R } : void 0;
     return /* @__PURE__ */ jsxs(
       SortableItem,
       P(x({
@@ -38080,7 +38087,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
         "dataSource",
         "toOptionsItem",
         "popupMatchSelectWidth"
-      ]), C = useDataSourceKey(), b = useDataSourceHeaders(m || C), S = useRef(!1), y = useFieldSchema(), v = ((H = y["x-component-props"]) == null ? void 0 : H.addMode) === "quickAdd", { getField: F } = useCollection_deprecated(), I = useRef(null), { getCollectionJoinField: R, getInterface: T } = useCollectionManager_deprecated(), D = y["x-collection-field"] || y.name, O = F(D) || R(D), j = u || (O == null ? void 0 : O.target) && (t == null ? void 0 : t.label) && R(`${O.target}.${t.label}`), N = useMemo(() => {
+      ]), C = useDataSourceKey(), b = useDataSourceHeaders(m || C), S = useRef(!1), y = useFieldSchema(), v = ((H = y["x-component-props"]) == null ? void 0 : H.addMode) === "quickAdd", { getField: F } = useCollection_deprecated(), I = useRef(null), { getCollectionJoinField: R, getInterface: T } = useCollectionManager_deprecated(), D = y["x-collection-field"] || y.name, N = F(D) || R(D), j = u || (N == null ? void 0 : N.target) && (t == null ? void 0 : t.label) && R(`${N.target}.${t.label}`), O = useMemo(() => {
         var K;
         if (j != null && j.interface) {
           const W = T(j.interface), X = ((K = W == null ? void 0 : W.filterable) == null ? void 0 : K.operators[0].value) || "$includes";
@@ -38155,7 +38162,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
           filter: mergeFilter([
             K ? {
               [t.label]: {
-                [N]: K
+                [O]: K
               }
             } : {},
             (W = n == null ? void 0 : n.params) == null ? void 0 : W.filter
@@ -38264,11 +38271,11 @@ const useFormDataTemplates = () => {
     d(I), m(null), t == null || t.reset();
   }), []), v = useCallback((I, R, T) => V(void 0, null, function* () {
     const D = P(x({}, R), { dataId: I });
-    m(R), fetchTemplateData(h, D, T).then((O) => (t && O && (t.reset(), t.__template = !0, forEach(O, (j, N) => {
+    m(R), fetchTemplateData(h, D, T).then((N) => (t && N && (t.reset(), t.__template = !0, forEach(N, (j, O) => {
       var B;
-      j && (t.values[N] = j, (B = t == null ? void 0 : t.setInitialValuesIn) == null || B.call(t, N, j));
-    })), O)).catch((O) => {
-      console.error(O);
+      j && (t.values[O] = j, (B = t == null ? void 0 : t.setInitialValuesIn) == null || B.call(t, O, j));
+    })), N)).catch((N) => {
+      console.error(N);
     });
   }), []);
   if (!i || !r)
@@ -39179,7 +39186,7 @@ const insertPositionToMethod = {
     )
   ] });
 }, components$4 = { TreeSelect: TreeSelect$1 }, MenuDesigner = () => {
-  var D, O;
+  var D, N;
   const { updateRoute: e, deleteRoute: t } = useNocoBaseRoutes(), n = useField(), o = useFieldSchema(), r = useAPIClient(), { dn: i, refresh: a } = useDesignable(), { t: l } = useTranslation(), c = findMenuSchema(o), u = useCompile(), { urlSchema: d, paramsSchema: p } = useURLAndHTMLSchema(), m = useMemo(
     () => {
       var j;
@@ -39188,10 +39195,10 @@ const insertPositionToMethod = {
     [(D = c == null ? void 0 : c["x-component-props"]) == null ? void 0 : D.onSelect]
   ), h = useMemo(() => toItems$1(c == null ? void 0 : c.properties, { t: l, compile: u }), [c == null ? void 0 : c.properties, l, u]), g = useCallback(
     (j) => {
-      onFieldChange("target", (N) => {
+      onFieldChange("target", (O) => {
         var w, M;
-        const [, B] = ((M = (w = N == null ? void 0 : N.value) == null ? void 0 : w.split) == null ? void 0 : M.call(w, "||")) || [];
-        N.query("position").take(($) => {
+        const [, B] = ((M = (w = O == null ? void 0 : O.value) == null ? void 0 : w.split) == null ? void 0 : M.call(w, "||")) || [];
+        O.query("position").take(($) => {
           $.dataSource = B === "Menu.SubMenu" ? [
             { label: l("Before"), value: "beforeBegin" },
             { label: l("After"), value: "afterEnd" },
@@ -39239,7 +39246,7 @@ const insertPositionToMethod = {
   }), [n.componentProps.tooltip]);
   o["x-component"] === "Menu.URL" && (f.properties.href = d, f.properties.params = p, C.href = n.componentProps.href, C.params = n.componentProps.params);
   const y = useCallback(
-    ({ title: j, icon: N, href: B, params: w }) => {
+    ({ title: j, icon: O, href: B, params: w }) => {
       var $;
       const M = {
         "x-uid": o["x-uid"],
@@ -39250,11 +39257,11 @@ const insertPositionToMethod = {
           }
         ]
       };
-      j && (o.title = j, n.title = j, M.title = j, a()), n.componentProps.icon = N, n.componentProps.href = B, n.componentProps.params = w, M["x-component-props"] = { icon: N, href: B, params: w }, o["x-component-props"] = o["x-component-props"] || {}, o["x-component-props"].icon = N, o["x-component-props"].href = B, o["x-component-props"].params = w, m == null || m({ item: { props: { schema: o } } }), i.emit("patch", {
+      j && (o.title = j, n.title = j, M.title = j, a()), n.componentProps.icon = O, n.componentProps.href = B, n.componentProps.params = w, M["x-component-props"] = { icon: O, href: B, params: w }, o["x-component-props"] = o["x-component-props"] || {}, o["x-component-props"].icon = O, o["x-component-props"].href = B, o["x-component-props"].params = w, m == null || m({ item: { props: { schema: o } } }), i.emit("patch", {
         schema: M
       }), ($ = o.__route__) != null && $.id && e(o.__route__.id, {
         title: j,
-        icon: N,
+        icon: O,
         options: B || w ? {
           href: B,
           params: w
@@ -39264,8 +39271,8 @@ const insertPositionToMethod = {
     [o, n, i, a, m]
   ), v = useCallback(
     ({ tooltip: j }) => {
-      var N;
-      (N = o.__route__) != null && N.id && e(o.__route__.id, {
+      var O;
+      (O = o.__route__) != null && O.id && e(o.__route__.id, {
         tooltip: j
       });
     },
@@ -39295,7 +39302,7 @@ const insertPositionToMethod = {
       }
     }
   }), [h, l]), { moveRoute: I } = useNocoBaseRoutes(), R = useCallback(
-    (B) => V(void 0, [B], function* ({ target: j, position: N }) {
+    (B) => V(void 0, [B], function* ({ target: j, position: O }) {
       var L;
       const [w] = ((L = j == null ? void 0 : j.split) == null ? void 0 : L.call(j, "||")) || [];
       if (!w)
@@ -39308,7 +39315,7 @@ const insertPositionToMethod = {
       }), k = {
         beforeBegin: "insertBefore",
         afterEnd: "insertAfter"
-      }, z = N === "beforeEnd" ? {
+      }, z = O === "beforeEnd" ? {
         targetScope: {
           parentId: M.__route__.id
         }
@@ -39318,8 +39325,8 @@ const insertPositionToMethod = {
       yield I(x({
         sourceId: o.__route__.id,
         sortField: "sort",
-        method: k[N]
-      }, z)), $.loadAPIClientEvents(), $.insertAdjacent(N, o);
+        method: k[O]
+      }, z)), $.loadAPIClientEvents(), $.insertAdjacent(O, o);
     }),
     [c, l, r, a, I, o]
   ), T = useMemo(() => ({
@@ -39354,7 +39361,7 @@ const insertPositionToMethod = {
       SchemaSettingsSwitchItem,
       {
         title: l("Hidden"),
-        checked: (O = o["x-component-props"]) == null ? void 0 : O.hidden,
+        checked: (N = o["x-component-props"]) == null ? void 0 : N.hidden,
         onChange: (j) => {
           Modal.confirm({
             title: l("Are you sure you want to hide this menu?"),
@@ -39773,14 +39780,14 @@ const useMenuDragEnd = () => {
     theme: m
   } = useProps(e), { t: h } = useTranslation(), g = useDesigner(), f = useFieldSchema(), C = useAPIClient(), { render: b } = useSchemaInitializerRender(f["x-initializer"], f["x-initializer-props"]), S = useSideMenuRef(), [y, v] = useState(), [F, I] = useState(() => i || (r ? findKeysByUid(f, r) : [])), [R, T] = useState(() => ["inline", "mix"].includes(n) ? a || F : a), D = useMemo(() => {
     var B;
-    let N;
+    let O;
     if (o) {
       const w = findKeysByUid(f, o);
-      N = (w == null ? void 0 : w[0]) || null;
+      O = (w == null ? void 0 : w[0]) || null;
     } else
-      N = (F == null ? void 0 : F[0]) || null;
-    if (n === "mix" && N) {
-      const w = (B = f.properties) == null ? void 0 : B[N];
+      O = (F == null ? void 0 : F[0]) || null;
+    if (n === "mix" && O) {
+      const w = (B = f.properties) == null ? void 0 : B[O];
       if ((w == null ? void 0 : w["x-component"]) === "Menu.SubMenu")
         return w;
     }
@@ -39791,12 +39798,12 @@ const useMenuDragEnd = () => {
       v(void 0);
       return;
     }
-    const N = findKeysByUid(f, o);
-    v(N), ["inline", "mix"].includes(n) && T(a || N);
+    const O = findKeysByUid(f, o);
+    v(O), ["inline", "mix"].includes(n) && T(a || O);
   }, [o]), useEffect(() => {
     ["inline", "mix"].includes(n) && T(F);
   }, [F]);
-  const O = useContext(SchemaComponentContext), { onDragEnd: j } = useMenuDragEnd();
+  const N = useContext(SchemaComponentContext), { onDragEnd: j } = useMenuDragEnd();
   return /* @__PURE__ */ jsx(DndContext, { onDragEnd: j, children: /* @__PURE__ */ jsx(MenuItemDesignerContext.Provider, { value: g, children: /* @__PURE__ */ jsxs(MenuModeContext.Provider, { value: n, children: [
     /* @__PURE__ */ jsx(
       HeaderMenu,
@@ -39813,7 +39820,7 @@ const useMenuDragEnd = () => {
         defaultSelectedKeys: F,
         defaultOpenKeys: R,
         selectedKeys: y,
-        designable: O.designable,
+        designable: N.designable,
         render: b,
         children: l
       }
@@ -39831,7 +39838,7 @@ const useMenuDragEnd = () => {
         render: b,
         t: h,
         api: C,
-        designable: O.designable
+        designable: N.designable
       }
     ) })
   ] }) }) });
@@ -40620,35 +40627,35 @@ 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 = (N, B) => {
-    const w = S.getCollection(N);
+  ]), 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 = (O, B) => {
+    const w = S.getCollection(O);
     return w ? w.getAllFields(B) : [];
-  }, v = Object.values(m), F = useMemo(() => e.multiple ? (n || []).map((N) => m[N]).filter(Boolean) : n, [n, e.multiple, m]), I = useCallback(
-    (N) => V(void 0, null, function* () {
+  }, v = Object.values(m), F = useMemo(() => e.multiple ? (n || []).map((O) => m[O]).filter(Boolean) : n, [n, e.multiple, m]), I = useCallback(
+    (O) => V(void 0, null, function* () {
       if (c != null)
-        return c(N);
-      if (!N.isLeaf && N.loadChildren) {
-        const B = N.loadChildren(N);
+        return c(O);
+      if (!O.isLeaf && O.loadChildren) {
+        const B = O.loadChildren(O);
         h((w) => B.reduce((M, $) => Object.assign(M, { [$.value]: $ }), x({}, w)));
       }
     }),
     [c]
   );
   useEffect(() => {
-    const N = l ? P(x({}, l), {
+    const O = l ? P(x({}, l), {
       id: l.value,
       key: l.value,
       title: l.label,
       fullTitle: l.label,
       isLeaf: !1
-    }) : null, w = (c === null ? [] : getCollectionFieldOptions.call({ compile: d, getCollectionFields: y, filter: a }, C, N)).reduce((M, $) => Object.assign(M, { [$.value]: $ }), {});
-    N && (w[N.value] = N), h(w);
+    }) : null, w = (c === null ? [] : getCollectionFieldOptions.call({ compile: d, getCollectionFields: y, filter: a }, C, O)).reduce((M, $) => Object.assign(M, { [$.value]: $ }), {});
+    O && (w[O.value] = O), h(w);
   }, [g, l, a, c]), useEffect(() => {
-    const N = e.multiple ? n : n ? [n] : [];
-    if (!(N != null && N.length) || N.every((w) => !!m[w]))
+    const O = e.multiple ? n : n ? [n] : [];
+    if (!(O != null && O.length) || O.every((w) => !!m[w]))
       return;
     const B = [];
-    N.forEach((w) => {
+    O.forEach((w) => {
       const M = w.split(".");
       let $ = m[M[0]];
       for (let k = 1; k < M.length && $; k++) {
@@ -40665,12 +40672,12 @@ const AppendsTreeSelect = (e) => {
     }), h((w) => B.reduce((M, $) => Object.assign(M, { [$.value]: $ }), x({}, w)));
   }, [n, v.length, e.multiple]);
   const R = useCallback(
-    (N) => {
+    (O) => {
       if (!e.multiple) {
-        o(N);
+        o(O);
         return;
       }
-      const B = N.map(($) => $.value).filter(Boolean), w = new Set(B), M = F.find(($) => !w.has($.value));
+      const B = O.map(($) => $.value).filter(Boolean), w = new Set(B), M = F.find(($) => !w.has($.value));
       if (M) {
         const $ = `${M.value}.`;
         Object.keys(m).forEach((k) => {
@@ -40687,16 +40694,16 @@ const AppendsTreeSelect = (e) => {
     },
     [e.multiple, F, o, m]
   ), T = useCallback(
-    (N) => {
+    (O) => {
       var z;
-      const { value: B, onClose: w, disabled: M, closable: $ } = N;
+      const { value: B, onClose: w, disabled: M, closable: $ } = O;
       if (!B)
         return null;
       const { fullTitle: k } = (z = m[B]) != null ? z : {};
       return /* @__PURE__ */ jsx(Tag, { closable: $ && !M, onClose: w, children: k == null ? void 0 : k.join(" / ") });
     },
     [m]
-  ), D = Array.isArray(F) ? F.filter((N) => N.value in m) : F, O = e.multiple ? n : n != null ? [n] : [];
+  ), D = Array.isArray(F) ? F.filter((O) => O.value in m) : F, N = e.multiple ? n : n != null ? [n] : [];
   return /* @__PURE__ */ jsx(
     TreeSelect$2,
     x({
@@ -40705,7 +40712,7 @@ const AppendsTreeSelect = (e) => {
       value: D,
       placeholder: p("Select field"),
       showCheckedStrategy: TreeSelect$2.SHOW_ALL,
-      treeDefaultExpandedKeys: O,
+      treeDefaultExpandedKeys: N,
       allowClear: {
         clearIcon: /* @__PURE__ */ jsx(CloseCircleFilled, { role: "button", "aria-label": "icon-close" })
       },
@@ -40740,18 +40747,18 @@ function getFieldPath(e) {
 }
 const InternalAssociationSelect$1 = observer$1(
   (e) => {
-    var O;
-    const D = e, { objectValue: t = !0, addMode: n } = D, o = Y(D, ["objectValue", "addMode"]), r = useField(), i = useFieldSchema(), a = useServiceOptions$1((i == null ? void 0 : i["x-component-props"]) || e), { options: l } = useAssociationFieldContext(), c = isVariable$1(e.value) ? void 0 : e.value, u = Array.isArray(c) ? c.filter(Boolean) : c, [d, p] = useState(u), m = (O = i["x-component-props"]) == null ? void 0 : O.addMode, { t: h } = useTranslation(), { multiple: g } = e, f = useForm(), b = useAPIClient().resource(l.target), S = useCollectionRecordData(), y = useContext(SchemaComponentContext), { getCollection: v } = useCollectionManager_deprecated(), F = v(l.target), { filterTargetKey: I } = F;
+    var N;
+    const D = e, { objectValue: t = !0, addMode: n } = D, o = Y(D, ["objectValue", "addMode"]), r = useField(), i = useFieldSchema(), a = useServiceOptions$1((i == null ? void 0 : i["x-component-props"]) || e), { options: l } = useAssociationFieldContext(), c = isVariable$1(e.value) ? void 0 : e.value, u = Array.isArray(c) ? c.filter(Boolean) : c, [d, p] = useState(u), m = (N = i["x-component-props"]) == null ? void 0 : N.addMode, { t: h } = useTranslation(), { multiple: g } = e, f = useForm(), b = useAPIClient().resource(l.target), S = useCollectionRecordData(), y = useContext(SchemaComponentContext), { getCollection: v } = useCollectionManager_deprecated(), F = v(l.target), { filterTargetKey: I } = F;
     useEffect(() => {
-      const j = isVariable$1(r.value) ? void 0 : r.value, N = Array.isArray(j) ? j.filter(Boolean) : j, B = removeIfKeyEmpty(N, I);
+      const j = isVariable$1(r.value) ? void 0 : r.value, O = Array.isArray(j) ? j.filter(Boolean) : j, B = removeIfKeyEmpty(O, I);
       p(B), isEqual(r.value, B) || (r.value = B);
     }, [r.value, I]), useEffect(() => {
       const j = uid();
       return f.addEffects(j, () => {
-        onFieldInputValueChange("*", (N) => {
+        onFieldInputValueChange("*", (O) => {
           var $, k, z, L, q, E;
-          const B = filterAnalyses((z = (k = ($ = r.componentProps) == null ? void 0 : $.service) == null ? void 0 : k.params) == null ? void 0 : z.filter) || [], w = getFieldPath(N.address.entire), M = getFieldPath(r.address.entire);
-          B.includes((L = N == null ? void 0 : N.props) == null ? void 0 : L.name) && r.value && isEqual(N == null ? void 0 : N.indexes, r == null ? void 0 : r.indexes) && ((q = N == null ? void 0 : N.props) == null ? void 0 : q.name) !== r.props.name && (!((E = r == null ? void 0 : r.indexes) != null && E.length) || isEqual(w, M)) && (r.setValue(null), p(null));
+          const B = filterAnalyses((z = (k = ($ = r.componentProps) == null ? void 0 : $.service) == null ? void 0 : k.params) == null ? void 0 : z.filter) || [], w = getFieldPath(O.address.entire), M = getFieldPath(r.address.entire);
+          B.includes((L = O == null ? void 0 : O.props) == null ? void 0 : L.name) && r.value && isEqual(O == null ? void 0 : O.indexes, r == null ? void 0 : r.indexes) && ((q = O == null ? void 0 : O.props) == null ? void 0 : q.name) !== r.props.name && (!((E = r == null ? void 0 : r.indexes) != null && E.length) || isEqual(w, M)) && (r.setValue(null), p(null));
         });
       }), () => {
         f.removeEffects(j);
@@ -40759,11 +40766,11 @@ const InternalAssociationSelect$1 = observer$1(
     }, []);
     const R = (j) => V(void 0, null, function* () {
       var M, $;
-      const { search: N, callBack: B } = j, {
+      const { search: O, callBack: B } = j, {
         data: { data: w }
       } = yield b.create({
         values: {
-          [(($ = (M = r == null ? void 0 : r.componentProps) == null ? void 0 : M.fieldNames) == null ? void 0 : $.label) || "id"]: N
+          [(($ = (M = r == null ? void 0 : r.componentProps) == null ? void 0 : M.fieldNames) == null ? void 0 : $.label) || "id"]: O
         }
       });
       if (w) {
@@ -40797,8 +40804,8 @@ const InternalAssociationSelect$1 = observer$1(
           service: a,
           onChange: (j) => {
             var B;
-            const N = Array.isArray(j) && j.length === 0 ? null : j;
-            (B = e.onChange) == null || B.call(e, N);
+            const O = Array.isArray(j) && j.length === 0 ? null : j;
+            (B = e.onChange) == null || B.call(e, O);
           },
           CustomDropdownRender: m === "quickAdd" && T
         })
@@ -41384,21 +41391,21 @@ function Uploader(n) {
   const { disabled: r, multiple: i, value: a, onChange: l, toValueItem: c = toValueItem } = t, [u, d] = useState([]), [p, m] = useState([]), { t: h } = useTranslation(), { componentCls: g } = useStyles$6(), f = useField(), C = useUploadProps(t), b = useBeforeUpload(e);
   useEffect(() => {
     if (p.length) {
-      const O = p.filter((j) => j.status === "error");
+      const N = p.filter((j) => j.status === "error");
       f.setFeedback({
         type: "error",
         code: "ValidateError",
-        messages: [O.length ? h("Some files are not uploaded correctly, please check.") : " "]
+        messages: [N.length ? h("Some files are not uploaded correctly, please check.") : " "]
       });
     } else
       f.setFeedback({});
   }, [f, p, h]);
   const S = useCallback(
-    (O) => {
-      var N;
-      const j = O.fileList.filter((B) => B.status !== "done").map(normalizeFile);
+    (N) => {
+      var O;
+      const j = N.fileList.filter((B) => B.status !== "done").map(normalizeFile);
       if (m(j), i) {
-        const B = O.fileList.filter((w) => w.status === "done");
+        const B = N.fileList.filter((w) => w.status === "done");
         if (B.length) {
           const w = [...u, ...B.map((M) => {
             var $;
@@ -41407,25 +41414,25 @@ function Uploader(n) {
           j.length ? d(w) : (l == null || l([...a || [], ...w]), d([]));
         }
       } else {
-        const B = O.fileList.find((w) => w.uid === O.file.uid);
-        B.status === "done" && (l == null || l(c((N = B.response) == null ? void 0 : N.data)), m([]));
+        const B = N.fileList.find((w) => w.uid === N.file.uid);
+        B.status === "done" && (l == null || l(c((O = B.response) == null ? void 0 : O.data)), m([]));
       }
     },
     [i, a, u, c, l]
-  ), y = useCallback((O) => {
+  ), y = useCallback((N) => {
     m((j) => {
-      const N = j.indexOf(O);
-      return j.splice(N, 1), [...j];
+      const O = j.indexOf(N);
+      return j.splice(O, 1), [...j];
     });
-  }, []), v = useCallback((O) => {
+  }, []), v = useCallback((N) => {
     d((j) => {
-      const N = j.indexOf(O);
-      return j.splice(N, 1), [...j];
+      const O = j.indexOf(N);
+      return j.splice(O, 1), [...j];
     });
   }, []), F = useComponent("QRCodeUploader"), { mimetype: I, size: R } = e != null ? e : {}, T = useSizeHint(R), D = !r && (i || (!a || Array.isArray(a) && !a.length) && !p.length);
   return /* @__PURE__ */ jsxs(Fragment$1, { children: [
-    u.map((O, j) => /* @__PURE__ */ jsx(AttachmentListItem, { file: O, index: j, disabled: r, onDelete: v }, O.id)),
-    p.map((O, j) => /* @__PURE__ */ jsx(AttachmentListItem, { file: O, index: j, disabled: r, onDelete: y }, O.uid)),
+    u.map((N, j) => /* @__PURE__ */ jsx(AttachmentListItem, { file: N, index: j, disabled: r, onDelete: v }, N.id)),
+    p.map((N, j) => /* @__PURE__ */ jsx(AttachmentListItem, { file: N, index: j, disabled: r, onDelete: y }, N.uid)),
     /* @__PURE__ */ jsx(
       "div",
       {
@@ -41735,15 +41742,15 @@ function FileSelector(e) {
   );
 }
 const InternalFileManager = (e) => {
-  var D, O;
+  var D, N;
   const T = e, { value: t, multiple: n, onChange: o } = T, r = Y(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 = (j) => {
     j.stopPropagation(), j.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 j = (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((N) => {
-        const B = N[p.label];
-        return P(x({}, N), {
+      const j = (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((O) => {
+        const B = O[p.label];
+        return P(x({}, O), {
           [p.label]: getLabelFormatValue$1(y(S), y(B))
         });
       });
@@ -41764,10 +41771,10 @@ const InternalFileManager = (e) => {
     setSelectedRows: u,
     collectionField: b
   }, R = () => {
-    const { setVisible: j } = useActionContext(), { multiple: N, selectedRows: B, onChange: w, options: M, collectionField: $ } = useContext(RecordPickerContext);
+    const { setVisible: j } = useActionContext(), { multiple: O, selectedRows: B, onChange: w, options: M, collectionField: $ } = useContext(RecordPickerContext);
     return {
       onClick() {
-        w(N ? unionBy(B, M, ($ == null ? void 0 : $.targetKey) || "id") : (B == null ? void 0 : B[0]) || null), j(!1);
+        w(O ? unionBy(B, M, ($ == null ? void 0 : $.targetKey) || "id") : (B == null ? void 0 : B[0]) || null), j(!1);
       }
     };
   };
@@ -41778,7 +41785,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: ((O = i["x-component-props"]) == null ? void 0 : O.selectFile) !== !1,
+        selectFile: ((N = i["x-component-props"]) == null ? void 0 : N.selectFile) !== !1,
         action: `${b == null ? void 0 : b.target}:create`,
         onSelect: F,
         onChange: o
@@ -41819,10 +41826,10 @@ const InternalFileManager = (e) => {
     FormItem: FormItem$1
   }
 }), CascadeSelect = connect((e) => {
-  var N;
+  var O;
   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 = (N = f == null ? void 0 : f.componentProps) == null ? void 0 : N.fieldNames, v = (g == null ? void 0 : g.target) && (y == null ? void 0 : y.label) && b(`${g.target}.${y.label}`), F = useMemo(() => {
+  ]), [l, c] = useState(t), [u, d] = useState(!1), p = useCompile(), m = useAPIClient(), h = useServiceOptions$1(e), { options: g, field: f } = useAssociationFieldContext(), C = m.resource(g.target), { getCollectionJoinField: b, getInterface: S } = useCollectionManager_deprecated(), y = (O = f == null ? void 0 : f.componentProps) == null ? void 0 : O.fieldNames, v = (g == null ? void 0 : g.target) && (y == null ? void 0 : y.label) && b(`${g.target}.${y.label}`), F = useMemo(() => {
     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]), I = useField();
@@ -41884,7 +41891,7 @@ const InternalFileManager = (e) => {
     } else
       f.value = w;
     k.length === 1 && !k[0].value ? o == null || o(null) : o == null || o(k);
-  }), O = (B, w, M) => V(void 0, null, function* () {
+  }), N = (B, w, M) => V(void 0, null, function* () {
     var $, k, z;
     if (B) {
       d(!0);
@@ -41927,7 +41934,7 @@ const InternalFileManager = (e) => {
         style: { minWidth: 150 },
         onChange: (z, L) => D(z, L, w),
         options: u ? [] : R(l),
-        onDropdownVisibleChange: (z) => O(z, B, w),
+        onDropdownVisibleChange: (z) => N(z, B, w),
         notFoundContent: u ? /* @__PURE__ */ jsx(Spin, { size: "small" }) : null
       },
       `${(k = B.value) == null ? void 0 : k.id}+ ${B.key} + ${y.label}`
@@ -42168,7 +42175,7 @@ const InternalNesterCardCss = css`
 }, InternalPicker = observer$1(
   (e) => {
     var B;
-    const N = e, { value: t, multiple: n, openSize: o, onChange: r, quickUpload: i, selectFile: a, shouldMountElement: l } = N, c = Y(N, ["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([]), I = useCollectionRecordData(), R = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((M) => {
+    const O = e, { value: t, multiple: n, openSize: o, onChange: r, quickUpload: i, selectFile: a, shouldMountElement: l } = O, c = Y(O, ["value", "multiple", "openSize", "onChange", "quickUpload", "selectFile", "shouldMountElement"]), u = useField(), d = useFieldNames$1(e), [p, m] = useState(!1), h = useFieldSchema(), g = useInsertSchema$1("Selector"), { options: f } = useAssociationFieldContext(), { collectionName: C } = useFormBlockContext(), b = useCompile(), S = useLabelUiSchema$1(f, (d == null ? void 0 : d.label) || "label"), y = h["x-add-new"], [v, F] = useState([]), I = useCollectionRecordData(), R = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((M) => {
       const $ = M == null ? void 0 : M[d.label];
       return P(x({}, M), {
         [d.label]: getLabelFormatValue$1(b(S), b($))
@@ -42189,7 +42196,7 @@ const InternalNesterCardCss = 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];
-    }, O = () => {
+    }, 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 }] } : {};
     }, j = () => {
@@ -42258,7 +42265,7 @@ const InternalNesterCardCss = css`
             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: O() }, 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: N() }, children: /* @__PURE__ */ jsx(
             SchemaComponentOptions,
             {
               scope: {
@@ -42302,44 +42309,45 @@ const RenderRecord = React.memo(
     ellipsisWithTooltipRef: m,
     value: h,
     setBtnHover: g,
-    onClick: f
+    onClick: f,
+    ellipsis: C
   }) => {
-    const [C, b] = useState(!0), [S, y] = useState([]), v = useRef(!1), F = useRef(u);
-    F.current = u;
-    const I = useCallback(() => F.current, []);
+    const [b, S] = useState(!0), [y, v] = useState([]), F = useRef(!1), I = useRef(u);
+    I.current = u;
+    const R = useCallback(() => I.current, []);
     return useEffect(() => {
-      const R = toArr$3(h).map((T, D, O) => {
-        const j = T == null ? void 0 : T[(e == null ? void 0 : e.label) || "label"], N = t ? transformNestedData(T).map(($) => $ == null ? void 0 : $[(e == null ? void 0 : e.label) || "label"]).join(" / ") : isObject(j) ? JSON.stringify(j) : j, B = toValue$4(n(N), "N/A"), w = o(
-          (T == null ? void 0 : T.__collection) || (r == null ? void 0 : r.target),
+      const T = toArr$3(h).map((D, N, j) => {
+        const O = D == null ? void 0 : D[(e == null ? void 0 : e.label) || "label"], B = t ? transformNestedData(D).map((k) => k == null ? void 0 : k[(e == null ? void 0 : e.label) || "label"]).join(" / ") : isObject(O) ? JSON.stringify(O) : O, w = toValue$4(n(B), "N/A"), M = o(
+          (D == null ? void 0 : D.__collection) || (r == null ? void 0 : r.target),
           (e == null ? void 0 : e.label) || "label"
-        ), M = getLabelFormatValue$1(n(w), B, !0);
+        ), $ = getLabelFormatValue$1(n(M), w, !0);
         return /* @__PURE__ */ jsxs(Fragment, { children: [
-          /* @__PURE__ */ jsx("span", { children: i ? M : a !== !1 ? /* @__PURE__ */ jsx(
+          /* @__PURE__ */ jsx("span", { children: i ? $ : a !== !1 ? /* @__PURE__ */ jsx(
             "a",
             {
               onMouseEnter: () => {
                 g(!0);
               },
-              onClick: ($) => {
-                var k;
-                g(!0), $.stopPropagation(), $.preventDefault(), l && !u.properties && (c(schema$1.Viewer), v.current = !0), v.current ? (setTimeout(() => {
-                  f == null || f({ recordData: T }), d({
-                    recordData: T,
+              onClick: (k) => {
+                var z;
+                g(!0), k.stopPropagation(), k.preventDefault(), l && !u.properties && (c(schema$1.Viewer), F.current = !0), F.current ? (setTimeout(() => {
+                  f == null || f({ recordData: D }), d({
+                    recordData: D,
                     parentRecordData: p,
-                    customActionSchema: I()
+                    customActionSchema: R()
                   });
-                }), v.current = !1) : u.properties && (f == null || f({ recordData: T }), d({
-                  recordData: T,
+                }), F.current = !1) : u.properties && (f == null || f({ recordData: D }), d({
+                  recordData: D,
                   parentRecordData: p
-                })), (k = m == null ? void 0 : m.current) == null || k.setPopoverVisible(!1);
+                })), (z = m == null ? void 0 : m.current) == null || z.setPopoverVisible(!1);
               },
-              children: M
+              children: $
             }
-          ) : M }),
-          D < O.length - 1 ? /* @__PURE__ */ jsx("span", { style: { marginRight: 4, color: "#aaa" }, children: "," }) : null
-        ] }, `${T == null ? void 0 : T.id}_${D}`);
+          ) : $ }),
+          N < j.length - 1 ? /* @__PURE__ */ jsx("span", { style: { marginRight: 4, color: "#aaa" }, children: "," }) : null
+        ] }, `${D == null ? void 0 : D.id}_${N}`);
       });
-      y(R), b(!1);
+      v(T), S(!1);
     }, [
       r == null ? void 0 : r.target,
       n,
@@ -42356,12 +42364,13 @@ const RenderRecord = React.memo(
       g,
       i,
       h,
-      I
-    ]), C ? null : /* @__PURE__ */ jsx(Fragment$1, { children: S });
+      R
+    ]), b ? null : /* @__PURE__ */ jsx("span", { style: C ? null : { whiteSpace: "normal" }, children: y });
   }
 );
 RenderRecord.displayName = "RenderRecord";
 const ButtonLinkList = observer$1((e) => {
+  var C;
   const t = useFieldSchema(), n = useCollectionManager(), { enableLink: o } = t["x-component-props"] || {}, r = useFieldNames$1({ fieldNames: e.fieldNames }), i = useInsertSchema$1("Viewer"), { options: a } = useAssociationFieldContext(), l = useCompile(), { designable: c } = useDesignable(), { snapshot: u } = useActionContext(), d = n.getCollection(a == null ? void 0 : a.target), p = (d == null ? void 0 : d.template) === "tree", m = useRef(), h = useLabelUiSchemaV2(), { openPopup: g } = usePopupUtils(), f = useCollectionRecordData();
   return /* @__PURE__ */ jsx(
     RenderRecord,
@@ -42381,7 +42390,8 @@ const ButtonLinkList = observer$1((e) => {
       ellipsisWithTooltipRef: m,
       value: e.value,
       setBtnHover: e.setBtnHover,
-      onClick: e.onClick
+      onClick: e.onClick,
+      ellipsis: (C = e.ellipsis) != null ? C : !0
     }
   );
 });
@@ -42390,13 +42400,23 @@ const getSourceData = (e, t) => {
   const n = t.name.split(".").filter((o, r, i) => r < i.length - 1).join(".");
   return n ? _.get(e, n) : e;
 }, ReadPrettyInternalViewer = (e) => {
-  const { value: t, ButtonList: n = ButtonLinkList } = e, o = useFieldSchema(), { enableLink: r, openMode: i, openSize: a } = o["x-component-props"] || {}, l = useField(), [c, u] = useState(!1), { options: d } = useAssociationFieldContext(), { visibleWithURL: p, setVisibleWithURL: m } = usePopupUtils(), [h, g] = useState(!!p), { defaultOpenMode: f } = useOpenModeContext(), C = useCollectionRecordData(), [b, S] = useState(null), { isPopupVisibleControlledByURL: y } = usePopupSettings(), v = useCallback((T) => {
-    S(T.recordData);
-  }, []), F = /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: /* @__PURE__ */ jsx(CollectionRecordProvider, { isNew: !1, record: getSourceData(C, o), children: /* @__PURE__ */ jsx(n, { setBtnHover: g, value: t, fieldNames: e.fieldNames, onClick: v }) }) }), I = useMemo(
+  var T, D;
+  const { value: t, ButtonList: n = ButtonLinkList } = e, o = useFieldSchema(), { enableLink: r, openMode: i, openSize: a } = o["x-component-props"] || {}, l = useField(), [c, u] = useState(!1), { options: d } = useAssociationFieldContext(), { visibleWithURL: p, setVisibleWithURL: m } = usePopupUtils(), [h, g] = useState(!!p), { defaultOpenMode: f } = useOpenModeContext(), C = useCollectionRecordData(), [b, S] = useState(null), { isPopupVisibleControlledByURL: y } = usePopupSettings(), v = useCallback((N) => {
+    S(N.recordData);
+  }, []), F = /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: (T = e.ellipsis) != null ? T : !0, children: /* @__PURE__ */ jsx(CollectionRecordProvider, { isNew: !1, record: getSourceData(C, o), children: /* @__PURE__ */ jsx(
+    n,
+    {
+      setBtnHover: g,
+      value: t,
+      fieldNames: e.fieldNames,
+      onClick: v,
+      ellipsis: (D = e.ellipsis) != null ? D : !0
+    }
+  ) }) }), I = useMemo(
     () => ({
       visible: c || p,
-      setVisible: (T) => {
-        u == null || u(T), m == null || m(T);
+      setVisible: (N) => {
+        u == null || u(N), m == null || m(N);
       },
       openMode: i || f,
       snapshot: (d == null ? void 0 : d.interface) === "snapshot",
@@ -42415,7 +42435,7 @@ const getSourceData = (e, t) => {
           schema: o,
           onlyRenderProperties: !0,
           basePath: l.address,
-          filterProperties: (T) => T["x-component"] !== "Action"
+          filterProperties: (N) => N["x-component"] !== "Action"
         }
       ) }) })
     ) : /* @__PURE__ */ jsx(CollectionRecordProvider, { isNew: !1, record: b, parentRecord: C, children: /* @__PURE__ */ jsx(VariablePopupRecordProvider, { children: /* @__PURE__ */ jsx(WithoutTableFieldResource.Provider, { value: !0, children: /* @__PURE__ */ jsx(NocoBaseRecursionField, { schema: o, onlyRenderProperties: !0, basePath: l.address }) }) }) }))
@@ -42769,10 +42789,10 @@ 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 = (T = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : T.linkageFromForm, p = r.componentProps.type === "danger" ? void 0 : r.componentProps.type || "primary", { getChildrenCollections: m } = useCollectionManager_deprecated(), h = m(n.name), g = useMemo(() => c.map((D) => {
       if (!D)
         return;
-      const O = h.find((j) => j.name === D.collection);
-      if (O)
-        return P(x({}, O.getOptions()), {
-          title: D.title || O.title
+      const N = h.find((j) => j.name === D.collection);
+      if (N)
+        return P(x({}, N.getOptions()), {
+          title: D.title || N.title
         });
     }).filter((D) => D && l(`${D.name}:create`)), [c, h]), f = (o == null ? void 0 : o["x-linkage-rules"]) || [], C = useRecord(), b = useLocalVariables$1({ currentForm: { values: C } }), S = useCompile(), { designable: y } = useDesignable(), v = e.icon || null, F = useApp(), I = useMemo(() => g.map((D) => ({
       key: D.name,
@@ -42783,8 +42803,8 @@ const CreateAction = observer$1(
     }), [I]);
     return useEffect(() => {
       r.stateOfLinkageRules = {}, f.filter((D) => !D.disabled).forEach((D) => {
-        var O;
-        (O = D.actions) == null || O.forEach((j) => {
+        var N;
+        (N = D.actions) == null || N.forEach((j) => {
           linkageAction(
             {
               operator: j.operator,
@@ -42993,19 +43013,19 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
       }
     });
     Array.isArray(o.value) || (o.value = []);
-    const I = useCallback(({ form: j, fieldSchema: N, collectionField: B, getInterface: w }) => {
+    const I = useCallback(({ form: j, fieldSchema: O, collectionField: B, getInterface: w }) => {
       var M;
-      return !B || B.target && ((M = N["x-component-props"]) != null && M.mode) && !["Picker", "Select"].includes(N["x-component-props"].mode) ? !1 : !(j != null && j.readPretty) && !isPatternDisabled(N) && !interfacesOfUnsupportedDefaultValue.includes(B == null ? void 0 : B.interface) && !isSystemField(B, w);
+      return !B || B.target && ((M = O["x-component-props"]) != null && M.mode) && !["Picker", "Select"].includes(O["x-component-props"].mode) ? !1 : !(j != null && j.readPretty) && !isPatternDisabled(O) && !interfacesOfUnsupportedDefaultValue.includes(B == null ? void 0 : B.interface) && !isSystemField(B, w);
     }, []), R = () => {
-      const { setVisible: j } = useActionContext(), { selectedRows: N, setSelectedRows: B } = useContext(RecordPickerContext);
+      const { setVisible: j } = useActionContext(), { selectedRows: O, setSelectedRows: B } = useContext(RecordPickerContext);
       return {
         onClick() {
-          N.map((w) => o.value.push(markRecordAsNew(w))), o.onInput(o.value), o.initialValue = o.value, B([]), j(!1);
+          O.map((w) => o.value.push(markRecordAsNew(w))), o.onInput(o.value), o.initialValue = o.value, B([]), j(!1);
         }
       };
-    }, T = useMemo(() => o.value && Object.keys(o.value).length > 0 ? (Array.isArray(o.value) ? o.value : o.value ? [o.value] : []).filter(Boolean).map((N) => {
-      const B = N == null ? void 0 : N[S.label];
-      return P(x({}, N), {
+    }, T = useMemo(() => o.value && Object.keys(o.value).length > 0 ? (Array.isArray(o.value) ? o.value : o.value ? [o.value] : []).filter(Boolean).map((O) => {
+      const B = O == null ? void 0 : O[S.label];
+      return P(x({}, O), {
         [S.label]: getLabelFormatValue$1(y(v), y(B))
       });
     }) : [], [o.value, S == null ? void 0 : S.label]), D = {
@@ -43020,9 +43040,9 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
       selectedRows: C,
       setSelectedRows: b,
       collectionField: n
-    }, O = () => {
-      const j = (n == null ? void 0 : n.targetKey) || "id", N = (o.value || []).map((w) => w == null ? void 0 : w[j]).filter(Boolean);
-      return N.length ? { $and: [{ [`${j}.$ne`]: N }] } : {};
+    }, N = () => {
+      const j = (n == null ? void 0 : n.targetKey) || "id", O = (o.value || []).map((w) => w == null ? void 0 : w[j]).filter(Boolean);
+      return O.length ? { $and: [{ [`${j}.$ne`]: O }] } : {};
     };
     return o.value.length > 0 ? /* @__PURE__ */ jsxs(
       Card,
@@ -43036,7 +43056,7 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
         `,
         children: [
           /* @__PURE__ */ jsxs(RefreshComponentProvider, { refresh: h, children: [
-            o.value.map((j, N) => {
+            o.value.map((j, O) => {
               let B = i;
               return i || (B = !(j != null && j[n.targetKey])), /* @__PURE__ */ jsxs(React.Fragment, { children: [
                 /* @__PURE__ */ jsx("div", { style: { textAlign: "right" }, children: !o.readPretty && B && /* @__PURE__ */ jsx(Tooltip, { title: c("Remove"), children: /* @__PURE__ */ jsx(
@@ -43045,22 +43065,22 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
                     style: { zIndex: 1e3, color: "#a8a3a3" },
                     onClick: () => {
                       action(() => (spliceArrayState(o, {
-                        startIndex: N,
+                        startIndex: O,
                         deleteCount: 1
-                      }), o.value.splice(N, 1), o.onInput(o.value)));
+                      }), o.value.splice(O, 1), o.onInput(o.value)));
                     }
                   }
                 ) }, "remove") }),
-                /* @__PURE__ */ jsx(FormActiveFieldsProvider, { name: "nester", children: /* @__PURE__ */ jsx(SubFormProvider, { value: { value: j, collection: d, fieldSchema: t.parent }, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: isNewRecord(j), record: j, parent: u, children: /* @__PURE__ */ jsx(RecordIndexProvider, { index: N, children: /* @__PURE__ */ jsx(DefaultValueProvider, { isAllowToSetDefaultValue: I, children: /* @__PURE__ */ jsx(
+                /* @__PURE__ */ jsx(FormActiveFieldsProvider, { name: "nester", children: /* @__PURE__ */ jsx(SubFormProvider, { value: { value: j, collection: d, fieldSchema: t.parent }, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: isNewRecord(j), record: j, parent: u, children: /* @__PURE__ */ jsx(RecordIndexProvider, { index: O, children: /* @__PURE__ */ jsx(DefaultValueProvider, { isAllowToSetDefaultValue: I, children: /* @__PURE__ */ jsx(
                   NocoBaseRecursionField,
                   {
                     onlyRenderProperties: !0,
-                    basePath: o.address.concat(N),
+                    basePath: o.address.concat(O),
                     schema: t
                   }
                 ) }) }) }) }) }),
                 /* @__PURE__ */ jsx(Divider$1, {})
-              ] }, N);
+              ] }, O);
             }),
             /* @__PURE__ */ jsxs(Space$1, { children: [
               o.editable && r && /* @__PURE__ */ jsx(
@@ -43071,8 +43091,8 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
                       action(() => {
                         Array.isArray(o.value) || (o.value = []);
                         const j = o.value.length;
-                        return o.value.splice(j, 0, markRecordAsNew({})), each(o.form.fields, (N, B) => {
-                          N || delete o.form.fields[B];
+                        return o.value.splice(j, 0, markRecordAsNew({})), each(o.form.fields, (O, B) => {
+                          O || delete o.form.fields[B];
                         }), o.onInput(o.value);
                       });
                     }
@@ -43106,7 +43126,7 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
                 visible: g,
                 setVisible: f
               },
-              children: /* @__PURE__ */ jsx(RecordPickerProvider, P(x({}, D), { children: /* @__PURE__ */ jsx(CollectionProvider, { name: n == null ? void 0 : n.target, children: /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(TableSelectorParamsProvider, { params: { filter: O() }, children: /* @__PURE__ */ jsx(
+              children: /* @__PURE__ */ jsx(RecordPickerProvider, P(x({}, D), { children: /* @__PURE__ */ jsx(CollectionProvider, { name: n == null ? void 0 : n.target, children: /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(TableSelectorParamsProvider, { params: { filter: N() }, children: /* @__PURE__ */ jsx(
                 SchemaComponentOptions,
                 {
                   scope: {
@@ -43153,7 +43173,7 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
     S.current = t;
     const y = useCallback(() => S.current, []);
     return /* @__PURE__ */ jsx(Fragment$1, { children: toArr$3(e.value).map((F, I, R) => {
-      const T = F == null ? void 0 : F[(r == null ? void 0 : r.label) || "label"], D = g ? transformNestedData(F).map((N) => N == null ? void 0 : N[(r == null ? void 0 : r.label) || "label"]).join(" / ") : isObject(T) ? JSON.stringify(T) : T, O = toValue$3(l(D), "N/A"), j = getTabFormatValue(l(u), O, F[o]);
+      const T = F == null ? void 0 : F[(r == null ? void 0 : r.label) || "label"], D = g ? transformNestedData(F).map((O) => O == null ? void 0 : O[(r == null ? void 0 : r.label) || "label"]).join(" / ") : isObject(T) ? JSON.stringify(T) : T, N = toValue$3(l(D), "N/A"), j = getTabFormatValue(l(u), N, F[o]);
       return /* @__PURE__ */ jsxs(Fragment, { children: [
         /* @__PURE__ */ jsx("span", { children: d ? j : n !== !1 ? /* @__PURE__ */ jsx(
           "a",
@@ -43161,9 +43181,9 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
             onMouseEnter: () => {
               e.setBtnHover(!0);
             },
-            onClick: (N) => {
+            onClick: (O) => {
               var B;
-              e.setBtnHover(!0), N.stopPropagation(), N.preventDefault(), c && !t.properties && (i(schema$1.Viewer), b.current = !0), b.current ? setTimeout(() => {
+              e.setBtnHover(!0), O.stopPropagation(), O.preventDefault(), c && !t.properties && (i(schema$1.Viewer), b.current = !0), b.current ? setTimeout(() => {
                 f({
                   recordData: F,
                   parentRecordData: C,
@@ -43240,9 +43260,9 @@ const useColumnsDeepMemoized = (e) => {
     `, [n.paddingContentVerticalLG, n.marginSM]), f = useCollection(), C = useMemo(
     () => d == null ? void 0 : d.map((S) => {
       var I, R, T, D;
-      const y = S.reduceProperties((O, j) => {
+      const y = S.reduceProperties((N, j) => {
         if (isCollectionFieldComponent(j))
-          return O.concat([j]);
+          return N.concat([j]);
       }, []), v = (y == null ? void 0 : y.length) > 0 ? y[0].name : S.name, F = !!((I = S["x-component-props"]) != null && I.columnHidden);
       return P(x({
         title: /* @__PURE__ */ jsx(TableColumnTitle, { name: S.name, schema: S, onlyRenderSelf: !0, tooltip: (R = S["x-component-props"]) == null ? void 0 : R.tooltip }),
@@ -43252,13 +43272,13 @@ const useColumnsDeepMemoized = (e) => {
         columnHidden: F
       }, S["x-component-props"]), {
         width: F && !a ? 0 : ((D = S["x-component-props"]) == null ? void 0 : D.width) || 100,
-        render: (O, j) => {
+        render: (N, j) => {
           var w;
-          const N = (w = o.value) == null ? void 0 : w.indexOf(j), B = o.address.concat(j.__index || N);
-          return /* @__PURE__ */ jsx(SubFormProvider, { value: { value: j, collection: f, fieldSchema: r.parent }, children: /* @__PURE__ */ jsx(RecordIndexProvider, { index: j.__index || N, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: isNewRecord(j), record: j, parent: u, children: /* @__PURE__ */ jsx(ColumnFieldProvider, { schema: S, basePath: B, children: /* @__PURE__ */ jsx("span", { role: "button", className: g, children: /* @__PURE__ */ jsx(RecursionField, { basePath: B, schema: S, onlyRenderProperties: !0 }) }, N) }) }) }) });
+          const O = (w = o.value) == null ? void 0 : w.indexOf(j), B = o.address.concat(j.__index || O);
+          return /* @__PURE__ */ jsx(SubFormProvider, { value: { value: j, collection: f, fieldSchema: r.parent }, children: /* @__PURE__ */ jsx(RecordIndexProvider, { index: j.__index || O, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: isNewRecord(j), record: j, parent: u, children: /* @__PURE__ */ jsx(ColumnFieldProvider, { schema: S, basePath: B, children: /* @__PURE__ */ jsx("span", { role: "button", className: g, children: /* @__PURE__ */ jsx(RecursionField, { basePath: B, schema: S, onlyRenderProperties: !0 }) }, O) }) }) }) });
         },
-        onCell: (O, j) => ({
-          record: O,
+        onCell: (N, j) => ({
+          record: N,
           schema: S,
           rowIndex: j,
           isSubTable: e.isSubTable,
@@ -43380,7 +43400,7 @@ const useColumnsDeepMemoized = (e) => {
             display: none !important;
           }
         `,
-      itemRender: (D, O, j) => O === "prev" ? /* @__PURE__ */ jsxs(
+      itemRender: (D, N, j) => N === "prev" ? /* @__PURE__ */ jsxs(
         "div",
         {
           style: { display: "flex" },
@@ -43588,8 +43608,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, O = useMemoizedFn(b.onRowDragEnd || (() => {
-    })), j = usePaginationProps$2(n, i), N = useTableColumns$1(b, j), [B, w] = useState(() => T ? D : []), [M, $] = useState(((Ce = S == null ? void 0 : S.data) == null ? void 0 : Ce.selectedRowKeys) || []), [k, z] = useState([]), L = (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, N = useMemoizedFn(b.onRowDragEnd || (() => {
+    })), j = usePaginationProps$2(n, i), O = useTableColumns$1(b, j), [B, w] = useState(() => T ? D : []), [M, $] = useState(((Ce = S == null ? void 0 : S.data) == null ? void 0 : Ce.selectedRowKeys) || []), [k, z] = useState([]), L = (p == null ? void 0 : p.type) !== "none", q = useRef(/* @__PURE__ */ new Map()), E = useMemo(() => css`
         & > td {
           background-color: ${t.controlItemBgActive} !important;
         }
@@ -43632,10 +43652,10 @@ const Table$1 = withDynamicSchemaProps(
           return;
         }
         const ie = (ve = (ye = (Se = oe.active) == null ? void 0 : Se.data.current) == null ? void 0 : ye.sortable) == null ? void 0 : ve.index, ae = (Ie = (Fe = (Pe = oe.over) == null ? void 0 : Pe.data.current) == null ? void 0 : Fe.sortable) == null ? void 0 : Ie.index, xe = S.value[ie] || oe.active, Te = S.value[ae] || oe.over;
-        S.move(ie, ae), O({ from: xe, to: Te });
+        S.move(ie, ae), N({ from: xe, to: Te });
       }, []);
       return /* @__PURE__ */ jsx(DndContext, { onDragEnd: te, children: /* @__PURE__ */ jsx("tbody", x({}, Q)) });
-    }, [S, O]);
+    }, [S, N]);
     W.displayName = "BodyWrapperComponent";
     const X = useMemo(() => ({
       header: {
@@ -43753,7 +43773,7 @@ const Table$1 = withDynamicSchemaProps(
           onRow: U,
           rowClassName: fe,
           scroll: ue,
-          columns: N,
+          columns: O,
           expandable: he,
           field: S,
           size: v
@@ -43857,17 +43877,17 @@ const Table$1 = withDynamicSchemaProps(
     }, R = () => {
       const z = (o == null ? void 0 : o.targetKey) || "id", L = (n.value || []).map((E) => E == null ? void 0 : E[z]).filter(Boolean);
       return L.length ? { $and: [{ [`${z}.$ne`]: L }] } : {};
-    }, [T, D] = useState(1), [O, j] = useState(((M = n.componentProps) == null ? void 0 : M.pageSize) || 10);
+    }, [T, D] = useState(1), [N, j] = useState(((M = n.componentProps) == null ? void 0 : M.pageSize) || 10);
     useEffect(() => {
       var z;
       j((z = n.componentProps) == null ? void 0 : z.pageSize);
     }, [($ = n.componentProps) == null ? void 0 : $.pageSize]);
-    const N = useMemo(() => {
+    const O = useMemo(() => {
       var L;
       const z = Math.ceil(((L = n.value) == null ? void 0 : L.length) / 10);
       return {
         current: T > z ? z : T,
-        pageSize: O || 10,
+        pageSize: N || 10,
         total: n == null ? void 0 : n.value,
         onChange: (q, E) => {
           D(q), j(E), n.componentProps.pageSize = E, n.onInput(n.value);
@@ -43876,7 +43896,7 @@ const Table$1 = withDynamicSchemaProps(
         pageSizeOptions: ["10", "20", "50", "100"],
         hideOnSinglePage: !1
       };
-    }, [(k = n.value) == null ? void 0 : k.length, O, T]), B = () => {
+    }, [(k = n.value) == null ? void 0 : k.length, N, T]), B = () => {
       const { field: z } = useAssociationFieldContext();
       return {
         run() {
@@ -43901,7 +43921,7 @@ const Table$1 = withDynamicSchemaProps(
           showIndex: !0,
           dragSort: !1,
           showDel: n.editable && (b !== !1 || C !== !1 || S !== !1) ? (z) => n.editable ? S !== !1 ? !0 : z == null ? void 0 : z.__isNewRecord__ : !1 : !1,
-          pagination: N,
+          pagination: O,
           rowSelection: { type: "none", hideSelectAll: !0 },
           isSubTable: !0,
           locale: {
@@ -44069,11 +44089,11 @@ AssociationSelect.Designer = function e() {
   var M, $, k, z, L, q, E, G, U, H, J;
   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), I = (M = F == null ? void 0 : F.validateSchema) == null ? void 0 : M.call(F, u), R = ($ = S == null ? void 0 : S.uiSchema) == null ? void 0 : $.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), O = ((L = (z = (k = c.componentProps) == null ? void 0 : k.service) == null ? void 0 : z.params) == null ? void 0 : L.sort) || [];
+  const D = useSortFields(S == null ? void 0 : S.target), N = ((L = (z = (k = c.componentProps) == null ? void 0 : k.service) == null ? void 0 : z.params) == null ? void 0 : L.sort) || [];
   useEffect(() => {
     c.readPretty !== u["x-read-pretty"] && (c.readPretty = !!u["x-read-pretty"]);
   }, [u["x-read-pretty"]]);
-  const j = O == null ? void 0 : O.map((K) => K.startsWith("-") ? {
+  const j = N == null ? void 0 : N.map((K) => K.startsWith("-") ? {
     field: K.substring(1),
     direction: "desc"
   } : {
@@ -44081,7 +44101,7 @@ AssociationSelect.Designer = function e() {
     direction: "asc"
   });
   c.readPretty || c.required;
-  const N = T.filter((K) => i(K)).map((K) => {
+  const O = T.filter((K) => i(K)).map((K) => {
     var W;
     return {
       value: K == null ? void 0 : K.name,
@@ -44432,7 +44452,7 @@ AssociationSelect.Designer = function e() {
       SchemaSettingsSelectItem,
       {
         title: d("Title field"),
-        options: N,
+        options: O,
         value: (J = (H = c == null ? void 0 : c.componentProps) == null ? void 0 : H.fieldNames) == null ? void 0 : J.label,
         onChange: (K) => {
           var ee, Z;
@@ -44465,7 +44485,7 @@ AssociationSelect.Designer = function e() {
   ] });
 };
 AssociationSelect.FilterDesigner = function e() {
-  var F, I, R, T, D, O, j, N, B, w, M;
+  var F, I, R, T, D, N, j, O, 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 = (I = m == null ? void 0 : m.uiSchema) == null ? void 0 : I.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(($) => $.startsWith("-") ? {
@@ -44589,7 +44609,7 @@ AssociationSelect.FilterDesigner = function e() {
         }
       }
     ),
-    i && !(i != null && i.readPretty) && ((O = m == null ? void 0 : m.uiSchema) == null ? void 0 : O.type) && /* @__PURE__ */ jsx(
+    i && !(i != null && i.readPretty) && ((N = m == null ? void 0 : m.uiSchema) == null ? void 0 : N.type) && /* @__PURE__ */ jsx(
       SchemaSettingsModalItem,
       {
         title: c("Set default value"),
@@ -44620,7 +44640,7 @@ AssociationSelect.FilterDesigner = function e() {
       SchemaSettingsDataScope,
       {
         collectionName: m == null ? void 0 : m.target,
-        defaultFilter: ((B = (N = (j = a.componentProps) == null ? void 0 : j.service) == null ? void 0 : N.params) == null ? void 0 : B.filter) || {},
+        defaultFilter: ((B = (O = (j = a.componentProps) == null ? void 0 : j.service) == null ? void 0 : O.params) == null ? void 0 : B.filter) || {},
         form: i,
         onSubmit: ({ filter: $ }) => {
           $ = removeNullCondition($), _.set(a.componentProps, "service.params.filter", $), l["x-component-props"] = a.componentProps, u.emit("patch", {
@@ -46294,8 +46314,8 @@ const InternalListBlockProvider = (e) => {
   return e - u - n.paddingLG - l;
 }, InternalList = withSkeletonComponent(
   (e) => {
-    var N, B, w;
-    const { service: t } = useListBlockContext(), { run: n, params: o } = t, r = useFieldSchema(), i = useDesigner(), a = (N = t == null ? void 0 : t.data) == null ? void 0 : N.meta, { pageSize: l, count: c, hasNext: u, page: d } = a || {}, p = useField(), [m] = useState(/* @__PURE__ */ new Map()), { wrapSSR: h, componentCls: g, hashId: f } = useStyles$3(), C = useListBlockHeight(), { token: b } = theme.useToken(), S = useCallback(
+    var O, B, w;
+    const { service: t } = useListBlockContext(), { run: n, params: o } = t, r = useFieldSchema(), i = useDesigner(), a = (O = t == null ? void 0 : t.data) == null ? void 0 : O.meta, { pageSize: l, count: c, hasNext: u, page: d } = a || {}, p = useField(), [m] = useState(/* @__PURE__ */ new Map()), { wrapSSR: h, componentCls: g, hashId: f } = useStyles$3(), C = useListBlockHeight(), { token: b } = theme.useToken(), S = useCallback(
       (M) => (m.has(M) || m.set(
         M,
         new Schema({
@@ -46837,16 +46857,16 @@ const toValue$1 = (e, t) => e == null ? t : e, ReadPrettyRecordPicker = observer
     if (isShowFilePicker(h))
       return u ? /* @__PURE__ */ jsx(Preview, x({}, e)) : null;
     const b = () => toArr$3(e.value).map((I, R, T) => {
-      const D = toValue$1(m(I == null ? void 0 : I[(i == null ? void 0 : i.label) || "label"]), "N/A"), O = getLabelFormatValue(h, D, !0);
+      const D = toValue$1(m(I == null ? void 0 : I[(i == null ? void 0 : i.label) || "label"]), "N/A"), N = getLabelFormatValue(h, D, !0);
       return /* @__PURE__ */ jsxs(Fragment, { children: [
-        /* @__PURE__ */ jsx("span", { className: "test-record-picker-read-pretty-item", children: g || f ? O : /* @__PURE__ */ jsx(
+        /* @__PURE__ */ jsx("span", { className: "test-record-picker-read-pretty-item", children: g || f ? N : /* @__PURE__ */ jsx(
           "a",
           {
             onClick: (j) => {
-              var N;
-              j.stopPropagation(), j.preventDefault(), l(!0), p(I), (N = C == null ? void 0 : C.current) == null || N.setPopoverVisible(!1);
+              var O;
+              j.stopPropagation(), j.preventDefault(), l(!0), p(I), (O = C == null ? void 0 : C.current) == null || O.setPopoverVisible(!1);
             },
-            children: O
+            children: N
           }
         ) }),
         R < T.length - 1 ? /* @__PURE__ */ jsx("span", { style: { marginRight: 4, color: "#aaa" }, children: "," }) : null
@@ -47676,8 +47696,8 @@ const useStyles$2 = genStyleHook("nb-rich-text", (e) => {
           "aria-label": `checkbox-${y.name}`
         }),
         renderCell: (y, v, F, I) => {
-          var D, O;
-          const R = (D = e == null ? void 0 : e.pagination) == null ? void 0 : D.current, T = ((O = e == null ? void 0 : e.pagination) == null ? void 0 : O.pageSize) || 20;
+          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;
           return R && (F = F + (R - 1) * T), /* @__PURE__ */ jsxs(
             "div",
             {
@@ -48262,8 +48282,8 @@ const TableActionColumnDesigner = (e) => {
     "sort-field"
   );
 }, TableBlockDesigner = () => {
-  var T, D, O, j, N, B, w, M, $, k, z;
-  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 = ((O = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : O.resource) || ((j = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : j.association), g = !((N = i == null ? void 0 : i["x-decorator-props"]) != null && N.disableTemplate), f = m == null ? void 0 : m.map((L) => L != null && L.startsWith("-") ? {
+  var T, D, N, j, O, B, w, M, $, k, z;
+  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) || ((j = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : j.association), g = !((O = i == null ? void 0 : i["x-decorator-props"]) != null && O.disableTemplate), f = m == null ? void 0 : m.map((L) => L != null && L.startsWith("-") ? {
     field: L.substring(1),
     direction: "desc"
   } : {
@@ -48508,7 +48528,7 @@ TableField.ActionBar = observer$1(
   { displayName: "TableField.ActionBar" }
 );
 const TableSelectorDesigner = () => {
-  var R, T, D, O, j, N;
+  var R, T, D, N, j, O;
   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"
@@ -48520,7 +48540,7 @@ const TableSelectorDesigner = () => {
     /* @__PURE__ */ jsx(
       SchemaSettingsDataScope,
       {
-        defaultFilter: ((O = (D = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : D.params) == null ? void 0 : O.filter) || {},
+        defaultFilter: ((N = (D = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : D.params) == null ? void 0 : N.filter) || {},
         form: a,
         onSubmit: ({ filter: B }) => {
           var $;
@@ -48666,7 +48686,7 @@ const TableSelectorDesigner = () => {
       SchemaSettingsSelectItem,
       {
         title: d("Records per page"),
-        value: ((N = (j = r.decoratorProps) == null ? void 0 : j.params) == null ? void 0 : N.pageSize) || 20,
+        value: ((O = (j = r.decoratorProps) == null ? void 0 : j.params) == null ? void 0 : O.pageSize) || 20,
         options: [
           { label: "5", value: 5 },
           { label: "10", value: 10 },
@@ -50130,14 +50150,14 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       const F = ["belongsTo"].includes(u) ? l : ["belongsToMany"].includes(u) ? d : c, I = (R = r(F)) == null ? void 0 : R.fields;
       if (I) {
         const T = I == null ? void 0 : I.filter((D) => supportTypes.includes(D.type)).map((D) => {
-          var O;
+          var N;
           return {
             value: D.name,
-            label: g(((O = D.uiSchema) == null ? void 0 : O.title) || D.name)
+            label: g(((N = D.uiSchema) == null ? void 0 : N.title) || D.name)
           };
         });
         if (o(T), y(T), h) {
-          const D = T.find((O) => O.value === h);
+          const D = T.find((N) => N.value === h);
           b((D == null ? void 0 : D.label) || h);
         }
       }
@@ -50149,16 +50169,16 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
         options: n,
         showSearch: !0,
         onDropdownVisibleChange: (F) => V(void 0, null, function* () {
-          var O;
+          var N;
           const { target: I, type: R, through: T } = f.values, D = ["belongsTo"].includes(R) ? l || p : ["belongsToMany"].includes(R) ? T : I;
           if (D && F) {
-            const j = ((O = r(D)) == null ? void 0 : O.fields) || [];
+            const j = ((N = r(D)) == null ? void 0 : N.fields) || [];
             o(
-              j == null ? void 0 : j.filter((N) => supportTypes.includes(N.type)).map((N) => {
+              j == null ? void 0 : j.filter((O) => supportTypes.includes(O.type)).map((O) => {
                 var B;
                 return {
-                  value: N.name,
-                  label: g(((B = N.uiSchema) == null ? void 0 : B.title) || N.name)
+                  value: O.name,
+                  label: g(((B = O.uiSchema) == null ? void 0 : B.title) || O.name)
                 };
               })
             );
@@ -50347,8 +50367,8 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   const t = useRecord();
   return /* @__PURE__ */ jsx(AddFieldAction, x({ item: t }, e));
 }, AddFieldAction = (e) => {
-  var N, 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(), I = ((B = (N = p(o.name)) == null ? void 0 : N.options) == null ? void 0 : B.fields) || o.fields || [], R = useMemo(() => d.map((w) => ({
+  var O, 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(), I = ((B = (O = p(o.name)) == null ? void 0 : O.options) == null ? void 0 : B.fields) || o.fields || [], R = useMemo(() => d.map((w) => ({
     label: S(w.title),
     value: w.name
   })), []), T = useCallback(() => {
@@ -50400,7 +50420,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   }).filter((w) => {
     var M;
     return (M = w == null ? void 0 : w.children) == null ? void 0 : M.length;
-  }), [T]), O = useMemo(() => ({
+  }), [T]), N = useMemo(() => ({
     style: {
       maxHeight: "60vh",
       overflow: "auto"
@@ -50420,7 +50440,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
     };
   }), [I == null ? void 0 : I.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: O, 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: N, children: r || /* @__PURE__ */ jsx(Button, { icon: /* @__PURE__ */ jsx(PlusOutlined, {}), type: "primary", children: y("Add field") }) }),
     /* @__PURE__ */ jsx(
       SchemaComponent,
       {
@@ -50546,16 +50566,16 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       "a",
       P(x({}, a), {
         onClick: () => V(void 0, null, function* () {
-          var j, N;
+          var j, O;
           const { data: R } = yield g.resource("collections.fields", o.collectionName).get({
             filterByTk: o.name,
             appends: ["reverseField"]
           });
           S(R == null ? void 0 : R.data);
           const T = l(o.interface), D = cloneDeep(R == null ? void 0 : R.data) || {};
-          D != null && D.reverseField || (D.autoCreateReverseField = !1, D.reverseField = (j = T == null ? void 0 : T.default) == null ? void 0 : j.reverseField, set$1(D.reverseField, "name", `f_${uid()}`), set$1(D.reverseField, "uiSchema.title", (N = o.__parent) == null ? void 0 : N.title));
-          const O = getSchema$7(T, D, o, C);
-          h(O), p(!0);
+          D != null && D.reverseField || (D.autoCreateReverseField = !1, D.reverseField = (j = T == null ? void 0 : T.default) == null ? void 0 : j.reverseField, set$1(D.reverseField, "name", `f_${uid()}`), set$1(D.reverseField, "uiSchema.title", (O = o.__parent) == null ? void 0 : O.title));
+          const N = getSchema$7(T, D, o, C);
+          h(N), p(!0);
         }),
         children: i || f("Edit")
       })
@@ -50650,7 +50670,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   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 B && ((M = m(B)) == null ? void 0 : M.map(($) => $.name).concat([B]));
-  }, [I, R] = useState({}), T = p(a), D = getIsOverriding(a, T, o), O = useMemo(() => h.map((B) => ({
+  }, [I, R] = useState({}), T = p(a), D = getIsOverriding(a, T, o), N = useMemo(() => h.map((B) => ({
     label: v(B.title),
     value: B.name
   })), []), j = () => {
@@ -50677,7 +50697,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
         });
       }
     };
-  }, N = useMemo(() => {
+  }, O = useMemo(() => {
     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;
@@ -50729,8 +50749,8 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           override: !0,
           isOverride: !0,
           targetScope: { target: F(l), through: F(c) },
-          collections: O,
-          scopeKeyOptions: N
+          collections: N,
+          scopeKeyOptions: O
         }, t)
       }
     )
@@ -51217,7 +51237,7 @@ const getSchema$4 = (e, t, n) => {
       }
     }).catch);
   }, [t]);
-  const N = (w, M) => {
+  const O = (w, M) => {
     d.splice(M, 1, w), p(d), S.value = d.map(($) => {
       var z, L, q;
       const k = typeof $.source == "string" ? $.source : (q = (L = (z = $.source) == null ? void 0 : z.filter) == null ? void 0 : L.call(z, Boolean)) == null ? void 0 : q.join(".");
@@ -51247,7 +51267,7 @@ const getSchema$4 = (e, t, n) => {
           onChange: (k, z) => {
             var q;
             const L = (q = I(k == null ? void 0 : k[0])) == null ? void 0 : q.find((E) => E.name === last(k));
-            N(P(x({}, M), { source: k, uiSchema: L == null ? void 0 : L.uiSchema }), $);
+            O(P(x({}, M), { source: k, uiSchema: L == null ? void 0 : L.uiSchema }), $);
           },
           placeholder: l("Select field source")
         }
@@ -51267,7 +51287,7 @@ const getSchema$4 = (e, t, n) => {
             popupMatchSelectWidth: !1,
             style: { width: "100%" },
             options: (k == null ? void 0 : k.possibleTypes.map((z) => ({ label: z, value: z }))) || [],
-            onChange: (z) => N(P(x({}, k), { type: z }), $)
+            onChange: (z) => O(P(x({}, k), { type: z }), $)
           }
         );
       }
@@ -51288,7 +51308,7 @@ const getSchema$4 = (e, t, n) => {
             onChange: (L) => {
               var E;
               const q = F(L);
-              N(P(x({}, k), { interface: L, uiSchema: (E = q == null ? void 0 : q.default) == null ? void 0 : E.uiSchema }), $);
+              O(P(x({}, k), { interface: L, uiSchema: (E = q == null ? void 0 : q.default) == null ? void 0 : E.uiSchema }), $);
             },
             children: z.map((L) => /* @__PURE__ */ jsx(Select$1.OptGroup, { label: D(L.label), children: L.children.map((q) => /* @__PURE__ */ jsx(Select$1.Option, { value: q.name, children: D(q.label) }, q.value)) }, L.key))
           }
@@ -51307,7 +51327,7 @@ const getSchema$4 = (e, t, n) => {
           Input$3,
           {
             defaultValue: ((z = k == null ? void 0 : k.uiSchema) == null ? void 0 : z.title) || w,
-            onChange: (L) => N(
+            onChange: (L) => O(
               P(x({}, k), { uiSchema: P(x({}, omit(k == null ? void 0 : k.uiSchema, "rawTitle")), { title: L.target.value }) }),
               $
             )
@@ -51362,8 +51382,8 @@ 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 O, j, N, B, w, M;
-      const I = typeof (F == null ? void 0 : F.source) == "string" ? (O = F == null ? void 0 : F.source) == null ? void 0 : O.split(".") : F == null ? void 0 : F.source, R = (N = (j = h(I == null ? void 0 : I[0])) == null ? void 0 : j.find(($) => $.name === (I == null ? void 0 : I[1]))) == null ? void 0 : N.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;
+      var N, j, O, B, w, M;
+      const I = 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 = (O = (j = h(I == null ? void 0 : I[0])) == null ? void 0 : j.find(($) => $.name === (I == null ? void 0 : I[1]))) == null ? void 0 : O.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,
@@ -51602,20 +51622,20 @@ const AsyncDataProvider = (e) => {
       () => h.filter((T) => !["relation"].includes(T.key)).map((T, D) => ({
         key: D,
         label: d(T.label),
-        options: T.children.map((O, j) => ({
-          value: O.name,
+        options: T.children.map((N, j) => ({
+          value: N.name,
           key: `${D}-${j}`,
-          label: d(O.label)
+          label: d(N.label)
         }))
       })),
       [d]
     ), f = useSourceFieldsOptions(), C = useRef(p);
     if (useEffect(() => {
-      var O;
+      var N;
       const T = /* @__PURE__ */ new Map();
-      i || (a && a.length ? Object.entries((a == null ? void 0 : a[0]) || {}).forEach(([j, N]) => {
+      i || (a && a.length ? Object.entries((a == null ? void 0 : a[0]) || {}).forEach(([j, O]) => {
         var k;
-        const B = l[j], w = inferInterface(j, N), M = (k = C.current(w)) == null ? void 0 : k.default, $ = (B == null ? void 0 : B.uiSchema) || (M == null ? void 0 : M.uiSchema) || {};
+        const B = l[j], w = inferInterface(j, O), M = (k = C.current(w)) == null ? void 0 : k.default, $ = (B == null ? void 0 : B.uiSchema) || (M == null ? void 0 : M.uiSchema) || {};
         T.set(j, {
           name: j,
           interface: (B == null ? void 0 : B.interface) || w,
@@ -51626,15 +51646,15 @@ const AsyncDataProvider = (e) => {
           }, $)
         });
       }) : Object.entries(l || {}).forEach(
-        ([j, N]) => T.set(j, P(x({
+        ([j, O]) => T.set(j, P(x({
           name: j,
           type: "string"
-        }, N), {
+        }, O), {
           uiSchema: x({
             title: j
-          }, (N == null ? void 0 : N.uiSchema) || {})
+          }, (O == null ? void 0 : O.uiSchema) || {})
         }))
-      )), (O = c.value) != null && O.length && c.value.forEach((j) => {
+      )), (N = c.value) != null && N.length && c.value.forEach((j) => {
         T.has(j.name) && T.set(j.name, j);
       });
       const D = Array.from(T.values());
@@ -51650,12 +51670,12 @@ const AsyncDataProvider = (e) => {
       return /* @__PURE__ */ jsx(Alert, { showIcon: !0, message: `${e("SQL error: ")}${T}`, type: "error" });
     }
     const S = (T, D) => {
-      const O = [...t];
-      O.splice(D, 1, T), n(O), c.setValue(
-        O.map((j) => {
-          var N, B, w;
+      const N = [...t];
+      N.splice(D, 1, T), n(N), c.setValue(
+        N.map((j) => {
+          var O, B, w;
           return P(x({}, j), {
-            source: typeof j.source == "string" ? j.source : ((w = (B = (N = j.source) == null ? void 0 : N.filter) == null ? void 0 : B.call(N, Boolean)) == null ? void 0 : w.join(".")) || null
+            source: typeof j.source == "string" ? j.source : ((w = (B = (O = j.source) == null ? void 0 : O.filter) == null ? void 0 : B.call(O, Boolean)) == null ? void 0 : w.join(".")) || null
           });
         })
       );
@@ -51671,8 +51691,8 @@ const AsyncDataProvider = (e) => {
         dataIndex: "source",
         key: "source",
         width: 200,
-        render: (T, D, O) => {
-          const j = t[O];
+        render: (T, D, N) => {
+          const j = t[N];
           return /* @__PURE__ */ jsx(
             Cascader$1,
             {
@@ -51680,16 +51700,16 @@ const AsyncDataProvider = (e) => {
               allowClear: !0,
               options: d(f),
               placeholder: e("Select field source"),
-              onChange: (N) => {
-                let B = l[N == null ? void 0 : N[1]];
-                B != null && B.interface || (B = m((N == null ? void 0 : N.join(".")) || "")), S(
+              onChange: (O) => {
+                let B = l[O == null ? void 0 : O[1]];
+                B != null && B.interface || (B = m((O == null ? void 0 : O.join(".")) || "")), S(
                   P(x({}, j), {
-                    source: N,
+                    source: O,
                     interface: B == null ? void 0 : B.interface,
                     type: B == null ? void 0 : B.type,
                     uiSchema: B == null ? void 0 : B.uiSchema
                   }),
-                  O
+                  N
                 );
               }
             }
@@ -51701,10 +51721,10 @@ const AsyncDataProvider = (e) => {
         dataIndex: "interface",
         key: "interface",
         width: 150,
-        render: (T, D, O) => {
-          var N;
-          const j = t[O];
-          return j.source ? /* @__PURE__ */ jsx(Tag, { children: d((N = p(T)) == null ? void 0 : N.title) || T }) : /* @__PURE__ */ jsx(
+        render: (T, D, N) => {
+          var O;
+          const j = t[N];
+          return j.source ? /* @__PURE__ */ jsx(Tag, { children: d((O = p(T)) == null ? void 0 : O.title) || T }) : /* @__PURE__ */ jsx(
             Select$1,
             {
               defaultValue: j.interface || "input",
@@ -51721,7 +51741,7 @@ const AsyncDataProvider = (e) => {
                     }),
                     type: (L = w == null ? void 0 : w.default) == null ? void 0 : L.type
                   }),
-                  O
+                  N
                 );
               },
               allowClear: !0,
@@ -51735,15 +51755,15 @@ const AsyncDataProvider = (e) => {
         dataIndex: "title",
         key: "title",
         width: 180,
-        render: (T, D, O) => {
-          var N, B;
-          const j = t[O];
+        render: (T, D, N) => {
+          var O, B;
+          const j = t[N];
           return /* @__PURE__ */ jsx(
             Input$3,
             {
-              value: ((N = j.uiSchema) == null ? void 0 : N.title) || T,
+              value: ((O = j.uiSchema) == null ? void 0 : O.title) || T,
               defaultValue: ((B = j.uiSchema) == null ? void 0 : B.title) !== void 0 ? j.uiSchema.title : j == null ? void 0 : j.name,
-              onChange: (w) => S(P(x({}, j), { uiSchema: P(x({}, j == null ? void 0 : j.uiSchema), { title: w.target.value }) }), O)
+              onChange: (w) => S(P(x({}, j), { uiSchema: P(x({}, j == null ? void 0 : j.uiSchema), { title: w.target.value }) }), N)
             }
           );
         }
@@ -57732,7 +57752,7 @@ const RolesResourcesActions = connect((e) => {
                       const T = p[I.name] || {
                         name: I.name
                       };
-                      R ? T.fields = [] : T.fields = (D = l == null ? void 0 : l.map) == null ? void 0 : D.call(l, (O) => O.name), p[I.name] = T, t(Object.values(p));
+                      R ? T.fields = [] : T.fields = (D = l == null ? void 0 : l.map) == null ? void 0 : D.call(l, (N) => N.name), p[I.name] = T, t(Object.values(p));
                     }
                   }
                 ),
@@ -57745,15 +57765,15 @@ const RolesResourcesActions = connect((e) => {
                   checked: T,
                   "aria-label": `${I.name}_checkbox`,
                   onChange: () => {
-                    const O = p[I.name] || {
+                    const N = p[I.name] || {
                       name: I.name
-                    }, j = O.fields || [];
+                    }, j = N.fields || [];
                     if (T) {
-                      const N = j.indexOf(D.name);
-                      j.splice(N, 1);
+                      const O = j.indexOf(D.name);
+                      j.splice(O, 1);
                     } else
                       j.push(D.name);
-                    O.fields = j, p[I.name] = O, t(Object.values(p));
+                    N.fields = j, p[I.name] = N, t(Object.values(p));
                   }
                 }
               )
@@ -58508,9 +58528,9 @@ function PluginInfo(e) {
                     y.silent().request({
                       url: "__health_check",
                       method: "get"
-                    }).then((O) => {
-                      (O == null ? void 0 : O.data) === "ok" && window.location.reload();
-                    }).catch((O) => {
+                    }).then((N) => {
+                      (N == null ? void 0 : N.data) === "ok" && window.location.reload();
+                    }).catch((N) => {
                     });
                   }
                   setInterval(D, 1e3);
@@ -59955,48 +59975,6 @@ const ActionInitializerItem = (e) => {
     }
   };
   return /* @__PURE__ */ jsx(ActionInitializer, P(x({}, e), { schema: t }));
-}, RefreshActionInitializer = (e) => {
-  const t = {
-    title: '{{ t("Refresh") }}',
-    "x-action": "refresh",
-    "x-component": "Action",
-    "x-use-component-props": "useRefreshActionProps",
-    "x-toolbar": "ActionSchemaToolbar",
-    "x-settings": "actionSettings:refresh",
-    "x-component-props": {
-      icon: "ReloadOutlined"
-    }
-  };
-  return /* @__PURE__ */ jsx(ActionInitializer, P(x({}, e), { schema: t }));
-}, CreateSubmitActionInitializer = (e) => {
-  const t = {
-    title: '{{ t("Submit") }}',
-    "x-action": "submit",
-    "x-component": "Action",
-    "x-use-component-props": "useCreateActionProps",
-    "x-toolbar": "ActionSchemaToolbar",
-    "x-settings": "actionSettings:createSubmit",
-    "x-component-props": {
-      type: "primary",
-      htmlType: "submit"
-    }
-  };
-  return /* @__PURE__ */ jsx(ActionInitializerItem, P(x({}, e), { schema: t }));
-}, UpdateSubmitActionInitializer = (e) => {
-  const t = {
-    title: '{{ t("Submit") }}',
-    "x-action": "submit",
-    "x-component": "Action",
-    "x-use-component-props": "useUpdateActionProps",
-    // 'x-designer': 'Action.Designer',
-    "x-toolbar": "ActionSchemaToolbar",
-    "x-settings": "actionSettings:updateSubmit",
-    "x-component-props": {
-      type: "primary",
-      htmlType: "submit"
-    }
-  };
-  return /* @__PURE__ */ jsx(ActionInitializerItem, P(x({}, e), { schema: t }));
 }, ActionBarAssociationFilterAction = (e) => {
   const t = useRefreshFieldSchema(), n = useFieldSchema(), o = useAPIClient(), { t: r } = useTranslation(), i = createDesignable({ t: r, api: o, refresh: t, current: n }), { service: a, props: l } = useBlockRequestContext();
   i.loadAPIClientEvents();
@@ -60283,15 +60261,15 @@ const ActionInitializerItem = (e) => {
     ), I = C || (i == null ? void 0 : i.targetKey) || "id", R = b || ((U = (G = a["x-component-props"]) == null ? void 0 : G.fieldNames) == null ? void 0 : U.label) || I, T = {
       title: R || I,
       key: I
-    }, [D, O] = useState([]), [j, N] = useState(a.default || []), [B, w] = useState(!0), M = useLabelUiSchema(i, (T == null ? void 0 : T.title) || "label");
+    }, [D, N] = useState([]), [j, O] = useState(a.default || []), [B, w] = useState(!0), M = useLabelUiSchema(i, (T == null ? void 0 : T.title) || "label");
     if (useEffect(() => {
-      a.default && (d(a.default), N(a.default));
+      a.default && (d(a.default), O(a.default));
     }, [a.default, d]), !i)
       return null;
     const $ = (K) => {
-      O(K), w(!1);
+      N(K), w(!1);
     }, k = (K) => {
-      N(K), d(K), p == null || p(K);
+      O(K), d(K), p == null || p(K);
     }, z = (K) => {
       var X;
       const W = (X = h == null ? void 0 : h[0]) == null ? void 0 : X.filter;
@@ -60782,7 +60760,7 @@ const DataBlockInitializer = (e) => {
     onClick: T,
     currentText: b,
     otherText: S
-  }), O = useGetSchemaInitializerMenuItems(T), j = useMemo(() => O(D, i), [O, D, i]), [N, B] = useState([]), w = useMenuSearch({ data: j, openKeys: N, hideSearch: u }), M = useMemo(() => {
+  }), N = useGetSchemaInitializerMenuItems(T), j = useMemo(() => N(D, i), [N, D, i]), [O, B] = useState([]), w = useMenuSearch({ data: j, openKeys: O, hideSearch: u }), M = useMemo(() => {
     let z = w.filter((L) => L.key !== "search" && L.key !== "empty");
     return p && z.length === 1 ? z = z[0].children : z = w, [
       {
@@ -61652,7 +61630,61 @@ const items = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
   useCreateAssociationListBlock,
   useCreateAssociationTableBlock,
   useMenuSearch
-}, Symbol.toStringTag, { value: "Module" })), UpdateRecordActionInitializer = (e) => {
+}, Symbol.toStringTag, { value: "Module" })), LinkActionInitializer = (e) => {
+  const t = {
+    type: "void",
+    title: '{{ t("Link") }}',
+    "x-action": "customize:link",
+    "x-toolbar": "ActionSchemaToolbar",
+    "x-settings": "actionSettings:link",
+    "x-component": (e == null ? void 0 : e["x-component"]) || "Action.Link",
+    "x-use-component-props": "useLinkActionProps",
+    "x-decorator": "ACLActionProvider"
+  }, n = useSchemaInitializerItem();
+  return /* @__PURE__ */ jsx(BlockInitializer, P(x({}, n), { schema: t, item: n }));
+}, RefreshActionInitializer = (e) => {
+  const t = {
+    title: '{{ t("Refresh") }}',
+    "x-action": "refresh",
+    "x-component": "Action",
+    "x-use-component-props": "useRefreshActionProps",
+    "x-toolbar": "ActionSchemaToolbar",
+    "x-settings": "actionSettings:refresh",
+    "x-component-props": {
+      icon: "ReloadOutlined"
+    }
+  };
+  return /* @__PURE__ */ jsx(ActionInitializer, P(x({}, e), { schema: t }));
+}, CreateSubmitActionInitializer = (e) => {
+  const t = {
+    title: '{{ t("Submit") }}',
+    "x-action": "submit",
+    "x-component": "Action",
+    "x-use-component-props": "useCreateActionProps",
+    "x-toolbar": "ActionSchemaToolbar",
+    "x-settings": "actionSettings:createSubmit",
+    "x-component-props": {
+      type: "primary",
+      htmlType: "submit"
+    }
+  };
+  return /* @__PURE__ */ jsx(ActionInitializerItem, P(x({}, e), { schema: t }));
+}, UpdateSubmitActionInitializer = (e) => {
+  const t = {
+    title: '{{ t("Submit") }}',
+    "x-action": "submit",
+    "x-component": "Action",
+    "x-use-component-props": "useUpdateActionProps",
+    // 'x-designer': 'Action.Designer',
+    "x-toolbar": "ActionSchemaToolbar",
+    "x-settings": "actionSettings:updateSubmit",
+    "x-component-props": {
+      type: "primary",
+      htmlType: "submit"
+    }
+  };
+  return /* @__PURE__ */ jsx(ActionInitializerItem, P(x({}, e), { schema: t }));
+}, UpdateRecordActionInitializer = (e) => {
   const t = {
     title: '{{ t("Update record") }}',
     "x-component": (e == null ? void 0 : e["x-component"]) || "Action.Link",
@@ -61674,7 +61706,7 @@ const items = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
     }
   }, n = useSchemaInitializerItem();
   return /* @__PURE__ */ jsx(BlockInitializer, P(x({}, n), { schema: t, item: n }));
-}, PopupActionInitializer = (e) => {
+}, PopupActionDecorator = (e) => /* @__PURE__ */ jsx(ClearCollectionFieldContext, { children: /* @__PURE__ */ jsx(ACLActionProvider, { children: e.children }) }), PopupActionInitializer = (e) => {
   const { defaultOpenMode: t } = useOpenModeContext(), { getPopupContext: n } = usePopupUtils(), o = {
     type: "void",
     title: '{{ t("Popup") }}',
@@ -61686,7 +61718,7 @@ const items = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
       openMode: t,
       refreshDataBlockRequest: !0
     },
-    "x-decorator": "ACLActionProvider",
+    "x-decorator": "PopupActionDecorator",
     properties: {
       drawer: {
         type: "void",
@@ -61725,18 +61757,121 @@ const items = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
     [CONTEXT_SCHEMA_KEY]: n()
   }, r = useSchemaInitializerItem();
   return /* @__PURE__ */ jsx(BlockInitializer, P(x({}, r), { schema: o, item: r }));
-}, LinkActionInitializer = (e) => {
-  const t = {
+}, AssociateActionInitializer = (e) => {
+  const { defaultOpenMode: t } = useOpenModeContext(), { getPopupContext: n } = usePopupUtils(), o = {
     type: "void",
-    title: '{{ t("Link") }}',
-    "x-action": "customize:link",
+    title: '{{ t("Associate") }}',
+    "x-action": "associate",
     "x-toolbar": "ActionSchemaToolbar",
-    "x-settings": "actionSettings:link",
-    "x-component": (e == null ? void 0 : e["x-component"]) || "Action.Link",
-    "x-use-component-props": "useLinkActionProps",
-    "x-decorator": "ACLActionProvider"
-  }, n = useSchemaInitializerItem();
-  return /* @__PURE__ */ jsx(BlockInitializer, P(x({}, n), { schema: t, item: n }));
+    "x-settings": "actionSettings:popup",
+    "x-component": "Action",
+    "x-component-props": {
+      openMode: t,
+      refreshDataBlockRequest: !0
+    },
+    properties: {
+      drawer: {
+        type: "void",
+        "x-component": "Action.Container",
+        title: '{{ t("Select record") }}',
+        "x-component-props": {
+          className: "nb-record-picker-selector"
+        },
+        "x-decorator": "AssociateActionProvider",
+        properties: {
+          grid: {
+            type: "void",
+            "x-component": "Grid",
+            "x-initializer": "popup:tableSelector:addBlock",
+            properties: {}
+          },
+          footer: {
+            "x-component": "Action.Container.Footer",
+            "x-component-props": {},
+            properties: {
+              actions: {
+                type: "void",
+                "x-component": "ActionBar",
+                "x-component-props": {},
+                properties: {
+                  submit: {
+                    title: '{{ t("Submit") }}',
+                    "x-action": "submit",
+                    "x-component": "Action",
+                    "x-use-component-props": "usePickActionProps",
+                    "x-toolbar": "ActionSchemaToolbar",
+                    "x-settings": "actionSettings:submit",
+                    "x-component-props": {
+                      type: "primary",
+                      htmlType: "submit"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    [CONTEXT_SCHEMA_KEY]: n()
+  }, r = useSchemaInitializerItem();
+  return /* @__PURE__ */ jsx(BlockInitializer, P(x({}, r), { schema: o, item: r }));
+}, useTableSelectorProps = () => {
+  const { setSelectedRows: e } = useContext(RecordPickerContext), r = useTableSelectorProps$4(), { onRowSelectionChange: t, rowKey: n = "id" } = r, o = Y(r, ["onRowSelectionChange", "rowKey"]);
+  return P(x({}, o), {
+    rowKey: n,
+    rowSelection: {
+      type: "checkbox"
+    },
+    onRowSelectionChange(i, a) {
+      e == null || e(i), t == null || t(i, a);
+    }
+  });
+}, AssociateActionProvider = (e) => {
+  const [t, n] = useState([]), o = useCollection(), { resource: r, block: i, __parent: a, service: l } = useBlockRequestContext(), c = useActionContext(), { isMobile: u } = useOpenModeContext() || {}, [d, p] = useState([]), { data: m } = l || {};
+  useEffect(() => {
+    var C;
+    (C = r == null ? void 0 : r.list) == null || C.call(r, {
+      paginate: !1
+    }).then((b) => {
+      var S;
+      p(((S = b.data) == null ? void 0 : S.data) || []);
+    });
+  }, [r, m == null ? void 0 : m.meta.count]);
+  const h = {
+    size: "small",
+    onChange: e == null ? void 0 : e.onChange,
+    selectedRows: t,
+    setSelectedRows: n
+  }, g = () => {
+    const { selectedRows: C } = useContext(RecordPickerContext), { setVisible: b, setSubmitted: S, setFormValueChanged: y } = useActionContext();
+    return {
+      onClick(F, I) {
+        return V(this, null, function* () {
+          var R, T;
+          yield r.add({
+            values: C
+          }), I && (I == null || I()), b == null || b(!1), S == null || S(!0), i && i !== "TableField" && ((T = (R = a == null ? void 0 : a.service) == null ? void 0 : R.refresh) == null || T.call(R), b == null || b(!1), y == null || y(!1));
+        });
+      }
+    };
+  }, f = () => {
+    const C = (o == null ? void 0 : o.filterTargetKey) || "id";
+    if (d) {
+      const b = d.map((y) => y[C]).filter(Boolean);
+      return b.length ? { $and: [{ [`${C}.$ne`]: b }] } : {};
+    }
+    return {};
+  };
+  return /* @__PURE__ */ jsx(
+    ActionContextProvider,
+    {
+      value: P(x({}, c), {
+        openMode: u ? "drawer" : c.openMode
+      }),
+      children: /* @__PURE__ */ jsx(RecordPickerProvider, P(x({}, h), { children: /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: { useTableSelectorProps, usePickActionProps: g }, children: /* @__PURE__ */ jsx(TableSelectorParamsProvider, { params: { filter: f() }, children: e.children }) }) }))
+    }
+  );
 }, recordFormBlockInitializers = new SchemaInitializer({
   name: "RecordFormBlockInitializers",
   title: '{{ t("Add block") }}',
@@ -63665,7 +63800,27 @@ const commonOptions$h = {
     name: "filterForm:configureFields"
   }, commonOptions$6),
   filterFormItemInitializers_deprecated
-), MarkdownBlockInitializer = () => {
+), DividerFormItemInitializer = () => {
+  const { insert: e } = useSchemaInitializer(), t = useSchemaInitializerItem();
+  return /* @__PURE__ */ jsx(
+    SchemaInitializerItem,
+    P(x({}, t), {
+      icon: /* @__PURE__ */ jsx(LineOutlined, {}),
+      onClick: () => {
+        e({
+          type: "void",
+          "x-decorator": "FormItem",
+          "x-toolbar": "FormItemSchemaToolbar",
+          "x-settings": "blockSettings:divider",
+          "x-component": "Divider",
+          "x-component-props": {
+            children: '{{t("Group")}}'
+          }
+        });
+      }
+    })
+  );
+}, MarkdownBlockInitializer = () => {
   const { insert: e } = useSchemaInitializer(), { t } = useTranslation(), n = useSchemaInitializerItem();
   return /* @__PURE__ */ jsx(
     SchemaInitializerItem,
@@ -63872,142 +64027,7 @@ const commonOptions$h = {
     name: "page:addBlock"
   }, commonOptions$4),
   blockInitializers_deprecated
-), DividerFormItemInitializer = () => {
-  const { insert: e } = useSchemaInitializer(), t = useSchemaInitializerItem();
-  return /* @__PURE__ */ jsx(
-    SchemaInitializerItem,
-    P(x({}, t), {
-      icon: /* @__PURE__ */ jsx(LineOutlined, {}),
-      onClick: () => {
-        e({
-          type: "void",
-          "x-decorator": "FormItem",
-          "x-toolbar": "FormItemSchemaToolbar",
-          "x-settings": "blockSettings:divider",
-          "x-component": "Divider",
-          "x-component-props": {
-            children: '{{t("Group")}}'
-          }
-        });
-      }
-    })
-  );
-}, AssociateActionInitializer = (e) => {
-  const { defaultOpenMode: t } = useOpenModeContext(), { getPopupContext: n } = usePopupUtils(), o = {
-    type: "void",
-    title: '{{ t("Associate") }}',
-    "x-action": "associate",
-    "x-toolbar": "ActionSchemaToolbar",
-    "x-settings": "actionSettings:popup",
-    "x-component": "Action",
-    "x-component-props": {
-      openMode: t,
-      refreshDataBlockRequest: !0
-    },
-    properties: {
-      drawer: {
-        type: "void",
-        "x-component": "Action.Container",
-        title: '{{ t("Select record") }}',
-        "x-component-props": {
-          className: "nb-record-picker-selector"
-        },
-        "x-decorator": "AssociateActionProvider",
-        properties: {
-          grid: {
-            type: "void",
-            "x-component": "Grid",
-            "x-initializer": "popup:tableSelector:addBlock",
-            properties: {}
-          },
-          footer: {
-            "x-component": "Action.Container.Footer",
-            "x-component-props": {},
-            properties: {
-              actions: {
-                type: "void",
-                "x-component": "ActionBar",
-                "x-component-props": {},
-                properties: {
-                  submit: {
-                    title: '{{ t("Submit") }}',
-                    "x-action": "submit",
-                    "x-component": "Action",
-                    "x-use-component-props": "usePickActionProps",
-                    "x-toolbar": "ActionSchemaToolbar",
-                    "x-settings": "actionSettings:submit",
-                    "x-component-props": {
-                      type: "primary",
-                      htmlType: "submit"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    [CONTEXT_SCHEMA_KEY]: n()
-  }, r = useSchemaInitializerItem();
-  return /* @__PURE__ */ jsx(BlockInitializer, P(x({}, r), { schema: o, item: r }));
-}, useTableSelectorProps = () => {
-  const { setSelectedRows: e } = useContext(RecordPickerContext), r = useTableSelectorProps$4(), { onRowSelectionChange: t, rowKey: n = "id" } = r, o = Y(r, ["onRowSelectionChange", "rowKey"]);
-  return P(x({}, o), {
-    rowKey: n,
-    rowSelection: {
-      type: "checkbox"
-    },
-    onRowSelectionChange(i, a) {
-      e == null || e(i), t == null || t(i, a);
-    }
-  });
-}, AssociateActionProvider = (e) => {
-  const [t, n] = useState([]), o = useCollection(), { resource: r, block: i, __parent: a, service: l } = useBlockRequestContext(), c = useActionContext(), { isMobile: u } = useOpenModeContext() || {}, [d, p] = useState([]), { data: m } = l || {};
-  useEffect(() => {
-    var C;
-    (C = r == null ? void 0 : r.list) == null || C.call(r, {
-      paginate: !1
-    }).then((b) => {
-      var S;
-      p(((S = b.data) == null ? void 0 : S.data) || []);
-    });
-  }, [r, m == null ? void 0 : m.meta.count]);
-  const h = {
-    size: "small",
-    onChange: e == null ? void 0 : e.onChange,
-    selectedRows: t,
-    setSelectedRows: n
-  }, g = () => {
-    const { selectedRows: C } = useContext(RecordPickerContext), { setVisible: b, setSubmitted: S, setFormValueChanged: y } = useActionContext();
-    return {
-      onClick(F, I) {
-        return V(this, null, function* () {
-          var R, T;
-          yield r.add({
-            values: C
-          }), I && (I == null || I()), b == null || b(!1), S == null || S(!0), i && i !== "TableField" && ((T = (R = a == null ? void 0 : a.service) == null ? void 0 : R.refresh) == null || T.call(R), b == null || b(!1), y == null || y(!1));
-        });
-      }
-    };
-  }, f = () => {
-    const C = (o == null ? void 0 : o.filterTargetKey) || "id";
-    if (d) {
-      const b = d.map((y) => y[C]).filter(Boolean);
-      return b.length ? { $and: [{ [`${C}.$ne`]: b }] } : {};
-    }
-    return {};
-  };
-  return /* @__PURE__ */ jsx(
-    ActionContextProvider,
-    {
-      value: P(x({}, c), {
-        openMode: u ? "drawer" : c.openMode
-      }),
-      children: /* @__PURE__ */ jsx(RecordPickerProvider, P(x({}, h), { children: /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: { useTableSelectorProps, usePickActionProps: g }, children: /* @__PURE__ */ jsx(TableSelectorParamsProvider, { params: { filter: f() }, children: e.children }) }) }))
-    }
-  );
-}, ParentCollectionFields = () => {
+), ParentCollectionFields = () => {
   const e = useInheritsFormItemInitializerFields({ component: "AssignedField" }), { t } = useTranslation(), n = useCompile();
   if (!(e != null && e.length))
     return null;
@@ -64452,7 +64472,8 @@ class SchemaInitializerPlugin extends Plugin {
         RefreshActionInitializer,
         DividerFormItemInitializer,
         AssociateActionInitializer,
-        AssociateActionProvider
+        AssociateActionProvider,
+        PopupActionDecorator
       })), this.app.schemaInitializerManager.add(blockInitializers_deprecated), this.app.schemaInitializerManager.add(blockInitializers), this.app.schemaInitializerManager.add(tableActionInitializers_deprecated), this.app.schemaInitializerManager.add(tableActionInitializers), this.app.schemaInitializerManager.add(tableColumnInitializers_deprecated), this.app.schemaInitializerManager.add(tableColumnInitializers), this.app.schemaInitializerManager.add(tableActionColumnInitializers_deprecated), this.app.schemaInitializerManager.add(tableActionColumnInitializers), this.app.schemaInitializerManager.add(formItemInitializers_deprecated), this.app.schemaInitializerManager.add(formItemInitializers), this.app.schemaInitializerManager.add(formActionInitializers), this.app.schemaInitializerManager.add(detailsActionInitializers_deprecated), this.app.schemaInitializerManager.add(detailsActionInitializers), this.app.schemaInitializerManager.add(readPrettyFormItemInitializers_deprecated), this.app.schemaInitializerManager.add(readPrettyFormItemInitializers), this.app.schemaInitializerManager.add(readPrettyFormActionInitializers_deprecated), this.app.schemaInitializerManager.add(readPrettyFormActionInitializers), this.app.schemaInitializerManager.add(createFormBlockInitializers_deprecated), this.app.schemaInitializerManager.add(createFormBlockInitializers), this.app.schemaInitializerManager.add(customizeCreateFormBlockInitializers_deprecated), this.app.schemaInitializerManager.add(customizeCreateFormBlockInitializers), this.app.schemaInitializerManager.add(customFormItemInitializers_deprecated), this.app.schemaInitializerManager.add(customFormItemInitializers), this.app.schemaInitializerManager.add(filterFormActionInitializers_deprecated), this.app.schemaInitializerManager.add(filterFormActionInitializers), this.app.schemaInitializerManager.add(createFormActionInitializers_deprecated), this.app.schemaInitializerManager.add(createFormActionInitializers), this.app.schemaInitializerManager.add(updateFormActionInitializers_deprecated), this.app.schemaInitializerManager.add(updateFormActionInitializers), this.app.schemaInitializerManager.add(filterFormItemInitializers_deprecated), this.app.schemaInitializerManager.add(filterFormItemInitializers), this.app.schemaInitializerManager.add(gridCardActionInitializers_deprecated), this.app.schemaInitializerManager.add(gridCardActionInitializers), this.app.schemaInitializerManager.add(gridCardItemActionInitializers_deprecated), this.app.schemaInitializerManager.add(gridCardItemActionInitializers), this.app.schemaInitializerManager.add(listActionInitializers_deprecated), this.app.schemaInitializerManager.add(listActionInitializers), this.app.schemaInitializerManager.add(listItemActionInitializers_deprecated), this.app.schemaInitializerManager.add(listItemActionInitializers), this.app.schemaInitializerManager.add(recordBlockInitializers_deprecated), this.app.schemaInitializerManager.add(recordBlockInitializers), this.app.schemaInitializerManager.add(recordFormBlockInitializers), this.app.schemaInitializerManager.add(subTableActionInitializers_deprecated), this.app.schemaInitializerManager.add(subTableActionInitializers), this.app.schemaInitializerManager.add(tableSelectorInitializers_deprecated), this.app.schemaInitializerManager.add(tableSelectorInitializers), this.app.schemaInitializerManager.add(tabPaneInitializers_deprecated), this.app.schemaInitializerManager.add(tabPaneInitializers), this.app.schemaInitializerManager.add(tabPaneInitializersForRecordBlock), this.app.schemaInitializerManager.add(tabPaneInitializersForBulkEditFormBlock), this.app.schemaInitializerManager.add(menuItemInitializer_deprecated), this.app.schemaInitializerManager.add(menuItemInitializer);
     });
   }