@nocobase/client 1.6.30 → 1.6.31

package/es/index.mjs

@@ -6047,7 +6047,7 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
       return { label: (F = i(v)) == null ? void 0 : F.title, value: v };
     });
   }
-  const p = (y, { exclude: v = [], depth: F = 0, maxDepth: I, prefix: w = "" }) => F > I ? [] : o(y).map((T) => {
+  const p = (y, { exclude: v = [], depth: F = 0, maxDepth: I, prefix: R = "" }) => F > I ? [] : o(y).map((T) => {
     var j;
     if (v.includes(T.name) || !T.interface || ["sort", "password", "sequence"].includes(T.type) || n && n(T))
       return;
@@ -6057,7 +6057,7 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
     }, O = P(x({}, D), {
       role: "button",
       title: React.createElement(TreeNode, P(x({}, D), { displayType: t })),
-      key: w ? `${w}.${T.name}` : T.name,
+      key: R ? `${R}.${T.name}` : T.name,
       isLeaf: !0,
       field: T
     });
@@ -6072,9 +6072,9 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
       prefix: O.key,
       exclude: ["id", ...systemKeys]
     })), O;
-  }).filter(Boolean), m = (y, { prefix: v, maxDepth: F, depth: I = 0, exclude: w = [] }) => I > F ? [] : o(y).map((T) => {
+  }).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 || w.includes(T.name))
+    if (!T.target || !T.interface || R.includes(T.name))
       return;
     const D = {
       type: "preloading",
@@ -6090,7 +6090,7 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
         prefix: O,
         depth: I + 1,
         maxDepth: F,
-        exclude: w
+        exclude: R
       })
     };
   }).filter(Boolean), h = (y) => y.map((v) => P(x({}, v), {
@@ -6099,11 +6099,11 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
     children: v.children ? h(v.children) : null
   })), g = useCallback((y, v, F) => {
     var T, D;
-    const I = v.index, w = (D = (T = u.initialValue) == null ? void 0 : T.items) == null ? void 0 : D[I];
+    const I = v.index, R = (D = (T = u.initialValue) == null ? void 0 : T.items) == null ? void 0 : D[I];
     if (!y)
       return [];
-    if (w != null && w.treeData || F)
-      return h(F || w.treeData);
+    if (R != null && R.treeData || F)
+      return h(F || R.treeData);
     try {
       return p(y, { exclude: ["id", ...systemKeys], maxDepth: 1 });
     } catch (O) {
@@ -6131,7 +6131,7 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
         const O = a(T.interface);
         if (!(O != null && O.filterable))
           return;
-        const { nested: j, children: N, operators: B } = O.filterable, R = {
+        const { nested: j, children: N, operators: B } = O.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,
@@ -6140,12 +6140,12 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
         };
         if (!(T.target && D > 2)) {
           if (D > 2)
-            return R;
-          if (N != null && N.length && (R.children = N), j) {
+            return w;
+          if (N != null && N.length && (w.children = N), j) {
             const k = o(T.target), z = I(k, D + 1).filter(Boolean);
-            R.children = R.children || [], R.children.push(...z);
+            w.children = w.children || [], w.children.push(...z);
           }
-          return R;
+          return w;
         }
       }, I = (T, D) => {
         const O = [];
@@ -6157,7 +6157,7 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
       return I(v, 1);
     },
     useTitleFieldDataSource: (y) => {
-      const v = y.path.entire.replace("titleField", "collection"), F = y.query(v).get("value"), w = o(F).filter((T) => {
+      const v = y.path.entire.replace("titleField", "collection"), F = y.query(v).get("value"), R = o(F).filter((T) => {
         var D;
         return (D = a(T.interface)) == null ? void 0 : D.titleUsable;
       }).map((T) => {
@@ -6167,7 +6167,7 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
           label: c((D = T == null ? void 0 : T.uiSchema) == null ? void 0 : D.title) || (T == null ? void 0 : T.name)
         };
       });
-      y.dataSource = w;
+      y.dataSource = R;
     }
   };
 };
@@ -6636,7 +6636,7 @@ function useRecordRequest(e) {
         '[nocobase]: The "filterByTk" parameter is missing in the "DataBlockRequestProvider" component'
       );
     const F = r.filterByTk === void 0 ? _.omit(r, "filterByTk") : r;
-    return (I = n[o]) == null ? void 0 : I.call(n, x(x({}, F), v)).then((w) => w.data);
+    return (I = n[o]) == null ? void 0 : I.call(n, x(x({}, F), v)).then((R) => R.data);
   };
   return useRequest((...v) => V(this, null, function* () {
     const [F, I] = yield Promise.all([
@@ -6802,7 +6802,7 @@ const mergeFilter = (e, t = "$and") => {
       r.forEach((h) => {
         var y, v, F, I;
         let g = d;
-        const f = n.find((w) => w.uid === h.uid);
+        const f = n.find((R) => R.uid === h.uid);
         if (!f)
           return;
         _.isFunction(u) && (u = u(f, h, getSourceKey$1(m, f.field))), _.isFunction(d) && (g = d(f, h)), _.isFunction(p) && (p = p(f));
@@ -6820,7 +6820,7 @@ const mergeFilter = (e, t = "$and") => {
         else if ((I = h.clearSelection) == null || I.call(h), delete b[o], h.dataLoadingMode === "manual")
           return h.clearData();
         const S = mergeFilter([
-          ...Object.values(b).map((w) => removeNullCondition(w)),
+          ...Object.values(b).map((R) => removeNullCondition(R)),
           h.defaultFilter
         ]);
         h.doFilter(
@@ -7423,7 +7423,7 @@ const collectFieldStateOfLinkageRules = ({ operator: e, value: t, field: n, cond
     case ActionType.Value:
       {
         const I = () => V(void 0, null, function* () {
-          var w;
+          var R;
           if ((t == null ? void 0 : t.mode) === "express") {
             if ((t.value || t.result) == null)
               return;
@@ -7437,7 +7437,7 @@ const collectFieldStateOfLinkageRules = ({ operator: e, value: t, field: n, cond
               console.error(O);
             }
           } else
-            return (t == null ? void 0 : t.mode) === "constant" ? (w = t == null ? void 0 : t.value) != null ? w : t : null;
+            return (t == null ? void 0 : t.mode) === "constant" ? (R = t == null ? void 0 : t.value) != null ? R : t : null;
         });
         isConditionEmpty(o) ? p.push(getTempFieldState(!0, I())) : p.push(getTempFieldState(conditionAnalyses(h, l), I())), n.stateOfLinkageRules = P(x({}, n.stateOfLinkageRules), {
           value: p
@@ -8553,7 +8553,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: w } = 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: O } = theme.useToken(), j = useNiceDropdownMaxHeight([T]), N = useMemo(
         () => x({
           options: n,
           style: C
@@ -8569,7 +8569,7 @@ function withInitializer(e) {
               padding: 0;
             }
           }
-        `, [O.paddingXXS]), R = useMemo(
+        `, [O.paddingXXS]), w = useMemo(
         () => ({
           maxHeight: j,
           overflowY: "auto"
@@ -8604,7 +8604,7 @@ function withInitializer(e) {
                   open: T,
                   onOpenChange: D,
                   content: F(
-                    /* @__PURE__ */ jsx("div", { className: `${w} ${I}`, style: R, children: /* @__PURE__ */ jsx(
+                    /* @__PURE__ */ jsx("div", { className: `${R} ${I}`, style: w, children: /* @__PURE__ */ jsx(
                       ConfigProvider,
                       {
                         theme: {
@@ -9218,7 +9218,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.6.30", 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.31", 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",
@@ -9240,9 +9240,9 @@ const name = "@nocobase/client", version = "1.6.30", 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.30",
-  "@nocobase/sdk": "1.6.30",
-  "@nocobase/utils": "1.6.30",
+  "@nocobase/evaluators": "1.6.31",
+  "@nocobase/sdk": "1.6.31",
+  "@nocobase/utils": "1.6.31",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -10055,8 +10055,8 @@ function useAssociationFieldContext() {
   return useContext(AssociationFieldContext);
 }
 function useServiceOptions$1(e) {
-  var g, f, C, b, S, y, v, F, I, w;
-  const { action: t = "list", service: n, useOriginalFilter: o } = e, r = useFieldSchema(), i = useField(), { getField: a } = useCollection_deprecated(), { getCollectionJoinField: l } = useCollectionManager_deprecated(), c = useRecord(), u = (isString((C = (f = (g = r == null ? void 0 : r["x-component-props"]) == null ? void 0 : g.service) == null ? void 0 : f.params) == null ? void 0 : C.filter) ? (y = (S = (b = i.componentProps) == null ? void 0 : b.service) == null ? void 0 : S.params) == null ? void 0 : y.filter : (I = (F = (v = r == null ? void 0 : r["x-component-props"]) == null ? void 0 : v.service) == null ? void 0 : F.params) == null ? void 0 : I.filter) || ((w = n == null ? void 0 : n.params) == null ? void 0 : w.filter), { filter: d } = useParsedFilter({ filterOption: u }), p = useMemo(() => a(r.name) || l(r == null ? void 0 : r["x-collection-field"]), [r]), m = c == null ? void 0 : c[p == null ? void 0 : p.sourceKey], h = useMemo(() => {
+  var g, f, C, b, S, y, v, F, I, R;
+  const { action: t = "list", service: n, useOriginalFilter: o } = e, r = useFieldSchema(), i = useField(), { getField: a } = useCollection_deprecated(), { getCollectionJoinField: l } = useCollectionManager_deprecated(), c = useRecord(), u = (isString((C = (f = (g = r == null ? void 0 : r["x-component-props"]) == null ? void 0 : g.service) == null ? void 0 : f.params) == null ? void 0 : C.filter) ? (y = (S = (b = i.componentProps) == null ? void 0 : b.service) == null ? void 0 : S.params) == null ? void 0 : y.filter : (I = (F = (v = r == null ? void 0 : r["x-component-props"]) == null ? void 0 : v.service) == null ? void 0 : F.params) == null ? void 0 : I.filter) || ((R = n == null ? void 0 : n.params) == null ? void 0 : R.filter), { filter: d } = useParsedFilter({ filterOption: u }), p = useMemo(() => a(r.name) || l(r == null ? void 0 : r["x-collection-field"]), [r]), m = c == null ? void 0 : c[p == null ? void 0 : p.sourceKey], h = useMemo(() => {
     const T = ["oho", "o2m"].includes(p == null ? void 0 : p.interface);
     return mergeFilter(
       [
@@ -10265,11 +10265,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, R;
+      var j, N, 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, w = !!((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: O } = (C == null ? void 0 : C.getField(I)) || {};
       return T && (T.default = D), P(x({
         title: /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: h, children: /* @__PURE__ */ jsx(
           b,
@@ -10284,9 +10284,9 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
         dataIndex: I,
         key: v.name,
         sorter: (B = v["x-component-props"]) == null ? void 0 : B.sorter,
-        columnHidden: w
+        columnHidden: R
       }, v["x-component-props"]), {
-        width: w && !a ? 0 : ((R = v["x-component-props"]) == null ? void 0 : R.width) || 100,
+        width: R && !a ? 0 : ((w = v["x-component-props"]) == null ? void 0 : w.width) || 100,
         render: (M, $, k) => /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: h, children: /* @__PURE__ */ jsx(
           TableCellRender,
           {
@@ -10303,10 +10303,10 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
           record: M,
           schema: v,
           rowIndex: $,
-          columnHidden: w
+          columnHidden: R
         }),
         onHeaderCell: () => ({
-          columnHidden: w
+          columnHidden: R
         })
       });
     }),
@@ -10340,13 +10340,13 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
       width: 60,
       align: "center",
       fixed: "right",
-      render: (F, I, w) => {
+      render: (F, I, R) => {
         if (e.showDel(I))
           return /* @__PURE__ */ jsx(
             "div",
             {
               onClick: () => action(() => {
-                const T = (d - 1) * p + w, D = o.value[T] ? 1 : 2;
+                const T = (d - 1) * p + R, D = o.value[T] ? 1 : 2;
                 return spliceArrayState(o, {
                   startIndex: T,
                   deleteCount: D
@@ -10396,7 +10396,7 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
   const o = e, { index: t } = o, n = Y(o, ["index"]);
   return /* @__PURE__ */ jsx("div", P(x({ className: cls("nb-table-index"), style: { padding: "0 8px 0 16px" } }, n), { children: t }));
 }, pageSizeOptions$3 = [5, 10, 20, 50, 100, 200], usePaginationProps$3 = (e, t, n) => {
-  var S, y, v, F, I, w;
+  var S, y, v, F, I, R;
   const { t: o } = useTranslation();
   useField();
   const { token: r } = useToken$1(), { meta: i } = useDataBlockRequestData() || {}, { hasNext: a } = i || {}, l = useMemo(
@@ -10443,7 +10443,7 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
       ) : j
     });
   }, [l, o, f, (I = n.value) == null ? void 0 : I.length, C]);
-  return t === !1 || !t && e === !1 ? !1 : ((w = n.value) == null ? void 0 : w.length) > 0 || b.total ? b : !1;
+  return t === !1 || !t && e === !1 ? !1 : ((R = n.value) == null ? void 0 : R.length) > 0 || b.total ? b : !1;
 }, headerClass$1 = css`
   max-width: 300px;
   white-space: nowrap;
@@ -10667,7 +10667,7 @@ const Table$2 = withDynamicSchemaProps(
         "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), [R, M] = useState(() => D ? O : []), [$, k] = useState(((be = y == null ? void 0 : y.data) == null ? void 0 : be.selectedRowKeys) || []), [z, E] = useState([]), q = (p == null ? void 0 : p.type) !== "none", L = useRef(/* @__PURE__ */ new Map()), G = useMemo(() => css`
+      })), 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, E] = useState([]), q = (p == null ? void 0 : p.type) !== "none", L = useRef(/* @__PURE__ */ new Map()), G = useMemo(() => css`
           & > td {
             background-color: ${t.controlItemBgActive} !important;
           }
@@ -10693,7 +10693,7 @@ const Table$2 = withDynamicSchemaProps(
       }), [C, z]);
       useDeepCompareEffect(() => {
         const Q = D ? O : [];
-        _.isEqual(Q, R) || M(Q);
+        _.isEqual(Q, w) || M(Q);
       }, [D, O]);
       const K = useCallback((Q) => {
         if (m)
@@ -10821,14 +10821,14 @@ const Table$2 = withDynamicSchemaProps(
         [z, H, JSON.stringify(m)]
       ), he = useCallback(
         (Q, te) => {
-          const oe = Q ? [...R, te[I.getPrimaryKey()]] : R.filter((ie) => te[I.getPrimaryKey()] !== ie);
+          const oe = Q ? [...w, te[I.getPrimaryKey()]] : w.filter((ie) => te[I.getPrimaryKey()] !== ie);
           M(oe), g == null || g(Q, te);
         },
-        [R, g, I]
+        [w, g, I]
       ), ge = useMemo(() => ({
         onExpand: he,
-        expandedRowKeys: R
-      }), [R, he]);
+        expandedRowKeys: w
+      }), [w, he]);
       return (
         // If spinning is set to undefined, it will cause the subtable to always display loading, so we need to convert it here.
         // We use Spin here instead of Table's loading prop because using Spin here reduces unnecessary re-renders.
@@ -10884,64 +10884,67 @@ const InternalTableBlockProvider = (e) => {
     childrenColumnName: i,
     expandFlag: a = !1,
     fieldNames: l,
-    collection: c
-  } = e, u = useField(), { resource: d, service: p } = useBlockRequestContext(), m = useFieldSchema(), [h, g] = useState(!!(l || a)), { heightProps: f } = useBlockHeightProps(), C = useRef(null);
+    collection: c,
+    association: u
+  } = e, d = useField(), { resource: p, service: m } = useBlockRequestContext(), h = useFieldSchema(), [g, f] = useState(!!(l || a)), { heightProps: C } = useBlockHeightProps(), b = useRef(null);
   useEffect(() => {
-    g(l || a);
+    f(l || a);
   }, [l || a]);
-  const b = useMemo(() => {
-    var w;
-    const { treeTable: F } = (m == null ? void 0 : m["x-decorator-props"]) || {}, I = (w = p == null ? void 0 : p.data) == null ? void 0 : w.data;
-    if (F)
-      return getIdsWithChildren(I);
-  }, [p == null ? void 0 : p.loading, m]), S = useCallback(
-    (F) => {
-      g(F || !h);
+  const S = useMemo(() => {
+    var T;
+    const { treeTable: I } = (h == null ? void 0 : h["x-decorator-props"]) || {}, R = (T = m == null ? void 0 : m.data) == null ? void 0 : T.data;
+    if (I)
+      return getIdsWithChildren(R);
+  }, [m == null ? void 0 : m.loading, h]), y = useCallback(
+    (I) => {
+      f(I || !g);
     },
-    [h]
-  ), y = useMemo(
+    [g]
+  ), v = useMemo(
     () => ({
-      field: u,
+      field: d,
       rowKey: r,
       childrenColumnName: i,
       showIndex: n,
       dragSort: o,
       dragSortBy: e.dragSortBy
     }),
-    [u, r, i, n, o, e.dragSortBy]
-  ), v = useMemo(
+    [d, r, i, n, o, e.dragSortBy]
+  ), F = useMemo(
     () => ({
       collection: c,
-      field: u,
-      service: p,
-      resource: d,
+      field: d,
+      service: m,
+      resource: p,
       params: t,
       showIndex: n,
       dragSort: o,
       rowKey: r,
-      expandFlag: h,
+      expandFlag: g,
       childrenColumnName: i,
-      allIncludesChildren: b,
-      setExpandFlag: S,
-      heightProps: f
+      allIncludesChildren: S,
+      setExpandFlag: y,
+      heightProps: C,
+      association: u
     }),
     [
-      b,
+      S,
       i,
       c,
       o,
-      h,
-      u,
-      f,
-      t,
+      g,
       d,
-      r,
+      C,
+      t,
       p,
-      S,
-      n
+      r,
+      m,
+      y,
+      n,
+      u
     ]
   );
-  return /* @__PURE__ */ jsx(TableElementRefContext.Provider, { value: C, children: /* @__PURE__ */ jsx(TableBlockContext.Provider, { value: v, children: /* @__PURE__ */ jsx(TableBlockContextBasicValue.Provider, { value: y, children: e.children }) }) });
+  return /* @__PURE__ */ jsx(TableElementRefContext.Provider, { value: b, children: /* @__PURE__ */ jsx(TableBlockContext.Provider, { value: F, children: /* @__PURE__ */ jsx(TableBlockContextBasicValue.Provider, { value: v, children: e.children }) }) });
 }, useTableBlockParamsCompat = (e) => {
   const t = useFieldSchema();
   let n, o = !1;
@@ -11419,14 +11422,14 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
   ].filter(Boolean).map((c) => encodePathValue(c)).join("/")}`;
 }, usePopupUtils = (e = {}) => {
   const t = useNavigateNoUpdate(), n = useLocationNoUpdate(), o = useFieldSchema(), r = useDataSourceKey(), i = useCollectionRecord(), a = useCollectionParentRecord(), l = useCollection(), c = useCollectionManager(), u = useAssociationName(), { visible: d, setVisible: p } = useContext(PopupVisibleProviderContext) || { visible: !1, setVisible: _.noop }, { params: m, currentLevel: h = 0 } = useCurrentPopupContext(), { getDataBlockRequest: g } = useDataBlockRequestGetter(), { isPopupVisibleControlledByURL: f } = usePopupSettings(), { setVisible: C } = useContext(ActionContext), { updatePopupContext: b } = usePopupContextInActionOrAssociationField(), S = useCurrentPopupContext(), y = useCallback(
-    (R) => {
+    (w) => {
       var M;
-      return (M = R || (a == null ? void 0 : a.data)) == null ? void 0 : M[c.getSourceKeyByAssociation(u)];
+      return (M = w || (a == null ? void 0 : a.data)) == null ? void 0 : M[c.getSourceKeyByAssociation(u)];
     },
     [a, u]
-  ), v = useDataBlockRequestData(), F = useTableBlockContextBasicValue() || {}, I = e.setVisible || C, w = useCallback(
+  ), v = useDataBlockRequestData(), F = useTableBlockContextBasicValue() || {}, I = e.setVisible || C, R = useCallback(
     ({
-      tabKey: R,
+      tabKey: w,
       popupUid: M,
       recordData: $,
       sourceId: k,
@@ -11440,20 +11443,20 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
         collection: z,
         filterbytk: q,
         sourceid: k,
-        tab: R
+        tab: w
       });
     },
     [u, c, l, r, a == null ? void 0 : a.data, u]
   ), T = useCallback(() => {
-    const R = {
+    const w = {
       dataSource: r,
       collection: u || l == null ? void 0 : l.name,
       association: u
     };
-    return _.omitBy(R, _.isNil);
+    return _.omitBy(w, _.isNil);
   }, [r, l, u]), D = useCallback(
     ({
-      recordData: R,
+      recordData: w,
       parentRecordData: M,
       collectionNameUsedInURL: $,
       popupUidUsedInURL: k,
@@ -11462,10 +11465,10 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
       if (!f())
         return I == null ? void 0 : I(!0);
       const E = z || o, q = E == null ? void 0 : E["x-uid"], L = y(M);
-      R = R || (i == null ? void 0 : i.data);
-      const G = w({
+      w = w || (i == null ? void 0 : i.data);
+      const G = R({
         popupUid: q,
-        recordData: R,
+        recordData: w,
         sourceId: L,
         collection: $,
         puid: k
@@ -11473,7 +11476,7 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
       let U = n.pathname;
       if (_.last(U) === "/" && (U = U.slice(0, -1)), storePopupContext(q, {
         schema: E,
-        record: new CollectionRecord({ isNew: !1, data: R }),
+        record: new CollectionRecord({ isNew: !1, data: w }),
         parentRecord: M ? new CollectionRecord({ isNew: !1, data: M }) : a,
         service: g(),
         dataSource: r,
@@ -11498,7 +11501,7 @@ ${JSON.stringify(E, null, 2)}`
       l,
       r,
       o,
-      w,
+      R,
       t,
       a,
       i,
@@ -11523,9 +11526,9 @@ ${JSON.stringify(E, null, 2)}`
     h,
     m == null ? void 0 : m.popupuid
   ]), j = useCallback(
-    (R) => {
-      const M = y(), $ = w({
-        tabKey: R,
+    (w) => {
+      const M = y(), $ = R({
+        tabKey: w,
         popupUid: m == null ? void 0 : m.popupuid,
         recordData: i == null ? void 0 : i.data,
         sourceId: M
@@ -11535,10 +11538,10 @@ ${JSON.stringify(E, null, 2)}`
         replace: !0
       });
     },
-    [w, t, m == null ? void 0 : m.popupuid, i == null ? void 0 : i.data, n]
-  ), N = useCallback((R, M) => {
-    M.__popup = R;
-  }, []), B = useCallback((R) => R.__popup, []);
+    [R, t, m == null ? void 0 : m.popupuid, i == null ? void 0 : i.data, n]
+  ), N = useCallback((w, M) => {
+    M.__popup = w;
+  }, []), B = useCallback((w) => w.__popup, []);
   return {
     /**
      * used to open popup by changing the url
@@ -12001,7 +12004,7 @@ const DrawerErrorFallback = (e) => {
 ActionDrawerContent.displayName = "ActionDrawerContent";
 const InternalActionDrawer = observer$1(
   (e) => {
-    const F = e, { footerNodeName: t = "Action.Drawer.Footer", zIndex: n, onClose: o } = F, r = Y(F, ["footerNodeName", "zIndex", "onClose"]), { visible: i, setVisible: a, openSize: l = "middle", drawerProps: c } = useActionContext(), u = useFieldSchema(), d = useField(), { componentCls: p, hashId: m } = useStyles$h(), h = useTabsContext(), g = useZIndexContext(), f = u.reduceProperties((I, w) => w["x-component"] === t ? w : I), { hidden: C } = useCurrentPopupContext(), b = useMemo(() => P(x(x({}, c == null ? void 0 : c.style), r == null ? void 0 : r.style), {
+    const F = e, { footerNodeName: t = "Action.Drawer.Footer", zIndex: n, onClose: o } = F, r = Y(F, ["footerNodeName", "zIndex", "onClose"]), { visible: i, setVisible: a, openSize: l = "middle", drawerProps: c } = useActionContext(), u = useFieldSchema(), d = useField(), { componentCls: p, hashId: m } = useStyles$h(), h = useTabsContext(), g = useZIndexContext(), f = u.reduceProperties((I, R) => R["x-component"] === t ? R : I), { hidden: C } = useCurrentPopupContext(), b = useMemo(() => P(x(x({}, c == null ? void 0 : c.style), r == null ? void 0 : r.style), {
       display: C ? "none" : "block"
     }), [C, c == null ? void 0 : c.style, r == null ? void 0 : r.style]), S = getZIndex("drawer", n || g, e.level || 0), y = useCallback(
       (I) => {
@@ -12111,7 +12114,7 @@ function useDelayedVisible(e, t = 200) {
 }
 const InternalActionModal = observer$1(
   (e) => {
-    const F = e, { footerNodeName: t = "Action.Modal.Footer", width: n, zIndex: o, delay: r = 200 } = F, i = Y(F, ["footerNodeName", "width", "zIndex", "delay"]), { visible: a, setVisible: l, openSize: c = "middle", modalProps: u } = useActionContext(), d = n != null ? n : openSizeWidthMap.get(c), p = useFieldSchema(), m = useField(), { token: h } = useToken(), g = useTabsContext(), f = useZIndexContext(), C = p.reduceProperties((I, w) => w["x-component"] === t ? w : I), { hidden: b } = useCurrentPopupContext(), S = !!C, y = getZIndex("modal", o || f, e.level || 0), v = useDelayedVisible(a, r);
+    const F = e, { footerNodeName: t = "Action.Modal.Footer", width: n, zIndex: o, delay: r = 200 } = F, i = Y(F, ["footerNodeName", "width", "zIndex", "delay"]), { visible: a, setVisible: l, openSize: c = "middle", modalProps: u } = useActionContext(), d = n != null ? n : openSizeWidthMap.get(c), p = useFieldSchema(), m = useField(), { token: h } = useToken(), g = useTabsContext(), f = useZIndexContext(), C = p.reduceProperties((I, R) => R["x-component"] === t ? R : I), { hidden: b } = useCurrentPopupContext(), S = !!C, y = getZIndex("modal", o || f, e.level || 0), v = useDelayedVisible(a, r);
     return /* @__PURE__ */ jsx(ActionContextNoRerender, { children: /* @__PURE__ */ jsx(zIndexContext.Provider, { value: y, children: /* @__PURE__ */ jsx(TabsContextProvider, P(x({}, g), { tabBarExtraContent: null, children: /* @__PURE__ */ jsx(
       Modal,
       P(x(x({
@@ -13105,7 +13108,7 @@ https://requirejs.org/docs/errors.html#` + e);
       var z = k.id, E = getOwn(l, z);
       return E || (E = l[z] = new o.Module(k)), E;
     }
-    function w(k, z, E) {
+    function R(k, z, E) {
       var q = k.id, L = getOwn(l, q);
       hasProp(p, q) && (!L || L.defineEmitComplete) ? z === "defined" && E(p[q]) : (L = I(k), L.error && z === "error" ? E(L.error) : L.on(z, E));
     }
@@ -13240,7 +13243,7 @@ https://requirejs.org/docs/errors.html#` + e);
       },
       callPlugin: function() {
         var k = this.map, z = k.id, E = F(k.prefix);
-        this.depMaps.push(E), w(E, "defined", bind(this, function(q) {
+        this.depMaps.push(E), R(E, "defined", bind(this, function(q) {
           var L, G, U, H = getOwn(h, this.map.id), J = this.map.name, K = this.map.parentMap ? this.map.parentMap.name : null, W = o.makeRequire(k.parentMap, {
             enableBuildCallback: !0
           });
@@ -13251,7 +13254,7 @@ https://requirejs.org/docs/errors.html#` + e);
               k.prefix + "!" + J,
               this.map.parentMap,
               !0
-            ), w(
+            ), R(
               G,
               "defined",
               bind(this, function(X) {
@@ -13311,9 +13314,9 @@ https://requirejs.org/docs/errors.html#` + e);
               this.depExports[z] = L(this);
               return;
             }
-            this.depCount += 1, w(k, "defined", bind(this, function(G) {
+            this.depCount += 1, R(k, "defined", bind(this, function(G) {
               this.undefed || (this.defineDep(z, G), this.check());
-            })), this.errback ? w(k, "error", bind(this, this.errback)) : this.events.error && w(k, "error", bind(this, function(G) {
+            })), this.errback ? R(k, "error", bind(this, this.errback)) : this.events.error && R(k, "error", bind(this, function(G) {
               this.emit("error", G);
             }));
           }
@@ -13336,12 +13339,12 @@ https://requirejs.org/docs/errors.html#` + e);
     function B(k) {
       hasProp(p, k[0]) || I(F(k[0], null, !0)).init(k[1], k[2]);
     }
-    function R(k, z, E, q) {
+    function w(k, z, E, q) {
       k.detachEvent && !isOpera ? q && k.detachEvent(q, z) : k.removeEventListener(E, z, !1);
     }
     function M(k) {
       var z = k.currentTarget || k.srcElement;
-      return R(z, o.onScriptLoad, "load", "onreadystatechange"), R(z, o.onScriptError, "error"), {
+      return w(z, o.onScriptLoad, "load", "onreadystatechange"), w(z, o.onScriptError, "error"), {
         node: z,
         id: z && z.getAttribute("data-requiremodule")
       };
@@ -15060,8 +15063,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, w, 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 = (w = a == null ? void 0 : a.data) == null ? void 0 : w.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, 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;
       if (!l || !c) {
         e == null || e(r);
         return;
@@ -15077,7 +15080,7 @@ const useDragEnd = (e) => {
       const g = createDesignable({
         t: o,
         api: n,
-        refresh: ({ refreshParentSchema: R = !0 } = {}) => t({ refreshParentSchema: R }),
+        refresh: ({ refreshParentSchema: w = !0 } = {}) => t({ refreshParentSchema: w }),
         current: c
       });
       if (g.loadAPIClientEvents(), l.parent === c.parent) {
@@ -15175,14 +15178,14 @@ GridColContext.displayName = "GridColContext";
 const GridContext = createContext({});
 GridContext.displayName = "GridContext";
 const breakRemoveOnGrid = (e) => e["x-component"] === "Grid", breakRemoveOnRow = (e) => e["x-component"] === "Grid.Row", ColDivider = (e) => {
-  var F, I, w;
+  var F, I, R;
   const { token: t } = useToken$1(), n = useRef(null), { dn: o, designable: r } = useDesignable(), { isOver: i, setNodeRef: a } = useDroppable({
     id: e.id,
     data: e.data,
     disabled: !r
   }), l = useRef(), c = useMemo(() => i ? {
     backgroundColor: new TinyColor(t.colorSettings).setAlpha(0.1).toHex8String()
-  } : {}, [i]), d = (w = (I = (F = useDndContext().active) == null ? void 0 : F.data.current) == null ? void 0 : I.schema) == null ? void 0 : w.parent, p = useMemo(
+  } : {}, [i]), d = (R = (I = (F = useDndContext().active) == null ? void 0 : F.data.current) == null ? void 0 : I.schema) == null ? void 0 : R.parent, p = useMemo(
     () => d ? Object.keys(d.properties).length : 0,
     [d]
   );
@@ -15229,8 +15232,8 @@ const breakRemoveOnGrid = (e) => e["x-component"] === "Grid", breakRemoveOnRow =
         return;
       const D = l.current, O = D.previousElementSibling, j = D.nextElementSibling;
       h["x-component-props"] = h["x-component-props"] || {}, g["x-component-props"] = g["x-component-props"] || {};
-      const N = D.clientWidth * (e.cols.length + 1) / e.cols.length, B = (100 * (O.getBoundingClientRect().width + N) / D.parentElement.clientWidth).toFixed(2), R = (100 * (j.getBoundingClientRect().width + N) / D.parentElement.clientWidth).toFixed(2);
-      _.set(h, "x-component-props.width", B), _.set(g, "x-component-props.width", R), o.emit("batchPatch", {
+      const N = D.clientWidth * (e.cols.length + 1) / e.cols.length, B = (100 * (O.getBoundingClientRect().width + N) / D.parentElement.clientWidth).toFixed(2), w = (100 * (j.getBoundingClientRect().width + N) / D.parentElement.clientWidth).toFixed(2);
+      _.set(h, "x-component-props.width", B), _.set(g, "x-component-props.width", w), o.emit("batchPatch", {
         schemas: [
           {
             "x-uid": h["x-uid"],
@@ -15544,32 +15547,32 @@ const useTableBlockProps = () => {
     ),
     onChange: useCallback(
       ({ current: S, pageSize: y }, v, F) => {
-        var O, j, N, B, R, M, $, k, z, E;
-        const I = (N = (j = (O = t.parent) == null ? void 0 : O["x-decorator-props"]) == null ? void 0 : j.params) == null ? void 0 : N.sort, w = F.order ? F.order === "ascend" ? [F.field] : [`-${F.field}`] : I || i.dragSortBy, T = y || ((M = (R = (B = t.parent) == null ? void 0 : B["x-decorator-props"]) == null ? void 0 : R.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 });
-        w && (D.sort = w), (E = a.current) == null || E.service.run(D);
+        var O, j, N, B, w, M, $, k, z, E;
+        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 });
+        R && (D.sort = R), (E = a.current) == null || E.service.run(D);
       },
       [t.parent]
     ),
     onClickRow: useCallback(
       (S, y, v) => {
-        const { targets: F, uid: I } = findFilterTargets(t), w = r();
-        if (!F || !F.some((D) => w.some((O) => O.uid === D.uid))) {
+        const { targets: F, uid: I } = findFilterTargets(t), R = r();
+        if (!F || !F.some((D) => R.some((O) => O.uid === D.uid))) {
           y((D) => D.length ? [] : D);
           return;
         }
-        const T = w.find((D) => D.uid === t.parent["x-uid"]);
-        w.forEach((D) => {
+        const T = R.find((D) => D.uid === t.parent["x-uid"]);
+        R.forEach((D) => {
           var $, k, z, E;
           const O = F.find((q) => q.uid === D.uid);
           if (!O)
             return;
-          const j = getSourceKey(T, O.field) || i.rowKey || "id", N = [S[j]], B = (($ = D.service.params) == null ? void 0 : $[0]) || {}, R = ((z = (k = D.service.params) == null ? void 0 : k[1]) == null ? void 0 : z.filters) || {};
+          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) || {};
           if (v.includes(S[i.rowKey])) {
             if ((E = D.clearSelection) == null || E.call(D), D.dataLoadingMode === "manual")
               return D.clearData();
-            delete R[I];
+            delete w[I];
           } else
-            R[I] = {
+            w[I] = {
               $and: [
                 {
                   [O.field || i.rowKey]: {
@@ -15579,7 +15582,7 @@ const useTableBlockProps = () => {
               ]
             };
           const M = mergeFilter([
-            ...Object.values(R).map((q) => removeNullCondition(q)),
+            ...Object.values(w).map((q) => removeNullCondition(q)),
             D.defaultFilter
           ]);
           return D.doFilter(
@@ -15587,7 +15590,7 @@ const useTableBlockProps = () => {
               page: 1,
               filter: M
             }),
-            { filters: R }
+            { filters: w }
           );
         }), y(
           (D) => D != null && D.includes(S[i.rowKey]) ? [] : [S[i.rowKey]]
@@ -15670,12 +15673,12 @@ const NOOP = () => {
       return;
     const v = t(i);
     if (setFieldProps(n, "content", v["x-content"]), setFieldProps(n, "title", v.title), setFieldProps(n, "description", v.description), m != null && m.form) {
-      const w = c() ? o.default || a : void 0;
-      w != null && setFieldProps(n, "initialValue", w);
+      const R = c() ? o.default || a : void 0;
+      R != null && setFieldProps(n, "initialValue", R);
     }
     if (!n.validator && (v["x-validator"] || o["x-validator"])) {
-      const w = concat([], v["x-validator"] || [], o["x-validator"] || []);
-      n.validator = w;
+      const R = concat([], v["x-validator"] || [], o["x-validator"] || []);
+      n.validator = R;
     }
     o["x-disabled"] === !0 && (n.disabled = !0), o["x-read-pretty"] === !0 && (n.readPretty = !0), setRequired(n, o, v), n.dataSource = v.enum;
     const F = t(x(x(x({}, ((I = d == null ? void 0 : d.schema) == null ? void 0 : I["x-component-props"]) || {}), v["x-component-props"] || {}), (o == null ? void 0 : o["x-component-props"]) || {})) || {};
@@ -15971,10 +15974,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 w, T, D, O, j, N, B, R, M, $, k, z, E;
-    if (!((w = t == null ? void 0 : t.service) != null && w.loading)) {
+    var R, T, D, O, j, N, B, w, M, $, k, z, E;
+    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((L) => L);
-      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 = (R = t == null ? void 0 : t.service) == null ? void 0 : R.data) == null ? void 0 : M.meta) == null ? void 0 : $.count, e.componentProps.pagination.current = (E = (z = (k = t == null ? void 0 : t.service) == null ? void 0 : k.data) == null ? void 0 : z.meta) == null ? void 0 : E.page;
+      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 = (E = (z = (k = t == null ? void 0 : t.service) == null ? void 0 : k.data) == null ? void 0 : z.meta) == null ? void 0 : E.page;
     }
   }, [
     i == null ? void 0 : i.foreignKey,
@@ -15991,21 +15994,21 @@ const useTableSelectorParams = () => useContext(TableSelectorParamsContext), Tab
     dragSort: !1,
     rowKey: t.rowKey || "id",
     pagination: ((F = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : F.pagination) === !1 ? !1 : e.componentProps.pagination,
-    onRowSelectionChange(w, T) {
+    onRowSelectionChange(R, T) {
       var D;
-      t.field.data = ((D = t == null ? void 0 : t.field) == null ? void 0 : D.data) || {}, t.field.data.selectedRowKeys = w, t.field.data.selectedRowData = T;
+      t.field.data = ((D = t == null ? void 0 : t.field) == null ? void 0 : D.data) || {}, t.field.data.selectedRowKeys = R, t.field.data.selectedRowData = T;
     },
     onRowDragEnd(D) {
-      return V(this, arguments, function* ({ from: w, to: T }) {
+      return V(this, arguments, function* ({ from: R, to: T }) {
         yield t.resource.move({
-          sourceId: w[t.rowKey || "id"],
+          sourceId: R[t.rowKey || "id"],
           targetId: T[t.rowKey || "id"]
         }), t.service.refresh();
       });
     },
-    onChange({ current: w, pageSize: T }) {
+    onChange({ current: R, pageSize: T }) {
       var D;
-      t.service.run(P(x({}, (D = t.service.params) == null ? void 0 : D[0]), { page: w, pageSize: T }));
+      t.service.run(P(x({}, (D = t.service.params) == null ? void 0 : D[0]), { page: R, pageSize: T }));
     }
   };
 }, BlockSchemaComponentProvider = (e) => /* @__PURE__ */ jsx(
@@ -16757,7 +16760,7 @@ const useFormItemInitializerFields = (e) => {
   var d, p;
   const { name: t, currentFields: n } = useCollection_deprecated(), { getInterface: o, getCollection: r } = useCollectionManager_deprecated(), i = useForm(), { readPretty: a = i.readPretty, block: l = "Form" } = e || {}, { fieldSchema: c } = useActionContext(), u = c == null ? void 0 : c["x-action"];
   return (p = (d = n.filter((m) => !m.collectionName || m.collectionName === t)) == null ? void 0 : d.filter((m) => (m == null ? void 0 : m.interface) && !(m != null && m.treeChildren))) == null ? void 0 : p.map((m) => {
-    var v, F, I, w, T;
+    var v, F, I, R, T;
     const h = o(m.interface), g = r(m.target), f = (m == null ? void 0 : m.target) && ((v = r(m == null ? void 0 : m.target)) == null ? void 0 : v.template) === "file", C = g, b = (I = (F = m == null ? void 0 : m.uiSchema) == null ? void 0 : F["x-component-props"]) == null ? void 0 : I.fieldNames, S = {
       type: "string",
       name: m.name,
@@ -16774,7 +16777,7 @@ const useFormItemInitializerFields = (e) => {
       } : C && b ? {
         fieldNames: P(x({}, b), { label: (g == null ? void 0 : g.titleField) || b.label })
       } : {},
-      "x-read-pretty": (w = m == null ? void 0 : m.uiSchema) == null ? void 0 : w["x-read-pretty"]
+      "x-read-pretty": (R = m == null ? void 0 : m.uiSchema) == null ? void 0 : R["x-read-pretty"]
     }, y = {
       type: "item",
       name: m.name,
@@ -16943,9 +16946,9 @@ const useFormItemInitializerFields = (e) => {
           title: ((I = f == null ? void 0 : f.uiSchema) == null ? void 0 : I.title) || f.name,
           Component: "CollectionFieldInitializer",
           remove: removeGridFormItem,
-          schemaInitialize: (w) => {
+          schemaInitialize: (R) => {
             var T;
-            (T = C == null ? void 0 : C.schemaInitialize) == null || T.call(C, w, {
+            (T = C == null ? void 0 : C.schemaInitialize) == null || T.call(C, R, {
               field: f,
               block: p,
               readPretty: d,
@@ -16991,8 +16994,8 @@ const useFormItemInitializerFields = (e) => {
           Component: "CollectionFieldInitializer",
           remove: removeGridFormItem,
           schemaInitialize: (I) => {
-            var w;
-            (w = f == null ? void 0 : f.schemaInitialize) == null || w.call(f, I, {
+            var R;
+            (R = f == null ? void 0 : f.schemaInitialize) == null || R.call(f, I, {
               field: g,
               block: p,
               readPretty: d,
@@ -17141,9 +17144,9 @@ const useFormItemInitializerFields = (e) => {
     filterDataSource: i
   });
   o && (y = y.filter((I) => I.key === f));
-  const { getTemplatesByCollection: v } = useSchemaTemplateManager(), F = useMemo(() => y.map(({ key: I, displayName: w, collections: T }) => ({
+  const { getTemplatesByCollection: v } = useSchemaTemplateManager(), F = useMemo(() => y.map(({ key: I, displayName: R, collections: T }) => ({
     name: I,
-    label: w,
+    label: R,
     type: "subMenu",
     children: [
       ...getChildren$1({
@@ -17181,7 +17184,7 @@ const useFormItemInitializerFields = (e) => {
         hideChildrenIfSingleCollection: !0,
         items: F
       })
-    }, w = {
+    }, R = {
       name: "associationRecords",
       Component: DataBlockInitializer,
       // 目的是使点击无效
@@ -17220,7 +17223,7 @@ const useFormItemInitializerFields = (e) => {
         hideChildrenIfSingleCollection: !1,
         fromOthersInPopup: !0,
         componentType: T[t] || t,
-        filter({ collection: B, associationField: R }) {
+        filter({ collection: B, associationField: w }) {
           return u ? u(B) : !0;
         },
         onClick(B) {
@@ -17229,7 +17232,7 @@ const useFormItemInitializerFields = (e) => {
       })
     };
     let O;
-    const j = b.length ? w : null;
+    const j = b.length ? R : null;
     if (F[0].children.length && b.length)
       l ? O = [I, j] : O = [I, j, D];
     else if (F[0].children.length)
@@ -17704,9 +17707,9 @@ function getGroupItemForForm({
       title: ((I = C == null ? void 0 : C.uiSchema) == null ? void 0 : I.title) || C.name,
       Component: "CollectionFieldInitializer",
       remove: removeGridFormItem,
-      schemaInitialize: (w) => {
+      schemaInitialize: (R) => {
         var T;
-        (T = b == null ? void 0 : b.schemaInitialize) == null || T.call(b, w, {
+        (T = b == null ? void 0 : b.schemaInitialize) == null || T.call(b, R, {
           field: C,
           block: i,
           readPretty: r,
@@ -17977,7 +17980,7 @@ const useGetAriaLabelOfDesigner = () => {
   }, { render: C, exists: b } = useSchemaSettingsRender(
     t["x-settings"] || i,
     t["x-settings-props"]
-  ), S = useGridRowContext(), y = useGridContext(), v = useDataSourceManager(), F = v == null ? void 0 : v.getDataSources(), I = useDataSource(), w = (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(() => {
+  ), 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;
     return {
       insertPosition: "afterEnd",
@@ -17994,7 +17997,7 @@ const useGetAriaLabelOfDesigner = () => {
   }, [g, (O = S == null ? void 0 : S.cols) == null ? void 0 : O.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 && w ? `${h(w == null ? void 0 : w.displayName)} > ${h(o)}` : h(o) }),
+      /* @__PURE__ */ jsx("span", { className: "title-tag", children: c && R ? `${h(R == null ? void 0 : R.displayName)} > ${h(o)}` : h(o) }),
       r && /* @__PURE__ */ jsxs("span", { className: "title-tag", children: [
         m("Reference template"),
         ": ",
@@ -18037,7 +18040,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(), w = useDataSource(), T = (I == null ? void 0 : I.length) > 1 && w, 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(), O = useCallback(() => {
     D({ refreshParentSchema: !0 });
   }, [D]), j = useMemo(() => {
     if (n) {
@@ -18049,7 +18052,7 @@ const useGetAriaLabelOfDesigner = () => {
   }, [n]), { render: N, exists: B } = useSchemaSettingsRender(
     r || (t == null ? void 0 : t["x-settings"]),
     t == null ? void 0 : t["x-settings-props"]
-  ), { render: R, exists: M } = useSchemaInitializerRender(
+  ), { render: w, exists: M } = useSchemaInitializerRender(
     o || (t == null ? void 0 : t["x-initializer"]),
     t == null ? void 0 : t["x-initializer-props"]
   ), $ = useGridRowContext(), k = useGridContext(), z = useMemo(() => {
@@ -18071,10 +18074,10 @@ const useGetAriaLabelOfDesigner = () => {
     if (o === !1)
       return null;
     if (M)
-      return R(z);
+      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, R]), L = useMemo(() => r !== !1 && B ? N() : null, [B, N, r]), G = useRef(null), U = "hidden";
+  }, [k, o, z, M, w]), L = useMemo(() => r !== !1 && B ? N() : null, [B, N, r]), G = useRef(null), U = "hidden";
   useEffect(() => {
     const K = G.current;
     let W = K == null ? void 0 : K.parentElement;
@@ -18151,23 +18154,23 @@ const SchemaToolbarErrorFallback = (e) => {
 }, useCollectionManager_deprecated = (e) => {
   const t = useDataSourceManager(), n = useDataSource(), o = useCollectionManager(), r = e || (n == null ? void 0 : n.key) || void 0, [i, a] = useState(uid()), { refresh: l } = useSchemaComponentContext(), c = useMemo(
     () => {
-      var R;
-      return (R = t == null ? void 0 : t.collectionFieldInterfaceManager) == null ? void 0 : R.getFieldInterfaces().reduce((M, $) => (M[$.name] = $, M), {});
+      var w;
+      return (w = t == null ? void 0 : t.collectionFieldInterfaceManager) == null ? void 0 : w.getFieldInterfaces().reduce((M, $) => (M[$.name] = $, M), {});
     },
     [t, i]
   ), u = useMemo(() => t == null ? void 0 : t.collectionTemplateManager.getCollectionTemplates(), [t, i]), d = useCallback(() => {
-    var R, M;
-    return (M = (R = t == null ? void 0 : t.getDataSource(r)) == null ? void 0 : R.collectionManager) == null ? void 0 : M.getCollections().map(($) => $.getOptions());
+    var w, M;
+    return (M = (w = t == null ? void 0 : t.getDataSource(r)) == null ? void 0 : w.collectionManager) == null ? void 0 : M.getCollections().map(($) => $.getOptions());
   }, [t, n]), p = useCallback(
-    (R) => {
+    (w) => {
       var M;
-      return o && !R ? o : (M = t == null ? void 0 : t.getDataSource(R || r)) == null ? void 0 : M.collectionManager;
+      return o && !w ? o : (M = t == null ? void 0 : t.getDataSource(w || r)) == null ? void 0 : M.collectionManager;
     },
     [o, t, r]
   ), m = useMemo(
     () => {
-      var R, M;
-      return (M = (R = t == null ? void 0 : t.getDataSource(DEFAULT_DATA_SOURCE_KEY)) == null ? void 0 : R.collectionManager) == null ? void 0 : M.getCollections();
+      var w, M;
+      return (M = (w = t == null ? void 0 : t.getDataSource(DEFAULT_DATA_SOURCE_KEY)) == null ? void 0 : w.collectionManager) == null ? void 0 : M.getCollections();
     },
     [t, i]
   ), h = useCallback(
@@ -18181,55 +18184,55 @@ const SchemaToolbarErrorFallback = (e) => {
     }),
     [t]
   ), f = useCompile(), C = useCallback(
-    (R, M) => {
+    (w, M) => {
       var $, k;
-      return ((k = ($ = p(M)) == null ? void 0 : $.getCollection(R)) == null ? void 0 : k.getInheritedFields()) || [];
+      return ((k = ($ = p(M)) == null ? void 0 : $.getCollection(w)) == null ? void 0 : k.getInheritedFields()) || [];
     },
     [t, p]
   ), b = useCallback(
-    (R, M) => {
+    (w, M) => {
       var k, z;
-      if (!R)
+      if (!w)
         return [];
-      const $ = (k = p(M)) == null ? void 0 : k.getCollection(R);
+      const $ = (k = p(M)) == null ? void 0 : k.getCollection(w);
       return ((z = $ == null ? void 0 : $.getAllFields) == null ? void 0 : z.call($)) || ($ == null ? void 0 : $.getFields()) || [];
     },
     [t, p]
   ), S = useCallback(
-    (R, M) => {
+    (w, M) => {
       var $;
-      if (!(!R || R.split(".").length < 2))
-        return ($ = p(M)) == null ? void 0 : $.getCollectionField(R);
+      if (!(!w || w.split(".").length < 2))
+        return ($ = p(M)) == null ? void 0 : $.getCollectionField(w);
     },
     [t, p]
   ), y = useCallback(
-    (R, M) => {
+    (w, M) => {
       var $, k;
-      return R ? ((k = ($ = p(M)) == null ? void 0 : $.getCollection(R)) == null ? void 0 : k.getParentCollectionsName()) || [] : [];
+      return w ? ((k = ($ = p(M)) == null ? void 0 : $.getCollection(w)) == null ? void 0 : k.getParentCollectionsName()) || [] : [];
     },
     [t, p]
   ), v = useCallback(
-    (R, M = !1, $) => {
+    (w, M = !1, $) => {
       var E;
-      if (!R)
+      if (!w)
         return [];
-      const k = (E = p($)) == null ? void 0 : E.getCollection(R);
+      const k = (E = p($)) == null ? void 0 : E.getCollection(w);
       return (k == null ? void 0 : k.getChildrenCollections(M)) || [];
     },
     [t, p]
   ), F = useCallback(
-    (R, M) => {
+    (w, M) => {
       var $, k;
-      return R ? ((k = ($ = p(M)) == null ? void 0 : $.getCollection(R)) == null ? void 0 : k.getCurrentFields()) || [] : [];
+      return w ? ((k = ($ = p(M)) == null ? void 0 : $.getCollection(w)) == null ? void 0 : k.getCurrentFields()) || [] : [];
     },
     [t, p]
   ), I = useCallback(
-    (R, M, $, k) => {
+    (w, M, $, k) => {
       var ee;
       const {
         association: z = !1,
         cached: E = {},
-        collectionNames: q = [R],
+        collectionNames: q = [w],
         maxDepth: L = 1,
         allowAllTypes: G = !1,
         exceptInterfaces: U = [],
@@ -18239,11 +18242,11 @@ const SchemaToolbarErrorFallback = (e) => {
       } = k || {};
       if (q.length - 1 > L)
         return;
-      if (E[R])
-        return _.cloneDeep(E[R]);
+      if (E[w])
+        return _.cloneDeep(E[w]);
       M && typeof M == "string" && (M = [M]), $ && typeof $ == "string" && ($ = [$]);
-      const W = b(R, K), X = (ee = W == null ? void 0 : W.filter(
-        (Z) => Z.interface && !U.includes(Z.interface) && (G || M && M.includes(Z.type) || $ && $.includes(Z.interface) || (z && Z.target && Z.target !== R && Array.isArray(z) ? z.includes(Z.interface) : !1))
+      const W = b(w, K), X = (ee = W == null ? void 0 : W.filter(
+        (Z) => Z.interface && !U.includes(Z.interface) && (G || M && M.includes(Z.type) || $ && $.includes(Z.interface) || (z && Z.target && Z.target !== w && Array.isArray(z) ? z.includes(Z.interface) : !1))
       )) == null ? void 0 : ee.map((Z) => {
         var re, se;
         const ne = x({
@@ -18258,44 +18261,44 @@ const SchemaToolbarErrorFallback = (e) => {
           usePrefix: J
         })), !((se = ne.children) != null && se.length)) ? null : ne;
       }).filter(Boolean);
-      return E[R] = X, X;
+      return E[w] = X, X;
     },
     [b]
-  ), w = useCallback(
-    (R, M) => {
+  ), R = useCallback(
+    (w, M) => {
       var $;
-      return ($ = p(M)) == null ? void 0 : $.getCollection(R);
+      return ($ = p(M)) == null ? void 0 : $.getCollection(w);
     },
     [t, p]
   ), T = useCallback(
-    (R, M) => {
+    (w, M) => {
       var $, k;
-      return (k = ($ = p(M)) == null ? void 0 : $.getCollection(R)) == null ? void 0 : k.getAllCollectionsInheritChain();
+      return (k = ($ = p(M)) == null ? void 0 : $.getCollection(w)) == null ? void 0 : k.getAllCollectionsInheritChain();
     },
     [t, p]
   ), D = useCallback(
-    (R, M) => () => {
+    (w, M) => () => {
       var $, k;
-      return (k = ($ = p(M)) == null ? void 0 : $.getCollection(R)) == null ? void 0 : k.getInheritCollectionsChain();
+      return (k = ($ = p(M)) == null ? void 0 : $.getCollection(w)) == null ? void 0 : k.getInheritCollectionsChain();
     },
     [t, p]
   ), O = useCallback(
-    (R) => t == null ? void 0 : t.collectionFieldInterfaceManager.getFieldInterface(R),
+    (w) => t == null ? void 0 : t.collectionFieldInterfaceManager.getFieldInterface(w),
     [t]
   ), j = useCallback(
-    (R) => {
+    (w) => {
       var M;
-      return (M = O(R.interface)) == null ? void 0 : M.titleUsable;
+      return (M = O(w.interface)) == null ? void 0 : M.titleUsable;
     },
     [O]
   ), N = useCallback(
-    (R, M, $) => {
+    (w, M, $) => {
       var k, z;
-      return (z = (k = p($)) == null ? void 0 : k.getCollection(M)) == null ? void 0 : z.getParentCollectionFields(R);
+      return (z = (k = p($)) == null ? void 0 : k.getCollection(M)) == null ? void 0 : z.getParentCollectionFields(w);
     },
     [t, p]
   ), B = useCallback(
-    (R = "general") => t == null ? void 0 : t.collectionTemplateManager.getCollectionTemplate(R),
+    (w = "general") => t == null ? void 0 : t.collectionTemplateManager.getCollectionTemplate(w),
     [t]
   );
   return {
@@ -18310,13 +18313,13 @@ const SchemaToolbarErrorFallback = (e) => {
     getInheritCollections: y,
     getChildrenCollections: v,
     refreshCM: g,
-    get: w,
+    get: R,
     getInheritedFields: C,
     getCollectionField: S,
     getCollectionFields: b,
     getCollectionFieldsOptions: I,
     getCurrentCollectionFields: F,
-    getCollection: w,
+    getCollection: R,
     getCollectionJoinField: S,
     getAllCollectionsInheritChain: T,
     getInheritCollectionsChain: D,
@@ -19470,7 +19473,7 @@ const ParentCollectionProvider = (e) => {
     collectionField: e,
     noDisabled: r,
     targetFieldSchema: i
-  }), { settings: w, shouldDisplayParentPopupRecord: T } = useParentPopupVariable({
+  }), { settings: R, shouldDisplayParentPopupRecord: T } = useParentPopupVariable({
     schema: n,
     collectionField: e,
     noDisabled: r,
@@ -19493,7 +19496,7 @@ const ParentCollectionProvider = (e) => {
     v && y,
     O && D,
     I && F,
-    T && w,
+    T && R,
     N && j
   ].filter(Boolean).filter(l), [
     u,
@@ -19546,8 +19549,8 @@ const findOption$1 = (e = [], t) => {
     if (n.data.dataIndex = b, (b == null ? void 0 : b.length) > 1) {
       const I = b.concat();
       I.pop();
-      const w = t(`${e}.${I.join(".")}`);
-      i.collectionName = w == null ? void 0 : w.target;
+      const R = t(`${e}.${I.join(".")}`);
+      i.collectionName = R == null ? void 0 : R.target;
     } else
       i.collectionName = null;
     n.data.operators = y, n.data.operator = v, n.data.schema = merge(S == null ? void 0 : S.schema, v == null ? void 0 : v.schema), n.data.value = get$1(unflatten(n.value), `${g}.$${C}`);
@@ -19701,7 +19704,7 @@ const findOption$1 = (e = [], t) => {
     blockCollectionName: C
   });
   l && v.every((T) => T.value !== F.value) && v.push(F);
-  const w = useCallback(
+  const R = useCallback(
     (T, D) => {
       if (!u)
         return n(T);
@@ -19716,7 +19719,7 @@ const findOption$1 = (e = [], t) => {
     {
       className: a,
       value: t,
-      onChange: w,
+      onChange: R,
       scope: m(
         I(_.isEmpty(b) ? v : b, {
           value: t
@@ -20191,22 +20194,22 @@ const compatibleDataId = (e, t) => e == null ? void 0 : e.map((n) => {
       ),
       []
     ), f = (F) => {
-      var w;
+      var R;
       const I = p(F);
       return m(
-        `${F}.${((w = g == null ? void 0 : g.config[F]) == null ? void 0 : w.titleField) || (I == null ? void 0 : I.titleField) || "id"}`
+        `${F}.${((R = g == null ? void 0 : g.config[F]) == null ? void 0 : R.titleField) || (I == null ? void 0 : I.titleField) || "id"}`
       );
     }, C = (F) => {
-      var w, T;
+      var R, T;
       const I = p(F);
       return {
-        label: getLabel(((T = (w = g.config) == null ? void 0 : w[F]) == null ? void 0 : T.titleField) || (I == null ? void 0 : I.titleField) || "id"),
+        label: getLabel(((T = (R = g.config) == null ? void 0 : R[F]) == null ? void 0 : T.titleField) || (I == null ? void 0 : I.titleField) || "id"),
         value: "id"
       };
     }, b = (F, I) => {
       var T, D;
-      const w = (D = (T = g.config) == null ? void 0 : T[F]) == null ? void 0 : D.filter;
-      return _.isEmpty(w) ? {} : removeNullCondition(mergeFilter([w, getSelectedIdFilter(I)], "$or"));
+      const R = (D = (T = g.config) == null ? void 0 : T[F]) == null ? void 0 : D.filter;
+      return _.isEmpty(R) ? {} : removeNullCondition(mergeFilter([R, getSelectedIdFilter(I)], "$or"));
     }, S = useMemo(() => ({ ArrayCollapse: ArrayCollapse$1 }), []), y = useMemo(
       () => ({
         getEnableFieldTree: a,
@@ -20579,11 +20582,11 @@ const DynamicComponent$1 = (e) => {
     [a, o]
   ), f = useMemo(() => ({ minWidth: 150, maxWidth: 430, fontSize: 13 }), []), C = useCallback(
     (I) => {
-      const w = I.replaceAll(`${r}.`, "").replaceAll("$system.", "").trim();
+      const R = I.replaceAll(`${r}.`, "").replaceAll("$system.", "").trim();
       o({
         mode: a,
         value: I,
-        result: w
+        result: R
       });
     },
     [r, a, o]
@@ -21578,7 +21581,7 @@ const SchemaSettingsSwitchItem = (e) => {
     )
   ] });
 }, SchemaSettingsActionModalItem = React.memo((e) => {
-  const R = e, {
+  const w = e, {
     title: t,
     onSubmit: n,
     width: o = "50%",
@@ -21589,7 +21592,7 @@ const SchemaSettingsSwitchItem = (e) => {
     modalTip: c,
     components: u,
     scope: d
-  } = R, p = Y(R, [
+  } = w, p = Y(w, [
     "title",
     "onSubmit",
     "width",
@@ -21600,7 +21603,7 @@ const SchemaSettingsSwitchItem = (e) => {
     "modalTip",
     "components",
     "scope"
-  ]), [m, h] = useState(!1), [g, f] = useState(e.uid), { t: C } = useTranslation(), b = useFieldSchema(), S = useContext(SchemaSettingsContext), { dn: y } = useSchemaSettings(), v = useCompile(), F = useAPIClient(), I = useFormActiveFields(), w = useZIndexContext(), T = getZIndex("modal", w + 10, 0), D = useMemo(
+  ]), [m, h] = useState(!1), [g, f] = useState(e.uid), { t: C } = useTranslation(), b = useFieldSchema(), S = useContext(SchemaSettingsContext), { dn: y } = useSchemaSettings(), v = useCompile(), F = useAPIClient(), I = useFormActiveFields(), R = useZIndexContext(), T = getZIndex("modal", R + 10, 0), D = useMemo(
     () => createForm({
       initialValues: cloneDeep$1(r),
       values: cloneDeep$1(r)
@@ -21687,7 +21690,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(), w = useCollectionRecord(), { association: T } = useDataBlockProps() || {}, D = useCurrentRecord(), O = useFormBlockContext(), j = useBlockContext(), { getOperators: N } = useOperators(), B = useLocationSearch(), R = useVariables$1(), { formValue: M, collection: $, parent: k } = useSubFormValue(), z = useCurrentPopupRecord(), E = 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(), O = useFormBlockContext(), j = useBlockContext(), { getOperators: N } = useOperators(), B = useLocationSearch(), w = useVariables$1(), { formValue: M, collection: $, parent: k } = useSubFormValue(), z = useCurrentPopupRecord(), E = useParentPopupRecord();
   return t ? null : /* @__PURE__ */ jsx(
     SchemaSettingsItem,
     P(x({
@@ -21697,7 +21700,7 @@ const SchemaSettingsModalItem = (e) => {
         const L = 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: R, children: /* @__PURE__ */ jsx(BlockContext.Provider, { value: j, children: /* @__PURE__ */ jsx(
+          () => /* @__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(
             VariablePopupRecordProvider,
             {
               recordData: z == null ? void 0 : z.value,
@@ -21706,7 +21709,7 @@ const SchemaSettingsModalItem = (e) => {
                 recordData: E == null ? void 0 : E.value,
                 collection: E == null ? void 0 : E.collection
               },
-              children: /* @__PURE__ */ jsx(CollectionRecordProvider, { record: d ? null : w, 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: O, children: /* @__PURE__ */ jsx(SubFormProvider, { value: { value: M, collection: $, parent: k }, children: /* @__PURE__ */ jsx(
                 FormActiveFieldsProvider,
                 {
                   name: "form",
@@ -21862,10 +21865,10 @@ const SchemaSettingsModalItem = (e) => {
   const { collectionName: n, readPretty: o, Component: r, afterSubmit: i } = t, a = useFieldSchema(), { form: l } = useFormBlockContext(), { dn: c } = useDesignable(), { t: u } = useTranslation(), { getTemplateById: d } = useSchemaTemplateManager(), p = useVariables$1(), m = useLocalVariables$1(), h = useRecord(), { type: g } = useFormBlockType(), f = (j = t == null ? void 0 : t.category) != null ? j : LinkageRuleCategory.default, C = (t == null ? void 0 : t.type) || (a != null && a["x-action"] || ["Action", "Action.Link"].includes(a["x-component"]) ? "button" : "field"), b = findGridSchema(a) || a, S = useLinkageCollectionFilterOptions(n), y = useLinkageCollectionFieldOptions(n, o), v = {
     [LinkageRuleCategory.default]: u("Linkage rules"),
     [LinkageRuleCategory.style]: u("Style")
-  }, F = LinkageRuleDataKeyMap[f], I = useCallback(() => (b == null ? void 0 : b[F]) || (a == null ? void 0 : a[F]) || [], [b, a, F]), w = v[f], T = useMemo(
+  }, F = LinkageRuleDataKeyMap[f], I = useCallback(() => (b == null ? void 0 : b[F]) || (a == null ? void 0 : a[F]) || [], [b, a, F]), R = v[f], T = useMemo(
     () => ({
       type: "object",
-      title: w,
+      title: R,
       properties: {
         fieldReaction: {
           "x-component": r || FormLinkageRules,
@@ -21892,8 +21895,8 @@ const SchemaSettingsModalItem = (e) => {
       const B = [];
       for (const z of N.fieldReaction.rules)
         B.push(_.pickBy(z, _.identity));
-      const R = b["x-component"] === "BlockTemplate" && ((k = b["x-component-props"]) == null ? void 0 : k.templateId), $ = {
-        "x-uid": R && d(R).uid || b["x-uid"]
+      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"]
       };
       b[F] = B, $[F] = B, c.emit("patch", {
         schema: $
@@ -21901,7 +21904,7 @@ const SchemaSettingsModalItem = (e) => {
     },
     [c, d, b, F, i]
   );
-  return /* @__PURE__ */ jsx(SchemaSettingsModalItem, { title: w, components: D, width: 770, schema: T, onSubmit: O });
+  return /* @__PURE__ */ jsx(SchemaSettingsModalItem, { title: R, components: D, width: 770, schema: T, onSubmit: O });
 }, useDataTemplates = (e) => {
   const t = useFieldSchema();
   if (e)
@@ -22395,7 +22398,7 @@ const designerCss$4 = ({ margin: e = "-18px -16px", padding: t = "18px 16px" } =
     }
   }
 ], SchemaSettingsDateFormat = function e(t) {
-  var h, g, f, C, b, S, y, v, F, I, w, T;
+  var h, g, f, C, b, S, y, v, F, I, R, T;
   const { fieldSchema: n } = t, o = useField(), { dn: r } = useDesignable(), { t: i } = useTranslation(), { getCollectionJoinField: a } = useCollectionManager_deprecated(), l = a(n == null ? void 0 : n["x-collection-field"]) || {}, c = (h = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : h.showTime, u = ((g = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : g.dateFormat) || ((C = (f = l == null ? void 0 : l.uiSchema) == null ? void 0 : f["x-component-props"]) == null ? void 0 : C.dateFormat) || "YYYY-MM-DD", d = ((b = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : b.timeFormat) || ((y = (S = l == null ? void 0 : l.uiSchema) == null ? void 0 : S["x-component-props"]) == null ? void 0 : y.timeFormat) || "HH:mm:ss", p = ((v = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : v.picker) || ((I = (F = l == null ? void 0 : l.uiSchema) == null ? void 0 : F["x-component-props"]) == null ? void 0 : I.picker) || "date", m = n["x-read-pretty"] || o.readOnly || o.readPretty;
   return /* @__PURE__ */ jsx(
     SchemaSettingsModalItem,
@@ -22489,7 +22492,7 @@ const designerCss$4 = ({ margin: e = "-18px -16px", padding: t = "18px 16px" } =
             }
           },
           showTime: {
-            default: c === void 0 ? (T = (w = l == null ? void 0 : l.uiSchema) == null ? void 0 : w["x-component-props"]) == null ? void 0 : T.showTime : c,
+            default: c === void 0 ? (T = (R = l == null ? void 0 : l.uiSchema) == null ? void 0 : R["x-component-props"]) == null ? void 0 : T.showTime : c,
             type: "boolean",
             "x-decorator": "FormItem",
             "x-component": "Checkbox",
@@ -22591,20 +22594,20 @@ const getActionContext = (e) => {
   var k, z, E;
   const n = useFieldSchema(), o = (k = t == null ? void 0 : t.fieldSchema) != null ? k : n, r = useField(), { dn: i } = useDesignable(), { t: a } = useTranslation(), l = useActionContext(), c = getActionContext(l).collection;
   let u;
-  const { getField: d } = useCollection_deprecated(), { getCollectionJoinField: p, getCollectionFields: m, getAllCollectionsInheritChain: h } = useCollectionManager_deprecated(), g = useVariables$1(), f = useLocalVariables$1(), C = useCollection_deprecated(), b = useRecord(), { form: S } = useFormBlockContext(), { getFields: y } = useCollectionFilterOptionsV2(C), { isInSubForm: v, isInSubTable: F } = useFlag() || {}, { name: I } = C, w = useMemo(
+  const { getField: d } = useCollection_deprecated(), { getCollectionJoinField: p, getCollectionFields: m, getAllCollectionsInheritChain: h } = useCollectionManager_deprecated(), g = useVariables$1(), f = useLocalVariables$1(), C = useCollection_deprecated(), b = useRecord(), { form: S } = useFormBlockContext(), { getFields: y } = useCollectionFilterOptionsV2(C), { isInSubForm: v, isInSubTable: F } = useFlag() || {}, { name: I } = C, R = useMemo(
     () => d(o.name) || p(o["x-collection-field"]),
     [o, p, d]
   ), T = _.omit(o, "required");
-  w != null && w.target && (u = p(
-    `${w.target}.${((E = (z = o["x-component-props"]) == null ? void 0 : z.fieldNames) == null ? void 0 : E.label) || "id"}`
+  R != null && R.target && (u = p(
+    `${R.target}.${((E = (z = o["x-component-props"]) == null ? void 0 : z.fieldNames) == null ? void 0 : E.label) || "id"}`
   ));
-  const D = (w == null ? void 0 : w.interface) === "m2o" && findParentFieldSchema(o), O = D && p(D == null ? void 0 : D["x-collection-field"]), j = useTableBlockContext(), N = (w == null ? void 0 : w.interface) === "m2m" || (w == null ? void 0 : w.interface) === "mbm" || (O == null ? void 0 : O.type) === "hasMany" && (w == null ? void 0 : w.interface) === "m2o", B = useCallback(
+  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(
     (q) => {
       const L = q.find((U) => U.value === "$nForm"), G = m(I);
       return !(G != null && G.length) && L && (L.children = formatVariableScop(y())), q;
     },
     [y, I]
-  ), R = useMemo(() => ({
+  ), w = useMemo(() => ({
     ArrayCollapse: ArrayCollapse$2,
     FormLayout,
     VariableInput: (q) => /* @__PURE__ */ jsx(
@@ -22622,16 +22625,16 @@ const getActionContext = (e) => {
         "x-decorator": "FormItem",
         "x-component": "VariableInput",
         "x-component-props": P(x({}, (o == null ? void 0 : o["x-component-props"]) || {}), {
-          collectionField: w,
+          collectionField: R,
           contextCollectionName: N ? c : "",
-          schema: w == null ? void 0 : w.uiSchema,
+          schema: R == null ? void 0 : R.uiSchema,
           targetFieldSchema: o,
           className: defaultInputStyle,
           form: S,
           record: b,
           returnScope: B,
           shouldChange: getShouldChange({
-            collectionField: w,
+            collectionField: R,
             variables: g,
             localVariables: f,
             getAllCollectionsInheritChain: h
@@ -22639,13 +22642,13 @@ const getActionContext = (e) => {
           renderSchemaComponent: function(L) {
             const G = useMemo(() => _.cloneDeep(T) || {}, []);
             G["x-read-pretty"] = !1, G["x-disabled"] = !1, _.set(G, "x-decorator-props.showTitle", !1);
-            const U = getFieldDefaultValue(G, w);
-            w.target && G["x-component-props"] && (G["x-component-props"].mode = "Select"), w != null && w.uiSchema.type && (G.type = w.uiSchema.type), (w == null ? void 0 : w.uiSchema["x-component"]) === "Checkbox" && (_.set(G, "x-component-props.defaultChecked", U), G.type = "void");
+            const U = getFieldDefaultValue(G, R);
+            R.target && G["x-component-props"] && (G["x-component-props"].mode = "Select"), R != null && R.uiSchema.type && (G.type = R.uiSchema.type), (R == null ? void 0 : R.uiSchema["x-component"]) === "Checkbox" && (_.set(G, "x-component-props.defaultChecked", U), G.type = "void");
             const H = useMemo(
               () => P(x({}, G || {}), {
                 "x-decorator": "FormItem",
                 "x-component-props": P(x({}, G["x-component-props"]), {
-                  collectionName: w == null ? void 0 : w.collectionName,
+                  collectionName: R == null ? void 0 : R.collectionName,
                   targetField: u,
                   defaultValue: isVariable$1(U) ? "" : U,
                   style: {
@@ -22662,11 +22665,11 @@ const getActionContext = (e) => {
           }
         }),
         title: a("Default value"),
-        default: getFieldDefaultValue(o, w)
+        default: getFieldDefaultValue(o, R)
       }
     }
   }), [
-    w,
+    R,
     o,
     T,
     S,
@@ -22696,7 +22699,7 @@ const getActionContext = (e) => {
     SchemaSettingsModalItem,
     {
       title: a("Set default value"),
-      components: R,
+      components: w,
       width: 800,
       schema: M,
       onSubmit: $,
@@ -23474,13 +23477,13 @@ const useGetFilterOptions = () => {
     };
   });
 }, TableColumnDesigner$1 = (e) => {
-  var j, N, B, R, M, $, k, z, E, q, L, 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((R = o == null ? void 0 : o.target) != null ? R : 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, N, B, w, M, $, k, z, E, q, L, 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(
     o == null ? void 0 : o.interface
-  ), I = useFieldModeOptions({ fieldSchema: n }), w = ((M = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : M.mode) || "Select";
+  ), 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 && w === "Select", O = () => {
+  const D = F && R === "Select", O = () => {
     const { name: U } = useCollection(), { linkageRulesProps: H } = useSchemaToolbar();
     return /* @__PURE__ */ jsx(SchemaSettingsLinkageRules, x({ category: "style" }, P(x({}, H), { collectionName: U })));
   };
@@ -23634,7 +23637,7 @@ const useGetFilterOptions = () => {
           C && { label: c("File manager"), value: "FileManager" },
           { label: c("Tag"), value: "Tag" }
         ].filter(Boolean) : I,
-        value: w,
+        value: R,
         onChange: (U) => {
           const H = {
             "x-uid": n["x-uid"]
@@ -23646,7 +23649,7 @@ const useGetFilterOptions = () => {
       },
       "field-mode"
     ),
-    ["Tag"].includes(w) && /* @__PURE__ */ jsx(
+    ["Tag"].includes(R) && /* @__PURE__ */ jsx(
       SchemaSettingsSelectItem,
       {
         title: c("Tag color field"),
@@ -25207,8 +25210,8 @@ const MarkdownEditor = (e) => {
     useCompile(), useEffect(() => {
       y(!0), V(void 0, null, function* () {
         setTimeout(() => V(void 0, null, function* () {
-          const w = yield getRenderContent(b, r, f, C, parseMarkdown);
-          g(w);
+          const R = yield getRenderContent(b, r, f, C, parseMarkdown);
+          g(R);
         })), y(!1);
       });
     }, [r, f, C, b]);
@@ -25232,8 +25235,8 @@ const MarkdownEditor = (e) => {
           a.editable = !1, d == null || d();
         },
         onSubmit: (I) => V(void 0, null, function* () {
-          var w;
-          a.editable = !1, (w = l["x-component-props"]) != null || (l["x-component-props"] = {}), l["x-component-props"].content = I, a.componentProps.content = I, u == null || u(l), c.emit("patch", {
+          var R;
+          a.editable = !1, (R = l["x-component-props"]) != null || (l["x-component-props"] = {}), l["x-component-props"].content = I, a.componentProps.content = I, u == null || u(l), c.emit("patch", {
             schema: {
               "x-uid": l["x-uid"],
               "x-component-props": {
@@ -25543,9 +25546,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([]), [w, T] = React.useState([]), [D, O] = React.useState(
+  const S = useCompile(), { t: y } = useTranslation(), v = useForm(), [F, I] = React.useState([]), [R, T] = React.useState([]), [D, O] = React.useState(
     m || !!(o && t != null)
-  ), j = useMemo(() => parseValue(t, p), [p, t]), N = typeof j == "string", B = N ? j : "", R = N ? null : j, M = Object.assign(
+  ), j = useMemo(() => parseValue(t, p), [p, t]), N = typeof j == "string", B = N ? j : "", w = N ? null : j, M = Object.assign(
     {
       label: "label",
       value: "value",
@@ -25571,28 +25574,28 @@ function Input$1(e) {
       ] : [],
       ...$ ? [S(X)] : [],
       ...h ? [...h] : []
-    ].filter((ne) => !ne.deprecated || (R == null ? void 0 : R[0]) === ne[M.value]);
+    ].filter((ne) => !ne.deprecated || (w == null ? void 0 : w[0]) === ne[M.value]);
     I(ee);
-  }, [h, R, $, a]);
+  }, [h, w, $, a]);
   const q = (W) => V(this, null, function* () {
     var ee;
     const X = W[W.length - 1];
     if (!((ee = X.children) != null && ee.length) && !X.isLeaf && X.loadChildren) {
       let Z;
-      if (R && R.length >= 2) {
-        for (const ne of R)
+      if (w && w.length >= 2) {
+        for (const ne of w)
           if (ne === X[M.value]) {
             Z = ne;
             break;
           }
       }
-      yield X.loadChildren(X, Z, R), I((ne) => [...ne]);
+      yield X.loadChildren(X, Z, w), I((ne) => [...ne]);
     }
   }), L = useCallback(
     (W, X) => {
       var ee, Z, ne;
       if (W[0] === "$") {
-        O(!0), R && n(null, X);
+        O(!0), w && n(null, X);
         return;
       } else
         O(!1);
@@ -25601,12 +25604,12 @@ function Input$1(e) {
         return;
       }
       if (W[0] === " ") {
-        W[1] ? W[1] !== B && n((ne = (Z = (ee = ConstantTypes[W[1]]) == null ? void 0 : ee.default) == null ? void 0 : Z.call(ee)) != null ? ne : null, X) : R && n(null, X);
+        W[1] ? W[1] !== B && n((ne = (Z = (ee = ConstantTypes[W[1]]) == null ? void 0 : ee.default) == null ? void 0 : Z.call(ee)) != null ? ne : null, X) : w && n(null, X);
         return;
       }
       n(`{{${W.join(".")}}}`, X);
     },
-    [B, R, n]
+    [B, w, n]
   ), G = useCallback(() => {
     var W;
     if (O(!!o), (W = $ == null ? void 0 : $.children) != null && W.length) {
@@ -25618,14 +25621,14 @@ function Input$1(e) {
   useEffect(() => {
     V(this, null, function* () {
       var Z;
-      if (!R || F.length <= 1)
+      if (!w || F.length <= 1)
         return;
       let X = null;
       const ee = [];
-      for (let ne = 0; ne < R.length; ne++) {
-        const re = R[ne];
+      for (let ne = 0; ne < w.length; ne++) {
+        const re = w[ne];
         try {
-          if (ne === 0 ? X = F.find((se) => se[M.value] === re) : (X.loadChildren && !((Z = X.children) != null && Z.length) && (yield X.loadChildren(X, re, R)), X = X.children.find((se) => se[M.value] === re)), !X)
+          if (ne === 0 ? X = F.find((se) => se[M.value] === re) : (X.loadChildren && !((Z = X.children) != null && Z.length) && (yield X.loadChildren(X, re, w)), X = X.children.find((se) => se[M.value] === re)), !X)
             return;
           ee.push(X[M.label]);
         } catch (se) {
@@ -25634,11 +25637,11 @@ function Input$1(e) {
       }
       I([...F]), T([...ee]);
     });
-  }, [R, F.length]);
+  }, [w, F.length]);
   const U = e.disabled || v.disabled;
   return g(
     /* @__PURE__ */ jsxs(Space$1.Compact, { style: l, className: cls(C, f, c), children: [
-      R ? /* @__PURE__ */ jsxs(
+      w ? /* @__PURE__ */ jsxs(
         "div",
         {
           className: cx(
@@ -25676,7 +25679,7 @@ function Input$1(e) {
                 "aria-label": "variable-tag",
                 style: { overflow: "hidden" },
                 className: cx("ant-input", { "ant-input-disabled": U }, f),
-                children: /* @__PURE__ */ jsx(Tag, { color: "blue", children: w.map((W, X) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
+                children: /* @__PURE__ */ jsx(Tag, { color: "blue", children: R.map((W, X) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
                   X ? " / " : "",
                   W
                 ] }, W)) })
@@ -25709,7 +25712,7 @@ function Input$1(e) {
         Cascader$1,
         {
           options: F,
-          value: R != null ? R : E,
+          value: w != null ? w : E,
           onChange: L,
           loadData: q,
           changeOnSelect: u,
@@ -25721,7 +25724,7 @@ function Input$1(e) {
               className: css(`
               margin-left: -1px;
             `),
-              type: R ? "primary" : "default",
+              type: w ? "primary" : "default",
               disabled: U
             }
           )
@@ -25901,7 +25904,7 @@ function TextArea(e) {
   const { wrapSSR: t, hashId: n, componentCls: o } = useStyles$a(), { scope: r, changeOnSelect: i, style: a, fieldNames: l, delimiters: c = ["{{", "}}"], addonBefore: u, trim: d = !0 } = e, p = typeof e.value == "string" ? e.value : e.value == null ? "" : e.value.toString(), m = useVariablesFromValue(p, c), h = useRef(null), [g, f] = useState([]), C = useForm(), b = useMemo(
     () => createOptionsValueLabelMap(g, l || defaultFieldNames$2),
     [l, g]
-  ), [S, y] = useState(!1), [v, F] = useState(!1), [I, w] = useState(() => renderHTML(p != null ? p : "", b, c)), [T, D] = useState([-1, 0, -1, 0]);
+  ), [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(
     (L) => {
@@ -25916,7 +25919,7 @@ function TextArea(e) {
       f(L);
     }).catch(console.error);
   }, [r, JSON.stringify(m)]), useEffect(() => {
-    w(renderHTML(p != null ? p : "", b, c)), v || D([-1, 0, -1, 0]);
+    R(renderHTML(p != null ? p : "", b, c)), v || D([-1, 0, -1, 0]);
   }, [p, b, j]), useEffect(() => {
     var U;
     const { current: L } = h;
@@ -25954,7 +25957,7 @@ function TextArea(e) {
       }), F(!0), D(getCurrentRange(U)), N(U);
     },
     [b, N, T]
-  ), R = useCallback(
+  ), w = useCallback(
     function({ currentTarget: L }) {
       S || (F(!0), D(getCurrentRange(L)), N(L));
     },
@@ -26041,7 +26044,7 @@ function TextArea(e) {
             {
               role: "button",
               "aria-label": "textbox",
-              onInput: R,
+              onInput: w,
               onBlur: M,
               onKeyDown: $,
               onPaste: E,
@@ -27456,8 +27459,9 @@ function getFilteredFormValues(e) {
     r && n.push(r);
   }), _.uniq(
     n.filter((r) => {
-      var i;
-      return (i = r == null ? void 0 : r.componentProps) == null ? void 0 : i.readOnlySubmit;
+      var l, c;
+      const i = ((l = r.path) == null ? void 0 : l.segments) || [], a = i.length <= 1 ? i.join(".") : i.slice(0, -1).join(".");
+      return ((c = r == null ? void 0 : r.componentProps) == null ? void 0 : c.readOnlySubmit) && !get$1(t, a)[r == null ? void 0 : r.componentProps.filterTargetKey];
     }).map((r) => {
       var a;
       const i = ((a = r.path) == null ? void 0 : a.segments) || [];
@@ -27488,7 +27492,7 @@ function getFormValues({
 function useCollectValuesToSubmit() {
   const e = useForm(), t = useFilterByTk(), { field: n, resource: o } = useBlockRequestContext(), { fields: r, getField: i, getTreeParentField: a, name: l } = useCollection_deprecated(), c = r.map((f) => f.name), { fieldSchema: u } = useActionContext(), { getActiveFieldsName: d } = useFormActiveFields() || {}, p = useVariables$1(), m = useLocalVariables$1({ currentForm: e }), h = useFieldSchema(), g = useTreeParentRecord();
   return useCallback(() => V(this, null, function* () {
-    var F, I, w, T;
+    var F, I, R, T;
     const { assignedValues: f = {}, overwriteValues: C } = (F = h == null ? void 0 : h["x-action-settings"]) != null ? F : {}, b = getFormValues({
       filterByTk: t,
       field: n,
@@ -27507,7 +27511,7 @@ function useCollectValuesToSubmit() {
     }));
     if (yield Promise.all(y), (I = u == null ? void 0 : u["x-component-props"]) == null ? void 0 : I.addChild) {
       const D = a();
-      b[(w = D == null ? void 0 : D.name) != null ? w : "parent"] = g, b[(T = D == null ? void 0 : D.foreignKey) != null ? T : "parentId"] = g == null ? void 0 : g.id;
+      b[(R = D == null ? void 0 : D.name) != null ? R : "parent"] = g, b[(T = D == null ? void 0 : D.foreignKey) != null ? T : "parentId"] = g == null ? void 0 : g.id;
     }
     return x(x(x({}, b), C), S);
   }), [
@@ -27534,12 +27538,12 @@ 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: w, 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: O, actionAfterSuccess: j } = v || {};
         F || (yield n.submit());
         const N = yield f();
         d.data = o.data || {}, d.data.loading = !0;
         try {
-          const R = yield r[C]({
+          const w = yield r[C]({
             values: N,
             filterKeys: b,
             filterByTk: e,
@@ -27547,17 +27551,17 @@ const useCreateActionProps = () => {
             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 = R, !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, !O) {
             message.success(h("Saved successfully")), yield resetFormCorrectly(n), (T && !j || j === "redirect") && D && (isURL(D) ? window.location.href = D : c(D));
             return;
           }
-          w ? m.success({
+          R ? m.success({
             title: p(O),
             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)));
-        } catch (R) {
+        } catch (w) {
           d.data.loading = !1;
         }
       });
@@ -27570,13 +27574,13 @@ const useCreateActionProps = () => {
     onClick() {
       return V(this, null, function* () {
         var z, E, q, L, G, U;
-        const w = u.map((H) => H.name), {
+        const R = u.map((H) => H.name), {
           assignedValues: T = {},
           onSuccess: D,
           overwriteValues: O,
           skipValidator: j,
           triggerWorkflows: N
-        } = (z = l == null ? void 0 : l["x-action-settings"]) != null ? z : {}, B = (E = i == null ? void 0 : i["x-component-props"]) == null ? void 0 : E.addChild, { successMessage: R } = D || {}, M = {}, $ = Object.keys(T).map((H) => V(this, null, function* () {
+        } = (z = l == null ? void 0 : l["x-action-settings"]) != null ? z : {}, B = (E = i == null ? void 0 : i["x-component-props"]) == null ? void 0 : E.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)) {
             const { value: W } = (yield C == null ? void 0 : C.parseVariable(J, b)) || {};
@@ -27589,7 +27593,7 @@ const useCreateActionProps = () => {
           filterByTk: g,
           field: t,
           form: e,
-          fieldNames: w,
+          fieldNames: R,
           getField: d,
           resource: n,
           actionFields: (S == null ? void 0 : S("form")) || []
@@ -27606,9 +27610,9 @@ const useCreateActionProps = () => {
             // 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
           });
-          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), !R)
+          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;
-          message.success(h(R));
+          message.success(h(w));
         } catch (H) {
           c.data.data = null, c.data.loading = !1;
         }
@@ -27715,13 +27719,13 @@ const useCreateActionProps = () => {
   return {
     onClick(f, C) {
       return V(this, null, function* () {
-        var N, B, R;
+        var N, 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: w, successMessage: T, actionAfterSuccess: D } = S || {}, O = {}, j = Object.keys(b).map((M) => V(this, null, function* () {
+        } = (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* () {
           const $ = b[M], k = m(M);
           if (isVariable$1($)) {
             const { value: z } = (yield u == null ? void 0 : u.parseVariable($, d)) || {};
@@ -27734,12 +27738,12 @@ const useCreateActionProps = () => {
           values: x({}, O),
           // 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 || (R = (B = t == null ? void 0 : t.service) == null ? void 0 : B.refresh) == null || R.call(B), T && (F ? c.success({
+        }), (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({
           title: a(T),
           onOk: () => V(this, null, function* () {
-            (I && !D || D === "redirect") && w && (isURL(w) ? window.location.href = w : i(w));
+            (I && !D || D === "redirect") && R && (isURL(R) ? window.location.href = R : i(R));
           })
-        }) : (message.success(a(T)), (I && !D || D === "redirect") && w && (isURL(w) ? window.location.href = w : i(w))));
+        }) : (message.success(a(T)), (I && !D || D === "redirect") && R && (isURL(R) ? window.location.href = R : i(R))));
       });
     }
   };
@@ -27756,7 +27760,7 @@ const useCreateActionProps = () => {
           assignedValues: T = {},
           onSuccess: D,
           updateMode: O
-        } = (z = i == null ? void 0 : i["x-action-settings"]) != null ? z : {}, { manualClose: j, redirecting: N, redirectTo: B, successMessage: R, actionAfterSuccess: M } = D || {};
+        } = (z = i == null ? void 0 : i["x-action-settings"]) != null ? z : {}, { manualClose: j, redirecting: N, 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 L = T[q], G = C(q);
@@ -27791,12 +27795,12 @@ const useCreateActionProps = () => {
               } finally {
                 m.data.loading = !1;
               }
-              t instanceof TableFieldResource || (J = (H = n == null ? void 0 : n.service) == null ? void 0 : H.refresh) == null || J.call(H), R && (j ? h.success({
-                title: d(R),
+              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));
                 })
-              }) : (message.success(d(R)), (N && !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))));
             });
           },
           onCancel() {
@@ -27815,12 +27819,12 @@ const useCreateActionProps = () => {
     onClick() {
       return V(this, null, function* () {
         var q, L, G, U;
-        const { skipValidator: I, onSuccess: w, requestSettings: T } = (q = o == null ? void 0 : o["x-action-settings"]) != null ? q : {}, { manualClose: D, redirecting: O, redirectTo: j, successMessage: N, actionAfterSuccess: B } = w || {}, R = 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: O, redirectTo: j, successMessage: N, actionAfterSuccess: B } = R || {}, w = o == null ? void 0 : o["x-action"];
         if (!T.url)
           return;
-        I !== !0 && R === "customize:form:request" && (yield i.submit());
+        I !== !0 && w === "customize:form:request" && (yield i.submit());
         const M = T.headers ? JSON.parse(T.headers) : {}, $ = T.params ? JSON.parse(T.params) : {}, k = T.data ? JSON.parse(T.data) : {};
-        if (R === "customize:form:request" && ["POST", "PUT", "PATCH"].includes(T.method)) {
+        if (w === "customize:form:request" && ["POST", "PUT", "PATCH"].includes(T.method)) {
           const H = a.map((K) => K.name), J = getFormValues({
             filterByTk: n,
             field: c,
@@ -27841,7 +27845,7 @@ const useCreateActionProps = () => {
         };
         f.data = c.data || {}, f.data.loading = !0;
         try {
-          yield e.request(x({}, E)), f.data.loading = !1, u instanceof TableFieldResource || (G = (L = d == null ? void 0 : d.service) == null ? void 0 : L.refresh) == null || G.call(L), (U = p == null ? void 0 : p.refresh) == null || U.call(p), R === "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({
+          yield e.request(x({}, E)), f.data.loading = !1, u instanceof TableFieldResource || (G = (L = d == null ? void 0 : d.service) == null ? void 0 : L.refresh) == null || G.call(L), (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),
             onOk: () => V(this, null, function* () {
               (O && !B || B === "redirect") && j && (isURL(j) ? window.location.href = j : t(j));
@@ -27860,13 +27864,13 @@ const useCreateActionProps = () => {
       return V(this, null, function* () {
         var L;
         const {
-          assignedValues: w = {},
+          assignedValues: R = {},
           onSuccess: T,
           overwriteValues: D,
           skipValidator: O,
           triggerWorkflows: j
-        } = (L = l == null ? void 0 : l["x-action-settings"]) != null ? L : {}, { manualClose: N, redirecting: B, redirectTo: R, successMessage: M, actionAfterSuccess: $ } = T || {}, k = {}, z = Object.keys(w).map((G) => V(this, null, function* () {
-          const U = w[G], H = d(G);
+        } = (L = l == null ? void 0 : l["x-action-settings"]) != null ? L : {}, { manualClose: N, 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)) || {};
             J && (k[G] = transformVariableValue(J, { targetCollectionField: H }));
@@ -27897,9 +27901,9 @@ const useCreateActionProps = () => {
           N ? f.success({
             title: m(M),
             onOk: () => V(this, null, function* () {
-              yield e.reset(), (B && !$ || $ === "redirect") && R && (isURL(R) ? window.location.href = R : c(R));
+              yield e.reset(), (B && !$ || $ === "redirect") && w && (isURL(w) ? window.location.href = w : c(w));
             })
-          }) : (message.success(m(M)), (B && !$ || $ === "redirect" || $ === "redirect") && R && (isURL(R) ? window.location.href = R : c(R)));
+          }) : (message.success(m(M)), (B && !$ || $ === "redirect" || $ === "redirect") && w && (isURL(w) ? window.location.href = w : c(w)));
         } catch (G) {
           h.data.loading = !1;
         }
@@ -27996,8 +28000,8 @@ const useCreateActionProps = () => {
       showSizeChanger: !1,
       onChange(v) {
         return V(this, null, function* () {
-          var I, w;
-          const F = (w = (I = e.service) == null ? void 0 : I.params) == null ? void 0 : w[0];
+          var I, R;
+          const F = (R = (I = e.service) == null ? void 0 : I.params) == null ? void 0 : R[0];
           e.service.run(P(x({}, F), { page: v }));
         });
       },
@@ -28056,8 +28060,8 @@ const useCreateActionProps = () => {
     /** 渲染 Collapse 的列表数据 */
     list: (d == null ? void 0 : d.data) || [],
     onSelected: (F) => {
-      var w, T, D, O;
-      const I = ((T = (w = t.params) == null ? void 0 : w[1]) == null ? void 0 : T.filters) || {};
+      var R, T, D, O;
+      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
       } : delete I[`af.${c}`], t.run(
@@ -28086,10 +28090,10 @@ 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, w, T, D, O, j, N, B;
+  var v, F, I, R, T, D, O, j, N, 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 = (w = t["x-component-props"]) == null ? void 0 : w.fieldNames) == null ? void 0 : T.label) || C, { data: f, params: h, run: g } = useRequest(
+  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(
     {
       headers: l,
       resource: e == null ? void 0 : e.target,
@@ -28119,7 +28123,7 @@ const useCreateActionProps = () => {
     d
   ]);
   const y = useCallback(
-    (R) => {
+    (w) => {
       const { targets: M, uid: $ } = findFilterTargets(t);
       o().forEach((k) => {
         var U, H, J, K;
@@ -28128,9 +28132,9 @@ const useCreateActionProps = () => {
         const E = `${$}${t.name}`, q = ((U = k.service.params) == null ? void 0 : U[0]) || {};
         (J = (H = k.service.params) == null ? void 0 : H[1]) != null && J.filters || _.set(k.service.params, "[1].filters", {});
         const L = k.service.params[1].filters;
-        if (R.length)
+        if (w.length)
           L[E] = {
-            [S]: R
+            [S]: w
           };
         else {
           if ((K = k.clearSelection) == null || K.call(k), k.dataLoadingMode === "manual")
@@ -28152,14 +28156,14 @@ const useCreateActionProps = () => {
   if (!e)
     return {};
   if (isOptionalField(e)) {
-    const R = n.find((k) => k.name === t.name), M = {
+    const w = n.find((k) => k.name === t.name), M = {
       select: "$in",
       multipleSelect: "$anyOf",
       checkbox: "$in",
       checkboxGroup: "$anyOf"
-    }, $ = ((B = R == null ? void 0 : R.uiSchema) == null ? void 0 : B.enum) || [];
+    }, $ = ((B = w == null ? void 0 : w.uiSchema) == null ? void 0 : B.enum) || [];
     C = "value", b = "label", p = $, h = {}, g = () => {
-    }, S = `${R.name}.${M[R.interface]}`, m = (k) => {
+    }, S = `${w.name}.${M[w.interface]}`, m = (k) => {
       const z = k.target.value;
       if (!z) {
         p = $;
@@ -28168,10 +28172,10 @@ const useCreateActionProps = () => {
       p = $.filter((E) => E.label.includes(z));
     };
   } else
-    S = `${r}.${C}.$in`, p = (f == null ? void 0 : f.data) || [], m = (R) => {
+    S = `${r}.${C}.$in`, p = (f == null ? void 0 : f.data) || [], m = (w) => {
       g(P(x({}, h == null ? void 0 : h[0]), {
         filter: {
-          [`${b}.$includes`]: R.target.value
+          [`${b}.$includes`]: w.target.value
         }
       }));
     };
@@ -28240,8 +28244,8 @@ const getAppends = ({
         y[v].forEach((I) => {
           if ("$and" in I || "$or" in I)
             return b(I);
-          const w = getTargetField(I);
-          w.length > 1 && o.add(w.join("."));
+          const R = getTargetField(I);
+          R.length > 1 && o.add(R.join("."));
         });
       };
       c["x-linkage-rules"].forEach(({ condition: y }) => {
@@ -28444,18 +28448,18 @@ function fillParentFields(e) {
 }
 const useSyncFromForm = (e, t, n) => {
   const { getCollectionJoinField: o, getCollectionFields: r } = useCollectionManager_deprecated(), i = ArrayBase.useArray(), a = ArrayBase.useIndex(), l = ArrayBase.useRecord(), c = useCompile(), { t: u } = useTranslation(), d = useForm(), p = /* @__PURE__ */ ((f) => (C, { exclude: b = [], depth: S = 0, maxDepth: y, prefix: v = "", disabled: F = !1 }, I) => {
-    const w = `${C}-${b.join(",")}-${S}-${y}-${v}`, T = f.get(w);
+    const R = `${C}-${b.join(",")}-${S}-${y}-${v}`, T = f.get(R);
     if (T)
       return T;
     if (S > y)
       return [];
     const D = r(C).map((O) => {
-      var R;
+      var w;
       if (b.includes(O.name) || !O.interface || ["sort", "password", "sequence"].includes(O.type))
         return;
       const j = {
         type: "duplicate",
-        tag: c((R = O.uiSchema) == null ? void 0 : R.title) || O.name
+        tag: c((w = O.uiSchema) == null ? void 0 : w.title) || O.name
       }, N = P(x({}, j), {
         title: React.createElement(TreeNode, j),
         key: v ? `${v}.${O.name}` : O.name,
@@ -28486,14 +28490,14 @@ const useSyncFromForm = (e, t, n) => {
       }
       return N;
     }).filter(Boolean);
-    return f.set(w, D), D;
+    return f.set(R, D), D;
   })(new LRUCache({ max: 100 })), m = /* @__PURE__ */ ((f) => (C, { prefix: b, maxDepth: S, depth: y = 0, exclude: v = [] }) => {
     const F = `${C}-${v.join(",")}-${y}-${S}-${b}`, I = f.get(F);
     if (I)
       return I;
     if (y > S)
       return [];
-    const w = r(C).map((T) => {
+    const R = r(C).map((T) => {
       var j, N;
       if (!T.target || !T.interface || v.includes(T.name))
         return;
@@ -28516,7 +28520,7 @@ const useSyncFromForm = (e, t, n) => {
         })
       };
     }).filter(Boolean);
-    return f.set(F, w), w;
+    return f.set(F, R), R;
   })(new LRUCache({ max: 100 })), h = useCallback((f, C) => {
     if (!f)
       return [];
@@ -28532,11 +28536,11 @@ const useSyncFromForm = (e, t, n) => {
         var y;
         const f = /* @__PURE__ */ new Set([]), C = /* @__PURE__ */ new Set([]), b = (v, F) => {
           var I;
-          (I = v == null ? void 0 : v.reduceProperties) == null || I.call(v, (w, T) => {
+          (I = v == null ? void 0 : v.reduceProperties) == null || I.call(v, (R, T) => {
             var M, $, k;
-            const D = w || 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, R = 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(R), O && (N || j) && T["x-component"] !== "TableField") {
-              if (f.add({ name: R, fieldMode: (($ = T["x-component-props"]) == null ? void 0 : $.mode) || "Select" }), ["Nester", "SubTable"].includes((k = T["x-component-props"]) == null ? void 0 : k.mode)) {
+            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") {
+              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);
               }
@@ -29401,32 +29405,34 @@ const DragHandler = (e) => {
     "title-field"
   ) : null;
 }, isDisplayField = (e) => e.includes("."), useLazyLoadDisplayAssociationFieldsOfForm = () => {
-  var C;
-  const { name: e } = useCollection_deprecated(), { getCollectionJoinField: t } = useCollectionManager_deprecated(), n = useForm(), o = useFieldSchema(), r = useVariables$1(), i = useField(), { formValue: a } = useSubFormValue(), { isInSubForm: l, isInSubTable: c } = useFlag() || {}, { getAssociationAppends: u } = useAssociationNames(), d = o.name.toString(), p = useRef(null), m = useRef(null);
-  p.current == null && isDisplayField(d) && (p.current = t(`${e}.${d}`)), m.current == null && isDisplayField(d) && (m.current = t(`${e}.${d.split(".")[0]}`));
-  const h = useMemo(() => !isDisplayField(d) || !r || e === "fields" || !p.current, [d, r, e, p.current]), g = h ? {} : untracked(() => _.cloneDeep(l || c ? a : n.values)), f = isDisplayField(d) && m.current ? _.get(g, `${d.split(".")[0]}.${((C = m.current) == null ? void 0 : C.targetKey) || "id"}`) : void 0;
+  var b;
+  const { name: e } = useCollection_deprecated(), { getCollectionJoinField: t, getCollection: n } = useCollectionManager_deprecated(), o = useForm(), r = useFieldSchema(), i = useVariables$1(), a = useField(), { formValue: l } = useSubFormValue(), { isInSubForm: c, isInSubTable: u } = useFlag() || {}, { getAssociationAppends: d } = useAssociationNames(), p = r.name.toString(), m = useRef(null), h = useRef(null);
+  m.current == null && isDisplayField(p) && (m.current = t(`${e}.${p}`)), h.current == null && isDisplayField(p) && (h.current = t(`${e}.${p.split(".")[0]}`));
+  const g = useMemo(() => !isDisplayField(p) || !i || e === "fields" || !m.current, [p, i, e, m.current]), f = g ? {} : untracked(() => _.cloneDeep(c || u ? l : o.values)), C = isDisplayField(p) && h.current ? _.get(f, `${p.split(".")[0]}.${((b = h.current) == null ? void 0 : b.targetKey) || "id"}`) : void 0;
   useEffect(() => {
-    if (h || _.isEmpty(g))
+    var I;
+    if (g || _.isEmpty(f))
       return;
-    const b = {
+    const S = {
       name: "$nForm",
-      ctx: g,
+      ctx: f,
       collectionName: e
-    }, S = `{{ $nForm.${d} }}`;
-    if (f == null)
+    }, y = `{{ $nForm.${p} }}`;
+    if (C == null)
       return;
-    const { appends: y } = u();
-    r.parseVariable(S, b, { appends: y }).then(({ value: v }) => {
+    const { appends: v } = d(), F = n((I = m.current) == null ? void 0 : I.collectionName);
+    i.parseVariable(y, S, { appends: v }).then(({ value: R }) => {
       nextTick(() => {
-        const F = transformVariableValue(v, { targetCollectionField: p.current });
-        _.isEmpty(F) && !_.isNumber(F) ? i.value = null : (i.value = F, i.componentProps = P(x({}, i.componentProps), {
-          readOnlySubmit: !0
+        const T = transformVariableValue(R, { targetCollectionField: m.current });
+        _.isEmpty(T) && !_.isNumber(T) ? a.value = null : (a.value = T, a.componentProps = P(x({}, a.componentProps), {
+          readOnlySubmit: !0,
+          filterTargetKey: (F == null ? void 0 : F.filterTargetKey) || "id"
         }));
       });
-    }).catch((v) => {
-      console.error(v);
+    }).catch((R) => {
+      console.error(R);
     });
-  }, [f, h]);
+  }, [C, g]);
 };
 function forEachLinkageRule(e, t) {
   e.forEach((n) => {
@@ -29476,8 +29482,8 @@ const useContextVariable = () => {
     dataSource: b,
     defaultValue: S
   } = useParentPopupVariableContext(), { datetimeCtx: y } = useDatetimeVariableContext(), { currentFormCtx: v } = useCurrentFormContext({ form: e == null ? void 0 : e.currentForm }), { name: F } = useCollection_deprecated(), I = useContextVariable();
-  let { name: w } = useBlockCollection();
-  return e != null && e.collectionName && (w = e.collectionName), useMemo(() => [
+  let { name: R } = useBlockCollection();
+  return e != null && e.collectionName && (R = e.collectionName), useMemo(() => [
     /**
      * @deprecated
      * 兼容老版本
@@ -29492,9 +29498,9 @@ const useContextVariable = () => {
      * 兼容旧版本的以数据表名称命名的变量，新版本已更名为 `$nForm`
      */
     {
-      name: w,
+      name: R,
       ctx: v || a,
-      collectionName: w
+      collectionName: R
     },
     /**
      * @deprecated
@@ -29503,7 +29509,7 @@ const useContextVariable = () => {
     {
       name: "$form",
       ctx: v,
-      collectionName: w
+      collectionName: R
     },
     {
       name: "$nRecord",
@@ -29534,7 +29540,7 @@ const useContextVariable = () => {
     {
       name: "$nForm",
       ctx: v,
-      collectionName: w
+      collectionName: R
     },
     {
       name: "$nDate",
@@ -29562,7 +29568,7 @@ const useContextVariable = () => {
   ].filter(Boolean), [
     a,
     l,
-    w,
+    R,
     v,
     c,
     u,
@@ -29650,8 +29656,8 @@ const useParseDefaultValue = () => {
     var F, I;
     if (g === "update" && t.default && e.form === f && ((I = e.setValue) == null || I.call(e, (F = r == null ? void 0 : r.data) == null ? void 0 : F[t.name])), t.default == null || a || l || isSubMode(t) || !(r != null && r.isNew) && !i)
       return;
-    const y = (...T) => V(void 0, [...T], function* ({ forceUpdate: w = !1 } = {}) {
-      if (n && e && (isVariable$1(t.default) && e.value == null || e.value === t.default || w)) {
+    const y = (...T) => V(void 0, [...T], function* ({ forceUpdate: R = !1 } = {}) {
+      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,
@@ -29677,17 +29683,17 @@ const useParseDefaultValue = () => {
         !/\{\{.+\}\}/g.test(t.default) && e.setInitialValue && e.setInitialValue(t.default);
     }), v = _.debounce(y, DEBOUNCE_WAIT);
     if (isVariable$1(t.default)) {
-      const w = getVariableName(t.default), T = S(w);
+      const R = getVariableName(t.default), T = S(R);
       return T ? (y(), reaction(
         () => {
-          const O = { [w]: (T == null ? void 0 : T.ctx) || {} }, j = getPath(t.default), N = getValuesByPath(O, j);
+          const O = { [R]: (T == null ? void 0 : T.ctx) || {} }, j = getPath(t.default), N = getValuesByPath(O, j);
           return N === void 0 ? Math.random() : N;
         },
         () => v({ forceUpdate: !0 }),
         {
           equals: _.isEqual
         }
-      )) : console.error(`useParseDefaultValue: can not find variable ${w}`);
+      )) : console.error(`useParseDefaultValue: can not find variable ${R}`);
     } else
       e.value == null && (c || u) && e.setValue(t.default);
   }, [t.default, o, g, C, b, d]);
@@ -32985,7 +32991,7 @@ const expendableActionSettings = new SchemaSettings({
           }
         },
         onSubmit: ({ sort: F }) => {
-          const I = F.map((w) => w.direction === "desc" ? `-${w.field}` : w.field);
+          const I = F.map((R) => R.direction === "desc" ? `-${R.field}` : R.field);
           _.set(r, "x-decorator-props.params.sort", I), a.decoratorProps.params = x({}, r["x-decorator-props"].params), l.emit("patch", {
             schema: {
               "x-uid": r["x-uid"],
@@ -35001,14 +35007,14 @@ const tableBlockSettings = new SchemaSettings({
       options: o,
       value: p == null ? void 0 : p.label,
       onChange(C) {
-        var v, F, I, w, T;
+        var v, F, I, R, T;
         const b = {
           "x-uid": c["x-uid"]
         }, S = P(x(x({}, (F = (v = d == null ? void 0 : d.uiSchema) == null ? void 0 : v["x-component-props"]) == null ? void 0 : F.fieldNames), (I = c["x-component-props"]) == null ? void 0 : I.fieldNames), {
           label: C
         });
         c["x-component-props"] = c["x-component-props"] || {}, c["x-component-props"].fieldNames = S, b["x-component-props"] = c["x-component-props"], t.componentProps.fieldNames = c["x-component-props"].fieldNames;
-        const y = (T = t.path) == null ? void 0 : T.splice(((w = t.path) == null ? void 0 : w.length) - 1, 1);
+        const y = (T = t.path) == null ? void 0 : T.splice(((R = t.path) == null ? void 0 : R.length) - 1, 1);
         t.form.query(`${y.concat("*." + c.name)}`).forEach((D) => {
           D.componentProps.fieldNames = p;
         }), n.emit("patch", {
@@ -35282,8 +35288,8 @@ const tableBlockSettings = new SchemaSettings({
   name: "fieldSettings:component:CascadeSelect",
   items: [fieldComponent$6, titleField$1, ellipsisSettingsItem, setTheDataScope]
 }), SchemaSettingsDateRange = function e(t) {
-  var w, T, D, O, j, N, B, R, M, $, k, z, E, q, L, 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 = ((w = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : w.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 = (R = u == null ? void 0 : u.uiSchema) == null ? void 0 : R["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, O, j, N, B, w, M, $, k, z, E, q, L, 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";
   n["x-read-pretty"] || o.readOnly || o.readPretty;
   const g = (E = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : E._minDate, f = (q = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : q._maxDate, C = ((L = u == null ? void 0 : u.uiSchema) == null ? void 0 : L["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(
@@ -36731,12 +36737,12 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
     _.isFunction(C) ? n.current = C(n.current) : n.current = C;
   }, []), u = useCallback(
     (C, b, S) => V(void 0, null, function* () {
-      var R, M;
+      var w, M;
       const y = C.split("."), v = y[0], F = mergeVariableToCollectionNameWithLocalVariables(variablesStore, b);
       let I = mergeCtxWithLocalVariables(n.current, b);
-      const { fieldPath: w, dataSource: T, variableOption: D } = getFieldPath$1(v, F);
-      let O = w;
-      const { fieldPath: j } = getFieldPath$1(C, F), N = y.length === 1 ? D == null ? void 0 : D.collectionName : (R = r(j, T)) == null ? void 0 : R.target;
+      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;
       if (!(v in I))
         throw new Error(`VariablesProvider: ${v} is not found`);
       for (let $ = 0; $ < y.length; $++) {
@@ -36834,7 +36840,7 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
     [u]
   ), g = useCallback(
     (C, b) => V(void 0, null, function* () {
-      var w;
+      var R;
       if (!isVariable$1(C))
         throw new Error(`VariablesProvider: ${C} is not a variable string`);
       b && (b = _.isArray(b) ? b : [b]);
@@ -36844,7 +36850,7 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
       ), y = getPath(C), { fieldPath: v, dataSource: F } = getFieldPath$1(y, S);
       let I = r(v, F);
       return !I && !y.includes(".") && (I = {
-        target: (w = S[y]) == null ? void 0 : w.collectionName
+        target: (R = S[y]) == null ? void 0 : R.collectionName
       }), I;
     }),
     [r]
@@ -37092,7 +37098,7 @@ const NocoBaseField = (e) => {
     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);
     }), 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), w = (j) => {
+  }, [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)
       return propertiesToReactElement({
         schema: y,
@@ -37104,7 +37110,7 @@ const NocoBaseField = (e) => {
         values: c,
         isUseFormilyField: u
       });
-  }, T = () => isValid(n) ? F.type === "object" ? o ? w() : /* @__PURE__ */ jsx(ObjectField, P(x({}, I), { name: n, basePath: m, children: w })) : F.type === "array" ? /* @__PURE__ */ jsx(ArrayField, P(x({}, I), { name: n, basePath: m })) : F.type === "void" ? o ? w() : /* @__PURE__ */ jsx(VoidField, P(x({}, I), { name: n, basePath: m, children: w })) : u ? /* @__PURE__ */ jsx(Field, P(x({}, I), { name: n, basePath: m })) : /* @__PURE__ */ jsx(NocoBaseField, { name: n, value: c, initialValue: c, basePath: m, schema: F }) : w();
+  }, T = () => isValid(n) ? F.type === "object" ? o ? R() : /* @__PURE__ */ jsx(ObjectField, P(x({}, I), { name: n, basePath: m, children: R })) : F.type === "array" ? /* @__PURE__ */ jsx(ArrayField, P(x({}, I), { name: n, basePath: m })) : F.type === "void" ? o ? R() : /* @__PURE__ */ jsx(VoidField, P(x({}, I), { name: n, basePath: m, children: R })) : u ? /* @__PURE__ */ jsx(Field, P(x({}, I), { name: n, basePath: m })) : /* @__PURE__ */ jsx(NocoBaseField, { name: n, value: c, initialValue: c, basePath: m, schema: F }) : R();
   return y ? /* @__PURE__ */ jsx(SchemaContext.Provider, { value: y, children: /* @__PURE__ */ jsx(RefreshFieldSchemaProvider, { refresh: v, children: T() }) }) : /* @__PURE__ */ jsx(Fragment, {});
 });
 NocoBaseRecursionField.displayName = "NocoBaseRecursionField";
@@ -37237,7 +37243,7 @@ const ActionLink = withDynamicSchemaProps(
       "onMouseEnter",
       "refreshDataBlockRequest",
       "confirmTitle"
-    ]), v = useDesigner(), F = useField(), I = useFieldSchema(), w = useCompile(), T = useCollectionRecordData(), D = w((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(), R = useLocalVariables$1({ currentForm: { values: T, readPretty: !1 } }), { visibleWithURL: M, setVisibleWithURL: $ } = usePopupUtils(), { setSubmitted: k } = useActionContext(), { getAriaLabel: z } = useGetAriaLabelOfAction(l), E = 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, 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), E = useCollectionParentRecordData(), q = useApp();
     useEffect(() => {
       F.stateOfLinkageRules && setInitialActionState(F), F.stateOfLinkageRules = {}, O.filter((H) => !H.disabled).forEach((H) => {
         var J;
@@ -37248,13 +37254,13 @@ const ActionLink = withDynamicSchemaProps(
               field: F,
               condition: H.condition,
               variables: B,
-              localVariables: R
+              localVariables: w
             },
             q.jsonLogic
           );
         });
       });
-    }, [F, O, R, B]);
+    }, [F, O, w, B]);
     const L = useCallback(
       (H) => {
         C == null || C(H);
@@ -37319,7 +37325,7 @@ const ActionLink = withDynamicSchemaProps(
     style: v,
     propsDisabled: F,
     useAction: I,
-    actionCallback: w,
+    actionCallback: R,
     visibleWithURL: T,
     setVisibleWithURL: D,
     setSubmitted: O,
@@ -37353,7 +37359,7 @@ const ActionLink = withDynamicSchemaProps(
     "setSubmitted",
     "getAriaLabel",
     "parentRecordData"
-  ]), [R, M] = useState(!1), { wrapSSR: $, componentCls: k, hashId: z } = useStyles$8(), [E, q] = useState(!1), L = o["x-toolbar-props"] || o["x-designer-props"], G = (me = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : me.openMode, U = (he = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : he.openSize, H = (ge = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : ge.refreshDataBlockRequest, { modal: J } = App.useApp(), K = useForm(), W = useACLActionParamsContext(), { run: X, element: ee, disabled: Z } = (I == null ? void 0 : I(w)) || {}, ne = K.disabled || i.disabled || ((de = i.data) == null ? void 0 : de.disabled) || F || Z, re = useMemo(() => {
+  ]), [w, M] = useState(!1), { wrapSSR: $, componentCls: k, hashId: z } = useStyles$8(), [E, q] = useState(!1), L = o["x-toolbar-props"] || o["x-designer-props"], G = (me = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : me.openMode, U = (he = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : he.openSize, H = (ge = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : ge.refreshDataBlockRequest, { modal: J } = App.useApp(), K = useForm(), W = useACLActionParamsContext(), { run: X, element: ee, disabled: Z } = (I == null ? void 0 : I(R)) || {}, ne = K.disabled || i.disabled || ((de = i.data) == null ? void 0 : de.disabled) || F || Z, re = useMemo(() => {
     var ce;
     return P(x({}, v), {
       opacity: r && (((ce = i == null ? void 0 : i.data) == null ? void 0 : ce.hidden) || !W) && 0.1,
@@ -37397,7 +37403,7 @@ const ActionLink = withDynamicSchemaProps(
     ActionContextProvider,
     {
       button: RenderButton(se),
-      visible: R || T,
+      visible: w || T,
       setVisible: le,
       formValueChanged: E,
       setFormValueChanged: q,
@@ -37479,13 +37485,13 @@ const RenderButton = ({
   setVisible: v,
   run: F,
   confirm: I,
-  modal: w,
+  modal: R,
   setSubmitted: T,
   confirmTitle: D,
   title: O
 }) => {
-  const { getDataBlockRequest: j } = useDataBlockRequestGetter(), { t: N } = useTranslation(), { isPopupVisibleControlledByURL: B } = usePopupSettings(), { openPopup: R } = usePopupUtils(), M = useRef(null);
-  M.current = R;
+  const { getDataBlockRequest: j } = useDataBlockRequestGetter(), { t: N } = useTranslation(), { isPopupVisibleControlledByURL: B } = usePopupSettings(), { openPopup: w } = usePopupUtils(), M = useRef(null);
+  M.current = w;
   const $ = useCallback(
     (k, z = !0) => {
       if (!(z && isPortalInBody(k.target)) && (k.preventDefault(), k.stopPropagation(), !i && n)) {
@@ -37495,7 +37501,7 @@ const RenderButton = ({
             S !== !1 && (T == null || T(!0), (L = (q = j()) == null ? void 0 : q.refresh) == null || L.call(q));
           }) : isBulkEditAction(y) || !B() ? (v(!0), F == null || F()) : ["view", "update", "create", "customize:popup"].includes(y["x-action"]) && y["x-uid"] ? M.current() : (v(!0), F == null || F());
         };
-        (I == null ? void 0 : I.enable) !== !1 && (I != null && I.content) ? w.confirm({
+        (I == null ? void 0 : I.enable) !== !1 && (I != null && I.content) ? 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) }),
           onOk: E
@@ -37512,7 +37518,7 @@ const RenderButton = ({
       t,
       y,
       B,
-      w,
+      R,
       b,
       S,
       F,
@@ -37593,8 +37599,8 @@ const RenderButtonInner = observer$1(
       "isLink"
     ]), F = useCallback(
       debounce$1(
-        (R, M = !0) => {
-          d(R, M);
+        (w, M = !0) => {
+          d(w, M);
         },
         300,
         { leading: !0, trailing: !1 }
@@ -37605,7 +37611,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: w } = N, T = Y(N, ["opacity"]), D = y && w ? { opacity: w } : void 0;
+    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;
     return /* @__PURE__ */ jsxs(
       SortableItem,
       P(x({
@@ -38071,14 +38077,14 @@ 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: w, getInterface: T } = useCollectionManager_deprecated(), D = y["x-collection-field"] || y.name, O = F(D) || w(D), j = u || (O == null ? void 0 : O.target) && (t == null ? void 0 : t.label) && w(`${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, 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(() => {
         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";
           return j.type === "string" ? "$includes" : X;
         }
         return "$includes";
-      }, [j]), B = useCompile(), R = useCallback(
+      }, [j]), B = useCompile(), w = useCallback(
         (K) => {
           try {
             return K.filter((W) => ["number", "string"].includes(typeof W[t.value]) || !W[t.value]).map((W) => {
@@ -38177,7 +38183,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
           defaultValue: i
         }, f), {
           loading: M ? k : !0,
-          options: h(R(L)),
+          options: h(w(L)),
           rawOptions: L,
           dropdownRender: (K) => {
             const W = L.some((X) => X[t.label] === I.current);
@@ -38253,9 +38259,9 @@ const useFormDataTemplates = () => {
     padding: n.padding
   }, e), [e, n.colorFillAlter]), S = useMemo(() => ({ fontSize: n.fontSize, fontWeight: "bold", whiteSpace: "nowrap", marginRight: n.marginXS }), [n.fontSize, n.marginXS]), y = useCallback((I) => V(void 0, null, function* () {
     d(I), m(null), t == null || t.reset();
-  }), []), v = useCallback((I, w, T) => V(void 0, null, function* () {
-    const D = P(x({}, w), { dataId: I });
-    m(w), fetchTemplateData(h, D, T).then((O) => (t && O && (t.reset(), t.__template = !0, forEach(O, (j, N) => {
+  }), []), 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) => {
       var B;
       j && (t.values[N] = j, (B = t == null ? void 0 : t.setInitialValuesIn) == null || B.call(t, N, j));
     })), O)).catch((O) => {
@@ -38322,7 +38328,7 @@ function fetchTemplateData(e, t, n) {
 }
 const useFormBlockHeight = () => {
   var v, F, I;
-  const e = useDataBlockHeight(), t = useFieldSchema(), { token: n } = theme.useToken(), { designable: o } = useDesignable(), { heightProps: r } = useBlockHeightProps() || {}, { title: i, titleHeight: a } = r || {}, { display: l, enabled: c } = useFormDataTemplates(), u = t.reduceProperties((w, T) => T["x-component"] === "ActionBar" ? T : w), d = Object.keys((u == null ? void 0 : u.properties) || {}).length > 0, p = (I = (F = (v = t == null ? void 0 : t.parent) == null ? void 0 : v["x-decorator"]) == null ? void 0 : F.includes) == null ? void 0 : I.call(F, "FormBlockProvider"), m = d || o ? n.controlHeight + (p ? 1 * n.marginLG : 24 + n.paddingLG) : n.marginLG, h = i ? a : 0, g = useDataBlockRequestData(), { count: f, pageSize: C } = (g == null ? void 0 : g.meta) || {}, S = f > C ? n.controlHeightSM + 24 : 0, y = l && c ? n.controlHeight + 2 * n.padding + n.margin : 0;
+  const e = useDataBlockHeight(), t = useFieldSchema(), { token: n } = theme.useToken(), { designable: o } = useDesignable(), { heightProps: r } = useBlockHeightProps() || {}, { title: i, titleHeight: a } = r || {}, { display: l, enabled: c } = useFormDataTemplates(), u = t.reduceProperties((R, T) => T["x-component"] === "ActionBar" ? T : R), d = Object.keys((u == null ? void 0 : u.properties) || {}).length > 0, p = (I = (F = (v = t == null ? void 0 : t.parent) == null ? void 0 : v["x-decorator"]) == null ? void 0 : F.includes) == null ? void 0 : I.call(F, "FormBlockProvider"), m = d || o ? n.controlHeight + (p ? 1 * n.marginLG : 24 + n.paddingLG) : n.marginLG, h = i ? a : 0, g = useDataBlockRequestData(), { count: f, pageSize: C } = (g == null ? void 0 : g.meta) || {}, S = f > C ? n.controlHeightSM + 24 : 0, y = l && c ? n.controlHeight + 2 * n.padding + n.margin : 0;
   return e - m - n.paddingLG - h - S - y;
 }, FormComponent = (e) => {
   const g = e, { form: t, children: n } = g, o = Y(g, ["form", "children"]), r = useField(), i = useFieldSchema(), a = getCardItemSchema == null ? void 0 : getCardItemSchema(i), l = useAttach(t.createVoidField(P(x({}, r.props), { basePath: "" }))), c = useFormBlockHeight(), { token: u } = theme.useToken(), {
@@ -39090,7 +39096,7 @@ const insertPositionToMethod = {
           }
         },
         onSubmit: (g) => V(void 0, [g], function* ({ title: m, icon: h }) {
-          var I, w;
+          var I, R;
           const f = i.__route__, C = (I = i.parent) == null ? void 0 : I.__route__, b = uid(), S = uid(), y = uid(), v = uid(), { data: F } = yield u({
             type: NocoBaseDesktopRouteType.page,
             title: m,
@@ -39110,7 +39116,7 @@ const insertPositionToMethod = {
             ]
           });
           insertPositionToMethod[o] && (yield d({
-            sourceId: (w = F == null ? void 0 : F.data) == null ? void 0 : w.id,
+            sourceId: (R = F == null ? void 0 : F.data) == null ? void 0 : R.id,
             targetId: f == null ? void 0 : f.id,
             sortField: "sort",
             method: insertPositionToMethod[o]
@@ -39180,8 +39186,8 @@ const insertPositionToMethod = {
   ), h = useMemo(() => toItems$1(c == null ? void 0 : c.properties, { t: l, compile: u }), [c == null ? void 0 : c.properties, l, u]), g = useCallback(
     (j) => {
       onFieldChange("target", (N) => {
-        var R, M;
-        const [, B] = ((M = (R = N == null ? void 0 : N.value) == null ? void 0 : R.split) == null ? void 0 : M.call(R, "||")) || [];
+        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(($) => {
           $.dataSource = B === "Menu.SubMenu" ? [
             { label: l("Before"), value: "beforeBegin" },
@@ -39230,7 +39236,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: R }) => {
+    ({ title: j, icon: N, href: B, params: w }) => {
       var $;
       const M = {
         "x-uid": o["x-uid"],
@@ -39241,14 +39247,14 @@ const insertPositionToMethod = {
           }
         ]
       };
-      j && (o.title = j, n.title = j, M.title = j, a()), n.componentProps.icon = N, n.componentProps.href = B, n.componentProps.params = R, M["x-component-props"] = { icon: N, href: B, params: R }, 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 = R, m == null || m({ item: { props: { schema: o } } }), i.emit("patch", {
+      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", {
         schema: M
       }), ($ = o.__route__) != null && $.id && e(o.__route__.id, {
         title: j,
         icon: N,
-        options: B || R ? {
+        options: B || w ? {
           href: B,
-          params: R
+          params: w
         } : void 0
       });
     },
@@ -39285,13 +39291,13 @@ const insertPositionToMethod = {
         "x-decorator": "FormItem"
       }
     }
-  }), [h, l]), { moveRoute: I } = useNocoBaseRoutes(), w = useCallback(
+  }), [h, l]), { moveRoute: I } = useNocoBaseRoutes(), R = useCallback(
     (B) => V(void 0, [B], function* ({ target: j, position: N }) {
       var E;
-      const [R] = ((E = j == null ? void 0 : j.split) == null ? void 0 : E.call(j, "||")) || [];
-      if (!R)
+      const [w] = ((E = j == null ? void 0 : j.split) == null ? void 0 : E.call(j, "||")) || [];
+      if (!w)
         return;
-      const M = findByUid(c, R), $ = createDesignable({
+      const M = findByUid(c, w), $ = createDesignable({
         t: l,
         api: r,
         refresh: a,
@@ -39378,7 +39384,7 @@ const insertPositionToMethod = {
         components: components$4,
         effects: g,
         schema: F,
-        onSubmit: w
+        onSubmit: R
       }
     ),
     /* @__PURE__ */ jsx(SchemaSettingsDivider, {}),
@@ -39622,8 +39628,8 @@ const useParentRoute = () => useContext(ParentRouteContext), useNocoBaseRoutes =
               const I = findMenuItem(v);
               if (!I)
                 return n == null ? void 0 : n(y);
-              const w = findKeysByUid(e, I["x-uid"]);
-              o(w), n == null || n({
+              const R = findKeysByUid(e, I["x-uid"]);
+              o(R), n == null || n({
                 key: I.name,
                 item: {
                   props: {
@@ -39762,18 +39768,18 @@ const useMenuDragEnd = () => {
     onChange: d,
     onFocus: p,
     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) : [])), [w, T] = useState(() => ["inline", "mix"].includes(n) ? a || F : a), D = useMemo(() => {
+  } = 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;
     if (o) {
-      const R = findKeysByUid(f, o);
-      N = (R == null ? void 0 : R[0]) || null;
+      const w = findKeysByUid(f, o);
+      N = (w == null ? void 0 : w[0]) || null;
     } else
       N = (F == null ? void 0 : F[0]) || null;
     if (n === "mix" && N) {
-      const R = (B = f.properties) == null ? void 0 : B[N];
-      if ((R == null ? void 0 : R["x-component"]) === "Menu.SubMenu")
-        return R;
+      const w = (B = f.properties) == null ? void 0 : B[N];
+      if ((w == null ? void 0 : w["x-component"]) === "Menu.SubMenu")
+        return w;
     }
     return null;
   }, [F, n, f, o]);
@@ -39802,7 +39808,7 @@ const useMenuDragEnd = () => {
         onSelect: t,
         setDefaultSelectedKeys: I,
         defaultSelectedKeys: F,
-        defaultOpenKeys: w,
+        defaultOpenKeys: R,
         selectedKeys: y,
         designable: O.designable,
         render: b,
@@ -39815,7 +39821,7 @@ const useMenuDragEnd = () => {
         mode: n,
         sideMenuSchema: D,
         sideMenuRef: S,
-        openKeys: w,
+        openKeys: R,
         setOpenKeys: T,
         selectedKeys: y,
         onSelect: t,
@@ -40206,15 +40212,15 @@ const className1 = css`
           m
         ).open({
           initialValues: {}
-        }), { title: I, icon: w } = F, T = uid(), D = uid();
+        }), { title: I, icon: R } = F, T = uid(), D = uid();
         yield g({
           type: NocoBaseDesktopRouteType.tabs,
           schemaUid: T,
           title: I || '{{t("Unnamed")}}',
-          icon: w,
+          icon: R,
           parentId: h.id,
           tabSchemaName: D
-        }), u.insertBeforeEnd(getTabSchema({ title: I, icon: w, schemaUid: T, tabSchemaName: D }));
+        }), u.insertBeforeEnd(getTabSchema({ title: I, icon: R, schemaUid: T, tabSchemaName: D }));
       }),
       children: o("Add tab")
     }
@@ -40231,14 +40237,14 @@ const className1 = css`
     return (F = h == null ? void 0 : h.children) == null ? void 0 : F.map((I) => {
       if (!I || I.hideInMenu)
         return null;
-      const w = { __route__: I };
+      const R = { __route__: I };
       return {
         label: /* @__PURE__ */ jsx(NocoBaseRouteContext.Provider, { value: I, children: /* @__PURE__ */ jsxs(
           SortableItem,
           {
             id: String(I.id),
             className: cls("nb-action-link", "designerCss", e),
-            schema: w,
+            schema: R,
             children: [
               I.icon && /* @__PURE__ */ jsx(Icon, { style: { marginRight: 8 }, type: I.icon }),
               /* @__PURE__ */ jsx("span", { children: I.title && r(f(I.title)) || o("Unnamed") }),
@@ -40621,15 +40627,15 @@ const AppendsTreeSelect = (e) => {
     "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 R = S.getCollection(N);
-    return R ? R.getAllFields(B) : [];
+    const w = S.getCollection(N);
+    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* () {
       if (c != null)
         return c(N);
       if (!N.isLeaf && N.loadChildren) {
         const B = N.loadChildren(N);
-        h((R) => B.reduce((M, $) => Object.assign(M, { [$.value]: $ }), x({}, R)));
+        h((w) => B.reduce((M, $) => Object.assign(M, { [$.value]: $ }), x({}, w)));
       }
     }),
     [c]
@@ -40641,15 +40647,15 @@ const AppendsTreeSelect = (e) => {
       title: l.label,
       fullTitle: l.label,
       isLeaf: !1
-    }) : null, R = (c === null ? [] : getCollectionFieldOptions.call({ compile: d, getCollectionFields: y, filter: a }, C, N)).reduce((M, $) => Object.assign(M, { [$.value]: $ }), {});
-    N && (R[N.value] = N), h(R);
+    }) : 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);
   }, [g, l, a, c]), useEffect(() => {
     const N = e.multiple ? n : n ? [n] : [];
-    if (!(N != null && N.length) || N.every((R) => !!m[R]))
+    if (!(N != null && N.length) || N.every((w) => !!m[w]))
       return;
     const B = [];
-    N.forEach((R) => {
-      const M = R.split(".");
+    N.forEach((w) => {
+      const M = w.split(".");
       let $ = m[M[0]];
       for (let k = 1; k < M.length && $; k++) {
         const z = M.slice(0, k + 1).join(".");
@@ -40662,38 +40668,38 @@ const AppendsTreeSelect = (e) => {
           E != null && E.length && (B.push(...E), $ = E.find((q) => q.value === M.slice(0, k + 1).join(".")));
         }
       }
-    }), h((R) => B.reduce((M, $) => Object.assign(M, { [$.value]: $ }), x({}, R)));
+    }), h((w) => B.reduce((M, $) => Object.assign(M, { [$.value]: $ }), x({}, w)));
   }, [n, v.length, e.multiple]);
-  const w = useCallback(
+  const R = useCallback(
     (N) => {
       if (!e.multiple) {
         o(N);
         return;
       }
-      const B = N.map(($) => $.value).filter(Boolean), R = new Set(B), M = F.find(($) => !R.has($.value));
+      const B = N.map(($) => $.value).filter(Boolean), w = new Set(B), M = F.find(($) => !w.has($.value));
       if (M) {
         const $ = `${M.value}.`;
         Object.keys(m).forEach((k) => {
-          k.startsWith($) && R.delete(k);
+          k.startsWith($) && w.delete(k);
         });
       } else
         B.forEach(($) => {
           const k = $.split(".");
           if (k.length)
             for (let z = 1; z <= k.length; z++)
-              R.add(k.slice(0, z).join("."));
+              w.add(k.slice(0, z).join("."));
         });
-      o(Array.from(R));
+      o(Array.from(w));
     },
     [e.multiple, F, o, m]
   ), T = useCallback(
     (N) => {
       var z;
-      const { value: B, onClose: R, disabled: M, closable: $ } = N;
+      const { value: B, onClose: w, disabled: M, closable: $ } = N;
       if (!B)
         return null;
       const { fullTitle: k } = (z = m[B]) != null ? z : {};
-      return /* @__PURE__ */ jsx(Tag, { closable: $ && !M, onClose: R, children: k == null ? void 0 : k.join(" / ") });
+      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] : [];
@@ -40712,7 +40718,7 @@ const AppendsTreeSelect = (e) => {
       treeCheckStrictly: e.multiple,
       treeCheckable: e.multiple,
       tagRender: T,
-      onChange: w,
+      onChange: R,
       treeDataSimpleMode: !0,
       treeData: v,
       loadData: I
@@ -40750,34 +40756,34 @@ const InternalAssociationSelect$1 = observer$1(
       return f.addEffects(j, () => {
         onFieldInputValueChange("*", (N) => {
           var $, k, z, E, q, L;
-          const B = filterAnalyses((z = (k = ($ = r.componentProps) == null ? void 0 : $.service) == null ? void 0 : k.params) == null ? void 0 : z.filter) || [], R = getFieldPath(N.address.entire), M = getFieldPath(r.address.entire);
-          B.includes((E = N == null ? void 0 : N.props) == null ? void 0 : E.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 && (!((L = r == null ? void 0 : r.indexes) != null && L.length) || isEqual(R, 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(N.address.entire), M = getFieldPath(r.address.entire);
+          B.includes((E = N == null ? void 0 : N.props) == null ? void 0 : E.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 && (!((L = r == null ? void 0 : r.indexes) != null && L.length) || isEqual(w, M)) && (r.setValue(null), p(null));
         });
       }), () => {
         f.removeEffects(j);
       };
     }, []);
-    const w = (j) => V(void 0, null, function* () {
+    const R = (j) => V(void 0, null, function* () {
       var M, $;
       const { search: N, callBack: B } = j, {
-        data: { data: R }
+        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
         }
       });
-      if (R) {
+      if (w) {
         if (["m2m", "o2m"].includes(l == null ? void 0 : l.interface) && g !== !1) {
           const k = f.getValuesIn(r.path) || [];
-          k.push(R), f.setValuesIn(r.path, k), r.onInput(k);
+          k.push(w), f.setValuesIn(r.path, k), r.onInput(k);
         } else
-          f.setValuesIn(r.path, R), r.onInput(R);
+          f.setValuesIn(r.path, w), r.onInput(w);
         isFunction$1(B) && (B == null || B()), message.success(h("Saved successfully"));
       }
     }), T = (j) => /* @__PURE__ */ jsxs(
       "div",
       {
-        onClick: () => w(j),
+        onClick: () => R(j),
         style: { cursor: "pointer", padding: "5px 12px", color: "#0d0c0c" },
         children: [
           /* @__PURE__ */ jsx(PlusOutlined, {}),
@@ -41398,16 +41404,16 @@ function Uploader(n) {
       var N;
       const j = O.fileList.filter((B) => B.status !== "done").map(normalizeFile);
       if (m(j), i) {
-        const B = O.fileList.filter((R) => R.status === "done");
+        const B = O.fileList.filter((w) => w.status === "done");
         if (B.length) {
-          const R = [...u, ...B.map((M) => {
+          const w = [...u, ...B.map((M) => {
             var $;
             return c(($ = M.response) == null ? void 0 : $.data);
           })];
-          j.length ? d(R) : (l == null || l([...a || [], ...R]), d([]));
+          j.length ? d(w) : (l == null || l([...a || [], ...w]), d([]));
         }
       } else {
-        const B = O.fileList.find((R) => R.uid === O.file.uid);
+        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([]));
       }
     },
@@ -41422,7 +41428,7 @@ function Uploader(n) {
       const N = j.indexOf(O);
       return j.splice(N, 1), [...j];
     });
-  }, []), F = useComponent("QRCodeUploader"), { mimetype: I, size: w } = e != null ? e : {}, T = useSizeHint(w), D = !r && (i || (!a || Array.isArray(a) && !a.length) && !p.length);
+  }, []), 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)),
@@ -41737,7 +41743,7 @@ function FileSelector(e) {
 const InternalFileManager = (e) => {
   var D, O;
   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, R) => R["x-component"] === "AssociationField.Selector" ? R : B, null) || i.addProperty("selector", schema$1.Selector), l(!0), u([]);
+    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) {
@@ -41763,11 +41769,11 @@ const InternalFileManager = (e) => {
     selectedRows: c,
     setSelectedRows: u,
     collectionField: b
-  }, w = () => {
-    const { setVisible: j } = useActionContext(), { multiple: N, selectedRows: B, onChange: R, options: M, collectionField: $ } = useContext(RecordPickerContext);
+  }, R = () => {
+    const { setVisible: j } = useActionContext(), { multiple: N, selectedRows: B, onChange: w, options: M, collectionField: $ } = useContext(RecordPickerContext);
     return {
       onClick() {
-        R(N ? unionBy(B, M, ($ == null ? void 0 : $.targetKey) || "id") : (B == null ? void 0 : B[0]) || null), j(!1);
+        w(N ? unionBy(B, M, ($ == null ? void 0 : $.targetKey) || "id") : (B == null ? void 0 : B[0]) || null), j(!1);
       }
     };
   };
@@ -41796,7 +41802,7 @@ const InternalFileManager = (e) => {
           },
           formValueChanged: !1
         },
-        children: /* @__PURE__ */ jsx(RecordPickerProvider, P(x({}, I), { children: /* @__PURE__ */ jsx(CollectionProvider_deprecated, { name: b == null ? void 0 : b.target, children: /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(TableSelectorParamsProvider, { params: {}, children: /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: { usePickActionProps: w, useTableSelectorProps: useTableSelectorProps$3 }, children: /* @__PURE__ */ jsx(
+        children: /* @__PURE__ */ jsx(RecordPickerProvider, P(x({}, I), { children: /* @__PURE__ */ jsx(CollectionProvider_deprecated, { name: b == null ? void 0 : b.target, children: /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(TableSelectorParamsProvider, { params: {}, children: /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: { usePickActionProps: R, useTableSelectorProps: useTableSelectorProps$3 }, children: /* @__PURE__ */ jsx(
           NocoBaseRecursionField,
           {
             onlyRenderProperties: !0,
@@ -41823,13 +41829,13 @@ const InternalFileManager = (e) => {
   const { data: t, mapOptions: n, onChange: o, value: r } = e, [i, a] = useState([
     { key: void 0, children: [], value: null }
   ]), [l, c] = useState(t), [u, d] = useState(!1), p = useCompile(), m = useAPIClient(), h = useServiceOptions$1(e), { options: g, field: f } = useAssociationFieldContext(), C = m.resource(g.target), { getCollectionJoinField: b, getInterface: S } = useCollectionManager_deprecated(), y = (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(() => {
-    var B, R;
-    return v != null && v.interface && ((R = (B = S(v.interface)) == null ? void 0 : B.filterable) == null ? void 0 : R.operators[0].value) || "$includes";
+    var B, w;
+    return v != null && v.interface && ((w = (B = S(v.interface)) == null ? void 0 : B.filterable) == null ? void 0 : w.operators[0].value) || "$includes";
   }, [v]), I = useField();
   useEffect(() => {
     var B;
     if (r) {
-      const R = Array.isArray(r) ? extractLastNonNullValueObjects(r == null ? void 0 : r.filter(($) => $.value), !0) : transformNestedData(r), M = (B = R == null ? void 0 : R.map) == null ? void 0 : B.call(R, ($) => ({
+      const w = Array.isArray(r) ? extractLastNonNullValueObjects(r == null ? void 0 : r.filter(($) => $.value), !0) : transformNestedData(r), M = (B = w == null ? void 0 : w.map) == null ? void 0 : B.call(w, ($) => ({
         key: $.parentId,
         children: [],
         value: $
@@ -41837,12 +41843,12 @@ const InternalFileManager = (e) => {
       a(M);
     }
   }, []);
-  const w = useCallback(
+  const R = useCallback(
     (B) => {
       try {
-        return B == null ? void 0 : B.filter((R) => ["number", "string"].includes(typeof R[y.value])).map((R) => {
+        return B == null ? void 0 : B.filter((w) => ["number", "string"].includes(typeof w[y.value])).map((w) => {
           var $, k, z;
-          let M = p(R[y.label]);
+          let M = p(w[y.label]);
           if (($ = v == null ? void 0 : v.uiSchema) != null && $.enum)
             if (Array.isArray(M))
               M = M.map((E, q) => {
@@ -41856,45 +41862,45 @@ const InternalFileManager = (e) => {
             }
           return (v == null ? void 0 : v.type) === "date" && (M = dayjs(M).format("YYYY-MM-DD")), n ? n({
             [y.label]: M || EMPTY,
-            [y.value]: R[y.value]
-          }) : P(x({}, R), {
+            [y.value]: w[y.value]
+          }) : P(x({}, w), {
             [y.label]: M || EMPTY,
-            [y.value]: R[y.value]
+            [y.value]: w[y.value]
           });
         }).filter(Boolean);
-      } catch (R) {
-        return console.error(R), B;
+      } catch (w) {
+        return console.error(w), B;
       }
     },
     [v == null ? void 0 : v.uiSchema, y]
   ), T = (B) => V(void 0, null, function* () {
     var M, $;
-    const R = yield C.list({
+    const w = yield C.list({
       pageSize: 200,
       params: h == null ? void 0 : h.params,
       filter: mergeFilter([B, (M = h == null ? void 0 : h.params) == null ? void 0 : M.filter]),
       tree: B.parentId ? void 0 : !0
     });
-    return ($ = R == null ? void 0 : R.data) == null ? void 0 : $.data;
-  }), D = (B, R, M) => V(void 0, null, function* () {
-    const $ = yield T({ parentId: R == null ? void 0 : R.id }), k = [...i];
-    if (k.splice(M + 1), k[M] = P(x({}, k[M]), { value: R }), R != null && R.id && (k[M + 1] = { key: R == null ? void 0 : R.id, children: ($ == null ? void 0 : $.length) > 0 ? $ : null }), a(k), ["o2m", "m2m"].includes(g.interface)) {
+    return ($ = w == null ? void 0 : w.data) == null ? void 0 : $.data;
+  }), D = (B, w, M) => V(void 0, null, function* () {
+    const $ = yield T({ parentId: w == null ? void 0 : w.id }), k = [...i];
+    if (k.splice(M + 1), k[M] = P(x({}, k[M]), { value: w }), w != null && w.id && (k[M + 1] = { key: w == null ? void 0 : w.id, children: ($ == null ? void 0 : $.length) > 0 ? $ : null }), a(k), ["o2m", "m2m"].includes(g.interface)) {
       const z = Array.isArray(f.fieldValue) ? f.fieldValue : [];
-      z[I.index] = R, f.fieldValue = z;
+      z[I.index] = w, f.fieldValue = z;
     } else
-      f.value = R;
+      f.value = w;
     k.length === 1 && !k[0].value ? o == null || o(null) : o == null || o(k);
-  }), O = (B, R, M) => V(void 0, null, function* () {
+  }), O = (B, w, M) => V(void 0, null, function* () {
     var $, k, z;
     if (B) {
       d(!0);
-      const E = yield T({ parentId: R == null ? void 0 : R.key });
-      if (d(!1), c(E), M === (i == null ? void 0 : i.length) - 1 && (($ = R == null ? void 0 : R.value) != null && $.id)) {
-        const q = yield T({ parentId: (k = R == null ? void 0 : R.value) == null ? void 0 : k.id }), L = [...i];
-        L.splice(M + 1), L[M] = P(x({}, L[M]), { value: R == null ? void 0 : R.value }), L[M + 1] = { key: (z = R == null ? void 0 : R.value) == null ? void 0 : z.id, children: (q == null ? void 0 : q.length) > 0 ? q : null }, a(L), o == null || o(L);
+      const E = yield T({ parentId: w == null ? void 0 : w.key });
+      if (d(!1), c(E), M === (i == null ? void 0 : i.length) - 1 && (($ = w == null ? void 0 : w.value) != null && $.id)) {
+        const q = yield T({ parentId: (k = w == null ? void 0 : w.value) == null ? void 0 : k.id }), L = [...i];
+        L.splice(M + 1), L[M] = P(x({}, L[M]), { value: w == null ? void 0 : w.value }), L[M + 1] = { key: (z = w == null ? void 0 : w.value) == null ? void 0 : z.id, children: (q == null ? void 0 : q.length) > 0 ? q : null }, a(L), o == null || o(L);
       }
     }
-  }), j = (B, R) => V(void 0, null, function* () {
+  }), j = (B, w) => V(void 0, null, function* () {
     const M = B ? {
       [y.label]: {
         [F]: B
@@ -41902,11 +41908,11 @@ const InternalFileManager = (e) => {
     } : {};
     d(!0);
     const $ = yield T(P(x({}, M), {
-      parentId: R == null ? void 0 : R.key
+      parentId: w == null ? void 0 : w.key
     }));
     d(!1), c($);
   });
-  return /* @__PURE__ */ jsx(Space$1, { wrap: !0, children: i.map((B, R) => {
+  return /* @__PURE__ */ jsx(Space$1, { wrap: !0, children: i.map((B, w) => {
     var M, $, k;
     return B.children && /* @__PURE__ */ jsx(
       Select$1,
@@ -41925,9 +41931,9 @@ const InternalFileManager = (e) => {
         onSearch: (z) => j(z, B),
         fieldNames: y,
         style: { minWidth: 150 },
-        onChange: (z, E) => D(z, E, R),
-        options: u ? [] : w(l),
-        onDropdownVisibleChange: (z) => O(z, B, R),
+        onChange: (z, E) => D(z, E, w),
+        options: u ? [] : R(l),
+        onDropdownVisibleChange: (z) => O(z, B, w),
         notFoundContent: u ? /* @__PURE__ */ jsx(Spin, { size: "small" }) : null
       },
       `${(k = B.value) == null ? void 0 : k.id}+ ${B.key} + ${y.label}`
@@ -42166,7 +42172,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(), w = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((M) => {
+    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 $ = M == null ? void 0 : M[d.label];
       return P(x({}, M), {
         [d.label]: getLabelFormatValue$1(b(S), b($))
@@ -42178,23 +42184,23 @@ const InternalNesterCardCss = css`
       association: {
         target: f == null ? void 0 : f.target
       },
-      options: w,
+      options: R,
       onChange: e == null ? void 0 : e.onChange,
       selectedRows: v,
       setSelectedRows: F,
       collectionField: f,
       currentFormCollection: C
     }, D = () => {
-      var R;
-      return n == null ? null : Array.isArray(t) ? (R = t.filter(Boolean)) == null ? void 0 : R.map((M) => M == null ? void 0 : M[d.value]) : t == null ? void 0 : t[d.value];
+      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 = () => {
-      const R = (f == null ? void 0 : f.targetKey) || "id", M = w.map((k) => k[R]).filter(Boolean);
-      return M.length ? { $and: [{ [`${R}.$ne`]: M }] } : {};
+      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 = () => {
-      const { setVisible: R } = useActionContext(), { multiple: M, selectedRows: $, onChange: k, options: z, collectionField: E } = useContext(RecordPickerContext);
+      const { setVisible: w } = useActionContext(), { multiple: M, selectedRows: $, onChange: k, options: z, collectionField: E } = useContext(RecordPickerContext);
       return {
         onClick() {
-          k(M ? unionBy($, z, (E == null ? void 0 : E.targetKey) || "id") : ($ == null ? void 0 : $[0]) || null), R(!1);
+          k(M ? unionBy($, z, (E == null ? void 0 : E.targetKey) || "id") : ($ == null ? void 0 : $[0]) || null), w(!1);
         },
         style: {
           display: M === !1 ? "none" : "block"
@@ -42213,18 +42219,18 @@ const InternalNesterCardCss = css`
           }, c), {
             mode: n ? "multiple" : e.mode,
             fieldNames: d,
-            onDropdownVisibleChange: (R) => {
+            onDropdownVisibleChange: (w) => {
               g(schema$1.Selector), m(!0);
             },
             allowClear: !0,
-            onChange: (R) => {
-              if (R) {
-                if (Array.isArray(R)) {
-                  if (!R.length) {
+            onChange: (w) => {
+              if (w) {
+                if (Array.isArray(w)) {
+                  if (!w.length) {
                     r([]), F([]);
                     return;
                   }
-                  const M = w == null ? void 0 : w.filter(($) => R.includes($[d.value]));
+                  const M = R == null ? void 0 : R.filter(($) => w.includes($[d.value]));
                   r(M), F(M);
                 }
               } else {
@@ -42232,7 +42238,7 @@ const InternalNesterCardCss = css`
                 r(M), F(M);
               }
             },
-            options: w,
+            options: R,
             value: D(),
             open: !1
           })
@@ -42243,7 +42249,7 @@ const InternalNesterCardCss = css`
             onlyRenderProperties: !0,
             basePath: u.address,
             schema: h,
-            filterProperties: (R) => R["x-component"] === "Action"
+            filterProperties: (w) => w["x-component"] === "Action"
           }
         ) }) })
       ] }),
@@ -42269,7 +42275,7 @@ const InternalNesterCardCss = css`
                   onlyRenderProperties: !0,
                   basePath: u.address,
                   schema: h,
-                  filterProperties: (R) => R["x-component"] === "AssociationField.Selector"
+                  filterProperties: (w) => w["x-component"] === "AssociationField.Selector"
                 }
               )
             }
@@ -42306,11 +42312,11 @@ const RenderRecord = React.memo(
     F.current = u;
     const I = useCallback(() => F.current, []);
     return useEffect(() => {
-      const w = 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"), R = o(
+      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),
           (e == null ? void 0 : e.label) || "label"
-        ), M = getLabelFormatValue$1(n(R), B, !0);
+        ), M = getLabelFormatValue$1(n(w), B, !0);
         return /* @__PURE__ */ jsxs(Fragment, { children: [
           /* @__PURE__ */ jsx("span", { children: i ? M : a !== !1 ? /* @__PURE__ */ jsx(
             "a",
@@ -42337,7 +42343,7 @@ const RenderRecord = React.memo(
           D < O.length - 1 ? /* @__PURE__ */ jsx("span", { style: { marginRight: 4, color: "#aaa" }, children: "," }) : null
         ] }, `${T == null ? void 0 : T.id}_${D}`);
       });
-      y(w), b(!1);
+      y(R), b(!1);
     }, [
       r == null ? void 0 : r.target,
       n,
@@ -42776,7 +42782,7 @@ const CreateAction = observer$1(
       key: D.name,
       label: S(D.title),
       onClick: () => t == null ? void 0 : t(D)
-    })), [g, t]), w = useMemo(() => ({
+    })), [g, t]), R = useMemo(() => ({
       items: I
     }), [I]);
     return useEffect(() => {
@@ -42803,7 +42809,7 @@ const CreateAction = observer$1(
         allowAddToCurrent: u,
         props: e,
         componentType: p,
-        menu: w,
+        menu: R,
         onClick: t,
         collection: n,
         icon: v,
@@ -42846,8 +42852,8 @@ function FinallyButton({
       danger: o.danger,
       icon: c,
       onClick: (v) => {
-        const F = getLinkageCollection(t, d, u), I = e.find((T) => T.name === F) ? F : l.name, w = m(I);
-        a == null || a(w);
+        const F = getLinkageCollection(t, d, u), I = e.find((T) => T.name === F) ? F : l.name, R = m(I);
+        a == null || a(R);
       },
       style: x({
         display: !p && ((C = u == null ? void 0 : u.data) == null ? void 0 : C.hidden) && "none",
@@ -42991,14 +42997,14 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
       }
     });
     Array.isArray(o.value) || (o.value = []);
-    const I = useCallback(({ form: j, fieldSchema: N, collectionField: B, getInterface: R }) => {
+    const I = useCallback(({ form: j, fieldSchema: N, 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, R);
-    }, []), w = () => {
+      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);
+    }, []), R = () => {
       const { setVisible: j } = useActionContext(), { selectedRows: N, setSelectedRows: B } = useContext(RecordPickerContext);
       return {
         onClick() {
-          N.map((R) => o.value.push(markRecordAsNew(R))), o.onInput(o.value), o.initialValue = o.value, B([]), j(!1);
+          N.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) => {
@@ -43019,7 +43025,7 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
       setSelectedRows: b,
       collectionField: n
     }, O = () => {
-      const j = (n == null ? void 0 : n.targetKey) || "id", N = (o.value || []).map((R) => R == null ? void 0 : R[j]).filter(Boolean);
+      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 }] } : {};
     };
     return o.value.length > 0 ? /* @__PURE__ */ jsxs(
@@ -43108,7 +43114,7 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
                 SchemaComponentOptions,
                 {
                   scope: {
-                    usePickActionProps: w,
+                    usePickActionProps: R,
                     useTableSelectorProps: useTableSelectorProps$2,
                     useCreateActionProps
                   },
@@ -43150,7 +43156,7 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
     const t = useFieldSchema(), { enableLink: n, tagColorField: o } = t["x-component-props"], r = useFieldNames$1({ fieldNames: e.fieldNames }), i = useInsertSchema$1("Viewer"), { options: a } = useAssociationFieldContext(), l = useCompile(), { designable: c } = useDesignable(), u = useLabelUiSchema$1(a, (r == null ? void 0 : r.label) || "label"), { snapshot: d } = useActionContext(), p = useRef(), { getCollection: m } = useCollectionManager_deprecated(), h = m(a == null ? void 0 : a.target), g = (h == null ? void 0 : h.template) === "tree", { openPopup: f } = usePopupUtils(), C = useCollectionRecordData(), b = useRef(!1), S = useRef(t);
     S.current = t;
     const y = useCallback(() => S.current, []);
-    return /* @__PURE__ */ jsx(Fragment$1, { children: toArr$3(e.value).map((F, I, w) => {
+    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]);
       return /* @__PURE__ */ jsxs(Fragment, { children: [
         /* @__PURE__ */ jsx("span", { children: d ? j : n !== !1 ? /* @__PURE__ */ jsx(
@@ -43175,7 +43181,7 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
             children: j
           }
         ) : j }),
-        I < w.length - 1 ? /* @__PURE__ */ jsx("span", { style: { marginRight: 4, color: "#aaa" }, children: "," }) : null
+        I < R.length - 1 ? /* @__PURE__ */ jsx("span", { style: { marginRight: 4, color: "#aaa" }, children: "," }) : null
       ] }, `${F == null ? void 0 : F[r.value]}_${I}`);
     }) });
   },
@@ -43237,13 +43243,13 @@ const useColumnsDeepMemoized = (e) => {
       }
     `, [n.paddingContentVerticalLG, n.marginSM]), f = useCollection(), C = useMemo(
     () => d == null ? void 0 : d.map((S) => {
-      var I, w, T, D;
+      var I, R, T, D;
       const y = S.reduceProperties((O, j) => {
         if (isCollectionFieldComponent(j))
           return O.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: (w = S["x-component-props"]) == null ? void 0 : w.tooltip }),
+        title: /* @__PURE__ */ jsx(TableColumnTitle, { name: S.name, schema: S, onlyRenderSelf: !0, tooltip: (R = S["x-component-props"]) == null ? void 0 : R.tooltip }),
         dataIndex: v,
         key: S.name,
         sorter: (T = S["x-component-props"]) == null ? void 0 : T.sorter,
@@ -43251,8 +43257,8 @@ const useColumnsDeepMemoized = (e) => {
       }, S["x-component-props"]), {
         width: F && !a ? 0 : ((D = S["x-component-props"]) == null ? void 0 : D.width) || 100,
         render: (O, j) => {
-          var R;
-          const N = (R = o.value) == null ? void 0 : R.indexOf(j), B = o.address.concat(j.__index || N);
+          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) }) }) }) });
         },
         onCell: (O, j) => ({
@@ -43296,11 +43302,11 @@ const useColumnsDeepMemoized = (e) => {
             "div",
             {
               onClick: () => action(() => {
-                const I = (p - 1) * m + F, w = o.value[I] ? 1 : 2;
+                const I = (p - 1) * m + F, R = o.value[I] ? 1 : 2;
                 return spliceArrayState(o, {
                   startIndex: I,
-                  deleteCount: w
-                }), o.value.splice(I, w), o.setInitialValue(o.value), o.onInput(o.value);
+                  deleteCount: R
+                }), o.value.splice(I, R), o.setInitialValue(o.value), o.onInput(o.value);
               }),
               children: /* @__PURE__ */ jsx(CloseOutlined, { style: { cursor: "pointer", color: "gray" } })
             }
@@ -43351,7 +43357,7 @@ const useColumnsDeepMemoized = (e) => {
   const o = e, { index: t } = o, n = Y(o, ["index"]);
   return /* @__PURE__ */ jsx("div", P(x({ className: cls("nb-table-index"), style: { padding: "0 8px 0 16px" } }, n), { children: t }));
 }, pageSizeOptions$1 = [5, 10, 20, 50, 100, 200], usePaginationProps$2 = (e, t) => {
-  var S, y, v, F, I, w;
+  var S, y, v, F, I, R;
   const { t: n } = useTranslation(), o = useField(), { token: r } = useToken$1(), { data: i } = useDataBlockRequest() || {}, { meta: a } = i || {}, { hasNext: l } = a || {}, c = useMemo(
     () => x(x({}, e), t),
     [JSON.stringify(x(x({}, e), t))]
@@ -43396,7 +43402,7 @@ const useColumnsDeepMemoized = (e) => {
       ) : j
     });
   }, [c, n, C, (I = o.value) == null ? void 0 : I.length]);
-  return t === !1 || !t && e === !1 ? !1 : ((w = o.value) == null ? void 0 : w.length) > 0 || b.total ? b : !1;
+  return t === !1 || !t && e === !1 ? !1 : ((R = o.value) == null ? void 0 : R.length) > 0 || b.total ? b : !1;
 }, headerClass = css`
   max-width: 300px;
   white-space: nowrap;
@@ -43586,8 +43592,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(), w = ((ce = y == null ? void 0 : y.parent) == null ? void 0 : ce["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: T, allIncludesChildren: D } = w, O = useMemoizedFn(b.onRowDragEnd || (() => {
-    })), j = usePaginationProps$2(n, i), N = useTableColumns$1(b, j), [B, R] = useState(() => T ? D : []), [M, $] = useState(((Ce = S == null ? void 0 : S.data) == null ? void 0 : Ce.selectedRowKeys) || []), [k, z] = useState([]), E = (p == null ? void 0 : p.type) !== "none", q = useRef(/* @__PURE__ */ new Map()), L = 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, 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([]), E = (p == null ? void 0 : p.type) !== "none", q = useRef(/* @__PURE__ */ new Map()), L = useMemo(() => css`
         & > td {
           background-color: ${t.controlItemBgActive} !important;
         }
@@ -43602,7 +43608,7 @@ const Table$1 = withDynamicSchemaProps(
     }) : null, [C, k]);
     useDeepCompareEffect(() => {
       const Q = T ? D : [];
-      _.isEqual(Q, B) || R(Q);
+      _.isEqual(Q, B) || w(Q);
     }, [T, D]);
     const H = useCallback((Q) => {
       if (m)
@@ -43727,7 +43733,7 @@ const Table$1 = withDynamicSchemaProps(
     ), me = useCallback(
       (Q, te) => {
         const oe = Q ? [...B, te[F.getPrimaryKey()]] : B.filter((ie) => te[F.getPrimaryKey()] !== ie);
-        R(oe), g == null || g(Q, te);
+        w(oe), g == null || g(Q, te);
       },
       [B, g, F]
     ), he = useMemo(() => ({
@@ -43852,7 +43858,7 @@ const Table$1 = withDynamicSchemaProps(
           D(L);
         }
       };
-    }, w = () => {
+    }, R = () => {
       const z = (o == null ? void 0 : o.targetKey) || "id", E = (n.value || []).map((L) => L == null ? void 0 : L[z]).filter(Boolean);
       return E.length ? { $and: [{ [`${z}.$ne`]: E }] } : {};
     }, [T, D] = useState(1), [O, j] = useState(((M = n.componentProps) == null ? void 0 : M.pageSize) || 10);
@@ -43884,7 +43890,7 @@ const Table$1 = withDynamicSchemaProps(
           return D(E), z.onInput(z.value);
         }
       };
-    }, R = () => ({
+    }, w = () => ({
       run() {
         l(!0);
       }
@@ -43929,7 +43935,7 @@ const Table$1 = withDynamicSchemaProps(
                 C && /* @__PURE__ */ jsx(
                   Action.Link,
                   {
-                    useAction: R,
+                    useAction: w,
                     title: /* @__PURE__ */ jsxs(Space$1, { style: { gap: 2 }, children: [
                       /* @__PURE__ */ jsx(ZoomInOutlined, {}),
                       " ",
@@ -43951,7 +43957,7 @@ const Table$1 = withDynamicSchemaProps(
             visible: a,
             setVisible: l
           },
-          children: /* @__PURE__ */ jsx(RecordPickerProvider, P(x({}, F), { children: /* @__PURE__ */ jsx(CollectionProvider_deprecated, { name: o == null ? void 0 : o.target, children: /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(TableSelectorParamsProvider, { params: { filter: w() }, children: /* @__PURE__ */ jsx(
+          children: /* @__PURE__ */ jsx(RecordPickerProvider, P(x({}, F), { children: /* @__PURE__ */ jsx(CollectionProvider_deprecated, { name: o == null ? void 0 : o.target, children: /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(TableSelectorParamsProvider, { params: { filter: R() }, children: /* @__PURE__ */ jsx(
             SchemaComponentOptions,
             {
               scope: {
@@ -44065,8 +44071,8 @@ InternalAssociationSelect.displayName = "InternalAssociationSelect";
 const AssociationSelect = InternalAssociationSelect;
 AssociationSelect.Designer = function e() {
   var M, $, k, z, E, q, L, 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), w = ($ = S == null ? void 0 : S.uiSchema) == null ? void 0 : $.title, T = S != null && S.target ? t(S == null ? void 0 : S.target) : [];
-  c.title === w || c.title;
+  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 = ((E = (z = (k = c.componentProps) == null ? void 0 : k.service) == null ? void 0 : z.params) == null ? void 0 : E.sort) || [];
   useEffect(() => {
     c.readPretty !== u["x-read-pretty"] && (c.readPretty = !!u["x-read-pretty"]);
@@ -44088,7 +44094,7 @@ AssociationSelect.Designer = function e() {
   });
   let B = "editable";
   u["x-disabled"] === !0 && (B = "readonly"), u["x-read-pretty"] === !0 && (B = "read-pretty");
-  const R = _.omit(u, "required");
+  const w = _.omit(u, "required");
   return /* @__PURE__ */ jsxs(GeneralSchemaDesigner, { children: [
     /* @__PURE__ */ jsx(GeneralSchemaItems, {}),
     l && !(l != null && l.readPretty) && I && /* @__PURE__ */ jsx(
@@ -44205,9 +44211,9 @@ AssociationSelect.Designer = function e() {
           type: "object",
           title: d("Set default value"),
           properties: {
-            default: P(x({}, R || {}), {
+            default: P(x({}, w || {}), {
               "x-decorator": "FormItem",
-              "x-component-props": P(x({}, R["x-component-props"]), {
+              "x-component-props": P(x({}, w["x-component-props"]), {
                 component: S != null && S.target ? "AssociationSelect" : void 0,
                 service: {
                   resource: S == null ? void 0 : S.target
@@ -44463,10 +44469,10 @@ AssociationSelect.Designer = function e() {
   ] });
 };
 AssociationSelect.FilterDesigner = function e() {
-  var F, I, w, T, D, O, j, N, B, R, M;
+  var F, I, R, T, D, O, j, N, 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 = (w = a.componentProps) == null ? void 0 : w.service) == null ? void 0 : T.params) == null ? void 0 : D.sort) || [], y = S == null ? void 0 : S.map(($) => $.startsWith("-") ? {
+  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("-") ? {
     field: $.substring(1),
     direction: "desc"
   } : {
@@ -44720,7 +44726,7 @@ AssociationSelect.FilterDesigner = function e() {
       {
         title: c("Title field"),
         options: v,
-        value: (M = (R = a == null ? void 0 : a.componentProps) == null ? void 0 : R.fieldNames) == null ? void 0 : M.label,
+        value: (M = (w = a == null ? void 0 : a.componentProps) == null ? void 0 : w.fieldNames) == null ? void 0 : M.label,
         onChange: ($) => {
           var E, q;
           const k = {
@@ -44843,11 +44849,11 @@ const AutoComplete = withDynamicSchemaProps(
           }
         },
         e
-      ) : {}, C = () => toArr$3(n).map((v) => typeof v == "object" ? v[m.value] : v), b = (v, F) => /* @__PURE__ */ jsx(Space$1, { split: "/", children: v.map((I, w) => {
-        if (F[w])
-          return /* @__PURE__ */ jsx("span", { children: I }, w);
+      ) : {}, C = () => toArr$3(n).map((v) => typeof v == "object" ? v[m.value] : v), b = (v, F) => /* @__PURE__ */ jsx(Space$1, { split: "/", children: v.map((I, R) => {
+        if (F[R])
+          return /* @__PURE__ */ jsx("span", { children: I }, R);
         const T = toArr$3(n).filter(Boolean).find((D) => D[m.value] === I);
-        return /* @__PURE__ */ jsx("span", { children: (T == null ? void 0 : T[m.label]) || I }, w);
+        return /* @__PURE__ */ jsx("span", { children: (T == null ? void 0 : T[m.label]) || I }, R);
       }) }), S = (v) => {
         var F;
         v && !((F = t.dataSource) != null && F.length) && (f == null || f());
@@ -45728,17 +45734,17 @@ const InternalGridCardBlockProvider = (e) => {
   (e) => {
     var I;
     const { columnCount: t, pagination: n } = useProps(e), { service: o, columnCount: r = defaultColumnCount } = useGridCardBlockContext(), i = t || r, { run: a, params: l } = o, c = (I = o == null ? void 0 : o.data) == null ? void 0 : I.meta, u = useFieldSchema(), d = useField(), p = useDesigner(), m = useGridCardBodyHeight(), h = useCallback(
-      (w) => new Schema({
+      (R) => new Schema({
         type: "object",
         properties: {
-          [w]: x({}, u.properties.item)
+          [R]: x({}, u.properties.item)
         }
       }),
       [u.properties]
     ), { token: g } = useToken(), f = useCallback(
-      (w, T) => {
+      (R, T) => {
         a(P(x({}, l == null ? void 0 : l[0]), {
-          page: w,
+          page: R,
           pageSize: T
         }));
       },
@@ -45793,7 +45799,7 @@ const InternalGridCardBlockProvider = (e) => {
                         xl: i.lg,
                         gutter: [g.marginBlock / 2, g.marginBlock / 2]
                       }),
-                      renderItem: (w, T) => /* @__PURE__ */ jsx(Col, { style: { height: "100%" }, className: "nb-card-item-warper", children: /* @__PURE__ */ jsx(
+                      renderItem: (R, T) => /* @__PURE__ */ jsx(Col, { style: { height: "100%" }, className: "nb-card-item-warper", children: /* @__PURE__ */ jsx(
                         NocoBaseRecursionField,
                         {
                           basePath: d.address,
@@ -45839,7 +45845,7 @@ function IconField(e) {
     var I;
     const F = (I = v == null ? void 0 : v.trim()) != null ? I : "";
     m(
-      F.length ? n.filter((w) => w.split(" ").some((T) => T.includes(F))) : n
+      F.length ? n.filter((R) => R.split(" ").some((T) => T.includes(F))) : n
     );
   }, 250), y = () => /* @__PURE__ */ jsxs(Flex, { vertical: !0, gap: "middle", children: [
     /* @__PURE__ */ jsx(
@@ -46160,7 +46166,7 @@ const InternalListBlockProvider = (e) => {
           }
         },
         onSubmit: ({ sort: F }) => {
-          const I = F.map((w) => w.direction === "desc" ? `-${w.field}` : w.field);
+          const I = F.map((R) => R.direction === "desc" ? `-${R.field}` : R.field);
           _.set(r, "x-decorator-props.params.sort", I), a.decoratorProps.params = P(x({}, r["x-decorator-props"].params), { page: 1 }), l.emit("patch", {
             schema: {
               "x-uid": r["x-uid"],
@@ -46292,7 +46298,7 @@ const InternalListBlockProvider = (e) => {
   return e - u - n.paddingLG - l;
 }, InternalList = withSkeletonComponent(
   (e) => {
-    var N, B, R;
+    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(
       (M) => (m.has(M) || m.set(
         M,
@@ -46314,7 +46320,7 @@ const InternalListBlockProvider = (e) => {
       [n, o]
     ), F = getCardItemSchema == null ? void 0 : getCardItemSchema(r), {
       layout: I = "vertical",
-      labelAlign: w = "left",
+      labelAlign: R = "left",
       labelWidth: T = 120,
       labelWrap: D = !0
     } = (F == null ? void 0 : F["x-component-props"]) || {}, j = (() => {
@@ -46388,7 +46394,7 @@ const InternalListBlockProvider = (e) => {
                   FormLayout,
                   {
                     layout: I,
-                    labelAlign: w,
+                    labelAlign: R,
                     labelWidth: I === "horizontal" ? T : null,
                     labelWrap: D,
                     children: /* @__PURE__ */ jsx(
@@ -46396,7 +46402,7 @@ const InternalListBlockProvider = (e) => {
                       P(x({}, e), {
                         pagination: !a || !((B = p.value) != null && B.length) ? !1 : j,
                         loading: t == null ? void 0 : t.loading,
-                        children: (R = p.value) != null && R.length ? p.value.map((M, $) => /* @__PURE__ */ jsx(
+                        children: (w = p.value) != null && w.length ? p.value.map((M, $) => /* @__PURE__ */ jsx(
                           NocoBaseRecursionField,
                           {
                             basePath: p.address,
@@ -46722,9 +46728,9 @@ const useTableSelectorProps$1 = () => {
   useEffect(() => {
     if (t) {
       const F = (Array.isArray(t) ? t : t ? [t] : []).map((I) => {
-        const w = I[l.label];
+        const R = I[l.label];
         return P(x({}, I), {
-          [l.label]: getLabelFormatValue(h, m(w))
+          [l.label]: getLabelFormatValue(h, m(R))
         });
       });
       S(F);
@@ -46740,7 +46746,7 @@ const useTableSelectorProps$1 = () => {
         action: `${p == null ? void 0 : p.target}:create`,
         onChange: (F) => {
           let I = toArr$3(F);
-          I.every((w) => w.status !== "uploading") && (I = I.filter((w) => w.status === "done").map((w) => w.response.data), o(n ? [...b, ...I] : I[0]));
+          I.every((R) => R.status !== "uploading") && (I = I.filter((R) => R.status === "done").map((R) => R.response.data), o(n ? [...b, ...I] : I[0]));
         }
       }
     ) : /* @__PURE__ */ jsx(
@@ -46760,7 +46766,7 @@ const useTableSelectorProps$1 = () => {
                 o([]), C([]);
                 return;
               }
-              const I = b == null ? void 0 : b.filter((w) => F.includes(w[l.value]));
+              const I = b == null ? void 0 : b.filter((R) => F.includes(R[l.value]));
               o(I), C(I);
             }
           } else {
@@ -46834,7 +46840,7 @@ const toValue$1 = (e, t) => e == null ? t : e, ReadPrettyRecordPicker = observer
     const { ellipsis: t } = e, n = useFieldSchema(), o = useRecord(), r = useCollectionManager(), i = useFieldNames(e), [a, l] = useState(!1), c = useCollection(), u = (c == null ? void 0 : c.getField(n.name)) || (r == null ? void 0 : r.getCollectionField(n == null ? void 0 : n["x-collection-field"])), [d, p] = useState({}), m = useCompile(), h = useLabelUiSchema(u, (i == null ? void 0 : i.label) || "label"), { snapshot: g } = useActionContext(), f = ((v = n["x-component-props"]) == null ? void 0 : v.mode) === "tags", C = useRef();
     if (isShowFilePicker(h))
       return u ? /* @__PURE__ */ jsx(Preview, x({}, e)) : null;
-    const b = () => toArr$3(e.value).map((I, w, T) => {
+    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);
       return /* @__PURE__ */ jsxs(Fragment, { children: [
         /* @__PURE__ */ jsx("span", { className: "test-record-picker-read-pretty-item", children: g || f ? O : /* @__PURE__ */ jsx(
@@ -46847,8 +46853,8 @@ const toValue$1 = (e, t) => e == null ? t : e, ReadPrettyRecordPicker = observer
             children: O
           }
         ) }),
-        w < T.length - 1 ? /* @__PURE__ */ jsx("span", { style: { marginRight: 4, color: "#aaa" }, children: "," }) : null
-      ] }, `${I[i.value]}_${w}`);
+        R < T.length - 1 ? /* @__PURE__ */ jsx("span", { style: { marginRight: 4, color: "#aaa" }, children: "," }) : null
+      ] }, `${I[i.value]}_${R}`);
     }), S = () => /* @__PURE__ */ jsx(WithoutTableFieldResource.Provider, { value: !0, children: /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(
       NocoBaseRecursionField,
       {
@@ -46857,8 +46863,8 @@ const toValue$1 = (e, t) => e == null ? t : e, ReadPrettyRecordPicker = observer
         filterProperties: (I) => I["x-component"] === "RecordPicker.Viewer"
       }
     ) }) }), y = () => {
-      var w;
-      const I = (w = n == null ? void 0 : n["x-collection-field"]) == null ? void 0 : w.split(".");
+      var R;
+      const I = (R = n == null ? void 0 : n["x-collection-field"]) == null ? void 0 : R.split(".");
       return I && I.length > 2 ? /* @__PURE__ */ jsx(RecordProvider, { record: d, parent: o[I[1]], children: S() }) : /* @__PURE__ */ jsx(RecordProvider, { record: d, parent: o, children: S() });
     };
     return u ? /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(BlockAssociationContext.Provider, { value: `${u.collectionName}.${u.name}`, children: /* @__PURE__ */ jsxs(CollectionProvider_deprecated, { name: (F = u.target) != null ? F : u.targetCollection, children: [
@@ -47675,8 +47681,8 @@ const useStyles$2 = genStyleHook("nb-rich-text", (e) => {
         }),
         renderCell: (y, v, F, I) => {
           var D, O;
-          const w = (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;
-          return w && (F = F + (w - 1) * T), /* @__PURE__ */ jsxs(
+          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;
+          return R && (F = F + (R - 1) * T), /* @__PURE__ */ jsxs(
             "div",
             {
               className: cls(
@@ -48069,9 +48075,9 @@ const useStyles$2 = genStyleHook("nb-rich-text", (e) => {
           }
         },
         onSubmit: ({ filter: F }) => {
-          var w;
+          var R;
           const I = n.decoratorProps.request.params || {};
-          I.filter = F, n.decoratorProps.request.params = I, o["x-decorator-props"].request.params = I, a.run(P(x({}, (w = a.params) == null ? void 0 : w[0]), { filter: F })), c.emit("patch", {
+          I.filter = F, n.decoratorProps.request.params = I, o["x-decorator-props"].request.params = I, a.run(P(x({}, (R = a.params) == null ? void 0 : R[0]), { filter: F })), c.emit("patch", {
             schema: {
               "x-uid": o["x-uid"],
               "x-decorator-props": o["x-decorator-props"]
@@ -48157,8 +48163,8 @@ const useStyles$2 = genStyleHook("nb-rich-text", (e) => {
         },
         onSubmit: ({ sort: F }) => {
           var T;
-          const I = F.map((D) => D.direction === "desc" ? `-${D.field}` : D.field), w = n.decoratorProps.request.params || {};
-          w.sort = I, n.decoratorProps.request.params = w, o["x-decorator-props"].request.params = w, c.emit("patch", {
+          const I = F.map((D) => D.direction === "desc" ? `-${D.field}` : D.field), R = n.decoratorProps.request.params || {};
+          R.sort = I, n.decoratorProps.request.params = R, o["x-decorator-props"].request.params = R, c.emit("patch", {
             schema: {
               "x-uid": o["x-uid"],
               "x-decorator-props": o["x-decorator-props"]
@@ -48181,9 +48187,9 @@ const useStyles$2 = genStyleHook("nb-rich-text", (e) => {
           { label: "200", value: 200 }
         ],
         onChange: (F) => {
-          var w;
+          var R;
           const I = n.decoratorProps.request.params || {};
-          I.pageSize = F, n.decoratorProps.request.params = I, o["x-decorator-props"].request.params = I, a.run(P(x({}, (w = a.params) == null ? void 0 : w[0]), { pageSize: F })), c.emit("patch", {
+          I.pageSize = F, n.decoratorProps.request.params = I, o["x-decorator-props"].request.params = I, a.run(P(x({}, (R = a.params) == null ? void 0 : R[0]), { pageSize: F })), c.emit("patch", {
             schema: {
               "x-uid": o["x-uid"],
               "x-decorator-props": o["x-decorator-props"]
@@ -48260,7 +48266,7 @@ const TableActionColumnDesigner = (e) => {
     "sort-field"
   );
 }, TableBlockDesigner = () => {
-  var T, D, O, j, N, B, R, M, $, k, z;
+  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((E) => E != null && E.startsWith("-") ? {
     field: E.substring(1),
     direction: "desc"
@@ -48279,7 +48285,7 @@ const TableActionColumnDesigner = (e) => {
       }), c.params[0].page = 1;
     },
     [d, r.decoratorProps, i, c]
-  ), w = useAPIClient();
+  ), R = useAPIClient();
   return /* @__PURE__ */ jsxs(GeneralSchemaDesigner, { template: C, title: t || e, children: [
     /* @__PURE__ */ jsx(SchemaSettingsBlockTitleItem, {}),
     /* @__PURE__ */ jsx(SchemaSettingsBlockHeightItem, {}),
@@ -48307,7 +48313,7 @@ const TableActionColumnDesigner = (e) => {
         title: u("Enable drag and drop sorting"),
         checked: r.decoratorProps.dragSort,
         onChange: (E) => V(void 0, null, function* () {
-          E && v && (yield w.resource("collections.fields", v.collectionName).update({
+          E && v && (yield R.resource("collections.fields", v.collectionName).update({
             filterByTk: v.name,
             values: {
               sortable: !0
@@ -48326,7 +48332,7 @@ const TableActionColumnDesigner = (e) => {
       SchemaSettingsDataScope,
       {
         collectionName: e,
-        defaultFilter: ((M = (R = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : R.params) == null ? void 0 : M.filter) || {},
+        defaultFilter: ((M = (w = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : w.params) == null ? void 0 : M.filter) || {},
         form: a,
         onSubmit: I
       }
@@ -48506,8 +48512,8 @@ TableField.ActionBar = observer$1(
   { displayName: "TableField.ActionBar" }
 );
 const TableSelectorDesigner = () => {
-  var w, T, D, O, j, N;
-  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 = (w = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : w.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("-") ? {
+  var R, T, D, O, j, N;
+  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"
   } : {
@@ -48523,8 +48529,8 @@ const TableSelectorDesigner = () => {
         onSubmit: ({ filter: B }) => {
           var $;
           B = removeNullCondition(B);
-          const R = r.decoratorProps.params || {};
-          R.filter = B, r.decoratorProps.params = R, i["x-decorator-props"].params = R;
+          const w = r.decoratorProps.params || {};
+          w.filter = B, r.decoratorProps.params = w, i["x-decorator-props"].params = w;
           let M = _.cloneDeep(B);
           u && (M ? M = {
             $and: [u, M]
@@ -48563,12 +48569,12 @@ const TableSelectorDesigner = () => {
         onChange: (B) => {
           var M;
           r.form.clearFormGraph(`${r.address}.*`), r.decoratorProps.treeTable = B, i["x-decorator-props"].treeTable = B;
-          const R = P(x({}, (M = c.params) == null ? void 0 : M[0]), {
+          const w = P(x({}, (M = c.params) == null ? void 0 : M[0]), {
             tree: B ? !0 : null
           });
           p.emit("patch", {
             schema: i
-          }), p.refresh(), c.run(R);
+          }), p.refresh(), c.run(w);
         }
       }
     ),
@@ -48650,13 +48656,13 @@ const TableSelectorDesigner = () => {
         },
         onSubmit: ({ sort: B }) => {
           var $;
-          const R = B.map((k) => k.direction === "desc" ? `-${k.field}` : k.field), M = r.decoratorProps.params || {};
-          M.sort = R, r.decoratorProps.params = M, i["x-decorator-props"].params = M, p.emit("patch", {
+          const w = B.map((k) => k.direction === "desc" ? `-${k.field}` : k.field), M = r.decoratorProps.params || {};
+          M.sort = w, r.decoratorProps.params = M, i["x-decorator-props"].params = M, p.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
               "x-decorator-props": i["x-decorator-props"]
             }
-          }), c.run(P(x({}, ($ = c.params) == null ? void 0 : $[0]), { sort: R }));
+          }), c.run(P(x({}, ($ = c.params) == null ? void 0 : $[0]), { sort: w }));
         }
       }
     ),
@@ -48675,8 +48681,8 @@ const TableSelectorDesigner = () => {
         ],
         onChange: (B) => {
           var M;
-          const R = r.decoratorProps.params || {};
-          R.pageSize = B, r.decoratorProps.params = R, i["x-decorator-props"].params = R, c.run(P(x({}, (M = c.params) == null ? void 0 : M[0]), { pageSize: B, page: 1 })), p.emit("patch", {
+          const w = r.decoratorProps.params || {};
+          w.pageSize = B, r.decoratorProps.params = w, i["x-decorator-props"].params = w, c.run(P(x({}, (M = c.params) == null ? void 0 : M[0]), { pageSize: B, page: 1 })), p.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
               "x-decorator-props": i["x-decorator-props"]
@@ -50124,8 +50130,8 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   (e) => {
     const { disabled: t } = e, [n, o] = useState([]), { getCollection: r } = useCollectionManager_deprecated(), i = useRecord(), a = useField(), { collectionName: l, target: c, type: u, through: d, name: p, template: m } = i, h = i[a.props.name], g = useCompile(), f = useForm(), [C, b] = useState(h || (m === "view" ? null : a.initialValue)), [S, y] = useState([]);
     return useEffect(() => {
-      var w;
-      const F = ["belongsTo"].includes(u) ? l : ["belongsToMany"].includes(u) ? d : c, I = (w = r(F)) == null ? void 0 : w.fields;
+      var R;
+      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;
@@ -50148,7 +50154,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
         showSearch: !0,
         onDropdownVisibleChange: (F) => V(void 0, null, function* () {
           var O;
-          const { target: I, type: w, through: T } = f.values, D = ["belongsTo"].includes(w) ? l || p : ["belongsToMany"].includes(w) ? T : I;
+          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) || [];
             o(
@@ -50163,13 +50169,13 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           }
         }),
         onChange: (F, I) => {
-          var w;
-          (w = e == null ? void 0 : e.onChange) == null || w.call(e, F), b(I.label || F);
+          var R;
+          (R = e == null ? void 0 : e.onChange) == null || R.call(e, F), b(I.label || F);
         },
         onSearch: (F) => {
           if (F) {
-            const I = F.toLocaleLowerCase(), w = n.filter((T) => T.label.toLocaleLowerCase().includes(I));
-            o(w);
+            const I = F.toLocaleLowerCase(), R = n.filter((T) => T.label.toLocaleLowerCase().includes(I));
+            o(R);
           } else
             o(S);
         }
@@ -50346,11 +50352,11 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   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 || [], w = useMemo(() => d.map((R) => ({
-    label: S(R.title),
-    value: R.name
+  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) => ({
+    label: S(w.title),
+    value: w.name
   })), []), T = useCallback(() => {
-    const { availableFieldInterfaces: R } = u(o.template) || {}, { exclude: M, include: $ } = R || {}, k = [];
+    const { availableFieldInterfaces: w } = u(o.template) || {}, { exclude: M, include: $ } = w || {}, k = [];
     return F.forEach((z) => {
       var E;
       if (z.key === "systemInfo")
@@ -50370,14 +50376,14 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
         }));
       }
     }), k;
-  }, [u, o]), D = useMemo(() => T().map((R) => {
+  }, [u, o]), D = useMemo(() => T().map((w) => {
     var M;
-    return ((M = R == null ? void 0 : R.children) == null ? void 0 : M.length) === 0 ? null : o.template === "view" ? {
+    return ((M = w == null ? void 0 : w.children) == null ? void 0 : M.length) === 0 ? null : o.template === "view" ? {
       type: "group",
-      label: S(R.label),
-      title: S(R.label),
-      key: R.label,
-      children: R.children.filter(($) => ["m2o"].includes($.name)).map(($) => ({
+      label: S(w.label),
+      title: S(w.label),
+      key: w.label,
+      children: w.children.filter(($) => ["m2o"].includes($.name)).map(($) => ({
         label: S($.title),
         title: S($.title),
         key: $.name,
@@ -50385,36 +50391,36 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       }))
     } : {
       type: "group",
-      label: S(R.label),
-      title: S(R.label),
-      key: R.label,
-      children: R == null ? void 0 : R.children.filter(($) => !["o2o", "subTable", "linkTo"].includes($.name)).map(($) => ({
+      label: S(w.label),
+      title: S(w.label),
+      key: w.label,
+      children: w == null ? void 0 : w.children.filter(($) => !["o2o", "subTable", "linkTo"].includes($.name)).map(($) => ({
         label: S($.title),
         title: S($.title),
         key: $.name,
         dataTargetScope: $.targetScope
       }))
     };
-  }).filter((R) => {
+  }).filter((w) => {
     var M;
-    return (M = R == null ? void 0 : R.children) == null ? void 0 : M.length;
+    return (M = w == null ? void 0 : w.children) == null ? void 0 : M.length;
   }), [T]), O = useMemo(() => ({
     style: {
       maxHeight: "60vh",
       overflow: "auto"
     },
-    onClick: (R) => {
-      const M = R.item.props["data-targetScope"];
+    onClick: (w) => {
+      const M = w.item.props["data-targetScope"];
       M && f(M);
-      const $ = getSchema$8(c(R.key), o, S);
+      const $ = getSchema$8(c(w.key), o, S);
       $ && (b($), h(!0));
     },
     items: D
-  }), [c, D, o]), j = useMemo(() => I.filter((R) => ["string", "bigInt", "integer"].includes(R.type)).map((R) => {
+  }), [c, D, o]), j = useMemo(() => I.filter((w) => ["string", "bigInt", "integer"].includes(w.type)).map((w) => {
     var M;
     return {
-      value: R.name,
-      label: S((M = R.uiSchema) == null ? void 0 : M.title)
+      value: w.name,
+      label: S((M = w.uiSchema) == null ? void 0 : M.title)
     };
   }), [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: [
@@ -50435,7 +50441,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           record: o,
           showReverseFieldConfig: !0,
           targetScope: g,
-          collections: w,
+          collections: R,
           isDialect: v,
           disabledJSONB: !1,
           scopeKeyOptions: j,
@@ -50527,17 +50533,17 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   return /* @__PURE__ */ jsx(EditFieldAction, x({ item: t, parentItem: n }, e));
 }, EditFieldAction = (e) => {
   const I = e, { scope: t, getContainer: n, item: o, parentItem: r, children: i } = I, a = Y(I, ["scope", "getContainer", "item", "parentItem", "children"]), { getInterface: l, collections: c, getCollection: u } = useCollectionManager_deprecated(), [d, p] = useState(!1), [m, h] = useState({}), g = useAPIClient(), { t: f } = useTranslation(), C = useCompile(), [b, S] = useState({}), { isDialect: y } = useDialect(), v = useMemo(() => {
-    var w;
-    return (o == null ? void 0 : o.fields) || ((w = u(o.collectionName)) == null ? void 0 : w.options.fields.filter((T) => ["string", "bigInt", "integer"].includes(T.type)).map((T) => {
+    var R;
+    return (o == null ? void 0 : o.fields) || ((R = u(o.collectionName)) == null ? void 0 : R.options.fields.filter((T) => ["string", "bigInt", "integer"].includes(T.type)).map((T) => {
       var D;
       return {
         value: T.name,
         label: C((D = T.uiSchema) == null ? void 0 : D.title)
       };
     }));
-  }, [o.name]), F = useMemo(() => c.map((w) => ({
-    label: C(w.title),
-    value: w.name
+  }, [o.name]), F = useMemo(() => c.map((R) => ({
+    label: C(R.title),
+    value: R.name
   })), []);
   return /* @__PURE__ */ jsx(RecordProvider, { record: o, parent: r, children: /* @__PURE__ */ jsxs(ActionContextProvider, { value: { visible: d, setVisible: p }, children: [
     /* @__PURE__ */ jsx(
@@ -50545,12 +50551,12 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       P(x({}, a), {
         onClick: () => V(void 0, null, function* () {
           var j, N;
-          const { data: w } = yield g.resource("collections.fields", o.collectionName).get({
+          const { data: R } = yield g.resource("collections.fields", o.collectionName).get({
             filterByTk: o.name,
             appends: ["reverseField"]
           });
-          S(w == null ? void 0 : w.data);
-          const T = l(o.interface), D = cloneDeep(w == null ? void 0 : w.data) || {};
+          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);
@@ -50648,11 +50654,11 @@ 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, w] = 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), O = useMemo(() => h.map((B) => ({
     label: v(B.title),
     value: B.name
   })), []), j = () => {
-    const B = useForm(), { refresh: R } = useResourceActionContext(), { refreshCM: M } = useCollectionManager_deprecated(), $ = useActionContext(), { resource: k } = useResourceContext();
+    const B = useForm(), { refresh: w } = useResourceActionContext(), { refreshCM: M } = useCollectionManager_deprecated(), $ = useActionContext(), { resource: k } = useResourceContext();
     return {
       run() {
         return V(this, null, function* () {
@@ -50671,17 +50677,17 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           ]);
           yield k.create({
             values: q
-          }), yield B.reset(), yield M(), yield R(), $.setVisible(!1);
+          }), yield B.reset(), yield M(), yield w(), $.setVisible(!1);
         });
       }
     };
   }, N = useMemo(() => {
     var B;
-    return (o == null ? void 0 : o.fields) || ((B = d(o.collectionName)) == null ? void 0 : B.options.fields.filter((R) => ["string", "bigInt", "integer"].includes(R.type)).map((R) => {
+    return (o == null ? void 0 : o.fields) || ((B = d(o.collectionName)) == null ? void 0 : B.options.fields.filter((w) => ["string", "bigInt", "integer"].includes(w.type)).map((w) => {
       var M;
       return {
-        value: R.name,
-        label: v((M = R.uiSchema) == null ? void 0 : M.title)
+        value: w.name,
+        label: v((M = w.uiSchema) == null ? void 0 : M.title)
       };
     }));
   }, [o.name]);
@@ -50693,12 +50699,12 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
         onClick: () => V(void 0, null, function* () {
           var B;
           if (!D) {
-            const { data: R } = yield S.resource("collections.fields", o.collectionName).get({
+            const { data: w } = yield S.resource("collections.fields", o.collectionName).get({
               filterByTk: o.name,
               appends: ["reverseField"]
             });
-            w(R == null ? void 0 : R.data);
-            const M = u(o.interface), $ = cloneDeep(R == null ? void 0 : R.data) || {};
+            R(w == null ? void 0 : w.data);
+            const M = u(o.interface), $ = cloneDeep(w == null ? void 0 : w.data) || {};
             $ != null && $.reverseField || ($.autoCreateReverseField = !1, $.reverseField = (B = M.default) == null ? void 0 : B.reverseField, set($.reverseField, "name", `f_${uid()}`), set($.reverseField, "uiSchema.title", o.__parent.title));
             const k = getSchema$6(
               P(x({}, M), {
@@ -51160,12 +51166,12 @@ const getSchema$4 = (e, t, n) => {
     });
   }), n.filter((o) => o.children.length > 0);
 }, PreviewCom = (e) => {
-  const { databaseView: t, viewName: n, sources: o, schema: r } = e, { data: i } = useContext(ResourceActionContext), a = useAPIClient(), { t: l } = useTranslation(), [c, u] = useState(!1), [d, p] = useState([]), [m, h] = useState([]), [g, f] = useState(o), [C, b] = useState([]), S = useField(), y = useForm(), { getCollection: v, getInterface: F, getCollectionFields: I, getInheritCollections: w, getParentCollectionFields: T } = useCollectionManager_deprecated(), D = useCompile(), j = useFieldInterfaceOptions().filter((R) => !["relation", "systemInfo"].includes(R.key));
+  const { databaseView: t, viewName: n, sources: o, schema: r } = e, { data: i } = useContext(ResourceActionContext), a = useAPIClient(), { t: l } = useTranslation(), [c, u] = useState(!1), [d, p] = useState([]), [m, h] = useState([]), [g, f] = useState(o), [C, b] = useState([]), S = useField(), y = useForm(), { getCollection: v, getInterface: F, getCollectionFields: I, getInheritCollections: R, getParentCollectionFields: T } = useCollectionManager_deprecated(), D = useCompile(), j = useFieldInterfaceOptions().filter((w) => !["relation", "systemInfo"].includes(w.key));
   useEffect(() => {
-    const R = [];
+    const w = [];
     g.forEach((M) => {
       var q;
-      const $ = v(M), z = w(M).map((L) => {
+      const $ = v(M), z = R(M).map((L) => {
         const G = T(L, M);
         return {
           type: "group",
@@ -51183,18 +51189,18 @@ const getSchema$4 = (e, t, n) => {
         var G;
         return { value: L.name, key: L.name, label: l(((G = L.uiSchema) == null ? void 0 : G.title) || L.name) };
       }).concat(z);
-      R.push({
+      w.push({
         value: M,
         label: l($.title || $.name),
         children: E
       });
-    }), h(R);
+    }), h(w);
   }, [g, t]), useEffect(() => {
-    t && (u(!0), a.resource("dbViews").get({ filterByTk: n, schema: r }).then(({ data: R }) => {
+    t && (u(!0), a.resource("dbViews").get({ filterByTk: n, schema: r }).then(({ data: w }) => {
       var M, $;
-      if (R) {
+      if (w) {
         u(!1), p([]);
-        const k = ($ = Object.values((M = R == null ? void 0 : R.data) == null ? void 0 : M.fields)) == null ? void 0 : $.map((z) => {
+        const k = ($ = Object.values((M = w == null ? void 0 : w.data) == null ? void 0 : M.fields)) == null ? void 0 : $.map((z) => {
           var E, q;
           if (z.source) {
             const L = (i == null ? void 0 : i.data.find((G) => G.name === z.name)) || z;
@@ -51210,13 +51216,13 @@ const getSchema$4 = (e, t, n) => {
         });
         S.value = k, setTimeout(() => {
           var z, E, q;
-          p(k), y.setValuesIn("sources", (z = R.data) == null ? void 0 : z.sources), f((E = R.data) == null ? void 0 : E.sources), b((q = R == null ? void 0 : R.data) == null ? void 0 : q.unsupportedFields);
+          p(k), y.setValuesIn("sources", (z = w.data) == null ? void 0 : z.sources), f((E = w.data) == null ? void 0 : E.sources), b((q = w == null ? void 0 : w.data) == null ? void 0 : q.unsupportedFields);
         });
       }
     }).catch);
   }, [t]);
-  const N = (R, M) => {
-    d.splice(M, 1, R), p(d), S.value = d.map(($) => {
+  const N = (w, M) => {
+    d.splice(M, 1, w), p(d), S.value = d.map(($) => {
       var z, E, q;
       const k = typeof $.source == "string" ? $.source : (q = (E = (z = $.source) == null ? void 0 : z.filter) == null ? void 0 : E.call(z, Boolean)) == null ? void 0 : q.join(".");
       return P(x({}, $), {
@@ -51235,10 +51241,10 @@ const getSchema$4 = (e, t, n) => {
       dataIndex: "source",
       key: "source",
       width: 200,
-      render: (R, M, $) => /* @__PURE__ */ jsx(
+      render: (w, M, $) => /* @__PURE__ */ jsx(
         Cascader$1,
         {
-          defaultValue: typeof R == "string" ? R == null ? void 0 : R.split(".") : R,
+          defaultValue: typeof w == "string" ? w == null ? void 0 : w.split(".") : w,
           allowClear: !0,
           style: { width: "100%" },
           options: D(m),
@@ -51256,12 +51262,12 @@ const getSchema$4 = (e, t, n) => {
       dataIndex: "type",
       width: 140,
       key: "type",
-      render: (R, M, $) => {
+      render: (w, M, $) => {
         const k = d[$];
-        return k != null && k.source || !(k != null && k.possibleTypes) ? /* @__PURE__ */ jsx(Tag, { children: R }) : /* @__PURE__ */ jsx(
+        return k != null && k.source || !(k != null && k.possibleTypes) ? /* @__PURE__ */ jsx(Tag, { children: w }) : /* @__PURE__ */ jsx(
           Select$1,
           {
-            defaultValue: R,
+            defaultValue: w,
             popupMatchSelectWidth: !1,
             style: { width: "100%" },
             options: (k == null ? void 0 : k.possibleTypes.map((z) => ({ label: z, value: z }))) || [],
@@ -51275,12 +51281,12 @@ const getSchema$4 = (e, t, n) => {
       dataIndex: "interface",
       key: "interface",
       width: 150,
-      render: (R, M, $) => {
+      render: (w, M, $) => {
         const k = d[$], z = getInterfaceOptions(j, k.type);
-        return k.source ? R : /* @__PURE__ */ jsx(
+        return k.source ? w : /* @__PURE__ */ jsx(
           Select$1,
           {
-            defaultValue: R,
+            defaultValue: w,
             style: { width: "100%" },
             popupMatchSelectWidth: !1,
             onChange: (E) => {
@@ -51298,13 +51304,13 @@ const getSchema$4 = (e, t, n) => {
       dataIndex: "title",
       key: "title",
       width: 180,
-      render: (R, M, $) => {
+      render: (w, M, $) => {
         var z;
         const k = d[$];
         return /* @__PURE__ */ jsx(
           Input$3,
           {
-            defaultValue: ((z = k == null ? void 0 : k.uiSchema) == null ? void 0 : z.title) || R,
+            defaultValue: ((z = k == null ? void 0 : k.uiSchema) == null ? void 0 : z.title) || w,
             onChange: (E) => N(
               P(x({}, k), { uiSchema: P(x({}, omit(k == null ? void 0 : k.uiSchema, "rawTitle")), { title: E.target.value }) }),
               $
@@ -51360,8 +51366,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, R, 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, w = (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) || (w == null ? void 0 : w.title) || F.name, D = F.source ? w : (M = (R = m(F.interface)) == null ? void 0 : R.default) == null ? void 0 : M.uiSchema;
+      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;
       return {
         title: u(T),
         dataIndex: F.name,
@@ -51595,7 +51601,7 @@ const AsyncDataProvider = (e) => {
   }), a;
 }, FieldsConfigure = observer$1(
   () => {
-    var v, F, I, w;
+    var v, F, I, R;
     const { t: e } = useTranslation(), [t, n] = useState([]), { data: o, error: r, loading: i } = useAsyncData(), { data: a, fields: l } = o || {}, c = useField(), { data: u } = useContext(ResourceActionContext), d = useCompile(), { getInterface: p, getCollectionField: m } = useCollectionManager_deprecated(), h = useFieldInterfaceOptions(), g = useMemo(
       () => h.filter((T) => !["relation"].includes(T.key)).map((T, D) => ({
         key: D,
@@ -51613,10 +51619,10 @@ const AsyncDataProvider = (e) => {
       const T = /* @__PURE__ */ new Map();
       i || (a && a.length ? Object.entries((a == null ? void 0 : a[0]) || {}).forEach(([j, N]) => {
         var k;
-        const B = l[j], R = inferInterface(j, N), M = (k = C.current(R)) == null ? void 0 : k.default, $ = (B == null ? void 0 : B.uiSchema) || (M == null ? void 0 : M.uiSchema) || {};
+        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) || {};
         T.set(j, {
           name: j,
-          interface: (B == null ? void 0 : B.interface) || R,
+          interface: (B == null ? void 0 : B.interface) || w,
           type: (B == null ? void 0 : B.type) || (M == null ? void 0 : M.type),
           source: B == null ? void 0 : B.source,
           uiSchema: x({
@@ -51643,7 +51649,7 @@ const AsyncDataProvider = (e) => {
       return /* @__PURE__ */ jsx(Alert, { showIcon: !0, message: e("Please use a valid SELECT or WITH AS statement") });
     const b = r;
     if (b) {
-      const T = ((w = (I = (F = (v = b == null ? void 0 : b.response) == null ? void 0 : v.data) == null ? void 0 : F.errors) == null ? void 0 : I.map) == null ? void 0 : w.call(I, (D) => D.message).join(`
+      const T = ((R = (I = (F = (v = b == null ? void 0 : b.response) == null ? void 0 : v.data) == null ? void 0 : F.errors) == null ? void 0 : I.map) == null ? void 0 : R.call(I, (D) => D.message).join(`
 `)) || b.message;
       return /* @__PURE__ */ jsx(Alert, { showIcon: !0, message: `${e("SQL error: ")}${T}`, type: "error" });
     }
@@ -51651,9 +51657,9 @@ const AsyncDataProvider = (e) => {
       const O = [...t];
       O.splice(D, 1, T), n(O), c.setValue(
         O.map((j) => {
-          var N, B, R;
+          var N, B, w;
           return P(x({}, j), {
-            source: typeof j.source == "string" ? j.source : ((R = (B = (N = j.source) == null ? void 0 : N.filter) == null ? void 0 : B.call(N, Boolean)) == null ? void 0 : R.join(".")) || null
+            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
           });
         })
       );
@@ -51710,14 +51716,14 @@ const AsyncDataProvider = (e) => {
               popupMatchSelectWidth: !1,
               onChange: (B) => {
                 var M, $, k, z, E;
-                const R = p(B);
+                const w = p(B);
                 S(
                   P(x({}, j), {
                     interface: B || null,
-                    uiSchema: P(x({}, (M = R == null ? void 0 : R.default) == null ? void 0 : M.uiSchema), {
-                      title: ((k = ($ = R == null ? void 0 : R.default) == null ? void 0 : $.uiSchema) == null ? void 0 : k.title) || ((z = j.uiSchema) == null ? void 0 : z.title)
+                    uiSchema: P(x({}, (M = w == null ? void 0 : w.default) == null ? void 0 : M.uiSchema), {
+                      title: ((k = ($ = w == null ? void 0 : w.default) == null ? void 0 : $.uiSchema) == null ? void 0 : k.title) || ((z = j.uiSchema) == null ? void 0 : z.title)
                     }),
-                    type: (E = R == null ? void 0 : R.default) == null ? void 0 : E.type
+                    type: (E = w == null ? void 0 : w.default) == null ? void 0 : E.type
                   }),
                   O
                 );
@@ -51741,7 +51747,7 @@ const AsyncDataProvider = (e) => {
             {
               value: ((N = j.uiSchema) == null ? void 0 : N.title) || T,
               defaultValue: ((B = j.uiSchema) == null ? void 0 : B.title) !== void 0 ? j.uiSchema.title : j == null ? void 0 : j.name,
-              onChange: (R) => S(P(x({}, j), { uiSchema: P(x({}, j == null ? void 0 : j.uiSchema), { title: R.target.value }) }), O)
+              onChange: (w) => S(P(x({}, j), { uiSchema: P(x({}, j == null ? void 0 : j.uiSchema), { title: w.target.value }) }), O)
             }
           );
         }
@@ -56505,6 +56511,7 @@ function useACLRoleContext() {
     [i, t]
   );
   return P(x({}, e), {
+    snippets: (e == null ? void 0 : e.snippets) || [],
     parseAction: useCallback(
       (c, u = {}) => {
         var h;
@@ -57623,32 +57630,32 @@ RoleResourceCollectionContext.displayName = "RoleResourceCollectionContext";
 const RolesResourcesActions = connect((e) => {
   var S, y, v, F;
   const t = (I) => {
-    const w = I.map((T) => P(x({}, T), {
+    const R = I.map((T) => P(x({}, T), {
       scope: isEmpty$1(T.scope) ? null : T.scope
     }));
-    e.onChange(w);
+    e.onChange(R);
   };
   useForm();
-  const n = useRecord(), o = useAvailableActions(), { getCollection: r, getCollectionFields: i } = useCollectionManager_deprecated(), a = r(n.collectionName), l = i(n.collectionName), c = useCompile(), { t: u } = useTranslation(), d = useField(), p = toActionMap(d.value || []), m = (I, w) => {
+  const n = useRecord(), o = useAvailableActions(), { getCollection: r, getCollectionFields: i } = useCollectionManager_deprecated(), a = r(n.collectionName), l = i(n.collectionName), c = useCompile(), { t: u } = useTranslation(), d = useField(), p = toActionMap(d.value || []), m = (I, R) => {
     var D;
     const T = p == null ? void 0 : p[I];
-    return T ? (D = T == null ? void 0 : T.fields) == null ? void 0 : D.includes(w) : !1;
+    return T ? (D = T == null ? void 0 : T.fields) == null ? void 0 : D.includes(R) : !1;
   }, h = o.filter((I) => I.allowConfigureFields), g = (S = l == null ? void 0 : l.filter((I) => I.interface)) == null ? void 0 : S.map((I) => {
-    const w = x({}, I);
+    const R = x({}, I);
     for (const T of h)
-      w[T.name] = m(T.name, I.name);
-    return w;
+      R[T.name] = m(T.name, I.name);
+    return R;
   }), f = (I) => {
-    var w, T;
+    var R, T;
     p[I] ? delete p[I] : p[I] = {
       name: I,
-      fields: (T = (w = l == null ? void 0 : l.filter((D) => D.interface)) == null ? void 0 : w.map) == null ? void 0 : T.call(w, (D) => D.name)
+      fields: (T = (R = l == null ? void 0 : l.filter((D) => D.interface)) == null ? void 0 : R.map) == null ? void 0 : T.call(R, (D) => D.name)
     }, t(Object.values(p));
-  }, C = (I, w) => {
-    p[I] ? (p[I].scope = w, t(Object.values(p))) : (f(I), p[I].scope = w);
+  }, C = (I, R) => {
+    p[I] ? (p[I].scope = R, t(Object.values(p))) : (f(I), p[I].scope = R);
   }, b = {};
   for (const I of h)
-    b[I.name] = ((y = l == null ? void 0 : l.filter((w) => w.interface)) == null ? void 0 : y.length) === ((F = (v = p == null ? void 0 : p[I.name]) == null ? void 0 : v.fields) == null ? void 0 : F.length);
+    b[I.name] = ((y = l == null ? void 0 : l.filter((R) => R.interface)) == null ? void 0 : y.length) === ((F = (v = p == null ? void 0 : p[I.name]) == null ? void 0 : v.fields) == null ? void 0 : F.length);
   return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(RoleResourceCollectionContext.Provider, { value: a, children: /* @__PURE__ */ jsxs(FormLayout, { layout: "vertical", children: [
     /* @__PURE__ */ jsx(FormItem$1, { label: u("Action permission"), children: /* @__PURE__ */ jsx(
       Table$3,
@@ -57670,12 +57677,12 @@ const RolesResourcesActions = connect((e) => {
           {
             dataIndex: "enabled",
             title: u("Allow"),
-            render: (I, w) => /* @__PURE__ */ jsx(
+            render: (I, R) => /* @__PURE__ */ jsx(
               Checkbox$1,
               {
                 checked: I,
                 onChange: () => {
-                  f(w.name);
+                  f(R.name);
                 }
               }
             )
@@ -57683,21 +57690,21 @@ const RolesResourcesActions = connect((e) => {
           {
             dataIndex: "scope",
             title: u("Data scope"),
-            render: (I, w) => !w.onNewRecord && /* @__PURE__ */ jsx(
+            render: (I, R) => !R.onNewRecord && /* @__PURE__ */ jsx(
               ScopeSelect,
               {
                 value: I,
                 onChange: (T) => {
-                  C(w.name, T);
+                  C(R.name, T);
                 }
               }
             )
           }
         ],
         dataSource: o == null ? void 0 : o.map((I) => {
-          let w = !1, T = null;
-          return p[I.name] && (w = !0, I.onNewRecord || (T = p[I.name].scope)), P(x({}, I), {
-            enabled: w,
+          let R = !1, T = null;
+          return p[I.name] && (R = !0, I.onNewRecord || (T = p[I.name].scope)), P(x({}, I), {
+            enabled: R,
             scope: T
           });
         })
@@ -57716,20 +57723,20 @@ const RolesResourcesActions = connect((e) => {
             render: (I) => c(I)
           },
           ...h.map((I) => {
-            const w = b == null ? void 0 : b[I.name];
+            const R = b == null ? void 0 : b[I.name];
             return {
               dataIndex: I.name,
               title: /* @__PURE__ */ jsxs(Fragment$1, { children: [
                 /* @__PURE__ */ jsx(
                   Checkbox$1,
                   {
-                    checked: w,
+                    checked: R,
                     onChange: () => {
                       var D;
                       const T = p[I.name] || {
                         name: I.name
                       };
-                      w ? 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, (O) => O.name), p[I.name] = T, t(Object.values(p));
                     }
                   }
                 ),
@@ -57971,10 +57978,10 @@ const PluginDetail = ({ plugin: e, onCancel: t }) => {
       ready: !!e.name
     }
   ), a = useMemo(() => {
-    var F, I, w;
+    var F, I, R;
     if (!((I = (F = r == null ? void 0 : r.data) == null ? void 0 : F.packageJson) != null && I.repository))
       return null;
-    const y = (w = r == null ? void 0 : r.data) == null ? void 0 : w.packageJson.repository;
+    const y = (R = r == null ? void 0 : r.data) == null ? void 0 : R.packageJson.repository;
     return (typeof y == "string" ? y : y.url).replace(/\.git$/, "").replace(/^git\+/, "");
   }, [r]), l = useMemo(() => {
     var v;
@@ -58383,7 +58390,7 @@ function PluginInfo(e) {
     description: m,
     error: h,
     homepage: g
-  } = t, { styles: f, theme: C } = useStyles$1(), b = useNavigate(), { t: S } = useTranslation(), y = useAPIClient(), { modal: v } = App.useApp(), [F, I] = useState(!1), w = i || r || l;
+  } = t, { styles: f, theme: C } = useStyles$1(), b = useNavigate(), { t: S } = useTranslation(), y = useAPIClient(), { modal: v } = App.useApp(), [F, I] = useState(!1), R = i || r || l;
   return /* @__PURE__ */ jsxs(Fragment$1, { children: [
     F && /* @__PURE__ */ jsx(
       PluginUpgradeModal,
@@ -58399,7 +58406,7 @@ function PluginInfo(e) {
       Card,
       {
         role: "button",
-        "aria-label": w,
+        "aria-label": R,
         size: "small",
         bordered: !1,
         onClick: () => {
@@ -58407,7 +58414,7 @@ function PluginInfo(e) {
         },
         headStyle: { border: "none", minHeight: "inherit", paddingTop: 14 },
         bodyStyle: { paddingTop: 10 },
-        title: /* @__PURE__ */ jsx("div", { children: w }),
+        title: /* @__PURE__ */ jsx("div", { children: R }),
         hoverable: !0,
         className: css`
           .ant-card-actions {
@@ -58756,15 +58763,15 @@ const LocalPlugins = () => {
     "Others"
   ], C = useMemo(() => f.map((v) => {
     if (v === "Others") {
-      const I = n == null ? void 0 : n.data.filter((w) => !hasIntersection(w.keywords, f));
+      const I = n == null ? void 0 : n.data.filter((R) => !hasIntersection(R.keywords, f));
       return {
         key: v,
         list: I
       };
     }
     const F = n == null ? void 0 : n.data.filter((I) => {
-      var w;
-      return (w = I.keywords) == null ? void 0 : w.includes(v);
+      var R;
+      return (R = I.keywords) == null ? void 0 : R.includes(v);
     });
     return {
       key: v,
@@ -58773,12 +58780,12 @@ const LocalPlugins = () => {
   }), [f]), b = useMemo(() => {
     var F;
     let y = ((F = i[a]) == null ? void 0 : F.list) || [];
-    !a && m ? y = C.find((I) => I.key === m).list : a && m && (y = C.find((w) => w.key === m).list.filter((w) => y.find((T) => T.name === w.name)));
+    !a && m ? y = C.find((I) => I.key === m).list : a && m && (y = C.find((R) => R.key === m).list.filter((R) => y.find((T) => T.name === R.name)));
     const v = g.toLocaleLowerCase().trim();
     return v && (y = _.filter(
       y,
       (I) => String(I.displayName || "").toLocaleLowerCase().includes(v) || String(I.description || "").toLocaleLowerCase().includes(v)
-    )), y.sort((I, w) => I.displayName.localeCompare(w.displayName));
+    )), y.sort((I, R) => I.displayName.localeCompare(R.displayName));
   }, [a, i, g, m]), S = (y) => {
     p(y);
   };
@@ -60277,16 +60284,16 @@ const ActionInitializerItem = (e) => {
     } = useProps(e), [y, v] = useState(!1), F = useMemo(
       () => S && (i != null && i.name) ? [i.name] : [],
       [i == null ? void 0 : i.name, S]
-    ), I = C || (i == null ? void 0 : i.targetKey) || "id", w = b || ((U = (G = a["x-component-props"]) == null ? void 0 : G.fieldNames) == null ? void 0 : U.label) || I, T = {
-      title: w || I,
+    ), 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, R] = useState(!0), M = useLabelUiSchema(i, (T == null ? void 0 : T.title) || "label");
+    }, [D, O] = useState([]), [j, N] = 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]), !i)
       return null;
     const $ = (K) => {
-      O(K), R(!1);
+      O(K), w(!1);
     }, k = (K) => {
       N(K), d(K), p == null || p(K);
     }, z = (K) => {
@@ -60349,7 +60356,7 @@ const ActionInitializerItem = (e) => {
                 treeData: u,
                 onSelect: k,
                 fieldNames: T,
-                titleRender: (K) => /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: getLabelFormatValue(M, c(K[w])) }),
+                titleRender: (K) => /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: getLabelFormatValue(M, c(K[R])) }),
                 selectedKeys: j,
                 blockNode: !0
               }
@@ -60370,10 +60377,10 @@ const ActionInitializerItem = (e) => {
       label: u((v = y == null ? void 0 : y.uiSchema) == null ? void 0 : v.title) || (y == null ? void 0 : y.name)
     };
   }), h = (y) => {
-    var I, w, T;
+    var I, R, T;
     const v = {
       "x-uid": t["x-uid"]
-    }, F = P(x(x({}, (w = (I = l == null ? void 0 : l.uiSchema) == null ? void 0 : I["x-component-props"]) == null ? void 0 : w.fieldNames), (T = t["x-component-props"]) == null ? void 0 : T.fieldNames), {
+    }, F = P(x(x({}, (R = (I = l == null ? void 0 : l.uiSchema) == null ? void 0 : I["x-component-props"]) == null ? void 0 : R.fieldNames), (T = t["x-component-props"]) == null ? void 0 : T.fieldNames), {
       label: y
     });
     t["x-component-props"] = t["x-component-props"] || {}, t["x-component-props"].fieldNames = F, v["x-component-props"] = t["x-component-props"], d.emit("patch", {
@@ -60752,19 +60759,19 @@ const DataBlockInitializer = (e) => {
     currentText: b,
     otherText: S,
     alwaysRenderMenu: y
-  } = e, { insert: v, setVisible: F } = useSchemaInitializer(), I = useCompile(), { getTemplateSchemaByMode: w } = useSchemaTemplateManager(), T = useCallback(
+  } = e, { insert: v, setVisible: F } = useSchemaInitializer(), I = useCompile(), { getTemplateSchemaByMode: R } = useSchemaTemplateManager(), T = useCallback(
     (z) => V(void 0, null, function* () {
       const { item: E, fromOthersInPopup: q } = z;
       if (f)
         return f(z);
       if (E.template) {
-        const L = yield w(E);
+        const L = yield R(E);
         v(t ? t(L, { item: E, fromOthersInPopup: q }) : L);
       } else
         n && n({ item: E, fromOthersInPopup: q });
       F(!1);
     }),
-    [w, v, F, n, f, t]
+    [R, v, F, n, f, t]
   ), D = h || // eslint-disable-next-line react-hooks/rules-of-hooks
   useCollectionDataSourceItems({
     name: i,
@@ -60779,9 +60786,9 @@ const DataBlockInitializer = (e) => {
     onClick: T,
     currentText: b,
     otherText: S
-  }), O = useGetSchemaInitializerMenuItems(T), j = useMemo(() => O(D, i), [O, D, i]), [N, B] = useState([]), R = useMenuSearch({ data: j, openKeys: N, hideSearch: u }), M = useMemo(() => {
-    let z = R.filter((E) => E.key !== "search" && E.key !== "empty");
-    return p && z.length === 1 ? z = z[0].children : z = R, [
+  }), O = useGetSchemaInitializerMenuItems(T), j = useMemo(() => O(D, i), [O, D, i]), [N, B] = useState([]), w = useMenuSearch({ data: j, openKeys: N, hideSearch: u }), M = useMemo(() => {
+    let z = w.filter((E) => E.key !== "search" && E.key !== "empty");
+    return p && z.length === 1 ? z = z[0].children : z = w, [
       {
         key: i,
         label: I(a),
@@ -60792,7 +60799,7 @@ const DataBlockInitializer = (e) => {
         children: z
       }
     ];
-  }, [R, p, i, I, a, r, T, e]);
+  }, [w, p, i, I, a, r, T, e]);
   return j.length > 1 || j.length === 1 && ((k = ($ = j[0]) == null ? void 0 : $.children) == null ? void 0 : k.length) > 0 || y ? /* @__PURE__ */ jsx(
     SchemaInitializerMenu,
     {
@@ -63960,46 +63967,48 @@ const commonOptions$h = {
     }
   });
 }, AssociateActionProvider = (e) => {
-  const [t, n] = useState([]), o = useCollection(), { resource: r, block: i, __parent: a } = useBlockRequestContext(), l = useActionContext(), { isMobile: c } = useOpenModeContext() || {}, [u, d] = useState([]);
+  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 g;
-    (g = r == null ? void 0 : r.list) == null || g.call(r).then((f) => {
-      var C;
-      d(((C = f.data) == null ? void 0 : C.data) || []);
+    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]);
-  const p = {
+  }, [r, m == null ? void 0 : m.meta.count]);
+  const h = {
     size: "small",
     onChange: e == null ? void 0 : e.onChange,
     selectedRows: t,
     setSelectedRows: n
-  }, m = () => {
-    const { selectedRows: g } = useContext(RecordPickerContext), { setVisible: f, setSubmitted: C, setFormValueChanged: b } = useActionContext();
+  }, g = () => {
+    const { selectedRows: C } = useContext(RecordPickerContext), { setVisible: b, setSubmitted: S, setFormValueChanged: y } = useActionContext();
     return {
-      onClick(y, v) {
+      onClick(F, I) {
         return V(this, null, function* () {
-          var F, I;
+          var R, T;
           yield r.add({
-            values: g
-          }), v && (v == null || v()), f == null || f(!1), C == null || C(!0), i && i !== "TableField" && ((I = (F = a == null ? void 0 : a.service) == null ? void 0 : F.refresh) == null || I.call(F), f == null || f(!1), b == null || b(!1));
+            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));
         });
       }
     };
-  }, h = () => {
-    const g = (o == null ? void 0 : o.filterTargetKey) || "id";
-    if (u) {
-      const f = u.map((b) => b[g]).filter(Boolean);
-      return f.length ? { $and: [{ [`${g}.$ne`]: f }] } : {};
+  }, 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({}, l), {
-        openMode: c ? "drawer" : l.openMode
+      value: P(x({}, c), {
+        openMode: u ? "drawer" : c.openMode
       }),
-      children: /* @__PURE__ */ jsx(RecordPickerProvider, P(x({}, p), { children: /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: { useTableSelectorProps, usePickActionProps: m }, children: /* @__PURE__ */ jsx(TableSelectorParamsProvider, { params: { filter: h() }, children: e.children }) }) }))
+      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 = () => {