@nocobase/client 1.2.29-alpha → 1.2.32-alpha

package/es/index.mjs

@@ -65,7 +65,7 @@ import { notification, Spin, message, Tag, Result, Button, Select as Select$1, t
 import * as formilyShared from "@formily/shared";
 import { merge, uid, isArr, isFn, applyMiddleware, isNum as isNum$1, isStr, isBool, toArr as toArr$3, isValid, isReactElement, each } from "@formily/shared";
 import * as ahooks from "ahooks";
-import { useSetState, useRequest as useRequest$1, useUpdate, useLocalStorageState, useBoolean, useEventListener, useMemoizedFn, useDeepCompareEffect, useDebounce, useSessionStorageState } from "ahooks";
+import { useSetState, useRequest as useRequest$1, useUpdate, useLocalStorageState, useBoolean, useEventListener, useMemoizedFn, useDeepCompareEffect, useCreation, useDebounce, useSessionStorageState } from "ahooks";
 import cloneDeep from "lodash/cloneDeep";
 import * as nocobaseClientUtils from "@nocobase/utils/client";
 import { isPlainObject, flatten, getValuesByPath, getDefaultFormat, str2moment, uid as uid$1, error, dayjs as dayjs$1, toGmt, toLocal, nextTick, forEach, isPortalInBody, unflatten as unflatten$1, isURL, parse, toFixedByStep, parseHTML } from "@nocobase/utils/client";
@@ -3965,7 +3965,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.2.29-alpha", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version$1 = "1.2.32-alpha", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
   "@ahooksjs/use-url-state": "3.5.1",
   "@ant-design/cssinjs": "^1.11.1",
   "@ant-design/icons": "^5.1.4",
@@ -3986,9 +3986,9 @@ const name = "@nocobase/client", version$1 = "1.2.29-alpha", license = "AGPL-3.0
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.2.29-alpha",
-  "@nocobase/sdk": "1.2.29-alpha",
-  "@nocobase/utils": "1.2.29-alpha",
+  "@nocobase/evaluators": "1.2.32-alpha",
+  "@nocobase/sdk": "1.2.32-alpha",
+  "@nocobase/utils": "1.2.32-alpha",
   ahooks: "^3.7.2",
   antd: "^5.12.8",
   "antd-style": "3.4.5",
@@ -4580,46 +4580,46 @@ const TreeNode = (e) => {
       return { label: (y = n(b)) == null ? void 0 : y.title, value: b };
     });
   }
-  const u = (S, { exclude: b = [], depth: y = 0, maxDepth: v, prefix: I = "" }) => y > v ? [] : t(S).map((A) => {
+  const u = (S, { exclude: b = [], depth: y = 0, maxDepth: v, prefix: I = "" }) => y > v ? [] : t(S).map((k) => {
     var M;
-    if (b.includes(A.name) || !A.interface || ["sort", "password", "sequence"].includes(A.type))
+    if (b.includes(k.name) || !k.interface || ["sort", "password", "sequence"].includes(k.type))
       return;
-    const k = {
+    const A = {
       type: "duplicate",
-      tag: a((M = A.uiSchema) == null ? void 0 : M.title) || A.name
-    }, w = F(g({}, k), {
+      tag: a((M = k.uiSchema) == null ? void 0 : M.title) || k.name
+    }, w = F(g({}, A), {
       role: "button",
-      title: React.createElement(TreeNode, k),
-      key: I ? `${I}.${A.name}` : A.name,
+      title: React.createElement(TreeNode, A),
+      key: I ? `${I}.${k.name}` : k.name,
       isLeaf: !0,
-      field: A
+      field: k
     });
-    return ["belongsTo", "belongsToMany"].includes(A.type) ? (k.type = "reference", w.type = "reference", w.title = React.createElement(TreeNode, F(g({}, k), { type: "reference" })), w.isLeaf = !1, w.children = d(A.target, {
+    return ["belongsTo", "belongsToMany"].includes(k.type) ? (A.type = "reference", w.type = "reference", w.title = React.createElement(TreeNode, F(g({}, A), { type: "reference" })), w.isLeaf = !1, w.children = d(k.target, {
       depth: y + 1,
       maxDepth: v,
       prefix: w.key,
       exclude: systemKeys
-    })) : ["hasOne", "hasMany"].includes(A.type) && (w.isLeaf = !1, w.children = u(A.target, {
+    })) : ["hasOne", "hasMany"].includes(k.type) && (w.isLeaf = !1, w.children = u(k.target, {
       depth: y + 1,
       maxDepth: v,
       prefix: w.key,
       exclude: ["id", ...systemKeys]
     })), w;
-  }).filter(Boolean), d = (S, { prefix: b, maxDepth: y, depth: v = 0, exclude: I = [] }) => v > y ? [] : t(S).map((A) => {
+  }).filter(Boolean), d = (S, { prefix: b, maxDepth: y, depth: v = 0, exclude: I = [] }) => v > y ? [] : t(S).map((k) => {
     var M;
-    if (!A.target || !A.interface || I.includes(A.name))
+    if (!k.target || !k.interface || I.includes(k.name))
       return;
-    const k = {
+    const A = {
       type: "preloading",
-      tag: a((M = A.uiSchema) == null ? void 0 : M.title) || A.name
-    }, w = b ? `${b}.${A.name}` : A.name;
+      tag: a((M = k.uiSchema) == null ? void 0 : M.title) || k.name
+    }, w = b ? `${b}.${k.name}` : k.name;
     return {
       role: "button",
-      title: React.createElement(TreeNode, k),
+      title: React.createElement(TreeNode, A),
       key: w,
       isLeaf: !1,
-      field: A,
-      children: d(A.target, {
+      field: k,
+      children: d(k.target, {
         prefix: w,
         depth: v + 1,
         maxDepth: y,
@@ -4631,8 +4631,8 @@ const TreeNode = (e) => {
     title: React.createElement(TreeNode, F(g({}, b), { type: b.type })),
     children: b.children ? p(b.children) : null
   })), m = useCallback((S, b, y) => {
-    var A, k;
-    const v = b.index, I = (k = (A = l.initialValue) == null ? void 0 : A.items) == null ? void 0 : k[v];
+    var k, A;
+    const v = b.index, I = (A = (k = l.initialValue) == null ? void 0 : k.items) == null ? void 0 : A[v];
     if (!S)
       return [];
     if (I != null && I.treeData || y)
@@ -4657,47 +4657,47 @@ const TreeNode = (e) => {
     getOnLoadData: h,
     getOnCheck: x,
     getScopeDataSource: (S) => {
-      const b = t(S), y = (A, k) => {
+      const b = t(S), y = (k, A) => {
         var O, R;
-        if (!A.interface)
+        if (!k.interface)
           return;
-        const w = r(A.interface);
+        const w = r(k.interface);
         if (!(w != null && w.filterable))
           return;
         const { nested: M, children: N, operators: E } = w.filterable, z = {
-          name: A.name,
-          title: ((O = A == null ? void 0 : A.uiSchema) == null ? void 0 : O.title) || A.name,
-          schema: A == null ? void 0 : A.uiSchema,
-          operators: ((R = E == null ? void 0 : E.filter) == null ? void 0 : R.call(E, (j) => !(j != null && j.visible) || j.visible(A))) || [],
-          interface: A.interface
+          name: k.name,
+          title: ((O = k == null ? void 0 : k.uiSchema) == null ? void 0 : O.title) || k.name,
+          schema: k == null ? void 0 : k.uiSchema,
+          operators: ((R = E == null ? void 0 : E.filter) == null ? void 0 : R.call(E, (j) => !(j != null && j.visible) || j.visible(k))) || [],
+          interface: k.interface
         };
-        if (!(A.target && k > 2)) {
-          if (k > 2)
+        if (!(k.target && A > 2)) {
+          if (A > 2)
             return z;
           if (N != null && N.length && (z.children = N), M) {
-            const j = t(A.target), B = v(j, k + 1).filter(Boolean);
+            const j = t(k.target), B = v(j, A + 1).filter(Boolean);
             z.children = z.children || [], z.children.push(...B);
           }
           return z;
         }
-      }, v = (A, k) => {
+      }, v = (k, A) => {
         const w = [];
-        return A.forEach((M) => {
-          const N = y(M, k);
+        return k.forEach((M) => {
+          const N = y(M, A);
           N && w.push(N);
         }), w;
       };
       return v(b, 1);
     },
     useTitleFieldDataSource: (S) => {
-      const b = S.path.entire.replace("titleField", "collection"), y = S.query(b).get("value"), I = t(y).filter((A) => {
-        var k;
-        return (k = r(A.interface)) == null ? void 0 : k.titleUsable;
-      }).map((A) => {
-        var k;
+      const b = S.path.entire.replace("titleField", "collection"), y = S.query(b).get("value"), I = t(y).filter((k) => {
+        var A;
+        return (A = r(k.interface)) == null ? void 0 : A.titleUsable;
+      }).map((k) => {
+        var A;
         return {
-          value: A == null ? void 0 : A.name,
-          label: a((k = A == null ? void 0 : A.uiSchema) == null ? void 0 : k.title) || (A == null ? void 0 : A.name)
+          value: k == null ? void 0 : k.name,
+          label: a((A = k == null ? void 0 : k.uiSchema) == null ? void 0 : A.title) || (k == null ? void 0 : k.name)
         };
       });
       S.dataSource = I;
@@ -6144,14 +6144,14 @@ const collectFieldStateOfLinkageRules = ({
           if ((t == null ? void 0 : t.mode) === "express") {
             if ((t.value || t.result) == null)
               return;
-            const { exp: I, scope: A } = yield replaceVariables(t.value || t.result, {
+            const { exp: I, scope: k } = yield replaceVariables(t.value || t.result, {
               variables: r,
               localVariables: i
             });
             try {
-              return d(I, g({ now: () => (/* @__PURE__ */ new Date()).toString() }, A));
-            } catch (k) {
-              console.error(k);
+              return d(I, g({ now: () => (/* @__PURE__ */ new Date()).toString() }, k));
+            } catch (A) {
+              console.error(A);
             }
           } else
             return (t == null ? void 0 : t.mode) === "constant" ? (v = t == null ? void 0 : t.value) != null ? v : t : null;
@@ -7595,7 +7595,7 @@ function withInitializer(e) {
           S ? S(c(z, { isInSubTable: i })) : r(u, c(z, { isInSubTable: i }), { onSuccess: d });
         },
         [S, c, r, u, d]
-      ), { wrapSSR: y, hashId: v, componentCls: I } = useSchemaInitializerStyles(), [A, k] = useState(!1), { token: w } = theme.useToken(), M = useNiceDropdownMaxHeight([A]), N = useMemo(
+      ), { wrapSSR: y, hashId: v, componentCls: I } = useSchemaInitializerStyles(), [k, A] = useState(!1), { token: w } = theme.useToken(), M = useNiceDropdownMaxHeight([k]), N = useMemo(
         () => g({
           options: o,
           style: f
@@ -7616,8 +7616,8 @@ function withInitializer(e) {
         SchemaInitializerContext.Provider,
         {
           value: {
-            visible: A,
-            setVisible: k,
+            visible: k,
+            setVisible: A,
             insert: b,
             options: o
           },
@@ -7628,8 +7628,8 @@ function withInitializer(e) {
             }, m), {
               arrow: !1,
               overlayClassName: E,
-              open: A,
-              onOpenChange: k,
+              open: k,
+              onOpenChange: A,
               content: y(
                 /* @__PURE__ */ jsx(
                   "div",
@@ -7821,8 +7821,8 @@ const SchemaInitializerItemInternal = () => {
     "componentProps",
     "sort"
   ]), m = a(), h = l(), x = useFindComponent(), f = o || n, C = !f && t && typeComponentMap$1[t], S = useMemo(() => {
-    const A = [...m || [], ...r || []];
-    return A.length === 0 ? void 0 : A;
+    const k = [...m || [], ...r || []];
+    return k.length === 0 ? void 0 : k;
   }, [m, r]), b = useMemo(() => F(g(g(g({}, p), C ? h : {}), C ? u : {}), {
     children: S
   }), [p, C, h, u, S]);
@@ -8452,13 +8452,13 @@ https://requirejs.org/docs/errors.html#` + e);
         id: (Y ? Y + "!" + J : J) + U
       };
     }
-    function A(T) {
+    function k(T) {
       var D = T.id, $ = getOwn(l, D);
       return $ || ($ = l[D] = new n.Module(T)), $;
     }
-    function k(T, D, $) {
+    function A(T, D, $) {
       var q = T.id, L = getOwn(l, q);
-      hasProp(p, q) && (!L || L.defineEmitComplete) ? D === "defined" && $(p[q]) : (L = A(T), L.error && D === "error" ? $(L.error) : L.on(D, $));
+      hasProp(p, q) && (!L || L.defineEmitComplete) ? D === "defined" && $(p[q]) : (L = k(T), L.error && D === "error" ? $(L.error) : L.on(D, $));
     }
     function w(T, D) {
       var $ = T.requireModules, q = !1;
@@ -8591,7 +8591,7 @@ https://requirejs.org/docs/errors.html#` + e);
       },
       callPlugin: function() {
         var T = this.map, D = T.id, $ = I(T.prefix);
-        this.depMaps.push($), k($, "defined", bind(this, function(q) {
+        this.depMaps.push($), A($, "defined", bind(this, function(q) {
           var L, G, U, K = getOwn(h, this.map.id), Y = this.map.name, W = this.map.parentMap ? this.map.parentMap.name : null, X = n.makeRequire(T.parentMap, {
             enableBuildCallback: !0
           });
@@ -8602,7 +8602,7 @@ https://requirejs.org/docs/errors.html#` + e);
               T.prefix + "!" + Y,
               this.map.parentMap,
               !0
-            ), k(
+            ), A(
               G,
               "defined",
               bind(this, function(Q) {
@@ -8634,7 +8634,7 @@ https://requirejs.org/docs/errors.html#` + e);
             }), w(Q);
           }), L.fromText = bind(this, function(Q, J) {
             var oe = T.name, re = I(oe), te = useInteractive;
-            J && (Q = J), te && (useInteractive = !1), A(re), hasProp(a.config, D) && (a.config[oe] = a.config[D]);
+            J && (Q = J), te && (useInteractive = !1), k(re), hasProp(a.config, D) && (a.config[oe] = a.config[D]);
             try {
               req.exec(Q);
             } catch (se) {
@@ -8662,9 +8662,9 @@ https://requirejs.org/docs/errors.html#` + e);
               this.depExports[D] = L(this);
               return;
             }
-            this.depCount += 1, k(T, "defined", bind(this, function(G) {
+            this.depCount += 1, A(T, "defined", bind(this, function(G) {
               this.undefed || (this.defineDep(D, G), this.check());
-            })), this.errback ? k(T, "error", bind(this, this.errback)) : this.events.error && k(T, "error", bind(this, function(G) {
+            })), this.errback ? A(T, "error", bind(this, this.errback)) : this.events.error && A(T, "error", bind(this, function(G) {
               this.emit("error", G);
             }));
           }
@@ -8685,7 +8685,7 @@ https://requirejs.org/docs/errors.html#` + e);
       }
     };
     function O(T) {
-      hasProp(p, T[0]) || A(I(T[0], null, !0)).init(T[1], T[2]);
+      hasProp(p, T[0]) || k(I(T[0], null, !0)).init(T[1], T[2]);
     }
     function R(T, D, $, q) {
       T.detachEvent && !isOpera ? q && T.detachEvent(q, D) : T.removeEventListener($, D, !1);
@@ -8764,7 +8764,7 @@ https://requirejs.org/docs/errors.html#` + e);
         function $(q, L, G) {
           var U, K, Y;
           return D.enableBuildCallback && L && isFunction(L) && (L.__requireJsBuild = !0), typeof q == "string" ? isFunction(L) ? w(makeError("requireargs", "Invalid require call"), G) : T && hasProp(r, q) ? r[q](l[T.id]) : req.get ? req.get(n, q, T, $) : (K = I(q, T, !1, !0), U = K.id, hasProp(p, U) ? p[U] : w(makeError("notloaded", 'Module name "' + U + '" has not been loaded yet for context: ' + e + (T ? "" : ". Use require([])")))) : (B(), n.nextTick(function() {
-            B(), Y = A(I(null, T)), Y.skipMap = D.skipMap, Y.init(q, L, G, {
+            B(), Y = k(I(null, T)), Y.skipMap = D.skipMap, Y.init(q, L, G, {
               enabled: !0
             }), z();
           }), $);
@@ -8806,7 +8806,7 @@ https://requirejs.org/docs/errors.html#` + e);
        */
       enable: function(T) {
         var D = getOwn(l, T.id);
-        D && A(T).enable();
+        D && k(T).enable();
       },
       /**
        * Internal method used by environment adapters to complete a load event.
@@ -9053,7 +9053,7 @@ const useCollectionManager_deprecated = (e) => {
       return R ? ((T = (B = p(j)) == null ? void 0 : B.getCollection(R)) == null ? void 0 : T.getCurrentFields()) || [] : [];
     },
     [t, p]
-  ), A = useCallback(
+  ), k = useCallback(
     (R, j = "string", B) => {
       var Q;
       const {
@@ -9080,7 +9080,7 @@ const useCollectionManager_deprecated = (e) => {
           value: K && U ? `${U}.${J.name}` : J.name,
           label: f((re = J == null ? void 0 : J.uiSchema) == null ? void 0 : re.title) || J.name
         }, J);
-        return T && J.target && (oe.children = $.includes(J.target) ? [] : A(J.target, j, F(g({}, B), {
+        return T && J.target && (oe.children = $.includes(J.target) ? [] : k(J.target, j, F(g({}, B), {
           cached: D,
           dataSource: Y,
           collectionNames: [...$, J.target],
@@ -9091,7 +9091,7 @@ const useCollectionManager_deprecated = (e) => {
       return D[R] = X, X;
     },
     [S]
-  ), k = useCallback(
+  ), A = useCallback(
     (R, j) => {
       var B;
       return (B = p(j)) == null ? void 0 : B.getCollection(R);
@@ -9137,13 +9137,13 @@ const useCollectionManager_deprecated = (e) => {
     getInheritCollections: y,
     getChildrenCollections: v,
     refreshCM: x,
-    get: k,
+    get: A,
     getInheritedFields: C,
     getCollectionField: b,
     getCollectionFields: S,
-    getCollectionFieldsOptions: A,
+    getCollectionFieldsOptions: k,
     getCurrentCollectionFields: I,
-    getCollection: k,
+    getCollection: A,
     getCollectionJoinField: b,
     getAllCollectionsInheritChain: w,
     getInheritCollectionsChain: M,
@@ -9858,9 +9858,9 @@ const BaseVariableContext = React.createContext(null), BaseVariableProvider = (e
     if (!((I = y.field) != null && I.target))
       return Promise.resolve(void 0);
     const v = y.field.target;
-    return new Promise((A) => {
+    return new Promise((k) => {
       setTimeout(() => {
-        const k = (getChildren$2(d(x(v, u), y), {
+        const A = (getChildren$2(d(x(v, u), y), {
           collectionField: e,
           uiSchema: t,
           targetFieldSchema: o,
@@ -9873,11 +9873,11 @@ const BaseVariableContext = React.createContext(null), BaseVariableProvider = (e
           getCollectionField: C.getCollectionField,
           deprecated: p
         }) || []).sort((w, M) => w.isLeaf && !M.isLeaf ? -1 : !w.isLeaf && M.isLeaf ? 1 : 0).sort((w, M) => w.disabled && !M.disabled ? 1 : !w.disabled && M.disabled ? -1 : 0);
-        if (k.length === 0) {
-          y.disabled = !0, y.isLeaf = !0, A();
+        if (A.length === 0) {
+          y.disabled = !0, y.isLeaf = !0, k();
           return;
         }
-        y.children = k, A();
+        y.children = A, k();
       }, 5);
     });
   };
@@ -10099,14 +10099,14 @@ const variablesStore = {}, getFieldPath = (e, t) => {
       var E;
       const b = f.split("."), y = b[0], v = mergeVariableToCollectionNameWithLocalVariables(variablesStore, C);
       let I = mergeCtxWithLocalVariables(t.current, C);
-      const { fieldPath: A, dataSource: k, variableOption: w } = getFieldPath(y, v);
-      let M = A;
+      const { fieldPath: k, dataSource: A, variableOption: w } = getFieldPath(y, v);
+      let M = k;
       if (!(y in I))
         throw new Error(`VariablesProvider: ${y} is not found`);
       for (let z = 0; z < b.length; z++) {
         if (I == null)
           return I === void 0 ? w.defaultValue : I;
-        const O = b[z], { fieldPath: R } = getFieldPath(b.slice(0, z + 1).join("."), v), j = n(R, k), B = (E = r(M)) == null ? void 0 : E.getPrimaryKey();
+        const O = b[z], { fieldPath: R } = getFieldPath(b.slice(0, z + 1).join("."), v), j = n(R, A), B = (E = r(M)) == null ? void 0 : E.getPrimaryKey();
         if (Array.isArray(I)) {
           const T = I.map((D) => {
             if (shouldToRequest(D == null ? void 0 : D[O]) && (D == null ? void 0 : D[B]) != null && j != null && j.target) {
@@ -10114,7 +10114,7 @@ const variablesStore = {}, getFieldPath = (e, t) => {
               if (hasRequested($))
                 return getRequested($);
               const q = o.request({
-                headers: getDataSourceHeaders(k),
+                headers: getDataSourceHeaders(A),
                 url: $,
                 params: {
                   appends: S == null ? void 0 : S.appends
@@ -10132,7 +10132,7 @@ const variablesStore = {}, getFieldPath = (e, t) => {
             D = yield getRequested(T);
           else {
             const $ = o.request({
-              headers: getDataSourceHeaders(k),
+              headers: getDataSourceHeaders(A),
               url: T,
               params: {
                 appends: S == null ? void 0 : S.appends
@@ -10185,7 +10185,7 @@ const variablesStore = {}, getFieldPath = (e, t) => {
     [c]
   ), h = useCallback(
     (f, C) => V(void 0, null, function* () {
-      var A;
+      var k;
       if (!isVariable(f))
         throw new Error(`VariablesProvider: ${f} is not a variable string`);
       C && (C = _.isArray(C) ? C : [C]);
@@ -10195,7 +10195,7 @@ const variablesStore = {}, getFieldPath = (e, t) => {
       ), b = getPath(f), { fieldPath: y, dataSource: v } = getFieldPath(b, S);
       let I = n(y, v);
       return !I && !b.includes(".") && (I = {
-        target: (A = S[b]) == null ? void 0 : A.collectionName
+        target: (k = S[b]) == null ? void 0 : k.collectionName
       }), I;
     }),
     [n]
@@ -10811,7 +10811,7 @@ function useServiceOptions$1(e) {
       var D;
       const T = yield u(mergeFilter([v || ((D = o == null ? void 0 : o.params) == null ? void 0 : D.filter)]));
       m(T);
-    }), A = _.debounce(I, DEBOUNCE_WAIT);
+    }), k = _.debounce(I, DEBOUNCE_WAIT);
     return I(), reaction(
       () => flatten(v, {
         breakOn({ key: D }) {
@@ -10829,7 +10829,7 @@ function useServiceOptions$1(e) {
           );
         }
       }),
-      A,
+      k,
       {
         equals: _.isEqual
       }
@@ -11404,13 +11404,13 @@ GridContext.displayName = "GridContext";
 const breakRemoveOnGrid = (e) => e["x-component"] === "Grid", breakRemoveOnRow = (e) => e["x-component"] === "Grid.Row", MemorizedRecursionField = React.memo(RecursionField);
 MemorizedRecursionField.displayName = "MemorizedRecursionField";
 const ColDivider = (e) => {
-  var I, A, k;
+  var I, k, A;
   const { token: t } = useToken(), o = useRef(null), { isOver: n, setNodeRef: r } = useDroppable({
     id: e.id,
     data: e.data
   }), { dn: i, designable: a } = useDesignable(), l = useRef(), c = useMemo(() => n ? {
     backgroundColor: new TinyColor(t.colorSettings).setAlpha(0.1).toHex8String()
-  } : {}, [n]), d = (k = (A = (I = useDndContext().active) == null ? void 0 : I.data.current) == null ? void 0 : A.schema) == null ? void 0 : k.parent, p = d ? Object.keys(d.properties).length : 0;
+  } : {}, [n]), d = (A = (k = (I = useDndContext().active) == null ? void 0 : I.data.current) == null ? void 0 : k.schema) == null ? void 0 : A.parent, p = d ? Object.keys(d.properties).length : 0;
   let m = !0;
   if (p === 1)
     if (e.first)
@@ -12201,19 +12201,19 @@ const DataBlockInitializer = (e) => {
     filterOtherRecordsCollection: C,
     currentText: S,
     otherText: b
-  } = e, { insert: y, setVisible: v } = useSchemaInitializer(), I = useCompile(), { getTemplateSchemaByMode: A } = useSchemaTemplateManager(), k = useCallback(
+  } = e, { insert: y, setVisible: v } = useSchemaInitializer(), I = useCompile(), { getTemplateSchemaByMode: k } = useSchemaTemplateManager(), A = useCallback(
     (B) => V(void 0, null, function* () {
       const { item: T, fromOthersInPopup: D } = B;
       if (f)
         return f(B);
       if (T.template) {
-        const $ = yield A(T);
+        const $ = yield k(T);
         y(t ? t($, { item: T, fromOthersInPopup: D }) : $);
       } else
         o && o({ item: T, fromOthersInPopup: D });
       v(!1);
     }),
-    [A, y, v, o, f, t]
+    [k, y, v, o, f, t]
   ), w = h || // eslint-disable-next-line react-hooks/rules-of-hooks
   useCollectionDataSourceItems({
     name: i,
@@ -12225,10 +12225,10 @@ const DataBlockInitializer = (e) => {
     showAssociationFields: d,
     dataBlockInitializerProps: e,
     hideOtherRecordsInPopup: x,
-    onClick: k,
+    onClick: A,
     currentText: S,
     otherText: b
-  }), M = useGetSchemaInitializerMenuItems(k), N = useMemo(() => M(w, i), [M, w, i]), [E, z] = useState([]), O = useMenuSearch({ data: N, openKeys: E, hideSearch: u }), R = useMemo(() => {
+  }), M = useGetSchemaInitializerMenuItems(A), N = useMemo(() => M(w, i), [M, w, i]), [E, z] = useState([]), O = useMenuSearch({ data: N, openKeys: E, hideSearch: u }), R = useMemo(() => {
     let B = O.filter((T) => T.key !== "search" && T.key !== "empty");
     return p && B.length === 1 ? B = B[0].children : B = O, [
       {
@@ -12236,12 +12236,12 @@ const DataBlockInitializer = (e) => {
         label: I(a),
         icon: typeof r == "string" ? /* @__PURE__ */ jsx(antIcons__default, { type: r }) : r,
         onClick: (T) => {
-          T.key === i && k(F(g({}, T), { item: e }));
+          T.key === i && A(F(g({}, T), { item: e }));
         },
         children: B
       }
     ];
-  }, [O, p, i, I, a, r, k, e]);
+  }, [O, p, i, I, a, r, A, e]);
   return N.length > 1 || N.length === 1 && ((j = N[0].children) == null ? void 0 : j.length) > 0 ? /* @__PURE__ */ jsx(
     SchemaInitializerMenu,
     {
@@ -12250,7 +12250,7 @@ const DataBlockInitializer = (e) => {
       },
       items: R
     }
-  ) : /* @__PURE__ */ jsx(SchemaInitializerItem, F(g({}, e), { onClick: k }));
+  ) : /* @__PURE__ */ jsx(SchemaInitializerItem, F(g({}, e), { onClick: A }));
 }, createTableBlockUISchema = (e) => {
   const { collectionName: t, dataSource: o, rowKey: n, association: r } = e;
   if (!o)
@@ -13225,13 +13225,13 @@ const FilterFormDesigner = () => /* @__PURE__ */ jsx(GeneralSchemaDesigner, { sc
     if (S == null)
       return;
     const { appends: I } = d();
-    i.parseVariable(v, y, { appends: I }).then((A) => {
+    i.parseVariable(v, y, { appends: I }).then((k) => {
       nextTick(() => {
-        const k = transformVariableValue(A, { targetCollectionField: h.current });
-        _.isEmpty(k) && !_.isNumber(k) ? a.value = null : a.value = k;
+        const A = transformVariableValue(k, { targetCollectionField: h.current });
+        _.isEmpty(A) && !_.isNumber(A) ? a.value = null : a.value = A;
       });
-    }).catch((A) => {
-      console.error(A);
+    }).catch((k) => {
+      console.error(k);
     });
   }, [S, f]);
 };
@@ -13264,8 +13264,8 @@ const useParseDefaultValue = () => {
       const S = getVariableName(t.default), b = x(S);
       return b ? (f(), reaction(
         () => {
-          const v = { [S]: (b == null ? void 0 : b.ctx) || {} }, I = getPath(t.default), A = getValuesByPath(v, I);
-          return A === void 0 ? Math.random() : A;
+          const v = { [S]: (b == null ? void 0 : b.ctx) || {} }, I = getPath(t.default), k = getValuesByPath(v, I);
+          return k === void 0 ? Math.random() : k;
         },
         () => C({ forceUpdate: !0 }),
         {
@@ -13906,12 +13906,12 @@ const findOption$1 = (e = [], t) => {
     var I;
     if (o.data = o.data || {}, !l || !n)
       return;
-    const [x = "", f = ""] = l.split(".$"), [C] = f.split(".", 2), S = x.split("."), b = findOption$1(S, n), y = b == null ? void 0 : b.operators, v = (I = y == null ? void 0 : y.find) == null ? void 0 : I.call(y, (A) => A.value === `$${C}`);
+    const [x = "", f = ""] = l.split(".$"), [C] = f.split(".", 2), S = x.split("."), b = findOption$1(S, n), y = b == null ? void 0 : b.operators, v = (I = y == null ? void 0 : y.find) == null ? void 0 : I.call(y, (k) => k.value === `$${C}`);
     if (o.data.dataIndex = S, (S == null ? void 0 : S.length) > 1) {
-      const A = S.concat();
-      A.pop();
-      const k = t(`${e}.${A.join(".")}`);
-      i.collectionName = k == null ? void 0 : k.target;
+      const k = S.concat();
+      k.pop();
+      const A = t(`${e}.${k.join(".")}`);
+      i.collectionName = A == null ? void 0 : A.target;
     } else
       i.collectionName = null;
     o.data.operators = y, o.data.operator = v, o.data.schema = merge(b == null ? void 0 : b.schema, v == null ? void 0 : v.schema), o.data.value = get$1(unflatten(o.value), `${x}.$${C}`);
@@ -13935,7 +13935,7 @@ const findOption$1 = (e = [], t) => {
   ), m = useCallback(
     (x) => {
       var y, v, I;
-      const f = (I = (v = (y = o.data) == null ? void 0 : y.operators) == null ? void 0 : v.find) == null ? void 0 : I.call(v, (A) => A.value === x);
+      const f = (I = (v = (y = o.data) == null ? void 0 : y.operators) == null ? void 0 : v.find) == null ? void 0 : I.call(v, (k) => k.value === x);
       o.data.operator = f;
       const C = findOption$1(o.data.dataIndex, n), S = cloneDeep(C == null ? void 0 : C.schema), b = cloneDeep(f == null ? void 0 : f.schema);
       o.data.schema = merge(S, b), o.data.value = f.noValue ? f.default || !0 : void 0, u();
@@ -14119,7 +14119,7 @@ const findOption$1 = (e = [], t) => {
     collectionField: e,
     noDisabled: r,
     targetFieldSchema: i
-  }), { currentParentRecordSettings: A, shouldDisplayCurrentParentRecord: k } = useCurrentParentRecordVariable({
+  }), { currentParentRecordSettings: k, shouldDisplayCurrentParentRecord: A } = useCurrentParentRecordVariable({
     schema: o,
     collectionName: l,
     collectionField: e,
@@ -14134,7 +14134,7 @@ const findOption$1 = (e = [], t) => {
     h && m,
     f && x,
     S && C,
-    k && A,
+    A && k,
     y && b,
     I && v,
     M && w
@@ -14149,8 +14149,8 @@ const findOption$1 = (e = [], t) => {
     x,
     S,
     C,
-    k,
     A,
+    k,
     y,
     b,
     M,
@@ -14186,13 +14186,13 @@ const findOption$1 = (e = [], t) => {
     targetFieldSchema: h,
     blockCollectionName: f
   });
-  l && y.every((k) => k.value !== v.value) && y.push(v);
-  const A = useCallback(
-    (k, w) => {
+  l && y.every((A) => A.value !== v.value) && y.push(v);
+  const k = useCallback(
+    (A, w) => {
       if (!u)
-        return o(k);
+        return o(A);
       setTimeout(() => V(void 0, null, function* () {
-        (yield u(k, w)) && o(k);
+        (yield u(A, w)) && o(A);
       }));
     },
     [o, u]
@@ -14202,7 +14202,7 @@ const findOption$1 = (e = [], t) => {
     {
       className: a,
       value: t,
-      onChange: A,
+      onChange: k,
       scope: m(
         I(_.isEmpty(C) ? y : C, {
           value: t
@@ -14732,14 +14732,14 @@ const SchemaSettingsDefaultValue = function e(t) {
   var B, T, D, $;
   const o = useFieldSchema(), n = (B = t == null ? void 0 : t.fieldSchema) != null ? B : o, r = useField(), { dn: i } = useDesignable(), { t: a } = useTranslation(), l = useActionContext();
   let c;
-  const { getField: u } = useCollection_deprecated(), { getCollectionJoinField: d, getCollectionFields: p, getAllCollectionsInheritChain: m } = useCollectionManager_deprecated(), h = useVariables(), x = useLocalVariables(), f = useCollection_deprecated(), C = useRecord(), { form: S } = useFormBlockContext(), { getFields: b } = useCollectionFilterOptionsV2(f), { isInSubForm: y, isInSubTable: v } = useFlag() || {}, { name: I } = f, A = useMemo(
+  const { getField: u } = useCollection_deprecated(), { getCollectionJoinField: d, getCollectionFields: p, getAllCollectionsInheritChain: m } = useCollectionManager_deprecated(), h = useVariables(), x = useLocalVariables(), f = useCollection_deprecated(), C = useRecord(), { form: S } = useFormBlockContext(), { getFields: b } = useCollectionFilterOptionsV2(f), { isInSubForm: y, isInSubTable: v } = useFlag() || {}, { name: I } = f, k = useMemo(
     () => u(n.name) || d(n["x-collection-field"]),
     [n, d, u]
-  ), k = _.omit(n, "required");
-  A != null && A.target && (c = d(
-    `${A.target}.${((D = (T = n["x-component-props"]) == null ? void 0 : T.fieldNames) == null ? void 0 : D.label) || "id"}`
+  ), A = _.omit(n, "required");
+  k != null && k.target && (c = d(
+    `${k.target}.${((D = (T = n["x-component-props"]) == null ? void 0 : T.fieldNames) == null ? void 0 : D.label) || "id"}`
   ));
-  const w = (A == null ? void 0 : A.interface) === "m2o" && findParentFieldSchema(n), M = w && d(w == null ? void 0 : w["x-collection-field"]), N = useTableBlockContext(), E = (($ = l == null ? void 0 : l.fieldSchema) == null ? void 0 : $["x-action"]) === "customize:create" && ((A == null ? void 0 : A.interface) === "m2m" || (M == null ? void 0 : M.type) === "hasMany" && (A == null ? void 0 : A.interface) === "m2o"), z = useCallback(
+  const w = (k == null ? void 0 : k.interface) === "m2o" && findParentFieldSchema(n), M = w && d(w == null ? void 0 : w["x-collection-field"]), N = useTableBlockContext(), E = (($ = l == null ? void 0 : l.fieldSchema) == null ? void 0 : $["x-action"]) === "customize:create" && ((k == null ? void 0 : k.interface) === "m2m" || (M == null ? void 0 : M.type) === "hasMany" && (k == null ? void 0 : k.interface) === "m2o"), z = useCallback(
     (q) => {
       const L = q.find((U) => U.value === "$nForm"), G = p(I);
       return !(G != null && G.length) && L && (L.children = formatVariableScop(b())), q;
@@ -14757,29 +14757,29 @@ const SchemaSettingsDefaultValue = function e(t) {
         "x-decorator": "FormItem",
         "x-component": "VariableInput",
         "x-component-props": F(g({}, (n == null ? void 0 : n["x-component-props"]) || {}), {
-          collectionField: A,
+          collectionField: k,
           contextCollectionName: E && N.collection,
-          schema: A == null ? void 0 : A.uiSchema,
+          schema: k == null ? void 0 : k.uiSchema,
           targetFieldSchema: n,
           className: defaultInputStyle,
           form: S,
           record: C,
           returnScope: z,
           shouldChange: getShouldChange({
-            collectionField: A,
+            collectionField: k,
             variables: h,
             localVariables: x,
             getAllCollectionsInheritChain: m
           }),
           renderSchemaComponent: function(L) {
-            const G = _.cloneDeep(k) || {};
+            const G = _.cloneDeep(A) || {};
             G.title = "", G.name = "default", G["x-read-pretty"] = !1, G["x-disabled"] = !1;
-            const U = getFieldDefaultValue(G, A);
-            A.target && G["x-component-props"] && (G["x-component-props"].mode = "Select"), A != null && A.uiSchema.type && (G.type = A.uiSchema.type), (A == null ? void 0 : A.uiSchema["x-component"]) === "Checkbox" && (_.set(G, "x-component-props.defaultChecked", U), G.type = "void");
+            const U = getFieldDefaultValue(G, k);
+            k.target && G["x-component-props"] && (G["x-component-props"].mode = "Select"), k != null && k.uiSchema.type && (G.type = k.uiSchema.type), (k == null ? void 0 : k.uiSchema["x-component"]) === "Checkbox" && (_.set(G, "x-component-props.defaultChecked", U), G.type = "void");
             const K = F(g({}, G || {}), {
               "x-decorator": "FormItem",
               "x-component-props": F(g({}, G["x-component-props"]), {
-                collectionName: A == null ? void 0 : A.collectionName,
+                collectionName: k == null ? void 0 : k.collectionName,
                 targetField: c,
                 onChange: L.onChange,
                 defaultValue: isVariable(U) ? "" : U,
@@ -14795,13 +14795,13 @@ const SchemaSettingsDefaultValue = function e(t) {
           }
         }),
         title: a("Default value"),
-        default: getFieldDefaultValue(n, A)
+        default: getFieldDefaultValue(n, k)
       }
     }
   }), [
-    A,
-    n,
     k,
+    n,
+    A,
     S,
     m,
     E,
@@ -15283,8 +15283,8 @@ const InternalTableBlockProvider = (e) => {
   return useEffect(() => {
     var S, b, y;
     if (!i) {
-      const v = (S = o == null ? void 0 : o.service) == null ? void 0 : S.data, I = (v == null ? void 0 : v.data) || [], A = (v == null ? void 0 : v.meta) || {}, k = (y = (b = o == null ? void 0 : o.field) == null ? void 0 : b.data) == null ? void 0 : y.selectedRowKeys;
-      isEqual(e.value, I) || (e.value = I, e == null || e.setInitialValue(I)), e.data = e.data || {}, isEqual(e.data.selectedRowKeys, k) || (e.data.selectedRowKeys = k), e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = A == null ? void 0 : A.pageSize, e.componentProps.pagination.total = A == null ? void 0 : A.count, e.componentProps.pagination.current = A == null ? void 0 : A.page;
+      const v = (S = o == null ? void 0 : o.service) == null ? void 0 : S.data, I = (v == null ? void 0 : v.data) || [], k = (v == null ? void 0 : v.meta) || {}, A = (y = (b = o == null ? void 0 : o.field) == null ? void 0 : b.data) == null ? void 0 : y.selectedRowKeys;
+      isEqual(e.value, I) || (e.value = I, e == null || e.setInitialValue(I)), e.data = e.data || {}, isEqual(e.data.selectedRowKeys, A) || (e.data.selectedRowKeys = A), e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = k == null ? void 0 : k.pageSize, e.componentProps.pagination.total = k == null ? void 0 : k.count, e.componentProps.pagination.current = k == null ? void 0 : k.page;
     }
   }, [e, (m = o == null ? void 0 : o.service) == null ? void 0 : m.data, i, (x = (h = o == null ? void 0 : o.field) == null ? void 0 : h.data) == null ? void 0 : x.selectedRowKeys]), {
     bordered: o.bordered,
@@ -15310,21 +15310,21 @@ const InternalTableBlockProvider = (e) => {
     ),
     onChange: useCallback(
       ({ current: S, pageSize: b }, y, v) => {
-        var k, w, M;
-        const I = o.dragSort ? o.dragSortBy : v.order ? v.order === "ascend" ? [v.field] : [`-${v.field}`] : n || o.dragSortBy, A = b || ((M = (w = (k = t.parent) == null ? void 0 : k["x-decorator-props"]) == null ? void 0 : w.params) == null ? void 0 : M.pageSize);
-        o.service.run(F(g({}, a == null ? void 0 : a[0]), { page: S || 1, pageSize: A, sort: I }));
+        var A, w, M;
+        const I = o.dragSort ? o.dragSortBy : v.order ? v.order === "ascend" ? [v.field] : [`-${v.field}`] : n || o.dragSortBy, k = b || ((M = (w = (A = t.parent) == null ? void 0 : A["x-decorator-props"]) == null ? void 0 : w.params) == null ? void 0 : M.pageSize);
+        o.service.run(F(g({}, a == null ? void 0 : a[0]), { page: S || 1, pageSize: k, sort: I }));
       },
       [n, a]
     ),
     onClickRow: useCallback(
       (S, b, y) => {
-        const { targets: v, uid: I } = findFilterTargets(t), A = r();
-        if (!v || !v.some((w) => A.some((M) => M.uid === w.uid))) {
+        const { targets: v, uid: I } = findFilterTargets(t), k = r();
+        if (!v || !v.some((w) => k.some((M) => M.uid === w.uid))) {
           b((w) => w.length ? [] : w);
           return;
         }
-        const k = [S[o.rowKey]];
-        A.forEach((w) => {
+        const A = [S[o.rowKey]];
+        k.forEach((w) => {
           var O, R, j;
           const M = v.find((B) => B.uid === w.uid);
           if (!M)
@@ -15339,7 +15339,7 @@ const InternalTableBlockProvider = (e) => {
               $and: [
                 {
                   [M.field || o.rowKey]: {
-                    [M.field ? "$in" : "$eq"]: k
+                    [M.field ? "$in" : "$eq"]: A
                   }
                 }
               ]
@@ -15355,7 +15355,7 @@ const InternalTableBlockProvider = (e) => {
             }),
             { filters: E }
           );
-        }), b((w) => w != null && w.includes(S[o.rowKey]) ? [] : [...k]);
+        }), b((w) => w != null && w.includes(S[o.rowKey]) ? [] : [...A]);
       },
       [o.rowKey, t, r]
     ),
@@ -15659,8 +15659,8 @@ const useTableSelectorParams = () => useContext(TableSelectorParamsContext), Tab
   var a, l, c, u, d, p, m, h, x, f, C, S, b, y, v, I;
   const e = useField(), t = useTableSelectorContext(), o = useFieldSchema(), { getCollectionJoinField: n } = useCollectionManager_deprecated(), r = recursiveParent$1(o, "CollectionField"), i = n(r == null ? void 0 : r["x-collection-field"]);
   return useEffect(() => {
-    var k, w, M, N, E, z, O, R, j, B, T, D, $, q, L;
-    if (!((k = t == null ? void 0 : t.service) != null && k.loading)) {
+    var A, w, M, N, E, z, O, R, j, B, T, D, $, q, L;
+    if (!((A = t == null ? void 0 : t.service) != null && A.loading)) {
       const G = (M = (w = t == null ? void 0 : t.service) == null ? void 0 : w.data) == null ? void 0 : M.data.map((U) => _.omit(U, i == null ? void 0 : i.foreignKey));
       e.value = G, (N = e == null ? void 0 : e.setInitialValue) == null || N.call(e, G), e.data = e.data || {}, e.data.selectedRowKeys = (z = (E = t == null ? void 0 : t.field) == null ? void 0 : E.data) == null ? void 0 : z.selectedRowKeys, e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (j = (R = (O = t == null ? void 0 : t.service) == null ? void 0 : O.data) == null ? void 0 : R.meta) == null ? void 0 : j.pageSize, e.componentProps.pagination.total = (D = (T = (B = t == null ? void 0 : t.service) == null ? void 0 : B.data) == null ? void 0 : T.meta) == null ? void 0 : D.count, e.componentProps.pagination.current = (L = (q = ($ = t == null ? void 0 : t.service) == null ? void 0 : $.data) == null ? void 0 : q.meta) == null ? void 0 : L.page;
     }
@@ -15679,21 +15679,21 @@ const useTableSelectorParams = () => useContext(TableSelectorParamsContext), Tab
     dragSort: !1,
     rowKey: t.rowKey || "id",
     pagination: ((I = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : I.pagination) === !1 ? !1 : e.componentProps.pagination,
-    onRowSelectionChange(k, w) {
+    onRowSelectionChange(A, w) {
       var M;
-      t.field.data = ((M = t == null ? void 0 : t.field) == null ? void 0 : M.data) || {}, t.field.data.selectedRowKeys = k;
+      t.field.data = ((M = t == null ? void 0 : t.field) == null ? void 0 : M.data) || {}, t.field.data.selectedRowKeys = A;
     },
     onRowDragEnd(M) {
-      return V(this, arguments, function* ({ from: k, to: w }) {
+      return V(this, arguments, function* ({ from: A, to: w }) {
         yield t.resource.move({
-          sourceId: k[t.rowKey || "id"],
+          sourceId: A[t.rowKey || "id"],
           targetId: w[t.rowKey || "id"]
         }), t.service.refresh();
       });
     },
-    onChange({ current: k, pageSize: w }) {
+    onChange({ current: A, pageSize: w }) {
       var M;
-      t.service.run(F(g({}, (M = t.service.params) == null ? void 0 : M[0]), { page: k, pageSize: w }));
+      t.service.run(F(g({}, (M = t.service.params) == null ? void 0 : M[0]), { page: A, pageSize: w }));
     }
   };
 }, BlockSchemaComponentProvider = (e) => /* @__PURE__ */ jsx(
@@ -16202,8 +16202,8 @@ function useInheritsTableColumnInitializerFields() {
           find: findTableColumn,
           remove: removeTableColumn,
           schemaInitialize: (I) => {
-            var A;
-            (A = x == null ? void 0 : x.schemaInitialize) == null || A.call(x, I, {
+            var k;
+            (k = x == null ? void 0 : x.schemaInitialize) == null || k.call(x, I, {
               field: h,
               readPretty: !0,
               block: "Table",
@@ -16221,7 +16221,7 @@ const useFormItemInitializerFields = (e) => {
   var d;
   const { name: t, currentFields: o } = useCollection_deprecated(), { getInterface: n, 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 (d = o == null ? void 0 : o.filter((p) => (p == null ? void 0 : p.interface) && !(p != null && p.treeChildren))) == null ? void 0 : d.map((p) => {
-    var y, v, I, A;
+    var y, v, I, k;
     const m = n(p.interface), h = r(p.target), x = (p == null ? void 0 : p.target) && ((y = r(p == null ? void 0 : p.target)) == null ? void 0 : y.template) === "file", f = h, C = (v = p == null ? void 0 : p.uiSchema["x-component-props"]) == null ? void 0 : v.fieldNames, S = {
       type: "string",
       name: p.name,
@@ -16242,12 +16242,12 @@ const useFormItemInitializerFields = (e) => {
     }, b = {
       type: "item",
       name: p.name,
-      title: ((A = p == null ? void 0 : p.uiSchema) == null ? void 0 : A.title) || p.name,
+      title: ((k = p == null ? void 0 : p.uiSchema) == null ? void 0 : k.title) || p.name,
       Component: "CollectionFieldInitializer",
       remove: removeGridFormItem,
-      schemaInitialize: (k) => {
+      schemaInitialize: (A) => {
         var w;
-        (w = m == null ? void 0 : m.schemaInitialize) == null || w.call(m, k, {
+        (w = m == null ? void 0 : m.schemaInitialize) == null || w.call(m, A, {
           field: p,
           block: l,
           readPretty: a,
@@ -16257,8 +16257,8 @@ const useFormItemInitializerFields = (e) => {
       },
       schema: S
     };
-    return l == "Kanban" && (b.find = (k, w, M) => {
-      const N = findSchema(k, "x-component", l);
+    return l == "Kanban" && (b.find = (A, w, M) => {
+      const N = findSchema(A, "x-component", l);
       return findSchema(N, w, M);
     }), b;
   });
@@ -16269,7 +16269,7 @@ const useFormItemInitializerFields = (e) => {
     var h;
     return (m == null ? void 0 : m.interface) && ((h = n(m.interface)) == null ? void 0 : h.filterable);
   })) == null ? void 0 : p.map((m) => {
-    var S, b, y, v, I, A, k;
+    var S, b, y, v, I, k, A;
     const h = n(m.interface), x = r(m.target);
     let f = {
       type: "string",
@@ -16299,9 +16299,9 @@ const useFormItemInitializerFields = (e) => {
       "x-collection-field": `${t}.${m.name}`,
       "x-component-props": (I = m.uiSchema) == null ? void 0 : I["x-component-props"]
     }), {
-      name: ((A = m == null ? void 0 : m.uiSchema) == null ? void 0 : A.title) || m.name,
+      name: ((k = m == null ? void 0 : m.uiSchema) == null ? void 0 : k.title) || m.name,
       type: "item",
-      title: ((k = m == null ? void 0 : m.uiSchema) == null ? void 0 : k.title) || m.name,
+      title: ((A = m == null ? void 0 : m.uiSchema) == null ? void 0 : A.title) || m.name,
       Component: "CollectionFieldInitializer",
       remove: removeGridFormItem,
       schemaInitialize: (w) => {
@@ -16325,8 +16325,8 @@ const useFormItemInitializerFields = (e) => {
     const h = r(m.target), x = (f = h == null ? void 0 : h.filter(
       (b) => (b == null ? void 0 : b.interface) && !["subTable"].includes(b == null ? void 0 : b.interface) && !b.treeChildren
     )) == null ? void 0 : f.map((b) => {
-      var A, k, w;
-      const y = n(b.interface), v = (m == null ? void 0 : m.target) && ((A = i(m == null ? void 0 : m.target)) == null ? void 0 : A.template) === "file", I = {
+      var k, A, w;
+      const y = n(b.interface), v = (m == null ? void 0 : m.target) && ((k = i(m == null ? void 0 : m.target)) == null ? void 0 : k.template) === "file", I = {
         type: "string",
         name: `${m.name}.${b.name}`,
         // 'x-designer': 'FormItem.Designer',
@@ -16345,7 +16345,7 @@ const useFormItemInitializerFields = (e) => {
         "x-collection-field": `${t}.${m.name}.${b.name}`
       };
       return {
-        name: ((k = b == null ? void 0 : b.uiSchema) == null ? void 0 : k.title) || b.name,
+        name: ((A = b == null ? void 0 : b.uiSchema) == null ? void 0 : A.title) || b.name,
         type: "item",
         title: ((w = b == null ? void 0 : b.uiSchema) == null ? void 0 : w.title) || b.name,
         Component: "CollectionFieldInitializer",
@@ -16425,7 +16425,7 @@ const useFormItemInitializerFields = (e) => {
     const u = i(c, t), { readPretty: d = l.readPretty, block: p = "Form", component: m = "CollectionField" } = e || {}, h = r(c);
     return {
       [h == null ? void 0 : h.title]: (x = u == null ? void 0 : u.filter((f) => f == null ? void 0 : f.interface)) == null ? void 0 : x.map((f) => {
-        var y, v, I, A;
+        var y, v, I, k;
         const C = o(f.interface), S = r(f.target), b = {
           type: "string",
           name: f.name,
@@ -16442,12 +16442,12 @@ const useFormItemInitializerFields = (e) => {
         return {
           name: ((I = f == null ? void 0 : f.uiSchema) == null ? void 0 : I.title) || f.name,
           type: "item",
-          title: ((A = f == null ? void 0 : f.uiSchema) == null ? void 0 : A.title) || f.name,
+          title: ((k = f == null ? void 0 : f.uiSchema) == null ? void 0 : k.title) || f.name,
           Component: "CollectionFieldInitializer",
           remove: removeGridFormItem,
-          schemaInitialize: (k) => {
+          schemaInitialize: (A) => {
             var w;
-            (w = C == null ? void 0 : C.schemaInitialize) == null || w.call(C, k, {
+            (w = C == null ? void 0 : C.schemaInitialize) == null || w.call(C, A, {
               field: f,
               block: p,
               readPretty: d,
@@ -16492,9 +16492,9 @@ const useFormItemInitializerFields = (e) => {
           title: ((I = x == null ? void 0 : x.uiSchema) == null ? void 0 : I.title) || x.name,
           Component: "CollectionFieldInitializer",
           remove: removeGridFormItem,
-          schemaInitialize: (A) => {
-            var k;
-            (k = f == null ? void 0 : f.schemaInitialize) == null || k.call(f, A, {
+          schemaInitialize: (k) => {
+            var A;
+            (A = f == null ? void 0 : f.schemaInitialize) == null || A.call(f, k, {
               field: x,
               block: p,
               readPretty: d,
@@ -16638,15 +16638,15 @@ const useFormItemInitializerFields = (e) => {
     filterDataSource: i
   });
   n && (b = b.filter((I) => I.key === x));
-  const { getTemplatesByCollection: y } = useSchemaTemplateManager(), v = useMemo(() => b.map(({ key: I, displayName: A, collections: k }) => ({
+  const { getTemplatesByCollection: y } = useSchemaTemplateManager(), v = useMemo(() => b.map(({ key: I, displayName: k, collections: A }) => ({
     name: I,
-    label: A,
+    label: k,
     type: "subMenu",
     children: [
       ...getChildren({
         name: e,
         association: S,
-        collections: k,
+        collections: A,
         componentName: t,
         searchValue: "",
         dataSource: I,
@@ -16677,7 +16677,7 @@ const useFormItemInitializerFields = (e) => {
         hideChildrenIfSingleCollection: !0,
         items: v
       })
-    }, A = {
+    }, k = {
       name: "associationRecords",
       Component: DataBlockInitializer,
       // 目的是使点击无效
@@ -16698,7 +16698,7 @@ const useFormItemInitializerFields = (e) => {
           }
         ]
       })
-    }, k = {
+    }, A = {
       ReadPrettyFormItem: "Details"
     }, w = {
       name: "otherRecords",
@@ -16714,7 +16714,7 @@ const useFormItemInitializerFields = (e) => {
         onlyCurrentDataSource: !1,
         hideChildrenIfSingleCollection: !1,
         fromOthersInPopup: !0,
-        componentType: k[t] || t,
+        componentType: A[t] || t,
         filter({ collection: z, associationField: O }) {
           return u ? u(z) : !0;
         },
@@ -16724,7 +16724,7 @@ const useFormItemInitializerFields = (e) => {
       })
     };
     let M;
-    const N = C.length ? A : null;
+    const N = C.length ? k : null;
     if (v[0].children.length && C.length)
       l ? M = [I, N] : M = [I, N, w];
     else if (v[0].children.length)
@@ -17347,7 +17347,7 @@ const useStyles$h = createStyles(() => ({
   }, { render: C, exists: S } = useSchemaSettingsRender(
     t["x-settings"] || i,
     t["x-settings-props"]
-  ), b = useGridRowContext(), y = useGridContext(), v = useDataSourceManager(), I = v == null ? void 0 : v.getDataSources(), A = useDataSource(), k = (I == null ? void 0 : I.length) > 1 && A, w = ["FormItem", "ReadPrettyFormItem"].includes(r == null ? void 0 : r.componentName) ? `${r == null ? void 0 : r.name} ${m("(Fields only)")}` : r == null ? void 0 : r.name, M = useMemo(() => {
+  ), b = useGridRowContext(), y = useGridContext(), v = useDataSourceManager(), I = v == null ? void 0 : v.getDataSources(), k = useDataSource(), A = (I == null ? void 0 : I.length) > 1 && k, w = ["FormItem", "ReadPrettyFormItem"].includes(r == null ? void 0 : r.componentName) ? `${r == null ? void 0 : r.name} ${m("(Fields only)")}` : r == null ? void 0 : r.name, M = useMemo(() => {
     var z;
     return {
       insertPosition: "afterEnd",
@@ -17364,7 +17364,7 @@ const useStyles$h = createStyles(() => ({
   }, [x, (N = b == null ? void 0 : b.cols) == null ? void 0 : N.length]);
   return d ? /* @__PURE__ */ jsx(SchemaToolbarProvider, F(g({}, a), { children: /* @__PURE__ */ jsxs("div", { className: cls("general-schema-designer", overrideAntdCSS), children: [
     n && /* @__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 && k ? `${h(k == null ? void 0 : k.displayName)} > ${h(n)}` : h(n) }),
+      /* @__PURE__ */ jsx("span", { className: "title-tag", children: c && A ? `${h(A == null ? void 0 : A.displayName)} > ${h(n)}` : h(n) }),
       r && /* @__PURE__ */ jsxs("span", { className: "title-tag", children: [
         m("Reference template"),
         ": ",
@@ -17413,11 +17413,11 @@ const useStyles$h = createStyles(() => ({
   ), { render: v, exists: I } = useSchemaInitializerRender(
     n || t["x-initializer"],
     t["x-initializer-props"]
-  ), A = useGridRowContext(), k = useGridContext(), w = useMemo(() => {
+  ), k = useGridRowContext(), A = useGridContext(), w = useMemo(() => {
     var R;
     return {
       insertPosition: "afterEnd",
-      wrap: ((R = A == null ? void 0 : A.cols) == null ? void 0 : R.length) === 1 ? gridRowColWrap : void 0,
+      wrap: ((R = k == null ? void 0 : k.cols) == null ? void 0 : R.length) === 1 ? gridRowColWrap : void 0,
       Component: (j) => /* @__PURE__ */ jsx(
         PlusOutlined,
         F(g({}, j), {
@@ -17427,15 +17427,15 @@ const useStyles$h = createStyles(() => ({
         })
       )
     };
-  }, [m, (O = A == null ? void 0 : A.cols) == null ? void 0 : O.length]), M = useMemo(() => l === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": m("drag-handler") }) }), [l, m]), N = useMemo(() => {
+  }, [m, (O = k == null ? void 0 : k.cols) == null ? void 0 : O.length]), M = useMemo(() => l === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": m("drag-handler") }) }), [l, m]), N = useMemo(() => {
     var R;
     if (n === !1)
       return null;
     if (I)
       return v(w);
-    if (k != null && k.InitializerComponent || k != null && k.renderSchemaInitializer)
-      return k != null && k.InitializerComponent ? /* @__PURE__ */ jsx(k.InitializerComponent, g({}, w)) : (R = k.renderSchemaInitializer) == null ? void 0 : R.call(k, w);
-  }, [k, n, w, I, v]), E = useMemo(() => r !== !1 && y ? b() : null, [y, b, r]), z = useRef(null);
+    if (A != null && A.InitializerComponent || A != null && A.renderSchemaInitializer)
+      return A != null && A.InitializerComponent ? /* @__PURE__ */ jsx(A.InitializerComponent, g({}, w)) : (R = A.renderSchemaInitializer) == null ? void 0 : R.call(A, w);
+  }, [A, n, w, I, v]), E = useMemo(() => r !== !1 && y ? b() : null, [y, b, r]), z = useRef(null);
   return useEffect(() => {
     const R = z.current;
     let j = R == null ? void 0 : R.parentElement;
@@ -17824,13 +17824,13 @@ observer$1(
           onChange: (v) => {
             b(v);
             try {
-              r.query("fieldReaction.items.*.layout.dataId").forEach((A) => {
-                A.componentProps.service.resource === m && (A.componentProps.fieldNames.label = v, A.componentProps.targetField = t(
+              r.query("fieldReaction.items.*.layout.dataId").forEach((k) => {
+                k.componentProps.service.resource === m && (k.componentProps.fieldNames.label = v, k.componentProps.targetField = t(
                   `${m}.${v || (h == null ? void 0 : h.titleField) || "id"}`
                 ));
               });
-            } catch (A) {
-              console.error(A);
+            } catch (k) {
+              console.error(k);
             }
             u["x-data-templates"] = d;
             const I = {
@@ -17899,22 +17899,22 @@ const compatibleDataId = (e, t) => e == null ? void 0 : e.map((o) => {
       ),
       []
     ), f = (I) => {
-      var k;
-      const A = p(I);
+      var A;
+      const k = p(I);
       return m(
-        `${I}.${((k = x == null ? void 0 : x.config[I]) == null ? void 0 : k.titleField) || (A == null ? void 0 : A.titleField) || "id"}`
+        `${I}.${((A = x == null ? void 0 : x.config[I]) == null ? void 0 : A.titleField) || (k == null ? void 0 : k.titleField) || "id"}`
       );
     }, C = (I) => {
-      var k, w;
-      const A = p(I);
+      var A, w;
+      const k = p(I);
       return {
-        label: getLabel(((w = (k = x.config) == null ? void 0 : k[I]) == null ? void 0 : w.titleField) || (A == null ? void 0 : A.titleField) || "id"),
+        label: getLabel(((w = (A = x.config) == null ? void 0 : A[I]) == null ? void 0 : w.titleField) || (k == null ? void 0 : k.titleField) || "id"),
         value: "id"
       };
-    }, S = (I, A) => {
+    }, S = (I, k) => {
       var w, M;
-      const k = (M = (w = x.config) == null ? void 0 : w[I]) == null ? void 0 : M.filter;
-      return _.isEmpty(k) ? {} : removeNullCondition(mergeFilter([k, getSelectedIdFilter(A)], "$or"));
+      const A = (M = (w = x.config) == null ? void 0 : w[I]) == null ? void 0 : M.filter;
+      return _.isEmpty(A) ? {} : removeNullCondition(mergeFilter([A, getSelectedIdFilter(k)], "$or"));
     }, b = useMemo(() => ({ ArrayCollapse: ArrayCollapse$1 }), []), y = useMemo(
       () => ({
         getEnableFieldTree: a,
@@ -18993,7 +18993,7 @@ const SchemaSettingsProvider = (e) => {
         const S = r && c(r), b = findGridSchema(m), y = yield FormDialog(
           a("Save as template"),
           () => {
-            const A = {
+            const k = {
               FormItem: a("Form"),
               ReadPrettyFormItem: a("Details")
             };
@@ -19008,8 +19008,8 @@ const SchemaSettingsProvider = (e) => {
                       title: a("Template name"),
                       required: !0,
                       default: S ? `${l((S == null ? void 0 : S.title) || (S == null ? void 0 : S.name))}_${a(
-                        A[n] || n
-                      )}` : a(A[n] || n),
+                        k[n] || n
+                      )}` : a(k[n] || n),
                       "x-decorator": "FormItem",
                       "x-component": "Input"
                     }
@@ -19177,7 +19177,7 @@ const SchemaSettingsProvider = (e) => {
     )
   ] });
 }, SchemaSettingsActionModalItem = React.memo((e) => {
-  const E = e, { title: t, onSubmit: o, initialValues: n, beforeOpen: r, initialSchema: i, schema: a, modalTip: l, components: c, scope: u } = E, d = H(E, ["title", "onSubmit", "initialValues", "beforeOpen", "initialSchema", "schema", "modalTip", "components", "scope"]), [p, m] = useState(!1), [h, x] = useState(e.uid), { t: f } = useTranslation(), C = useFieldSchema(), S = useContext(SchemaSettingsContext), { dn: b } = useSchemaSettings(), y = useCompile(), v = useAPIClient(), I = useFormActiveFields(), A = useMemo(
+  const E = e, { title: t, onSubmit: o, initialValues: n, beforeOpen: r, initialSchema: i, schema: a, modalTip: l, components: c, scope: u } = E, d = H(E, ["title", "onSubmit", "initialValues", "beforeOpen", "initialSchema", "schema", "modalTip", "components", "scope"]), [p, m] = useState(!1), [h, x] = useState(e.uid), { t: f } = useTranslation(), C = useFieldSchema(), S = useContext(SchemaSettingsContext), { dn: b } = useSchemaSettings(), y = useCompile(), v = useAPIClient(), I = useFormActiveFields(), k = useMemo(
     () => createForm({
       initialValues: cloneDeep$1(n),
       values: cloneDeep$1(n)
@@ -19185,13 +19185,13 @@ const SchemaSettingsProvider = (e) => {
     [n]
   );
   useEffect(() => {
-    A.setInitialValues(cloneDeep$1(n));
+    k.setInitialValues(cloneDeep$1(n));
   }, [JSON.stringify(n || {})]);
-  const k = useCallback(() => {
-    m(!1), A.reset();
-  }, [A]), w = useCallback(() => V(void 0, null, function* () {
-    yield A.submit(), o == null || o(cloneDeep$1(A.values)), m(!1);
-  }), [A, o]), M = useCallback(() => V(void 0, null, function* () {
+  const A = useCallback(() => {
+    m(!1), k.reset();
+  }, [k]), w = useCallback(() => V(void 0, null, function* () {
+    yield k.submit(), o == null || o(cloneDeep$1(k.values)), m(!1);
+  }), [k, o]), M = useCallback(() => V(void 0, null, function* () {
     !h && (i != null && i["x-uid"]) && (C["x-action-settings"].schemaUid = i["x-uid"], b.emit("patch", { schema: C }), yield v.resource("uiSchemas").insert({ values: i }), x(i["x-uid"])), typeof r == "function" && (r == null || r()), S.setVisible(!1), m(!0);
   }), [v, S, b, C, i, h]), N = useCallback((z) => z.stopPropagation(), []);
   return /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -19214,12 +19214,12 @@ const SchemaSettingsProvider = (e) => {
         }, d), {
           destroyOnClose: !0,
           open: p,
-          onCancel: k,
+          onCancel: A,
           footer: /* @__PURE__ */ jsxs(Space$1, { children: [
-            /* @__PURE__ */ jsx(Button, { onClick: k, children: f("Cancel") }),
+            /* @__PURE__ */ jsx(Button, { onClick: A, children: f("Cancel") }),
             /* @__PURE__ */ jsx(Button, { type: "primary", onClick: w, children: f("Submit") })
           ] }),
-          children: /* @__PURE__ */ jsx(FormActiveFieldsProvider, { name: "form", getActiveFieldsName: I == null ? void 0 : I.getActiveFieldsName, children: /* @__PURE__ */ jsx(FormProvider, { form: A, children: /* @__PURE__ */ jsxs(FormLayout, { layout: "vertical", children: [
+          children: /* @__PURE__ */ jsx(FormActiveFieldsProvider, { name: "form", getActiveFieldsName: I == null ? void 0 : I.getActiveFieldsName, children: /* @__PURE__ */ jsx(FormProvider, { form: k, children: /* @__PURE__ */ jsxs(FormLayout, { layout: "vertical", children: [
             l && /* @__PURE__ */ jsx(Alert, { message: l }),
             l && /* @__PURE__ */ jsx("br", {}),
             p && h && /* @__PURE__ */ jsx(RemoteSchemaComponent, { noForm: !0, components: c, scope: u, uid: h }),
@@ -19255,7 +19255,7 @@ const SchemaSettingsModalItem = (e) => {
     "initialValues",
     "width",
     "noRecord"
-  ]), m = useContext(SchemaOptionsContext), h = useCollection_deprecated(), x = useAPIClient(), f = useApp(), { theme: C } = useGlobalTheme(), S = useBlockRequestContext(), b = useFormActiveFields(), { locale: y } = useContext(ConfigProvider.ConfigContext), v = useDataSourceManager(), I = useDataSourceKey(), A = useCollectionRecord(), { association: k } = useDataBlockProps() || {}, w = useFormBlockContext(), M = useBlockContext(), { getOperators: N } = useOperators(), { formValue: E, collection: z } = useSubFormValue(), O = useCurrentPopupRecord(), R = useParentPopupRecord();
+  ]), m = useContext(SchemaOptionsContext), h = useCollection_deprecated(), x = useAPIClient(), f = useApp(), { theme: C } = useGlobalTheme(), S = useBlockRequestContext(), b = useFormActiveFields(), { locale: y } = useContext(ConfigProvider.ConfigContext), v = useDataSourceManager(), I = useDataSourceKey(), k = useCollectionRecord(), { association: A } = useDataBlockProps() || {}, w = useFormBlockContext(), M = useBlockContext(), { getOperators: N } = useOperators(), { formValue: E, collection: z } = useSubFormValue(), O = useCurrentPopupRecord(), R = useParentPopupRecord();
   return t ? null : /* @__PURE__ */ jsx(
     SchemaSettingsItem,
     F(g({
@@ -19274,7 +19274,7 @@ const SchemaSettingsModalItem = (e) => {
                 recordData: R == null ? void 0 : R.value,
                 collection: R == null ? void 0 : R.collection
               },
-              children: /* @__PURE__ */ jsx(CollectionRecordProvider, { record: d ? null : A, children: /* @__PURE__ */ jsx(FormBlockContext$1.Provider, { value: w, children: /* @__PURE__ */ jsx(SubFormProvider, { value: { value: E, collection: z }, children: /* @__PURE__ */ jsx(
+              children: /* @__PURE__ */ jsx(CollectionRecordProvider, { record: d ? null : k, children: /* @__PURE__ */ jsx(FormBlockContext$1.Provider, { value: w, children: /* @__PURE__ */ jsx(SubFormProvider, { value: { value: E, collection: z }, children: /* @__PURE__ */ jsx(
                 FormActiveFieldsProvider,
                 {
                   name: "form",
@@ -19284,7 +19284,7 @@ const SchemaSettingsModalItem = (e) => {
                     {
                       allowNull: !0,
                       collection: h.name,
-                      association: k,
+                      association: A,
                       children: /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: m.scope, components: m.components, children: /* @__PURE__ */ jsx(
                         FormLayout,
                         {
@@ -19448,8 +19448,8 @@ const SchemaSettingsModalItem = (e) => {
       const I = [];
       for (const N of v.fieldReaction.rules)
         I.push(_.pickBy(N, _.identity));
-      const A = x["x-component"] === "BlockTemplate" && ((M = x["x-component-props"]) == null ? void 0 : M.templateId), w = {
-        "x-uid": A && c(A).uid || x["x-uid"]
+      const k = x["x-component"] === "BlockTemplate" && ((M = x["x-component-props"]) == null ? void 0 : M.templateId), w = {
+        "x-uid": k && c(k).uid || x["x-uid"]
       };
       x["x-linkage-rules"] = I, w["x-linkage-rules"] = I, a.emit("patch", {
         schema: w
@@ -19983,10 +19983,10 @@ const SchemaSettingsWrapper = (e) => {
           "x-uid": o["x-uid"]
         };
         I["x-component-props"] = o["x-component-props"] || {}, o["x-component-props"] = g(g({}, o["x-component-props"] || {}), v), I["x-component-props"] = o["x-component-props"], n.componentProps = o["x-component-props"];
-        const A = n.path.entire.split(".");
-        A.pop();
-        const k = A.join(".");
-        n.query(`${k}.*[0:].${o.name}`).forEach((w) => {
+        const k = n.path.entire.split(".");
+        k.pop();
+        const A = k.join(".");
+        n.query(`${A}.*[0:].${o.name}`).forEach((w) => {
           w.props.name === o.name && w.setComponentProps(g({}, v));
         }), r.emit("patch", {
           schema: I
@@ -21154,8 +21154,8 @@ function WorkflowSelect(r) {
       if (b.value) {
         const v = b.value.split(".");
         for (let I = 0; I < v.length && y; I++) {
-          const A = v[I], k = y.fields.find((w) => w.name === A);
-          k && (y = d(k.target, p));
+          const k = v[I], A = y.fields.find((w) => w.name === k);
+          A && (y = d(A.target, p));
         }
       }
       h(joinCollectionName(p, y.name)), c(`group[${l}].workflowKey`, null);
@@ -21710,7 +21710,7 @@ const ActionLink = withDynamicSchemaProps(
       "addChild",
       "onMouseEnter",
       "refreshDataBlockRequest"
-    ]), v = useACLActionParamsContext(), { wrapSSR: I, componentCls: A, hashId: k } = useStyles$d(), { t: w } = useTranslation(), [M, N] = useState(!1), [E, z] = useState(!1), O = useDesigner(), R = useField(), { run: j, element: B, disabled: T } = a(f), D = useFieldSchema(), $ = useCompile(), q = useForm(), L = useCollectionRecordData(), G = useCollectionParentRecordData(), U = D["x-toolbar-props"] || D["x-designer-props"], K = (me = D == null ? void 0 : D["x-component-props"]) == null ? void 0 : me.openMode, Y = (he = D == null ? void 0 : D["x-component-props"]) == null ? void 0 : he.openSize, W = (ge = D == null ? void 0 : D["x-component-props"]) == null ? void 0 : ge.refreshDataBlockRequest, X = q.disabled || R.disabled || ((xe = R.data) == null ? void 0 : xe.disabled) || x || T, Q = useMemo(() => (D == null ? void 0 : D["x-linkage-rules"]) || [], [D == null ? void 0 : D["x-linkage-rules"]]), { designable: J } = useDesignable(), oe = useComponent(i) || i, { modal: re } = App.useApp(), te = useVariables(), se = useLocalVariables({ currentForm: { values: L } }), { getAriaLabel: ae } = useGetAriaLabelOfAction(u), ce = useDataBlockRequest(), ue = useMemo(() => {
+    ]), v = useACLActionParamsContext(), { wrapSSR: I, componentCls: k, hashId: A } = useStyles$d(), { t: w } = useTranslation(), [M, N] = useState(!1), [E, z] = useState(!1), O = useDesigner(), R = useField(), { run: j, element: B, disabled: T } = a(f), D = useFieldSchema(), $ = useCompile(), q = useForm(), L = useCollectionRecordData(), G = useCollectionParentRecordData(), U = D["x-toolbar-props"] || D["x-designer-props"], K = (me = D == null ? void 0 : D["x-component-props"]) == null ? void 0 : me.openMode, Y = (he = D == null ? void 0 : D["x-component-props"]) == null ? void 0 : he.openSize, W = (ge = D == null ? void 0 : D["x-component-props"]) == null ? void 0 : ge.refreshDataBlockRequest, X = q.disabled || R.disabled || ((xe = R.data) == null ? void 0 : xe.disabled) || x || T, Q = useMemo(() => (D == null ? void 0 : D["x-linkage-rules"]) || [], [D == null ? void 0 : D["x-linkage-rules"]]), { designable: J } = useDesignable(), oe = useComponent(i) || i, { modal: re } = App.useApp(), te = useVariables(), se = useLocalVariables({ currentForm: { values: L } }), { getAriaLabel: ae } = useGetAriaLabelOfAction(u), ce = useDataBlockRequest(), ue = useMemo(() => {
       const Z = u || $(D.title);
       return _.isString(Z) ? w(Z) : Z;
     }, [u, D.title, w]);
@@ -21748,9 +21748,10 @@ const ActionLink = withDynamicSchemaProps(
     ), Ie = useMemo(() => {
       var Z;
       return F(g({}, p), {
-        opacity: J && (((Z = R == null ? void 0 : R.data) == null ? void 0 : Z.hidden) || !v) && 0.1
+        opacity: J && (((Z = R == null ? void 0 : R.data) == null ? void 0 : Z.hidden) || !v) && 0.1,
+        color: X ? "rgba(0, 0, 0, 0.25)" : null
       });
-    }, [J, (ee = R == null ? void 0 : R.data) == null ? void 0 : ee.hidden, p]), Se = useCallback(
+    }, [J, (ee = R == null ? void 0 : R.data) == null ? void 0 : ee.hidden, p, X]), Se = useCallback(
       (Z) => {
         S == null || S(Z);
       },
@@ -21770,7 +21771,7 @@ const ActionLink = withDynamicSchemaProps(
           style: Ie,
           onClick: Pe,
           component: oe || Button,
-          className: cls(A, k, l, "nb-action"),
+          className: cls(k, A, l, "nb-action"),
           type: e.type === "danger" ? void 0 : e.type,
           children: [
             ue,
@@ -22459,10 +22460,10 @@ const useGetFilterOptions = () => {
   var N, E, z, O, R, j, B, T, D, $, q, L;
   const { uiSchema: t, fieldSchema: o, collectionField: n } = e, { form: r } = useFormBlockContext(), { getInterface: i, getCollection: a } = useCollectionManager_deprecated(), l = useField(), { t: c } = useTranslation(), u = useFieldSchema(), { dn: d } = useDesignable(), p = ((N = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : N.fieldNames) || ((E = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : E.fieldNames), m = useLabelFields$1((z = n == null ? void 0 : n.target) != null ? z : n == null ? void 0 : n.targetCollection), h = useColorFields((O = n == null ? void 0 : n.target) != null ? O : n == null ? void 0 : n.targetCollection), x = i(n == null ? void 0 : n.interface), f = a(n == null ? void 0 : n.target), C = isFileCollection$1(f), S = ["QuickEdit", "FormItem"].includes(o["x-decorator"]), { currentMode: b } = useAssociationFieldContext(), { isAllowToSetDefaultValue: y } = useIsAllowToSetDefaultValue({ collectionField: n, fieldSchema: o }), v = ["datetime", "createdAt", "updatedAt"].includes(n == null ? void 0 : n.interface), I = ["obo", "oho", "o2o", "o2m", "m2m", "m2o", "snapshot"].includes(
     n == null ? void 0 : n.interface
-  ), A = useFieldModeOptions({ fieldSchema: o }), k = ((R = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : R.mode) || "Select";
+  ), k = useFieldModeOptions({ fieldSchema: o }), A = ((R = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : R.mode) || "Select";
   let w = "editable";
   o["x-disabled"] === !0 && (w = "readonly"), o["x-read-pretty"] === !0 && (w = "read-pretty");
-  const M = I && k === "Select";
+  const M = I && A === "Select";
   return /* @__PURE__ */ jsxs(GeneralSchemaDesigner, { disableInitializer: !0, children: [
     /* @__PURE__ */ jsx(
       SchemaSettingsModalItem,
@@ -22611,8 +22612,8 @@ const useGetFilterOptions = () => {
           { label: c("Title"), value: "Select" },
           C && { label: c("File manager"), value: "FileManager" },
           { label: c("Tag"), value: "Tag" }
-        ].filter(Boolean) : A,
-        value: k,
+        ].filter(Boolean) : k,
+        value: A,
         onChange: (G) => {
           const U = {
             "x-uid": o["x-uid"]
@@ -22624,7 +22625,7 @@ const useGetFilterOptions = () => {
       },
       "field-mode"
     ),
-    ["Tag"].includes(k) && /* @__PURE__ */ jsx(
+    ["Tag"].includes(A) && /* @__PURE__ */ jsx(
       SchemaSettingsSelectItem,
       {
         title: c("Tag color field"),
@@ -23675,7 +23676,7 @@ function getFormValues({
 function useCollectValuesToSubmit() {
   const e = useForm(), t = useFilterByTk(), { field: o, resource: n } = 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(), m = useLocalVariables({ currentForm: e }), h = useFieldSchema(), x = useTreeParentRecord();
   return useCallback(() => V(this, null, function* () {
-    var I, A, k, w;
+    var I, k, A, w;
     const { assignedValues: f = {}, overwriteValues: C } = (I = h == null ? void 0 : h["x-action-settings"]) != null ? I : {}, S = getFormValues({
       filterByTk: t,
       field: o,
@@ -23692,9 +23693,9 @@ function useCollectValuesToSubmit() {
       } else
         N != null && N !== "" && (b[M] = N);
     }));
-    if (yield Promise.all(y), (A = u == null ? void 0 : u["x-component-props"]) == null ? void 0 : A.addChild) {
+    if (yield Promise.all(y), (k = u == null ? void 0 : u["x-component-props"]) == null ? void 0 : k.addChild) {
       const M = a();
-      S[(k = M == null ? void 0 : M.name) != null ? k : "parent"] = x, S[(w = M == null ? void 0 : M.foreignKey) != null ? w : "parentId"] = x == null ? void 0 : x.id;
+      S[(A = M == null ? void 0 : M.name) != null ? A : "parent"] = x, S[(w = M == null ? void 0 : M.foreignKey) != null ? w : "parentId"] = x == null ? void 0 : x.id;
     }
     return g(g(g({}, S), C), b);
   }), [
@@ -23721,17 +23722,17 @@ const useCreateActionProps = () => {
     onClick() {
       return V(this, null, function* () {
         var w;
-        const { onSuccess: v, skipValidator: I, triggerWorkflows: A } = (w = u == null ? void 0 : u["x-action-settings"]) != null ? w : {};
+        const { onSuccess: v, skipValidator: I, triggerWorkflows: k } = (w = u == null ? void 0 : u["x-action-settings"]) != null ? w : {};
         I || (yield o.submit());
-        const k = yield f();
+        const A = yield f();
         d.data = n.data || {}, d.data.loading = !0;
         try {
           const M = yield r[C]({
-            values: k,
+            values: A,
             filterKeys: S,
             filterByTk: e,
             // TODO(refactor): should change to inject by plugin
-            triggerWorkflows: A != null && A.length ? A.map((N) => [N.workflowKey, N.context].filter(Boolean).join("!")).join(",") : void 0,
+            triggerWorkflows: k != null && k.length ? k.map((N) => [N.workflowKey, N.context].filter(Boolean).join("!")).join(",") : void 0,
             updateAssociationValues: x
           });
           if (i == null || i(!1), a == null || a(!0), l == null || l(!1), d.data.loading = !1, d.data.data = M, !(v != null && v.successMessage)) {
@@ -23757,7 +23758,7 @@ const useCreateActionProps = () => {
     onClick() {
       return V(this, null, function* () {
         var T, D, $, q, L, G;
-        const k = u.map((U) => U.name), {
+        const A = u.map((U) => U.name), {
           assignedValues: w = {},
           onSuccess: M,
           overwriteValues: N,
@@ -23776,7 +23777,7 @@ const useCreateActionProps = () => {
           filterByTk: x,
           field: t,
           form: e,
-          fieldNames: k,
+          fieldNames: A,
           getField: d,
           resource: o,
           actionFields: (b == null ? void 0 : b("form")) || []
@@ -23898,13 +23899,13 @@ const useCreateActionProps = () => {
   return {
     onClick(x, f) {
       return V(this, null, function* () {
-        var A, k, w;
+        var k, A, w;
         const {
           assignedValues: C = {},
           onSuccess: S,
           skipValidator: b,
           triggerWorkflows: y
-        } = (A = r == null ? void 0 : r["x-action-settings"]) != null ? A : {}, v = {}, I = Object.keys(C).map((M) => V(this, null, function* () {
+        } = (k = r == null ? void 0 : r["x-action-settings"]) != null ? k : {}, v = {}, I = Object.keys(C).map((M) => V(this, null, function* () {
           const N = C[M], E = m(M);
           if (isVariable(N)) {
             const z = yield u == null ? void 0 : u.parseVariable(N, d);
@@ -23917,7 +23918,7 @@ const useCreateActionProps = () => {
           values: g({}, v),
           // TODO(refactor): should change to inject by plugin
           triggerWorkflows: y != null && y.length ? y.map((M) => [M.workflowKey, M.context].filter(Boolean).join("!")).join(",") : void 0
-        }), f && (f == null || f()), e instanceof TableFieldResource || (w = (k = t == null ? void 0 : t.service) == null ? void 0 : k.refresh) == null || w.call(k), S != null && S.successMessage && (S != null && S.manualClose ? c.success({
+        }), f && (f == null || f()), e instanceof TableFieldResource || (w = (A = t == null ? void 0 : t.service) == null ? void 0 : A.refresh) == null || w.call(A), S != null && S.successMessage && (S != null && S.manualClose ? c.success({
           title: a(S == null ? void 0 : S.successMessage),
           onOk: () => V(this, null, function* () {
             S != null && S.redirecting && (S != null && S.redirectTo) && (isURL(S.redirectTo) ? window.location.href = S.redirectTo : i(S.redirectTo));
@@ -23936,13 +23937,13 @@ const useCreateActionProps = () => {
       return V(this, null, function* () {
         var z;
         const {
-          assignedValues: k = {},
+          assignedValues: A = {},
           onSuccess: w,
           updateMode: M
         } = (z = i == null ? void 0 : i["x-action-settings"]) != null ? z : {};
         m.data = e.data || {}, m.data.loading = !0;
-        const N = {}, E = Object.keys(k).map((R) => V(this, null, function* () {
-          const j = k[R], B = C(R);
+        const N = {}, E = Object.keys(A).map((R) => V(this, null, function* () {
+          const j = A[R], B = C(R);
           if (isVariable(j)) {
             const T = yield x == null ? void 0 : x.parseVariable(j, S);
             T && (N[R] = transformVariableValue(T, { targetCollectionField: B }));
@@ -23998,12 +23999,12 @@ const useCreateActionProps = () => {
     onClick() {
       return V(this, null, function* () {
         var R, j, B, T;
-        const { skipValidator: I, onSuccess: A, requestSettings: k } = (R = n == null ? void 0 : n["x-action-settings"]) != null ? R : {}, w = n == null ? void 0 : n["x-action"];
-        if (!k.url)
+        const { skipValidator: I, onSuccess: k, requestSettings: A } = (R = n == null ? void 0 : n["x-action-settings"]) != null ? R : {}, w = n == null ? void 0 : n["x-action"];
+        if (!A.url)
           return;
         I !== !0 && w === "customize:form:request" && (yield i.submit());
-        const M = k.headers ? JSON.parse(k.headers) : {}, N = k.params ? JSON.parse(k.params) : {}, E = k.data ? JSON.parse(k.data) : {};
-        if (w === "customize:form:request" && ["POST", "PUT", "PATCH"].includes(k.method)) {
+        const M = A.headers ? JSON.parse(A.headers) : {}, N = A.params ? JSON.parse(A.params) : {}, E = A.data ? JSON.parse(A.data) : {};
+        if (w === "customize:form:request" && ["POST", "PUT", "PATCH"].includes(A.method)) {
           const D = a.map((q) => q.name), $ = getFormValues({
             filterByTk: o,
             field: c,
@@ -24016,22 +24017,22 @@ const useCreateActionProps = () => {
           Object.assign(E, $);
         }
         const O = {
-          url: renderTemplate(k.url, { currentRecord: m, currentUser: x }),
-          method: k.method,
+          url: renderTemplate(A.url, { currentRecord: m, currentUser: x }),
+          method: A.method,
           headers: parse(M)({ currentRecord: m, currentUser: x }),
           params: parse(N)({ currentRecord: m, currentUser: x }),
           data: parse(E)({ currentRecord: m, currentUser: x })
         };
         f.data = c.data || {}, f.data.loading = !0;
         try {
-          if (yield e.request(g({}, O)), f.data.loading = !1, u instanceof TableFieldResource || (B = (j = d == null ? void 0 : d.service) == null ? void 0 : j.refresh) == null || B.call(j), (T = p == null ? void 0 : p.refresh) == null || T.call(p), w === "customize:form:request" && (C == null || C(!1)), !(A != null && A.successMessage))
+          if (yield e.request(g({}, O)), f.data.loading = !1, u instanceof TableFieldResource || (B = (j = d == null ? void 0 : d.service) == null ? void 0 : j.refresh) == null || B.call(j), (T = p == null ? void 0 : p.refresh) == null || T.call(p), w === "customize:form:request" && (C == null || C(!1)), !(k != null && k.successMessage))
             return;
-          A != null && A.manualClose ? S.success({
-            title: r(A == null ? void 0 : A.successMessage),
+          k != null && k.manualClose ? S.success({
+            title: r(k == null ? void 0 : k.successMessage),
             onOk: () => V(this, null, function* () {
-              A != null && A.redirecting && (A != null && A.redirectTo) && (isURL(A.redirectTo) ? window.location.href = A.redirectTo : t(A.redirectTo));
+              k != null && k.redirecting && (k != null && k.redirectTo) && (isURL(k.redirectTo) ? window.location.href = k.redirectTo : t(k.redirectTo));
             })
-          }) : message.success(r(A == null ? void 0 : A.successMessage));
+          }) : message.success(r(k == null ? void 0 : k.successMessage));
         } finally {
           f.data.loading = !1;
         }
@@ -24045,13 +24046,13 @@ const useCreateActionProps = () => {
       return V(this, null, function* () {
         var j;
         const {
-          assignedValues: A = {},
-          onSuccess: k,
+          assignedValues: k = {},
+          onSuccess: A,
           overwriteValues: w,
           skipValidator: M,
           triggerWorkflows: N
-        } = (j = c == null ? void 0 : c["x-action-settings"]) != null ? j : {}, E = {}, z = Object.keys(A).map((B) => V(this, null, function* () {
-          const T = A[B], D = p(B);
+        } = (j = c == null ? void 0 : c["x-action-settings"]) != null ? j : {}, E = {}, z = Object.keys(k).map((B) => V(this, null, function* () {
+          const T = k[B], D = p(B);
           if (isVariable(T)) {
             const $ = yield b == null ? void 0 : b.parseVariable(T, y);
             $ && (E[B] = transformVariableValue($, { targetCollectionField: D }));
@@ -24077,14 +24078,14 @@ const useCreateActionProps = () => {
             updateAssociationValues: f,
             // TODO(refactor): should change to inject by plugin
             triggerWorkflows: N != null && N.length ? N.map((B) => [B.workflowKey, B.context].filter(Boolean).join("!")).join(",") : void 0
-          })), x.data.loading = !1, i == null || i(!1), a == null || a(!0), l == null || l(!1), !(k != null && k.successMessage))
+          })), x.data.loading = !1, i == null || i(!1), a == null || a(!0), l == null || l(!1), !(A != null && A.successMessage))
             return;
-          k != null && k.manualClose ? C.success({
-            title: h(k == null ? void 0 : k.successMessage),
+          A != null && A.manualClose ? C.success({
+            title: h(A == null ? void 0 : A.successMessage),
             onOk: () => V(this, null, function* () {
-              yield e.reset(), k != null && k.redirecting && (k != null && k.redirectTo) && (isURL(k.redirectTo) ? window.location.href = k.redirectTo : u(k.redirectTo));
+              yield e.reset(), A != null && A.redirecting && (A != null && A.redirectTo) && (isURL(A.redirectTo) ? window.location.href = A.redirectTo : u(A.redirectTo));
             })
-          }) : (message.success(h(k == null ? void 0 : k.successMessage)), k != null && k.redirecting && (k != null && k.redirectTo) && (isURL(k.redirectTo) ? window.location.href = k.redirectTo : u(k.redirectTo)));
+          }) : (message.success(h(A == null ? void 0 : A.successMessage)), A != null && A.redirecting && (A != null && A.redirectTo) && (isURL(A.redirectTo) ? window.location.href = A.redirectTo : u(A.redirectTo)));
         } catch (B) {
           x.data.loading = !1;
         }
@@ -24226,17 +24227,17 @@ const useCreateActionProps = () => {
     /** 渲染 Collapse 的列表数据 */
     list: (d == null ? void 0 : d.data) || [],
     onSelected: (I) => {
-      var k, w, M, N;
-      const A = ((w = (k = t.params) == null ? void 0 : k[1]) == null ? void 0 : w.filters) || {};
-      I.length ? A[`af.${c}`] = {
+      var A, w, M, N;
+      const k = ((w = (A = t.params) == null ? void 0 : A[1]) == null ? void 0 : w.filters) || {};
+      I.length ? k[`af.${c}`] = {
         [`${c}.${i}.$in`]: I
-      } : delete A[`af.${c}`], t.run(
+      } : delete k[`af.${c}`], t.run(
         F(g({}, (M = t.params) == null ? void 0 : M[0]), {
           pageSize: 200,
           page: 1,
-          filter: mergeFilter([...Object.values(A), (N = o == null ? void 0 : o.params) == null ? void 0 : N.filter])
+          filter: mergeFilter([...Object.values(k), (N = o == null ? void 0 : o.params) == null ? void 0 : N.filter])
         }),
-        { filters: A }
+        { filters: k }
       );
     },
     handleSearchInput: (I) => {
@@ -24253,7 +24254,7 @@ const useCreateActionProps = () => {
   const { currentFields: e = [] } = useCollection_deprecated();
   return e.filter((t) => isOptionalField(t));
 }, isOptionalField = (e) => ["select", "multipleSelect", "checkbox", "checkboxGroup", "chinaRegion"].includes(e.interface) && e.uiSchema.enum, useAssociationFilterBlockProps = () => {
-  var b, y, v, I, A;
+  var b, y, v, I, k;
   const e = AssociationFilter.useAssociationField(), t = useFieldSchema(), o = useOptionalFieldList(), { getDataBlocks: n } = useFilterBlock(), r = e == null ? void 0 : e.name, i = useField(), { props: a } = useBlockRequestContext(), l = useDataSourceHeaders(a == null ? void 0 : a.dataSource), c = useCollectionManager_deprecated();
   let u, d, p, m, h, x, f, C;
   if (x = e != null && e.target ? (b = c.getCollection(e.target)) == null ? void 0 : b.getPrimaryKey() : "id", f = ((v = (y = t["x-component-props"]) == null ? void 0 : y.fieldNames) == null ? void 0 : v.label) || x, { data: h, params: p, run: m } = useRequest(
@@ -24277,14 +24278,14 @@ const useCreateActionProps = () => {
   }, [e, f, m, x]), !e)
     return {};
   if (isOptionalField(e)) {
-    const k = o.find((N) => N.name === t.name), w = {
+    const A = o.find((N) => N.name === t.name), w = {
       select: "$in",
       multipleSelect: "$anyOf",
       checkbox: "$in",
       checkboxGroup: "$anyOf"
-    }, M = ((A = k == null ? void 0 : k.uiSchema) == null ? void 0 : A.enum) || [];
+    }, M = ((k = A == null ? void 0 : A.uiSchema) == null ? void 0 : k.enum) || [];
     x = "value", f = "label", u = M, p = {}, m = () => {
-    }, C = `${k.name}.${w[k.interface]}`, d = (N) => {
+    }, C = `${A.name}.${w[A.interface]}`, d = (N) => {
       const E = N.target.value;
       if (!E) {
         u = M;
@@ -24293,26 +24294,26 @@ const useCreateActionProps = () => {
       u = M.filter((z) => z.label.includes(E));
     };
   } else
-    C = `${r}.${x}.$in`, u = (h == null ? void 0 : h.data) || [], d = (k) => {
+    C = `${r}.${x}.$in`, u = (h == null ? void 0 : h.data) || [], d = (A) => {
       m(F(g({}, p == null ? void 0 : p[0]), {
         filter: {
-          [`${f}.$includes`]: k.target.value
+          [`${f}.$includes`]: A.target.value
         }
       }));
     };
   return {
     /** 渲染 Collapse 的列表数据 */
     list: u,
-    onSelected: (k) => {
+    onSelected: (A) => {
       const { targets: w, uid: M } = findFilterTargets(t);
       n().forEach((N) => {
         var B, T, D;
         if (!w.find(($) => $.uid === N.uid))
           return;
         const z = `${M}${t.name}`, O = ((B = N.service.params) == null ? void 0 : B[0]) || {}, R = ((D = (T = N.service.params) == null ? void 0 : T[1]) == null ? void 0 : D.filters) || {};
-        if (k.length)
+        if (A.length)
           R[z] = {
-            [C]: k
+            [C]: A
           };
         else {
           if (N.dataLoadingMode === "manual")
@@ -24378,33 +24379,33 @@ const useAssociationNames = (e) => {
       var S, b, y, v;
       const m = d || u, h = p["x-collection-field"] && n(p["x-collection-field"], e), x = p.name.includes("."), f = h && ["hasOne", "hasMany", "belongsTo", "belongsToMany"].includes(h.type);
       if (p["x-linkage-rules"]) {
-        const I = (k) => {
-          const w = Object.keys(k)[0] || "$and";
-          k[w].forEach((N) => {
+        const I = (A) => {
+          const w = Object.keys(A)[0] || "$and";
+          A[w].forEach((N) => {
             if ("$and" in N || "$or" in N)
               return I(N);
             const E = getTargetField(N);
             E.length > 1 && o.add(E.join("."));
           });
         };
-        p["x-linkage-rules"].forEach(({ condition: k }) => {
-          I(k);
+        p["x-linkage-rules"].forEach(({ condition: A }) => {
+          I(A);
         });
       }
       const C = f && ((S = r(h.target, e)) == null ? void 0 : S.template) === "tree";
       if (h && (f || x) && p["x-component"] !== "TableField") {
-        const I = !f && x ? getAssociationPath(p.name) : p.name, A = m === "" || !m ? I : m + "." + I;
+        const I = !f && x ? getAssociationPath(p.name) : p.name, k = m === "" || !m ? I : m + "." + I;
         if (C)
-          o.add(A), o.add(`${A}.parent(recursively=true)`);
+          o.add(k), o.add(`${k}.parent(recursively=true)`);
         else if ((b = p["x-component-props"]) != null && b.sortArr) {
-          const k = (y = p["x-component-props"]) == null ? void 0 : y.sortArr;
-          o.add(`${A}(sort=${k})`);
+          const A = (y = p["x-component-props"]) == null ? void 0 : y.sortArr;
+          o.add(`${k}(sort=${A})`);
         } else
-          o.add(A);
+          o.add(k);
         if (["Nester", "SubTable", "PopoverNester"].includes((v = p["x-component-props"]) == null ? void 0 : v.mode)) {
-          t.add(A);
-          const k = m && m !== "" ? m + "." + p.name : p.name;
-          a(p, k);
+          t.add(k);
+          const A = m && m !== "" ? m + "." + p.name : p.name;
+          a(p, A);
         }
       } else
         [
@@ -24541,8 +24542,8 @@ function navigateWithinSelf(e, t, o = window.location.origin) {
   isURL(e) ? e.startsWith(o) ? t(e.replace(o, "")) : window.open(e, "_self") : t(e.startsWith("/") ? e : `/${e}`);
 }
 const useSyncFromForm = (e, t, o) => {
-  const { getCollectionJoinField: n, 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: S = [], depth: b = 0, maxDepth: y, prefix: v = "", disabled: I = !1 }, A) => {
-    const k = `${C}-${S.join(",")}-${b}-${y}-${v}`, w = f.get(k);
+  const { getCollectionJoinField: n, 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: S = [], depth: b = 0, maxDepth: y, prefix: v = "", disabled: I = !1 }, k) => {
+    const A = `${C}-${S.join(",")}-${b}-${y}-${v}`, w = f.get(A);
     if (w)
       return w;
     if (b > y)
@@ -24560,7 +24561,7 @@ const useSyncFromForm = (e, t, o) => {
         isLeaf: !0,
         field: N,
         disabled: I
-      }), O = A.find((j) => j.name === z.key);
+      }), O = k.find((j) => j.name === z.key);
       if (["belongsTo", "belongsToMany"].includes(N.type) && (!O || ["Select", "Picker"].includes(O == null ? void 0 : O.fieldMode)))
         E.type = "reference", z.type = "reference", z.title = React.createElement(TreeNode, F(g({}, E), { type: "reference" })), z.isLeaf = !1, z.children = m(N.target, {
           depth: b + 1,
@@ -24579,19 +24580,19 @@ const useSyncFromForm = (e, t, o) => {
             exclude: ["id", ...systemKeys],
             disabled: j
           },
-          A
+          k
         );
       }
       return z;
     }).filter(Boolean);
-    return f.set(k, M), M;
+    return f.set(A, M), M;
   })(new LRUCache({ max: 100 })), m = /* @__PURE__ */ ((f) => (C, { prefix: S, maxDepth: b, depth: y = 0, exclude: v = [] }) => {
-    const I = `${C}-${v.join(",")}-${y}-${b}-${S}`, A = f.get(I);
-    if (A)
-      return A;
+    const I = `${C}-${v.join(",")}-${y}-${b}-${S}`, k = f.get(I);
+    if (k)
+      return k;
     if (y > b)
       return [];
-    const k = r(C).map((w) => {
+    const A = r(C).map((w) => {
       var E, z;
       if (!w.target || !w.interface || v.includes(w.name))
         return;
@@ -24614,7 +24615,7 @@ const useSyncFromForm = (e, t, o) => {
         })
       };
     }).filter(Boolean);
-    return f.set(I, k), k;
+    return f.set(I, A), A;
   })(new LRUCache({ max: 100 })), h = useCallback((f, C) => {
     if (!f)
       return [];
@@ -24629,10 +24630,10 @@ const useSyncFromForm = (e, t, o) => {
       return V(this, null, function* () {
         var y;
         const f = /* @__PURE__ */ new Set([]), C = /* @__PURE__ */ new Set([]), S = (v, I) => {
-          var A;
-          (A = v == null ? void 0 : v.reduceProperties) == null || A.call(v, (k, w) => {
+          var k;
+          (k = v == null ? void 0 : v.reduceProperties) == null || k.call(v, (A, w) => {
             var j, B, T;
-            const M = k || I, N = w["x-collection-field"] && n(w["x-collection-field"]), E = w.name.includes("."), z = N && ["hasOne", "hasMany", "belongsTo", "belongsToMany"].includes(N.type), O = !z && E ? getAssociationPath(w.name) : w.name, R = M === "" || !M ? O : M + "." + O;
+            const M = A || I, N = w["x-collection-field"] && n(w["x-collection-field"]), E = w.name.includes("."), z = N && ["hasOne", "hasMany", "belongsTo", "belongsToMany"].includes(N.type), O = !z && E ? getAssociationPath(w.name) : w.name, R = M === "" || !M ? O : M + "." + O;
             if (N && !(["hasOne", "hasMany"].includes(N.type) || ["SubForm", "Nester"].includes((j = w["x-component-props"]) == null ? void 0 : j.mode)) && C.add(R), N && (z || E) && w["x-component"] !== "TableField") {
               if (f.add({ name: R, fieldMode: ((B = w["x-component-props"]) == null ? void 0 : B.mode) || "Select" }), ["Nester", "SubTable"].includes((T = w["x-component-props"]) == null ? void 0 : T.mode)) {
                 const D = M && M !== "" ? M + "." + w.name : w.name;
@@ -25411,7 +25412,7 @@ function Input$1(e) {
     fieldNames: u
   } = e, d = typeof e.scope == "function" ? e.scope() : e.scope, { wrapSSR: p, hashId: m, componentCls: h, rootPrefixCls: x } = useStyles$c();
   useAntdInputStyle(`${x}-input`);
-  const f = useCompile(), { t: C } = useTranslation(), S = useForm(), [b, y] = React.useState([]), [v, I] = React.useState([]), A = useMemo(() => parseValue(t), [t]), k = typeof A == "string", w = k ? A : "", M = k ? null : A, N = Object.assign(
+  const f = useCompile(), { t: C } = useTranslation(), S = useForm(), [b, y] = React.useState([]), [v, I] = React.useState([]), k = useMemo(() => parseValue(t), [t]), A = typeof k == "string", w = A ? k : "", M = A ? null : k, N = Object.assign(
     {
       label: "label",
       value: "value",
@@ -25816,13 +25817,13 @@ function getCurrentRange(e) {
   ];
 }
 function TextArea(e) {
-  const { wrapSSR: t, hashId: o, componentCls: n } = useStyles$c(), { value: r = "", scope: i, onChange: a, multiline: l = !0, changeOnSelect: c, style: u } = e, d = useRef(null), [p, m] = useState([]), h = useForm(), x = useMemo(() => createOptionsValueLabelMap(p), [p]), [f, C] = useState(!1), [S, b] = useState(!1), [y, v] = useState(() => renderHTML(r != null ? r : "", x)), [I, A] = useState([-1, 0, -1, 0]);
+  const { wrapSSR: t, hashId: o, componentCls: n } = useStyles$c(), { value: r = "", scope: i, onChange: a, multiline: l = !0, changeOnSelect: c, style: u } = e, d = useRef(null), [p, m] = useState([]), h = useForm(), x = useMemo(() => createOptionsValueLabelMap(p), [p]), [f, C] = useState(!1), [S, b] = useState(!1), [y, v] = useState(() => renderHTML(r != null ? r : "", x)), [I, k] = useState([-1, 0, -1, 0]);
   useAntdInputStyle("ant-input"), useEffect(() => {
     preloadOptions(i, r).then((j) => {
       m(j);
     }).catch(console.error);
   }, [i, r]), useEffect(() => {
-    v(renderHTML(r != null ? r : "", x)), S || A([-1, 0, -1, 0]);
+    v(renderHTML(r != null ? r : "", x)), S || k([-1, 0, -1, 0]);
   }, [r, x]), useEffect(() => {
     var T;
     const { current: j } = d;
@@ -25844,11 +25845,11 @@ function TextArea(e) {
       if (D) {
         B.setStartAfter(D), B.setEndAfter(D);
         const $ = Array.from(j.childNodes), q = B.startContainer === j ? -1 : $.indexOf(D), L = B.startContainer === j ? -1 : $.indexOf(D);
-        A([q, B.startOffset, L, B.endOffset]);
+        k([q, B.startOffset, L, B.endOffset]);
       }
     }
   }, [y]);
-  const k = useCallback(
+  const A = useCallback(
     function(j) {
       const B = j.filter(($) => !!$.trim()), { current: T } = d;
       if (!T || !B)
@@ -25857,23 +25858,23 @@ function TextArea(e) {
       const D = createVariableTagHTML(B.join("."), x);
       pasteHTML(T, D, {
         range: I
-      }), b(!0), A(getCurrentRange(T)), a(getValue(T));
+      }), b(!0), k(getCurrentRange(T)), a(getValue(T));
     },
     [x, a, I]
   ), w = useCallback(
     function({ currentTarget: j }) {
-      f || (b(!0), A(getCurrentRange(j)), a(getValue(j)));
+      f || (b(!0), k(getCurrentRange(j)), a(getValue(j)));
     },
     [f, a]
   ), M = useCallback(function({ currentTarget: j }) {
-    A(getCurrentRange(j));
+    k(getCurrentRange(j));
   }, []), N = useCallback(function(j) {
     j.key === "Enter" && j.preventDefault();
   }, []), E = useCallback(function() {
     C(!0);
   }, []), z = useCallback(
     ({ currentTarget: j }) => {
-      C(!1), b(!0), A(getCurrentRange(j)), a(getValue(j));
+      C(!1), b(!0), k(getCurrentRange(j)), a(getValue(j));
     },
     [a]
   ), O = useCallback(
@@ -25896,7 +25897,7 @@ function TextArea(e) {
           }
         }
       }).replace(/\n/g, " ");
-      b(!0), pasteHTML(j.currentTarget, T), A(getCurrentRange(j.currentTarget)), a(getValue(j.currentTarget));
+      b(!0), pasteHTML(j.currentTarget, T), k(getCurrentRange(j.currentTarget)), a(getValue(j.currentTarget));
     },
     [a]
   ), R = e.disabled || h.disabled;
@@ -25967,7 +25968,7 @@ function TextArea(e) {
               dangerouslySetInnerHTML: { __html: y }
             }
           ),
-          R ? null : /* @__PURE__ */ jsx(VariableSelect, { options: p, setOptions: m, onInsert: k, changeOnSelect: c })
+          R ? null : /* @__PURE__ */ jsx(VariableSelect, { options: p, setOptions: m, onInsert: A, changeOnSelect: c })
         ]
       }
     )
@@ -27369,9 +27370,9 @@ const customizeLinkActionSettings = new SchemaSettings({
       step: null
     }
   }), [n]);
-  useMemo(() => gridSizes.reduce((I, A) => (I[A] = F(g({}, p), {
-    title: n(screenSizeTitleMaps[A]),
-    description: `${n("Screen size")} ${screenSizeMaps[A]} ${n("pixels")}`
+  useMemo(() => gridSizes.reduce((I, k) => (I[k] = F(g({}, p), {
+    title: n(screenSizeTitleMaps[k]),
+    description: `${n("Screen size")} ${screenSizeMaps[k]} ${n("pixels")}`
   }), I), {}), [p, n]);
   const m = u == null ? void 0 : u.map((I) => I.startsWith("-") ? {
     field: I.substring(1),
@@ -27474,8 +27475,8 @@ const customizeLinkActionSettings = new SchemaSettings({
           }
         },
         onSubmit: ({ sort: I }) => {
-          const A = I.map((k) => k.direction === "desc" ? `-${k.field}` : k.field);
-          _.set(r, "x-decorator-props.params.sort", A), a.decoratorProps.params = g({}, r["x-decorator-props"].params), l.emit("patch", {
+          const k = I.map((A) => A.direction === "desc" ? `-${A.field}` : A.field);
+          _.set(r, "x-decorator-props.params.sort", k), a.decoratorProps.params = g({}, r["x-decorator-props"].params), l.emit("patch", {
             schema: {
               "x-uid": r["x-uid"],
               "x-decorator-props": r["x-decorator-props"]
@@ -28813,14 +28814,14 @@ const gridCardBlockSettings = new SchemaSettings({
       options: n,
       value: p == null ? void 0 : p.label,
       onChange(C) {
-        var v, I, A, k, w;
+        var v, I, k, A, w;
         const S = {
           "x-uid": c["x-uid"]
-        }, b = F(g(g({}, (I = (v = d == null ? void 0 : d.uiSchema) == null ? void 0 : v["x-component-props"]) == null ? void 0 : I.fieldNames), (A = c["x-component-props"]) == null ? void 0 : A.fieldNames), {
+        }, b = F(g(g({}, (I = (v = d == null ? void 0 : d.uiSchema) == null ? void 0 : v["x-component-props"]) == null ? void 0 : I.fieldNames), (k = c["x-component-props"]) == null ? void 0 : k.fieldNames), {
           label: C
         });
         c["x-component-props"] = c["x-component-props"] || {}, c["x-component-props"].fieldNames = b, S["x-component-props"] = c["x-component-props"], t.componentProps.fieldNames = c["x-component-props"].fieldNames;
-        const y = (w = t.path) == null ? void 0 : w.splice(((k = t.path) == null ? void 0 : k.length) - 1, 1);
+        const y = (w = t.path) == null ? void 0 : w.splice(((A = t.path) == null ? void 0 : A.length) - 1, 1);
         t.form.query(`${y.concat("*." + c.name)}`).forEach((M) => {
           M.componentProps.fieldNames = p;
         }), o.emit("patch", {
@@ -30087,8 +30088,8 @@ const useFieldComponentOptions = () => {
   const { refresh: t } = useDesignable(), o = useAPIClient(), { t: n } = useTranslation();
   return useCallback(
     (r) => {
-      var f, C, S, b, y, v, I, A, k, w, M, N, E, z, O;
-      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 = (b = (S = a == null ? void 0 : a.data) == null ? void 0 : S.current) == null ? void 0 : b.schema, u = (v = (y = a == null ? void 0 : a.data) == null ? void 0 : y.current) == null ? void 0 : v.insertAdjacent, d = (A = (I = a == null ? void 0 : a.data) == null ? void 0 : I.current) == null ? void 0 : A.breakRemoveOn, p = (w = (k = a == null ? void 0 : a.data) == null ? void 0 : k.current) == null ? void 0 : w.wrapSchema, m = (N = (M = a == null ? void 0 : a.data) == null ? void 0 : M.current) == null ? void 0 : N.onSuccess, h = (O = (z = (E = a == null ? void 0 : a.data) == null ? void 0 : E.current) == null ? void 0 : z.removeParentsIfNoChildren) != null ? O : !0;
+      var f, C, S, b, y, v, I, k, A, w, M, N, E, z, O;
+      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 = (b = (S = a == null ? void 0 : a.data) == null ? void 0 : S.current) == null ? void 0 : b.schema, u = (v = (y = a == null ? void 0 : a.data) == null ? void 0 : y.current) == null ? void 0 : v.insertAdjacent, d = (k = (I = a == null ? void 0 : a.data) == null ? void 0 : I.current) == null ? void 0 : k.breakRemoveOn, p = (w = (A = a == null ? void 0 : a.data) == null ? void 0 : A.current) == null ? void 0 : w.wrapSchema, m = (N = (M = a == null ? void 0 : a.data) == null ? void 0 : M.current) == null ? void 0 : N.onSuccess, h = (O = (z = (E = a == null ? void 0 : a.data) == null ? void 0 : E.current) == null ? void 0 : z.removeParentsIfNoChildren) != null ? O : !0;
       if (!l || !c) {
         e == null || e(r);
         return;
@@ -30588,7 +30589,7 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
       "CustomDropdownRender",
       "optionFilter",
       "dataSource"
-    ]), x = useDataSourceKey(), f = useDataSourceHeaders(m || x), [C, S] = useState(!1), b = useRef(!1), y = useFieldSchema(), v = ((K = y["x-component-props"]) == null ? void 0 : K.addMode) === "quickAdd", { getField: I } = useCollection_deprecated(), A = useRef(null), { getCollectionJoinField: k, getInterface: w } = useCollectionManager_deprecated(), M = y["x-collection-field"] || y.name, N = I(M) || k(M), E = u || (N == null ? void 0 : N.target) && (t == null ? void 0 : t.label) && k(`${N.target}.${t.label}`), z = useMemo(() => {
+    ]), x = useDataSourceKey(), f = useDataSourceHeaders(m || x), [C, S] = useState(!1), b = useRef(!1), y = useFieldSchema(), v = ((K = y["x-component-props"]) == null ? void 0 : K.addMode) === "quickAdd", { getField: I } = useCollection_deprecated(), k = useRef(null), { getCollectionJoinField: A, getInterface: w } = useCollectionManager_deprecated(), M = y["x-collection-field"] || y.name, N = I(M) || A(M), E = u || (N == null ? void 0 : N.target) && (t == null ? void 0 : t.label) && A(`${N.target}.${t.label}`), z = useMemo(() => {
       var W, X;
       return E != null && E.interface && ((X = (W = w(E.interface)) == null ? void 0 : W.filterable) == null ? void 0 : X.operators[0].value) || "$includes";
     }, [E]), O = useCompile(), R = useCallback(
@@ -30641,15 +30642,15 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
         fieldNames: t
       }),
       [o, t]
-    ), $ = useCallback(() => A.current && d ? /* @__PURE__ */ jsx(
+    ), $ = useCallback(() => k.current && d ? /* @__PURE__ */ jsx(
       d,
       {
-        search: A.current,
+        search: k.current,
         callBack: () => {
-          A.current = null, S(!1);
+          k.current = null, S(!1);
         }
       }
-    ) : null, [A.current]);
+    ) : null, [k.current]);
     useEffect(() => {
       b.current && B();
     }, [D]);
@@ -30664,7 +30665,7 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
           } : {},
           (X = o == null ? void 0 : o.params) == null ? void 0 : X.filter
         ])
-      }), A.current = W;
+      }), k.current = W;
     }), L = useMemo(() => {
       var J;
       const W = r || i;
@@ -30684,7 +30685,7 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
         fieldNames: t,
         onSearch: q,
         onDropdownVisibleChange: (W) => {
-          S(W), A.current = null, W && B(), b.current = !0;
+          S(W), k.current = null, W && B(), b.current = !0;
         },
         objectValue: a,
         value: r,
@@ -30694,10 +30695,10 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
         options: R(L),
         rawOptions: L,
         dropdownRender: (W) => {
-          const X = L.some((Q) => Q[t.label] === A.current);
+          const X = L.some((Q) => Q[t.label] === k.current);
           return /* @__PURE__ */ jsx(Fragment, { children: v ? /* @__PURE__ */ jsxs(Fragment, { children: [
-            !((j == null ? void 0 : j.data.length) === 0 && (A != null && A.current)) && W,
-            (j == null ? void 0 : j.data.length) > 0 && (A == null ? void 0 : A.current) && !X && /* @__PURE__ */ jsx(Divider, { style: { margin: 0 } }),
+            !((j == null ? void 0 : j.data.length) === 0 && (k != null && k.current)) && W,
+            (j == null ? void 0 : j.data.length) > 0 && (k == null ? void 0 : k.current) && !X && /* @__PURE__ */ jsx(Divider, { style: { margin: 0 } }),
             !X && /* @__PURE__ */ jsx($, {})
           ] }) : W });
         }
@@ -30767,12 +30768,12 @@ const useFormDataTemplates = () => {
   }, e), [e, o.colorFillAlter]), C = useMemo(() => ({ fontSize: o.fontSize, fontWeight: "bold", whiteSpace: "nowrap", marginRight: o.marginXS }), [o.fontSize, o.marginXS]), S = useCallback((v) => V(void 0, null, function* () {
     d(v), m(null), t == null || t.reset();
   }), []), b = useCallback((v, I) => V(void 0, null, function* () {
-    const A = F(g({}, I), { dataId: v });
-    m(I), fetchTemplateData(h, A).then((k) => (t && k && (t.reset(), t.__template = !0, forEach(k, (w, M) => {
+    const k = F(g({}, I), { dataId: v });
+    m(I), fetchTemplateData(h, k).then((A) => (t && A && (t.reset(), t.__template = !0, forEach(A, (w, M) => {
       var N;
       w && (t.values[M] = w, (N = t == null ? void 0 : t.setInitialValuesIn) == null || N.call(t, M, w));
-    })), k)).catch((k) => {
-      console.error(k);
+    })), A)).catch((A) => {
+      console.error(A);
     });
   }), []);
   if (!i || !r)
@@ -30834,7 +30835,7 @@ function fetchTemplateData(e, t, o) {
 }
 const useFormBlockHeight = () => {
   var y, v, I;
-  const e = useDataBlockHeight(), t = useFieldSchema(), { token: o } = theme.useToken(), { designable: n } = useDesignable(), { heightProps: r } = useBlockHeightProps() || {}, { title: i } = r || {}, { display: a, enabled: l } = useFormDataTemplates(), c = t.reduceProperties((A, k) => k["x-component"] === "ActionBar" ? k : A), u = Object.keys((c == null ? void 0 : c.properties) || {}).length > 0, d = (I = (v = (y = t == null ? void 0 : t.parent) == null ? void 0 : y["x-decorator"]) == null ? void 0 : v.includes) == null ? void 0 : I.call(v, "FormBlockProvider"), p = u || n ? o.controlHeight + (d ? 1 : 2) * o.marginLG : o.marginLG, m = i ? o.fontSizeLG * o.lineHeightLG + o.padding * 2 - 1 : 0, { data: h } = useDataBlockRequest() || {}, { count: x, pageSize: f } = (h == null ? void 0 : h.meta) || {}, S = x > f ? o.controlHeightSM + 1 * o.paddingLG : 0, b = a && l ? o.controlHeight + 2 * o.padding + o.margin : 0;
+  const e = useDataBlockHeight(), t = useFieldSchema(), { token: o } = theme.useToken(), { designable: n } = useDesignable(), { heightProps: r } = useBlockHeightProps() || {}, { title: i } = r || {}, { display: a, enabled: l } = useFormDataTemplates(), c = t.reduceProperties((k, A) => A["x-component"] === "ActionBar" ? A : k), u = Object.keys((c == null ? void 0 : c.properties) || {}).length > 0, d = (I = (v = (y = t == null ? void 0 : t.parent) == null ? void 0 : y["x-decorator"]) == null ? void 0 : v.includes) == null ? void 0 : I.call(v, "FormBlockProvider"), p = u || n ? o.controlHeight + (d ? 1 : 2) * o.marginLG : o.marginLG, m = i ? o.fontSizeLG * o.lineHeightLG + o.padding * 2 - 1 : 0, { data: h } = useDataBlockRequest() || {}, { count: x, pageSize: f } = (h == null ? void 0 : h.meta) || {}, S = x > f ? o.controlHeightSM + 1 * o.paddingLG : 0, b = a && l ? o.controlHeight + 2 * o.padding + o.margin : 0;
   return e - p - o.paddingLG - m - S - b;
 }, FormComponent = (e) => {
   const u = e, { form: t, children: o } = u, n = H(u, ["form", "children"]), r = useField(), i = useFieldSchema(), a = useAttach(t.createVoidField(F(g({}, r.props), { basePath: "" }))), l = useFormBlockHeight(), { token: c } = theme.useToken();
@@ -30884,12 +30885,12 @@ const useFormBlockHeight = () => {
           if ((f = x.targetFields) != null && f.length) {
             const C = x.targetFields.join(",");
             onFieldInit(`*(${C})`, (S, b) => {
-              var y, v, I, A;
+              var y, v, I, k;
               S.initStateOfLinkageRules = {
                 display: ((y = S.initStateOfLinkageRules) == null ? void 0 : y.display) || getTempFieldState(!0, S.display),
                 required: ((v = S.initStateOfLinkageRules) == null ? void 0 : v.required) || getTempFieldState(!0, S.required || !1),
                 pattern: ((I = S.initStateOfLinkageRules) == null ? void 0 : I.pattern) || getTempFieldState(!0, S.pattern),
-                value: ((A = S.initStateOfLinkageRules) == null ? void 0 : A.value) || getTempFieldState(!0, S.value || S.initialValue)
+                value: ((k = S.initStateOfLinkageRules) == null ? void 0 : k.value) || getTempFieldState(!0, S.value || S.initialValue)
               }, p.push(
                 reaction(
                   // 这里共依赖 3 部分，当这 3 部分中的任意一部分发生变更后，需要触发联动规则：
@@ -30897,8 +30898,8 @@ const useFormBlockHeight = () => {
                   // 2. 条件中的变量值；
                   // 3. value 表达式中的变量值；
                   () => {
-                    const k = getFieldValuesInCondition({ linkageRules: l, formValues: b.values }), w = getVariableValuesInCondition({ linkageRules: l, localVariables: i }), M = getVariableValuesInExpression({ action: x, localVariables: i });
-                    return [k, w, M].map((E) => JSON.stringify(E)).join(",");
+                    const A = getFieldValuesInCondition({ linkageRules: l, formValues: b.values }), w = getVariableValuesInCondition({ linkageRules: l, localVariables: i }), M = getVariableValuesInExpression({ action: x, localVariables: i });
+                    return [A, w, M].map((E) => JSON.stringify(E)).join(",");
                   },
                   getSubscriber(x, S, m, r, i),
                   { fireImmediately: !0, equals: _.isEqual }
@@ -31718,7 +31719,7 @@ const FixedBlockContext = React.createContext({
   const h = (B = l["x-component-props"]) == null ? void 0 : B.disablePageHeader, x = (T = l["x-component-props"]) == null ? void 0 : T.enablePageTabs, f = (D = l["x-component-props"]) == null ? void 0 : D.hidePageTitle, C = useContext(SchemaOptionsContext), [S, b] = useSearchParams(), [y, v] = useState(!1), I = useMemo(
     () => S.get("tab") || Object.keys(l.properties || {}).shift(),
     [l.properties, S]
-  ), [A, k] = useState(0), { wrapSSR: w, hashId: M, componentCls: N } = useStyles$9(), E = useStyles$a(), { token: z } = useToken(), O = f ? void 0 : l.title || r(i);
+  ), [k, A] = useState(0), { wrapSSR: w, hashId: M, componentCls: N } = useStyles$9(), E = useStyles$a(), { token: z } = useToken(), O = f ? void 0 : l.title || r(i);
   useRequest(
     {
       url: `/uiSchemas:getParentJsonSchema/${l["x-uid"]}`
@@ -31740,7 +31741,7 @@ const FixedBlockContext = React.createContext({
         "div",
         {
           ref: ($) => {
-            k(Math.floor(($ == null ? void 0 : $.getBoundingClientRect().height) || 0) + 1);
+            A(Math.floor(($ == null ? void 0 : $.getBoundingClientRect().height) || 0) + 1);
           },
           children: !h && /* @__PURE__ */ jsx(
             PageHeader,
@@ -31834,7 +31835,7 @@ const FixedBlockContext = React.createContext({
           )
         }
       ),
-      /* @__PURE__ */ jsx("div", { className: "nb-page-wrapper", children: /* @__PURE__ */ jsx(ErrorBoundary, { FallbackComponent: ErrorFallback, onError: R, children: PageContent(y, h, x, l, I, A) }) })
+      /* @__PURE__ */ jsx("div", { className: "nb-page-wrapper", children: /* @__PURE__ */ jsx(ErrorBoundary, { FallbackComponent: ErrorFallback, onError: R, children: PageContent(y, h, x, l, I, k) }) })
     ] })
   );
 };
@@ -32156,7 +32157,7 @@ const AppendsTreeSelect = (e) => {
     "filter",
     "rootOption",
     "loadData"
-  ]), d = useCompile(), { t: p } = useTranslation(), [m, h] = useState({}), x = i({ collection: r }), [f, C] = parseCollectionName(x), S = useApp(), { collectionManager: b } = S.dataSourceManager.getDataSource(f), y = b.getCollectionFields.bind(b), v = Object.values(m), I = useMemo(() => e.multiple ? (o || []).map((z) => m[z]).filter(Boolean) : o, [o, e.multiple, m]), A = useCallback(
+  ]), d = useCompile(), { t: p } = useTranslation(), [m, h] = useState({}), x = i({ collection: r }), [f, C] = parseCollectionName(x), S = useApp(), { collectionManager: b } = S.dataSourceManager.getDataSource(f), y = b.getCollectionFields.bind(b), v = Object.values(m), I = useMemo(() => e.multiple ? (o || []).map((z) => m[z]).filter(Boolean) : o, [o, e.multiple, m]), k = useCallback(
     (z) => V(void 0, null, function* () {
       if (c != null)
         return c(z);
@@ -32197,7 +32198,7 @@ const AppendsTreeSelect = (e) => {
       }
     }), h((R) => O.reduce((j, B) => Object.assign(j, { [B.value]: B }), g({}, R)));
   }, [o, v.length, e.multiple]);
-  const k = useCallback(
+  const A = useCallback(
     (z) => {
       if (!e.multiple) {
         n(z);
@@ -32245,10 +32246,10 @@ const AppendsTreeSelect = (e) => {
       treeCheckStrictly: e.multiple,
       treeCheckable: e.multiple,
       tagRender: w,
-      onChange: k,
+      onChange: A,
       treeDataSimpleMode: !0,
       treeData: v,
-      loadData: A
+      loadData: k
     }, u)
   );
 }, AssociationFieldProvider = observer$1(
@@ -32312,25 +32313,25 @@ const AppendsTreeSelect = (e) => {
   }), n;
 }, InternalAssociationSelect$1 = observer$1(
   (e) => {
-    var A;
-    const I = e, { objectValue: t = !0, addMode: o } = I, n = H(I, ["objectValue", "addMode"]), r = useField(), i = useFieldSchema(), a = useServiceOptions$1((i == null ? void 0 : i["x-component-props"]) || e), { options: l } = useAssociationFieldContext(), c = isVariable(e.value) ? void 0 : e.value, u = Array.isArray(c) ? c.filter(Boolean) : c, [d, p] = useState(u), m = (A = i["x-component-props"]) == null ? void 0 : A.addMode, { t: h } = useTranslation(), { multiple: x } = e, f = useForm(), S = useAPIClient().resource(l.target), b = useCollectionRecordData();
+    var k;
+    const I = e, { objectValue: t = !0, addMode: o } = I, n = H(I, ["objectValue", "addMode"]), r = useField(), i = useFieldSchema(), a = useServiceOptions$1((i == null ? void 0 : i["x-component-props"]) || e), { options: l } = useAssociationFieldContext(), c = isVariable(e.value) ? void 0 : e.value, u = Array.isArray(c) ? c.filter(Boolean) : c, [d, p] = useState(u), m = (k = i["x-component-props"]) == null ? void 0 : k.addMode, { t: h } = useTranslation(), { multiple: x } = e, f = useForm(), S = useAPIClient().resource(l.target), b = useCollectionRecordData();
     useEffect(() => {
-      const k = isVariable(r.value) ? void 0 : r.value, w = Array.isArray(k) ? k.filter(Boolean) : k;
+      const A = isVariable(r.value) ? void 0 : r.value, w = Array.isArray(A) ? A.filter(Boolean) : A;
       p(w);
     }, [r.value]), useEffect(() => {
-      const k = uid();
-      return f.addEffects(k, () => {
+      const A = uid();
+      return f.addEffects(A, () => {
         onFieldInputValueChange("*", (w) => {
           var N, E, z, O;
           (filterAnalyses((z = (E = (N = r.componentProps) == null ? void 0 : N.service) == null ? void 0 : E.params) == null ? void 0 : z.filter) || []).includes((O = w == null ? void 0 : w.props) == null ? void 0 : O.name) && r.value && (r.setValue(r.initialValue), p(r.initialValue));
         });
       }), () => {
-        f.removeEffects(k);
+        f.removeEffects(A);
       };
     }, []);
-    const y = (k) => V(void 0, null, function* () {
+    const y = (A) => V(void 0, null, function* () {
       var E, z;
-      const { search: w, callBack: M } = k, {
+      const { search: w, callBack: M } = A, {
         data: { data: N }
       } = yield S.create({
         values: {
@@ -32345,14 +32346,14 @@ const AppendsTreeSelect = (e) => {
           f.setValuesIn(r.path, N), r.onInput(N);
         isFunction(M) && (M == null || M()), message.success(h("Saved successfully"));
       }
-    }), v = (k) => /* @__PURE__ */ jsxs(
+    }), v = (A) => /* @__PURE__ */ jsxs(
       "div",
       {
-        onClick: () => y(k),
+        onClick: () => y(A),
         style: { cursor: "pointer", padding: "5px 12px", color: "#0d0c0c" },
         children: [
           /* @__PURE__ */ jsx(PlusOutlined, {}),
-          /* @__PURE__ */ jsx("span", { style: { paddingLeft: 5 }, children: h("Add") + ` “${k.search}” ` })
+          /* @__PURE__ */ jsx("span", { style: { paddingLeft: 5 }, children: h("Add") + ` “${A.search}” ` })
         ]
       }
     );
@@ -32366,9 +32367,9 @@ const AppendsTreeSelect = (e) => {
           objectValue: t,
           value: u || d,
           service: a,
-          onChange: (k) => {
+          onChange: (A) => {
             var M;
-            const w = (k == null ? void 0 : k.length) !== 0 ? k : null;
+            const w = (A == null ? void 0 : A.length) !== 0 ? A : null;
             (M = e.onChange) == null || M.call(e, w);
           },
           CustomDropdownRender: m === "quickAdd" && v
@@ -32380,7 +32381,7 @@ const AppendsTreeSelect = (e) => {
           onlyRenderProperties: !0,
           basePath: r.address,
           schema: i,
-          filterProperties: (k) => k["x-component"] === "Action"
+          filterProperties: (A) => A["x-component"] === "Action"
         }
       ) }) })
     ] }) }, i.name);
@@ -32903,26 +32904,26 @@ function Uploader(o) {
   const f = useCallback(
     (I) => {
       if (i) {
-        const A = I.fileList.filter((k) => k.status === "done");
-        if (A.length) {
-          const k = [...a != null ? a : [], ...A.map(toValueItem)];
-          l == null || l(k);
+        const k = I.fileList.filter((A) => A.status === "done");
+        if (k.length) {
+          const A = [...a != null ? a : [], ...k.map(toValueItem)];
+          l == null || l(A);
         }
-        u(I.fileList.filter((k) => k.status !== "done").map(normalizeFile));
+        u(I.fileList.filter((A) => A.status !== "done").map(normalizeFile));
       } else {
-        const A = I.fileList.find((k) => k.uid === I.file.uid);
-        A.status === "done" ? (l == null || l(toValueItem(A)), u([])) : u([normalizeFile(A)]);
+        const k = I.fileList.find((A) => A.uid === I.file.uid);
+        k.status === "done" ? (l == null || l(toValueItem(k)), u([])) : u([normalizeFile(k)]);
       }
     },
     [a, i, l]
   ), C = useCallback((I) => {
-    u((A) => {
-      const k = A.indexOf(I);
-      return A.splice(k, 1), [...A];
+    u((k) => {
+      const A = k.indexOf(I);
+      return k.splice(A, 1), [...k];
     });
   }, []), { mimetype: S, size: b } = e != null ? e : {}, y = useSizeHint(b), v = !r && (i || (!a || Array.isArray(a) && !a.length) && !c.length);
   return /* @__PURE__ */ jsxs(Fragment, { children: [
-    c.map((I, A) => /* @__PURE__ */ jsx(AttachmentListItem, { file: I, index: A, disabled: r, onDelete: C }, I.uid)),
+    c.map((I, k) => /* @__PURE__ */ jsx(AttachmentListItem, { file: I, index: k, disabled: r, onDelete: C }, I.uid)),
     /* @__PURE__ */ jsx(
       "div",
       {
@@ -33231,7 +33232,7 @@ function FileSelector(e) {
 }
 const InternalFileManager = (e) => {
   var w, M;
-  const k = e, { value: t, multiple: o, onChange: n } = k, r = H(k, ["value", "multiple", "onChange"]), i = useFieldSchema(), [a, l] = useState(!1), [c, u] = useState([]), d = useInsertSchema("Selector"), p = useFieldNames$1(e), m = useField(), [h, x] = useState([]), { getField: f } = useCollection_deprecated(), C = f(m.props.name), S = useLabelUiSchema$1(C == null ? void 0 : C.target, (p == null ? void 0 : p.label) || "label"), b = useCompile(), { modalProps: y } = useActionContext(), v = (N) => {
+  const A = e, { value: t, multiple: o, onChange: n } = A, r = H(A, ["value", "multiple", "onChange"]), i = useFieldSchema(), [a, l] = useState(!1), [c, u] = useState([]), d = useInsertSchema("Selector"), p = useFieldNames$1(e), m = useField(), [h, x] = useState([]), { getField: f } = useCollection_deprecated(), C = f(m.props.name), S = useLabelUiSchema$1(C == null ? void 0 : C.target, (p == null ? void 0 : p.label) || "label"), b = useCompile(), { modalProps: y } = useActionContext(), v = (N) => {
     N.stopPropagation(), N.preventDefault(), d(schema$1.Selector), l(!0), u([]);
   };
   useEffect(() => {
@@ -33258,7 +33259,7 @@ const InternalFileManager = (e) => {
     selectedRows: c,
     setSelectedRows: u,
     collectionField: C
-  }, A = () => {
+  }, k = () => {
     const { setVisible: N } = useActionContext(), { multiple: E, selectedRows: z, onChange: O, options: R, collectionField: j } = useContext(RecordPickerContext);
     return {
       onClick() {
@@ -33291,7 +33292,7 @@ const InternalFileManager = (e) => {
           },
           formValueChanged: !1
         },
-        children: /* @__PURE__ */ jsx(RecordPickerProvider, F(g({}, I), { children: /* @__PURE__ */ jsx(CollectionProvider_deprecated, { name: C == null ? void 0 : C.target, children: /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(TableSelectorParamsProvider, { params: {}, children: /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: { usePickActionProps: A, useTableSelectorProps: useTableSelectorProps$2 }, children: /* @__PURE__ */ jsx(
+        children: /* @__PURE__ */ jsx(RecordPickerProvider, F(g({}, I), { children: /* @__PURE__ */ jsx(CollectionProvider_deprecated, { name: C == null ? void 0 : C.target, children: /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(TableSelectorParamsProvider, { params: {}, children: /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: { usePickActionProps: k, useTableSelectorProps: useTableSelectorProps$2 }, children: /* @__PURE__ */ jsx(
           RecursionField,
           {
             onlyRenderProperties: !0,
@@ -33320,7 +33321,7 @@ const InternalFileManager = (e) => {
   ]), [l, c] = useState(t), [u, d] = useState(!1), p = useCompile(), m = useAPIClient(), h = useServiceOptions$1(e), { options: x, field: f } = useAssociationFieldContext(), C = m.resource(x.target), { getCollectionJoinField: S, getInterface: b } = useCollectionManager_deprecated(), y = (z = f == null ? void 0 : f.componentProps) == null ? void 0 : z.fieldNames, v = (x == null ? void 0 : x.target) && (y == null ? void 0 : y.label) && S(`${x.target}.${y.label}`), I = useMemo(() => {
     var O, R;
     return v != null && v.interface && ((R = (O = b(v.interface)) == null ? void 0 : O.filterable) == null ? void 0 : R.operators[0].value) || "$includes";
-  }, [v]), A = useField();
+  }, [v]), k = useField();
   useEffect(() => {
     var O;
     if (r) {
@@ -33332,7 +33333,7 @@ const InternalFileManager = (e) => {
       a(j);
     }
   }, []);
-  const k = useCallback(
+  const A = useCallback(
     (O) => {
       try {
         return O == null ? void 0 : O.filter((R) => ["number", "string"].includes(typeof R[y.value])).map((R) => {
@@ -33375,7 +33376,7 @@ const InternalFileManager = (e) => {
     const B = yield w({ parentId: R == null ? void 0 : R.id }), T = [...i];
     if (T.splice(j + 1), T[j] = F(g({}, T[j]), { value: R }), R != null && R.id && (T[j + 1] = { key: R == null ? void 0 : R.id, children: (B == null ? void 0 : B.length) > 0 ? B : null }), a(T), ["o2m", "m2m"].includes(x.interface)) {
       const D = Array.isArray(f.fieldValue) ? f.fieldValue : [];
-      D[A.index] = R, f.fieldValue = D;
+      D[k.index] = R, f.fieldValue = D;
     } else
       f.value = R;
     n == null || n(T);
@@ -33421,7 +33422,7 @@ const InternalFileManager = (e) => {
         fieldNames: y,
         style: { minWidth: 150 },
         onChange: (D, $) => M(D, $, R),
-        options: u ? [] : k(l),
+        options: u ? [] : A(l),
         onDropdownVisibleChange: (D) => N(D, O, R),
         notFoundContent: u ? /* @__PURE__ */ jsx(Spin, { size: "small" }) : null
       },
@@ -33616,7 +33617,7 @@ const InternalNesterCss = css`
 }, InternalPicker = observer$1(
   (e) => {
     var O;
-    const z = e, { value: t, multiple: o, openSize: n, onChange: r, quickUpload: i, selectFile: a, shouldMountElement: l } = z, c = H(z, ["value", "multiple", "openSize", "onChange", "quickUpload", "selectFile", "shouldMountElement"]), u = useField(), d = useFieldNames$1(e), [p, m] = useState(!1), h = useFieldSchema(), x = useInsertSchema("Selector"), { options: f } = useAssociationFieldContext(), { collectionName: C } = useFormBlockContext(), S = useCompile(), b = useLabelUiSchema$1(f, (d == null ? void 0 : d.label) || "label"), y = h["x-add-new"], [v, I] = useState([]), A = useCollectionRecordData(), k = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((j) => {
+    const z = e, { value: t, multiple: o, openSize: n, onChange: r, quickUpload: i, selectFile: a, shouldMountElement: l } = z, c = H(z, ["value", "multiple", "openSize", "onChange", "quickUpload", "selectFile", "shouldMountElement"]), u = useField(), d = useFieldNames$1(e), [p, m] = useState(!1), h = useFieldSchema(), x = useInsertSchema("Selector"), { options: f } = useAssociationFieldContext(), { collectionName: C } = useFormBlockContext(), S = useCompile(), b = useLabelUiSchema$1(f, (d == null ? void 0 : d.label) || "label"), y = h["x-add-new"], [v, I] = useState([]), k = useCollectionRecordData(), A = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((j) => {
       const B = j == null ? void 0 : j[d.label];
       return F(g({}, j), {
         [d.label]: getLabelFormatValue$1(S(b), S(B))
@@ -33628,7 +33629,7 @@ const InternalNesterCss = css`
       association: {
         target: f == null ? void 0 : f.target
       },
-      options: k,
+      options: A,
       onChange: e == null ? void 0 : e.onChange,
       selectedRows: v,
       setSelectedRows: I,
@@ -33638,7 +33639,7 @@ const InternalNesterCss = css`
       var R;
       return o == null ? null : Array.isArray(t) ? (R = t.filter(Boolean)) == null ? void 0 : R.map((j) => j == null ? void 0 : j[d.value]) : t == null ? void 0 : t[d.value];
     }, N = () => {
-      const R = (f == null ? void 0 : f.targetKey) || "id", j = k.map((T) => T[R]).filter(Boolean);
+      const R = (f == null ? void 0 : f.targetKey) || "id", j = A.map((T) => T[R]).filter(Boolean);
       return j.length ? { $and: [{ [`${R}.$ne`]: j }] } : {};
     }, E = () => {
       const { setVisible: R } = useActionContext(), { multiple: j, selectedRows: B, onChange: T, options: D, collectionField: $ } = useContext(RecordPickerContext);
@@ -33674,7 +33675,7 @@ const InternalNesterCss = css`
                     r([]), I([]);
                     return;
                   }
-                  const j = k == null ? void 0 : k.filter((B) => R.includes(B[d.value]));
+                  const j = A == null ? void 0 : A.filter((B) => R.includes(B[d.value]));
                   r(j), I(j);
                 }
               } else {
@@ -33682,12 +33683,12 @@ const InternalNesterCss = css`
                 r(j), I(j);
               }
             },
-            options: k,
+            options: A,
             value: M(),
             open: !1
           })
         ) }),
-        y && /* @__PURE__ */ jsx(RecordProvider, { isNew: !0, record: null, parent: A, children: /* @__PURE__ */ jsx(ClearCollectionFieldContext, { children: /* @__PURE__ */ jsx(
+        y && /* @__PURE__ */ jsx(RecordProvider, { isNew: !0, record: null, parent: k, children: /* @__PURE__ */ jsx(ClearCollectionFieldContext, { children: /* @__PURE__ */ jsx(
           RecursionField,
           {
             onlyRenderProperties: !0,
@@ -33738,7 +33739,7 @@ const ReadPrettyInternalViewer = observer$1(
     var N;
     const t = useFieldSchema(), o = useRecord(), { getCollection: n } = useCollectionManager_deprecated(), { enableLink: r } = t["x-component-props"] || {}, i = useField(), a = useFieldNames$1(e), [l, c] = useState(!1), u = useInsertSchema("Viewer"), { options: d } = useAssociationFieldContext(), [p, m] = useState({}), h = useCompile(), { designable: x } = useDesignable(), { snapshot: f } = useActionContext(), C = n(d == null ? void 0 : d.target), S = (C == null ? void 0 : C.template) === "tree", b = useRef(), y = useLabelUiSchemaV2(), [v, I] = useState(!1);
     useTranslation();
-    const k = /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, ref: b, children: toArr$3(e.value).map((E, z, O) => {
+    const A = /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, ref: b, children: toArr$3(e.value).map((E, z, O) => {
       const R = E == null ? void 0 : E[(a == null ? void 0 : a.label) || "label"], j = S ? transformNestedData(E).map(($) => $ == null ? void 0 : $[(a == null ? void 0 : a.label) || "label"]).join(" / ") : isObject(R) ? JSON.stringify(R) : R, B = toValue$4(h(j), "N/A"), T = y(
         (E == null ? void 0 : E.__collection) || (d == null ? void 0 : d.target),
         (a == null ? void 0 : a.label) || "label"
@@ -33761,7 +33762,7 @@ const ReadPrettyInternalViewer = observer$1(
       ] }, `${E == null ? void 0 : E.id}_${z}`);
     }) });
     if (r === !1 || !v)
-      return k;
+      return A;
     const w = () => /* @__PURE__ */ jsx(VariablePopupRecordProvider, { recordData: p, collection: C, children: /* @__PURE__ */ jsx(WithoutTableFieldResource.Provider, { value: !0, children: /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(
       RecursionField,
       {
@@ -33776,7 +33777,7 @@ const ReadPrettyInternalViewer = observer$1(
       return E && E.length > 2 ? /* @__PURE__ */ jsx(RecordProvider, { record: p, parent: o[E[1]], children: w() }) : /* @__PURE__ */ jsx(RecordProvider, { record: p, parent: o, children: w() });
     };
     return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(BlockAssociationContext.Provider, { value: `${d == null ? void 0 : d.collectionName}.${d == null ? void 0 : d.name}`, children: /* @__PURE__ */ jsxs(CollectionProvider_deprecated, { name: (N = d == null ? void 0 : d.target) != null ? N : d == null ? void 0 : d.targetCollection, children: [
-      k,
+      A,
       /* @__PURE__ */ jsx(
         ActionContextProvider,
         {
@@ -34028,8 +34029,8 @@ function getLinkageCollection(e, t, o) {
 }
 const CreateAction = observer$1(
   (e) => {
-    var k;
-    const { onClick: t } = e, o = useCollection_deprecated(), n = useFieldSchema(), r = useField(), i = useForm(), a = useVariables(), l = useAclCheckFn(), c = n["x-enable-children"] || [], u = n == null ? void 0 : n["x-allow-add-to-current"], d = (k = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : k.linkageFromForm, p = r.componentProps.type === "danger" ? void 0 : r.componentProps.type || "primary", { getChildrenCollections: m } = useCollectionManager_deprecated(), h = m(o.name), x = useMemo(() => c.map((w) => {
+    var A;
+    const { onClick: t } = e, o = useCollection_deprecated(), n = useFieldSchema(), r = useField(), i = useForm(), a = useVariables(), l = useAclCheckFn(), c = n["x-enable-children"] || [], u = n == null ? void 0 : n["x-allow-add-to-current"], d = (A = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : A.linkageFromForm, p = r.componentProps.type === "danger" ? void 0 : r.componentProps.type || "primary", { getChildrenCollections: m } = useCollectionManager_deprecated(), h = m(o.name), x = useMemo(() => c.map((w) => {
       if (!w)
         return;
       const M = h.find((N) => N.name === w.collection);
@@ -34041,7 +34042,7 @@ const CreateAction = observer$1(
       key: w.name,
       label: b(w.title),
       onClick: () => t == null ? void 0 : t(w)
-    })), [x, t]), A = useMemo(() => ({
+    })), [x, t]), k = useMemo(() => ({
       items: I
     }), [I]);
     return useEffect(() => {
@@ -34065,7 +34066,7 @@ const CreateAction = observer$1(
         allowAddToCurrent: u,
         props: e,
         componentType: p,
-        menu: A,
+        menu: k,
         onClick: t,
         collection: o,
         icon: v,
@@ -34107,8 +34108,8 @@ function FinallyButton({
       danger: n.danger,
       icon: c,
       onClick: (v) => {
-        const I = getLinkageCollection(t, d, u), A = e.find((w) => w.name === I) ? I : l.name, k = m(A);
-        a == null || a(k);
+        const I = getLinkageCollection(t, d, u), k = e.find((w) => w.name === I) ? I : l.name, A = m(k);
+        a == null || a(A);
       },
       style: g({
         display: !p && ((C = u == null ? void 0 : u.data) == null ? void 0 : C.hidden) && "none",
@@ -34323,18 +34324,18 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
 ), toValue$3 = (e, t) => e == null ? t : e, ReadPrettyInternalTag = observer$1(
   (e) => {
     var E;
-    const t = useFieldSchema(), o = useRecord(), { enableLink: n, tagColorField: r } = t["x-component-props"], i = useField(), a = useFieldNames$1(e), [l, c] = useState(!1), u = useInsertSchema("Viewer"), { options: d } = useAssociationFieldContext(), [p, m] = useState({}), h = useCompile(), { designable: x } = useDesignable(), f = useLabelUiSchema$1(d, (a == null ? void 0 : a.label) || "label"), { snapshot: C } = useActionContext(), S = useRef(), { getCollection: b } = useCollectionManager_deprecated(), y = b(d == null ? void 0 : d.target), v = (y == null ? void 0 : y.template) === "tree", [I, A] = useState(!1), w = /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, ref: S, children: toArr$3(e.value).map((z, O, R) => {
+    const t = useFieldSchema(), o = useRecord(), { enableLink: n, tagColorField: r } = t["x-component-props"], i = useField(), a = useFieldNames$1(e), [l, c] = useState(!1), u = useInsertSchema("Viewer"), { options: d } = useAssociationFieldContext(), [p, m] = useState({}), h = useCompile(), { designable: x } = useDesignable(), f = useLabelUiSchema$1(d, (a == null ? void 0 : a.label) || "label"), { snapshot: C } = useActionContext(), S = useRef(), { getCollection: b } = useCollectionManager_deprecated(), y = b(d == null ? void 0 : d.target), v = (y == null ? void 0 : y.template) === "tree", [I, k] = useState(!1), w = /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, ref: S, children: toArr$3(e.value).map((z, O, R) => {
       const j = z == null ? void 0 : z[(a == null ? void 0 : a.label) || "label"], B = v ? transformNestedData(z).map(($) => $ == null ? void 0 : $[(a == null ? void 0 : a.label) || "label"]).join(" / ") : isObject(j) ? JSON.stringify(j) : j, T = toValue$3(h(B), "N/A"), D = getTabFormatValue(h(f), T, z[r]);
       return /* @__PURE__ */ jsxs(Fragment$1, { children: [
         /* @__PURE__ */ jsx("span", { children: C ? D : n !== !1 ? /* @__PURE__ */ jsx(
           "a",
           {
             onMouseEnter: () => {
-              A(!0);
+              k(!0);
             },
             onClick: ($) => {
               var q;
-              A(!0), $.stopPropagation(), $.preventDefault(), x && u(schema$1.Viewer), c(!0), m(z), (q = S == null ? void 0 : S.current) == null || q.setPopoverVisible(!1);
+              k(!0), $.stopPropagation(), $.preventDefault(), x && u(schema$1.Viewer), c(!0), m(z), (q = S == null ? void 0 : S.current) == null || q.setPopoverVisible(!1);
             },
             children: D
           }
@@ -34404,46 +34405,54 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
   const t = useField();
   return e.field || t;
 };
+function getSchemaArrJSON(e) {
+  return e.map((t) => t.name === "actions" ? omit$1(t.toJSON(), "properties") : t.toJSON());
+}
 function adjustColumnOrder(e) {
   const t = [], o = [], n = [];
   return e.forEach((r) => {
     r.fixed === "left" ? t.push(r) : r.fixed === "right" ? n.push(r) : o.push(r);
   }), [...t, ...o, ...n];
 }
-const useTableColumns$1 = (e) => {
-  const { token: t } = useToken(), o = useArrayField(e), n = useFieldSchema(), { schemaInWhitelist: r } = useACLFieldWhitelist(), { designable: i } = useDesignable(), { exists: a, render: l } = useSchemaInitializerRender(n["x-initializer"], n["x-initializer-props"]), c = useCollectionParentRecordData(), u = n.reduceProperties((x, f) => isColumnComponent$1(f) && r(Object.values(f.properties || {}).pop()) ? x.concat([f]) : x, []), d = useMemo(() => css`
+const useColumnsDeepMemoized = (e) => {
+  const t = getSchemaArrJSON(e), o = useCreation(() => ({ value: _.cloneDeep(t) }), []);
+  return _.isEqual(t, o.value) || (o.value = _.cloneDeep(t)), o.value;
+}, useTableColumns$1 = (e) => {
+  const { token: t } = useToken(), o = useArrayField(e), n = useFieldSchema(), { schemaInWhitelist: r } = useACLFieldWhitelist(), { designable: i } = useDesignable(), { exists: a, render: l } = useSchemaInitializerRender(n["x-initializer"], n["x-initializer-props"]), c = useCollectionParentRecordData(), u = n.reduceProperties((f, C) => isColumnComponent$1(C) && r(Object.values(C.properties || {}).pop()) ? f.concat([C]) : f, []), d = useColumnsDeepMemoized(u), p = useMemo(() => css`
       .nb-action-link {
         margin: -${t.paddingContentVerticalLG}px -${t.marginSM}px;
         padding: ${t.paddingContentVerticalLG}px ${t.margin}px;
       }
-    `, [t.paddingContentVerticalLG, t.marginSM]), p = useCollection(), m = useMemo(
-    () => u == null ? void 0 : u.map((x) => {
-      var S;
-      const f = x.reduceProperties((b, y) => {
-        if (isCollectionFieldComponent(y))
-          return b.concat([y]);
-      }, []), C = (f == null ? void 0 : f.length) > 0 ? f[0].name : x.name;
+    `, [t.paddingContentVerticalLG, t.marginSM]), m = useCollection(), h = useMemo(
+    () => u == null ? void 0 : u.map((f) => {
+      var b;
+      const C = f.reduceProperties((y, v) => {
+        if (isCollectionFieldComponent(v))
+          return y.concat([v]);
+      }, []), S = (C == null ? void 0 : C.length) > 0 ? C[0].name : f.name;
       return F(g({
-        title: /* @__PURE__ */ jsx(RecursionField, { name: x.name, schema: x, onlyRenderSelf: !0 }),
-        dataIndex: C,
-        key: x.name,
-        sorter: (S = x["x-component-props"]) == null ? void 0 : S.sorter,
+        title: /* @__PURE__ */ jsx(RecursionField, { name: f.name, schema: f, onlyRenderSelf: !0 }),
+        dataIndex: S,
+        key: f.name,
+        sorter: (b = f["x-component-props"]) == null ? void 0 : b.sorter,
         width: 200
-      }, x["x-component-props"]), {
-        render: (b, y) => {
+      }, f["x-component-props"]), {
+        render: (y, v) => {
           var A;
-          const v = (A = o.value) == null ? void 0 : A.indexOf(y), I = o.address.concat(y.__index || v);
-          return /* @__PURE__ */ jsx(SubFormProvider, { value: { value: y, collection: p }, children: /* @__PURE__ */ jsx(RecordIndexProvider, { index: y.__index || v, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: isNewRecord(y), record: y, parent: c, children: /* @__PURE__ */ jsx(ColumnFieldProvider, { schema: x, basePath: I, children: /* @__PURE__ */ jsx("span", { role: "button", className: d, children: /* @__PURE__ */ jsx(RecursionField, { basePath: I, schema: x, onlyRenderProperties: !0 }) }) }) }) }) });
+          const I = (A = o.value) == null ? void 0 : A.indexOf(v), k = o.address.concat(v.__index || I);
+          return /* @__PURE__ */ jsx(SubFormProvider, { value: { value: v, collection: m }, children: /* @__PURE__ */ jsx(RecordIndexProvider, { index: v.__index || I, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: isNewRecord(v), record: v, parent: c, children: /* @__PURE__ */ jsx(ColumnFieldProvider, { schema: f, basePath: k, children: /* @__PURE__ */ jsx("span", { role: "button", className: p, children: /* @__PURE__ */ jsx(RecursionField, { basePath: k, schema: f, onlyRenderProperties: !0 }) }) }) }) }) });
         }
       });
     }),
-    [u, o.value, o.address, p, c, d]
+    // 这里不能把 columnsSchema 作为依赖，因为其每次都会变化，这里使用 hasChangedColumns 作为依赖
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [d, o.value, o.address, m, c, p]
   );
   return useMemo(() => {
     if (!a)
-      return m;
-    const x = [
-      ...m,
+      return h;
+    const f = [
+      ...h,
       {
         title: l(),
         dataIndex: "TABLE_COLUMN_INITIALIZER",
@@ -34452,29 +34461,29 @@ const useTableColumns$1 = (e) => {
         fixed: i ? "right" : "none"
       }
     ];
-    return e.showDel && x.push({
+    return e.showDel && f.push({
       title: "",
       key: "delete",
       width: 60,
       align: "center",
       fixed: "right",
-      render: (f, C, S) => /* @__PURE__ */ jsx(
+      render: (C, S, b) => /* @__PURE__ */ jsx(
         DeleteOutlined,
         {
           style: { cursor: "pointer" },
           onClick: () => {
             action(() => {
-              var b;
+              var y;
               return spliceArrayState(o, {
-                startIndex: S,
+                startIndex: b,
                 deleteCount: 1
-              }), o.value.splice(S, 1), (b = o.initialValue) == null || b.splice(S, 1), o.onInput(o.value);
+              }), o.value.splice(b, 1), (y = o.initialValue) == null || y.splice(b, 1), o.onInput(o.value);
             });
           }
         }
       )
-    }), adjustColumnOrder(x);
-  }, [m, a, o, l, e.showDel, i]);
+    }), adjustColumnOrder(f);
+  }, [h, a, o, l, e.showDel, i]);
 }, SortableRow = (e) => {
   var u, d, p, m, h, x;
   const { token: t } = useToken(), o = (u = e["data-row-key"]) == null ? void 0 : u.toString(), { setNodeRef: n, isOver: r, active: i, over: a } = useSortable({
@@ -34601,7 +34610,7 @@ const useTableColumns$1 = (e) => {
       "onExpand",
       "loading",
       "onClickRow"
-    ]), b = useArrayField(S), y = useTableColumns$1(S), v = useFieldSchema(), I = useCollection(), k = ((me = v == null ? void 0 : v.parent) == null ? void 0 : me["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: w, allIncludesChildren: M } = k, N = useMemoizedFn(S.onRowDragEnd || (() => {
+    ]), b = useArrayField(S), y = useTableColumns$1(S), v = useFieldSchema(), I = useCollection(), A = ((me = v == null ? void 0 : v.parent) == null ? void 0 : me["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: w, allIncludesChildren: M } = A, N = useMemoizedFn(S.onRowDragEnd || (() => {
     })), E = usePaginationProps$1(o, i), [z, O] = useState(() => w ? M : []), [R, j] = useState(((he = b == null ? void 0 : b.data) == null ? void 0 : he.selectedRowKeys) || []), [B, T] = useState([]), D = (p == null ? void 0 : p.type) !== "none", $ = useRef(/* @__PURE__ */ new Map()), q = useMemo(() => css`
         & > td {
           background-color: ${t.controlItemBgActiveHover} !important;
@@ -34861,8 +34870,8 @@ const useTableColumns$1 = (e) => {
     const { openSize: t } = e, { field: o, options: n } = useAssociationFieldContext(), { t: r } = useTranslation(), [i, a] = useState(!1), [l, c] = useState([]), u = useFieldNames$1(e), d = useFieldSchema(), p = useCompile(), m = useLabelUiSchema$1(n, (u == null ? void 0 : u.label) || "label"), h = useCollectionRecord(), x = useCollection(), f = (v, I) => {
       if (I !== void 0 && isArr(o.value) && v !== I)
         return action(() => {
-          const A = o.value[v];
-          return o.value.splice(v, 1), o.value.splice(I, 0, A), exchangeArrayState(o, {
+          const k = o.value[v];
+          return o.value.splice(v, 1), o.value.splice(I, 0, k), exchangeArrayState(o, {
             fromIndex: v,
             toIndex: I
           }), o.onInput(o.value);
@@ -34870,9 +34879,9 @@ const useTableColumns$1 = (e) => {
     };
     o.move = f;
     const C = useMemo(() => o.value && Object.keys(o.value).length > 0 ? (Array.isArray(o.value) ? o.value : o.value ? [o.value] : []).filter(Boolean).map((I) => {
-      const A = I == null ? void 0 : I[u.label];
+      const k = I == null ? void 0 : I[u.label];
       return F(g({}, I), {
-        [u.label]: getLabelFormatValue$1(p(m), p(A))
+        [u.label]: getLabelFormatValue$1(p(m), p(k))
       });
     }) : [], [o.value, u == null ? void 0 : u.label]), S = {
       size: "small",
@@ -34887,14 +34896,14 @@ const useTableColumns$1 = (e) => {
       setSelectedRows: c,
       collectionField: n
     }, b = () => {
-      const { setVisible: v } = useActionContext(), { selectedRows: I, setSelectedRows: A } = useContext(RecordPickerContext);
+      const { setVisible: v } = useActionContext(), { selectedRows: I, setSelectedRows: k } = useContext(RecordPickerContext);
       return {
         onClick() {
-          I.map((k) => o.value.push(k)), o.onInput(o.value), A([]), v(!1);
+          I.map((A) => o.value.push(A)), o.onInput(o.value), k([]), v(!1);
         }
       };
     }, y = () => {
-      const v = (n == null ? void 0 : n.targetKey) || "id", I = (o.value || []).map((k) => k[v]).filter(Boolean);
+      const v = (n == null ? void 0 : n.targetKey) || "id", I = (o.value || []).map((A) => A[v]).filter(Boolean);
       return I.length ? { $and: [{ [`${v}.$ne`]: I }] } : {};
     };
     return /* @__PURE__ */ jsxs("div", { className: subTableContainer, children: [
@@ -35062,8 +35071,8 @@ const ReadPretty$7 = observer$1(
 ), AssociationSelect = InternalAssociationSelect;
 AssociationSelect.Designer = function e() {
   var j, B, T, D, $, q, L, G, U, K, Y;
-  const { getCollectionFields: t, getInterface: o, getCollectionJoinField: n, 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: x } = useDesignable(), f = useCompile(), C = useIsShowMultipleSwitch(), { isAllowToSetDefaultValue: S } = useIsAllowToSetDefaultValue(), b = a(u.name) || n(u["x-collection-field"]), y = useFieldComponentOptions(), v = c.address.segments.includes("__form_grid"), I = o(b == null ? void 0 : b.interface), A = (j = I == null ? void 0 : I.validateSchema) == null ? void 0 : j.call(I, u), k = (B = b == null ? void 0 : b.uiSchema) == null ? void 0 : B.title, w = b != null && b.target ? t(b == null ? void 0 : b.target) : [];
-  c.title === k || c.title;
+  const { getCollectionFields: t, getInterface: o, getCollectionJoinField: n, 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: x } = useDesignable(), f = useCompile(), C = useIsShowMultipleSwitch(), { isAllowToSetDefaultValue: S } = useIsAllowToSetDefaultValue(), b = a(u.name) || n(u["x-collection-field"]), y = useFieldComponentOptions(), v = c.address.segments.includes("__form_grid"), I = o(b == null ? void 0 : b.interface), k = (j = I == null ? void 0 : I.validateSchema) == null ? void 0 : j.call(I, u), A = (B = b == null ? void 0 : b.uiSchema) == null ? void 0 : B.title, w = b != null && b.target ? t(b == null ? void 0 : b.target) : [];
+  c.title === A || c.title;
   const M = useSortFields(b == null ? void 0 : b.target), N = (($ = (D = (T = c.componentProps) == null ? void 0 : T.service) == null ? void 0 : D.params) == null ? void 0 : $.sort) || [];
   useEffect(() => {
     c.readPretty !== u["x-read-pretty"] && (c.readPretty = !!u["x-read-pretty"]);
@@ -35088,7 +35097,7 @@ AssociationSelect.Designer = function e() {
   const R = _.omit(u, "required");
   return /* @__PURE__ */ jsxs(GeneralSchemaDesigner, { children: [
     /* @__PURE__ */ jsx(GeneralSchemaItems, {}),
-    l && !(l != null && l.readPretty) && A && /* @__PURE__ */ jsx(
+    l && !(l != null && l.readPretty) && k && /* @__PURE__ */ jsx(
       SchemaSettingsModalItem,
       {
         title: d("Set validation rules"),
@@ -35127,7 +35136,7 @@ AssociationSelect.Designer = function e() {
                       labelCol: 8,
                       wrapperCol: 16
                     },
-                    properties: F(g({}, A), {
+                    properties: F(g({}, k), {
                       message: {
                         type: "string",
                         title: '{{ t("Error message") }}',
@@ -35460,10 +35469,10 @@ AssociationSelect.Designer = function e() {
   ] });
 };
 AssociationSelect.FilterDesigner = function e() {
-  var I, A, k, w, M, N, E, z, O, R, j;
-  const { getCollectionFields: t, getInterface: o, getCollectionJoinField: n } = 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) || n(l["x-collection-field"]), h = o(m == null ? void 0 : m.interface), x = (I = h == null ? void 0 : h.validateSchema) == null ? void 0 : I.call(h, l), f = (A = m == null ? void 0 : m.uiSchema) == null ? void 0 : A.title, C = m != null && m.target ? t(m == null ? void 0 : m.target) : [];
+  var I, k, A, w, M, N, E, z, O, R, j;
+  const { getCollectionFields: t, getInterface: o, getCollectionJoinField: n } = 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) || n(l["x-collection-field"]), h = o(m == null ? void 0 : m.interface), x = (I = h == null ? void 0 : h.validateSchema) == null ? void 0 : I.call(h, l), f = (k = m == null ? void 0 : m.uiSchema) == null ? void 0 : k.title, C = m != null && m.target ? t(m == null ? void 0 : m.target) : [];
   a.title === f || a.title;
-  const S = useSortFields(m == null ? void 0 : m.target), b = ((M = (w = (k = a.componentProps) == null ? void 0 : k.service) == null ? void 0 : w.params) == null ? void 0 : M.sort) || [], y = b == null ? void 0 : b.map((B) => B.startsWith("-") ? {
+  const S = useSortFields(m == null ? void 0 : m.target), b = ((M = (w = (A = a.componentProps) == null ? void 0 : A.service) == null ? void 0 : w.params) == null ? void 0 : M.sort) || [], y = b == null ? void 0 : b.map((B) => B.startsWith("-") ? {
     field: B.substring(1),
     direction: "desc"
   } : {
@@ -35853,11 +35862,11 @@ const blockDeleteSettings = new SchemaSettings({
           }
         },
         e
-      ), C = () => toArr$3(o).map((v) => typeof v == "object" ? v[m.value] : v), S = (v, I) => /* @__PURE__ */ jsx(Space$1, { split: "/", children: v.map((A, k) => {
-        if (I[k])
-          return /* @__PURE__ */ jsx("span", { children: A }, k);
-        const w = toArr$3(o).filter(Boolean).find((M) => M[m.value] === A);
-        return /* @__PURE__ */ jsx("span", { children: (w == null ? void 0 : w[m.label]) || A }, k);
+      ), C = () => toArr$3(o).map((v) => typeof v == "object" ? v[m.value] : v), S = (v, I) => /* @__PURE__ */ jsx(Space$1, { split: "/", children: v.map((k, A) => {
+        if (I[A])
+          return /* @__PURE__ */ jsx("span", { children: k }, A);
+        const w = toArr$3(o).filter(Boolean).find((M) => M[m.value] === k);
+        return /* @__PURE__ */ jsx("span", { children: (w == null ? void 0 : w[m.label]) || k }, A);
       }) }), b = (v) => {
         var I;
         v && !((I = t.dataSource) != null && I.length) && f();
@@ -35875,7 +35884,7 @@ const blockDeleteSettings = new SchemaSettings({
           displayRender: S,
           onDropdownVisibleChange: b,
           onChange: (v, I) => {
-            n(v && r ? I.map((A) => omit$1(A, [m.children])) : v);
+            n(v && r ? I.map((k) => omit$1(k, [m.children])) || null : v || null);
           }
         })
       );
@@ -37058,7 +37067,7 @@ const InternalListBlockProvider = (e) => {
           }
         },
         onSubmit: ({ sort: v }) => {
-          const I = v.map((A) => A.direction === "desc" ? `-${A.field}` : A.field);
+          const I = v.map((k) => k.direction === "desc" ? `-${k.field}` : k.field);
           _.set(r, "x-decorator-props.params.sort", I), a.decoratorProps.params = F(g({}, r["x-decorator-props"].params), { page: 1 }), l.emit("patch", {
             schema: {
               "x-uid": r["x-uid"],
@@ -37539,8 +37548,8 @@ const MarkdownEditor = (e) => {
     const { isDarkTheme: t } = useGlobalTheme(), { componentCls: o, hashId: n } = useStyles$4({ isDarkTheme: t }), { content: r, className: i } = e, a = useField(), l = useFieldSchema(), { dn: c } = useDesignable(), { onSave: u, onCancel: d, form: p } = e, m = useCollectionRecord(), [h, x] = useState(""), f = useVariables(), C = useLocalVariables(), [S, b] = useState(!1);
     useEffect(() => {
       b(!0), V(void 0, null, function* () {
-        const A = yield replaceVariableValue(r, f, C), k = yield parseMarkdown(A);
-        x(k), b(!1);
+        const k = yield replaceVariableValue(r, f, C), A = yield parseMarkdown(k);
+        x(A), b(!1);
       });
     }, [r, f, C]);
     const y = useMarkdownHeight(), v = useVariableOptions({
@@ -37563,8 +37572,8 @@ const MarkdownEditor = (e) => {
           a.editable = !1, d == null || d();
         },
         onSubmit: (I) => V(void 0, null, function* () {
-          var A;
-          a.editable = !1, (A = 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 k;
+          a.editable = !1, (k = 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": {
@@ -38233,7 +38242,7 @@ const Menu = observer$1(
       "defaultSelectedKeys",
       "defaultOpenKeys",
       "children"
-    ]), { t: d } = useTranslation(), p = useDesigner(), m = useFieldSchema(), { refresh: h } = useDesignable(), x = useAPIClient(), { render: f } = useSchemaInitializerRender(m["x-initializer"], m["x-initializer-props"]), C = useSideMenuRef(), [S, b] = useState(), [y, v] = useState(() => a || (r ? findKeysByUid(m, r) : [])), [I, A] = useState(!1), [k, w] = useState(() => ["inline", "mix"].includes(o) ? l || y : l), M = useMemo(() => {
+    ]), { t: d } = useTranslation(), p = useDesigner(), m = useFieldSchema(), { refresh: h } = useDesignable(), x = useAPIClient(), { render: f } = useSchemaInitializerRender(m["x-initializer"], m["x-initializer-props"]), C = useSideMenuRef(), [S, b] = useState(), [y, v] = useState(() => a || (r ? findKeysByUid(m, r) : [])), [I, k] = useState(!1), [A, w] = useState(() => ["inline", "mix"].includes(o) ? l || y : l), M = useMemo(() => {
       var O;
       let z;
       if (n) {
@@ -38267,10 +38276,10 @@ const Menu = observer$1(
           schema: m,
           mode: o,
           onSelect: t,
-          setLoading: A,
+          setLoading: k,
           setDefaultSelectedKeys: v,
           defaultSelectedKeys: y,
-          defaultOpenKeys: k,
+          defaultOpenKeys: A,
           selectedKeys: S,
           designable: N,
           render: f,
@@ -38284,7 +38293,7 @@ const Menu = observer$1(
           mode: o,
           sideMenuSchema: M,
           sideMenuRef: C,
-          openKeys: k,
+          openKeys: A,
           setOpenKeys: w,
           selectedKeys: S,
           onSelect: t,
@@ -38468,8 +38477,8 @@ const useStyles$3 = createStyles(({ token: e }) => ({
       const S = e.charCodeAt(x - 1), b = e.charCodeAt(x - 2);
       if (isLetter(f)) {
         if (isLetter(S) && isLetter(b)) {
-          const y = e.toLowerCase(), v = y.charCodeAt(x), I = y.charCodeAt(x - 1), A = y.charCodeAt(x - 2);
-          v - I === I - A && Math.abs(v - I) === 1 && u++;
+          const y = e.toLowerCase(), v = y.charCodeAt(x), I = y.charCodeAt(x - 1), k = y.charCodeAt(x - 2);
+          v - I === I - k && Math.abs(v - I) === 1 && u++;
         }
       } else
         isNum(f) ? isNum(S) && isNum(b) && f - S === S - b && Math.abs(f - S) === 1 && u++ : isSymbol(S) && isSymbol(b) && f - S === S - b && Math.abs(f - S) === 1 && u++;
@@ -38682,10 +38691,10 @@ const useTableSelectorProps = () => {
   const v = e, { value: t, multiple: o, onChange: n, quickUpload: r, selectFile: i } = v, a = H(v, ["value", "multiple", "onChange", "quickUpload", "selectFile"]), l = useFieldNames(e), [c, u] = useState(!1), d = useFieldSchema(), p = useAssociation(e), m = useCompile(), h = useLabelUiSchema(p, (l == null ? void 0 : l.label) || "label"), x = isShowFilePicker(h), [f, C] = useState([]), [S, b] = useState([]);
   useEffect(() => {
     if (t) {
-      const I = (Array.isArray(t) ? t : t ? [t] : []).map((A) => {
-        const k = A[l.label];
-        return F(g({}, A), {
-          [l.label]: getLabelFormatValue(h, m(k))
+      const I = (Array.isArray(t) ? t : t ? [t] : []).map((k) => {
+        const A = k[l.label];
+        return F(g({}, k), {
+          [l.label]: getLabelFormatValue(h, m(A))
         });
       });
       b(I);
@@ -38700,8 +38709,8 @@ const useTableSelectorProps = () => {
         multiple: o,
         action: `${p == null ? void 0 : p.target}:create`,
         onChange: (I) => {
-          let A = toArr$3(I);
-          A.every((k) => k.status !== "uploading") && (A = A.filter((k) => k.status === "done").map((k) => k.response.data), n(o ? [...S, ...A] : A[0]));
+          let k = toArr$3(I);
+          k.every((A) => A.status !== "uploading") && (k = k.filter((A) => A.status === "done").map((A) => A.response.data), n(o ? [...S, ...k] : k[0]));
         }
       }
     ) : /* @__PURE__ */ jsx(
@@ -38721,12 +38730,12 @@ const useTableSelectorProps = () => {
                 n([]), C([]);
                 return;
               }
-              const A = S == null ? void 0 : S.filter((k) => I.includes(k[l.value]));
-              n(A), C(A);
+              const k = S == null ? void 0 : S.filter((A) => I.includes(A[l.value]));
+              n(k), C(k);
             }
           } else {
-            const A = o ? [] : null;
-            n(A), C(A), b([]);
+            const k = o ? [] : null;
+            n(k), C(k), b([]);
           }
         },
         options: S,
@@ -38791,38 +38800,38 @@ function isShowFilePicker(e) {
 }
 const toValue$1 = (e, t) => e == null ? t : e, ReadPrettyRecordPicker = observer$1(
   (e) => {
-    var I, A;
+    var I, k;
     const { ellipsis: t } = e, o = useFieldSchema(), n = useRecord(), { getCollectionJoinField: r } = useCollectionManager_deprecated(), i = useFieldNames(e), [a, l] = useState(!1), { getField: c } = useCollection_deprecated(), u = c(o.name) || r(o == null ? void 0 : o["x-collection-field"]), [d, p] = useState({}), m = useCompile(), h = useLabelUiSchema(u, (i == null ? void 0 : i.label) || "label"), x = isShowFilePicker(h), { snapshot: f } = useActionContext(), C = ((I = o["x-component-props"]) == null ? void 0 : I.mode) === "tags", S = useRef();
     if (x)
       return u ? /* @__PURE__ */ jsx(Preview, g({}, e)) : null;
-    const b = () => toArr$3(e.value).map((k, w, M) => {
-      const N = toValue$1(m(k == null ? void 0 : k[(i == null ? void 0 : i.label) || "label"]), "N/A"), E = getLabelFormatValue(h, N, !0);
+    const b = () => toArr$3(e.value).map((A, w, M) => {
+      const N = toValue$1(m(A == null ? void 0 : A[(i == null ? void 0 : i.label) || "label"]), "N/A"), E = getLabelFormatValue(h, N, !0);
       return /* @__PURE__ */ jsxs(Fragment$1, { children: [
         /* @__PURE__ */ jsx("span", { className: "test-record-picker-read-pretty-item", children: f || C ? E : /* @__PURE__ */ jsx(
           "a",
           {
             onClick: (z) => {
               var O;
-              z.stopPropagation(), z.preventDefault(), l(!0), p(k), (O = S == null ? void 0 : S.current) == null || O.setPopoverVisible(!1);
+              z.stopPropagation(), z.preventDefault(), l(!0), p(A), (O = S == null ? void 0 : S.current) == null || O.setPopoverVisible(!1);
             },
             children: E
           }
         ) }),
         w < M.length - 1 ? /* @__PURE__ */ jsx("span", { style: { marginRight: 4, color: "#aaa" }, children: "," }) : null
-      ] }, `${k[i.value]}_${w}`);
+      ] }, `${A[i.value]}_${w}`);
     }), y = () => /* @__PURE__ */ jsx(WithoutTableFieldResource.Provider, { value: !0, children: /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(
       RecursionField,
       {
         schema: o,
         onlyRenderProperties: !0,
-        filterProperties: (k) => k["x-component"] === "RecordPicker.Viewer"
+        filterProperties: (A) => A["x-component"] === "RecordPicker.Viewer"
       }
     ) }) }), v = () => {
       var w;
-      const k = (w = o == null ? void 0 : o["x-collection-field"]) == null ? void 0 : w.split(".");
-      return k && k.length > 2 ? /* @__PURE__ */ jsx(RecordProvider, { record: d, parent: n[k[1]], children: y() }) : /* @__PURE__ */ jsx(RecordProvider, { record: d, parent: n, children: y() });
+      const A = (w = o == null ? void 0 : o["x-collection-field"]) == null ? void 0 : w.split(".");
+      return A && A.length > 2 ? /* @__PURE__ */ jsx(RecordProvider, { record: d, parent: n[A[1]], children: y() }) : /* @__PURE__ */ jsx(RecordProvider, { record: d, parent: n, children: y() });
     };
-    return u ? /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(BlockAssociationContext.Provider, { value: `${u.collectionName}.${u.name}`, children: /* @__PURE__ */ jsxs(CollectionProvider_deprecated, { name: (A = u.target) != null ? A : u.targetCollection, children: [
+    return u ? /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(BlockAssociationContext.Provider, { value: `${u.collectionName}.${u.name}`, children: /* @__PURE__ */ jsxs(CollectionProvider_deprecated, { name: (k = u.target) != null ? k : u.targetCollection, children: [
       /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: t, ref: S, children: b() }),
       /* @__PURE__ */ jsx(
         ActionContextProvider,
@@ -39621,10 +39630,10 @@ const useStyles$2 = genStyleHook("nb-rich-text", (e) => {
         getCheckboxProps: (y) => ({
           "aria-label": `checkbox-${y.name}`
         }),
-        renderCell: (y, v, I, A) => {
+        renderCell: (y, v, I, k) => {
           var M, N;
-          const k = (M = e == null ? void 0 : e.pagination) == null ? void 0 : M.current, w = ((N = e == null ? void 0 : e.pagination) == null ? void 0 : N.pageSize) || 20;
-          return k && (I = I + (k - 1) * w), /* @__PURE__ */ jsxs(
+          const A = (M = e == null ? void 0 : e.pagination) == null ? void 0 : M.current, w = ((N = e == null ? void 0 : e.pagination) == null ? void 0 : N.pageSize) || 20;
+          return A && (I = I + (A - 1) * w), /* @__PURE__ */ jsxs(
             "div",
             {
               className: cls(
@@ -39687,7 +39696,7 @@ const useStyles$2 = genStyleHook("nb-rich-text", (e) => {
                         }
                       `
                     ),
-                    children: A
+                    children: k
                   }
                 )
               ]
@@ -39713,8 +39722,8 @@ const useStyles$2 = genStyleHook("nb-rich-text", (e) => {
           {
             handleSelector: ".drag-handle",
             onDragEnd: (y, v) => V(void 0, null, function* () {
-              const I = o.value[y], A = o.value[v];
-              o.move(y, v), yield h(I, A);
+              const I = o.value[y], k = o.value[v];
+              o.move(y, v), yield h(I, k);
             }),
             lineClassName: css`
             border-bottom: 2px solid ${new TinyColor(t.colorSettings).setAlpha(0.6).toHex8String()} !important;
@@ -40016,9 +40025,9 @@ const useStyles$2 = genStyleHook("nb-rich-text", (e) => {
           }
         },
         onSubmit: ({ filter: v }) => {
-          var A;
+          var k;
           const I = o.decoratorProps.request.params || {};
-          I.filter = v, o.decoratorProps.request.params = I, n["x-decorator-props"].request.params = I, a.run(F(g({}, (A = a.params) == null ? void 0 : A[0]), { filter: v })), c.emit("patch", {
+          I.filter = v, o.decoratorProps.request.params = I, n["x-decorator-props"].request.params = I, a.run(F(g({}, (k = a.params) == null ? void 0 : k[0]), { filter: v })), c.emit("patch", {
             schema: {
               "x-uid": n["x-uid"],
               "x-decorator-props": n["x-decorator-props"]
@@ -40103,14 +40112,14 @@ const useStyles$2 = genStyleHook("nb-rich-text", (e) => {
           }
         },
         onSubmit: ({ sort: v }) => {
-          var k;
-          const I = v.map((w) => w.direction === "desc" ? `-${w.field}` : w.field), A = o.decoratorProps.request.params || {};
-          A.sort = I, o.decoratorProps.request.params = A, n["x-decorator-props"].request.params = A, c.emit("patch", {
+          var A;
+          const I = v.map((w) => w.direction === "desc" ? `-${w.field}` : w.field), k = o.decoratorProps.request.params || {};
+          k.sort = I, o.decoratorProps.request.params = k, n["x-decorator-props"].request.params = k, c.emit("patch", {
             schema: {
               "x-uid": n["x-uid"],
               "x-decorator-props": n["x-decorator-props"]
             }
-          }), a.run(F(g({}, (k = a.params) == null ? void 0 : k[0]), { sort: I }));
+          }), a.run(F(g({}, (A = a.params) == null ? void 0 : A[0]), { sort: I }));
         }
       }
     ),
@@ -40127,9 +40136,9 @@ const useStyles$2 = genStyleHook("nb-rich-text", (e) => {
           { label: "200", value: 200 }
         ],
         onChange: (v) => {
-          var A;
+          var k;
           const I = o.decoratorProps.request.params || {};
-          I.pageSize = v, o.decoratorProps.request.params = I, n["x-decorator-props"].request.params = I, a.run(F(g({}, (A = a.params) == null ? void 0 : A[0]), { pageSize: v })), c.emit("patch", {
+          I.pageSize = v, o.decoratorProps.request.params = I, n["x-decorator-props"].request.params = I, a.run(F(g({}, (k = a.params) == null ? void 0 : k[0]), { pageSize: v })), c.emit("patch", {
             schema: {
               "x-uid": n["x-uid"],
               "x-decorator-props": n["x-decorator-props"]
@@ -40206,8 +40215,8 @@ const TableActionColumnDesigner = (e) => {
     "sort-field"
   );
 }, TableBlockDesigner = () => {
-  var k, w, M, N, E, z, O, R, j, B;
-  const { name: e, title: t } = useCollection_deprecated(), { getCollectionField: o, getCollection: n } = useCollectionManager_deprecated(), r = useField(), i = useFieldSchema(), { form: a } = useFormBlockContext(), l = useSortFields(e), { service: c } = useTableBlockContext(), { t: u } = useTranslation(), { dn: d } = useDesignable(), p = ((w = (k = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : k.params) == null ? void 0 : w.sort) || [], m = ((M = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : M.resource) || ((N = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : N.association), h = !((E = i == null ? void 0 : i["x-decorator-props"]) != null && E.disableTemplate), x = p == null ? void 0 : p.map((T) => T != null && T.startsWith("-") ? {
+  var A, w, M, N, E, z, O, R, j, B;
+  const { name: e, title: t } = useCollection_deprecated(), { getCollectionField: o, getCollection: n } = useCollectionManager_deprecated(), r = useField(), i = useFieldSchema(), { form: a } = useFormBlockContext(), l = useSortFields(e), { service: c } = useTableBlockContext(), { t: u } = useTranslation(), { dn: d } = useDesignable(), p = ((w = (A = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : A.params) == null ? void 0 : w.sort) || [], m = ((M = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : M.resource) || ((N = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : N.association), h = !((E = i == null ? void 0 : i["x-decorator-props"]) != null && E.disableTemplate), x = p == null ? void 0 : p.map((T) => T != null && T.startsWith("-") ? {
     field: T.substring(1),
     direction: "desc"
   } : {
@@ -40225,7 +40234,7 @@ const TableActionColumnDesigner = (e) => {
       }), c.params[0].page = 1;
     },
     [d, r.decoratorProps, i, c]
-  ), A = useAPIClient();
+  ), k = useAPIClient();
   return /* @__PURE__ */ jsxs(GeneralSchemaDesigner, { template: f, title: t || e, children: [
     /* @__PURE__ */ jsx(SchemaSettingsBlockTitleItem, {}),
     /* @__PURE__ */ jsx(SchemaSettingsBlockHeightItem, {}),
@@ -40253,7 +40262,7 @@ const TableActionColumnDesigner = (e) => {
         title: u("Enable drag and drop sorting"),
         checked: r.decoratorProps.dragSort,
         onChange: (T) => V(void 0, null, function* () {
-          T && y && (yield A.resource("collections.fields", y.collectionName).update({
+          T && y && (yield k.resource("collections.fields", y.collectionName).update({
             filterByTk: y.name,
             values: {
               sortable: !0
@@ -40420,14 +40429,14 @@ TableField.ActionBar = observer$1(
   { displayName: "TableField.ActionBar" }
 );
 const TableSelectorDesigner = () => {
-  var k, w, M, N, E, z;
-  const { name: e, title: t } = useCollection_deprecated(), { getCollectionJoinField: o, getAllCollectionsInheritChain: n } = useCollectionManager_deprecated(), r = useField(), i = useFieldSchema(), { form: a } = useFormBlockContext(), l = useSortFields(e), { service: c, extraFilter: u } = useTableSelectorContext(), { t: d } = useTranslation(), { dn: p } = useDesignable(), m = ((w = (k = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : k.params) == null ? void 0 : w.sort) || [], h = recursiveParent$1(i, "CollectionField"), x = o(h == null ? void 0 : h["x-collection-field"]), f = m == null ? void 0 : m.map((O) => O.startsWith("-") ? {
+  var A, w, M, N, E, z;
+  const { name: e, title: t } = useCollection_deprecated(), { getCollectionJoinField: o, getAllCollectionsInheritChain: n } = useCollectionManager_deprecated(), r = useField(), i = useFieldSchema(), { form: a } = useFormBlockContext(), l = useSortFields(e), { service: c, extraFilter: u } = useTableSelectorContext(), { t: d } = useTranslation(), { dn: p } = useDesignable(), m = ((w = (A = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : A.params) == null ? void 0 : w.sort) || [], h = recursiveParent$1(i, "CollectionField"), x = o(h == null ? void 0 : h["x-collection-field"]), f = m == null ? void 0 : m.map((O) => O.startsWith("-") ? {
     field: O.substring(1),
     direction: "desc"
   } : {
     field: O,
     direction: "asc"
-  }), C = useSchemaTemplate(), S = useCollection_deprecated(), { dragSort: b } = r.decoratorProps, y = useRecord(), v = useVariables(), { currentFormCollection: I } = useContext(RecordPickerContext), A = useLocalVariables({ collectionName: I });
+  }), C = useSchemaTemplate(), S = useCollection_deprecated(), { dragSort: b } = r.decoratorProps, y = useRecord(), v = useVariables(), { currentFormCollection: I } = useContext(RecordPickerContext), k = useLocalVariables({ collectionName: I });
   return /* @__PURE__ */ jsxs(GeneralSchemaDesigner, { template: C, title: t || e, disableInitializer: !0, children: [
     /* @__PURE__ */ jsx(
       SchemaSettingsDataScope,
@@ -40459,7 +40468,7 @@ const TableSelectorDesigner = () => {
             shouldChange: getShouldChange({
               collectionField: O.collectionField,
               variables: v,
-              localVariables: A,
+              localVariables: k,
               getAllCollectionsInheritChain: n
             }),
             currentFormCollectionName: I,
@@ -41154,8 +41163,8 @@ const SelfFields = (e) => {
     const C = F(g({}, e.context), {
       collection: x
     }), S = (v, I) => {
-      const A = n(v, I);
-      return F(g({}, A || {}), {
+      const k = n(v, I);
+      return F(g({}, k || {}), {
         "x-read-pretty": !0,
         name: `${h.name}.${v.name}`,
         "x-collection-field": `${i.name}.${h.name}.${v.name}`
@@ -42269,16 +42278,16 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       var I;
       const y = ["belongsTo"].includes(u) ? l : ["belongsToMany"].includes(u) ? d : c, v = (I = r(y)) == null ? void 0 : I.fields;
       if (v) {
-        const A = v == null ? void 0 : v.filter((k) => supportTypes.includes(k.type)).map((k) => {
+        const k = v == null ? void 0 : v.filter((A) => supportTypes.includes(A.type)).map((A) => {
           var w;
           return {
-            value: k.name,
-            label: x(((w = k.uiSchema) == null ? void 0 : w.title) || k.name)
+            value: A.name,
+            label: x(((w = A.uiSchema) == null ? void 0 : w.title) || A.name)
           };
         });
-        if (n(A), h) {
-          const k = A.find((w) => w.value === h);
-          S((k == null ? void 0 : k.label) || h);
+        if (n(k), h) {
+          const A = k.find((w) => w.value === h);
+          S((A == null ? void 0 : A.label) || h);
         }
       }
     }, [u]), /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(
@@ -42290,9 +42299,9 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
         showSearch: !0,
         onDropdownVisibleChange: (y) => V(void 0, null, function* () {
           var w;
-          const { target: v, type: I, through: A } = f.values, k = ["belongsTo"].includes(I) ? l || p : ["belongsToMany"].includes(I) ? A : v;
-          if (k && y) {
-            const M = ((w = r(k)) == null ? void 0 : w.fields) || [];
+          const { target: v, type: I, through: k } = f.values, A = ["belongsTo"].includes(I) ? l || p : ["belongsToMany"].includes(I) ? k : v;
+          if (A && y) {
+            const M = ((w = r(A)) == null ? void 0 : w.fields) || [];
             n(
               M == null ? void 0 : M.filter((N) => supportTypes.includes(N.type)).map((N) => {
                 var E;
@@ -42518,7 +42527,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   return /* @__PURE__ */ jsx(AddFieldAction, g({ item: t }, e));
 }, AddFieldAction = (e) => {
   var z, O;
-  const { scope: t, getContainer: o, item: n, children: r, trigger: i, align: a, database: l } = e, { getInterface: c, getTemplate: u, collections: d, getCollection: p } = useCollectionManager_deprecated(), [m, h] = useState(!1), [x, f] = useState(), [C, S] = useState({}), b = useCompile(), { t: y } = useTranslation(), { isDialect: v } = useDialect(), I = useFieldInterfaceOptions(), A = ((O = (z = p(n.name)) == null ? void 0 : z.options) == null ? void 0 : O.fields) || n.fields || [], k = useMemo(() => d.map((R) => ({
+  const { scope: t, getContainer: o, item: n, children: r, trigger: i, align: a, database: l } = e, { getInterface: c, getTemplate: u, collections: d, getCollection: p } = useCollectionManager_deprecated(), [m, h] = useState(!1), [x, f] = useState(), [C, S] = useState({}), b = useCompile(), { t: y } = useTranslation(), { isDialect: v } = useDialect(), I = useFieldInterfaceOptions(), k = ((O = (z = p(n.name)) == null ? void 0 : z.options) == null ? void 0 : O.fields) || n.fields || [], A = useMemo(() => d.map((R) => ({
     label: b(R.title),
     value: R.name
   })), []), w = useCallback(() => {
@@ -42582,13 +42591,13 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       B && (S(B), h(!0));
     },
     items: M
-  }), [c, M, n]), E = useMemo(() => A.filter((R) => ["string", "bigInt", "integer"].includes(R.type)).map((R) => {
+  }), [c, M, n]), E = useMemo(() => k.filter((R) => ["string", "bigInt", "integer"].includes(R.type)).map((R) => {
     var j;
     return {
       value: R.name,
       label: b((j = R.uiSchema) == null ? void 0 : j.title)
     };
-  }), [A == null ? void 0 : A.length]);
+  }), [k == null ? void 0 : k.length]);
   return n.template !== "sql" && /* @__PURE__ */ jsx(RecordProvider, { record: n, children: /* @__PURE__ */ jsxs(ActionContextProvider, { value: { visible: m, setVisible: h }, children: [
     /* @__PURE__ */ jsx(Dropdown, { getPopupContainer: o, trigger: i, align: a, menu: N, children: r || /* @__PURE__ */ jsx(Button, { icon: /* @__PURE__ */ jsx(PlusOutlined, {}), type: "primary", children: y("Add field") }) }),
     /* @__PURE__ */ jsx(
@@ -42607,7 +42616,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           record: n,
           showReverseFieldConfig: !0,
           targetScope: x,
-          collections: k,
+          collections: A,
           isDialect: v,
           disabledJSONB: !1,
           scopeKeyOptions: E,
@@ -42732,18 +42741,18 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   const t = useRecord(), o = useCollectionParentRecordData();
   return /* @__PURE__ */ jsx(EditFieldAction, g({ item: t, parentItem: o }, e));
 }, EditFieldAction = (e) => {
-  const A = e, { scope: t, getContainer: o, item: n, parentItem: r, children: i } = A, a = H(A, ["scope", "getContainer", "item", "parentItem", "children"]), { getInterface: l, collections: c, getCollection: u } = useCollectionManager_deprecated(), [d, p] = useState(!1), [m, h] = useState({}), x = useAPIClient(), { t: f } = useTranslation(), C = useCompile(), [S, b] = useState({}), { isDialect: y } = useDialect(), v = useMemo(() => {
-    var k;
-    return (n == null ? void 0 : n.fields) || ((k = u(n.collectionName)) == null ? void 0 : k.options.fields.filter((w) => ["string", "bigInt", "integer"].includes(w.type)).map((w) => {
+  const k = e, { scope: t, getContainer: o, item: n, parentItem: r, children: i } = k, a = H(k, ["scope", "getContainer", "item", "parentItem", "children"]), { getInterface: l, collections: c, getCollection: u } = useCollectionManager_deprecated(), [d, p] = useState(!1), [m, h] = useState({}), x = useAPIClient(), { t: f } = useTranslation(), C = useCompile(), [S, b] = useState({}), { isDialect: y } = useDialect(), v = useMemo(() => {
+    var A;
+    return (n == null ? void 0 : n.fields) || ((A = u(n.collectionName)) == null ? void 0 : A.options.fields.filter((w) => ["string", "bigInt", "integer"].includes(w.type)).map((w) => {
       var M;
       return {
         value: w.name,
         label: C((M = w.uiSchema) == null ? void 0 : M.title)
       };
     }));
-  }, [n.name]), I = useMemo(() => c.map((k) => ({
-    label: C(k.title),
-    value: k.name
+  }, [n.name]), I = useMemo(() => c.map((A) => ({
+    label: C(A.title),
+    value: A.name
   })), []);
   return /* @__PURE__ */ jsx(RecordProvider, { record: n, parent: r, children: /* @__PURE__ */ jsxs(ActionContextProvider, { value: { visible: d, setVisible: p }, children: [
     /* @__PURE__ */ jsx(
@@ -42751,12 +42760,12 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       F(g({}, a), {
         onClick: () => V(void 0, null, function* () {
           var E, z;
-          const { data: k } = yield x.resource("collections.fields", n.collectionName).get({
+          const { data: A } = yield x.resource("collections.fields", n.collectionName).get({
             filterByTk: n.name,
             appends: ["reverseField"]
           });
-          b(k == null ? void 0 : k.data);
-          const w = l(n.interface), M = cloneDeep(k == null ? void 0 : k.data) || {};
+          b(A == null ? void 0 : A.data);
+          const w = l(n.interface), M = cloneDeep(A == null ? void 0 : A.data) || {};
           M != null && M.reverseField || (M.autoCreateReverseField = !1, M.reverseField = (E = w == null ? void 0 : w.default) == null ? void 0 : E.reverseField, set(M.reverseField, "name", `f_${uid()}`), set(M.reverseField, "uiSchema.title", (z = n.__parent) == null ? void 0 : z.title));
           const N = getSchema$7(
             F(g({}, w), {
@@ -42860,7 +42869,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   const { scope: t, getContainer: o, item: n, parentItem: r, children: i, currentCollection: a } = e, { target: l, through: c } = n, { getInterface: u, getCollection: d, getCurrentCollectionFields: p, getChildrenCollections: m, collections: h } = useCollectionManager_deprecated(), [x, f] = useState(!1), [C, S] = useState({}), b = useAPIClient(), { t: y } = useTranslation(), v = useCompile(), I = (O) => {
     var j;
     return O && ((j = m(O)) == null ? void 0 : j.map((B) => B.name).concat([O]));
-  }, [A, k] = useState({}), w = p(a), M = getIsOverriding(w, n), N = useMemo(() => h.map((O) => ({
+  }, [k, A] = useState({}), w = p(a), M = getIsOverriding(w, n), N = useMemo(() => h.map((O) => ({
     label: v(O.title),
     value: O.name
   })), []), E = () => {
@@ -42909,7 +42918,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
               filterByTk: n.name,
               appends: ["reverseField"]
             });
-            k(R == null ? void 0 : R.data);
+            A(R == null ? void 0 : R.data);
             const j = u(n.interface), B = cloneDeep(R == null ? void 0 : R.data) || {};
             B != null && B.reverseField || (B.autoCreateReverseField = !1, B.reverseField = (O = j.default) == null ? void 0 : O.reverseField, set$1(B.reverseField, "name", `f_${uid()}`), set$1(B.reverseField, "uiSchema.title", n.__parent.title));
             const T = getSchema$6(
@@ -42934,7 +42943,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           getContainer: o,
           useOverridingCollectionField: E,
           useCancelAction,
-          showReverseFieldConfig: !(A != null && A.reverseField),
+          showReverseFieldConfig: !(k != null && k.reverseField),
           createOnly: !0,
           override: !0,
           isOverride: !0,
@@ -43003,14 +43012,14 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       "a",
       {
         onClick: () => V(void 0, null, function* () {
-          var A;
+          var k;
           const { data: b } = yield m.resource("collections.fields", n.collectionName).get({
             filterByTk: n.name,
             appends: ["reverseField"]
           });
           C(b == null ? void 0 : b.data);
           const y = a(n.interface), v = cloneDeep(b == null ? void 0 : b.data) || {};
-          v != null && v.reverseField || (v.autoCreateReverseField = !1, v.reverseField = (A = y.default) == null ? void 0 : A.reverseField, set(v.reverseField, "name", `f_${uid()}`), set(v.reverseField, "uiSchema.title", n.__parent.title));
+          v != null && v.reverseField || (v.autoCreateReverseField = !1, v.reverseField = (k = y.default) == null ? void 0 : k.reverseField, set(v.reverseField, "name", `f_${uid()}`), set(v.reverseField, "uiSchema.title", n.__parent.title));
           const I = getSchema$5(
             F(g({}, y), {
               default: v
@@ -43369,12 +43378,12 @@ const getSchema$4 = (e, t, o) => {
     });
   }), o.filter((n) => n.children.length > 0);
 }, PreviewCom = (e) => {
-  const { databaseView: t, viewName: o, sources: n, schema: r } = e, { data: i } = useContext(ResourceActionContext), a = useAPIClient(), { t: l } = useTranslation(), [c, u] = useState(!1), [d, p] = useState([]), [m, h] = useState([]), [x, f] = useState(n), [C, S] = useState([]), b = useField(), y = useForm(), { getCollection: v, getInterface: I, getCollectionFields: A, getInheritCollections: k, getParentCollectionFields: w } = useCollectionManager_deprecated(), M = useCompile(), E = useFieldInterfaceOptions().filter((R) => !["relation", "systemInfo"].includes(R.key));
+  const { databaseView: t, viewName: o, sources: n, schema: r } = e, { data: i } = useContext(ResourceActionContext), a = useAPIClient(), { t: l } = useTranslation(), [c, u] = useState(!1), [d, p] = useState([]), [m, h] = useState([]), [x, f] = useState(n), [C, S] = useState([]), b = useField(), y = useForm(), { getCollection: v, getInterface: I, getCollectionFields: k, getInheritCollections: A, getParentCollectionFields: w } = useCollectionManager_deprecated(), M = useCompile(), E = useFieldInterfaceOptions().filter((R) => !["relation", "systemInfo"].includes(R.key));
   useEffect(() => {
     const R = [];
     x.forEach((j) => {
       var q;
-      const B = v(j), D = k(j).map((L) => {
+      const B = v(j), D = A(j).map((L) => {
         const G = w(L, j);
         return {
           type: "group",
@@ -43453,7 +43462,7 @@ const getSchema$4 = (e, t, o) => {
           options: M(m),
           onChange: (T, D) => {
             var q;
-            const $ = (q = A(T == null ? void 0 : T[0])) == null ? void 0 : q.find((L) => L.name === last(T));
+            const $ = (q = k(T == null ? void 0 : T[0])) == null ? void 0 : q.find((L) => L.name === last(T));
             z(F(g({}, j), { source: T, uiSchema: $ == null ? void 0 : $.uiSchema }), B);
           },
           placeholder: l("Select field source")
@@ -43570,7 +43579,7 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
     var v;
     return (v = y.filter((I) => I.source || I.interface)) == null ? void 0 : v.map((I) => {
       var N, E, z, O, R, j;
-      const A = typeof (I == null ? void 0 : I.source) == "string" ? (N = I == null ? void 0 : I.source) == null ? void 0 : N.split(".") : I == null ? void 0 : I.source, k = (z = (E = h(A == null ? void 0 : A[0])) == null ? void 0 : E.find((B) => B.name === (A == null ? void 0 : A[1]))) == null ? void 0 : z.uiSchema, w = ((O = I == null ? void 0 : I.uiSchema) == null ? void 0 : O.title) || (k == null ? void 0 : k.title) || I.name, M = I.source ? k : (j = (R = m(I.interface)) == null ? void 0 : R.default) == null ? void 0 : j.uiSchema;
+      const k = typeof (I == null ? void 0 : I.source) == "string" ? (N = I == null ? void 0 : I.source) == null ? void 0 : N.split(".") : I == null ? void 0 : I.source, A = (z = (E = h(k == null ? void 0 : k[0])) == null ? void 0 : E.find((B) => B.name === (k == null ? void 0 : k[1]))) == null ? void 0 : z.uiSchema, w = ((O = I == null ? void 0 : I.uiSchema) == null ? void 0 : O.title) || (A == null ? void 0 : A.title) || I.name, M = I.source ? A : (j = (R = m(I.interface)) == null ? void 0 : R.default) == null ? void 0 : j.uiSchema;
       return {
         title: u(w),
         dataIndex: I.name,
@@ -43582,9 +43591,9 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
             properties: {
               [I.name]: {
                 name: `${I.name}`,
-                "x-component": M && A ? "CollectionField" : "Input",
+                "x-component": M && k ? "CollectionField" : "Input",
                 "x-read-pretty": !0,
-                "x-collection-field": A == null ? void 0 : A.join("."),
+                "x-collection-field": k == null ? void 0 : k.join("."),
                 default: I.interface === "json" ? JSON.stringify($) : $
               }
             }
@@ -43804,7 +43813,7 @@ const AsyncDataProvider = (e) => {
   }), a;
 }, FieldsConfigure = observer$1(
   () => {
-    var v, I, A, k;
+    var v, I, k, A;
     const { t: e } = useTranslation(), [t, o] = useState([]), { data: n, error: r, loading: i } = useAsyncData(), { data: a, fields: l } = n || {}, c = useField(), { data: u } = useContext(ResourceActionContext), d = useCompile(), { getInterface: p, getCollectionField: m } = useCollectionManager_deprecated(), h = useFieldInterfaceOptions(), x = useMemo(
       () => h.filter((w) => !["relation"].includes(w.key)).map((w, M) => ({
         key: M,
@@ -43852,7 +43861,7 @@ const AsyncDataProvider = (e) => {
       return /* @__PURE__ */ jsx(Alert, { showIcon: !0, message: e("Please use a valid SELECT or WITH AS statement") });
     const S = r;
     if (S) {
-      const w = ((k = (A = (I = (v = S == null ? void 0 : S.response) == null ? void 0 : v.data) == null ? void 0 : I.errors) == null ? void 0 : A.map) == null ? void 0 : k.call(A, (M) => M.message).join(`
+      const w = ((A = (k = (I = (v = S == null ? void 0 : S.response) == null ? void 0 : v.data) == null ? void 0 : I.errors) == null ? void 0 : k.map) == null ? void 0 : A.call(k, (M) => M.message).join(`
 `)) || S.message;
       return /* @__PURE__ */ jsx(Alert, { showIcon: !0, message: `${e("SQL error: ")}${w}`, type: "error" });
     }
@@ -49509,7 +49518,7 @@ const ACLCollectionProvider = (e) => {
     )
   };
 }, ACLCollectionFieldProvider = (e) => {
-  const t = useFieldSchema(), o = useField(), { allowAll: n } = useACLRoleContext(), { whitelist: r } = useACLFieldWhitelist(), [i] = t.name.split("."), a = !t["x-acl-ignore"] && r.length > 0 ? r.includes(i) : !0;
+  const t = useFieldSchema(), o = useField(), { allowAll: n } = useACLRoleContext(), { whitelist: r } = useACLFieldWhitelist(), [i] = t.name.split("."), a = !t["x-acl-ignore"] && r.length > 0 && (t != null && t["x-collection-field"]) ? r.includes(i) : !0;
   return useEffect(() => {
     a || (o.required = !1, o.display = "hidden");
   }, [a, o]), n ? /* @__PURE__ */ jsx(Fragment, { children: e.children }) : t["x-collection-field"] ? a ? /* @__PURE__ */ jsx(Fragment, { children: e.children }) : null : /* @__PURE__ */ jsx(Fragment, { children: e.children });
@@ -50561,34 +50570,34 @@ const RolesResourcesScopesSelectedRowKeysProvider = (e) => {
 }, RoleResourceCollectionContext = createContext({});
 RoleResourceCollectionContext.displayName = "RoleResourceCollectionContext";
 const RolesResourcesActions = connect((e) => {
-  var y, v, I, A;
-  const { styles: t } = useStyles$a(), o = (k) => {
-    const w = k.map((M) => F(g({}, M), {
+  var y, v, I, k;
+  const { styles: t } = useStyles$a(), o = (A) => {
+    const w = A.map((M) => F(g({}, M), {
       scope: isEmpty$1(M.scope) ? null : M.scope
     }));
     e.onChange(w);
   };
   useForm();
-  const n = useRecord(), r = useAvailableActions(), { getCollection: i, getCollectionFields: a } = useCollectionManager_deprecated(), l = i(n.collectionName), c = a(n.collectionName), u = useCompile(), { t: d } = useTranslation(), p = useField(), m = toActionMap(p.value || []), h = (k, w) => {
+  const n = useRecord(), r = useAvailableActions(), { getCollection: i, getCollectionFields: a } = useCollectionManager_deprecated(), l = i(n.collectionName), c = a(n.collectionName), u = useCompile(), { t: d } = useTranslation(), p = useField(), m = toActionMap(p.value || []), h = (A, w) => {
     var N;
-    const M = m == null ? void 0 : m[k];
+    const M = m == null ? void 0 : m[A];
     return M ? (N = M == null ? void 0 : M.fields) == null ? void 0 : N.includes(w) : !1;
-  }, x = r.filter((k) => k.allowConfigureFields), f = (y = c == null ? void 0 : c.filter((k) => k.interface)) == null ? void 0 : y.map((k) => {
-    const w = g({}, k);
+  }, x = r.filter((A) => A.allowConfigureFields), f = (y = c == null ? void 0 : c.filter((A) => A.interface)) == null ? void 0 : y.map((A) => {
+    const w = g({}, A);
     for (const M of x)
-      w[M.name] = h(M.name, k.name);
+      w[M.name] = h(M.name, A.name);
     return w;
-  }), C = (k) => {
+  }), C = (A) => {
     var w, M;
-    m[k] ? delete m[k] : m[k] = {
-      name: k,
+    m[A] ? delete m[A] : m[A] = {
+      name: A,
       fields: (M = (w = c == null ? void 0 : c.filter((N) => N.interface)) == null ? void 0 : w.map) == null ? void 0 : M.call(w, (N) => N.name)
     }, o(Object.values(m));
-  }, S = (k, w) => {
-    m[k] ? (m[k].scope = w, o(Object.values(m))) : (C(k), m[k].scope = w);
+  }, S = (A, w) => {
+    m[A] ? (m[A].scope = w, o(Object.values(m))) : (C(A), m[A].scope = w);
   }, b = {};
-  for (const k of x)
-    b[k.name] = ((v = c == null ? void 0 : c.filter((w) => w.interface)) == null ? void 0 : v.length) === ((A = (I = m == null ? void 0 : m[k.name]) == null ? void 0 : I.fields) == null ? void 0 : A.length);
+  for (const A of x)
+    b[A.name] = ((v = c == null ? void 0 : c.filter((w) => w.interface)) == null ? void 0 : v.length) === ((k = (I = m == null ? void 0 : m[A.name]) == null ? void 0 : I.fields) == null ? void 0 : k.length);
   return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(RoleResourceCollectionContext.Provider, { value: l, children: /* @__PURE__ */ jsxs(FormLayout, { layout: "vertical", children: [
     /* @__PURE__ */ jsx(FormItem$1, { label: d("Action permission"), children: /* @__PURE__ */ jsx(
       Table$2,
@@ -50600,20 +50609,20 @@ const RolesResourcesActions = connect((e) => {
           {
             dataIndex: "displayName",
             title: d("Action display name"),
-            render: (k) => u(k)
+            render: (A) => u(A)
           },
           {
             dataIndex: "onNewRecord",
             title: d("Action type"),
-            render: (k) => k ? /* @__PURE__ */ jsx(Tag, { color: "green", children: d("Action on new records") }) : /* @__PURE__ */ jsx(Tag, { color: "geekblue", children: d("Action on existing records") })
+            render: (A) => A ? /* @__PURE__ */ jsx(Tag, { color: "green", children: d("Action on new records") }) : /* @__PURE__ */ jsx(Tag, { color: "geekblue", children: d("Action on existing records") })
           },
           {
             dataIndex: "enabled",
             title: d("Allow"),
-            render: (k, w) => /* @__PURE__ */ jsx(
+            render: (A, w) => /* @__PURE__ */ jsx(
               Checkbox$1,
               {
-                checked: k,
+                checked: A,
                 onChange: () => {
                   C(w.name);
                 }
@@ -50623,10 +50632,10 @@ const RolesResourcesActions = connect((e) => {
           {
             dataIndex: "scope",
             title: d("Data scope"),
-            render: (k, w) => !w.onNewRecord && /* @__PURE__ */ jsx(
+            render: (A, w) => !w.onNewRecord && /* @__PURE__ */ jsx(
               ScopeSelect,
               {
-                value: k,
+                value: A,
                 onChange: (M) => {
                   S(w.name, M);
                 }
@@ -50634,9 +50643,9 @@ const RolesResourcesActions = connect((e) => {
             )
           }
         ],
-        dataSource: r == null ? void 0 : r.map((k) => {
+        dataSource: r == null ? void 0 : r.map((A) => {
           let w = !1, M = null;
-          return m[k.name] && (w = !0, k.onNewRecord || (M = m[k.name].scope)), F(g({}, k), {
+          return m[A.name] && (w = !0, A.onNewRecord || (M = m[A.name].scope)), F(g({}, A), {
             enabled: w,
             scope: M
           });
@@ -50653,12 +50662,12 @@ const RolesResourcesActions = connect((e) => {
           {
             dataIndex: ["uiSchema", "title"],
             title: d("Field display name"),
-            render: (k) => u(k)
+            render: (A) => u(A)
           },
-          ...x.map((k) => {
-            const w = b == null ? void 0 : b[k.name];
+          ...x.map((A) => {
+            const w = b == null ? void 0 : b[A.name];
             return {
-              dataIndex: k.name,
+              dataIndex: A.name,
               title: /* @__PURE__ */ jsxs(Fragment, { children: [
                 /* @__PURE__ */ jsx(
                   Checkbox$1,
@@ -50666,31 +50675,31 @@ const RolesResourcesActions = connect((e) => {
                     checked: w,
                     onChange: () => {
                       var N;
-                      const M = m[k.name] || {
-                        name: k.name
+                      const M = m[A.name] || {
+                        name: A.name
                       };
-                      w ? M.fields = [] : M.fields = (N = c == null ? void 0 : c.map) == null ? void 0 : N.call(c, (E) => E.name), m[k.name] = M, o(Object.values(m));
+                      w ? M.fields = [] : M.fields = (N = c == null ? void 0 : c.map) == null ? void 0 : N.call(c, (E) => E.name), m[A.name] = M, o(Object.values(m));
                     }
                   }
                 ),
                 " ",
-                u(k.displayName)
+                u(A.displayName)
               ] }),
               render: (M, N) => /* @__PURE__ */ jsx(
                 Checkbox$1,
                 {
                   checked: M,
-                  "aria-label": `${k.name}_checkbox`,
+                  "aria-label": `${A.name}_checkbox`,
                   onChange: () => {
-                    const E = m[k.name] || {
-                      name: k.name
+                    const E = m[A.name] || {
+                      name: A.name
                     }, z = E.fields || [];
                     if (M) {
                       const O = z.indexOf(N.name);
                       z.splice(O, 1);
                     } else
                       z.push(N.name);
-                    E.fields = z, m[k.name] = E, o(Object.values(m));
+                    E.fields = z, m[A.name] = E, o(Object.values(m));
                   }
                 }
               )
@@ -50940,14 +50949,14 @@ const PluginDetail = ({ plugin: e, onCancel: t }) => {
       ready: !!e.name
     }
   ), a = useMemo(() => {
-    var k, w, M;
-    if (!((w = (k = r == null ? void 0 : r.data) == null ? void 0 : k.packageJson) != null && w.repository))
+    var A, w, M;
+    if (!((w = (A = r == null ? void 0 : r.data) == null ? void 0 : A.packageJson) != null && w.repository))
       return null;
     const I = (M = r == null ? void 0 : r.data) == null ? void 0 : M.packageJson.repository;
     return (typeof I == "string" ? I : I.url).replace(/\.git$/, "").replace(/^git\+/, "");
   }, [r]), l = useMemo(() => {
-    var A;
-    const I = (A = r == null ? void 0 : r.data) == null ? void 0 : A.packageJson.author;
+    var k;
+    const I = (k = r == null ? void 0 : r.data) == null ? void 0 : k.packageJson.author;
     return I ? typeof I == "string" ? I : I.name : null;
   }, [r]), { styles: c, theme: u } = useStyles$1(), d = [
     {
@@ -51331,14 +51340,14 @@ const PluginUploadForm = ({ onClose: e, pluginData: t, isUpgrade: o }) => {
   ] });
 };
 function PluginInfo(e) {
-  const { data: t, onClick: o } = e, n = useApp(), { name: r, displayName: i, isCompatible: a, packageName: l, updatable: c, builtIn: u, enabled: d, description: p, error: m, homepage: h } = t, { styles: x, theme: f } = useStyles$1(), C = useNavigate(), { t: S } = useTranslation(), b = useAPIClient(), { modal: y } = App.useApp(), [v, I] = useState(!1), A = i || r || l;
+  const { data: t, onClick: o } = e, n = useApp(), { name: r, displayName: i, isCompatible: a, packageName: l, updatable: c, builtIn: u, enabled: d, description: p, error: m, homepage: h } = t, { styles: x, theme: f } = useStyles$1(), C = useNavigate(), { t: S } = useTranslation(), b = useAPIClient(), { modal: y } = App.useApp(), [v, I] = useState(!1), k = i || r || l;
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     v && /* @__PURE__ */ jsx(
       PluginUpgradeModal,
       {
         isShow: v,
         pluginData: t,
-        onClose: (k) => {
+        onClose: (A) => {
           I(!1);
         }
       }
@@ -51347,7 +51356,7 @@ function PluginInfo(e) {
       Card,
       {
         role: "button",
-        "aria-label": A,
+        "aria-label": k,
         size: "small",
         bordered: !1,
         onClick: () => {
@@ -51355,7 +51364,7 @@ function PluginInfo(e) {
         },
         headStyle: { border: "none", minHeight: "inherit", paddingTop: 14 },
         bodyStyle: { paddingTop: 10 },
-        title: /* @__PURE__ */ jsx("div", { children: A }),
+        title: /* @__PURE__ */ jsx("div", { children: k }),
         hoverable: !0,
         className: css`
           .ant-card-actions {
@@ -51386,8 +51395,8 @@ function PluginInfo(e) {
               {
                 href: h,
                 target: "_blank",
-                onClick: (k) => {
-                  k.stopPropagation();
+                onClick: (A) => {
+                  A.stopPropagation();
                 },
                 rel: "noreferrer",
                 children: [
@@ -51401,8 +51410,8 @@ function PluginInfo(e) {
             c && /* @__PURE__ */ jsxs(
               "a",
               {
-                onClick: (k) => {
-                  k.stopPropagation(), I(!0);
+                onClick: (A) => {
+                  A.stopPropagation(), I(!0);
                 },
                 children: [
                   /* @__PURE__ */ jsx(ReloadOutlined, {}),
@@ -51415,8 +51424,8 @@ function PluginInfo(e) {
             d ? n.pluginSettingsManager.has(r) && /* @__PURE__ */ jsxs(
               "a",
               {
-                onClick: (k) => {
-                  k.stopPropagation(), C(n.pluginSettingsManager.getRoutePath(r));
+                onClick: (A) => {
+                  A.stopPropagation(), C(n.pluginSettingsManager.getRoutePath(r));
                 },
                 children: [
                   /* @__PURE__ */ jsx(SettingOutlined, {}),
@@ -51429,22 +51438,22 @@ function PluginInfo(e) {
               {
                 disabled: u,
                 title: S("Are you sure to delete this plugin?"),
-                onConfirm: (k) => V(this, null, function* () {
-                  k.stopPropagation(), b.request({
+                onConfirm: (A) => V(this, null, function* () {
+                  A.stopPropagation(), b.request({
                     url: "pm:remove",
                     params: {
                       filterByTk: r
                     }
                   });
                 }),
-                onCancel: (k) => k.stopPropagation(),
+                onCancel: (A) => A.stopPropagation(),
                 okText: S("Yes"),
                 cancelText: S("No"),
                 children: /* @__PURE__ */ jsxs(
                   "a",
                   {
-                    onClick: (k) => {
-                      k.stopPropagation();
+                    onClick: (A) => {
+                      A.stopPropagation();
                     },
                     className: cls({ [x.cardActionDisabled]: u }),
                     children: [
@@ -51464,12 +51473,12 @@ function PluginInfo(e) {
               "aria-label": "enable",
               size: "small",
               disabled: u || m,
-              onChange: (k, w) => V(this, null, function* () {
-                if (w.stopPropagation(), !a && k) {
+              onChange: (A, w) => V(this, null, function* () {
+                if (w.stopPropagation(), !a && A) {
                   message.error(S("Dependencies check failed, can't enable."));
                   return;
                 }
-                k ? yield b.request({
+                A ? yield b.request({
                   url: "pm:enable",
                   params: {
                     filterByTk: r
@@ -51581,15 +51590,15 @@ const LocalPlugins = () => {
     "Others"
   ], C = useMemo(() => f.map((v) => {
     if (v === "Others") {
-      const A = o == null ? void 0 : o.data.filter((k) => !hasIntersection(k.keywords, f));
+      const k = o == null ? void 0 : o.data.filter((A) => !hasIntersection(A.keywords, f));
       return {
         key: v,
-        list: A
+        list: k
       };
     }
-    const I = o == null ? void 0 : o.data.filter((A) => {
-      var k;
-      return (k = A.keywords) == null ? void 0 : k.includes(v);
+    const I = o == null ? void 0 : o.data.filter((k) => {
+      var A;
+      return (A = k.keywords) == null ? void 0 : A.includes(v);
     });
     return {
       key: v,
@@ -51598,12 +51607,12 @@ const LocalPlugins = () => {
   }), [f]), S = useMemo(() => {
     var I;
     let y = ((I = i[a]) == null ? void 0 : I.list) || [];
-    !a && m ? y = C.find((A) => A.key === m).list : a && m && (y = C.find((k) => k.key === m).list.filter((k) => y.find((w) => w.name === k.name)));
+    !a && m ? y = C.find((k) => k.key === m).list : a && m && (y = C.find((A) => A.key === m).list.filter((A) => y.find((w) => w.name === A.name)));
     const v = x.toLocaleLowerCase().trim();
     return v && (y = _.filter(
       y,
-      (A) => String(A.displayName || "").toLocaleLowerCase().includes(v) || String(A.description || "").toLocaleLowerCase().includes(v)
-    )), y.sort((A, k) => A.displayName.localeCompare(k.displayName));
+      (k) => String(k.displayName || "").toLocaleLowerCase().includes(v) || String(k.description || "").toLocaleLowerCase().includes(v)
+    )), y.sort((k, A) => k.displayName.localeCompare(A.displayName));
   }, [a, i, x, m]), b = (y) => {
     p(y);
   };
@@ -52436,7 +52445,7 @@ const useMenuProps = () => {
   const { notification: t } = App.useApp(), [o, n] = useSessionStorageState("plugin-notice", { defaultValue: !1 }), { t: r } = useMenuTranslation(), { setTitle: i } = useDocumentTitle(), a = useCallback((w) => i(r(w)), []), l = useNavigate(), c = useParams(), u = useLocation(), d = useMatch("/admin"), p = useMatch("/admin/:name"), m = c.name, h = !!m, { sideMenuRef: x } = e, f = useACLRoleContext(), [C, S] = useState(null), b = ({ item: w }) => {
     const M = w.props.schema;
     a(M.title), S(M), l(`/admin/${M["x-uid"]}`);
-  }, { render: y } = useAppSpin(), v = useAdminSchemaUid(), { data: I, loading: A } = useRequest(
+  }, { render: y } = useAppSpin(), v = useAdminSchemaUid(), { data: I, loading: k } = useRequest(
     {
       url: `/uiSchemas:getJsonSchema/${v}`
     },
@@ -52469,16 +52478,16 @@ const useMenuProps = () => {
       z || O ? x.current.style.display = "none" : x.current.style.display = "block";
     }
   }, [I == null ? void 0 : I.data, c.name, x]);
-  const k = useMemo(() => {
+  const A = useMemo(() => {
     const w = filterByACL(I == null ? void 0 : I.data, f);
     return w != null && w["x-component-props"] && (w["x-component-props"].useProps = useMenuProps), w;
   }, [I == null ? void 0 : I.data]);
   return useEffect(() => {
     if (p) {
-      const w = findByUid(k, m);
+      const w = findByUid(A, m);
       w && a(w.title);
     }
-  }, [m, d, p, k, a]), useRequest(
+  }, [m, d, p, A, a]), useRequest(
     {
       url: "applicationPlugins:list",
       params: {
@@ -52511,12 +52520,12 @@ const useMenuProps = () => {
       manual: !0
       // ready: !hasNotice,
     }
-  ), A ? y() : /* @__PURE__ */ jsx(SchemaIdContext.Provider, { value: m, children: /* @__PURE__ */ jsx(
+  ), k ? y() : /* @__PURE__ */ jsx(SchemaIdContext.Provider, { value: m, children: /* @__PURE__ */ jsx(
     SchemaComponent,
     {
       distributed: !0,
       scope: { useMenuProps, onSelect: b, sideMenuRef: x, defaultSelectedUid: m },
-      schema: k
+      schema: A
     }
   ) });
 }, GlobalStyleForAdminLayout = createGlobalStyle`
@@ -53300,10 +53309,10 @@ const ActionInitializerItem = (e) => {
     } = useProps(e), [S, b] = useState(!1), y = useMemo(
       () => C && (i != null && i.name) ? [i.name] : [],
       []
-    ), v = x || (i == null ? void 0 : i.targetKey) || "id", I = f || ((L = (q = a["x-component-props"]) == null ? void 0 : q.fieldNames) == null ? void 0 : L.label) || v, A = {
+    ), v = x || (i == null ? void 0 : i.targetKey) || "id", I = f || ((L = (q = a["x-component-props"]) == null ? void 0 : q.fieldNames) == null ? void 0 : L.label) || v, k = {
       title: I || v,
       key: v
-    }, [k, w] = useState([]), [M, N] = useState([]), [E, z] = useState(!0), O = useLabelUiSchema(i, (A == null ? void 0 : A.title) || "label");
+    }, [A, w] = useState([]), [M, N] = useState([]), [E, z] = useState(!0), O = useLabelUiSchema(i, (k == null ? void 0 : k.title) || "label");
     if (!i)
       return null;
     const R = (K) => {
@@ -53365,11 +53374,11 @@ const ActionInitializerItem = (e) => {
               {
                 className: "Tree",
                 onExpand: R,
-                expandedKeys: k,
+                expandedKeys: A,
                 autoExpandParent: E,
                 treeData: u,
                 onSelect: j,
-                fieldNames: A,
+                fieldNames: k,
                 titleRender: (K) => /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: getLabelFormatValue(O, c(K[I])) }),
                 selectedKeys: M,
                 blockNode: !0
@@ -53391,10 +53400,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 A, k, w;
+    var k, A, w;
     const v = {
       "x-uid": t["x-uid"]
-    }, I = F(g(g({}, (k = (A = l == null ? void 0 : l.uiSchema) == null ? void 0 : A["x-component-props"]) == null ? void 0 : k.fieldNames), (w = t["x-component-props"]) == null ? void 0 : w.fieldNames), {
+    }, I = F(g(g({}, (A = (k = l == null ? void 0 : l.uiSchema) == null ? void 0 : k["x-component-props"]) == null ? void 0 : A.fieldNames), (w = t["x-component-props"]) == null ? void 0 : w.fieldNames), {
       label: y
     });
     t["x-component-props"] = t["x-component-props"] || {}, t["x-component-props"].fieldNames = I, v["x-component-props"] = t["x-component-props"], d.emit("patch", {