@nocobase/client 1.3.9-beta → 1.3.11-beta

package/es/index.mjs

@@ -4083,7 +4083,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.3.9-beta", 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.3.11-beta", 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",
@@ -4104,9 +4104,9 @@ const name = "@nocobase/client", version$1 = "1.3.9-beta", license = "AGPL-3.0",
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.3.9-beta",
-  "@nocobase/sdk": "1.3.9-beta",
-  "@nocobase/utils": "1.3.9-beta",
+  "@nocobase/evaluators": "1.3.11-beta",
+  "@nocobase/sdk": "1.3.11-beta",
+  "@nocobase/utils": "1.3.11-beta",
   ahooks: "^3.7.2",
   antd: "^5.12.8",
   "antd-style": "3.4.5",
@@ -4785,15 +4785,15 @@ const TreeNode = (e) => {
           name: A.name,
           title: ((N = A == null ? void 0 : A.uiSchema) == null ? void 0 : N.title) || A.name,
           schema: A == null ? void 0 : A.uiSchema,
-          operators: ((w = O == null ? void 0 : O.filter) == null ? void 0 : w.call(O, (M) => !(M != null && M.visible) || M.visible(A))) || [],
+          operators: ((w = O == null ? void 0 : O.filter) == null ? void 0 : w.call(O, (j) => !(j != null && j.visible) || j.visible(A))) || [],
           interface: A.interface
         };
         if (!(A.target && k > 2)) {
           if (k > 2)
             return z;
           if ($ != null && $.length && (z.children = $), D) {
-            const M = t(A.target), j = v(M, k + 1).filter(Boolean);
-            z.children = z.children || [], z.children.push(...j);
+            const j = t(A.target), M = v(j, k + 1).filter(Boolean);
+            z.children = z.children || [], z.children.push(...M);
           }
           return z;
         }
@@ -8916,14 +8916,14 @@ https://requirejs.org/docs/errors.html#` + e);
     function w(R, B, V, E) {
       R.detachEvent && !isOpera ? E && R.detachEvent(E, B) : R.removeEventListener(V, B, !1);
     }
-    function M(R) {
+    function j(R) {
       var B = R.currentTarget || R.srcElement;
       return w(B, n.onScriptLoad, "load", "onreadystatechange"), w(B, n.onScriptError, "error"), {
         node: B,
         id: B && B.getAttribute("data-requiremodule")
       };
     }
-    function j() {
+    function M() {
       var R;
       for (D(); d.length; ) {
         if (R = d.shift(), R[0] === null)
@@ -8989,8 +8989,8 @@ https://requirejs.org/docs/errors.html#` + e);
         B = B || {};
         function V(E, q, G) {
           var U, K, Y;
-          return B.enableBuildCallback && q && isFunction(q) && (q.__requireJsBuild = !0), typeof E == "string" ? isFunction(q) ? T(makeError("requireargs", "Invalid require call"), G) : R && hasProp(r, E) ? r[E](l[R.id]) : req.get ? req.get(n, E, R, V) : (K = I(E, R, !1, !0), U = K.id, hasProp(p, U) ? p[U] : T(makeError("notloaded", 'Module name "' + U + '" has not been loaded yet for context: ' + e + (R ? "" : ". Use require([])")))) : (j(), n.nextTick(function() {
-            j(), Y = A(I(null, R)), Y.skipMap = B.skipMap, Y.init(E, q, G, {
+          return B.enableBuildCallback && q && isFunction(q) && (q.__requireJsBuild = !0), typeof E == "string" ? isFunction(q) ? T(makeError("requireargs", "Invalid require call"), G) : R && hasProp(r, E) ? r[E](l[R.id]) : req.get ? req.get(n, E, R, V) : (K = I(E, R, !1, !0), U = K.id, hasProp(p, U) ? p[U] : T(makeError("notloaded", 'Module name "' + U + '" has not been loaded yet for context: ' + e + (R ? "" : ". Use require([])")))) : (M(), n.nextTick(function() {
+            M(), Y = A(I(null, R)), Y.skipMap = B.skipMap, Y.init(E, q, G, {
               enabled: !0
             }), z();
           }), V);
@@ -9110,7 +9110,7 @@ https://requirejs.org/docs/errors.html#` + e);
       onScriptLoad: function(R) {
         if (R.type === "load" || readyRegExp.test((R.currentTarget || R.srcElement).readyState)) {
           interactiveScript = null;
-          var B = M(R);
+          var B = j(R);
           n.completeLoad(B.id);
         }
       },
@@ -9118,7 +9118,7 @@ https://requirejs.org/docs/errors.html#` + e);
        * Callback for script errors.
        */
       onScriptError: function(R) {
-        var B = M(R);
+        var B = j(R);
         if (!y(B.id)) {
           var V = [];
           return eachProp(l, function(E, q) {
@@ -9208,22 +9208,22 @@ const useCollectionManager_deprecated = (e) => {
   const t = useDataSourceManager(), o = useDataSource(), n = useCollectionManager(), r = e || (o == null ? void 0 : o.key) || void 0, [i, a] = useState(uid()), { refresh: l } = useSchemaComponentContext(), c = useMemo(
     () => {
       var w;
-      return (w = t == null ? void 0 : t.collectionFieldInterfaceManager) == null ? void 0 : w.getFieldInterfaces().reduce((M, j) => (M[j.name] = j, M), {});
+      return (w = t == null ? void 0 : t.collectionFieldInterfaceManager) == null ? void 0 : w.getFieldInterfaces().reduce((j, M) => (j[M.name] = M, j), {});
     },
     [t, i]
   ), u = useMemo(() => t == null ? void 0 : t.collectionTemplateManager.getCollectionTemplates(), [t, i]), d = useCallback(() => {
-    var w, M;
-    return (M = (w = t == null ? void 0 : t.getDataSource(r)) == null ? void 0 : w.collectionManager) == null ? void 0 : M.getCollections().map((j) => j.getOptions());
+    var w, j;
+    return (j = (w = t == null ? void 0 : t.getDataSource(r)) == null ? void 0 : w.collectionManager) == null ? void 0 : j.getCollections().map((M) => M.getOptions());
   }, [t, o]), p = useCallback(
     (w) => {
-      var M;
-      return n && !w ? n : (M = t == null ? void 0 : t.getDataSource(w || r)) == null ? void 0 : M.collectionManager;
+      var j;
+      return n && !w ? n : (j = t == null ? void 0 : t.getDataSource(w || r)) == null ? void 0 : j.collectionManager;
     },
     [n, t, r]
   ), m = useMemo(
     () => {
-      var w, M;
-      return (M = (w = t == null ? void 0 : t.getDataSource(DEFAULT_DATA_SOURCE_KEY)) == null ? void 0 : w.collectionManager) == null ? void 0 : M.getCollections();
+      var w, j;
+      return (j = (w = t == null ? void 0 : t.getDataSource(DEFAULT_DATA_SOURCE_KEY)) == null ? void 0 : w.collectionManager) == null ? void 0 : j.getCollections();
     },
     [t, i]
   ), g = useCallback(
@@ -9237,50 +9237,50 @@ const useCollectionManager_deprecated = (e) => {
     }),
     [t]
   ), x = useCompile(), C = useCallback(
-    (w, M) => {
-      var j, R;
-      return ((R = (j = p(M)) == null ? void 0 : j.getCollection(w)) == null ? void 0 : R.getInheritedFields()) || [];
+    (w, j) => {
+      var M, R;
+      return ((R = (M = p(j)) == null ? void 0 : M.getCollection(w)) == null ? void 0 : R.getInheritedFields()) || [];
     },
     [t, p]
   ), S = useCallback(
-    (w, M) => {
+    (w, j) => {
       var R, B;
       if (!w)
         return [];
-      const j = (R = p(M)) == null ? void 0 : R.getCollection(w);
-      return ((B = j == null ? void 0 : j.getAllFields) == null ? void 0 : B.call(j)) || (j == null ? void 0 : j.getFields()) || [];
+      const M = (R = p(j)) == null ? void 0 : R.getCollection(w);
+      return ((B = M == null ? void 0 : M.getAllFields) == null ? void 0 : B.call(M)) || (M == null ? void 0 : M.getFields()) || [];
     },
     [t, p]
   ), b = useCallback(
-    (w, M) => {
-      var j;
+    (w, j) => {
+      var M;
       if (!(!w || w.split(".").length < 2))
-        return (j = p(M)) == null ? void 0 : j.getCollectionField(w);
+        return (M = p(j)) == null ? void 0 : M.getCollectionField(w);
     },
     [t, p]
   ), y = useCallback(
-    (w, M) => {
-      var j, R;
-      return w ? ((R = (j = p(M)) == null ? void 0 : j.getCollection(w)) == null ? void 0 : R.getParentCollectionsName()) || [] : [];
+    (w, j) => {
+      var M, R;
+      return w ? ((R = (M = p(j)) == null ? void 0 : M.getCollection(w)) == null ? void 0 : R.getParentCollectionsName()) || [] : [];
     },
     [t, p]
   ), v = useCallback(
-    (w, M = !1, j) => {
+    (w, j = !1, M) => {
       var V;
       if (!w)
         return [];
-      const R = (V = p(j)) == null ? void 0 : V.getCollection(w);
-      return (R == null ? void 0 : R.getChildrenCollections(M)) || [];
+      const R = (V = p(M)) == null ? void 0 : V.getCollection(w);
+      return (R == null ? void 0 : R.getChildrenCollections(j)) || [];
     },
     [t, p]
   ), I = useCallback(
-    (w, M) => {
-      var j, R;
-      return w ? ((R = (j = p(M)) == null ? void 0 : j.getCollection(w)) == null ? void 0 : R.getCurrentFields()) || [] : [];
+    (w, j) => {
+      var M, R;
+      return w ? ((R = (M = p(j)) == null ? void 0 : M.getCollection(w)) == null ? void 0 : R.getCurrentFields()) || [] : [];
     },
     [t, p]
   ), A = useCallback(
-    (w, M = "string", j) => {
+    (w, j = "string", M) => {
       var Q;
       const {
         association: R = !1,
@@ -9292,21 +9292,21 @@ const useCollectionManager_deprecated = (e) => {
         prefixFieldValue: U = "",
         usePrefix: K = !1,
         dataSource: Y
-      } = j || {};
+      } = M || {};
       if (V.length - 1 > E)
         return;
       if (B[w])
         return _.cloneDeep(B[w]);
-      typeof M == "string" && (M = [M]);
+      typeof j == "string" && (j = [j]);
       const H = S(w, Y), X = (Q = H == null ? void 0 : H.filter(
-        (J) => J.interface && !G.includes(J.interface) && (q || M.includes(J.type) || (R && J.target && J.target !== w && Array.isArray(R) ? R.includes(J.interface) : !1))
+        (J) => J.interface && !G.includes(J.interface) && (q || j.includes(J.type) || (R && J.target && J.target !== w && Array.isArray(R) ? R.includes(J.interface) : !1))
       )) == null ? void 0 : Q.map((J) => {
         var ne, oe;
         const te = h({
           value: K && U ? `${U}.${J.name}` : J.name,
           label: x((ne = J == null ? void 0 : J.uiSchema) == null ? void 0 : ne.title) || J.name
         }, J);
-        return R && J.target && (te.children = V.includes(J.target) ? [] : A(J.target, M, F(h({}, j), {
+        return R && J.target && (te.children = V.includes(J.target) ? [] : A(J.target, j, F(h({}, M), {
           cached: B,
           dataSource: Y,
           collectionNames: [...V, J.target],
@@ -9318,21 +9318,21 @@ const useCollectionManager_deprecated = (e) => {
     },
     [S]
   ), k = useCallback(
-    (w, M) => {
-      var j;
-      return (j = p(M)) == null ? void 0 : j.getCollection(w);
+    (w, j) => {
+      var M;
+      return (M = p(j)) == null ? void 0 : M.getCollection(w);
     },
     [t, p]
   ), T = useCallback(
-    (w, M) => {
-      var j, R;
-      return (R = (j = p(M)) == null ? void 0 : j.getCollection(w)) == null ? void 0 : R.getAllCollectionsInheritChain();
+    (w, j) => {
+      var M, R;
+      return (R = (M = p(j)) == null ? void 0 : M.getCollection(w)) == null ? void 0 : R.getAllCollectionsInheritChain();
     },
     [t, p]
   ), D = useCallback(
-    (w, M) => () => {
-      var j, R;
-      return (R = (j = p(M)) == null ? void 0 : j.getCollection(w)) == null ? void 0 : R.getInheritCollectionsChain();
+    (w, j) => () => {
+      var M, R;
+      return (R = (M = p(j)) == null ? void 0 : M.getCollection(w)) == null ? void 0 : R.getInheritCollectionsChain();
     },
     [t, p]
   ), $ = useCallback(
@@ -9340,14 +9340,14 @@ const useCollectionManager_deprecated = (e) => {
     [t]
   ), O = useCallback(
     (w) => {
-      var M;
-      return (M = $(w.interface)) == null ? void 0 : M.titleUsable;
+      var j;
+      return (j = $(w.interface)) == null ? void 0 : j.titleUsable;
     },
     [$]
   ), z = useCallback(
-    (w, M, j) => {
+    (w, j, M) => {
       var R, B;
-      return (B = (R = p(j)) == null ? void 0 : R.getCollection(M)) == null ? void 0 : B.getParentCollectionFields(w);
+      return (B = (R = p(M)) == null ? void 0 : R.getCollection(j)) == null ? void 0 : B.getParentCollectionFields(w);
     },
     [t, p]
   ), N = useCallback(
@@ -9782,14 +9782,14 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
       popupUid: z,
       recordData: N,
       sourceId: w,
-      collection: M,
-      puid: j
+      collection: j,
+      puid: M
     }) => {
       const R = c.getFilterByTK(u || l, N);
       return getPopupPathFromParams({
         popupuid: z,
-        puid: j,
-        collection: M,
+        puid: M,
+        collection: j,
         filterbytk: R,
         sourceid: w,
         tab: O
@@ -9809,22 +9809,22 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
       parentRecordData: z,
       collectionNameUsedInURL: N,
       popupUidUsedInURL: w,
-      customActionSchema: M
+      customActionSchema: j
     } = {}) => {
       if (!f())
         return y == null ? void 0 : y(!0);
-      const j = (M == null ? void 0 : M["x-uid"]) || (n == null ? void 0 : n["x-uid"]), R = b(z);
+      const M = (j == null ? void 0 : j["x-uid"]) || (n == null ? void 0 : n["x-uid"]), R = b(z);
       O = O || (i == null ? void 0 : i.data);
       const B = v({
-        popupUid: j,
+        popupUid: M,
         recordData: O,
         sourceId: R,
         collection: N,
         puid: w
       });
       let V = o.pathname;
-      _.last(V) === "/" && (V = V.slice(0, -1)), storePopupContext(j, {
-        schema: M || n,
+      _.last(V) === "/" && (V = V.slice(0, -1)), storePopupContext(M, {
+        schema: j || n,
         record: new CollectionRecord({ isNew: !1, data: O }),
         parentRecord: z ? new CollectionRecord({ isNew: !1, data: z }) : a,
         service: g,
@@ -9832,7 +9832,7 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
         collection: l.name,
         association: u,
         sourceId: R
-      }), C(I(), M), t(withSearchParams(`${V}${B}`));
+      }), C(I(), j), t(withSearchParams(`${V}${B}`));
     },
     [
       u,
@@ -10800,18 +10800,18 @@ const variablesStore = {}, getFieldPath = (e, t) => {
       const { fieldPath: $ } = getFieldPath(x, v), O = b.length === 1 ? T.collectionName : (N = n($, k)) == null ? void 0 : N.target;
       if (!(y in I))
         throw new Error(`VariablesProvider: ${y} is not found`);
-      for (let M = 0; M < b.length; M++) {
+      for (let j = 0; j < b.length; j++) {
         if (I == null)
           return {
             value: I === void 0 ? T.defaultValue : I,
             dataSource: k,
             collectionName: O
           };
-        const j = b[M], { fieldPath: R } = getFieldPath(b.slice(0, M + 1).join("."), v), B = n(R, k), V = (w = r(D)) == null ? void 0 : w.getPrimaryKey();
+        const M = b[j], { fieldPath: R } = getFieldPath(b.slice(0, j + 1).join("."), v), B = n(R, k), V = (w = r(D)) == null ? void 0 : w.getPrimaryKey();
         if (Array.isArray(I)) {
           const E = I.map((q) => {
-            if (!(S != null && S.doNotRequest) && shouldToRequest(q == null ? void 0 : q[j]) && (q == null ? void 0 : q[V]) != null && B != null && B.target) {
-              const G = `/${D}/${q[B.sourceKey || V]}/${j}:${getAction(B.type)}`;
+            if (!(S != null && S.doNotRequest) && shouldToRequest(q == null ? void 0 : q[M]) && (q == null ? void 0 : q[V]) != null && B != null && B.target) {
+              const G = `/${D}/${q[B.sourceKey || V]}/${M}:${getAction(B.type)}`;
               if (hasRequested(G))
                 return getRequested(G);
               const U = o.request({
@@ -10820,14 +10820,14 @@ const variablesStore = {}, getFieldPath = (e, t) => {
                 params: {
                   appends: S == null ? void 0 : S.appends
                 }
-              }).then((K) => (clearRequested(G), q[j] = K.data.data, q[j]));
+              }).then((K) => (clearRequested(G), q[M] = K.data.data, q[M]));
               return stashRequested(G, U), U;
             }
-            return q == null ? void 0 : q[j];
+            return q == null ? void 0 : q[M];
           });
           I = removeThroughCollectionFields(_.flatten(yield Promise.all(E)), B);
-        } else if (!(S != null && S.doNotRequest) && shouldToRequest(I[j]) && I[V] != null && (B != null && B.target)) {
-          const E = `/${D}/${I[B.sourceKey || V]}/${j}:${getAction(B.type)}`;
+        } else if (!(S != null && S.doNotRequest) && shouldToRequest(I[M]) && I[V] != null && (B != null && B.target)) {
+          const E = `/${D}/${I[B.sourceKey || V]}/${M}:${getAction(B.type)}`;
           let q = null;
           if (hasRequested(E))
             q = yield getRequested(E);
@@ -10841,9 +10841,9 @@ const variablesStore = {}, getFieldPath = (e, t) => {
             });
             stashRequested(E, G), q = yield G, clearRequested(E);
           }
-          raw(I)[j] || (raw(I)[j] = q.data.data), I = removeThroughCollectionFields(getValuesByPath(I, j), B);
+          raw(I)[M] || (raw(I)[M] = q.data.data), I = removeThroughCollectionFields(getValuesByPath(I, M), B);
         } else
-          I = removeThroughCollectionFields(getValuesByPath(I, j), B);
+          I = removeThroughCollectionFields(getValuesByPath(I, M), B);
         B != null && B.target && (D = B.target);
       }
       const z = i(_.isFunction(I) ? I() : I);
@@ -12876,7 +12876,7 @@ const useGetAriaLabelOfDesigner = () => {
         })
       )
     };
-  }, [b, (V = z == null ? void 0 : z.cols) == null ? void 0 : V.length]), M = useMemo(() => u === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": b("drag-handler") }) }), [u, b]), j = useMemo(() => {
+  }, [b, (V = z == null ? void 0 : z.cols) == null ? void 0 : V.length]), j = useMemo(() => u === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": b("drag-handler") }) }), [u, b]), M = useMemo(() => {
     var E;
     if (n === !1)
       return null;
@@ -12913,8 +12913,8 @@ const useGetAriaLabelOfDesigner = () => {
           k[1] && /* @__PURE__ */ jsx("span", { className: C.toolbarTitleTag, children: `${S("Reference template")}: ${`${k[1]}` || S("Untitled")}` })
         ] }) }),
         /* @__PURE__ */ jsx("div", { className: cls(C.toolbarIcons, a), style: l, children: /* @__PURE__ */ jsxs(Space$1, { size: 3, align: "center", className: d, style: p, children: [
-          M,
           j,
+          M,
           R
         ] }) })
       ]
@@ -13293,8 +13293,8 @@ const ColDivider = (e) => {
       $.style.width = `${y[0] + T.delta.x}px`, O.style.width = `${y[1] - T.delta.x}px`;
     },
     onDragEnd(T) {
-      var M;
-      if (!o.current || (M = o.current) != null && M.startsWith(T.active.id) && !o.current.endsWith("_move") || y[0] <= 0 || y[1] <= 0 || (v([0, 0]), !g || !f))
+      var j;
+      if (!o.current || (j = o.current) != null && j.startsWith(T.active.id) && !o.current.endsWith("_move") || y[0] <= 0 || y[1] <= 0 || (v([0, 0]), !g || !f))
         return;
       const D = l.current, $ = D.previousElementSibling, O = D.nextElementSibling;
       g["x-component-props"] = g["x-component-props"] || {}, f["x-component-props"] = f["x-component-props"] || {};
@@ -14001,7 +14001,7 @@ function useMenuSearch({
   })) : f, [e, c, u, f]);
 }
 const DataBlockInitializer = (e) => {
-  var M;
+  var j;
   const {
     templateWrap: t,
     onCreateBlockSchema: o,
@@ -14022,10 +14022,10 @@ const DataBlockInitializer = (e) => {
     currentText: S,
     otherText: b
   } = e, { insert: y, setVisible: v } = useSchemaInitializer(), I = useCompile(), { getTemplateSchemaByMode: A } = useSchemaTemplateManager(), k = useCallback(
-    (j) => L(void 0, null, function* () {
-      const { item: R, fromOthersInPopup: B } = j;
+    (M) => L(void 0, null, function* () {
+      const { item: R, fromOthersInPopup: B } = M;
       if (x)
-        return x(j);
+        return x(M);
       if (R.template) {
         const V = yield A(R);
         y(t ? t(V, { item: R, fromOthersInPopup: B }) : V);
@@ -14049,8 +14049,8 @@ const DataBlockInitializer = (e) => {
     currentText: S,
     otherText: b
   }), D = useGetSchemaInitializerMenuItems(k), $ = useMemo(() => D(T, i), [D, T, i]), [O, z] = useState([]), N = useMenuSearch({ data: $, openKeys: O, hideSearch: u }), w = useMemo(() => {
-    let j = N.filter((R) => R.key !== "search" && R.key !== "empty");
-    return p && j.length === 1 ? j = j[0].children : j = N, [
+    let M = N.filter((R) => R.key !== "search" && R.key !== "empty");
+    return p && M.length === 1 ? M = M[0].children : M = N, [
       {
         key: i,
         label: I(a),
@@ -14058,15 +14058,15 @@ const DataBlockInitializer = (e) => {
         onClick: (R) => {
           R.key === i && k(F(h({}, R), { item: e }));
         },
-        children: j
+        children: M
       }
     ];
   }, [N, p, i, I, a, r, k, e]);
-  return $.length > 1 || $.length === 1 && ((M = $[0].children) == null ? void 0 : M.length) > 0 ? /* @__PURE__ */ jsx(
+  return $.length > 1 || $.length === 1 && ((j = $[0].children) == null ? void 0 : j.length) > 0 ? /* @__PURE__ */ jsx(
     SchemaInitializerMenu,
     {
-      onOpenChange: (j) => {
-        z(j);
+      onOpenChange: (M) => {
+        z(M);
       },
       items: w
     }
@@ -15056,8 +15056,8 @@ function useServiceOptions$1(e) {
   var C, S, b, y;
   const { action: t = "list", service: o, useOriginalFilter: n } = e, r = useFieldSchema(), i = useField(), { getField: a } = useCollection_deprecated(), { getCollectionJoinField: l } = useCollectionManager_deprecated(), c = useRecord(), { parseFilter: u, findVariable: d } = useParseDataScopeFilter(), [p, m] = useState(null);
   useEffect(() => {
-    var T, D, $, O, z, N, w, M, j;
-    const v = isString(($ = (D = (T = r == null ? void 0 : r["x-component-props"]) == null ? void 0 : T.service) == null ? void 0 : D.params) == null ? void 0 : $.filter) ? (N = (z = (O = i.componentProps) == null ? void 0 : O.service) == null ? void 0 : z.params) == null ? void 0 : N.filter : (j = (M = (w = r == null ? void 0 : r["x-component-props"]) == null ? void 0 : w.service) == null ? void 0 : M.params) == null ? void 0 : j.filter, I = () => L(this, null, function* () {
+    var T, D, $, O, z, N, w, j, M;
+    const v = isString(($ = (D = (T = r == null ? void 0 : r["x-component-props"]) == null ? void 0 : T.service) == null ? void 0 : D.params) == null ? void 0 : $.filter) ? (N = (z = (O = i.componentProps) == null ? void 0 : O.service) == null ? void 0 : z.params) == null ? void 0 : N.filter : (M = (j = (w = r == null ? void 0 : r["x-component-props"]) == null ? void 0 : w.service) == null ? void 0 : j.params) == null ? void 0 : M.filter, I = () => L(this, null, function* () {
       var B;
       const R = yield u(mergeFilter([v || ((B = o == null ? void 0 : o.params) == null ? void 0 : B.filter)]));
       m(R);
@@ -17070,8 +17070,8 @@ function formatVariableScop(e) {
   }));
 }
 const SchemaSettingsDefaultValue = function e(t) {
-  var j, R, B, V;
-  const o = useFieldSchema(), n = (j = t == null ? void 0 : t.fieldSchema) != null ? j : o, r = useField(), { dn: i } = useDesignable(), { t: a } = useTranslation(), l = useActionContext();
+  var M, R, B, V;
+  const o = useFieldSchema(), n = (M = t == null ? void 0 : t.fieldSchema) != null ? M : 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(), g = useVariables$1(), f = useLocalVariables(), x = useCollection_deprecated(), C = useRecord(), { form: S } = useFormBlockContext(), { getFields: b } = useCollectionFilterOptionsV2(x), { isInSubForm: y, isInSubTable: v } = useFlag() || {}, { name: I } = x, A = useMemo(
     () => u(n.name) || d(n["x-collection-field"]),
@@ -17153,7 +17153,7 @@ const SchemaSettingsDefaultValue = function e(t) {
     $.collection,
     c,
     g
-  ]), M = useCallback(
+  ]), j = useCallback(
     (E) => {
       var G;
       const q = {
@@ -17173,7 +17173,7 @@ const SchemaSettingsDefaultValue = function e(t) {
       components: N,
       width: 800,
       schema: w,
-      onSubmit: M
+      onSubmit: j
     }
   );
 }, fieldComponentSettingsItem = {
@@ -17724,13 +17724,13 @@ const InternalTableBlockProvider = (e) => {
           const D = v.find((q) => q.uid === T.uid);
           if (!D)
             return;
-          const $ = (R = T.foreignKeyFields) == null ? void 0 : R.some((q) => q.name === D.field), O = getSourceKey(k, D.field), z = $ ? O : o.rowKey, N = [S[z]], w = ((B = T.service.params) == null ? void 0 : B[0]) || {}, M = ((E = (V = T.service.params) == null ? void 0 : V[1]) == null ? void 0 : E.filters) || {};
+          const $ = (R = T.foreignKeyFields) == null ? void 0 : R.some((q) => q.name === D.field), O = getSourceKey(k, D.field), z = $ ? O : o.rowKey, N = [S[z]], w = ((B = T.service.params) == null ? void 0 : B[0]) || {}, j = ((E = (V = T.service.params) == null ? void 0 : V[1]) == null ? void 0 : E.filters) || {};
           if (y.includes(S[o.rowKey])) {
             if (T.dataLoadingMode === "manual")
               return T.clearData();
-            delete M[I];
+            delete j[I];
           } else
-            M[I] = {
+            j[I] = {
               $and: [
                 {
                   [D.field || o.rowKey]: {
@@ -17739,16 +17739,16 @@ const InternalTableBlockProvider = (e) => {
                 }
               ]
             };
-          const j = mergeFilter([
-            ...Object.values(M).map((q) => removeNullCondition(q)),
+          const M = mergeFilter([
+            ...Object.values(j).map((q) => removeNullCondition(q)),
             T.defaultFilter
           ]);
           return T.doFilter(
             F(h({}, w), {
               page: 1,
-              filter: j
+              filter: M
             }),
-            { filters: M }
+            { filters: j }
           );
         }), b((T) => T != null && T.includes(S[o.rowKey]) ? [] : [S[o.rowKey]]);
       },
@@ -18072,10 +18072,10 @@ const useTableSelectorParams = () => useContext(TableSelectorParamsContext), Tab
   var a, l, c, u, d, p, m, g, f, x, C, S, b, y, v, I;
   const e = useField(), t = useTableSelectorContext(), o = useFieldSchema(), { getCollectionJoinField: n } = useCollectionManager_deprecated(), r = recursiveParent(o, "CollectionField"), i = n(r == null ? void 0 : r["x-collection-field"]);
   return useEffect(() => {
-    var k, T, D, $, O, z, N, w, M, j, R, B, V, E, q;
+    var k, T, D, $, O, z, N, w, j, M, R, B, V, E, q;
     if (!((k = t == null ? void 0 : t.service) != null && k.loading)) {
       const G = (D = (T = t == null ? void 0 : t.service) == null ? void 0 : T.data) == null ? void 0 : D.data.map((U) => _.omit(U, i == null ? void 0 : i.foreignKey));
-      e.value = G, ($ = e == null ? void 0 : e.setInitialValue) == null || $.call(e, G), e.data = e.data || {}, e.data.selectedRowKeys = (z = (O = t == null ? void 0 : t.field) == null ? void 0 : O.data) == null ? void 0 : z.selectedRowKeys, e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (M = (w = (N = t == null ? void 0 : t.service) == null ? void 0 : N.data) == null ? void 0 : w.meta) == null ? void 0 : M.pageSize, e.componentProps.pagination.total = (B = (R = (j = t == null ? void 0 : t.service) == null ? void 0 : j.data) == null ? void 0 : R.meta) == null ? void 0 : B.count, e.componentProps.pagination.current = (q = (E = (V = t == null ? void 0 : t.service) == null ? void 0 : V.data) == null ? void 0 : E.meta) == null ? void 0 : q.page;
+      e.value = G, ($ = e == null ? void 0 : e.setInitialValue) == null || $.call(e, G), e.data = e.data || {}, e.data.selectedRowKeys = (z = (O = t == null ? void 0 : t.field) == null ? void 0 : O.data) == null ? void 0 : z.selectedRowKeys, e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (j = (w = (N = t == null ? void 0 : t.service) == null ? void 0 : N.data) == null ? void 0 : w.meta) == null ? void 0 : j.pageSize, e.componentProps.pagination.total = (B = (R = (M = t == null ? void 0 : t.service) == null ? void 0 : M.data) == null ? void 0 : R.meta) == null ? void 0 : B.count, e.componentProps.pagination.current = (q = (E = (V = t == null ? void 0 : t.service) == null ? void 0 : V.data) == null ? void 0 : E.meta) == null ? void 0 : q.page;
     }
   }, [
     i == null ? void 0 : i.foreignKey,
@@ -19654,38 +19654,38 @@ const ActionLink = withDynamicSchemaProps(
       "addChild",
       "onMouseEnter",
       "refreshDataBlockRequest"
-    ]), y = useACLActionParamsContext(), { wrapSSR: v, componentCls: I, hashId: A } = useStyles$f(), { t: k } = useTranslation(), { visibleWithURL: T, setVisibleWithURL: D } = usePopupUtils(), [$, O] = useState(!1), [z, N] = useState(!1), { setSubmitted: w } = useActionContext(), M = useDesigner(), j = useField(), { run: R, element: B, disabled: V } = _.isFunction(i) ? i(f) : {}, E = useFieldSchema(), q = useCompile(), G = useForm(), U = useCollectionRecordData(), K = useCollectionParentRecordData(), Y = E["x-toolbar-props"] || E["x-designer-props"], H = (me = E == null ? void 0 : E["x-component-props"]) == null ? void 0 : me.openMode, X = (le = E == null ? void 0 : E["x-component-props"]) == null ? void 0 : le.openSize, Q = (ge = E == null ? void 0 : E["x-component-props"]) == null ? void 0 : ge.refreshDataBlockRequest, J = G.disabled || j.disabled || ((he = j.data) == null ? void 0 : he.disabled) || g || V, te = useMemo(() => (E == null ? void 0 : E["x-linkage-rules"]) || [], [E == null ? void 0 : E["x-linkage-rules"]]), { designable: ne } = useDesignable(), oe = useComponent(r) || r, { modal: se } = App.useApp(), ie = useVariables$1(), Se = useLocalVariables({ currentForm: { values: U, readPretty: !1 } }), { getAriaLabel: Ie } = useGetAriaLabelOfAction(c), Ae = useDataBlockRequest(), ke = useMemo(() => {
+    ]), y = useACLActionParamsContext(), { wrapSSR: v, componentCls: I, hashId: A } = useStyles$f(), { t: k } = useTranslation(), { visibleWithURL: T, setVisibleWithURL: D } = usePopupUtils(), [$, O] = useState(!1), [z, N] = useState(!1), { setSubmitted: w } = useActionContext(), j = useDesigner(), M = useField(), { run: R, element: B, disabled: V } = _.isFunction(i) ? i(f) : {}, E = useFieldSchema(), q = useCompile(), G = useForm(), U = useCollectionRecordData(), K = useCollectionParentRecordData(), Y = E["x-toolbar-props"] || E["x-designer-props"], H = (me = E == null ? void 0 : E["x-component-props"]) == null ? void 0 : me.openMode, X = (le = E == null ? void 0 : E["x-component-props"]) == null ? void 0 : le.openSize, Q = (ge = E == null ? void 0 : E["x-component-props"]) == null ? void 0 : ge.refreshDataBlockRequest, J = G.disabled || M.disabled || ((he = M.data) == null ? void 0 : he.disabled) || g || V, te = useMemo(() => (E == null ? void 0 : E["x-linkage-rules"]) || [], [E == null ? void 0 : E["x-linkage-rules"]]), { designable: ne } = useDesignable(), oe = useComponent(r) || r, { modal: se } = App.useApp(), ie = useVariables$1(), Se = useLocalVariables({ currentForm: { values: U, readPretty: !1 } }), { getAriaLabel: Ie } = useGetAriaLabelOfAction(c), Ae = useDataBlockRequest(), ke = useMemo(() => {
       const Z = c || q(E.title);
       return _.isString(Z) ? k(Z) : Z;
     }, [c, E.title, k]);
     useEffect(() => {
-      j.stateOfLinkageRules && setInitialActionState(j), j.stateOfLinkageRules = {}, te.filter((Z) => !Z.disabled).forEach((Z) => {
+      M.stateOfLinkageRules && setInitialActionState(M), M.stateOfLinkageRules = {}, te.filter((Z) => !Z.disabled).forEach((Z) => {
         var re;
         (re = Z.actions) == null || re.forEach((ae) => {
           linkageAction({
             operator: ae.operator,
-            field: j,
+            field: M,
             condition: Z.condition,
             variables: ie,
             localVariables: Se
           });
         });
       });
-    }, [j, te, Se, ie]);
+    }, [M, te, Se, ie]);
     const be = useMemo(() => {
       var Z;
       return F(h({}, d), {
-        opacity: ne && (((Z = j == null ? void 0 : j.data) == null ? void 0 : Z.hidden) || !y) && 0.1,
+        opacity: ne && (((Z = M == null ? void 0 : M.data) == null ? void 0 : Z.hidden) || !y) && 0.1,
         color: J ? "rgba(0, 0, 0, 0.25)" : d == null ? void 0 : d.color
       });
-    }, [y, ne, (ee = j == null ? void 0 : j.data) == null ? void 0 : ee.hidden, d, J]), Te = useCallback(
+    }, [y, ne, (ee = M == null ? void 0 : M.data) == null ? void 0 : ee.hidden, d, J]), Te = useCallback(
       (Z) => {
         C == null || C(Z);
       },
       [C]
     ), ue = {
       designable: ne,
-      field: j,
+      field: M,
       aclCtx: y,
       actionTitle: ke,
       icon: l,
@@ -19701,7 +19701,7 @@ const ActionLink = withDynamicSchemaProps(
       others: b,
       getAriaLabel: Ie,
       type: e.type,
-      Designer: M,
+      Designer: j,
       openMode: H,
       onClick: u,
       refreshDataBlockRequest: Q,
@@ -19727,7 +19727,7 @@ const ActionLink = withDynamicSchemaProps(
         fieldSchema: E,
         setSubmitted: w,
         children: [
-          t && /* @__PURE__ */ jsx(RecursionField, { basePath: j.address, onlyRenderProperties: !0, schema: E }),
+          t && /* @__PURE__ */ jsx(RecursionField, { basePath: M.address, onlyRenderProperties: !0, schema: E }),
           !t && /* @__PURE__ */ jsx(RenderButton, h({}, ue)),
           /* @__PURE__ */ jsx(VariablePopupRecordProvider, { children: !t && e.children }),
           B
@@ -19814,7 +19814,7 @@ function RenderButton({
   confirm: D,
   modal: $
 }) {
-  var M, j;
+  var j, M;
   const { t: O } = useTranslation(), { isPopupVisibleControlledByURL: z } = usePopupSettings(), { openPopup: N } = usePopupUtils(), w = useCallback(
     (R, B = !0) => {
       if (!(B && isPortalInBody(R.target)) && (R.preventDefault(), R.stopPropagation(), !a && o)) {
@@ -19847,14 +19847,14 @@ function RenderButton({
       O
     ]
   );
-  return !e && ((M = t == null ? void 0 : t.data) != null && M.hidden || !o) ? null : /* @__PURE__ */ jsxs(
+  return !e && ((j = t == null ? void 0 : t.data) != null && j.hidden || !o) ? null : /* @__PURE__ */ jsxs(
     SortableItem,
     F(h({
       role: "button",
       "aria-label": x()
     }, f), {
       onMouseEnter: c,
-      loading: ((j = t == null ? void 0 : t.data) == null ? void 0 : j.loading) || i,
+      loading: ((M = t == null ? void 0 : t.data) == null ? void 0 : M.loading) || i,
       icon: typeof r == "string" ? /* @__PURE__ */ jsx(Icon, { type: r }) : r,
       disabled: a,
       style: l,
@@ -22055,7 +22055,7 @@ const SchemaSettingsProvider = (e) => {
   }, [k]), D = useCallback(() => L(void 0, null, function* () {
     yield k.submit();
     try {
-      const N = k.values, w = Object.keys(N).reduce((M, j) => (k.query(j).take() && (M[j] = N[j]), M), {});
+      const N = k.values, w = Object.keys(N).reduce((j, M) => (k.query(M).take() && (j[M] = N[M]), j), {});
       yield o == null ? void 0 : o(cloneDeep$1(w)), g(!1);
     } catch (N) {
       console.error(N);
@@ -22102,7 +22102,7 @@ const SchemaSettingsProvider = (e) => {
 });
 SchemaSettingsActionModalItem.displayName = "SchemaSettingsActionModalItem";
 const SchemaSettingsModalItem = (e) => {
-  const j = e, {
+  const M = e, {
     hidden: t,
     title: o,
     components: n,
@@ -22113,7 +22113,7 @@ const SchemaSettingsModalItem = (e) => {
     initialValues: c,
     width: u = "fit-content",
     noRecord: d = !1
-  } = j, p = W(j, [
+  } = M, p = W(M, [
     "hidden",
     "title",
     "components",
@@ -22124,7 +22124,7 @@ const SchemaSettingsModalItem = (e) => {
     "initialValues",
     "width",
     "noRecord"
-  ]), m = useContext(SchemaOptionsContext), g = useCollection_deprecated(), f = useAPIClient(), x = useApp(), { theme: C } = useGlobalTheme(), S = useBlockRequestContext(), b = useFormActiveFields(), { locale: y } = useContext(ConfigProvider.ConfigContext), v = useDataSourceManager(), I = useDataSourceKey(), A = useCollectionRecord(), { association: k } = useDataBlockProps() || {}, T = useFormBlockContext(), D = useBlockContext(), { getOperators: $ } = useOperators(), O = useLocationSearch(), { formValue: z, collection: N } = useSubFormValue(), w = useCurrentPopupRecord(), M = useParentPopupRecord();
+  ]), m = useContext(SchemaOptionsContext), g = useCollection_deprecated(), f = useAPIClient(), x = useApp(), { theme: C } = useGlobalTheme(), S = useBlockRequestContext(), b = useFormActiveFields(), { locale: y } = useContext(ConfigProvider.ConfigContext), v = useDataSourceManager(), I = useDataSourceKey(), A = useCollectionRecord(), { association: k } = useDataBlockProps() || {}, T = useFormBlockContext(), D = useBlockContext(), { getOperators: $ } = useOperators(), O = useLocationSearch(), { formValue: z, collection: N } = useSubFormValue(), w = useCurrentPopupRecord(), j = useParentPopupRecord();
   return t ? null : /* @__PURE__ */ jsx(
     SchemaSettingsItem,
     F(h({
@@ -22140,8 +22140,8 @@ const SchemaSettingsModalItem = (e) => {
               recordData: w == null ? void 0 : w.value,
               collection: w == null ? void 0 : w.collection,
               parent: {
-                recordData: M == null ? void 0 : M.value,
-                collection: M == null ? void 0 : M.collection
+                recordData: j == null ? void 0 : j.value,
+                collection: j == null ? void 0 : j.collection
               },
               children: /* @__PURE__ */ jsx(CollectionRecordProvider, { record: d ? null : A, children: /* @__PURE__ */ jsx(FormBlockContext$1.Provider, { value: T, children: /* @__PURE__ */ jsx(SubFormProvider, { value: { value: z, collection: N }, children: /* @__PURE__ */ jsx(
                 FormActiveFieldsProvider,
@@ -22318,11 +22318,11 @@ const SchemaSettingsModalItem = (e) => {
     [o, r, i, x, d, p, l, u, v]
   ), k = useMemo(() => ({ ArrayCollapse: ArrayCollapse$2, FormLayout }), []), T = useCallback(
     ($) => {
-      var M;
+      var j;
       const O = [];
-      for (const j of $.fieldReaction.rules)
-        O.push(_.pickBy(j, _.identity));
-      const z = x["x-component"] === "BlockTemplate" && ((M = x["x-component-props"]) == null ? void 0 : M.templateId), w = {
+      for (const M of $.fieldReaction.rules)
+        O.push(_.pickBy(M, _.identity));
+      const z = x["x-component"] === "BlockTemplate" && ((j = x["x-component-props"]) == null ? void 0 : j.templateId), w = {
         "x-uid": z && c(z).uid || x["x-uid"]
       };
       x[y] = O, w[y] = O, a.emit("patch", {
@@ -23614,10 +23614,10 @@ const useGetFilterOptions = () => {
     };
   });
 }, TableColumnDesigner$1 = (e) => {
-  var O, z, N, w, M, j, R, B, V, E, q, G;
+  var O, z, N, w, j, M, R, B, V, E, q, G;
   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 = ((O = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : O.fieldNames) || ((z = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : z.fieldNames), m = useLabelFields$1((N = n == null ? void 0 : n.target) != null ? N : n == null ? void 0 : n.targetCollection), g = useColorFields((w = n == null ? void 0 : n.target) != null ? w : n == null ? void 0 : n.targetCollection), f = i(n == null ? void 0 : n.interface), x = a(n == null ? void 0 : n.target), C = isFileCollection$1(x), 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 = ((M = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : M.mode) || "Select";
+  ), A = useFieldModeOptions({ fieldSchema: o }), k = ((j = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : j.mode) || "Select";
   let T = "editable";
   o["x-disabled"] === !0 && (T = "readonly"), o["x-read-pretty"] === !0 && (T = "read-pretty");
   const D = I && k === "Select", $ = () => {
@@ -23636,7 +23636,7 @@ const useGetFilterOptions = () => {
             title: {
               title: c("Column title"),
               default: u == null ? void 0 : u.title,
-              description: `${c("Original field title: ")}${((j = n == null ? void 0 : n.uiSchema) == null ? void 0 : j.title) || (o == null ? void 0 : o.title)}`,
+              description: `${c("Original field title: ")}${((M = n == null ? void 0 : n.uiSchema) == null ? void 0 : M.title) || (o == null ? void 0 : o.title)}`,
               "x-decorator": "FormItem",
               "x-component": "Input",
               "x-component-props": {}
@@ -24925,7 +24925,7 @@ const useCreateActionProps = () => {
           overwriteValues: $,
           skipValidator: O,
           triggerWorkflows: z
-        } = (R = l == null ? void 0 : l["x-action-settings"]) != null ? R : {}, N = (B = i == null ? void 0 : i["x-component-props"]) == null ? void 0 : B.addChild, w = {}, M = Object.keys(T).map((U) => L(this, null, function* () {
+        } = (R = l == null ? void 0 : l["x-action-settings"]) != null ? R : {}, N = (B = i == null ? void 0 : i["x-component-props"]) == null ? void 0 : B.addChild, w = {}, j = Object.keys(T).map((U) => L(this, null, function* () {
           const K = T[U], Y = d(U);
           if (isVariable(K)) {
             const { value: H } = (yield C == null ? void 0 : C.parseVariable(K, S)) || {};
@@ -24933,8 +24933,8 @@ const useCreateActionProps = () => {
           } else
             K != null && K !== "" && (w[U] = K);
         }));
-        yield Promise.all(M), O || (yield e.submit());
-        const j = getFormValues({
+        yield Promise.all(j), O || (yield e.submit());
+        const M = getFormValues({
           filterByTk: f,
           field: t,
           form: e,
@@ -24945,12 +24945,12 @@ const useCreateActionProps = () => {
         });
         if (N) {
           const U = p();
-          j[(V = U == null ? void 0 : U.name) != null ? V : "parent"] = x, j[(E = U == null ? void 0 : U.foreignKey) != null ? E : "parentId"] = x.id;
+          M[(V = U == null ? void 0 : U.name) != null ? V : "parent"] = x, M[(E = U == null ? void 0 : U.foreignKey) != null ? E : "parentId"] = x.id;
         }
         c.data = t.data || {}, c.data.loading = !0;
         try {
           const U = yield o[y]({
-            values: h(h(h({}, j), $), w),
+            values: h(h(h({}, M), $), w),
             filterKeys: v,
             // TODO(refactor): should change to inject by plugin
             triggerWorkflows: z != null && z.length ? z.map((K) => [K.workflowKey, K.context].filter(Boolean).join("!")).join(",") : void 0
@@ -25104,20 +25104,20 @@ const useCreateActionProps = () => {
         } = (z = i == null ? void 0 : i["x-action-settings"]) != null ? z : {};
         m.data = e.data || {}, m.data.loading = !0;
         const $ = {}, O = Object.keys(k).map((w) => L(this, null, function* () {
-          const M = k[w], j = C(w);
-          if (isVariable(M)) {
-            const { value: R } = (yield f == null ? void 0 : f.parseVariable(M, S)) || {};
-            R && ($[w] = transformVariableValue(R, { targetCollectionField: j }));
+          const j = k[w], M = C(w);
+          if (isVariable(j)) {
+            const { value: R } = (yield f == null ? void 0 : f.parseVariable(j, S)) || {};
+            R && ($[w] = transformVariableValue(R, { targetCollectionField: M }));
           } else
-            M != null && M !== "" && ($[w] = M);
+            j != null && j !== "" && ($[w] = j);
         }));
         yield Promise.all(O), g.confirm({
           title: p("Bulk update"),
           content: p(D === "selected" ? "Update selected data?" : "Update all data?"),
           onOk() {
             return L(this, null, function* () {
-              var j, R, B, V;
-              const { filter: w } = (R = (j = n.params) == null ? void 0 : j[0]) != null ? R : {}, M = {
+              var M, R, B, V;
+              const { filter: w } = (R = (M = n.params) == null ? void 0 : M[0]) != null ? R : {}, j = {
                 values: h({}, $),
                 filter: w,
                 forceUpdate: !1
@@ -25127,11 +25127,11 @@ const useCreateActionProps = () => {
                   message.error(p("Please select the records to be updated")), m.data.loading = !1;
                   return;
                 }
-                M.filter = { $and: [{ [l || "id"]: { $in: c } }] };
+                j.filter = { $and: [{ [l || "id"]: { $in: c } }] };
               }
-              M.filter || (M.forceUpdate = !0);
+              j.filter || (j.forceUpdate = !0);
               try {
-                yield t.update(M);
+                yield t.update(j);
               } catch (E) {
               } finally {
                 m.data.loading = !1;
@@ -25159,7 +25159,7 @@ const useCreateActionProps = () => {
   return {
     onClick() {
       return L(this, null, function* () {
-        var w, M, j, R;
+        var w, j, M, R;
         const { skipValidator: I, onSuccess: A, requestSettings: k } = (w = n == null ? void 0 : n["x-action-settings"]) != null ? w : {}, T = n == null ? void 0 : n["x-action"];
         if (!k.url)
           return;
@@ -25186,7 +25186,7 @@ const useCreateActionProps = () => {
         };
         x.data = c.data || {}, x.data.loading = !0;
         try {
-          if (yield e.request(h({}, N)), x.data.loading = !1, u instanceof TableFieldResource || (j = (M = d == null ? void 0 : d.service) == null ? void 0 : M.refresh) == null || j.call(M), (R = p == null ? void 0 : p.refresh) == null || R.call(p), T === "customize:form:request" && (C == null || C(!1)), !(A != null && A.successMessage))
+          if (yield e.request(h({}, N)), x.data.loading = !1, u instanceof TableFieldResource || (M = (j = d == null ? void 0 : d.service) == null ? void 0 : j.refresh) == null || M.call(j), (R = p == null ? void 0 : p.refresh) == null || R.call(p), T === "customize:form:request" && (C == null || C(!1)), !(A != null && A.successMessage))
             return;
           A != null && A.manualClose ? S.success({
             title: r(A == null ? void 0 : A.successMessage),
@@ -25205,23 +25205,23 @@ const useCreateActionProps = () => {
   return {
     onClick() {
       return L(this, null, function* () {
-        var M;
+        var j;
         const {
           assignedValues: A = {},
           onSuccess: k,
           overwriteValues: T,
           skipValidator: D,
           triggerWorkflows: $
-        } = (M = c == null ? void 0 : c["x-action-settings"]) != null ? M : {}, O = {}, z = Object.keys(A).map((j) => L(this, null, function* () {
-          const R = A[j], B = p(j);
+        } = (j = c == null ? void 0 : c["x-action-settings"]) != null ? j : {}, O = {}, z = Object.keys(A).map((M) => L(this, null, function* () {
+          const R = A[M], B = p(M);
           if (isVariable(R)) {
             const { value: V } = (yield b == null ? void 0 : b.parseVariable(R, y)) || {};
-            V && (O[j] = transformVariableValue(V, { targetCollectionField: B }));
+            V && (O[M] = transformVariableValue(V, { targetCollectionField: B }));
           } else
-            R != null && R !== "" && (O[j] = R);
+            R != null && R !== "" && (O[M] = R);
         }));
         yield Promise.all(z), D || (yield e.submit());
-        const N = d.map((j) => j.name), w = getFormValues({
+        const N = d.map((M) => M.name), w = getFormValues({
           filterByTk: t,
           field: o,
           form: e,
@@ -25238,7 +25238,7 @@ const useCreateActionProps = () => {
           }, S), {
             updateAssociationValues: x,
             // TODO(refactor): should change to inject by plugin
-            triggerWorkflows: $ != null && $.length ? $.map((j) => [j.workflowKey, j.context].filter(Boolean).join("!")).join(",") : void 0
+            triggerWorkflows: $ != null && $.length ? $.map((M) => [M.workflowKey, M.context].filter(Boolean).join("!")).join(",") : void 0
           })), f.data.loading = !1, i == null || i(!1), a == null || a(!0), l == null || l(!1), !(k != null && k.successMessage))
             return;
           k != null && k.manualClose ? C.success({
@@ -25247,7 +25247,7 @@ const useCreateActionProps = () => {
               yield e.reset(), k != null && k.redirecting && (k != null && k.redirectTo) && (isURL(k.redirectTo) ? window.location.href = k.redirectTo : u(k.redirectTo));
             })
           }) : (message.success(g(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)));
-        } catch (j) {
+        } catch (M) {
           f.data.loading = !1;
         }
       });
@@ -25480,7 +25480,7 @@ const useCreateActionProps = () => {
         u = z;
         return;
       }
-      u = z.filter((M) => M.label.includes(w));
+      u = z.filter((j) => j.label.includes(w));
     };
   } else
     C = `${r}.${f}.$in`, u = (g == null ? void 0 : g.data) || [], d = ($) => {
@@ -25499,19 +25499,19 @@ const useCreateActionProps = () => {
         var V, E, q;
         if (!O.find((G) => G.uid === N.uid))
           return;
-        const M = `${z}${t.name}`, j = ((V = N.service.params) == null ? void 0 : V[0]) || {}, R = ((q = (E = N.service.params) == null ? void 0 : E[1]) == null ? void 0 : q.filters) || {};
+        const j = `${z}${t.name}`, M = ((V = N.service.params) == null ? void 0 : V[0]) || {}, R = ((q = (E = N.service.params) == null ? void 0 : E[1]) == null ? void 0 : q.filters) || {};
         if ($.length)
-          R[M] = {
+          R[j] = {
             [C]: $
           };
         else {
           if (N.dataLoadingMode === "manual")
             return N.clearData();
-          delete R[M];
+          delete R[j];
         }
         const B = mergeFilter([...Object.values(R), N.defaultFilter]);
         return N.doFilter(
-          F(h({}, j), {
+          F(h({}, M), {
             page: 1,
             filter: B
           }),
@@ -25758,7 +25758,7 @@ const useSyncFromForm = (e, t, o) => {
         isLeaf: !0,
         field: $,
         disabled: I
-      }), N = A.find((M) => M.name === z.key);
+      }), N = A.find((j) => j.name === z.key);
       if (["belongsTo", "belongsToMany"].includes($.type) && (!N || ["Select", "Picker"].includes(N == null ? void 0 : N.fieldMode)))
         O.type = "reference", z.type = "reference", z.title = React.createElement(TreeNode, F(h({}, O), { type: "reference" })), z.isLeaf = !1, z.children = m($.target, {
           depth: b + 1,
@@ -25767,15 +25767,15 @@ const useSyncFromForm = (e, t, o) => {
           exclude: systemKeys
         });
       else if (["hasOne", "hasMany"].includes($.type) || ["Nester", "SubTable"].includes(N == null ? void 0 : N.fieldMode)) {
-        let M = !1;
-        ["hasOne", "hasMany"].includes($.type) && ["Select", "Picker"].includes(N == null ? void 0 : N.fieldMode) && (M = !0), z.disabled = !0, z.isLeaf = !1, z.children = p(
+        let j = !1;
+        ["hasOne", "hasMany"].includes($.type) && ["Select", "Picker"].includes(N == null ? void 0 : N.fieldMode) && (j = !0), z.disabled = !0, z.isLeaf = !1, z.children = p(
           $.target,
           {
             depth: b + 1,
             maxDepth: y,
             prefix: z.key,
             exclude: ["id", ...systemKeys],
-            disabled: M
+            disabled: j
           },
           A
         );
@@ -25829,10 +25829,10 @@ const useSyncFromForm = (e, t, o) => {
         const x = /* @__PURE__ */ new Set([]), C = /* @__PURE__ */ new Set([]), S = (v, I) => {
           var A;
           (A = v == null ? void 0 : v.reduceProperties) == null || A.call(v, (k, T) => {
-            var M, j, R;
+            var j, M, R;
             const D = k || I, $ = T["x-collection-field"] && n(T["x-collection-field"]), O = T.name.includes("."), z = $ && ["hasOne", "hasMany", "belongsTo", "belongsToMany"].includes($.type), N = !z && O ? getAssociationPath(T.name) : T.name, w = D === "" || !D ? N : D + "." + N;
-            if ($ && !(["hasOne", "hasMany"].includes($.type) || ["SubForm", "Nester"].includes((M = T["x-component-props"]) == null ? void 0 : M.mode)) && C.add(w), $ && (z || O) && T["x-component"] !== "TableField") {
-              if (x.add({ name: w, fieldMode: ((j = T["x-component-props"]) == null ? void 0 : j.mode) || "Select" }), ["Nester", "SubTable"].includes((R = T["x-component-props"]) == null ? void 0 : R.mode)) {
+            if ($ && !(["hasOne", "hasMany"].includes($.type) || ["SubForm", "Nester"].includes((j = T["x-component-props"]) == null ? void 0 : j.mode)) && C.add(w), $ && (z || O) && T["x-component"] !== "TableField") {
+              if (x.add({ name: w, fieldMode: ((M = T["x-component-props"]) == null ? void 0 : M.mode) || "Select" }), ["Nester", "SubTable"].includes((R = T["x-component-props"]) == null ? void 0 : R.mode)) {
                 const B = D && D !== "" ? D + "." + T.name : T.name;
                 S(T, B);
               }
@@ -26671,7 +26671,7 @@ function Input$1(e) {
     label: S("Constant"),
     [N.value]: "$",
     [N.label]: S("Constant")
-  } : i ? getTypedConstantOption(O, i, N) : null, [O, i]), M = w && !n ? w.component : NullComponent, j = Array.isArray(i) ? (G = (q = i.find((U) => Array.isArray(U) && U[0] === O)) == null ? void 0 : q[1]) != null ? G : {} : {};
+  } : i ? getTypedConstantOption(O, i, N) : null, [O, i]), j = w && !n ? w.component : NullComponent, M = Array.isArray(i) ? (G = (q = i.find((U) => Array.isArray(U) && U[0] === O)) == null ? void 0 : q[1]) != null ? G : {} : {};
   let R;
   t == null ? n && k ? R = ["$"] : R = [""] : R = n ? ["$"] : [" ", O], useEffect(() => {
     const H = w != null ? w : {}, { component: U } = H, K = W(H, ["component"]), Y = [
@@ -26802,12 +26802,12 @@ function Input$1(e) {
             )
           ]
         }
-      ) : /* @__PURE__ */ jsx("div", { style: { flex: 1 }, children: n && k ? n : M ? /* @__PURE__ */ jsx(
-        M,
+      ) : /* @__PURE__ */ jsx("div", { style: { flex: 1 }, children: n && k ? n : j ? /* @__PURE__ */ jsx(
+        j,
         F(h({
           role: "button",
           "aria-label": "variable-constant"
-        }, j), {
+        }, M), {
           value: t,
           onChange: o
         })
@@ -27080,68 +27080,68 @@ 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([]), g = useForm(), f = useMemo(() => createOptionsValueLabelMap(p), [p]), [x, C] = useState(!1), [S, b] = useState(!1), [y, v] = useState(() => renderHTML(r != null ? r : "", f)), [I, A] = useState([-1, 0, -1, 0]);
   useAntdInputStyle("ant-input"), useEffect(() => {
-    preloadOptions(i, r).then((M) => {
-      m(M);
+    preloadOptions(i, r).then((j) => {
+      m(j);
     }).catch(console.error);
   }, [i, r]), useEffect(() => {
     v(renderHTML(r != null ? r : "", f)), S || A([-1, 0, -1, 0]);
   }, [r, f]), useEffect(() => {
     var R;
-    const { current: M } = d;
-    if (!M)
+    const { current: j } = d;
+    if (!j)
       return;
-    const j = new Range();
+    const M = new Range();
     if (S) {
       if (I.join() === "-1,0,-1,0")
         return;
       const B = (R = window.getSelection) == null ? void 0 : R.call(window);
       if (B)
         try {
-          const V = Array.from(M.childNodes);
-          V.length && (I[0] === -1 ? I[1] && j.setStartAfter(V[I[1] - 1]) : j.setStart(V[I[0]], I[1]), I[2] === -1 ? I[3] && j.setEndAfter(V[I[3] - 1]) : j.setEnd(V[I[2]], I[3])), j.collapse(!0), B.removeAllRanges(), B.addRange(j);
+          const V = Array.from(j.childNodes);
+          V.length && (I[0] === -1 ? I[1] && M.setStartAfter(V[I[1] - 1]) : M.setStart(V[I[0]], I[1]), I[2] === -1 ? I[3] && M.setEndAfter(V[I[3] - 1]) : M.setEnd(V[I[2]], I[3])), M.collapse(!0), B.removeAllRanges(), B.addRange(M);
         } catch (V) {
         }
     } else {
-      const { lastChild: B } = M;
+      const { lastChild: B } = j;
       if (B) {
-        j.setStartAfter(B), j.setEndAfter(B);
-        const V = Array.from(M.childNodes), E = j.startContainer === M ? -1 : V.indexOf(B), q = j.startContainer === M ? -1 : V.indexOf(B);
-        A([E, j.startOffset, q, j.endOffset]);
+        M.setStartAfter(B), M.setEndAfter(B);
+        const V = Array.from(j.childNodes), E = M.startContainer === j ? -1 : V.indexOf(B), q = M.startContainer === j ? -1 : V.indexOf(B);
+        A([E, M.startOffset, q, M.endOffset]);
       }
     }
   }, [y]);
   const k = useCallback(
-    function(M) {
-      const j = M.filter((V) => !!V.trim()), { current: R } = d;
-      if (!R || !j)
+    function(j) {
+      const M = j.filter((V) => !!V.trim()), { current: R } = d;
+      if (!R || !M)
         return;
       R.focus();
-      const B = createVariableTagHTML(j.join("."), f);
+      const B = createVariableTagHTML(M.join("."), f);
       pasteHTML(R, B, {
         range: I
       }), b(!0), A(getCurrentRange(R)), a(getValue(R));
     },
     [f, a, I]
   ), T = useCallback(
-    function({ currentTarget: M }) {
-      x || (b(!0), A(getCurrentRange(M)), a(getValue(M)));
+    function({ currentTarget: j }) {
+      x || (b(!0), A(getCurrentRange(j)), a(getValue(j)));
     },
     [x, a]
-  ), D = useCallback(function({ currentTarget: M }) {
-    A(getCurrentRange(M));
-  }, []), $ = useCallback(function(M) {
-    M.key === "Enter" && M.preventDefault();
+  ), D = useCallback(function({ currentTarget: j }) {
+    A(getCurrentRange(j));
+  }, []), $ = useCallback(function(j) {
+    j.key === "Enter" && j.preventDefault();
   }, []), O = useCallback(function() {
     C(!0);
   }, []), z = useCallback(
-    ({ currentTarget: M }) => {
-      C(!1), b(!0), A(getCurrentRange(M)), a(getValue(M));
+    ({ currentTarget: j }) => {
+      C(!1), b(!0), A(getCurrentRange(j)), a(getValue(j));
     },
     [a]
   ), N = useCallback(
-    function(M) {
-      M.preventDefault();
-      const j = M.clipboardData.getData("text/html") || M.clipboardData.getData("text"), R = sanitizeHTML(j, {
+    function(j) {
+      j.preventDefault();
+      const M = j.clipboardData.getData("text/html") || j.clipboardData.getData("text"), R = sanitizeHTML(M, {
         allowedTags: ["span"],
         allowedAttributes: {
           span: ["data-variable", "contenteditable"]
@@ -27158,7 +27158,7 @@ function TextArea(e) {
           }
         }
       }).replace(/\n/g, " ");
-      b(!0), pasteHTML(M.currentTarget, R), A(getCurrentRange(M.currentTarget)), a(getValue(M.currentTarget));
+      b(!0), pasteHTML(j.currentTarget, R), A(getCurrentRange(j.currentTarget)), a(getValue(j.currentTarget));
     },
     [a]
   ), w = e.disabled || g.disabled;
@@ -31893,7 +31893,7 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
         }
       },
       [O == null ? void 0 : O.uiSchema, t]
-    ), { data: M, run: j, loading: R } = useRequest(
+    ), { data: j, run: M, loading: R } = useRequest(
       F(h({
         action: "list"
       }, o), {
@@ -31924,11 +31924,11 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
       }
     ) : null, [A.current]);
     useEffect(() => {
-      b.current && j();
+      b.current && M();
     }, [B]);
     const E = (H) => L(void 0, null, function* () {
       var X;
-      j({
+      M({
         filter: mergeFilter([
           H ? {
             [t.label]: {
@@ -31941,11 +31941,11 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
     }), q = useMemo(() => {
       var J;
       const H = r || i;
-      if (!((J = M == null ? void 0 : M.data) != null && J.length))
+      if (!((J = j == null ? void 0 : j.data) != null && J.length))
         return H != null ? Array.isArray(H) ? H : [H] : [];
-      const X = H != null && (Array.isArray(H) ? H : [F(h({}, H), { [t.value]: H[t.value] || H })]) || [], Q = typeof p == "function" ? M.data.filter(p) : M.data;
+      const X = H != null && (Array.isArray(H) ? H : [F(h({}, H), { [t.value]: H[t.value] || H })]) || [], Q = typeof p == "function" ? j.data.filter(p) : j.data;
       return uniqBy(Q.concat(X != null ? X : []), t.value);
-    }, [r, i, M == null ? void 0 : M.data, t.value, p]);
+    }, [r, i, j == null ? void 0 : j.data, t.value, p]);
     return /* @__PURE__ */ jsx(
       Select,
       F(h({
@@ -31957,20 +31957,20 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
         fieldNames: t,
         onSearch: E,
         onDropdownVisibleChange: (H) => {
-          S(H), A.current = null, H && j(), b.current = !0;
+          S(H), A.current = null, H && M(), b.current = !0;
         },
         objectValue: a,
         value: r,
         defaultValue: i
       }, g), {
-        loading: M ? R : !0,
+        loading: j ? R : !0,
         options: w(q),
         rawOptions: q,
         dropdownRender: (H) => {
           const X = q.some((Q) => Q[t.label] === A.current);
           return /* @__PURE__ */ jsx(Fragment, { children: v ? /* @__PURE__ */ jsxs(Fragment, { children: [
-            !((M == null ? void 0 : M.data.length) === 0 && (A != null && A.current)) && H,
-            (M == null ? void 0 : M.data.length) > 0 && (A == null ? void 0 : A.current) && !X && /* @__PURE__ */ jsx(Divider, { style: { margin: 0 } }),
+            !((j == null ? void 0 : j.data.length) === 0 && (A != null && A.current)) && H,
+            (j == null ? void 0 : j.data.length) > 0 && (A == null ? void 0 : A.current) && !X && /* @__PURE__ */ jsx(Divider, { style: { margin: 0 } }),
             !X && /* @__PURE__ */ jsx(V, {})
           ] }) : H });
         }
@@ -33018,13 +33018,13 @@ const useStyles$9 = genStyleHook("nb-page", (e) => {
     // 处理 searchParams 是为了兼容旧版的 tab 参数
     () => p || I.get("tab") || Object.keys(l.properties || {}).shift(),
     [l.properties, I, p]
-  ), [D, $] = useState(0), { wrapSSR: O, hashId: z, componentCls: N } = useStyles$9(), w = useStyles$a(), { token: M } = useToken(), j = b ? void 0 : l.title || r(i);
+  ), [D, $] = useState(0), { wrapSSR: O, hashId: z, componentCls: N } = useStyles$9(), w = useStyles$a(), { token: j } = useToken(), M = b ? void 0 : l.title || r(i);
   useRequest(
     {
       url: `/uiSchemas:getParentJsonSchema/${l["x-uid"]}`
     },
     {
-      ready: !b && !j,
+      ready: !b && !M,
       onSuccess(U) {
         a(U.data.title);
       }
@@ -33039,10 +33039,10 @@ const useStyles$9 = genStyleHook("nb-page", (e) => {
       animated: f,
       activeKey: T,
       tabBarStyle: {
-        paddingLeft: M.paddingLG - M.paddingPageHorizontal,
-        paddingRight: M.paddingLG - M.paddingPageHorizontal,
-        marginLeft: M.paddingPageHorizontal - M.paddingLG,
-        marginRight: M.paddingPageHorizontal - M.paddingLG
+        paddingLeft: j.paddingLG - j.paddingPageHorizontal,
+        paddingRight: j.paddingLG - j.paddingPageHorizontal,
+        marginLeft: j.paddingPageHorizontal - j.paddingLG,
+        marginRight: j.paddingPageHorizontal - j.paddingLG
       },
       onChange: (U) => {
         k(!0), navigateToTab({ activeKey: U, navigate: v, basename: g }), setTimeout(() => {
@@ -33135,9 +33135,9 @@ const useStyles$9 = genStyleHook("nb-page", (e) => {
           children: !C && /* @__PURE__ */ jsx(
             PageHeader,
             F(h({
-              className: cls("pageHeaderCss", j || S ? "" : "height0"),
+              className: cls("pageHeaderCss", M || S ? "" : "height0"),
               ghost: !1,
-              title: j || " "
+              title: M || " "
             }, o), {
               footer: B
             })
@@ -33481,7 +33481,7 @@ const AppendsTreeSelect = (e) => {
         return c(z);
       if (!z.isLeaf && z.loadChildren) {
         const N = z.loadChildren(z);
-        g((w) => N.reduce((M, j) => Object.assign(M, { [j.value]: j }), h({}, w)));
+        g((w) => N.reduce((j, M) => Object.assign(j, { [M.value]: M }), h({}, w)));
       }
     }),
     [c]
@@ -33493,7 +33493,7 @@ const AppendsTreeSelect = (e) => {
       title: l.label,
       fullTitle: l.label,
       isLeaf: !1
-    }) : null, w = (c === null ? [] : getCollectionFieldOptions.call({ compile: d, getCollectionFields: y, filter: a }, C, z)).reduce((M, j) => Object.assign(M, { [j.value]: j }), {});
+    }) : null, w = (c === null ? [] : getCollectionFieldOptions.call({ compile: d, getCollectionFields: y, filter: a }, C, z)).reduce((j, M) => Object.assign(j, { [M.value]: M }), {});
     z && (w[z.value] = z), g(w);
   }, [f, l, a, c]), useEffect(() => {
     const z = e.multiple ? o : o ? [o] : [];
@@ -33501,20 +33501,20 @@ const AppendsTreeSelect = (e) => {
       return;
     const N = [];
     z.forEach((w) => {
-      const M = w.split(".");
-      let j = m[M[0]];
-      for (let R = 1; R < M.length && j; R++) {
-        const B = M.slice(0, R + 1).join(".");
+      const j = w.split(".");
+      let M = m[j[0]];
+      for (let R = 1; R < j.length && M; R++) {
+        const B = j.slice(0, R + 1).join(".");
         if (m[B]) {
-          j = m[B];
+          M = m[B];
           break;
         }
-        if (!j.isLeaf && j.loadChildren) {
-          const V = j.loadChildren(j);
-          V != null && V.length && (N.push(...V), j = V.find((E) => E.value === M.slice(0, R + 1).join(".")));
+        if (!M.isLeaf && M.loadChildren) {
+          const V = M.loadChildren(M);
+          V != null && V.length && (N.push(...V), M = V.find((E) => E.value === j.slice(0, R + 1).join(".")));
         }
       }
-    }), g((w) => N.reduce((M, j) => Object.assign(M, { [j.value]: j }), h({}, w)));
+    }), g((w) => N.reduce((j, M) => Object.assign(j, { [M.value]: M }), h({}, w)));
   }, [o, v.length, e.multiple]);
   const k = useCallback(
     (z) => {
@@ -33522,15 +33522,15 @@ const AppendsTreeSelect = (e) => {
         n(z);
         return;
       }
-      const N = z.map((j) => j.value).filter(Boolean), w = new Set(N), M = I.find((j) => !w.has(j.value));
-      if (M) {
-        const j = `${M.value}.`;
+      const N = z.map((M) => M.value).filter(Boolean), w = new Set(N), j = I.find((M) => !w.has(M.value));
+      if (j) {
+        const M = `${j.value}.`;
         Object.keys(m).forEach((R) => {
-          R.startsWith(j) && w.delete(R);
+          R.startsWith(M) && w.delete(R);
         });
       } else
-        N.forEach((j) => {
-          const R = j.split(".");
+        N.forEach((M) => {
+          const R = M.split(".");
           if (R.length)
             for (let B = 1; B <= R.length; B++)
               w.add(R.slice(0, B).join("."));
@@ -33541,11 +33541,11 @@ const AppendsTreeSelect = (e) => {
   ), T = useCallback(
     (z) => {
       var B;
-      const { value: N, onClose: w, disabled: M, closable: j } = z;
+      const { value: N, onClose: w, disabled: j, closable: M } = z;
       if (!N)
         return null;
       const { fullTitle: R } = (B = m[N]) != null ? B : {};
-      return /* @__PURE__ */ jsx(Tag, { closable: j && !M, onClose: w, children: R == null ? void 0 : R.join(" / ") });
+      return /* @__PURE__ */ jsx(Tag, { closable: M && !j, onClose: w, children: R == null ? void 0 : R.join(" / ") });
     },
     [m]
   ), D = Array.isArray(I) ? I.filter((z) => z.value in m) : I, $ = e.multiple ? o : o != null ? [o] : [];
@@ -33593,8 +33593,8 @@ const AppendsTreeSelect = (e) => {
       const k = uid();
       return x.addEffects(k, () => {
         onFieldInputValueChange("*", (T) => {
-          var $, O, z, N;
-          (filterAnalyses((z = (O = ($ = r.componentProps) == null ? void 0 : $.service) == null ? void 0 : O.params) == null ? void 0 : z.filter) || []).includes((N = T == null ? void 0 : T.props) == null ? void 0 : N.name) && r.value && (r.setValue(void 0), p(void 0));
+          var $, O, z, N, w, j;
+          (filterAnalyses((z = (O = ($ = r.componentProps) == null ? void 0 : $.service) == null ? void 0 : O.params) == null ? void 0 : z.filter) || []).includes((N = T == null ? void 0 : T.props) == null ? void 0 : N.name) && r.value && ((w = T == null ? void 0 : T.indexes) == null ? void 0 : w[0]) === ((j = r == null ? void 0 : r.indexes) == null ? void 0 : j[0]) && (r.setValue(void 0), p(void 0));
         });
       }), () => {
         x.removeEffects(k);
@@ -34531,10 +34531,10 @@ const InternalFileManager = (e) => {
     setSelectedRows: u,
     collectionField: C
   }, A = () => {
-    const { setVisible: $ } = useActionContext(), { multiple: O, selectedRows: z, onChange: N, options: w, collectionField: M } = useContext(RecordPickerContext);
+    const { setVisible: $ } = useActionContext(), { multiple: O, selectedRows: z, onChange: N, options: w, collectionField: j } = useContext(RecordPickerContext);
     return {
       onClick() {
-        N(O ? unionBy(z, w, (M == null ? void 0 : M.targetKey) || "id") : (z == null ? void 0 : z[0]) || null), $(!1);
+        N(O ? unionBy(z, w, (j == null ? void 0 : j.targetKey) || "id") : (z == null ? void 0 : z[0]) || null), $(!1);
       }
     };
   };
@@ -34596,36 +34596,36 @@ const InternalFileManager = (e) => {
   useEffect(() => {
     var N;
     if (r) {
-      const w = Array.isArray(r) ? extractLastNonNullValueObjects(r == null ? void 0 : r.filter((j) => j.value), !0) : transformNestedData(r), M = (N = w == null ? void 0 : w.map) == null ? void 0 : N.call(w, (j) => ({
-        key: j.parentId,
+      const w = Array.isArray(r) ? extractLastNonNullValueObjects(r == null ? void 0 : r.filter((M) => M.value), !0) : transformNestedData(r), j = (N = w == null ? void 0 : w.map) == null ? void 0 : N.call(w, (M) => ({
+        key: M.parentId,
         children: [],
-        value: j
+        value: M
       }));
-      a(M);
+      a(j);
     }
   }, []);
   const k = useCallback(
     (N) => {
       try {
         return N == null ? void 0 : N.filter((w) => ["number", "string"].includes(typeof w[y.value])).map((w) => {
-          var j, R, B;
-          let M = p(w[y.label]);
-          if ((j = v == null ? void 0 : v.uiSchema) != null && j.enum)
-            if (Array.isArray(M))
-              M = M.map((V, E) => {
+          var M, R, B;
+          let j = p(w[y.label]);
+          if ((M = v == null ? void 0 : v.uiSchema) != null && M.enum)
+            if (Array.isArray(j))
+              j = j.map((V, E) => {
                 var G, U;
                 const q = (U = (G = v.uiSchema.enum).find) == null ? void 0 : U.call(G, (K) => K.value === V);
                 return q ? /* @__PURE__ */ jsx(Tag, { color: q.color, style: { marginRight: 3 }, children: (q == null ? void 0 : q.label) || V }, E) : /* @__PURE__ */ jsx(Tag, { children: V }, V);
               }).reverse();
             else {
-              const V = (B = (R = v.uiSchema.enum).find) == null ? void 0 : B.call(R, (E) => E.value === M);
-              V && (M = /* @__PURE__ */ jsx(Tag, { color: V.color, children: V.label }));
+              const V = (B = (R = v.uiSchema.enum).find) == null ? void 0 : B.call(R, (E) => E.value === j);
+              V && (j = /* @__PURE__ */ jsx(Tag, { color: V.color, children: V.label }));
             }
-          return (v == null ? void 0 : v.type) === "date" && (M = dayjs(M).format("YYYY-MM-DD")), o ? o({
-            [y.label]: M || EMPTY,
+          return (v == null ? void 0 : v.type) === "date" && (j = dayjs(j).format("YYYY-MM-DD")), o ? o({
+            [y.label]: j || EMPTY,
             [y.value]: w[y.value]
           }) : F(h({}, w), {
-            [y.label]: M || EMPTY,
+            [y.label]: j || EMPTY,
             [y.value]: w[y.value]
           });
         }).filter(Boolean);
@@ -34635,46 +34635,46 @@ const InternalFileManager = (e) => {
     },
     [v == null ? void 0 : v.uiSchema, y]
   ), T = (N) => L(void 0, null, function* () {
-    var M;
+    var j;
     const w = yield C.list({
       pageSize: 200,
       params: g == null ? void 0 : g.params,
       filter: mergeFilter([N]),
       tree: N.parentId ? void 0 : !0
     });
-    return (M = w == null ? void 0 : w.data) == null ? void 0 : M.data;
-  }), D = (N, w, M) => L(void 0, null, function* () {
-    const j = yield T({ parentId: w == null ? void 0 : w.id }), R = [...i];
-    if (R.splice(M + 1), R[M] = F(h({}, R[M]), { value: w }), w != null && w.id && (R[M + 1] = { key: w == null ? void 0 : w.id, children: (j == null ? void 0 : j.length) > 0 ? j : null }), a(R), ["o2m", "m2m"].includes(f.interface)) {
+    return (j = w == null ? void 0 : w.data) == null ? void 0 : j.data;
+  }), D = (N, w, j) => L(void 0, null, function* () {
+    const M = yield T({ parentId: w == null ? void 0 : w.id }), R = [...i];
+    if (R.splice(j + 1), R[j] = F(h({}, R[j]), { value: w }), w != null && w.id && (R[j + 1] = { key: w == null ? void 0 : w.id, children: (M == null ? void 0 : M.length) > 0 ? M : null }), a(R), ["o2m", "m2m"].includes(f.interface)) {
       const B = Array.isArray(x.fieldValue) ? x.fieldValue : [];
       B[A.index] = w, x.fieldValue = B;
     } else
       x.value = w;
     n == null || n(R);
-  }), $ = (N, w, M) => L(void 0, null, function* () {
-    var j, R, B;
+  }), $ = (N, w, j) => L(void 0, null, function* () {
+    var M, R, B;
     if (N) {
       d(!0);
       const V = yield T({ parentId: w == null ? void 0 : w.key });
-      if (d(!1), c(V), M === (i == null ? void 0 : i.length) - 1 && ((j = w == null ? void 0 : w.value) != null && j.id)) {
+      if (d(!1), c(V), j === (i == null ? void 0 : i.length) - 1 && ((M = w == null ? void 0 : w.value) != null && M.id)) {
         const E = yield T({ parentId: (R = w == null ? void 0 : w.value) == null ? void 0 : R.id }), q = [...i];
-        q.splice(M + 1), q[M] = F(h({}, q[M]), { value: w == null ? void 0 : w.value }), q[M + 1] = { key: (B = w == null ? void 0 : w.value) == null ? void 0 : B.id, children: (E == null ? void 0 : E.length) > 0 ? E : null }, a(q), n == null || n(q);
+        q.splice(j + 1), q[j] = F(h({}, q[j]), { value: w == null ? void 0 : w.value }), q[j + 1] = { key: (B = w == null ? void 0 : w.value) == null ? void 0 : B.id, children: (E == null ? void 0 : E.length) > 0 ? E : null }, a(q), n == null || n(q);
       }
     }
   }), O = (N, w) => L(void 0, null, function* () {
-    const M = N ? {
+    const j = N ? {
       [y.label]: {
         [I]: N
       }
     } : {};
     d(!0);
-    const j = yield T(F(h({}, M), {
+    const M = yield T(F(h({}, j), {
       parentId: w == null ? void 0 : w.key
     }));
-    d(!1), c(j);
+    d(!1), c(M);
   });
   return /* @__PURE__ */ jsx(Space$1, { wrap: !0, children: i.map((N, w) => {
-    var M, j, R;
+    var j, M, R;
     return N.children && /* @__PURE__ */ jsx(
       Select$1,
       {
@@ -34685,8 +34685,8 @@ const InternalFileManager = (e) => {
         filterOption: !1,
         filterSort: null,
         defaultValue: {
-          label: (M = N == null ? void 0 : N.value) == null ? void 0 : M[y.label],
-          value: (j = N == null ? void 0 : N.value) == null ? void 0 : j[y.value]
+          label: (j = N == null ? void 0 : N.value) == null ? void 0 : j[y.label],
+          value: (M = N == null ? void 0 : N.value) == null ? void 0 : M[y.value]
         },
         labelInValue: !0,
         onSearch: (B) => O(B, N),
@@ -34888,10 +34888,10 @@ const InternalNesterCss = css`
 }, InternalPicker = observer$1(
   (e) => {
     var N;
-    const z = e, { value: t, multiple: o, openSize: n, onChange: r, quickUpload: i, selectFile: a, shouldMountElement: l } = z, c = W(z, ["value", "multiple", "openSize", "onChange", "quickUpload", "selectFile", "shouldMountElement"]), u = useField(), d = useFieldNames$1(e), [p, m] = useState(!1), g = useFieldSchema(), f = useInsertSchema("Selector"), { options: x } = useAssociationFieldContext(), { collectionName: C } = useFormBlockContext(), S = useCompile(), b = useLabelUiSchema$1(x, (d == null ? void 0 : d.label) || "label"), y = g["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((M) => {
-      const j = M == null ? void 0 : M[d.label];
-      return F(h({}, M), {
-        [d.label]: getLabelFormatValue$1(S(b), S(j))
+    const z = e, { value: t, multiple: o, openSize: n, onChange: r, quickUpload: i, selectFile: a, shouldMountElement: l } = z, c = W(z, ["value", "multiple", "openSize", "onChange", "quickUpload", "selectFile", "shouldMountElement"]), u = useField(), d = useFieldNames$1(e), [p, m] = useState(!1), g = useFieldSchema(), f = useInsertSchema("Selector"), { options: x } = useAssociationFieldContext(), { collectionName: C } = useFormBlockContext(), S = useCompile(), b = useLabelUiSchema$1(x, (d == null ? void 0 : d.label) || "label"), y = g["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 M = j == null ? void 0 : j[d.label];
+      return F(h({}, j), {
+        [d.label]: getLabelFormatValue$1(S(b), S(M))
       });
     }) : [], [t, d == null ? void 0 : d.label]), T = {
       size: "small",
@@ -34908,18 +34908,18 @@ const InternalNesterCss = css`
       currentFormCollection: C
     }, D = () => {
       var w;
-      return o == null ? null : Array.isArray(t) ? (w = t.filter(Boolean)) == null ? void 0 : w.map((M) => M == null ? void 0 : M[d.value]) : t == null ? void 0 : t[d.value];
+      return o == null ? null : Array.isArray(t) ? (w = t.filter(Boolean)) == null ? void 0 : w.map((j) => j == null ? void 0 : j[d.value]) : t == null ? void 0 : t[d.value];
     }, $ = () => {
-      const w = (x == null ? void 0 : x.targetKey) || "id", M = k.map((R) => R[w]).filter(Boolean);
-      return M.length ? { $and: [{ [`${w}.$ne`]: M }] } : {};
+      const w = (x == null ? void 0 : x.targetKey) || "id", j = k.map((R) => R[w]).filter(Boolean);
+      return j.length ? { $and: [{ [`${w}.$ne`]: j }] } : {};
     }, O = () => {
-      const { setVisible: w } = useActionContext(), { multiple: M, selectedRows: j, onChange: R, options: B, collectionField: V } = useContext(RecordPickerContext);
+      const { setVisible: w } = useActionContext(), { multiple: j, selectedRows: M, onChange: R, options: B, collectionField: V } = useContext(RecordPickerContext);
       return {
         onClick() {
-          R(M ? unionBy(j, B, (V == null ? void 0 : V.targetKey) || "id") : (j == null ? void 0 : j[0]) || null), w(!1);
+          R(j ? unionBy(M, B, (V == null ? void 0 : V.targetKey) || "id") : (M == null ? void 0 : M[0]) || null), w(!1);
         },
         style: {
-          display: M !== !1 && ["o2m", "m2m", "mbm"].includes(V == null ? void 0 : V.interface) ? "block" : "none"
+          display: j !== !1 && ["o2m", "m2m", "mbm"].includes(V == null ? void 0 : V.interface) ? "block" : "none"
         }
       };
     };
@@ -34946,12 +34946,12 @@ const InternalNesterCss = css`
                     r([]), I([]);
                     return;
                   }
-                  const M = k == null ? void 0 : k.filter((j) => w.includes(j[d.value]));
-                  r(M), I(M);
+                  const j = k == null ? void 0 : k.filter((M) => w.includes(M[d.value]));
+                  r(j), I(j);
                 }
               } else {
-                const M = o ? [] : null;
-                r(M), I(M);
+                const j = o ? [] : null;
+                r(j), I(j);
               }
             },
             options: k,
@@ -35959,7 +35959,7 @@ const useColumnsDeepMemoized = (e) => {
       "loading",
       "onClickRow"
     ]), b = useArrayField(S), y = useTableColumns$1(S), v = useFieldSchema(), I = useCollection(), k = ((pe = v == null ? void 0 : v.parent) == null ? void 0 : pe["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: T, allIncludesChildren: D } = k, $ = useMemoizedFn(S.onRowDragEnd || (() => {
-    })), O = usePaginationProps$2(o, i), [z, N] = useState(() => T ? D : []), [w, M] = useState(((me = b == null ? void 0 : b.data) == null ? void 0 : me.selectedRowKeys) || []), [j, R] = useState([]), B = (p == null ? void 0 : p.type) !== "none", V = useRef(/* @__PURE__ */ new Map()), E = useMemo(() => css`
+    })), O = usePaginationProps$2(o, i), [z, N] = useState(() => T ? D : []), [w, j] = useState(((me = b == null ? void 0 : b.data) == null ? void 0 : me.selectedRowKeys) || []), [M, R] = useState([]), B = (p == null ? void 0 : p.type) !== "none", V = useRef(/* @__PURE__ */ new Map()), E = useMemo(() => css`
         & > td {
           background-color: ${t.controlItemBgActiveHover} !important;
         }
@@ -35971,9 +35971,9 @@ const useColumnsDeepMemoized = (e) => {
       [C, t.controlItemBgActiveHover]
     ), G = useMemo(() => C ? (ee) => ({
       onClick: (Z) => {
-        isPortalInBody(Z.target) || C(ee, R, j);
+        isPortalInBody(Z.target) || C(ee, R, M);
       }
-    }) : null, [C, j]);
+    }) : null, [C, M]);
     useDeepCompareEffect(() => {
       const ee = T ? D : [];
       _.isEqual(ee, z) || N(ee);
@@ -36033,7 +36033,7 @@ const useColumnsDeepMemoized = (e) => {
           type: "checkbox",
           selectedRowKeys: w,
           onChange(ee, Z) {
-            b.data = b.data || {}, b.data.selectedRowKeys = ee, M(ee), u == null || u(ee, Z);
+            b.data = b.data || {}, b.data.selectedRowKeys = ee, j(ee), u == null || u(ee, Z);
           },
           getCheckboxProps(ee) {
             return {
@@ -36104,8 +36104,8 @@ const useColumnsDeepMemoized = (e) => {
       x: "max-content",
       y: ie
     }), [ie, Ie]), ke = useCallback(
-      (ee) => j.includes(ee[m]) ? q : "",
-      [j, q, m]
+      (ee) => M.includes(ee[m]) ? q : "",
+      [M, q, m]
     ), be = useCallback(
       (ee, Z) => {
         const re = ee ? [...z, Z[I.getPrimaryKey()]] : z.filter((ae) => Z[I.getPrimaryKey()] !== ae);
@@ -36420,8 +36420,8 @@ const ReadPretty$7 = observer$1(
 InternalAssociationSelect.displayName = "InternalAssociationSelect";
 const AssociationSelect = InternalAssociationSelect;
 AssociationSelect.Designer = function e() {
-  var M, j, R, B, V, E, q, 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: g, insertAdjacent: f } = useDesignable(), x = 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 = (M = I == null ? void 0 : I.validateSchema) == null ? void 0 : M.call(I, u), k = (j = b == null ? void 0 : b.uiSchema) == null ? void 0 : j.title, T = b != null && b.target ? t(b == null ? void 0 : b.target) : [];
+  var j, M, R, B, V, E, q, 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: g, insertAdjacent: f } = useDesignable(), x = 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 = (M = b == null ? void 0 : b.uiSchema) == null ? void 0 : M.title, T = b != null && b.target ? t(b == null ? void 0 : b.target) : [];
   c.title === k || c.title;
   const D = useSortFields(b == null ? void 0 : b.target), $ = ((V = (B = (R = c.componentProps) == null ? void 0 : R.service) == null ? void 0 : B.params) == null ? void 0 : V.sort) || [];
   useEffect(() => {
@@ -36819,22 +36819,22 @@ AssociationSelect.Designer = function e() {
   ] });
 };
 AssociationSelect.FilterDesigner = function e() {
-  var I, A, k, T, D, $, O, z, N, w, M;
+  var I, A, k, T, D, $, O, z, N, w, 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"]), g = o(m == null ? void 0 : m.interface), f = (I = g == null ? void 0 : g.validateSchema) == null ? void 0 : I.call(g, l), x = (A = m == null ? void 0 : m.uiSchema) == null ? void 0 : A.title, C = m != null && m.target ? t(m == null ? void 0 : m.target) : [];
   a.title === x || a.title;
-  const S = useSortFields(m == null ? void 0 : m.target), b = ((D = (T = (k = a.componentProps) == null ? void 0 : k.service) == null ? void 0 : T.params) == null ? void 0 : D.sort) || [], y = b == null ? void 0 : b.map((j) => j.startsWith("-") ? {
-    field: j.substring(1),
+  const S = useSortFields(m == null ? void 0 : m.target), b = ((D = (T = (k = a.componentProps) == null ? void 0 : k.service) == null ? void 0 : T.params) == null ? void 0 : D.sort) || [], y = b == null ? void 0 : b.map((M) => M.startsWith("-") ? {
+    field: M.substring(1),
     direction: "desc"
   } : {
-    field: j,
+    field: M,
     direction: "asc"
   });
   a.readPretty || a.required;
-  const v = C.filter((j) => !(j != null && j.target) && j.type !== "boolean").map((j) => {
+  const v = C.filter((M) => !(M != null && M.target) && M.type !== "boolean").map((M) => {
     var R;
     return {
-      value: j == null ? void 0 : j.name,
-      label: p((R = j == null ? void 0 : j.uiSchema) == null ? void 0 : R.title) || (j == null ? void 0 : j.name)
+      value: M == null ? void 0 : M.name,
+      label: p((R = M == null ? void 0 : M.uiSchema) == null ? void 0 : R.title) || (M == null ? void 0 : M.name)
     };
   });
   return l["x-disabled"], l["x-read-pretty"], /* @__PURE__ */ jsxs(GeneralSchemaDesigner, { children: [
@@ -36925,10 +36925,10 @@ AssociationSelect.FilterDesigner = function e() {
             }
           }
         },
-        onSubmit: (j) => {
+        onSubmit: (M) => {
           var E;
           const R = [];
-          for (const q of j.rules)
+          for (const q of M.rules)
             R.push(_.pickBy(q, _.identity));
           const B = {
             "x-uid": l["x-uid"]
@@ -36960,11 +36960,11 @@ AssociationSelect.FilterDesigner = function e() {
             })
           }
         },
-        onSubmit: (j) => {
+        onSubmit: (M) => {
           const R = {
             "x-uid": l["x-uid"]
           };
-          a.value !== j.default && (a.value = j.default), l.default = j.default, R.default = j.default, u.emit("patch", {
+          a.value !== M.default && (a.value = M.default), l.default = M.default, R.default = M.default, u.emit("patch", {
             schema: R
           }), d();
         }
@@ -36976,8 +36976,8 @@ AssociationSelect.FilterDesigner = function e() {
         collectionName: m == null ? void 0 : m.target,
         defaultFilter: ((N = (z = (O = a.componentProps) == null ? void 0 : O.service) == null ? void 0 : z.params) == null ? void 0 : N.filter) || {},
         form: i,
-        onSubmit: ({ filter: j }) => {
-          j = removeNullCondition(j), _.set(a.componentProps, "service.params.filter", j), l["x-component-props"] = a.componentProps, u.emit("patch", {
+        onSubmit: ({ filter: M }) => {
+          M = removeNullCondition(M), _.set(a.componentProps, "service.params.filter", M), l["x-component-props"] = a.componentProps, u.emit("patch", {
             schema: {
               "x-uid": l["x-uid"],
               "x-component-props": a.componentProps
@@ -37060,8 +37060,8 @@ AssociationSelect.FilterDesigner = function e() {
             }
           }
         },
-        onSubmit: ({ sort: j }) => {
-          const R = j.map((B) => B.direction === "desc" ? `-${B.field}` : B.field);
+        onSubmit: ({ sort: M }) => {
+          const R = M.map((B) => B.direction === "desc" ? `-${B.field}` : B.field);
           _.set(a.componentProps, "service.params.sort", R), l["x-component-props"] = a.componentProps, u.emit("patch", {
             schema: {
               "x-uid": l["x-uid"],
@@ -37076,13 +37076,13 @@ AssociationSelect.FilterDesigner = function e() {
       {
         title: c("Title field"),
         options: v,
-        value: (M = (w = a == null ? void 0 : a.componentProps) == null ? void 0 : w.fieldNames) == null ? void 0 : M.label,
-        onChange: (j) => {
+        value: (j = (w = a == null ? void 0 : a.componentProps) == null ? void 0 : w.fieldNames) == null ? void 0 : j.label,
+        onChange: (M) => {
           var V, E;
           const R = {
             "x-uid": l["x-uid"]
           }, B = F(h(h({}, (E = (V = m == null ? void 0 : m.uiSchema) == null ? void 0 : V["x-component-props"]) == null ? void 0 : E.fieldNames), a.componentProps.fieldNames), {
-            label: j
+            label: M
           });
           a.componentProps.fieldNames = B, l["x-component-props"] = l["x-component-props"] || {}, l["x-component-props"].fieldNames = B, R["x-component-props"] = l["x-component-props"], u.emit("patch", {
             schema: R
@@ -41623,7 +41623,7 @@ const TableActionColumnDesigner = (e) => {
     "sort-field"
   );
 }, TableBlockDesigner = () => {
-  var T, D, $, O, z, N, w, M, j, R;
+  var T, D, $, O, z, N, w, j, M, R;
   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(), { componentNamePrefix: p } = useBlockTemplateContext(), m = ((D = (T = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : T.params) == null ? void 0 : D.sort) || [], g = (($ = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : $.resource) || ((O = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : O.association), f = !((z = i == null ? void 0 : i["x-decorator-props"]) != null && z.disableTemplate), x = m == null ? void 0 : m.map((B) => B != null && B.startsWith("-") ? {
     field: B.substring(1),
     direction: "desc"
@@ -41689,7 +41689,7 @@ const TableActionColumnDesigner = (e) => {
       SchemaSettingsDataScope,
       {
         collectionName: e,
-        defaultFilter: ((M = (w = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : w.params) == null ? void 0 : M.filter) || {},
+        defaultFilter: ((j = (w = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : w.params) == null ? void 0 : j.filter) || {},
         form: a,
         onSubmit: A
       }
@@ -41786,7 +41786,7 @@ const TableActionColumnDesigner = (e) => {
       SchemaSettingsSelectItem,
       {
         title: u("Records per page"),
-        value: ((R = (j = r.decoratorProps) == null ? void 0 : j.params) == null ? void 0 : R.pageSize) || 20,
+        value: ((R = (M = r.decoratorProps) == null ? void 0 : M.params) == null ? void 0 : R.pageSize) || 20,
         options: [
           { label: "10", value: 10 },
           { label: "20", value: 20 },
@@ -41859,14 +41859,14 @@ const TableSelectorDesigner = () => {
         defaultFilter: (($ = (D = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : D.params) == null ? void 0 : $.filter) || {},
         form: a,
         onSubmit: ({ filter: N }) => {
-          var j;
+          var M;
           N = removeNullCondition(N);
           const w = r.decoratorProps.params || {};
           w.filter = N, r.decoratorProps.params = w, i["x-decorator-props"].params = w;
-          let M = _.cloneDeep(N);
-          u && (M ? M = {
-            $and: [u, M]
-          } : M = u), c.run(F(h({}, (j = c.params) == null ? void 0 : j[0]), { filter: M, page: 1 })), p.emit("patch", {
+          let j = _.cloneDeep(N);
+          u && (j ? j = {
+            $and: [u, j]
+          } : j = u), c.run(F(h({}, (M = c.params) == null ? void 0 : M[0]), { filter: j, page: 1 })), p.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
               "x-decorator-props": i["x-decorator-props"]
@@ -41899,9 +41899,9 @@ const TableSelectorDesigner = () => {
         defaultChecked: !0,
         checked: r.decoratorProps.treeTable,
         onChange: (N) => {
-          var M;
+          var j;
           r.form.clearFormGraph(`${r.address}.*`), r.decoratorProps.treeTable = N, i["x-decorator-props"].treeTable = N;
-          const w = F(h({}, (M = c.params) == null ? void 0 : M[0]), {
+          const w = F(h({}, (j = c.params) == null ? void 0 : j[0]), {
             tree: N ? !0 : null
           });
           p.emit("patch", {
@@ -41987,14 +41987,14 @@ const TableSelectorDesigner = () => {
           }
         },
         onSubmit: ({ sort: N }) => {
-          var j;
-          const w = N.map((R) => R.direction === "desc" ? `-${R.field}` : R.field), M = r.decoratorProps.params || {};
-          M.sort = w, r.decoratorProps.params = M, i["x-decorator-props"].params = M, p.emit("patch", {
+          var M;
+          const w = N.map((R) => R.direction === "desc" ? `-${R.field}` : R.field), j = r.decoratorProps.params || {};
+          j.sort = w, r.decoratorProps.params = j, i["x-decorator-props"].params = j, p.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
               "x-decorator-props": i["x-decorator-props"]
             }
-          }), c.run(F(h({}, (j = c.params) == null ? void 0 : j[0]), { sort: w }));
+          }), c.run(F(h({}, (M = c.params) == null ? void 0 : M[0]), { sort: w }));
         }
       }
     ),
@@ -42011,9 +42011,9 @@ const TableSelectorDesigner = () => {
           { label: "200", value: 200 }
         ],
         onChange: (N) => {
-          var M;
+          var j;
           const w = r.decoratorProps.params || {};
-          w.pageSize = N, r.decoratorProps.params = w, i["x-decorator-props"].params = w, c.run(F(h({}, (M = c.params) == null ? void 0 : M[0]), { pageSize: N, page: 1 })), p.emit("patch", {
+          w.pageSize = N, r.decoratorProps.params = w, i["x-decorator-props"].params = w, c.run(F(h({}, (j = c.params) == null ? void 0 : j[0]), { pageSize: N, page: 1 })), p.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
               "x-decorator-props": i["x-decorator-props"]
@@ -43974,71 +43974,71 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
     label: b(w.title),
     value: w.name
   })), []), T = useCallback(() => {
-    const { availableFieldInterfaces: w } = u(n.template) || {}, { exclude: M, include: j } = w || {}, R = [];
+    const { availableFieldInterfaces: w } = u(n.template) || {}, { exclude: j, include: M } = w || {}, R = [];
     return I.forEach((B) => {
       var V;
       if (B.key === "systemInfo")
         R.push(F(h({}, B), {
-          children: B.children.filter((E) => E.hidden ? !1 : E.value === "tableoid" ? j != null && j.length ? j.includes(E.value) : (l == null ? void 0 : l.dialect) === "postgres" : typeof n[E.value] == "boolean" ? n[E.value] : !0)
+          children: B.children.filter((E) => E.hidden ? !1 : E.value === "tableoid" ? M != null && M.length ? M.includes(E.value) : (l == null ? void 0 : l.dialect) === "postgres" : typeof n[E.value] == "boolean" ? n[E.value] : !0)
         }));
       else {
         let E = [];
-        j != null && j.length ? j.forEach((q) => {
+        M != null && M.length ? M.forEach((q) => {
           var U;
           const G = (U = B == null ? void 0 : B.children) == null ? void 0 : U.find((K) => [q, q.interface].includes(K.name));
           G && E.push(F(h({}, G), {
             targetScope: q == null ? void 0 : q.targetScope
           }));
-        }) : M != null && M.length ? E = (V = B == null ? void 0 : B.children) == null ? void 0 : V.filter((q) => !M.includes(q.name)) : E = B == null ? void 0 : B.children, E != null && E.length && R.push(F(h({}, B), {
+        }) : j != null && j.length ? E = (V = B == null ? void 0 : B.children) == null ? void 0 : V.filter((q) => !j.includes(q.name)) : E = B == null ? void 0 : B.children, E != null && E.length && R.push(F(h({}, B), {
           children: E
         }));
       }
     }), R;
   }, [u, n]), D = useMemo(() => T().map((w) => {
-    var M;
-    return ((M = w == null ? void 0 : w.children) == null ? void 0 : M.length) === 0 ? null : n.template === "view" ? {
+    var j;
+    return ((j = w == null ? void 0 : w.children) == null ? void 0 : j.length) === 0 ? null : n.template === "view" ? {
       type: "group",
       label: b(w.label),
       title: b(w.label),
       key: w.label,
-      children: w.children.filter((j) => ["m2o"].includes(j.name)).map((j) => ({
-        label: b(j.title),
-        title: b(j.title),
-        key: j.name,
-        dataTargetScope: j.targetScope
+      children: w.children.filter((M) => ["m2o"].includes(M.name)).map((M) => ({
+        label: b(M.title),
+        title: b(M.title),
+        key: M.name,
+        dataTargetScope: M.targetScope
       }))
     } : {
       type: "group",
       label: b(w.label),
       title: b(w.label),
       key: w.label,
-      children: w == null ? void 0 : w.children.filter((j) => !["o2o", "subTable", "linkTo"].includes(j.name)).map((j) => ({
-        label: b(j.title),
-        title: b(j.title),
-        key: j.name,
-        dataTargetScope: j.targetScope
+      children: w == null ? void 0 : w.children.filter((M) => !["o2o", "subTable", "linkTo"].includes(M.name)).map((M) => ({
+        label: b(M.title),
+        title: b(M.title),
+        key: M.name,
+        dataTargetScope: M.targetScope
       }))
     };
   }).filter((w) => {
-    var M;
-    return (M = w == null ? void 0 : w.children) == null ? void 0 : M.length;
+    var j;
+    return (j = w == null ? void 0 : w.children) == null ? void 0 : j.length;
   }), [T]), $ = useMemo(() => ({
     style: {
       maxHeight: "60vh",
       overflow: "auto"
     },
     onClick: (w) => {
-      const M = w.item.props["data-targetScope"];
-      M && x(M);
-      const j = getSchema$8(c(w.key), n, b);
-      j && (S(j), g(!0));
+      const j = w.item.props["data-targetScope"];
+      j && x(j);
+      const M = getSchema$8(c(w.key), n, b);
+      M && (S(M), g(!0));
     },
     items: D
   }), [c, D, n]), O = useMemo(() => A.filter((w) => ["string", "bigInt", "integer"].includes(w.type)).map((w) => {
-    var M;
+    var j;
     return {
       value: w.name,
-      label: b((M = w.uiSchema) == null ? void 0 : M.title)
+      label: b((j = w.uiSchema) == null ? void 0 : j.title)
     };
   }), [A == null ? void 0 : A.length]);
   return n.template !== "sql" && /* @__PURE__ */ jsx(RecordProvider, { record: n, children: /* @__PURE__ */ jsxs(ActionContextProvider, { value: { visible: m, setVisible: g }, children: [
@@ -44310,13 +44310,13 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   return /* @__PURE__ */ jsx(OverridingFieldAction, h({ item: t, parentItem: o }, e));
 }, getIsOverriding = (e, t) => e.find((n) => n.name === t.name), OverridingFieldAction = (e) => {
   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: g } = useCollectionManager_deprecated(), [f, x] = useState(!1), [C, S] = useState({}), b = useAPIClient(), { t: y } = useTranslation(), v = useCompile(), I = (N) => {
-    var M;
-    return N && ((M = m(N)) == null ? void 0 : M.map((j) => j.name).concat([N]));
+    var j;
+    return N && ((j = m(N)) == null ? void 0 : j.map((M) => M.name).concat([N]));
   }, [A, k] = useState({}), T = p(a), D = getIsOverriding(T, n), $ = useMemo(() => g.map((N) => ({
     label: v(N.title),
     value: N.name
   })), []), O = () => {
-    const N = useForm(), { refresh: w } = useResourceActionContext(), { refreshCM: M } = useCollectionManager_deprecated(), j = useActionContext(), { resource: R } = useResourceContext();
+    const N = useForm(), { refresh: w } = useResourceActionContext(), { refreshCM: j } = useCollectionManager_deprecated(), M = useActionContext(), { resource: R } = useResourceContext();
     return {
       run() {
         return L(this, null, function* () {
@@ -44335,17 +44335,17 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           ]);
           yield R.create({
             values: E
-          }), yield N.reset(), yield M(), yield w(), j.setVisible(!1);
+          }), yield N.reset(), yield j(), yield w(), M.setVisible(!1);
         });
       }
     };
   }, z = useMemo(() => {
     var N;
     return (n == null ? void 0 : n.fields) || ((N = d(n.collectionName)) == null ? void 0 : N.options.fields.filter((w) => ["string", "bigInt", "integer"].includes(w.type)).map((w) => {
-      var M;
+      var j;
       return {
         value: w.name,
-        label: v((M = w.uiSchema) == null ? void 0 : M.title)
+        label: v((j = w.uiSchema) == null ? void 0 : j.title)
       };
     }));
   }, [n.name]);
@@ -44362,11 +44362,11 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
               appends: ["reverseField"]
             });
             k(w == null ? void 0 : w.data);
-            const M = u(n.interface), j = cloneDeep(w == null ? void 0 : w.data) || {};
-            j != null && j.reverseField || (j.autoCreateReverseField = !1, j.reverseField = (N = M.default) == null ? void 0 : N.reverseField, set$1(j.reverseField, "name", `f_${uid()}`), set$1(j.reverseField, "uiSchema.title", n.__parent.title));
+            const j = u(n.interface), M = cloneDeep(w == null ? void 0 : w.data) || {};
+            M != null && M.reverseField || (M.autoCreateReverseField = !1, M.reverseField = (N = j.default) == null ? void 0 : N.reverseField, set$1(M.reverseField, "name", `f_${uid()}`), set$1(M.reverseField, "uiSchema.title", n.__parent.title));
             const R = getSchema$6(
-              F(h({}, M), {
-                default: j
+              F(h({}, j), {
+                default: M
               }),
               n,
               v
@@ -44824,10 +44824,10 @@ const getSchema$4 = (e, t, o) => {
   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, g] = useState([]), [f, x] = useState(n), [C, S] = useState([]), b = useField(), y = useForm(), { getCollection: v, getInterface: I, getCollectionFields: A, getInheritCollections: k, getParentCollectionFields: T } = useCollectionManager_deprecated(), D = useCompile(), O = useFieldInterfaceOptions().filter((w) => !["relation", "systemInfo"].includes(w.key));
   useEffect(() => {
     const w = [];
-    f.forEach((M) => {
+    f.forEach((j) => {
       var E;
-      const j = v(M), B = k(M).map((q) => {
-        const G = T(q, M);
+      const M = v(j), B = k(j).map((q) => {
+        const G = T(q, j);
         return {
           type: "group",
           key: q,
@@ -44840,22 +44840,22 @@ const getSchema$4 = (e, t, o) => {
             };
           })
         };
-      }), V = (E = j.fields.filter((q) => !["obo", "oho", "m2m", "o2m"].includes(q == null ? void 0 : q.interface))) == null ? void 0 : E.map((q) => {
+      }), V = (E = M.fields.filter((q) => !["obo", "oho", "m2m", "o2m"].includes(q == null ? void 0 : q.interface))) == null ? void 0 : E.map((q) => {
         var G;
         return { value: q.name, key: q.name, label: l(((G = q.uiSchema) == null ? void 0 : G.title) || q.name) };
       }).concat(B);
       w.push({
-        value: M,
-        label: l(j.title || j.name),
+        value: j,
+        label: l(M.title || M.name),
         children: V
       });
     }), g(w);
   }, [f, t]), useEffect(() => {
     t && (u(!0), a.resource("dbViews").get({ filterByTk: o, schema: r }).then(({ data: w }) => {
-      var M, j;
+      var j, M;
       if (w) {
         u(!1), p([]);
-        const R = (j = Object.values((M = w == null ? void 0 : w.data) == null ? void 0 : M.fields)) == null ? void 0 : j.map((B) => {
+        const R = (M = Object.values((j = w == null ? void 0 : w.data) == null ? void 0 : j.fields)) == null ? void 0 : M.map((B) => {
           var V, E;
           if (B.source) {
             const q = (i == null ? void 0 : i.data.find((G) => G.name === B.name)) || B;
@@ -44876,11 +44876,11 @@ const getSchema$4 = (e, t, o) => {
       }
     }).catch);
   }, [t]);
-  const z = (w, M) => {
-    d.splice(M, 1, w), p(d), b.value = d.map((j) => {
+  const z = (w, j) => {
+    d.splice(j, 1, w), p(d), b.value = d.map((M) => {
       var B, V, E;
-      const R = typeof j.source == "string" ? j.source : (E = (V = (B = j.source) == null ? void 0 : B.filter) == null ? void 0 : V.call(B, Boolean)) == null ? void 0 : E.join(".");
-      return F(h({}, j), {
+      const R = typeof M.source == "string" ? M.source : (E = (V = (B = M.source) == null ? void 0 : B.filter) == null ? void 0 : V.call(B, Boolean)) == null ? void 0 : E.join(".");
+      return F(h({}, M), {
         source: R
       });
     });
@@ -44896,7 +44896,7 @@ const getSchema$4 = (e, t, o) => {
       dataIndex: "source",
       key: "source",
       width: 200,
-      render: (w, M, j) => /* @__PURE__ */ jsx(
+      render: (w, j, M) => /* @__PURE__ */ jsx(
         Cascader$1,
         {
           defaultValue: typeof w == "string" ? w == null ? void 0 : w.split(".") : w,
@@ -44906,7 +44906,7 @@ const getSchema$4 = (e, t, o) => {
           onChange: (R, B) => {
             var E;
             const V = (E = A(R == null ? void 0 : R[0])) == null ? void 0 : E.find((q) => q.name === last(R));
-            z(F(h({}, M), { source: R, uiSchema: V == null ? void 0 : V.uiSchema }), j);
+            z(F(h({}, j), { source: R, uiSchema: V == null ? void 0 : V.uiSchema }), M);
           },
           placeholder: l("Select field source")
         }
@@ -44917,8 +44917,8 @@ const getSchema$4 = (e, t, o) => {
       dataIndex: "type",
       width: 140,
       key: "type",
-      render: (w, M, j) => {
-        const R = d[j];
+      render: (w, j, M) => {
+        const R = d[M];
         return R != null && R.source || !(R != null && R.possibleTypes) ? /* @__PURE__ */ jsx(Tag, { children: w }) : /* @__PURE__ */ jsx(
           Select$1,
           {
@@ -44926,7 +44926,7 @@ const getSchema$4 = (e, t, o) => {
             popupMatchSelectWidth: !1,
             style: { width: "100%" },
             options: (R == null ? void 0 : R.possibleTypes.map((B) => ({ label: B, value: B }))) || [],
-            onChange: (B) => z(F(h({}, R), { type: B }), j)
+            onChange: (B) => z(F(h({}, R), { type: B }), M)
           }
         );
       }
@@ -44936,8 +44936,8 @@ const getSchema$4 = (e, t, o) => {
       dataIndex: "interface",
       key: "interface",
       width: 150,
-      render: (w, M, j) => {
-        const R = d[j], B = getInterfaceOptions(O, R.type);
+      render: (w, j, M) => {
+        const R = d[M], B = getInterfaceOptions(O, R.type);
         return R.source ? w : /* @__PURE__ */ jsx(
           Select$1,
           {
@@ -44947,7 +44947,7 @@ const getSchema$4 = (e, t, o) => {
             onChange: (V) => {
               var q;
               const E = I(V);
-              z(F(h({}, R), { interface: V, uiSchema: (q = E == null ? void 0 : E.default) == null ? void 0 : q.uiSchema }), j);
+              z(F(h({}, R), { interface: V, uiSchema: (q = E == null ? void 0 : E.default) == null ? void 0 : q.uiSchema }), M);
             },
             children: B.map((V) => /* @__PURE__ */ jsx(Select$1.OptGroup, { label: D(V.label), children: V.children.map((E) => /* @__PURE__ */ jsx(Select$1.Option, { value: E.name, children: D(E.label) }, E.value)) }, V.key))
           }
@@ -44959,16 +44959,16 @@ const getSchema$4 = (e, t, o) => {
       dataIndex: "title",
       key: "title",
       width: 180,
-      render: (w, M, j) => {
+      render: (w, j, M) => {
         var B;
-        const R = d[j];
+        const R = d[M];
         return /* @__PURE__ */ jsx(
           Input$3,
           {
             defaultValue: ((B = R == null ? void 0 : R.uiSchema) == null ? void 0 : B.title) || w,
             onChange: (V) => z(
               F(h({}, R), { uiSchema: F(h({}, omit$1(R == null ? void 0 : R.uiSchema, "rawTitle")), { title: V.target.value }) }),
-              j
+              M
             )
           }
         );
@@ -45021,14 +45021,14 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
   }, b = (y) => {
     var v;
     return (v = y.filter((I) => I.source || I.interface)) == null ? void 0 : v.map((I) => {
-      var $, O, z, N, w, M;
-      const A = typeof (I == null ? void 0 : I.source) == "string" ? ($ = I == null ? void 0 : I.source) == null ? void 0 : $.split(".") : I == null ? void 0 : I.source, k = (z = (O = g(A == null ? void 0 : A[0])) == null ? void 0 : O.find((j) => j.name === (A == null ? void 0 : A[1]))) == null ? void 0 : z.uiSchema, T = ((N = I == null ? void 0 : I.uiSchema) == null ? void 0 : N.title) || (k == null ? void 0 : k.title) || I.name, D = I.source ? k : (M = (w = m(I.interface)) == null ? void 0 : w.default) == null ? void 0 : M.uiSchema;
+      var $, O, z, N, w, j;
+      const A = typeof (I == null ? void 0 : I.source) == "string" ? ($ = I == null ? void 0 : I.source) == null ? void 0 : $.split(".") : I == null ? void 0 : I.source, k = (z = (O = g(A == null ? void 0 : A[0])) == null ? void 0 : O.find((M) => M.name === (A == null ? void 0 : A[1]))) == null ? void 0 : z.uiSchema, T = ((N = I == null ? void 0 : I.uiSchema) == null ? void 0 : N.title) || (k == null ? void 0 : k.title) || I.name, D = I.source ? k : (j = (w = m(I.interface)) == null ? void 0 : w.default) == null ? void 0 : j.uiSchema;
       return {
         title: u(T),
         dataIndex: I.name,
         key: I.name,
         width: 200,
-        render: (j, R, B) => {
+        render: (M, R, B) => {
           const V = R[I.name], E = {
             type: "object",
             properties: {
@@ -45274,15 +45274,15 @@ const AsyncDataProvider = (e) => {
       const T = /* @__PURE__ */ new Map();
       i || (a && a.length ? Object.entries((a == null ? void 0 : a[0]) || {}).forEach(([O, z]) => {
         var R;
-        const N = l[O], w = inferInterface(O, z), M = (R = C.current(w)) == null ? void 0 : R.default, j = (N == null ? void 0 : N.uiSchema) || (M == null ? void 0 : M.uiSchema) || {};
+        const N = l[O], w = inferInterface(O, z), j = (R = C.current(w)) == null ? void 0 : R.default, M = (N == null ? void 0 : N.uiSchema) || (j == null ? void 0 : j.uiSchema) || {};
         T.set(O, {
           name: O,
           interface: (N == null ? void 0 : N.interface) || w,
-          type: (N == null ? void 0 : N.type) || (M == null ? void 0 : M.type),
+          type: (N == null ? void 0 : N.type) || (j == null ? void 0 : j.type),
           source: N == null ? void 0 : N.source,
           uiSchema: h({
             title: O
-          }, j)
+          }, M)
         });
       }) : Object.entries(l || {}).forEach(
         ([O, z]) => T.set(O, F(h({
@@ -45370,13 +45370,13 @@ const AsyncDataProvider = (e) => {
               style: { width: "100%" },
               popupMatchSelectWidth: !1,
               onChange: (N) => {
-                var M, j, R, B, V;
+                var j, M, R, B, V;
                 const w = p(N);
                 b(
                   F(h({}, O), {
                     interface: N || null,
-                    uiSchema: F(h({}, (M = w == null ? void 0 : w.default) == null ? void 0 : M.uiSchema), {
-                      title: ((R = (j = w == null ? void 0 : w.default) == null ? void 0 : j.uiSchema) == null ? void 0 : R.title) || ((B = O.uiSchema) == null ? void 0 : B.title)
+                    uiSchema: F(h({}, (j = w == null ? void 0 : w.default) == null ? void 0 : j.uiSchema), {
+                      title: ((R = (M = w == null ? void 0 : w.default) == null ? void 0 : M.uiSchema) == null ? void 0 : R.title) || ((B = O.uiSchema) == null ? void 0 : B.title)
                     }),
                     type: (V = w == null ? void 0 : w.default) == null ? void 0 : V.type
                   }),
@@ -54784,9 +54784,9 @@ const ActionInitializerItem = (e) => {
       return null;
     const w = (K) => {
       T(K), z(!1);
-    }, M = (K) => {
-      $(K), d(K);
     }, j = (K) => {
+      $(K), d(K);
+    }, M = (K) => {
       var H;
       const Y = (H = m == null ? void 0 : m[0]) == null ? void 0 : H.filter;
       (S || Y) && g(F(h({}, m == null ? void 0 : m[0]), {
@@ -54830,7 +54830,7 @@ const ActionInitializerItem = (e) => {
                       style: {
                         flex: "0 0 auto"
                       },
-                      children: S ? /* @__PURE__ */ jsx(CloseOutlined, { className: "CloseOutlined", onClick: j }) : /* @__PURE__ */ jsx(SearchOutlined, { className: "SearchOutlined", onClick: j })
+                      children: S ? /* @__PURE__ */ jsx(CloseOutlined, { className: "CloseOutlined", onClick: M }) : /* @__PURE__ */ jsx(SearchOutlined, { className: "SearchOutlined", onClick: M })
                     }
                   )
                 ]
@@ -54844,7 +54844,7 @@ const ActionInitializerItem = (e) => {
                 expandedKeys: k,
                 autoExpandParent: O,
                 treeData: u,
-                onSelect: M,
+                onSelect: j,
                 fieldNames: A,
                 titleRender: (K) => /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: getLabelFormatValue(N, c(K[I])) }),
                 selectedKeys: D,
@@ -57554,21 +57554,9 @@ const commonOptions$e = {
       name: "otherBlocks",
       children: [
         {
-          title: '{{t("Add text")}}',
-          Component: "BlockItemInitializer",
-          name: "addText",
-          schema: {
-            type: "void",
-            "x-editable": !1,
-            "x-decorator": "BlockItem",
-            // 'x-designer': 'Markdown.Void.Designer',
-            "x-toolbar": "BlockSchemaToolbar",
-            "x-settings": "blockSettings:markdown",
-            "x-component": "Markdown.Void",
-            "x-component-props": {
-              content: '{{t("This is a demo text, **supports Markdown syntax**.")}}'
-            }
-          }
+          name: "markdown",
+          title: '{{t("Markdown")}}',
+          Component: "MarkdownBlockInitializer"
         }
       ]
     }