@nocobase/client 1.4.0-beta.10 → 1.4.0-beta.11

package/es/index.mjs

@@ -102,7 +102,7 @@ import { createRoot as createRoot$1 } from "react-dom/client";
 import * as i18next from "i18next";
 import i18next__default from "i18next";
 import * as antIcons from "@ant-design/icons";
-import antIcons__default, { LoadingOutlined, createFromIconfontCN, RightOutlined, HighlightOutlined, PlusOutlined, DragOutlined, MenuOutlined, ArrowLeftOutlined, CopyOutlined, CloseCircleOutlined, UserOutlined, CloseCircleFilled, QuestionCircleOutlined, CloseOutlined, DownloadOutlined, InboxOutlined, DeleteOutlined, EditOutlined, DownOutlined, CheckOutlined, RightSquareOutlined, SyncOutlined, ExclamationCircleFilled, ApiOutlined, SettingOutlined, ReadOutlined, ReloadOutlined, SearchOutlined, TableOutlined, FormOutlined, OrderedListOutlined, LineOutlined, DisconnectOutlined, TranslationOutlined } from "@ant-design/icons";
+import antIcons__default, { LoadingOutlined, createFromIconfontCN, RightOutlined, HighlightOutlined, PlusOutlined, DragOutlined, MenuOutlined, ArrowLeftOutlined, CopyOutlined, CloseCircleOutlined, UserOutlined, CloseCircleFilled, QuestionCircleOutlined, CloseOutlined, DownloadOutlined, InboxOutlined, DeleteOutlined, EditOutlined, DownOutlined, CheckOutlined, RightSquareOutlined, SyncOutlined, ExclamationCircleFilled, ApiOutlined, SettingOutlined, ReadOutlined, ReloadOutlined, SearchOutlined, TableOutlined, FormOutlined, ProfileOutlined, AppstoreOutlined, OrderedListOutlined, LineOutlined, DisconnectOutlined, TranslationOutlined } from "@ant-design/icons";
 import * as formilyReactiveReact from "@formily/reactive-react";
 import { observer } from "@formily/reactive-react";
 import { ErrorBoundary } from "react-error-boundary";
@@ -745,6 +745,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get getStoredPopupContext() {
     return getStoredPopupContext;
   },
+  get handleDateChangeOnForm() {
+    return handleDateChangeOnForm;
+  },
   get inferPickerType() {
     return inferPickerType;
   },
@@ -2778,6 +2781,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get gridRowColWrap() {
     return gridRowColWrap;
   },
+  get handleDateChangeOnForm() {
+    return handleDateChangeOnForm;
+  },
   get hasIcon() {
     return hasIcon;
   },
@@ -4287,7 +4293,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.4.0-beta.10", 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.4.0-beta.11", 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",
@@ -4309,9 +4315,9 @@ const name = "@nocobase/client", version$1 = "1.4.0-beta.10", license = "AGPL-3.
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.4.0-beta.10",
-  "@nocobase/sdk": "1.4.0-beta.10",
-  "@nocobase/utils": "1.4.0-beta.10",
+  "@nocobase/evaluators": "1.4.0-beta.11",
+  "@nocobase/sdk": "1.4.0-beta.11",
+  "@nocobase/utils": "1.4.0-beta.11",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -4909,12 +4915,12 @@ const TreeNode = (e) => {
     });
   }
   const p = (y, { exclude: v = [], depth: I = 0, maxDepth: w, prefix: T = "" }) => I > w ? [] : n(y).map((A) => {
-    var L;
+    var z;
     if (v.includes(A.name) || !A.interface || ["sort", "password", "sequence"].includes(A.type) || o && o(A))
       return;
     const D = {
       type: "duplicate",
-      tag: c((L = A.uiSchema) == null ? void 0 : L.title) || A.name
+      tag: c((z = A.uiSchema) == null ? void 0 : z.title) || A.name
     }, $ = F(x({}, D), {
       role: "button",
       title: React.createElement(TreeNode, F(x({}, D), { displayType: t })),
@@ -4934,12 +4940,12 @@ const TreeNode = (e) => {
       exclude: ["id", ...systemKeys]
     })), $;
   }).filter(Boolean), m = (y, { prefix: v, maxDepth: I, depth: w = 0, exclude: T = [] }) => w > I ? [] : n(y).map((A) => {
-    var L;
+    var z;
     if (!A.target || !A.interface || T.includes(A.name))
       return;
     const D = {
       type: "preloading",
-      tag: c((L = A.uiSchema) == null ? void 0 : L.title) || A.name
+      tag: c((z = A.uiSchema) == null ? void 0 : z.title) || A.name
     }, $ = v ? `${v}.${A.name}` : A.name;
     return {
       role: "button",
@@ -4992,7 +4998,7 @@ const TreeNode = (e) => {
         const $ = a(A.interface);
         if (!($ != null && $.filterable))
           return;
-        const { nested: L, children: z, operators: j } = $.filterable, R = {
+        const { nested: z, children: O, operators: j } = $.filterable, R = {
           name: A.name,
           title: ((B = A == null ? void 0 : A.uiSchema) == null ? void 0 : B.title) || A.name,
           schema: A == null ? void 0 : A.uiSchema,
@@ -5002,7 +5008,7 @@ const TreeNode = (e) => {
         if (!(A.target && D > 2)) {
           if (D > 2)
             return R;
-          if (z != null && z.length && (R.children = z), L) {
+          if (O != null && O.length && (R.children = O), z) {
             const k = n(A.target), N = w(k, D + 1).filter(Boolean);
             R.children = R.children || [], R.children.push(...N);
           }
@@ -5010,9 +5016,9 @@ const TreeNode = (e) => {
         }
       }, w = (A, D) => {
         const $ = [];
-        return A.forEach((L) => {
-          const z = I(L, D);
-          z && $.push(z);
+        return A.forEach((z) => {
+          const O = I(z, D);
+          O && $.push(O);
         }), $;
       };
       return w(v, 1);
@@ -7039,7 +7045,7 @@ const REGEX_OF_VARIABLE = /^\s*\{\{\s*([a-zA-Z0-9_$-.]+?)\s*\}\}\s*$/g, REGEX_OF
 }, handleChangeOnFilter = (e, t, o) => {
   const n = o ? "YYYY-MM-DD HH:mm:ss" : getPickerFormat(t);
   return e && dayjs(e).format(n);
-}, handleChangeOnForm = (e, t, o, n, r, i) => {
+}, handleDateChangeOnForm = (e, t, o, n, r, i) => {
   const a = r ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD";
   if (!e)
     return e;
@@ -7061,7 +7067,7 @@ const REGEX_OF_VARIABLE = /^\s*\{\{\s*([a-zA-Z0-9_$-.]+?)\s*\}\}\s*$/g, REGEX_OF
       format: l,
       value: str2moment(e.value, e),
       onChange: (u, d) => {
-        c && c(a ? handleChangeOnFilter(u, n, o) : handleChangeOnForm(u, t, r, n, o, i));
+        c && c(a ? handleChangeOnFilter(u, n, o) : handleDateChangeOnForm(u, t, r, n, o, i));
       }
     });
   };
@@ -9255,7 +9261,7 @@ function withInitializer(e) {
           b ? b(y(R, { isInSubTable: i })) : r(d, y(R, { isInSubTable: i }), { onSuccess: p });
         },
         [b, y, r, d, p]
-      ), { wrapSSR: I, hashId: w, componentCls: T } = useSchemaInitializerStyles(), [A, D] = useState(!1), { token: $ } = theme.useToken(), L = useNiceDropdownMaxHeight([A]), z = useMemo(
+      ), { wrapSSR: I, hashId: w, componentCls: T } = useSchemaInitializerStyles(), [A, D] = useState(!1), { token: $ } = theme.useToken(), z = useNiceDropdownMaxHeight([A]), O = useMemo(
         () => x({
           options: o,
           style: C
@@ -9281,7 +9287,7 @@ function withInitializer(e) {
             insert: v,
             options: o
           },
-          children: f === !1 ? React.createElement(e, z) : /* @__PURE__ */ jsx(
+          children: f === !1 ? React.createElement(e, O) : /* @__PURE__ */ jsx(
             Popover,
             F(x({
               placement: "bottomLeft"
@@ -9296,7 +9302,7 @@ function withInitializer(e) {
                   {
                     className: `${T} ${w}`,
                     style: {
-                      maxHeight: L,
+                      maxHeight: z,
                       overflowY: "auto"
                     },
                     children: /* @__PURE__ */ jsx(
@@ -9318,7 +9324,7 @@ function withInitializer(e) {
                   }
                 )
               ),
-              children: React.createElement(e, z)
+              children: React.createElement(e, O)
             })
           )
         }
@@ -10450,7 +10456,7 @@ const variablesStore = {}, getFieldPath = (e, t) => {
       let w = mergeCtxWithLocalVariables(o.current, S);
       const { fieldPath: T, dataSource: A, variableOption: D } = getFieldPath(v, I);
       let $ = T;
-      const { fieldPath: L } = getFieldPath(C, I), z = y.length === 1 ? D == null ? void 0 : D.collectionName : (R = r(L, A)) == null ? void 0 : R.target;
+      const { fieldPath: z } = getFieldPath(C, I), O = y.length === 1 ? D == null ? void 0 : D.collectionName : (R = r(z, A)) == null ? void 0 : R.target;
       if (!(v in w))
         throw new Error(`VariablesProvider: ${v} is not found`);
       for (let M = 0; M < y.length; M++) {
@@ -10458,13 +10464,13 @@ const variablesStore = {}, getFieldPath = (e, t) => {
           return {
             value: w === void 0 ? D == null ? void 0 : D.defaultValue : w,
             dataSource: A,
-            collectionName: z
+            collectionName: O
           };
-        const k = y[M], { fieldPath: N } = getFieldPath(y.slice(0, M + 1).join("."), I), O = r(N, A), q = (B = i($)) == null ? void 0 : B.getPrimaryKey();
+        const k = y[M], { fieldPath: N } = getFieldPath(y.slice(0, M + 1).join("."), I), L = r(N, A), q = (B = i($)) == null ? void 0 : B.getPrimaryKey();
         if (Array.isArray(w)) {
           const E = w.map((U) => {
-            if (!(b != null && b.doNotRequest) && shouldToRequest(U == null ? void 0 : U[k]) && (U == null ? void 0 : U[q]) != null && O != null && O.target) {
-              const G = `/${$}/${U[O.sourceKey || q]}/${k}:${getAction(O.type)}`;
+            if (!(b != null && b.doNotRequest) && shouldToRequest(U == null ? void 0 : U[k]) && (U == null ? void 0 : U[q]) != null && L != null && L.target) {
+              const G = `/${$}/${U[L.sourceKey || q]}/${k}:${getAction(L.type)}`;
               if (hasRequested(G))
                 return getRequested(G);
               const H = n.request({
@@ -10478,9 +10484,9 @@ const variablesStore = {}, getFieldPath = (e, t) => {
             }
             return U == null ? void 0 : U[k];
           });
-          w = removeThroughCollectionFields(_.flatten(yield Promise.all(E)), O);
-        } else if (!(b != null && b.doNotRequest) && shouldToRequest(w[k]) && w[q] != null && (O != null && O.target)) {
-          const E = `/${$}/${w[O.sourceKey || q]}/${k}:${getAction(O.type)}`;
+          w = removeThroughCollectionFields(_.flatten(yield Promise.all(E)), L);
+        } else if (!(b != null && b.doNotRequest) && shouldToRequest(w[k]) && w[q] != null && (L != null && L.target)) {
+          const E = `/${$}/${w[L.sourceKey || q]}/${k}:${getAction(L.type)}`;
           let U = null;
           if (hasRequested(E))
             U = yield getRequested(E);
@@ -10494,10 +10500,10 @@ const variablesStore = {}, getFieldPath = (e, t) => {
             });
             stashRequested(E, G), U = yield G, clearRequested(E);
           }
-          raw(w)[k] || (raw(w)[k] = U.data.data), w = removeThroughCollectionFields(getValuesByPath(w, k), O);
+          raw(w)[k] || (raw(w)[k] = U.data.data), w = removeThroughCollectionFields(getValuesByPath(w, k), L);
         } else
-          w = removeThroughCollectionFields(getValuesByPath(w, k), O);
-        O != null && O.target && ($ = O.target);
+          w = removeThroughCollectionFields(getValuesByPath(w, k), L);
+        L != null && L.target && ($ = L.target);
       }
       const j = a(
         _.isFunction(w) ? w({ fieldOperator: b == null ? void 0 : b.fieldOperator, isParsingVariable: !0 }) : w
@@ -10505,7 +10511,7 @@ const variablesStore = {}, getFieldPath = (e, t) => {
       return {
         value: j === void 0 ? D.defaultValue : j,
         dataSource: A,
-        collectionName: z
+        collectionName: O
       };
     }),
     [r]
@@ -11833,14 +11839,14 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
   ].filter(Boolean).map((c) => encodePathValue(c)).join("/")}`;
 }, usePopupUtils = (e = {}) => {
   const t = useNavigateNoUpdate(), o = useLocationNoUpdate(), n = useFieldSchema(), r = useDataSourceKey(), i = useCollectionRecord(), a = useCollectionParentRecord(), l = useCollection(), c = useCollectionManager(), u = useAssociationName(), { visible: d, setVisible: p } = useContext(PopupVisibleProviderContext) || { visible: !1, setVisible: _.noop }, { params: m } = useCurrentPopupContext(), h = useDataBlockRequest(), { isPopupVisibleControlledByURL: g } = usePopupSettings(), { setVisible: f } = useContext(ActionContext), { updatePopupContext: C } = usePopupContextInActionOrAssociationField(), S = useCurrentPopupContext(), b = useCallback(
-    (z) => {
+    (O) => {
       var j;
-      return (j = z || (a == null ? void 0 : a.data)) == null ? void 0 : j[c.getSourceKeyByAssociation(u)];
+      return (j = O || (a == null ? void 0 : a.data)) == null ? void 0 : j[c.getSourceKeyByAssociation(u)];
     },
     [a, u]
   ), y = useTableBlockContext(), v = e.setVisible || f, I = useCallback(
     ({
-      tabKey: z,
+      tabKey: O,
       popupUid: j,
       recordData: R,
       sourceId: B,
@@ -11854,20 +11860,20 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
         collection: M,
         filterbytk: N,
         sourceid: B,
-        tab: z
+        tab: O
       });
     },
     [u, c, l, r, a == null ? void 0 : a.data, u]
   ), w = useCallback(() => {
-    const z = {
+    const O = {
       dataSource: r,
       collection: u || l == null ? void 0 : l.name,
       association: u
     };
-    return _.omitBy(z, _.isNil);
+    return _.omitBy(O, _.isNil);
   }, [r, l, u]), T = useCallback(
     ({
-      recordData: z,
+      recordData: O,
       parentRecordData: j,
       collectionNameUsedInURL: R,
       popupUidUsedInURL: B,
@@ -11876,10 +11882,10 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
       if (!g())
         return v == null ? void 0 : v(!0);
       const k = (M == null ? void 0 : M["x-uid"]) || (n == null ? void 0 : n["x-uid"]), N = b(j);
-      z = z || (i == null ? void 0 : i.data);
-      const O = I({
+      O = O || (i == null ? void 0 : i.data);
+      const L = I({
         popupUid: k,
-        recordData: z,
+        recordData: O,
         sourceId: N,
         collection: R,
         puid: B
@@ -11887,7 +11893,7 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
       let q = o.pathname;
       _.last(q) === "/" && (q = q.slice(0, -1)), storePopupContext(k, {
         schema: M || n,
-        record: new CollectionRecord({ isNew: !1, data: z }),
+        record: new CollectionRecord({ isNew: !1, data: O }),
         parentRecord: j ? new CollectionRecord({ isNew: !1, data: j }) : a,
         service: h,
         dataSource: r,
@@ -11895,7 +11901,7 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
         association: u,
         sourceId: N,
         tableBlockContext: y
-      }), C(w(), M), t(withSearchParams(`${q}${O}`));
+      }), C(w(), M), t(withSearchParams(`${q}${L}`));
     },
     [
       u,
@@ -11919,9 +11925,9 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
       return v == null ? void 0 : v(!1);
     t(withSearchParams(removeLastPopupPath(o.pathname)), { replace: !0 });
   }, [g, v, t, o == null ? void 0 : o.pathname]), D = useCallback(
-    (z) => {
+    (O) => {
       const j = b(), R = I({
-        tabKey: z,
+        tabKey: O,
         popupUid: m == null ? void 0 : m.popupuid,
         recordData: i == null ? void 0 : i.data,
         sourceId: j
@@ -11932,9 +11938,9 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
       });
     },
     [I, t, m == null ? void 0 : m.popupuid, i == null ? void 0 : i.data, o]
-  ), $ = useCallback((z, j) => {
-    j.__popup = z;
-  }, []), L = useCallback((z) => z.__popup, []);
+  ), $ = useCallback((O, j) => {
+    j.__popup = O;
+  }, []), z = useCallback((O) => O.__popup, []);
   return {
     /**
      * used to open popup by changing the url
@@ -11945,7 +11951,7 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
      */
     closePopup: A,
     savePopupSchemaToSchema: $,
-    getPopupSchemaFromSchema: L,
+    getPopupSchemaFromSchema: z,
     context: S,
     /**
      * @deprecated
@@ -12960,23 +12966,23 @@ const ColDivider = (e) => {
       if (!b)
         return;
       o.current = A.active.id;
-      const D = l.current, $ = D.previousElementSibling, L = D.nextElementSibling;
-      v([$.clientWidth, L.clientWidth]);
+      const D = l.current, $ = D.previousElementSibling, z = D.nextElementSibling;
+      v([$.clientWidth, z.clientWidth]);
     },
     onDragMove(A) {
       if (!b)
         return;
       o.current === A.active.id && (o.current = o.current + "_move");
-      const D = l.current, $ = D.previousElementSibling, L = D.nextElementSibling;
-      $.style.width = `${y[0] + A.delta.x}px`, L.style.width = `${y[1] - A.delta.x}px`;
+      const D = l.current, $ = D.previousElementSibling, z = D.nextElementSibling;
+      $.style.width = `${y[0] + A.delta.x}px`, z.style.width = `${y[1] - A.delta.x}px`;
     },
     onDragEnd(A) {
       var B;
       if (!o.current || (B = o.current) != null && B.startsWith(A.active.id) && !o.current.endsWith("_move") || y[0] <= 0 || y[1] <= 0 || (v([0, 0]), !h || !g))
         return;
-      const D = l.current, $ = D.previousElementSibling, L = D.nextElementSibling;
+      const D = l.current, $ = D.previousElementSibling, z = D.nextElementSibling;
       h["x-component-props"] = h["x-component-props"] || {}, g["x-component-props"] = g["x-component-props"] || {};
-      const z = D.clientWidth * (e.cols.length + 1) / e.cols.length, j = (100 * ($.getBoundingClientRect().width + z) / D.parentElement.clientWidth).toFixed(2), R = (100 * (L.getBoundingClientRect().width + z) / D.parentElement.clientWidth).toFixed(2);
+      const O = D.clientWidth * (e.cols.length + 1) / e.cols.length, j = (100 * ($.getBoundingClientRect().width + O) / D.parentElement.clientWidth).toFixed(2), R = (100 * (z.getBoundingClientRect().width + O) / D.parentElement.clientWidth).toFixed(2);
       _.set(h, "x-component-props.width", j), _.set(g, "x-component-props.width", R), i.emit("batchPatch", {
         schemas: [
           {
@@ -13269,8 +13275,8 @@ const TableColumnSchemaToolbar = (e) => /* @__PURE__ */ jsx(GridRowContext.Provi
     ),
     onChange: useCallback(
       ({ current: h, pageSize: g }, f, C) => {
-        var I, w, T, A, D, $, L, z, j, R;
-        const S = (T = (w = (I = t.parent) == null ? void 0 : I["x-decorator-props"]) == null ? void 0 : w.params) == null ? void 0 : T.sort, b = C.order ? C.order === "ascend" ? [C.field] : [`-${C.field}`] : S || i.current.dragSortBy, y = g || (($ = (D = (A = t.parent) == null ? void 0 : A["x-decorator-props"]) == null ? void 0 : D.params) == null ? void 0 : $.pageSize), v = F(x({}, (j = (z = (L = i.current) == null ? void 0 : L.service) == null ? void 0 : z.params) == null ? void 0 : j[0]), { page: h || 1, pageSize: y });
+        var I, w, T, A, D, $, z, O, j, R;
+        const S = (T = (w = (I = t.parent) == null ? void 0 : I["x-decorator-props"]) == null ? void 0 : w.params) == null ? void 0 : T.sort, b = C.order ? C.order === "ascend" ? [C.field] : [`-${C.field}`] : S || i.current.dragSortBy, y = g || (($ = (D = (A = t.parent) == null ? void 0 : A["x-decorator-props"]) == null ? void 0 : D.params) == null ? void 0 : $.pageSize), v = F(x({}, (j = (O = (z = i.current) == null ? void 0 : z.service) == null ? void 0 : O.params) == null ? void 0 : j[0]), { page: h || 1, pageSize: y });
         b && (v.sort = b), (R = i.current) == null || R.service.run(v);
       },
       [t.parent]
@@ -13288,13 +13294,13 @@ const TableColumnSchemaToolbar = (e) => /* @__PURE__ */ jsx(GridRowContext.Provi
           const I = C.find((k) => k.uid === v.uid);
           if (!I)
             return;
-          const w = (j = v.foreignKeyFields) == null ? void 0 : j.some((k) => k.name === I.field), T = getSourceKey(y, I.field), A = w ? T : o.rowKey, D = [h[A]], $ = ((R = v.service.params) == null ? void 0 : R[0]) || {}, L = ((M = (B = v.service.params) == null ? void 0 : B[1]) == null ? void 0 : M.filters) || {};
+          const w = (j = v.foreignKeyFields) == null ? void 0 : j.some((k) => k.name === I.field), T = getSourceKey(y, I.field), A = w ? T : o.rowKey, D = [h[A]], $ = ((R = v.service.params) == null ? void 0 : R[0]) || {}, z = ((M = (B = v.service.params) == null ? void 0 : B[1]) == null ? void 0 : M.filters) || {};
           if (f.includes(h[o.rowKey])) {
             if (v.dataLoadingMode === "manual")
               return v.clearData();
-            delete L[S];
+            delete z[S];
           } else
-            L[S] = {
+            z[S] = {
               $and: [
                 {
                   [I.field || o.rowKey]: {
@@ -13303,16 +13309,16 @@ const TableColumnSchemaToolbar = (e) => /* @__PURE__ */ jsx(GridRowContext.Provi
                 }
               ]
             };
-          const z = mergeFilter([
-            ...Object.values(L).map((k) => removeNullCondition(k)),
+          const O = mergeFilter([
+            ...Object.values(z).map((k) => removeNullCondition(k)),
             v.defaultFilter
           ]);
           return v.doFilter(
             F(x({}, $), {
               page: 1,
-              filter: z
+              filter: O
             }),
-            { filters: L }
+            { filters: z }
           );
         }), g((v) => v != null && v.includes(h[o.rowKey]) ? [] : [h[o.rowKey]]);
       },
@@ -13641,10 +13647,10 @@ const useTableSelectorParams = () => useContext(TableSelectorParamsContext), Tab
   var a, l, c, u, d, p, m, h, g, f, C, S, b, y, v, I;
   const e = useField(), t = useTableSelectorContext(), o = useFieldSchema(), { getCollectionJoinField: n } = useCollectionManager_deprecated(), r = recursiveParent$1(o, "CollectionField"), i = n(r == null ? void 0 : r["x-collection-field"]);
   return useEffect(() => {
-    var T, A, D, $, L, z, j, R, B, M, k, N, O;
+    var T, A, D, $, z, O, j, R, B, M, k, N, L;
     if (!((T = t == null ? void 0 : t.service) != null && T.loading)) {
       const q = (D = (A = t == null ? void 0 : t.service) == null ? void 0 : A.data) == null ? void 0 : D.data.map((E) => E);
-      e.value = q, ($ = e == null ? void 0 : e.setInitialValue) == null || $.call(e, q), e.data = e.data || {}, e.data.selectedRowKeys = [], e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (j = (z = (L = t == null ? void 0 : t.service) == null ? void 0 : L.data) == null ? void 0 : z.meta) == null ? void 0 : j.pageSize, e.componentProps.pagination.total = (M = (B = (R = t == null ? void 0 : t.service) == null ? void 0 : R.data) == null ? void 0 : B.meta) == null ? void 0 : M.count, e.componentProps.pagination.current = (O = (N = (k = t == null ? void 0 : t.service) == null ? void 0 : k.data) == null ? void 0 : N.meta) == null ? void 0 : O.page;
+      e.value = q, ($ = e == null ? void 0 : e.setInitialValue) == null || $.call(e, q), e.data = e.data || {}, e.data.selectedRowKeys = [], e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (j = (O = (z = t == null ? void 0 : t.service) == null ? void 0 : z.data) == null ? void 0 : O.meta) == null ? void 0 : j.pageSize, e.componentProps.pagination.total = (M = (B = (R = t == null ? void 0 : t.service) == null ? void 0 : R.data) == null ? void 0 : B.meta) == null ? void 0 : M.count, e.componentProps.pagination.current = (L = (N = (k = t == null ? void 0 : t.service) == null ? void 0 : k.data) == null ? void 0 : N.meta) == null ? void 0 : L.page;
     }
   }, [
     i == null ? void 0 : i.foreignKey,
@@ -14419,8 +14425,8 @@ const useFormItemInitializerFields = (e) => {
       schema: S
     };
     return l == "Kanban" && (b.find = (A, D, $) => {
-      const L = findSchema(A, "x-component", l);
-      return findSchema(L, D, $);
+      const z = findSchema(A, "x-component", l);
+      return findSchema(z, D, $);
     }), b;
   });
 }, useFilterFormItemInitializerFields = (e) => {
@@ -14784,13 +14790,13 @@ const useFormItemInitializerFields = (e) => {
         componentNamePrefix: m
       }).sort((D) => {
         const $ = _.toArray((C == null ? void 0 : C.inherits) || []);
-        if (D.name === (C == null ? void 0 : C.name) || $.some((L) => L === D.name))
+        if (D.name === (C == null ? void 0 : C.name) || $.some((z) => z === D.name))
           return -1;
       })
     ]
   })), [y, C == null ? void 0 : C.inherits, C == null ? void 0 : C.name, t, v, h]);
   return r ? useMemo(() => {
-    var z;
+    var O;
     const w = {
       name: "currentRecord",
       collectionName: C.name,
@@ -14855,18 +14861,18 @@ const useFormItemInitializerFields = (e) => {
       })
     };
     let $;
-    const L = S.length ? T : null;
+    const z = S.length ? T : null;
     if (I[0].children.length && S.length)
-      l ? $ = [w, L] : $ = [w, L, D];
+      l ? $ = [w, z] : $ = [w, z, D];
     else if (I[0].children.length)
       if (l) {
         if (I[0].children.length <= 1)
-          return I[0].children = ((z = I[0].children[0]) == null ? void 0 : z.children) || [], I;
+          return I[0].children = ((O = I[0].children[0]) == null ? void 0 : O.children) || [], I;
         $ = [w];
       } else
         $ = [w, D];
     else
-      l ? $ = [L] : $ = [L, D];
+      l ? $ = [z] : $ = [z, D];
     return [
       {
         name: "records",
@@ -15576,7 +15582,7 @@ const useGetAriaLabelOfDesigner = () => {
     display: block !important;
   }
 `, GeneralSchemaDesigner = (e) => {
-  var $, L;
+  var $, z;
   const t = useFieldSchema(), {
     disableInitializer: o,
     title: n,
@@ -15593,10 +15599,10 @@ const useGetAriaLabelOfDesigner = () => {
     t["x-settings"] || i,
     t["x-settings-props"]
   ), b = useGridRowContext(), y = useGridContext(), v = useDataSourceManager(), I = v == null ? void 0 : v.getDataSources(), w = useDataSource(), T = (I == null ? void 0 : I.length) > 1 && w, A = ["FormItem", "ReadPrettyFormItem"].includes(r == null ? void 0 : r.componentName) ? `${r == null ? void 0 : r.name} ${m("(Fields only)")}` : r == null ? void 0 : r.name, D = useMemo(() => {
-    var z;
+    var O;
     return {
       insertPosition: "afterEnd",
-      wrap: ((z = b == null ? void 0 : b.cols) == null ? void 0 : z.length) > 1 ? void 0 : gridRowColWrap,
+      wrap: ((O = b == null ? void 0 : b.cols) == null ? void 0 : O.length) > 1 ? void 0 : gridRowColWrap,
       Component: (j) => /* @__PURE__ */ jsx(
         PlusOutlined,
         F(x({}, j), {
@@ -15618,7 +15624,7 @@ const useGetAriaLabelOfDesigner = () => {
     ] }) }),
     /* @__PURE__ */ jsx("div", { className: "general-schema-designer-icons", children: /* @__PURE__ */ jsxs(Space$1, { size: 3, align: "center", children: [
       l && /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": g("drag-handler") }) }),
-      !o && (y != null && y.InitializerComponent ? /* @__PURE__ */ jsx(y.InitializerComponent, x({}, D)) : (L = y == null ? void 0 : y.renderSchemaInitializer) == null ? void 0 : L.call(y, D)),
+      !o && (y != null && y.InitializerComponent ? /* @__PURE__ */ jsx(y.InitializerComponent, x({}, D)) : (z = y == null ? void 0 : y.renderSchemaInitializer) == null ? void 0 : z.call(y, D)),
       S ? C(a) : /* @__PURE__ */ jsx(
         SchemaSettingsDropdown,
         F(x({
@@ -15637,7 +15643,7 @@ const useGetAriaLabelOfDesigner = () => {
     ] }) })
   ] }) })) : null;
 }, InternalSchemaToolbar = (e) => {
-  var O;
+  var L;
   const t = useFieldSchema(), {
     title: o,
     initializer: n,
@@ -15661,14 +15667,14 @@ const useGetAriaLabelOfDesigner = () => {
   }, [f, o]), { render: A, exists: D } = useSchemaSettingsRender(
     r || (t == null ? void 0 : t["x-settings"]),
     t == null ? void 0 : t["x-settings-props"]
-  ), { render: $, exists: L } = useSchemaInitializerRender(
+  ), { render: $, exists: z } = useSchemaInitializerRender(
     n || (t == null ? void 0 : t["x-initializer"]),
     t == null ? void 0 : t["x-initializer-props"]
-  ), z = useGridRowContext(), j = useGridContext(), R = useMemo(() => {
+  ), O = useGridRowContext(), j = useGridContext(), R = useMemo(() => {
     var q;
     return {
       insertPosition: "afterEnd",
-      wrap: ((q = z == null ? void 0 : z.cols) == null ? void 0 : q.length) === 1 ? gridRowColWrap : void 0,
+      wrap: ((q = O == null ? void 0 : O.cols) == null ? void 0 : q.length) === 1 ? gridRowColWrap : void 0,
       Component: (E) => /* @__PURE__ */ jsx(
         PlusOutlined,
         F(x({}, E), {
@@ -15678,15 +15684,15 @@ const useGetAriaLabelOfDesigner = () => {
         })
       )
     };
-  }, [b, (O = z == null ? void 0 : z.cols) == null ? void 0 : O.length]), B = useMemo(() => u === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": b("drag-handler") }) }), [u, b]), M = useMemo(() => {
+  }, [b, (L = O == null ? void 0 : O.cols) == null ? void 0 : L.length]), B = useMemo(() => u === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": b("drag-handler") }) }), [u, b]), M = useMemo(() => {
     var q;
     if (n === !1)
       return null;
-    if (L)
+    if (z)
       return $(R);
     if (j != null && j.InitializerComponent || j != null && j.renderSchemaInitializer)
       return j != null && j.InitializerComponent ? /* @__PURE__ */ jsx(j.InitializerComponent, x({}, R)) : (q = j.renderSchemaInitializer) == null ? void 0 : q.call(j, R);
-  }, [j, n, R, L, $]), k = useMemo(() => r !== !1 && D ? A() : null, [D, A, r]), N = useRef(null);
+  }, [j, n, R, z, $]), k = useMemo(() => r !== !1 && D ? A() : null, [D, A, r]), N = useRef(null);
   return useEffect(() => {
     const q = N.current;
     let E = q == null ? void 0 : q.parentElement;
@@ -17149,12 +17155,12 @@ const ActionLink = withDynamicSchemaProps(
       "onMouseEnter",
       "refreshDataBlockRequest",
       "confirmTitle"
-    ]), { t: v } = useTranslation(), I = useDesigner(), w = useField(), T = useFieldSchema(), A = useCompile(), D = useCollectionRecordData(), $ = A((H = T["x-component-props"]) == null ? void 0 : H.confirm) || g, L = useMemo(() => (T == null ? void 0 : T["x-linkage-rules"]) || [], [T == null ? void 0 : T["x-linkage-rules"]]), { designable: z } = useDesignable(), j = useComponent(n) || n, R = useVariables(), B = useLocalVariables({ currentForm: { values: D, readPretty: !1 } }), { visibleWithURL: M, setVisibleWithURL: k } = usePopupUtils(), { setSubmitted: N } = useActionContext(), { getAriaLabel: O } = useGetAriaLabelOfAction(l), q = useCollectionParentRecordData(), E = useMemo(() => {
+    ]), { t: v } = useTranslation(), I = useDesigner(), w = useField(), T = useFieldSchema(), A = useCompile(), D = useCollectionRecordData(), $ = A((H = T["x-component-props"]) == null ? void 0 : H.confirm) || g, z = useMemo(() => (T == null ? void 0 : T["x-linkage-rules"]) || [], [T == null ? void 0 : T["x-linkage-rules"]]), { designable: O } = useDesignable(), j = useComponent(n) || n, R = useVariables(), B = useLocalVariables({ currentForm: { values: D, readPretty: !1 } }), { visibleWithURL: M, setVisibleWithURL: k } = usePopupUtils(), { setSubmitted: N } = useActionContext(), { getAriaLabel: L } = useGetAriaLabelOfAction(l), q = useCollectionParentRecordData(), E = useMemo(() => {
       const W = l || A(T.title);
       return _.isString(W) ? v(W) : W;
     }, [l, T.title, v]);
     useEffect(() => {
-      w.stateOfLinkageRules && setInitialActionState(w), w.stateOfLinkageRules = {}, L.filter((W) => !W.disabled).forEach((W) => {
+      w.stateOfLinkageRules && setInitialActionState(w), w.stateOfLinkageRules = {}, z.filter((W) => !W.disabled).forEach((W) => {
         var X;
         (X = W.actions) == null || X.forEach((J) => {
           linkageAction({
@@ -17166,7 +17172,7 @@ const ActionLink = withDynamicSchemaProps(
           });
         });
       });
-    }, [w, L, B, R]);
+    }, [w, z, B, R]);
     const U = useCallback(
       (W) => {
         C == null || C(W);
@@ -17178,7 +17184,7 @@ const ActionLink = withDynamicSchemaProps(
       x({
         containerRefKey: o,
         fieldSchema: T,
-        designable: z,
+        designable: O,
         field: w,
         actionTitle: E,
         icon: a,
@@ -17201,7 +17207,7 @@ const ActionLink = withDynamicSchemaProps(
         visibleWithURL: M,
         setVisibleWithURL: k,
         setSubmitted: N,
-        getAriaLabel: O,
+        getAriaLabel: L,
         parentRecordData: q,
         actionCallback: h
       }, y)
@@ -17236,8 +17242,8 @@ const ActionLink = withDynamicSchemaProps(
     actionCallback: A,
     visibleWithURL: D,
     setVisibleWithURL: $,
-    setSubmitted: L,
-    getAriaLabel: z,
+    setSubmitted: z,
+    getAriaLabel: O,
     parentRecordData: j
   } = ge, R = K(ge, [
     "containerRefKey",
@@ -17268,7 +17274,7 @@ const ActionLink = withDynamicSchemaProps(
     "setSubmitted",
     "getAriaLabel",
     "parentRecordData"
-  ]), [B, M] = useState(!1), { wrapSSR: k, componentCls: N, hashId: O } = useStyles$g(), [q, E] = useState(!1), U = n["x-toolbar-props"] || n["x-designer-props"], G = (ue = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : ue.openMode, H = (xe = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : xe.openSize, W = (de = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : de.refreshDataBlockRequest, { modal: X } = App.useApp(), J = useForm(), Y = useACLActionParamsContext(), { run: Q, element: Z, disabled: te } = (T == null ? void 0 : T(A)) || {}, ee = J.disabled || i.disabled || ((pe = i.data) == null ? void 0 : pe.disabled) || w || te, se = useMemo(() => {
+  ]), [B, M] = useState(!1), { wrapSSR: k, componentCls: N, hashId: L } = useStyles$g(), [q, E] = useState(!1), U = n["x-toolbar-props"] || n["x-designer-props"], G = (ue = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : ue.openMode, H = (xe = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : xe.openSize, W = (de = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : de.refreshDataBlockRequest, { modal: X } = App.useApp(), J = useForm(), Y = useACLActionParamsContext(), { run: Q, element: Z, disabled: te } = (T == null ? void 0 : T(A)) || {}, ee = J.disabled || i.disabled || ((pe = i.data) == null ? void 0 : pe.disabled) || w || te, se = useMemo(() => {
     var ce;
     return F(x({}, I), {
       opacity: r && (((ce = i == null ? void 0 : i.data) == null ? void 0 : ce.hidden) || !Y) && 0.1,
@@ -17287,10 +17293,10 @@ const ActionLink = withDynamicSchemaProps(
     tarComponent: d,
     designerProps: U,
     componentCls: N,
-    hashId: O,
+    hashId: L,
     className: p,
     others: R,
-    getAriaLabel: z,
+    getAriaLabel: O,
     type: m,
     Designer: h,
     openMode: G,
@@ -17301,7 +17307,7 @@ const ActionLink = withDynamicSchemaProps(
     run: Q,
     confirm: f,
     modal: X,
-    setSubmitted: L,
+    setSubmitted: z,
     confirmTitle: C
   };
   let le = /* @__PURE__ */ jsx(PopupVisibleProvider, { visible: !1, children: /* @__PURE__ */ jsxs(
@@ -17318,7 +17324,7 @@ const ActionLink = withDynamicSchemaProps(
       openSize: H,
       containerRefKey: o,
       fieldSchema: n,
-      setSubmitted: L,
+      setSubmitted: z,
       children: [
         S && /* @__PURE__ */ jsx(RecursionField, { basePath: i.address, onlyRenderProperties: !0, schema: n }),
         !S && /* @__PURE__ */ jsx(RenderButton, x({}, ie)),
@@ -17398,24 +17404,24 @@ function RenderButton({
   confirm: A,
   modal: D,
   setSubmitted: $,
-  confirmTitle: L
+  confirmTitle: z
 }) {
-  const z = useDataBlockRequest(), { t: j } = useTranslation(), { isPopupVisibleControlledByURL: R } = usePopupSettings(), { openPopup: B } = usePopupUtils(), M = useRef(null);
-  M.current = z;
+  const O = useDataBlockRequest(), { t: j } = useTranslation(), { isPopupVisibleControlledByURL: R } = usePopupSettings(), { openPopup: B } = usePopupUtils(), M = useRef(null);
+  M.current = O;
   const k = useRef(null);
   k.current = B;
   const N = useCallback(
-    (O, q = !0) => {
-      if (!(q && isPortalInBody(O.target)) && (O.preventDefault(), O.stopPropagation(), !a && o)) {
+    (L, q = !0) => {
+      if (!(q && isPortalInBody(L.target)) && (L.preventDefault(), L.stopPropagation(), !a && o)) {
         const E = () => {
-          y ? y(O, () => {
+          y ? y(L, () => {
             var U, G;
             v !== !1 && ($ == null || $(!0), (G = (U = M.current) == null ? void 0 : U.refresh) == null || G.call(U));
           }) : isBulkEditAction(I) || !R() ? (w(!0), T == null || T()) : ["view", "update", "create", "customize:popup"].includes(I["x-action"]) && I["x-uid"] ? k.current() : (w(!0), T == null || T());
         };
         (A == null ? void 0 : A.enable) !== !1 && (A != null && A.content) ? D.confirm({
-          title: j(A.title, { title: L || n }),
-          content: j(A.content, { title: L || n }),
+          title: j(A.title, { title: z || n }),
+          content: j(A.content, { title: z || n }),
           onOk: E
         }) : E();
       }
@@ -17435,7 +17441,7 @@ function RenderButton({
       T,
       D,
       j,
-      L,
+      z,
       n
     ]
   );
@@ -18036,19 +18042,19 @@ https://requirejs.org/docs/errors.html#` + e);
       config: {}
     }, l = {}, c = {}, u = {}, d = [], p = {}, m = {}, h = {}, g = 1, f = 1;
     function C(k) {
-      var N, O;
+      var N, L;
       for (N = 0; N < k.length; N++)
-        if (O = k[N], O === ".")
+        if (L = k[N], L === ".")
           k.splice(N, 1), N -= 1;
-        else if (O === "..") {
+        else if (L === "..") {
           if (N === 0 || N === 1 && k[2] === ".." || k[N - 1] === "..")
             continue;
           N > 0 && (k.splice(N - 1, 2), N -= 2);
         }
     }
-    function S(k, N, O) {
+    function S(k, N, L) {
       var q, E, U, G, H, W, X, J, Y, Q, Z, te, ee = N && N.split("/"), se = a.map, ie = se && se["*"];
-      if (k && (k = k.split("/"), X = k.length - 1, a.nodeIdCompat && jsSuffixRegExp.test(k[X]) && (k[X] = k[X].replace(jsSuffixRegExp, "")), k[0].charAt(0) === "." && ee && (te = ee.slice(0, ee.length - 1), k = te.concat(k)), C(k), k = k.join("/")), O && se && (ee || ie)) {
+      if (k && (k = k.split("/"), X = k.length - 1, a.nodeIdCompat && jsSuffixRegExp.test(k[X]) && (k[X] = k[X].replace(jsSuffixRegExp, "")), k[0].charAt(0) === "." && ee && (te = ee.slice(0, ee.length - 1), k = te.concat(k)), C(k), k = k.join("/")), L && se && (ee || ie)) {
         U = k.split("/");
         e:
           for (G = U.length; G > 0; G -= 1) {
@@ -18079,14 +18085,14 @@ https://requirejs.org/docs/errors.html#` + e);
         })([k]), !0;
     }
     function v(k) {
-      var N, O = k ? k.indexOf("!") : -1;
-      return O > -1 && (N = k.substring(0, O), k = k.substring(O + 1, k.length)), [N, k];
+      var N, L = k ? k.indexOf("!") : -1;
+      return L > -1 && (N = k.substring(0, L), k = k.substring(L + 1, k.length)), [N, k];
     }
-    function I(k, N, O, q) {
+    function I(k, N, L, q) {
       var E, U, G, H, W = null, X = N ? N.name : null, J = k, Y = !0, Q = "";
-      return k || (Y = !1, k = "_@r" + (g += 1)), H = v(k), W = H[0], k = H[1], W && (W = S(W, X, q), U = getOwn(p, W)), k && (W ? O ? Q = k : U && U.normalize ? Q = U.normalize(k, function(Z) {
+      return k || (Y = !1, k = "_@r" + (g += 1)), H = v(k), W = H[0], k = H[1], W && (W = S(W, X, q), U = getOwn(p, W)), k && (W ? L ? Q = k : U && U.normalize ? Q = U.normalize(k, function(Z) {
         return S(Z, X, q);
-      }) : Q = k.indexOf("!") === -1 ? S(k, X, q) : k : (Q = S(k, X, q), H = v(Q), W = H[0], Q = H[1], O = !0, E = n.nameToUrl(Q))), G = W && !U && !O ? "_unnormalized" + (f += 1) : "", {
+      }) : Q = k.indexOf("!") === -1 ? S(k, X, q) : k : (Q = S(k, X, q), H = v(Q), W = H[0], Q = H[1], L = !0, E = n.nameToUrl(Q))), G = W && !U && !L ? "_unnormalized" + (f += 1) : "", {
         prefix: W,
         name: Q,
         parentMap: N,
@@ -18098,16 +18104,16 @@ https://requirejs.org/docs/errors.html#` + e);
       };
     }
     function w(k) {
-      var N = k.id, O = getOwn(l, N);
-      return O || (O = l[N] = new n.Module(k)), O;
+      var N = k.id, L = getOwn(l, N);
+      return L || (L = l[N] = new n.Module(k)), L;
     }
-    function T(k, N, O) {
+    function T(k, N, L) {
       var q = k.id, E = getOwn(l, q);
-      hasProp(p, q) && (!E || E.defineEmitComplete) ? N === "defined" && O(p[q]) : (E = w(k), E.error && N === "error" ? O(E.error) : E.on(N, O));
+      hasProp(p, q) && (!E || E.defineEmitComplete) ? N === "defined" && L(p[q]) : (E = w(k), E.error && N === "error" ? L(E.error) : E.on(N, L));
     }
     function A(k, N) {
-      var O = k.requireModules, q = !1;
-      N ? N(k) : (each(O, function(E) {
+      var L = k.requireModules, q = !1;
+      N ? N(k) : (each(L, function(E) {
         var U = getOwn(l, E);
         U && (U.error = k, U.events.error && (q = !0, U.emit("error", k)));
       }), q || req.onError(k));
@@ -18140,15 +18146,15 @@ https://requirejs.org/docs/errors.html#` + e);
     function $(k) {
       delete l[k], delete c[k];
     }
-    function L(k, N, O) {
+    function z(k, N, L) {
       var q = k.map.id;
       k.error ? k.emit("error", k.error) : (N[q] = !0, each(k.depMaps, function(E, U) {
         var G = E.id, H = getOwn(l, G);
-        H && !k.depMatched[U] && !O[G] && (getOwn(N, G) ? (k.defineDep(U, p[G]), k.check()) : L(H, N, O));
-      }), O[q] = !0);
+        H && !k.depMatched[U] && !L[G] && (getOwn(N, G) ? (k.defineDep(U, p[G]), k.check()) : z(H, N, L));
+      }), L[q] = !0);
     }
-    function z() {
-      var k, N, O = a.waitSeconds * 1e3, q = O && n.startTime + O < (/* @__PURE__ */ new Date()).getTime(), E = [], U = [], G = !1, H = !0;
+    function O() {
+      var k, N, L = a.waitSeconds * 1e3, q = L && n.startTime + L < (/* @__PURE__ */ new Date()).getTime(), E = [], U = [], G = !1, H = !0;
       if (!t) {
         if (t = !0, eachProp(c, function(W) {
           var X = W.map, J = X.id;
@@ -18161,19 +18167,19 @@ https://requirejs.org/docs/errors.html#` + e);
         }), q && E.length)
           return k = makeError("timeout", "Load timeout for modules: " + E, null, E), k.contextName = n.contextName, A(k);
         H && each(U, function(W) {
-          L(W, {}, {});
+          z(W, {}, {});
         }), (!q || N) && G && (isBrowser || isWebWorker) && !i && (i = setTimeout(function() {
-          i = 0, z();
+          i = 0, O();
         }, 50)), t = !1;
       }
     }
     o = function(k) {
       this.events = getOwn(u, k.id) || {}, this.map = k, this.shim = getOwn(a.shim, k.id), this.depExports = [], this.depMaps = [], this.depMatched = [], this.pluginMaps = {}, this.depCount = 0;
     }, o.prototype = {
-      init: function(k, N, O, q) {
-        q = q || {}, !this.inited && (this.factory = N, O ? this.on("error", O) : this.events.error && (O = bind(this, function(E) {
+      init: function(k, N, L, q) {
+        q = q || {}, !this.inited && (this.factory = N, L ? this.on("error", L) : this.events.error && (L = bind(this, function(E) {
           this.emit("error", E);
-        })), this.depMaps = k && k.slice(0), this.errback = O, this.inited = !0, this.ignore = q.ignore, q.enabled || this.enabled ? this.enable() : this.check());
+        })), this.depMaps = k && k.slice(0), this.errback = L, this.inited = !0, this.ignore = q.ignore, q.enabled || this.enabled ? this.enable() : this.check());
       },
       defineDep: function(k, N) {
         this.depMatched[k] || (this.depMatched[k] = !0, this.depCount -= 1, this.depExports[k] = N);
@@ -18202,9 +18208,9 @@ https://requirejs.org/docs/errors.html#` + e);
        */
       check: function() {
         if (!(!this.enabled || this.enabling)) {
-          var k, N, O = this.map.id, q = this.depExports, E = this.exports, U = this.factory;
+          var k, N, L = this.map.id, q = this.depExports, E = this.exports, U = this.factory;
           if (!this.inited)
-            hasProp(n.defQueueMap, O) || this.fetch();
+            hasProp(n.defQueueMap, L) || this.fetch();
           else if (this.error)
             this.emit("error", this.error);
           else if (!this.defining) {
@@ -18212,31 +18218,31 @@ https://requirejs.org/docs/errors.html#` + e);
               if (isFunction(U)) {
                 if (this.events.error && this.map.isDefine || req.onError !== defaultOnError)
                   try {
-                    E = n.execCb(O, U, q, E);
+                    E = n.execCb(L, U, q, E);
                   } catch (H) {
                     k = H;
                   }
                 else
-                  E = n.execCb(O, U, q, E);
+                  E = n.execCb(L, U, q, E);
                 if (this.map.isDefine && E === void 0 && (N = this.module, N ? E = N.exports : this.usingExports && (E = this.exports)), k)
                   return k.requireMap = this.map, k.requireModules = this.map.isDefine ? [this.map.id] : null, k.requireType = this.map.isDefine ? "define" : "require", A(this.error = k);
               } else
                 E = U;
-              if (this.exports = E, this.map.isDefine && !this.ignore && (p[O] = E, req.onResourceLoad)) {
+              if (this.exports = E, this.map.isDefine && !this.ignore && (p[L] = E, req.onResourceLoad)) {
                 var G = [];
                 each(this.depMaps, function(H) {
                   G.push(H.normalizedMap || H);
                 }), req.onResourceLoad(n, this.map, G);
               }
-              $(O), this.defined = !0;
+              $(L), this.defined = !0;
             }
             this.defining = !1, this.defined && !this.defineEmitted && (this.defineEmitted = !0, this.emit("defined", this.exports), this.defineEmitComplete = !0);
           }
         }
       },
       callPlugin: function() {
-        var k = this.map, N = k.id, O = I(k.prefix);
-        this.depMaps.push(O), T(O, "defined", bind(this, function(q) {
+        var k = this.map, N = k.id, L = I(k.prefix);
+        this.depMaps.push(L), T(L, "defined", bind(this, function(q) {
           var E, U, G, H = getOwn(h, this.map.id), W = this.map.name, X = this.map.parentMap ? this.map.parentMap.name : null, J = n.makeRequire(k.parentMap, {
             enableBuildCallback: !0
           });
@@ -18292,11 +18298,11 @@ https://requirejs.org/docs/errors.html#` + e);
             }
             ee && (useInteractive = !0), this.depMaps.push(te), n.completeLoad(Z), J([Z], E);
           }), q.load(k.name, J, E, a);
-        })), n.enable(O, this), this.pluginMaps[O.id] = O;
+        })), n.enable(L, this), this.pluginMaps[L.id] = L;
       },
       enable: function() {
         c[this.map.id] = this, this.enabled = !0, this.enabling = !0, each(this.depMaps, bind(this, function(k, N) {
-          var O, q, E;
+          var L, q, E;
           if (typeof k == "string") {
             if (k = I(
               k,
@@ -18313,27 +18319,27 @@ https://requirejs.org/docs/errors.html#` + e);
               this.emit("error", U);
             }));
           }
-          O = k.id, q = l[O], !hasProp(r, O) && q && !q.enabled && n.enable(k, this);
+          L = k.id, q = l[L], !hasProp(r, L) && q && !q.enabled && n.enable(k, this);
         })), eachProp(this.pluginMaps, bind(this, function(k) {
           var N = getOwn(l, k.id);
           N && !N.enabled && n.enable(k, this);
         })), this.enabling = !1, this.check();
       },
       on: function(k, N) {
-        var O = this.events[k];
-        O || (O = this.events[k] = []), O.push(N);
+        var L = this.events[k];
+        L || (L = this.events[k] = []), L.push(N);
       },
       emit: function(k, N) {
-        each(this.events[k], function(O) {
-          O(N);
+        each(this.events[k], function(L) {
+          L(N);
         }), k === "error" && delete this.events[k];
       }
     };
     function j(k) {
       hasProp(p, k[0]) || w(I(k[0], null, !0)).init(k[1], k[2]);
     }
-    function R(k, N, O, q) {
-      k.detachEvent && !isOpera ? q && k.detachEvent(q, N) : k.removeEventListener(O, N, !1);
+    function R(k, N, L, q) {
+      k.detachEvent && !isOpera ? q && k.detachEvent(q, N) : k.removeEventListener(L, N, !1);
     }
     function B(k) {
       var N = k.currentTarget || k.srcElement;
@@ -18374,7 +18380,7 @@ https://requirejs.org/docs/errors.html#` + e);
             return (U.indexOf("?") === -1 ? "?" : "&") + N;
           };
         }
-        var O = a.shim, q = {
+        var L = a.shim, q = {
           paths: !0,
           bundles: !0,
           config: !0,
@@ -18389,8 +18395,8 @@ https://requirejs.org/docs/errors.html#` + e);
         }), k.shim && (eachProp(k.shim, function(E, U) {
           isArray(E) && (E = {
             deps: E
-          }), (E.exports || E.init) && !E.exportsFn && (E.exportsFn = n.makeShimExports(E)), O[U] = E;
-        }), a.shim = O), k.packages && each(k.packages, function(E) {
+          }), (E.exports || E.init) && !E.exportsFn && (E.exportsFn = n.makeShimExports(E)), L[U] = E;
+        }), a.shim = L), k.packages && each(k.packages, function(E) {
           var U, G;
           E = typeof E == "string" ? { name: E } : E, G = E.name, U = E.location, U && (a.paths[G] = E.location), a.pkgs[G] = E.name + "/" + (E.main || "main").replace(currDirRegExp, "").replace(jsSuffixRegExp, "");
         }), eachProp(l, function(E, U) {
@@ -18399,22 +18405,22 @@ https://requirejs.org/docs/errors.html#` + e);
       },
       makeShimExports: function(k) {
         function N() {
-          var O;
-          return k.init && (O = k.init.apply(global, arguments)), O || k.exports && getGlobal(k.exports);
+          var L;
+          return k.init && (L = k.init.apply(global, arguments)), L || k.exports && getGlobal(k.exports);
         }
         return N;
       },
       makeRequire: function(k, N) {
         N = N || {};
-        function O(q, E, U) {
+        function L(q, E, U) {
           var G, H, W;
-          return N.enableBuildCallback && E && isFunction(E) && (E.__requireJsBuild = !0), typeof q == "string" ? isFunction(E) ? A(makeError("requireargs", "Invalid require call"), U) : k && hasProp(r, q) ? r[q](l[k.id]) : req.get ? req.get(n, q, k, O) : (H = I(q, k, !1, !0), G = H.id, hasProp(p, G) ? p[G] : A(makeError("notloaded", 'Module name "' + G + '" has not been loaded yet for context: ' + e + (k ? "" : ". Use require([])")))) : (M(), n.nextTick(function() {
+          return N.enableBuildCallback && E && isFunction(E) && (E.__requireJsBuild = !0), typeof q == "string" ? isFunction(E) ? A(makeError("requireargs", "Invalid require call"), U) : k && hasProp(r, q) ? r[q](l[k.id]) : req.get ? req.get(n, q, k, L) : (H = I(q, k, !1, !0), G = H.id, hasProp(p, G) ? p[G] : A(makeError("notloaded", 'Module name "' + G + '" has not been loaded yet for context: ' + e + (k ? "" : ". Use require([])")))) : (M(), n.nextTick(function() {
             M(), W = w(I(null, k)), W.skipMap = N.skipMap, W.init(q, E, U, {
               enabled: !0
-            }), z();
-          }), O);
+            }), O();
+          }), L);
         }
-        return mixin(O, {
+        return mixin(L, {
           isBrowser,
           /**
            * Converts a module name + .extension into an URL path.
@@ -18435,13 +18441,13 @@ https://requirejs.org/docs/errors.html#` + e);
           specified: function(q) {
             return q = I(q, k, !1, !0).id, hasProp(p, q) || hasProp(l, q);
           }
-        }), k || (O.undef = function(q) {
+        }), k || (L.undef = function(q) {
           D();
           var E = I(q, k, !0), U = getOwn(l, q);
           U.undefed = !0, b(q), delete p[q], delete m[E.url], delete u[q], eachReverse(d, function(G, H) {
             G[0] === q && d.splice(H, 1);
           }), delete n.defQueueMap[q], U && (U.events.defined && (u[q] = U.events), $(q));
-        }), O;
+        }), L;
       },
       /**
        * Called to enable a module if it is still in the registry
@@ -18460,15 +18466,15 @@ https://requirejs.org/docs/errors.html#` + e);
        * @param {String} moduleName the name of the module to potentially complete.
        */
       completeLoad: function(k) {
-        var N, O, q, E = getOwn(a.shim, k) || {}, U = E.exports;
+        var N, L, q, E = getOwn(a.shim, k) || {}, U = E.exports;
         for (D(); d.length; ) {
-          if (O = d.shift(), O[0] === null) {
-            if (O[0] = k, N)
+          if (L = d.shift(), L[0] === null) {
+            if (L[0] = k, N)
               break;
             N = !0;
           } else
-            O[0] === k && (N = !0);
-          j(O);
+            L[0] === k && (N = !0);
+          j(L);
         }
         if (n.defQueueMap = {}, q = getOwn(l, k), !N && !hasProp(p, k) && q && !q.inited) {
           if (a.enforceDefine && (!U || !getGlobal(U)))
@@ -18480,7 +18486,7 @@ https://requirejs.org/docs/errors.html#` + e);
             ));
           j([k, E.deps || [], E.exportsFn]);
         }
-        z();
+        O();
       },
       /**
        * Converts a module name to a file path. Supports cases where
@@ -18489,10 +18495,10 @@ https://requirejs.org/docs/errors.html#` + e);
        * it is assumed to have already been normalized. This is an
        * internal API, not a public one. Use toUrl for the public API.
        */
-      nameToUrl: function(k, N, O) {
+      nameToUrl: function(k, N, L) {
         var q, E, U, G, H, W, X, J = getOwn(a.pkgs, k);
         if (J && (k = J), X = getOwn(h, k), X)
-          return n.nameToUrl(X, N, O);
+          return n.nameToUrl(X, N, L);
         if (req.jsExtRegExp.test(k))
           H = k + (N || "");
         else {
@@ -18501,7 +18507,7 @@ https://requirejs.org/docs/errors.html#` + e);
               isArray(W) && (W = W[0]), E.splice(0, U, W);
               break;
             }
-          H = E.join("/"), H += N || (/^data\:|^blob\:|\?/.test(H) || O ? "" : ".js"), H = (H.charAt(0) === "/" || H.match(/^[\w\+\.\-]+:/) ? "" : a.baseUrl) + H;
+          H = E.join("/"), H += N || (/^data\:|^blob\:|\?/.test(H) || L ? "" : ".js"), H = (H.charAt(0) === "/" || H.match(/^[\w\+\.\-]+:/) ? "" : a.baseUrl) + H;
         }
         return a.urlArgs && !/^blob\:/.test(H) ? H + a.urlArgs(k, H) : H;
       },
@@ -18517,8 +18523,8 @@ https://requirejs.org/docs/errors.html#` + e);
        *
        * @private
        */
-      execCb: function(k, N, O, q) {
-        return N.apply(q, O);
+      execCb: function(k, N, L, q) {
+        return N.apply(q, L);
       },
       /**
        * callback for script loads, used to check status of loading.
@@ -18539,13 +18545,13 @@ https://requirejs.org/docs/errors.html#` + e);
       onScriptError: function(k) {
         var N = B(k);
         if (!y(N.id)) {
-          var O = [];
+          var L = [];
           return eachProp(l, function(q, E) {
             E.indexOf("_@r") !== 0 && each(q.depMaps, function(U) {
               if (U.id === N.id)
-                return O.push(E), !0;
+                return L.push(E), !0;
             });
-          }), A(makeError("scripterror", 'Script error for "' + N.id + (O.length ? '", needed by: ' + O.join(", ") : '"'), k, [N.id]));
+          }), A(makeError("scripterror", 'Script error for "' + N.id + (L.length ? '", needed by: ' + L.join(", ") : '"'), k, [N.id]));
         }
       }
     }, n.require = n.makeRequire(), n;
@@ -19087,10 +19093,10 @@ const useCollectionManager_deprecated = (e) => {
     [t, p]
   ), v = useCallback(
     (R, B = !1, M) => {
-      var O;
+      var L;
       if (!R)
         return [];
-      const k = (O = p(M)) == null ? void 0 : O.getCollection(R);
+      const k = (L = p(M)) == null ? void 0 : L.getCollection(R);
       return (k == null ? void 0 : k.getChildrenCollections(B)) || [];
     },
     [t, p]
@@ -19106,7 +19112,7 @@ const useCollectionManager_deprecated = (e) => {
       const {
         association: k = !1,
         cached: N = {},
-        collectionNames: O = [R],
+        collectionNames: L = [R],
         maxDepth: q = 1,
         allowAllTypes: E = !1,
         exceptInterfaces: U = [],
@@ -19114,7 +19120,7 @@ const useCollectionManager_deprecated = (e) => {
         usePrefix: H = !1,
         dataSource: W
       } = M || {};
-      if (O.length - 1 > q)
+      if (L.length - 1 > q)
         return;
       if (N[R])
         return _.cloneDeep(N[R]);
@@ -19127,10 +19133,10 @@ const useCollectionManager_deprecated = (e) => {
           value: H && G ? `${G}.${Q.name}` : Q.name,
           label: f((te = Q == null ? void 0 : Q.uiSchema) == null ? void 0 : te.title) || Q.name
         }, Q);
-        return k && Q.target && (Z.children = O.includes(Q.target) ? [] : w(Q.target, B, F(x({}, M), {
+        return k && Q.target && (Z.children = L.includes(Q.target) ? [] : w(Q.target, B, F(x({}, M), {
           cached: N,
           dataSource: W,
-          collectionNames: [...O, Q.target],
+          collectionNames: [...L, Q.target],
           prefixFieldValue: H ? G ? `${G}.${Q.name}` : Q.name : "",
           usePrefix: H
         })), !((ee = Z.children) != null && ee.length)) ? null : Z;
@@ -19159,13 +19165,13 @@ const useCollectionManager_deprecated = (e) => {
   ), $ = useCallback(
     (R) => t == null ? void 0 : t.collectionFieldInterfaceManager.getFieldInterface(R),
     [t]
-  ), L = useCallback(
+  ), z = useCallback(
     (R) => {
       var B;
       return (B = $(R.interface)) == null ? void 0 : B.titleUsable;
     },
     [$]
-  ), z = useCallback(
+  ), O = useCallback(
     (R, B, M) => {
       var k, N;
       return (N = (k = p(M)) == null ? void 0 : k.getCollection(B)) == null ? void 0 : N.getParentCollectionFields(R);
@@ -19183,7 +19189,7 @@ const useCollectionManager_deprecated = (e) => {
     getTemplate: j,
     getInterface: $,
     getCollections: d,
-    getParentCollectionFields: z,
+    getParentCollectionFields: O,
     getInheritCollections: y,
     getChildrenCollections: v,
     refreshCM: g,
@@ -19197,7 +19203,7 @@ const useCollectionManager_deprecated = (e) => {
     getCollectionJoinField: b,
     getAllCollectionsInheritChain: A,
     getInheritCollectionsChain: D,
-    isTitleField: L
+    isTitleField: z
   };
 }, GetMenuItemContext = createContext(null);
 GetMenuItemContext.displayName = "GetMenuItemContext";
@@ -19423,7 +19429,7 @@ const useUserVariable = ({
     collectionField: e,
     noDisabled: r,
     targetFieldSchema: i
-  }), { urlSearchParamsSettings: L, shouldDisplay: z } = useURLSearchParamsVariable();
+  }), { urlSearchParamsSettings: z, shouldDisplay: O } = useURLSearchParamsVariable();
   return useMemo(() => [
     u,
     d,
@@ -19436,7 +19442,7 @@ const useUserVariable = ({
     $ && D,
     w && I,
     A && T,
-    z && L
+    O && z
   ].filter(Boolean).filter(l), [
     u,
     d,
@@ -19454,8 +19460,8 @@ const useUserVariable = ({
     D,
     w,
     I,
-    z,
-    L
+    O,
+    z
   ]);
 }, RemoveConditionContext = createContext(null);
 RemoveConditionContext.displayName = "RemoveConditionContext";
@@ -21510,7 +21516,7 @@ const SchemaSettingsProvider = (e) => {
   }, [JSON.stringify(r || {})]);
   const $ = useCallback(() => {
     h(!1), D.reset();
-  }, [D]), L = useCallback(() => V(void 0, null, function* () {
+  }, [D]), z = useCallback(() => V(void 0, null, function* () {
     yield D.submit();
     try {
       const B = D.values, M = Object.keys(B).reduce((k, N) => (D.query(N).take() && (k[N] = B[N]), k), {});
@@ -21518,7 +21524,7 @@ const SchemaSettingsProvider = (e) => {
     } catch (B) {
       console.error(B);
     }
-  }), [D, o]), z = useCallback(() => V(void 0, null, function* () {
+  }), [D, o]), O = useCallback(() => V(void 0, null, function* () {
     !g && (a != null && a["x-uid"]) && (S["x-action-settings"].schemaUid = a["x-uid"], y.emit("patch", { schema: S }), yield I.resource("uiSchemas").insert({ values: a }), f(a["x-uid"])), typeof i == "function" && (i == null || i()), b.setVisible(!1), h(!0);
   }), [I, b, y, S, a, g]), j = useCallback((B) => B.stopPropagation(), []);
   return /* @__PURE__ */ jsxs(zIndexContext.Provider, { value: A, children: [
@@ -21527,7 +21533,7 @@ const SchemaSettingsProvider = (e) => {
       F(x({
         title: v(t)
       }, p), {
-        onClick: z,
+        onClick: O,
         onKeyDown: j,
         children: e.children || e.title
       })
@@ -21545,7 +21551,7 @@ const SchemaSettingsProvider = (e) => {
           zIndex: A,
           footer: /* @__PURE__ */ jsxs(Space$1, { children: [
             /* @__PURE__ */ jsx(Button, { onClick: $, children: C("Cancel") }),
-            /* @__PURE__ */ jsx(Button, { type: "primary", onClick: L, children: C("Submit") })
+            /* @__PURE__ */ jsx(Button, { type: "primary", onClick: z, children: C("Submit") })
           ] }),
           children: /* @__PURE__ */ jsx(FormActiveFieldsProvider, { name: "form", getActiveFieldsName: w == null ? void 0 : w.getActiveFieldsName, children: /* @__PURE__ */ jsx(FormProvider, { form: D, children: /* @__PURE__ */ jsxs(FormLayout, { layout: "vertical", children: [
             c && /* @__PURE__ */ jsx(Alert, { message: c }),
@@ -21561,7 +21567,7 @@ const SchemaSettingsProvider = (e) => {
 });
 SchemaSettingsActionModalItem.displayName = "SchemaSettingsActionModalItem";
 const SchemaSettingsModalItem = (e) => {
-  const O = e, {
+  const L = e, {
     hidden: t,
     title: o,
     components: n,
@@ -21573,7 +21579,7 @@ const SchemaSettingsModalItem = (e) => {
     width: u = "fit-content",
     noRecord: d = !1,
     ModalContextProvider: p = (q) => /* @__PURE__ */ jsx(Fragment, { children: q.children })
-  } = O, m = K(O, [
+  } = L, m = K(L, [
     "hidden",
     "title",
     "components",
@@ -21585,7 +21591,7 @@ const SchemaSettingsModalItem = (e) => {
     "width",
     "noRecord",
     "ModalContextProvider"
-  ]), h = useContext(SchemaOptionsContext), g = useCollection_deprecated(), f = useAPIClient(), C = useApp(), { theme: S } = useGlobalTheme(), b = useBlockRequestContext(), y = useFormActiveFields(), { locale: v } = useContext(ConfigProvider.ConfigContext), I = useDataSourceManager(), w = useDataSourceKey(), T = useCollectionRecord(), { association: A } = useDataBlockProps() || {}, D = useFormBlockContext(), $ = useBlockContext(), { getOperators: L } = useOperators(), z = useLocationSearch(), j = useVariables(), { formValue: R, collection: B, parent: M } = useSubFormValue(), k = useCurrentPopupRecord(), N = useParentPopupRecord();
+  ]), h = useContext(SchemaOptionsContext), g = useCollection_deprecated(), f = useAPIClient(), C = useApp(), { theme: S } = useGlobalTheme(), b = useBlockRequestContext(), y = useFormActiveFields(), { locale: v } = useContext(ConfigProvider.ConfigContext), I = useDataSourceManager(), w = useDataSourceKey(), T = useCollectionRecord(), { association: A } = useDataBlockProps() || {}, D = useFormBlockContext(), $ = useBlockContext(), { getOperators: z } = useOperators(), O = useLocationSearch(), j = useVariables(), { formValue: R, collection: B, parent: M } = useSubFormValue(), k = useCurrentPopupRecord(), N = useParentPopupRecord();
   return t ? null : /* @__PURE__ */ jsx(
     SchemaSettingsItem,
     F(x({
@@ -21595,7 +21601,7 @@ const SchemaSettingsModalItem = (e) => {
         const q = l ? yield l() : c, E = _.isFunction(e.schema) ? e.schema() : e.schema;
         FormDialog(
           { title: E.title || o, width: u },
-          () => /* @__PURE__ */ jsx(p, { children: /* @__PURE__ */ jsx(CollectOperators, { defaultOperators: L(), children: /* @__PURE__ */ jsx(VariablesContext.Provider, { value: j, children: /* @__PURE__ */ jsx(BlockContext.Provider, { value: $, children: /* @__PURE__ */ jsx(
+          () => /* @__PURE__ */ jsx(p, { children: /* @__PURE__ */ jsx(CollectOperators, { defaultOperators: z(), children: /* @__PURE__ */ jsx(VariablesContext.Provider, { value: j, children: /* @__PURE__ */ jsx(BlockContext.Provider, { value: $, children: /* @__PURE__ */ jsx(
             VariablePopupRecordProvider,
             {
               recordData: k == null ? void 0 : k.value,
@@ -21609,7 +21615,7 @@ const SchemaSettingsModalItem = (e) => {
                 {
                   name: "form",
                   getActiveFieldsName: y == null ? void 0 : y.getActiveFieldsName,
-                  children: /* @__PURE__ */ jsx(LocationSearchContext.Provider, { value: z, children: /* @__PURE__ */ jsx(BlockRequestContext_deprecated.Provider, { value: b, children: /* @__PURE__ */ jsx(DataSourceApplicationProvider, { dataSourceManager: I, dataSource: w, children: /* @__PURE__ */ jsx(
+                  children: /* @__PURE__ */ jsx(LocationSearchContext.Provider, { value: O, children: /* @__PURE__ */ jsx(BlockRequestContext_deprecated.Provider, { value: b, children: /* @__PURE__ */ jsx(DataSourceApplicationProvider, { dataSourceManager: I, dataSource: w, children: /* @__PURE__ */ jsx(
                     AssociationOrCollectionProvider,
                     {
                       allowNull: !0,
@@ -21756,8 +21762,8 @@ const SchemaSettingsModalItem = (e) => {
     }
   );
 }, SchemaSettingsLinkageRules = function e(t) {
-  var L;
-  const { collectionName: o, readPretty: n, Component: r, afterSubmit: i } = t, a = useFieldSchema(), { form: l } = useFormBlockContext(), { dn: c } = useDesignable(), { t: u } = useTranslation(), { getTemplateById: d } = useSchemaTemplateManager(), p = useVariables(), m = useLocalVariables(), h = useRecord(), { type: g } = useFormBlockType(), f = (L = t == null ? void 0 : t.category) != null ? L : LinkageRuleCategory.default, C = (t == null ? void 0 : t.type) || (a != null && a["x-action"] || ["Action", "Action.Link"].includes(a["x-component"]) ? "button" : "field"), S = findGridSchema(a) || a, b = useLinkageCollectionFilterOptions(o), y = useLinkageCollectionFieldOptions(o, n), v = {
+  var z;
+  const { collectionName: o, readPretty: n, Component: r, afterSubmit: i } = t, a = useFieldSchema(), { form: l } = useFormBlockContext(), { dn: c } = useDesignable(), { t: u } = useTranslation(), { getTemplateById: d } = useSchemaTemplateManager(), p = useVariables(), m = useLocalVariables(), h = useRecord(), { type: g } = useFormBlockType(), f = (z = t == null ? void 0 : t.category) != null ? z : LinkageRuleCategory.default, C = (t == null ? void 0 : t.type) || (a != null && a["x-action"] || ["Action", "Action.Link"].includes(a["x-component"]) ? "button" : "field"), S = findGridSchema(a) || a, b = useLinkageCollectionFilterOptions(o), y = useLinkageCollectionFieldOptions(o, n), v = {
     [LinkageRuleCategory.default]: u("Linkage rules"),
     [LinkageRuleCategory.style]: u("Style")
   }, I = LinkageRuleDataKeyMap[f], w = useCallback(() => (S == null ? void 0 : S[I]) || (a == null ? void 0 : a[I]) || [], [S, a, I]), T = v[f], A = useMemo(
@@ -21785,10 +21791,10 @@ const SchemaSettingsModalItem = (e) => {
     }),
     [o, a, l, S, m, h, u, p, w, r]
   ), D = useMemo(() => ({ ArrayCollapse: ArrayCollapse$2, FormLayout }), []), $ = useCallback(
-    (z) => {
+    (O) => {
       var k;
       const j = [];
-      for (const N of z.fieldReaction.rules)
+      for (const N of O.fieldReaction.rules)
         j.push(_.pickBy(N, _.identity));
       const R = S["x-component"] === "BlockTemplate" && ((k = S["x-component-props"]) == null ? void 0 : k.templateId), M = {
         "x-uid": R && d(R).uid || S["x-uid"]
@@ -22469,10 +22475,10 @@ const useColumnSchema$1 = () => {
           "x-uid": o["x-uid"]
         };
         (n.componentProps.picker || "date") !== D.picker && !m && n.value && (n.value = void 0, n.initialValue = void 0, o.default = void 0, $.default = void 0), $["x-component-props"] = n.componentProps || {}, o["x-component-props"] = x(x({}, n.componentProps || {}), D), $["x-component-props"] = o["x-component-props"], n.componentProps = o["x-component-props"];
-        const L = n.path.entire.split(".");
-        L.pop();
-        const z = L.join(".");
-        n.query(`${z}.*[0:].${o.name}`).forEach((j) => {
+        const z = n.path.entire.split(".");
+        z.pop();
+        const O = z.join(".");
+        n.query(`${O}.*[0:].${o.name}`).forEach((j) => {
           j.props.name === o.name && ((n.componentProps.picker || "date") !== D.picker && !m && (j.value = void 0, j.initialValue = void 0), j.setComponentProps(x({}, D)));
         }), r.emit("patch", {
           schema: $
@@ -22494,7 +22500,7 @@ const getActionContext = (e) => {
   var o;
   return ((o = e.fieldSchema) == null ? void 0 : o["x-action-context"]) || {};
 }, SchemaSettingsDefaultValue = function e(t) {
-  var k, N, O;
+  var k, N, L;
   const o = useFieldSchema(), n = (k = t == null ? void 0 : t.fieldSchema) != null ? k : o, r = useField(), { dn: i } = useDesignable(), { t: a } = useTranslation(), l = useActionContext(), c = getActionContext(l).collection;
   let u;
   const { getField: d } = useCollection_deprecated(), { getCollectionJoinField: p, getCollectionFields: m, getAllCollectionsInheritChain: h } = useCollectionManager_deprecated(), g = useVariables(), f = useLocalVariables(), C = useCollection_deprecated(), S = useRecord(), { form: b } = useFormBlockContext(), { getFields: y } = useCollectionFilterOptionsV2(C), { isInSubForm: v, isInSubTable: I } = useFlag() || {}, { name: w } = C, T = useMemo(
@@ -22502,9 +22508,9 @@ const getActionContext = (e) => {
     [n, p, d]
   ), A = _.omit(n, "required");
   T != null && T.target && (u = p(
-    `${T.target}.${((O = (N = n["x-component-props"]) == null ? void 0 : N.fieldNames) == null ? void 0 : O.label) || "id"}`
+    `${T.target}.${((L = (N = n["x-component-props"]) == null ? void 0 : N.fieldNames) == null ? void 0 : L.label) || "id"}`
   ));
-  const D = (T == null ? void 0 : T.interface) === "m2o" && findParentFieldSchema(n), $ = D && p(D == null ? void 0 : D["x-collection-field"]), L = useTableBlockContext(), z = (T == null ? void 0 : T.interface) === "m2m" || ($ == null ? void 0 : $.type) === "hasMany" && (T == null ? void 0 : T.interface) === "m2o", j = useCallback(
+  const D = (T == null ? void 0 : T.interface) === "m2o" && findParentFieldSchema(n), $ = D && p(D == null ? void 0 : D["x-collection-field"]), z = useTableBlockContext(), O = (T == null ? void 0 : T.interface) === "m2m" || ($ == null ? void 0 : $.type) === "hasMany" && (T == null ? void 0 : T.interface) === "m2o", j = useCallback(
     (q) => {
       const E = q.find((G) => G.value === "$nForm"), U = m(w);
       return !(U != null && U.length) && E && (E.children = formatVariableScop(y())), q;
@@ -22529,7 +22535,7 @@ const getActionContext = (e) => {
         "x-component": "VariableInput",
         "x-component-props": F(x({}, (n == null ? void 0 : n["x-component-props"]) || {}), {
           collectionField: T,
-          contextCollectionName: z ? c : "",
+          contextCollectionName: O ? c : "",
           schema: T == null ? void 0 : T.uiSchema,
           targetFieldSchema: n,
           className: defaultInputStyle,
@@ -22577,12 +22583,12 @@ const getActionContext = (e) => {
     A,
     b,
     h,
-    z,
+    O,
     f,
     S,
     j,
     a,
-    L.collection,
+    z.collection,
     u,
     g
   ]), M = useCallback(
@@ -23352,8 +23358,8 @@ const useGetFilterOptions = () => {
     };
   });
 }, TableColumnDesigner$1 = (e) => {
-  var L, z, j, R, B, M, k, N, O, q, E, U;
-  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 = ((L = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : L.fieldNames) || ((z = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : z.fieldNames), m = useLabelFields$1((j = n == null ? void 0 : n.target) != null ? j : n == null ? void 0 : n.targetCollection), h = useColorFields((R = n == null ? void 0 : n.target) != null ? R : n == null ? void 0 : n.targetCollection), g = i(n == null ? void 0 : n.interface), f = a(n == null ? void 0 : n.target), C = isFileCollection$2(f), S = ["QuickEdit", "FormItem"].includes(o["x-decorator"]), { currentMode: b } = useAssociationFieldContext(), { isAllowToSetDefaultValue: y } = useIsAllowToSetDefaultValue({ collectionField: n, fieldSchema: o }), v = ["datetime", "createdAt", "updatedAt"].includes(n == null ? void 0 : n.interface), I = ["obo", "oho", "o2o", "o2m", "m2m", "m2o", "snapshot"].includes(
+  var z, O, j, R, B, M, k, N, L, q, E, U;
+  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 = ((z = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : z.fieldNames) || ((O = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : O.fieldNames), m = useLabelFields$1((j = n == null ? void 0 : n.target) != null ? j : n == null ? void 0 : n.targetCollection), h = useColorFields((R = n == null ? void 0 : n.target) != null ? R : n == null ? void 0 : n.targetCollection), g = i(n == null ? void 0 : n.interface), f = a(n == null ? void 0 : n.target), C = isFileCollection$2(f), S = ["QuickEdit", "FormItem"].includes(o["x-decorator"]), { currentMode: b } = useAssociationFieldContext(), { isAllowToSetDefaultValue: y } = useIsAllowToSetDefaultValue({ collectionField: n, fieldSchema: o }), v = ["datetime", "createdAt", "updatedAt"].includes(n == null ? void 0 : n.interface), I = ["obo", "oho", "o2o", "o2m", "m2m", "m2o", "snapshot"].includes(
     n == null ? void 0 : n.interface
   ), w = useFieldModeOptions({ fieldSchema: o }), T = ((B = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : B.mode) || "Select";
   let A = "editable";
@@ -23395,7 +23401,7 @@ const useGetFilterOptions = () => {
       SchemaSettingsDataScope,
       {
         collectionName: n == null ? void 0 : n.target,
-        defaultFilter: ((O = (N = (k = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : k.service) == null ? void 0 : N.params) == null ? void 0 : O.filter) || {},
+        defaultFilter: ((L = (N = (k = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : k.service) == null ? void 0 : N.params) == null ? void 0 : L.filter) || {},
         form: r,
         onSubmit: ({ filter: G }) => {
           var W, X;
@@ -24587,10 +24593,10 @@ function useCollectValuesToSubmit() {
       resource: n,
       actionFields: (d == null ? void 0 : d("form")) || []
     }), b = {}, y = Object.keys(f).map((D) => V(this, null, function* () {
-      const $ = f[D], L = i(D);
+      const $ = f[D], z = i(D);
       if (isVariable($)) {
-        const { value: z } = (yield p == null ? void 0 : p.parseVariable($, m)) || {};
-        z != null && (b[D] = transformVariableValue(z, { targetCollectionField: L }));
+        const { value: O } = (yield p == null ? void 0 : p.parseVariable($, m)) || {};
+        O != null && (b[D] = transformVariableValue(O, { targetCollectionField: z }));
       } else
         $ != null && $ !== "" && (b[D] = $);
     }));
@@ -24623,29 +24629,29 @@ const useCreateActionProps = () => {
     onClick() {
       return V(this, null, function* () {
         var j;
-        const { onSuccess: v, skipValidator: I, triggerWorkflows: w } = (j = u == null ? void 0 : u["x-action-settings"]) != null ? j : {}, { manualClose: T, redirecting: A, redirectTo: D, successMessage: $, actionAfterSuccess: L } = v || {};
+        const { onSuccess: v, skipValidator: I, triggerWorkflows: w } = (j = u == null ? void 0 : u["x-action-settings"]) != null ? j : {}, { manualClose: T, redirecting: A, redirectTo: D, successMessage: $, actionAfterSuccess: z } = v || {};
         I || (yield o.submit());
-        const z = yield f();
+        const O = yield f();
         d.data = n.data || {}, d.data.loading = !0;
         try {
           const R = yield r[C]({
-            values: z,
+            values: O,
             filterKeys: S,
             filterByTk: e,
             // TODO(refactor): should change to inject by plugin
             triggerWorkflows: w != null && w.length ? w.map((B) => [B.workflowKey, B.context].filter(Boolean).join("!")).join(",") : void 0,
             updateAssociationValues: g
           });
-          if ((L === "previous" || !L && A !== !0) && (i == null || i(!1)), a == null || a(!0), l == null || l(!1), d.data.loading = !1, d.data.data = R, !$) {
-            message.success(h("Saved successfully")), yield resetFormCorrectly(o), (A && !L || L === "redirect") && D && (isURL(D) ? window.location.href = D : c(D));
+          if ((z === "previous" || !z && A !== !0) && (i == null || i(!1)), a == null || a(!0), l == null || l(!1), d.data.loading = !1, d.data.data = R, !$) {
+            message.success(h("Saved successfully")), yield resetFormCorrectly(o), (A && !z || z === "redirect") && D && (isURL(D) ? window.location.href = D : c(D));
             return;
           }
           T ? m.success({
             title: p($),
             onOk: () => V(this, null, function* () {
-              yield resetFormCorrectly(o), (A && !L || L === "redirect") && D && (isURL(D) ? window.location.href = D : c(D));
+              yield resetFormCorrectly(o), (A && !z || z === "redirect") && D && (isURL(D) ? window.location.href = D : c(D));
             })
-          }) : (message.success(p($)), yield resetFormCorrectly(o), (A && !L || L === "redirect") && D && (isURL(D) ? window.location.href = D : c(D)));
+          }) : (message.success(p($)), yield resetFormCorrectly(o), (A && !z || z === "redirect") && D && (isURL(D) ? window.location.href = D : c(D)));
         } catch (R) {
           d.data.loading = !1;
         }
@@ -24658,14 +24664,14 @@ const useCreateActionProps = () => {
   return {
     onClick() {
       return V(this, null, function* () {
-        var N, O, q, E, U, G;
+        var N, L, q, E, U, G;
         const T = u.map((H) => H.name), {
           assignedValues: A = {},
           onSuccess: D,
           overwriteValues: $,
-          skipValidator: L,
-          triggerWorkflows: z
-        } = (N = l == null ? void 0 : l["x-action-settings"]) != null ? N : {}, j = (O = i == null ? void 0 : i["x-component-props"]) == null ? void 0 : O.addChild, { successMessage: R } = D || {}, B = {}, M = Object.keys(A).map((H) => V(this, null, function* () {
+          skipValidator: z,
+          triggerWorkflows: O
+        } = (N = l == null ? void 0 : l["x-action-settings"]) != null ? N : {}, j = (L = i == null ? void 0 : i["x-component-props"]) == null ? void 0 : L.addChild, { successMessage: R } = D || {}, B = {}, M = Object.keys(A).map((H) => V(this, null, function* () {
           const W = A[H], X = d(H);
           if (isVariable(W)) {
             const { value: J } = (yield C == null ? void 0 : C.parseVariable(W, S)) || {};
@@ -24673,7 +24679,7 @@ const useCreateActionProps = () => {
           } else
             W != null && W !== "" && (B[H] = W);
         }));
-        yield Promise.all(M), L || (yield e.submit());
+        yield Promise.all(M), z || (yield e.submit());
         const k = getFormValues({
           filterByTk: g,
           field: t,
@@ -24693,7 +24699,7 @@ const useCreateActionProps = () => {
             values: x(x(x({}, k), $), B),
             filterKeys: v,
             // TODO(refactor): should change to inject by plugin
-            triggerWorkflows: z != null && z.length ? z.map((W) => [W.workflowKey, W.context].filter(Boolean).join("!")).join(",") : void 0
+            triggerWorkflows: O != null && O.length ? O.map((W) => [W.workflowKey, W.context].filter(Boolean).join("!")).join(",") : void 0
           });
           if (c.data.loading = !1, c.data.data = H, (G = (U = n == null ? void 0 : n.service) == null ? void 0 : U.refresh) == null || G.call(U), r == null || r(!1), a == null || a(!0), !R)
             return;
@@ -24800,13 +24806,13 @@ const useCreateActionProps = () => {
   return {
     onClick(f, C) {
       return V(this, null, function* () {
-        var z, j, R;
+        var O, j, R;
         const {
           assignedValues: S = {},
           onSuccess: b,
           skipValidator: y,
           triggerWorkflows: v
-        } = (z = r == null ? void 0 : r["x-action-settings"]) != null ? z : {}, { manualClose: I, redirecting: w, redirectTo: T, successMessage: A, actionAfterSuccess: D } = b || {}, $ = {}, L = Object.keys(S).map((B) => V(this, null, function* () {
+        } = (O = r == null ? void 0 : r["x-action-settings"]) != null ? O : {}, { manualClose: I, redirecting: w, redirectTo: T, successMessage: A, actionAfterSuccess: D } = b || {}, $ = {}, z = Object.keys(S).map((B) => V(this, null, function* () {
           const M = S[B], k = m(B);
           if (isVariable(M)) {
             const { value: N } = (yield u == null ? void 0 : u.parseVariable(M, d)) || {};
@@ -24814,7 +24820,7 @@ const useCreateActionProps = () => {
           } else
             M != null && M !== "" && ($[B] = M);
         }));
-        yield Promise.all(L), y === !1 && (yield l.submit()), yield e.update({
+        yield Promise.all(z), y === !1 && (yield l.submit()), yield e.update({
           filterByTk: n,
           values: x({}, $),
           // TODO(refactor): should change to inject by plugin
@@ -24841,7 +24847,7 @@ const useCreateActionProps = () => {
           assignedValues: A = {},
           onSuccess: D,
           updateMode: $
-        } = (N = i == null ? void 0 : i["x-action-settings"]) != null ? N : {}, { manualClose: L, redirecting: z, redirectTo: j, successMessage: R, actionAfterSuccess: B } = D || {};
+        } = (N = i == null ? void 0 : i["x-action-settings"]) != null ? N : {}, { manualClose: z, redirecting: O, redirectTo: j, successMessage: R, actionAfterSuccess: B } = D || {};
         m.data = e.data || {}, m.data.loading = !0;
         const M = {}, k = Object.keys(A).map((q) => V(this, null, function* () {
           const E = A[q], U = C(q);
@@ -24851,7 +24857,7 @@ const useCreateActionProps = () => {
           } else
             E != null && E !== "" && (M[q] = E);
         }));
-        yield Promise.all(k), (B === "previous" || !B && z !== !0) && (b == null || b(!1)), h.confirm({
+        yield Promise.all(k), (B === "previous" || !B && O !== !0) && (b == null || b(!1)), h.confirm({
           title: p("Bulk update"),
           content: p($ === "selected" ? "Update selected data?" : "Update all data?"),
           onOk() {
@@ -24876,12 +24882,12 @@ const useCreateActionProps = () => {
               } finally {
                 m.data.loading = !1;
               }
-              t instanceof TableFieldResource || (W = (H = o == null ? void 0 : o.service) == null ? void 0 : H.refresh) == null || W.call(H), R && (L ? h.success({
+              t instanceof TableFieldResource || (W = (H = o == null ? void 0 : o.service) == null ? void 0 : H.refresh) == null || W.call(H), R && (z ? h.success({
                 title: d(R),
                 onOk: () => V(this, null, function* () {
-                  (z && !B || B === "redirect") && j && (isURL(j) ? window.location.href = j : u(j));
+                  (O && !B || B === "redirect") && j && (isURL(j) ? window.location.href = j : u(j));
                 })
-              }) : (message.success(d(R)), (z && !B || B === "redirect") && j && (isURL(j) ? window.location.href = j : u(j))));
+              }) : (message.success(d(R)), (O && !B || B === "redirect") && j && (isURL(j) ? window.location.href = j : u(j))));
             });
           },
           onCancel() {
@@ -24900,7 +24906,7 @@ const useCreateActionProps = () => {
     onClick() {
       return V(this, null, function* () {
         var q, E, U, G;
-        const { skipValidator: w, onSuccess: T, requestSettings: A } = (q = n == null ? void 0 : n["x-action-settings"]) != null ? q : {}, { manualClose: D, redirecting: $, redirectTo: L, successMessage: z, actionAfterSuccess: j } = T || {}, R = n == null ? void 0 : n["x-action"];
+        const { skipValidator: w, onSuccess: T, requestSettings: A } = (q = n == null ? void 0 : n["x-action-settings"]) != null ? q : {}, { manualClose: D, redirecting: $, redirectTo: z, successMessage: O, actionAfterSuccess: j } = T || {}, R = n == null ? void 0 : n["x-action"];
         if (!A.url)
           return;
         w !== !0 && R === "customize:form:request" && (yield i.submit());
@@ -24917,7 +24923,7 @@ const useCreateActionProps = () => {
           });
           Object.assign(k, W);
         }
-        const O = {
+        const L = {
           url: renderTemplate(A.url, { currentRecord: m, currentUser: g }),
           method: A.method,
           headers: parse(B)({ currentRecord: m, currentUser: g }),
@@ -24926,12 +24932,12 @@ const useCreateActionProps = () => {
         };
         f.data = c.data || {}, f.data.loading = !0;
         try {
-          yield e.request(x({}, O)), f.data.loading = !1, u instanceof TableFieldResource || (U = (E = d == null ? void 0 : d.service) == null ? void 0 : E.refresh) == null || U.call(E), (G = p == null ? void 0 : p.refresh) == null || G.call(p), R === "customize:form:request" && (j === "previous" || !j && $ !== !0) && (S == null || S(!1)), z || (message.success(C("Saved successfully")), yield resetFormCorrectly(i), ($ && !j || j === "redirect") && L && (isURL(L) ? window.location.href = L : t(L))), D ? b.success({
-            title: r(z),
+          yield e.request(x({}, L)), f.data.loading = !1, u instanceof TableFieldResource || (U = (E = d == null ? void 0 : d.service) == null ? void 0 : E.refresh) == null || U.call(E), (G = p == null ? void 0 : p.refresh) == null || G.call(p), R === "customize:form:request" && (j === "previous" || !j && $ !== !0) && (S == null || S(!1)), O || (message.success(C("Saved successfully")), yield resetFormCorrectly(i), ($ && !j || j === "redirect") && z && (isURL(z) ? window.location.href = z : t(z))), D ? b.success({
+            title: r(O),
             onOk: () => V(this, null, function* () {
-              ($ && !j || j === "redirect") && L && (isURL(L) ? window.location.href = L : t(L));
+              ($ && !j || j === "redirect") && z && (isURL(z) ? window.location.href = z : t(z));
             })
-          }) : message.success(r(z));
+          }) : message.success(r(O));
         } finally {
           f.data.loading = !1;
         }
@@ -24949,8 +24955,8 @@ const useCreateActionProps = () => {
           onSuccess: A,
           overwriteValues: D,
           skipValidator: $,
-          triggerWorkflows: L
-        } = (E = l == null ? void 0 : l["x-action-settings"]) != null ? E : {}, { manualClose: z, redirecting: j, redirectTo: R, successMessage: B, actionAfterSuccess: M } = A || {}, k = {}, N = Object.keys(T).map((U) => V(this, null, function* () {
+          triggerWorkflows: z
+        } = (E = l == null ? void 0 : l["x-action-settings"]) != null ? E : {}, { manualClose: O, redirecting: j, redirectTo: R, successMessage: B, actionAfterSuccess: M } = A || {}, k = {}, N = Object.keys(T).map((U) => V(this, null, function* () {
           const G = T[U], H = d(U);
           if (isVariable(G)) {
             const { value: W } = (yield S == null ? void 0 : S.parseVariable(G, b)) || {};
@@ -24959,11 +24965,11 @@ const useCreateActionProps = () => {
             G != null && G !== "" && (k[U] = G);
         }));
         yield Promise.all(N), $ || (yield e.submit());
-        const O = u.map((U) => U.name), q = getFormValues({
+        const L = u.map((U) => U.name), q = getFormValues({
           filterByTk: t,
           field: o,
           form: e,
-          fieldNames: O,
+          fieldNames: L,
           getField: d,
           resource: n,
           actionFields: (y == null ? void 0 : y("form")) || []
@@ -24976,10 +24982,10 @@ const useCreateActionProps = () => {
           }, C), {
             updateAssociationValues: g,
             // TODO(refactor): should change to inject by plugin
-            triggerWorkflows: L != null && L.length ? L.map((U) => [U.workflowKey, U.context].filter(Boolean).join("!")).join(",") : void 0
+            triggerWorkflows: z != null && z.length ? z.map((U) => [U.workflowKey, U.context].filter(Boolean).join("!")).join(",") : void 0
           })), h.data.loading = !1, w && (w == null || w()), (M === "previous" || !M && j !== !0) && (i == null || i(!1)), a == null || a(!1), !B)
             return;
-          z ? f.success({
+          O ? f.success({
             title: m(B),
             onOk: () => V(this, null, function* () {
               yield e.reset(), (j && !M || M === "redirect") && R && (isURL(R) ? window.location.href = R : c(R));
@@ -25190,7 +25196,7 @@ const useCreateActionProps = () => {
   var o;
   return ["select", "multipleSelect", "checkbox", "checkboxGroup", "chinaRegion"].includes(e == null ? void 0 : e.interface) && ((o = e == null ? void 0 : e.uiSchema) == null ? void 0 : o.enum);
 }, useAssociationFilterBlockProps = () => {
-  var v, I, w, T, A, D, $, L, z, j;
+  var v, I, w, T, A, D, $, z, O, j;
   const e = AssociationFilter.useAssociationField(), t = useFieldSchema(), o = useOptionalFieldList(), { getDataBlocks: n } = useFilterBlock(), r = e == null ? void 0 : e.name, i = useField(), { props: a } = useBlockRequestContext(), l = useDataSourceHeaders(a == null ? void 0 : a.dataSource), c = useCollectionManager_deprecated(), { filter: u, parseVariableLoading: d } = useParsedFilter({ filterOption: (I = (v = i.componentProps) == null ? void 0 : v.params) == null ? void 0 : I.filter });
   let p, m, h, g, f, C, S, b;
   C = e != null && e.target ? (w = c.getCollection(e.target)) == null ? void 0 : w.getPrimaryKey() : "id", S = ((A = (T = t["x-component-props"]) == null ? void 0 : T.fieldNames) == null ? void 0 : A.label) || C, { data: f, params: h, run: g } = useRequest(
@@ -25219,7 +25225,7 @@ const useCreateActionProps = () => {
     g,
     C,
     ($ = i.componentProps) == null ? void 0 : $.params,
-    (z = (L = i.componentProps) == null ? void 0 : L.params) == null ? void 0 : z.sort,
+    (O = (z = i.componentProps) == null ? void 0 : z.params) == null ? void 0 : O.sort,
     d
   ]);
   const y = useCallback(
@@ -25229,17 +25235,17 @@ const useCreateActionProps = () => {
         var G, H, W;
         if (!B.find((X) => X.uid === k.uid))
           return;
-        const O = `${M}${t.name}`, q = ((G = k.service.params) == null ? void 0 : G[0]) || {};
+        const L = `${M}${t.name}`, q = ((G = k.service.params) == null ? void 0 : G[0]) || {};
         (W = (H = k.service.params) == null ? void 0 : H[1]) != null && W.filters || _.set(k.service.params, "[1].filters", {});
         const E = k.service.params[1].filters;
         if (R.length)
-          E[O] = {
+          E[L] = {
             [b]: R
           };
         else {
           if (k.dataLoadingMode === "manual")
             return k.clearData();
-          delete E[O];
+          delete E[L];
         }
         const U = mergeFilter([...Object.values(E), k.defaultFilter]);
         return k.doFilter(
@@ -25269,7 +25275,7 @@ const useCreateActionProps = () => {
         p = M;
         return;
       }
-      p = M.filter((O) => O.label.includes(N));
+      p = M.filter((L) => L.label.includes(N));
     };
   } else
     b = `${r}.${C}.$in`, p = (f == null ? void 0 : f.data) || [], m = (R) => {
@@ -25549,38 +25555,38 @@ const useSyncFromForm = (e, t, o) => {
       var R;
       if (S.includes($.name) || !$.interface || ["sort", "password", "sequence"].includes($.type))
         return;
-      const L = {
+      const z = {
         type: "duplicate",
         tag: c((R = $.uiSchema) == null ? void 0 : R.title) || $.name
-      }, z = F(x({}, L), {
-        title: React.createElement(TreeNode, L),
+      }, O = F(x({}, z), {
+        title: React.createElement(TreeNode, z),
         key: v ? `${v}.${$.name}` : $.name,
         isLeaf: !0,
         field: $,
         disabled: I
-      }), j = w.find((B) => B.name === z.key);
+      }), j = w.find((B) => B.name === O.key);
       if (["belongsTo", "belongsToMany"].includes($.type) && (!j || ["Select", "Picker"].includes(j == null ? void 0 : j.fieldMode)))
-        L.type = "reference", z.type = "reference", z.title = React.createElement(TreeNode, F(x({}, L), { type: "reference" })), z.isLeaf = !1, z.children = m($.target, {
+        z.type = "reference", O.type = "reference", O.title = React.createElement(TreeNode, F(x({}, z), { type: "reference" })), O.isLeaf = !1, O.children = m($.target, {
           depth: b + 1,
           maxDepth: y,
-          prefix: z.key,
+          prefix: O.key,
           exclude: systemKeys
         });
       else if (["hasOne", "hasMany"].includes($.type) || ["Nester", "SubTable"].includes(j == null ? void 0 : j.fieldMode)) {
         let B = !1;
-        ["hasOne", "hasMany"].includes($.type) && ["Select", "Picker"].includes(j == null ? void 0 : j.fieldMode) && (B = !0), z.disabled = !0, z.isLeaf = !1, z.children = p(
+        ["hasOne", "hasMany"].includes($.type) && ["Select", "Picker"].includes(j == null ? void 0 : j.fieldMode) && (B = !0), O.disabled = !0, O.isLeaf = !1, O.children = p(
           $.target,
           {
             depth: b + 1,
             maxDepth: y,
-            prefix: z.key,
+            prefix: O.key,
             exclude: ["id", ...systemKeys],
             disabled: B
           },
           w
         );
       }
-      return z;
+      return O;
     }).filter(Boolean);
     return f.set(T, D), D;
   })(new LRUCache({ max: 100 })), m = /* @__PURE__ */ ((f) => (C, { prefix: S, maxDepth: b, depth: y = 0, exclude: v = [] }) => {
@@ -25590,16 +25596,16 @@ const useSyncFromForm = (e, t, o) => {
     if (y > b)
       return [];
     const T = r(C).map((A) => {
-      var L, z;
+      var z, O;
       if (!A.target || !A.interface || v.includes(A.name))
         return;
       const D = {
         type: "preloading",
-        tag: c((L = A.uiSchema) == null ? void 0 : L.title) || A.name
+        tag: c((z = A.uiSchema) == null ? void 0 : z.title) || A.name
       }, $ = S ? `${S}.${A.name}` : A.name;
       return {
         type: "preloading",
-        tag: c((z = A.uiSchema) == null ? void 0 : z.title) || A.name,
+        tag: c((O = A.uiSchema) == null ? void 0 : O.title) || A.name,
         title: React.createElement(TreeNode, D),
         key: $,
         isLeaf: !1,
@@ -25630,8 +25636,8 @@ const useSyncFromForm = (e, t, o) => {
           var w;
           (w = v == null ? void 0 : v.reduceProperties) == null || w.call(v, (T, A) => {
             var B, M, k;
-            const D = T || I, $ = A["x-collection-field"] && n(A["x-collection-field"]), L = A.name.includes("."), z = $ && ["hasOne", "hasMany", "belongsTo", "belongsToMany"].includes($.type), j = !z && L ? getAssociationPath(A.name) : A.name, R = D === "" || !D ? j : D + "." + j;
-            if ($ && !(["hasOne", "hasMany"].includes($.type) || ["SubForm", "Nester"].includes((B = A["x-component-props"]) == null ? void 0 : B.mode)) && C.add(R), $ && (z || L) && A["x-component"] !== "TableField") {
+            const D = T || I, $ = A["x-collection-field"] && n(A["x-collection-field"]), z = A.name.includes("."), O = $ && ["hasOne", "hasMany", "belongsTo", "belongsToMany"].includes($.type), j = !O && z ? getAssociationPath(A.name) : A.name, R = D === "" || !D ? j : D + "." + j;
+            if ($ && !(["hasOne", "hasMany"].includes($.type) || ["SubForm", "Nester"].includes((B = A["x-component-props"]) == null ? void 0 : B.mode)) && C.add(R), $ && (O || z) && A["x-component"] !== "TableField") {
               if (f.add({ name: R, fieldMode: ((M = A["x-component-props"]) == null ? void 0 : M.mode) || "Select" }), ["Nester", "SubTable"].includes((k = A["x-component-props"]) == null ? void 0 : k.mode)) {
                 const N = D && D !== "" ? D + "." + A.name : A.name;
                 S(A, N);
@@ -26480,16 +26486,16 @@ const useParseDefaultValue = () => {
         isVariable(e.value) && (yield e.reset({ forceClear: !0 })), e.loading = !0;
         const D = !t.name.toString().includes(".") && (d == null ? void 0 : d.getField(t.name)), {
           value: $,
-          collectionName: L,
-          dataSource: z = "main"
+          collectionName: z,
+          dataSource: O = "main"
         } = yield o.parseVariable(t.default, n, {
           fieldOperator: C(t.name)
         });
-        if (D != null && D.target && L && D.target !== L && !isInherit({
+        if (D != null && D.target && z && D.target !== z && !isInherit({
           collectionName: D.target,
-          targetCollectionName: L,
+          targetCollectionName: z,
           dm: S,
-          dataSource: z
+          dataSource: O
         })) {
           e.loading = !1;
           return;
@@ -26505,8 +26511,8 @@ const useParseDefaultValue = () => {
       const T = getVariableName(t.default), A = b(T);
       return A ? (y(), reaction(
         () => {
-          const $ = { [T]: (A == null ? void 0 : A.ctx) || {} }, L = getPath(t.default), z = getValuesByPath($, L);
-          return z === void 0 ? Math.random() : z;
+          const $ = { [T]: (A == null ? void 0 : A.ctx) || {} }, z = getPath(t.default), O = getValuesByPath($, z);
+          return O === void 0 ? Math.random() : O;
         },
         () => v({ forceUpdate: !0 }),
         {
@@ -27899,7 +27905,7 @@ function Input$1(e) {
   useAntdInputStyle(`${S}-input`);
   const b = useCompile(), { t: y } = useTranslation(), v = useForm(), [I, w] = React.useState([]), [T, A] = React.useState([]), [D, $] = React.useState(
     m || !!(n && t != null)
-  ), L = useMemo(() => parseValue(t, p), [p, t]), z = typeof L == "string", j = z ? L : "", R = z ? null : L, B = Object.assign(
+  ), z = useMemo(() => parseValue(t, p), [p, t]), O = typeof z == "string", j = O ? z : "", R = O ? null : z, B = Object.assign(
     {
       label: "label",
       value: "value",
@@ -27912,8 +27918,8 @@ function Input$1(e) {
     [B.value]: "$",
     [B.label]: y("Constant")
   } : i ? getTypedConstantOption(j, i, B) : null, [j, i]), k = (H = M == null ? void 0 : M.component) != null ? H : NullComponent, N = Array.isArray(i) ? (X = (W = i.find((J) => Array.isArray(J) && J[0] === j)) == null ? void 0 : W[1]) != null ? X : {} : {};
-  let O;
-  t == null ? a ? n && D ? O = ["$"] : O = [""] : n ? O = ["$"] : O = [" ", j] : O = n ? ["$"] : [" ", j], m && (O = ["$"]), useEffect(() => {
+  let L;
+  t == null ? a ? n && D ? L = ["$"] : L = [""] : n ? L = ["$"] : L = [" ", j] : L = n ? ["$"] : [" ", j], m && (L = ["$"]), useEffect(() => {
     const Z = M != null ? M : {}, { component: J } = Z, Y = K(Z, ["component"]), Q = [
       ...a ? [
         {
@@ -28063,7 +28069,7 @@ function Input$1(e) {
         Cascader$1,
         {
           options: I,
-          value: R != null ? R : O,
+          value: R != null ? R : L,
           onChange: E,
           loadData: q,
           changeOnSelect: u,
@@ -28353,7 +28359,7 @@ function TextArea(e) {
     const { current: N } = m;
     if (!N)
       return;
-    const O = new Range();
+    const L = new Range();
     if (y) {
       if (T.join() === "-1,0,-1,0")
         return;
@@ -28361,36 +28367,36 @@ function TextArea(e) {
       if (E)
         try {
           const U = Array.from(N.childNodes);
-          U.length && (T[0] === -1 ? T[1] && O.setStartAfter(U[T[1] - 1]) : O.setStart(U[T[0]], T[1]), T[2] === -1 ? T[3] && O.setEndAfter(U[T[3] - 1]) : O.setEnd(U[T[2]], T[3])), O.collapse(!0), E.removeAllRanges(), E.addRange(O);
+          U.length && (T[0] === -1 ? T[1] && L.setStartAfter(U[T[1] - 1]) : L.setStart(U[T[0]], T[1]), T[2] === -1 ? T[3] && L.setEndAfter(U[T[3] - 1]) : L.setEnd(U[T[2]], T[3])), L.collapse(!0), E.removeAllRanges(), E.addRange(L);
         } catch (U) {
         }
     } else {
       const { lastChild: E } = N;
       if (E) {
-        O.setStartAfter(E), O.setEndAfter(E);
-        const U = Array.from(N.childNodes), G = O.startContainer === N ? -1 : U.indexOf(E), H = O.startContainer === N ? -1 : U.indexOf(E);
-        A([G, O.startOffset, H, O.endOffset]);
+        L.setStartAfter(E), L.setEndAfter(E);
+        const U = Array.from(N.childNodes), G = L.startContainer === N ? -1 : U.indexOf(E), H = L.startContainer === N ? -1 : U.indexOf(E);
+        A([G, L.startOffset, H, L.endOffset]);
       }
     }
   }, [I]);
   const $ = useCallback(
     function(N) {
-      const O = N.filter((U) => !!U.trim()), { current: q } = m;
-      if (!q || !O)
+      const L = N.filter((U) => !!U.trim()), { current: q } = m;
+      if (!q || !L)
         return;
       q.focus();
-      const E = createVariableTagHTML(O.join("."), C);
+      const E = createVariableTagHTML(L.join("."), C);
       pasteHTML(q, E, {
         range: T
       }), v(!0), A(getCurrentRange(q)), i(getValue(q, u));
     },
     [C, i, T, D]
-  ), L = useCallback(
+  ), z = useCallback(
     function({ currentTarget: N }) {
       S || (v(!0), A(getCurrentRange(N)), i(getValue(N, u)));
     },
     [S, i, D]
-  ), z = useCallback(function({ currentTarget: N }) {
+  ), O = useCallback(function({ currentTarget: N }) {
     A(getCurrentRange(N));
   }, []), j = useCallback(function(N) {
     N.key === "Enter" && N.preventDefault();
@@ -28404,7 +28410,7 @@ function TextArea(e) {
   ), M = useCallback(
     function(N) {
       N.preventDefault();
-      const O = N.clipboardData.getData("text/html") || N.clipboardData.getData("text"), q = sanitizeHTML(O, {
+      const L = N.clipboardData.getData("text/html") || N.clipboardData.getData("text"), q = sanitizeHTML(L, {
         allowedTags: ["span"],
         allowedAttributes: {
           span: ["data-variable", "contenteditable"]
@@ -28457,8 +28463,8 @@ function TextArea(e) {
             {
               role: "button",
               "aria-label": "textbox",
-              onInput: L,
-              onBlur: z,
+              onInput: z,
+              onBlur: O,
               onKeyDown: j,
               onPaste: M,
               onCompositionStart: R,
@@ -30891,7 +30897,7 @@ const tableBlockSettings = new SchemaSettings({
         }, null);
         return {
           title: t("Table size"),
-          value: ((r = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : r.size) || "middle",
+          value: ((r = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : r.size) || "small",
           options: [
             { label: t("Large"), value: "large" },
             { label: t("Middle"), value: "middle" },
@@ -33565,8 +33571,8 @@ const useFieldComponentOptions = () => {
   const { refresh: t } = useDesignable(), o = useAPIClient(), { t: n } = useTranslation();
   return useCallback(
     (r) => {
-      var f, C, S, b, y, v, I, w, T, A, D, $, L, z, j;
-      const { active: i, over: a } = r, l = (C = (f = i == null ? void 0 : i.data) == null ? void 0 : f.current) == null ? void 0 : C.schema, c = (b = (S = a == null ? void 0 : a.data) == null ? void 0 : S.current) == null ? void 0 : b.schema, u = (v = (y = a == null ? void 0 : a.data) == null ? void 0 : y.current) == null ? void 0 : v.insertAdjacent, d = (w = (I = a == null ? void 0 : a.data) == null ? void 0 : I.current) == null ? void 0 : w.breakRemoveOn, p = (A = (T = a == null ? void 0 : a.data) == null ? void 0 : T.current) == null ? void 0 : A.wrapSchema, m = ($ = (D = a == null ? void 0 : a.data) == null ? void 0 : D.current) == null ? void 0 : $.onSuccess, h = (j = (z = (L = a == null ? void 0 : a.data) == null ? void 0 : L.current) == null ? void 0 : z.removeParentsIfNoChildren) != null ? j : !0;
+      var f, C, S, b, y, v, I, w, T, A, D, $, z, O, j;
+      const { active: i, over: a } = r, l = (C = (f = i == null ? void 0 : i.data) == null ? void 0 : f.current) == null ? void 0 : C.schema, c = (b = (S = a == null ? void 0 : a.data) == null ? void 0 : S.current) == null ? void 0 : b.schema, u = (v = (y = a == null ? void 0 : a.data) == null ? void 0 : y.current) == null ? void 0 : v.insertAdjacent, d = (w = (I = a == null ? void 0 : a.data) == null ? void 0 : I.current) == null ? void 0 : w.breakRemoveOn, p = (A = (T = a == null ? void 0 : a.data) == null ? void 0 : T.current) == null ? void 0 : A.wrapSchema, m = ($ = (D = a == null ? void 0 : a.data) == null ? void 0 : D.current) == null ? void 0 : $.onSuccess, h = (j = (O = (z = a == null ? void 0 : a.data) == null ? void 0 : z.current) == null ? void 0 : O.removeParentsIfNoChildren) != null ? j : !0;
       if (!l || !c) {
         e == null || e(r);
         return;
@@ -33886,7 +33892,7 @@ const ReadPretty$b = observer$1(
       const l = x(x({}, defaultFieldNames$1), e.fieldNames), c = i.dataSource || e.options || (a == null ? void 0 : a.uiSchema.enum) || [], u = getCurrentOptions(i.value, c, l);
       if (!isValid(e.value) && !u.length || isArrayField(i) && ((p = i == null ? void 0 : i.value) == null ? void 0 : p.length) === 0)
         return;
-      const d = u.map((m, h) => /* @__PURE__ */ jsx(Tag, { color: m[l.color], icon: m.icon, children: m[l.label] }, h));
+      const d = i.value && u.map((m, h) => /* @__PURE__ */ jsx(Tag, { color: m[l.color], icon: m.icon, children: m[l.label] }, h));
       r(d), o(!1);
     }, [
       a == null ? void 0 : a.uiSchema.enum,
@@ -34086,7 +34092,7 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
         "dataSource",
         "toOptionsItem",
         "popupMatchSelectWidth"
-      ]), C = useDataSourceKey(), S = useDataSourceHeaders(m || C), [b, y] = useState(!1), v = useRef(!1), I = useFieldSchema(), w = ((X = I["x-component-props"]) == null ? void 0 : X.addMode) === "quickAdd", { getField: T } = useCollection_deprecated(), A = useRef(null), { getCollectionJoinField: D, getInterface: $ } = useCollectionManager_deprecated(), L = I["x-collection-field"] || I.name, z = T(L) || D(L), j = u || (z == null ? void 0 : z.target) && (t == null ? void 0 : t.label) && D(`${z.target}.${t.label}`), R = useMemo(() => {
+      ]), C = useDataSourceKey(), S = useDataSourceHeaders(m || C), [b, y] = useState(!1), v = useRef(!1), I = useFieldSchema(), w = ((X = I["x-component-props"]) == null ? void 0 : X.addMode) === "quickAdd", { getField: T } = useCollection_deprecated(), A = useRef(null), { getCollectionJoinField: D, getInterface: $ } = useCollectionManager_deprecated(), z = I["x-collection-field"] || I.name, O = T(z) || D(z), j = u || (O == null ? void 0 : O.target) && (t == null ? void 0 : t.label) && D(`${O.target}.${t.label}`), R = useMemo(() => {
         var Y;
         if (j != null && j.interface) {
           const Q = $(j.interface), Z = ((Y = Q == null ? void 0 : Q.filterable) == null ? void 0 : Y.operators[0].value) || "$includes";
@@ -34122,7 +34128,7 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
           }
         },
         [j == null ? void 0 : j.uiSchema, t]
-      ), { data: k, run: N, loading: O } = useRequest(
+      ), { data: k, run: N, loading: L } = useRequest(
         F(x({
           action: "list"
         }, o), {
@@ -34192,7 +34198,7 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
           value: r,
           defaultValue: i
         }, f), {
-          loading: k ? O : !0,
+          loading: k ? L : !0,
           options: h(M(G)),
           rawOptions: G,
           dropdownRender: (Y) => {
@@ -35158,7 +35164,7 @@ const useStyles$9 = genStyleHook("nb-page", (e) => {
   ] }) }) }) }) : null;
 }, Page = (e) => {
   var q, E, U;
-  const O = e, { children: t } = O, o = K(O, ["children"]), { t: n } = useTranslation(), r = useCompile(), { title: i, setTitle: a } = useDocumentTitle(), l = useFieldSchema(), c = useDesignable(), { theme: u } = useGlobalTheme(), { getAriaLabel: d } = useGetAriaLabelOfSchemaInitializer(), { tabUid: p, name: m } = useParams(), h = useRouterBasename(), [g, f] = useState(!1);
+  const L = e, { children: t } = L, o = K(L, ["children"]), { t: n } = useTranslation(), r = useCompile(), { title: i, setTitle: a } = useDocumentTitle(), l = useFieldSchema(), c = useDesignable(), { theme: u } = useGlobalTheme(), { getAriaLabel: d } = useGetAriaLabelOfSchemaInitializer(), { tabUid: p, name: m } = useParams(), h = useRouterBasename(), [g, f] = useState(!1);
   useEffect(() => {
     setTimeout(() => {
       f(!0);
@@ -35170,7 +35176,7 @@ 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: L, hashId: z, componentCls: j } = useStyles$9(), R = useStyles$a(), { token: B } = useToken(), M = b ? void 0 : l.title || r(i);
+  ), [D, $] = useState(0), { wrapSSR: z, hashId: O, componentCls: j } = useStyles$9(), R = useStyles$a(), { token: B } = useToken(), M = b ? void 0 : l.title || r(i);
   useRequest(
     {
       url: `/uiSchemas:getParentJsonSchema/${l["x-uid"]}`
@@ -35275,8 +35281,8 @@ const useStyles$9 = genStyleHook("nb-page", (e) => {
     l.mapProperties((G) => G.title || n("Unnamed")).join(),
     S
   ]);
-  return L(
-    /* @__PURE__ */ jsxs("div", { className: `${j} ${z} ${R.styles}`, children: [
+  return z(
+    /* @__PURE__ */ jsxs("div", { className: `${j} ${O} ${R.styles}`, children: [
       /* @__PURE__ */ jsx(PageDesigner, { title: l.title || i }),
       /* @__PURE__ */ jsx(
         "div",
@@ -35609,7 +35615,7 @@ function getCollectionFieldOptions(e, t) {
   });
 }
 const AppendsTreeSelect = (e) => {
-  const L = e, {
+  const z = e, {
     title: t,
     value: o,
     onChange: n,
@@ -35618,7 +35624,7 @@ const AppendsTreeSelect = (e) => {
     filter: a = trueFilter,
     rootOption: l,
     loadData: c
-  } = L, u = K(L, [
+  } = z, u = K(z, [
     "title",
     "value",
     "onChange",
@@ -35627,35 +35633,35 @@ const AppendsTreeSelect = (e) => {
     "filter",
     "rootOption",
     "loadData"
-  ]), d = useCompile(), { t: p } = useTranslation(), [m, h] = useState({}), g = i({ collection: r }), [f, C] = parseCollectionName(g), S = useApp(), { collectionManager: b } = S.dataSourceManager.getDataSource(f), y = (z, j) => {
-    const R = b.getCollection(z);
+  ]), d = useCompile(), { t: p } = useTranslation(), [m, h] = useState({}), g = i({ collection: r }), [f, C] = parseCollectionName(g), S = useApp(), { collectionManager: b } = S.dataSourceManager.getDataSource(f), y = (O, j) => {
+    const R = b.getCollection(O);
     return R ? R.getAllFields(j) : [];
-  }, v = Object.values(m), I = useMemo(() => e.multiple ? (o || []).map((z) => m[z]).filter(Boolean) : o, [o, e.multiple, m]), w = useCallback(
-    (z) => V(void 0, null, function* () {
+  }, v = Object.values(m), I = useMemo(() => e.multiple ? (o || []).map((O) => m[O]).filter(Boolean) : o, [o, e.multiple, m]), w = useCallback(
+    (O) => V(void 0, null, function* () {
       if (c != null)
-        return c(z);
-      if (!z.isLeaf && z.loadChildren) {
-        const j = z.loadChildren(z);
+        return c(O);
+      if (!O.isLeaf && O.loadChildren) {
+        const j = O.loadChildren(O);
         h((R) => j.reduce((B, M) => Object.assign(B, { [M.value]: M }), x({}, R)));
       }
     }),
     [c]
   );
   useEffect(() => {
-    const z = l ? F(x({}, l), {
+    const O = l ? F(x({}, l), {
       id: l.value,
       key: l.value,
       title: l.label,
       fullTitle: l.label,
       isLeaf: !1
-    }) : null, R = (c === null ? [] : getCollectionFieldOptions.call({ compile: d, getCollectionFields: y, filter: a }, C, z)).reduce((B, M) => Object.assign(B, { [M.value]: M }), {});
-    z && (R[z.value] = z), h(R);
+    }) : null, R = (c === null ? [] : getCollectionFieldOptions.call({ compile: d, getCollectionFields: y, filter: a }, C, O)).reduce((B, M) => Object.assign(B, { [M.value]: M }), {});
+    O && (R[O.value] = O), h(R);
   }, [g, l, a, c]), useEffect(() => {
-    const z = e.multiple ? o : o ? [o] : [];
-    if (!(z != null && z.length) || z.every((R) => !!m[R]))
+    const O = e.multiple ? o : o ? [o] : [];
+    if (!(O != null && O.length) || O.every((R) => !!m[R]))
       return;
     const j = [];
-    z.forEach((R) => {
+    O.forEach((R) => {
       const B = R.split(".");
       let M = m[B[0]];
       for (let k = 1; k < B.length && M; k++) {
@@ -35665,19 +35671,19 @@ const AppendsTreeSelect = (e) => {
           break;
         }
         if (!M.isLeaf && M.loadChildren) {
-          const O = M.loadChildren(M);
-          O != null && O.length && (j.push(...O), M = O.find((q) => q.value === B.slice(0, k + 1).join(".")));
+          const L = M.loadChildren(M);
+          L != null && L.length && (j.push(...L), M = L.find((q) => q.value === B.slice(0, k + 1).join(".")));
         }
       }
     }), h((R) => j.reduce((B, M) => Object.assign(B, { [M.value]: M }), x({}, R)));
   }, [o, v.length, e.multiple]);
   const T = useCallback(
-    (z) => {
+    (O) => {
       if (!e.multiple) {
-        n(z);
+        n(O);
         return;
       }
-      const j = z.map((M) => M.value).filter(Boolean), R = new Set(j), B = I.find((M) => !R.has(M.value));
+      const j = O.map((M) => M.value).filter(Boolean), R = new Set(j), B = I.find((M) => !R.has(M.value));
       if (B) {
         const M = `${B.value}.`;
         Object.keys(m).forEach((k) => {
@@ -35694,16 +35700,16 @@ const AppendsTreeSelect = (e) => {
     },
     [e.multiple, I, n, m]
   ), A = useCallback(
-    (z) => {
+    (O) => {
       var N;
-      const { value: j, onClose: R, disabled: B, closable: M } = z;
+      const { value: j, onClose: R, disabled: B, closable: M } = O;
       if (!j)
         return null;
       const { fullTitle: k } = (N = m[j]) != null ? N : {};
       return /* @__PURE__ */ jsx(Tag, { closable: M && !B, onClose: R, children: k == null ? void 0 : k.join(" / ") });
     },
     [m]
-  ), D = Array.isArray(I) ? I.filter((z) => z.value in m) : I, $ = e.multiple ? o : o != null ? [o] : [];
+  ), D = Array.isArray(I) ? I.filter((O) => O.value in m) : I, $ = e.multiple ? o : o != null ? [o] : [];
   return /* @__PURE__ */ jsx(
     TreeSelect$2,
     x({
@@ -35748,20 +35754,20 @@ const AppendsTreeSelect = (e) => {
       const T = uid();
       return f.addEffects(T, () => {
         onFieldInputValueChange("*", (A) => {
-          var $, L, z, j, R;
-          (filterAnalyses((z = (L = ($ = r.componentProps) == null ? void 0 : $.service) == null ? void 0 : L.params) == null ? void 0 : z.filter) || []).includes((j = A == null ? void 0 : A.props) == null ? void 0 : j.name) && r.value && isEqual(A == null ? void 0 : A.indexes, r == null ? void 0 : r.indexes) && ((R = A == null ? void 0 : A.props) == null ? void 0 : R.name) !== r.props.name && (r.setValue(void 0), p(void 0));
+          var $, z, O, j, R;
+          (filterAnalyses((O = (z = ($ = r.componentProps) == null ? void 0 : $.service) == null ? void 0 : z.params) == null ? void 0 : O.filter) || []).includes((j = A == null ? void 0 : A.props) == null ? void 0 : j.name) && r.value && isEqual(A == null ? void 0 : A.indexes, r == null ? void 0 : r.indexes) && ((R = A == null ? void 0 : A.props) == null ? void 0 : R.name) !== r.props.name && (r.setValue(void 0), p(void 0));
         });
       }), () => {
         f.removeEffects(T);
       };
     }, []);
     const y = (T) => V(void 0, null, function* () {
-      var L, z;
+      var z, O;
       const { search: A, callBack: D } = T, {
         data: { data: $ }
       } = yield S.create({
         values: {
-          [((z = (L = r == null ? void 0 : r.componentProps) == null ? void 0 : L.fieldNames) == null ? void 0 : z.label) || "id"]: A
+          [((O = (z = r == null ? void 0 : r.componentProps) == null ? void 0 : z.fieldNames) == null ? void 0 : O.label) || "id"]: A
         }
       });
       if ($) {
@@ -36357,9 +36363,9 @@ function Uploader(o) {
       if (i) {
         const D = T.fileList.filter(($) => $.status === "done");
         if (D.length) {
-          const $ = [...a != null ? a : [], ...D.map((L) => {
-            var z;
-            return c((z = L.response) == null ? void 0 : z.data);
+          const $ = [...a != null ? a : [], ...D.map((z) => {
+            var O;
+            return c((O = z.response) == null ? void 0 : O.data);
           })];
           l == null || l($);
         }
@@ -36687,39 +36693,39 @@ function FileSelector(e) {
   );
 }
 const InternalFileManager = (e) => {
-  var A, D;
-  const T = e, { value: t, multiple: o, onChange: n } = T, r = K(T, ["value", "multiple", "onChange"]), i = useFieldSchema(), [a, l] = useState(!1), [c, u] = useState([]), d = useInsertSchema("Selector"), p = useFieldNames$1(e), m = useField(), [h, g] = useState([]), { getField: f } = useCollection_deprecated(), C = f(m.props.name), S = useLabelUiSchema$1(C == null ? void 0 : C.target, (p == null ? void 0 : p.label) || "label"), b = useCompile(), { modalProps: y } = useActionContext(), v = ($) => {
-    $.stopPropagation(), $.preventDefault(), d(schema$1.Selector), l(!0), u([]);
+  var D, $;
+  const A = e, { value: t, multiple: o, onChange: n } = A, r = K(A, ["value", "multiple", "onChange"]), i = useFieldSchema(), [a, l] = useState(!1), [c, u] = useState([]), d = useInsertSchema("Selector"), p = useFieldNames$1(e), { designable: m } = useDesignable(), h = useField(), [g, f] = useState([]), { getField: C } = useCollection_deprecated(), S = C(h.props.name), b = useLabelUiSchema$1(S == null ? void 0 : S.target, (p == null ? void 0 : p.label) || "label"), y = useCompile(), { modalProps: v } = useActionContext(), I = (z) => {
+    z.stopPropagation(), z.preventDefault(), m ? d(schema$1.Selector) : i.addProperty("selector", schema$1.Selector), l(!0), u([]);
   };
   useEffect(() => {
     if (t && Object.keys(t).length > 0) {
-      const $ = (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((L) => {
-        const z = L[p.label];
-        return F(x({}, L), {
-          [p.label]: getLabelFormatValue$1(b(S), b(z))
+      const z = (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((O) => {
+        const j = O[p.label];
+        return F(x({}, O), {
+          [p.label]: getLabelFormatValue$1(y(b), y(j))
         });
       });
-      g($);
+      f(z);
     } else
-      g([]);
+      f([]);
   }, [t, p == null ? void 0 : p.label]);
-  const I = {
+  const w = {
     size: "small",
     fieldNames: p,
-    multiple: ["o2m", "m2m"].includes(C == null ? void 0 : C.interface) && o,
+    multiple: ["o2m", "m2m"].includes(S == null ? void 0 : S.interface) && o,
     association: {
-      target: C == null ? void 0 : C.target
+      target: S == null ? void 0 : S.target
     },
-    options: h,
+    options: g,
     onChange: e == null ? void 0 : e.onChange,
     selectedRows: c,
     setSelectedRows: u,
-    collectionField: C
-  }, w = () => {
-    const { setVisible: $ } = useActionContext(), { multiple: L, selectedRows: z, onChange: j, options: R, collectionField: B } = useContext(RecordPickerContext);
+    collectionField: S
+  }, T = () => {
+    const { setVisible: z } = useActionContext(), { multiple: O, selectedRows: j, onChange: R, options: B, collectionField: M } = useContext(RecordPickerContext);
     return {
       onClick() {
-        j(L ? unionBy(z, R, (B == null ? void 0 : B.targetKey) || "id") : (z == null ? void 0 : z[0]) || null), $(!1);
+        R(O ? unionBy(j, B, (M == null ? void 0 : M.targetKey) || "id") : (j == null ? void 0 : j[0]) || null), z(!1);
       }
     };
   };
@@ -36727,12 +36733,12 @@ const InternalFileManager = (e) => {
     /* @__PURE__ */ jsx(
       FileSelector,
       F(x({}, r), {
-        value: o ? h : h == null ? void 0 : h[0],
+        value: o ? g : g == null ? void 0 : g[0],
         multiple: o,
-        quickUpload: ((A = i["x-component-props"]) == null ? void 0 : A.quickUpload) !== !1,
-        selectFile: ((D = i["x-component-props"]) == null ? void 0 : D.selectFile) !== !1,
-        action: `${C == null ? void 0 : C.target}:create`,
-        onSelect: v,
+        quickUpload: ((D = i["x-component-props"]) == null ? void 0 : D.quickUpload) !== !1,
+        selectFile: (($ = i["x-component-props"]) == null ? void 0 : $.selectFile) !== !1,
+        action: `${S == null ? void 0 : S.target}:create`,
+        onSelect: I,
         onChange: n
       })
     ),
@@ -36744,17 +36750,17 @@ const InternalFileManager = (e) => {
           visible: a,
           setVisible: l,
           modalProps: {
-            getContainer: (r == null ? void 0 : r.getContainer) || (y == null ? void 0 : y.getContainer)
+            getContainer: (r == null ? void 0 : r.getContainer) || (v == null ? void 0 : v.getContainer)
           },
           formValueChanged: !1
         },
-        children: /* @__PURE__ */ jsx(RecordPickerProvider, F(x({}, I), { children: /* @__PURE__ */ jsx(CollectionProvider_deprecated, { name: C == null ? void 0 : C.target, children: /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(TableSelectorParamsProvider, { params: {}, children: /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: { usePickActionProps: w, useTableSelectorProps: useTableSelectorProps$2 }, children: /* @__PURE__ */ jsx(
+        children: /* @__PURE__ */ jsx(RecordPickerProvider, F(x({}, w), { children: /* @__PURE__ */ jsx(CollectionProvider_deprecated, { name: S == null ? void 0 : S.target, children: /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(TableSelectorParamsProvider, { params: {}, children: /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: { usePickActionProps: T, useTableSelectorProps: useTableSelectorProps$2 }, children: /* @__PURE__ */ jsx(
           RecursionField,
           {
             onlyRenderProperties: !0,
-            basePath: m.address,
+            basePath: h.address,
             schema: i,
-            filterProperties: ($) => $["x-component"] === "AssociationField.Selector"
+            filterProperties: (z) => z["x-component"] === "AssociationField.Selector"
           }
         ) }) }) }) }) }))
       }
@@ -36771,10 +36777,10 @@ const InternalFileManager = (e) => {
     FormItem: FormItem$1
   }
 }), CascadeSelect = connect((e) => {
-  var z;
+  var O;
   const { data: t, mapOptions: o, onChange: n, value: r } = e, [i, a] = useState([
     { key: void 0, children: [], value: null }
-  ]), [l, c] = useState(t), [u, d] = useState(!1), p = useCompile(), m = useAPIClient(), h = useServiceOptions$1(e), { options: g, field: f } = useAssociationFieldContext(), C = m.resource(g.target), { getCollectionJoinField: S, getInterface: b } = useCollectionManager_deprecated(), y = (z = f == null ? void 0 : f.componentProps) == null ? void 0 : z.fieldNames, v = (g == null ? void 0 : g.target) && (y == null ? void 0 : y.label) && S(`${g.target}.${y.label}`), I = useMemo(() => {
+  ]), [l, c] = useState(t), [u, d] = useState(!1), p = useCompile(), m = useAPIClient(), h = useServiceOptions$1(e), { options: g, field: f } = useAssociationFieldContext(), C = m.resource(g.target), { getCollectionJoinField: S, getInterface: b } = useCollectionManager_deprecated(), y = (O = f == null ? void 0 : f.componentProps) == null ? void 0 : O.fieldNames, v = (g == null ? void 0 : g.target) && (y == null ? void 0 : y.label) && S(`${g.target}.${y.label}`), I = useMemo(() => {
     var j, R;
     return v != null && v.interface && ((R = (j = b(v.interface)) == null ? void 0 : j.filterable) == null ? void 0 : R.operators[0].value) || "$includes";
   }, [v]), w = useField();
@@ -36797,14 +36803,14 @@ const InternalFileManager = (e) => {
           let B = p(R[y.label]);
           if ((M = v == null ? void 0 : v.uiSchema) != null && M.enum)
             if (Array.isArray(B))
-              B = B.map((O, q) => {
+              B = B.map((L, q) => {
                 var U, G;
-                const E = (G = (U = v.uiSchema.enum).find) == null ? void 0 : G.call(U, (H) => H.value === O);
-                return E ? /* @__PURE__ */ jsx(Tag, { color: E.color, style: { marginRight: 3 }, children: (E == null ? void 0 : E.label) || O }, q) : /* @__PURE__ */ jsx(Tag, { children: O }, O);
+                const E = (G = (U = v.uiSchema.enum).find) == null ? void 0 : G.call(U, (H) => H.value === L);
+                return E ? /* @__PURE__ */ jsx(Tag, { color: E.color, style: { marginRight: 3 }, children: (E == null ? void 0 : E.label) || L }, q) : /* @__PURE__ */ jsx(Tag, { children: L }, L);
               }).reverse();
             else {
-              const O = (N = (k = v.uiSchema.enum).find) == null ? void 0 : N.call(k, (q) => q.value === B);
-              O && (B = /* @__PURE__ */ jsx(Tag, { color: O.color, children: O.label }));
+              const L = (N = (k = v.uiSchema.enum).find) == null ? void 0 : N.call(k, (q) => q.value === B);
+              L && (B = /* @__PURE__ */ jsx(Tag, { color: L.color, children: L.label }));
             }
           return (v == null ? void 0 : v.type) === "date" && (B = dayjs(B).format("YYYY-MM-DD")), o ? o({
             [y.label]: B || EMPTY,
@@ -36840,13 +36846,13 @@ const InternalFileManager = (e) => {
     var M, k, N;
     if (j) {
       d(!0);
-      const O = yield A({ parentId: R == null ? void 0 : R.key });
-      if (d(!1), c(O), B === (i == null ? void 0 : i.length) - 1 && ((M = R == null ? void 0 : R.value) != null && M.id)) {
+      const L = yield A({ parentId: R == null ? void 0 : R.key });
+      if (d(!1), c(L), B === (i == null ? void 0 : i.length) - 1 && ((M = R == null ? void 0 : R.value) != null && M.id)) {
         const q = yield A({ parentId: (k = R == null ? void 0 : R.value) == null ? void 0 : k.id }), E = [...i];
         E.splice(B + 1), E[B] = F(x({}, E[B]), { value: R == null ? void 0 : R.value }), E[B + 1] = { key: (N = R == null ? void 0 : R.value) == null ? void 0 : N.id, children: (q == null ? void 0 : q.length) > 0 ? q : null }, a(E), n == null || n(E);
       }
     }
-  }), L = (j, R) => V(void 0, null, function* () {
+  }), z = (j, R) => V(void 0, null, function* () {
     const B = j ? {
       [y.label]: {
         [I]: j
@@ -36874,10 +36880,10 @@ const InternalFileManager = (e) => {
           value: (M = j == null ? void 0 : j.value) == null ? void 0 : M[y.value]
         },
         labelInValue: !0,
-        onSearch: (N) => L(N, j),
+        onSearch: (N) => z(N, j),
         fieldNames: y,
         style: { minWidth: 150 },
-        onChange: (N, O) => D(N, O, R),
+        onChange: (N, L) => D(N, L, R),
         options: u ? [] : T(l),
         onDropdownVisibleChange: (N) => $(N, j, R),
         notFoundContent: u ? /* @__PURE__ */ jsx(Spin, { size: "small" }) : null
@@ -37092,7 +37098,7 @@ const InternalNesterCss = css`
 }, InternalPicker = observer$1(
   (e) => {
     var j;
-    const z = e, { value: t, multiple: o, openSize: n, onChange: r, quickUpload: i, selectFile: a, shouldMountElement: l } = z, c = K(z, ["value", "multiple", "openSize", "onChange", "quickUpload", "selectFile", "shouldMountElement"]), u = useField(), d = useFieldNames$1(e), [p, m] = useState(!1), h = useFieldSchema(), g = useInsertSchema("Selector"), { options: f } = useAssociationFieldContext(), { collectionName: C } = useFormBlockContext(), S = useCompile(), b = useLabelUiSchema$1(f, (d == null ? void 0 : d.label) || "label"), y = h["x-add-new"], [v, I] = useState([]), w = useCollectionRecordData(), T = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((B) => {
+    const O = e, { value: t, multiple: o, openSize: n, onChange: r, quickUpload: i, selectFile: a, shouldMountElement: l } = O, c = K(O, ["value", "multiple", "openSize", "onChange", "quickUpload", "selectFile", "shouldMountElement"]), u = useField(), d = useFieldNames$1(e), [p, m] = useState(!1), h = useFieldSchema(), g = useInsertSchema("Selector"), { options: f } = useAssociationFieldContext(), { collectionName: C } = useFormBlockContext(), S = useCompile(), b = useLabelUiSchema$1(f, (d == null ? void 0 : d.label) || "label"), y = h["x-add-new"], [v, I] = useState([]), w = useCollectionRecordData(), T = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((B) => {
       const M = B == null ? void 0 : B[d.label];
       return F(x({}, B), {
         [d.label]: getLabelFormatValue$1(S(b), S(M))
@@ -37116,14 +37122,14 @@ const InternalNesterCss = css`
     }, $ = () => {
       const R = (f == null ? void 0 : f.targetKey) || "id", B = T.map((k) => k[R]).filter(Boolean);
       return B.length ? { $and: [{ [`${R}.$ne`]: B }] } : {};
-    }, L = () => {
-      const { setVisible: R } = useActionContext(), { multiple: B, selectedRows: M, onChange: k, options: N, collectionField: O } = useContext(RecordPickerContext);
+    }, z = () => {
+      const { setVisible: R } = useActionContext(), { multiple: B, selectedRows: M, onChange: k, options: N, collectionField: L } = useContext(RecordPickerContext);
       return {
         onClick() {
-          k(B ? unionBy(M, N, (O == null ? void 0 : O.targetKey) || "id") : (M == null ? void 0 : M[0]) || null), R(!1);
+          k(B ? unionBy(M, N, (L == null ? void 0 : L.targetKey) || "id") : (M == null ? void 0 : M[0]) || null), R(!1);
         },
         style: {
-          display: B !== !1 && ["o2m", "m2m", "mbm"].includes(O == null ? void 0 : O.interface) ? "block" : "none"
+          display: B !== !1 && ["o2m", "m2m", "mbm"].includes(L == null ? void 0 : L.interface) ? "block" : "none"
         }
       };
     };
@@ -37186,7 +37192,7 @@ const InternalNesterCss = css`
             SchemaComponentOptions,
             {
               scope: {
-                usePickActionProps: L,
+                usePickActionProps: z,
                 useTableSelectorProps: useTableSelectorProps$1
               },
               children: /* @__PURE__ */ jsx(
@@ -37230,27 +37236,27 @@ const RenderRecord = React.memo(
     const [f, C] = useState(!0), [S, b] = useState([]);
     return useEffect(() => {
       const y = toArr$3(h).map((v, I, w) => {
-        const T = v == null ? void 0 : v[(e == null ? void 0 : e.label) || "label"], A = t ? transformNestedData(v).map((z) => z == null ? void 0 : z[(e == null ? void 0 : e.label) || "label"]).join(" / ") : isObject(T) ? JSON.stringify(T) : T, D = toValue$3(o(A), "N/A"), $ = n(
+        const T = v == null ? void 0 : v[(e == null ? void 0 : e.label) || "label"], A = t ? transformNestedData(v).map((O) => O == null ? void 0 : O[(e == null ? void 0 : e.label) || "label"]).join(" / ") : isObject(T) ? JSON.stringify(T) : T, D = toValue$3(o(A), "N/A"), $ = n(
           (v == null ? void 0 : v.__collection) || (r == null ? void 0 : r.target),
           (e == null ? void 0 : e.label) || "label"
-        ), L = getLabelFormatValue$1(o($), D, !0);
+        ), z = getLabelFormatValue$1(o($), D, !0);
         return /* @__PURE__ */ jsxs(Fragment$1, { children: [
-          /* @__PURE__ */ jsx("span", { children: i ? L : a !== !1 ? /* @__PURE__ */ jsx(
+          /* @__PURE__ */ jsx("span", { children: i ? z : a !== !1 ? /* @__PURE__ */ jsx(
             "a",
             {
               onMouseEnter: () => {
                 g(!0);
               },
-              onClick: (z) => {
+              onClick: (O) => {
                 var j;
-                g(!0), z.stopPropagation(), z.preventDefault(), l && c(schema$1.Viewer), u.properties && d({
+                g(!0), O.stopPropagation(), O.preventDefault(), l && c(schema$1.Viewer), u.properties && d({
                   recordData: v,
                   parentRecordData: p
                 }), (j = m == null ? void 0 : m.current) == null || j.setPopoverVisible(!1);
               },
-              children: L
+              children: z
             }
-          ) : L }),
+          ) : z }),
           I < w.length - 1 ? /* @__PURE__ */ jsx("span", { style: { marginRight: 4, color: "#aaa" }, children: "," }) : null
         ] }, `${v == null ? void 0 : v.id}_${I}`);
       });
@@ -38031,8 +38037,8 @@ const useColumnsDeepMemoized = (e) => {
         width: I && !a ? 0 : ((A = b["x-component-props"]) == null ? void 0 : A.width) || 100,
         render: (D, $) => {
           var j;
-          const L = (j = n.value) == null ? void 0 : j.indexOf($), z = n.address.concat($.__index || L);
-          return /* @__PURE__ */ jsx(SubFormProvider, { value: { value: $, collection: f, fieldSchema: r.parent }, children: /* @__PURE__ */ jsx(RecordIndexProvider, { index: $.__index || L, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: isNewRecord($), record: $, parent: u, children: /* @__PURE__ */ jsx(ColumnFieldProvider, { schema: b, basePath: z, children: /* @__PURE__ */ jsx("span", { role: "button", className: g, children: /* @__PURE__ */ jsx(RecursionField, { basePath: z, schema: b, onlyRenderProperties: !0 }) }) }) }) }) });
+          const z = (j = n.value) == null ? void 0 : j.indexOf($), O = n.address.concat($.__index || z);
+          return /* @__PURE__ */ jsx(SubFormProvider, { value: { value: $, collection: f, fieldSchema: r.parent }, children: /* @__PURE__ */ jsx(RecordIndexProvider, { index: $.__index || z, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: isNewRecord($), record: $, parent: u, children: /* @__PURE__ */ jsx(ColumnFieldProvider, { schema: b, basePath: O, children: /* @__PURE__ */ jsx("span", { role: "button", className: g, children: /* @__PURE__ */ jsx(RecursionField, { basePath: O, schema: b, onlyRenderProperties: !0 }) }) }) }) }) });
         },
         onCell: (D, $) => ({
           record: D,
@@ -38157,7 +38163,7 @@ const useColumnsDeepMemoized = (e) => {
             display: none !important;
           }
         `,
-      itemRender: (D, $, L) => $ === "prev" ? /* @__PURE__ */ jsxs(
+      itemRender: (D, $, z) => $ === "prev" ? /* @__PURE__ */ jsxs(
         "div",
         {
           style: { display: "flex" },
@@ -38167,12 +38173,12 @@ const useColumnsDeepMemoized = (e) => {
                   }
                 `,
           children: [
-            L,
+            z,
             " ",
             /* @__PURE__ */ jsx("div", { style: { marginLeft: "7px" }, children: d })
           ]
         }
-      ) : L
+      ) : z
     });
   }, [c, o, C, (w = n.value) == null ? void 0 : w.length]);
   return t === !1 || !t && e === !1 ? !1 : ((T = n.value) == null ? void 0 : T.length) > 0 || S.total ? S : !1;
@@ -38373,8 +38379,8 @@ const Table$1 = withDynamicSchemaProps(
       "onExpand",
       "loading",
       "onClickRow"
-    ]), b = useArrayField(S), y = useFieldSchema(), { size: v = "middle" } = (y == null ? void 0 : y["x-component-props"]) || {}, I = useCollection(), T = ((ce = y == null ? void 0 : y.parent) == null ? void 0 : ce["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: A, allIncludesChildren: D } = T, $ = useMemoizedFn(S.onRowDragEnd || (() => {
-    })), L = usePaginationProps$2(o, i), z = useTableColumns$1(S, L), [j, R] = useState(() => A ? D : []), [B, M] = useState(((ye = b == null ? void 0 : b.data) == null ? void 0 : ye.selectedRowKeys) || []), [k, N] = useState([]), O = (p == null ? void 0 : p.type) !== "none", q = useRef(/* @__PURE__ */ new Map()), E = useMemo(() => css`
+    ]), b = useArrayField(S), y = useFieldSchema(), { size: v = "small" } = (y == null ? void 0 : y["x-component-props"]) || {}, I = useCollection(), T = ((ce = y == null ? void 0 : y.parent) == null ? void 0 : ce["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: A, allIncludesChildren: D } = T, $ = useMemoizedFn(S.onRowDragEnd || (() => {
+    })), z = usePaginationProps$2(o, i), O = useTableColumns$1(S, z), [j, R] = useState(() => A ? D : []), [B, M] = useState(((ye = b == null ? void 0 : b.data) == null ? void 0 : ye.selectedRowKeys) || []), [k, N] = useState([]), L = (p == null ? void 0 : p.type) !== "none", q = useRef(/* @__PURE__ */ new Map()), E = useMemo(() => css`
         & > td {
           background-color: ${t.controlItemBgActive} !important;
         }
@@ -38448,21 +38454,21 @@ const Table$1 = withDynamicSchemaProps(
           renderCell: (oe, ne, re, ae) => {
             if (!l && !c)
               return ae;
-            const he = L == null ? void 0 : L.current, Se = (L == null ? void 0 : L.pageSize) || 20;
+            const he = z == null ? void 0 : z.current, Se = (z == null ? void 0 : z.pageSize) || 20;
             return he ? re = re + (he - 1) * Se + 1 : re = re + 1, ne.__index && (re = extractIndex(ne.__index)), /* @__PURE__ */ jsxs(
               "div",
               {
                 role: "button",
                 "aria-label": `table-index-${re}`,
                 className: cls(oe ? "checked" : floatLeftClass, rowSelectCheckboxWrapperClass, {
-                  [rowSelectCheckboxWrapperClassHover]: O
+                  [rowSelectCheckboxWrapperClassHover]: L
                 }),
                 children: [
                   /* @__PURE__ */ jsxs("div", { className: cls(oe ? "checked" : null, rowSelectCheckboxContentClass), children: [
                     l && /* @__PURE__ */ jsx(SortHandle$1, { id: W(ne) }),
                     c && /* @__PURE__ */ jsx(TableIndex$2, { index: re })
                   ] }),
-                  O && /* @__PURE__ */ jsx(
+                  L && /* @__PURE__ */ jsx(
                     "div",
                     {
                       className: cls(
@@ -38487,9 +38493,9 @@ const Table$1 = withDynamicSchemaProps(
         l,
         b,
         W,
-        O,
+        L,
         Q,
-        L
+        z
       ]
     ), te = useCallback(
       ({ children: oe }) => {
@@ -38532,13 +38538,13 @@ const Table$1 = withDynamicSchemaProps(
           defaultRowKey: H,
           dataSource: X
         }, S), Z), {
-          paginationProps: L,
+          paginationProps: z,
           components: Y,
           onTableChange: d,
           onRow: G,
           rowClassName: ge,
           scroll: le,
-          columns: z,
+          columns: O,
           expandable: xe,
           field: b,
           size: v
@@ -38570,8 +38576,11 @@ const Table$1 = withDynamicSchemaProps(
     transform: translateY(0);
     opacity: 1;
   }
+  .ant-table-cell .ant-formily-item-control {
+    max-width: 100% !important;
+  }
 `, tableClassName = css`
-  .ant-formily-item.ant-formily-item-feedback-layout-loose {
+  .ant-formily-item-feedback-layout-popover {
     margin-bottom: 0px !important;
   }
   .ant-formily-editable {
@@ -38589,7 +38598,7 @@ const Table$1 = withDynamicSchemaProps(
   border-radius: 0px;
 `, SubTable = observer$1(
   (e) => {
-    var z, j, R;
+    var O, j, R;
     const { openSize: t } = e, { field: o, options: n } = useAssociationFieldContext(), { t: r } = useTranslation(), [i, a] = useState(!1), [l, c] = useState([]), u = useFieldNames$1(e), d = useFieldSchema(), p = useCompile(), m = useLabelUiSchema$1(n, (u == null ? void 0 : u.label) || "label"), h = useCollectionRecord(), g = useCollection(), { allowSelectExistingRecord: f, allowAddnew: C, allowDisassociation: S } = o.componentProps;
     useSubTableSpecialCase({ field: o });
     const b = (B, M) => {
@@ -38624,21 +38633,21 @@ const Table$1 = withDynamicSchemaProps(
       const { setVisible: B } = useActionContext(), { selectedRows: M, setSelectedRows: k } = useContext(RecordPickerContext);
       return {
         onClick() {
-          var O;
+          var L;
           M.map((q) => o.value.push(markRecordAsNew(q))), o.onInput(o.value), o.initialValue = o.value, k([]), B(!1);
-          const N = Math.ceil(o.value.length / (((O = o.componentProps) == null ? void 0 : O.pageSize) || 10));
+          const N = Math.ceil(o.value.length / (((L = o.componentProps) == null ? void 0 : L.pageSize) || 10));
           A(N);
         }
       };
     }, w = () => {
       const B = (n == null ? void 0 : n.targetKey) || "id", M = (o.value || []).map((N) => N == null ? void 0 : N[B]).filter(Boolean);
       return M.length ? { $and: [{ [`${B}.$ne`]: M }] } : {};
-    }, [T, A] = useState(1), [D, $] = useState(((z = o.componentProps) == null ? void 0 : z.pageSize) || 10);
+    }, [T, A] = useState(1), [D, $] = useState(((O = o.componentProps) == null ? void 0 : O.pageSize) || 10);
     useEffect(() => {
       var B;
       $((B = o.componentProps) == null ? void 0 : B.pageSize);
     }, [(j = o.componentProps) == null ? void 0 : j.pageSize]);
-    const L = useMemo(() => {
+    const z = useMemo(() => {
       var M;
       const B = Math.ceil(((M = o.value) == null ? void 0 : M.length) / 10);
       return {
@@ -38658,13 +38667,12 @@ const Table$1 = withDynamicSchemaProps(
         Table$1,
         {
           className: tableClassName,
-          bordered: !0,
           size: "small",
           field: o,
           showIndex: !0,
           dragSort: !1,
           showDel: C !== !1 || f !== !1 || S !== !1 ? (B) => o.editable ? S !== !1 ? !0 : B == null ? void 0 : B.__isNewRecord__ : !1 : !1,
-          pagination: L,
+          pagination: z,
           rowSelection: { type: "none", hideSelectAll: !0 },
           footer: () => o.editable && /* @__PURE__ */ jsxs(Fragment, { children: [
             C !== !1 && /* @__PURE__ */ jsx(
@@ -38820,14 +38828,14 @@ const ReadPretty$7 = observer$1(
 InternalAssociationSelect.displayName = "InternalAssociationSelect";
 const AssociationSelect = InternalAssociationSelect;
 AssociationSelect.Designer = function e() {
-  var B, M, k, N, O, q, E, U, G, H, W;
+  var B, M, k, N, L, q, E, U, G, H, W;
   const { getCollectionFields: t, getInterface: o, getCollectionJoinField: n, getCollection: r, isTitleField: i } = useCollectionManager_deprecated(), { getField: a } = useCollection_deprecated(), { form: l } = useFormBlockContext(), c = useField(), u = useFieldSchema(), { t: d } = useTranslation(), p = useFilterByTk(), { dn: m, refresh: h, insertAdjacent: g } = useDesignable(), f = useCompile(), C = useIsShowMultipleSwitch(), { isAllowToSetDefaultValue: S } = useIsAllowToSetDefaultValue(), b = a(u.name) || n(u["x-collection-field"]), y = useFieldComponentOptions(), v = c.address.segments.includes("__form_grid"), I = o(b == null ? void 0 : b.interface), w = (B = I == null ? void 0 : I.validateSchema) == null ? void 0 : B.call(I, u), T = (M = b == null ? void 0 : b.uiSchema) == null ? void 0 : M.title, A = b != null && b.target ? t(b == null ? void 0 : b.target) : [];
   c.title === T || c.title;
-  const D = useSortFields(b == null ? void 0 : b.target), $ = ((O = (N = (k = c.componentProps) == null ? void 0 : k.service) == null ? void 0 : N.params) == null ? void 0 : O.sort) || [];
+  const D = useSortFields(b == null ? void 0 : b.target), $ = ((L = (N = (k = c.componentProps) == null ? void 0 : k.service) == null ? void 0 : N.params) == null ? void 0 : L.sort) || [];
   useEffect(() => {
     c.readPretty !== u["x-read-pretty"] && (c.readPretty = !!u["x-read-pretty"]);
   }, [u["x-read-pretty"]]);
-  const L = $ == null ? void 0 : $.map((X) => X.startsWith("-") ? {
+  const z = $ == null ? void 0 : $.map((X) => X.startsWith("-") ? {
     field: X.substring(1),
     direction: "desc"
   } : {
@@ -38835,7 +38843,7 @@ AssociationSelect.Designer = function e() {
     direction: "asc"
   });
   c.readPretty || c.required;
-  const z = A.filter((X) => i(X)).map((X) => {
+  const O = A.filter((X) => i(X)).map((X) => {
     var J;
     return {
       value: X == null ? void 0 : X.name,
@@ -39073,7 +39081,7 @@ AssociationSelect.Designer = function e() {
           properties: {
             sort: {
               type: "array",
-              default: L,
+              default: z,
               "x-component": "ArrayItems",
               "x-decorator": "FormItem",
               items: {
@@ -39186,7 +39194,7 @@ AssociationSelect.Designer = function e() {
       SchemaSettingsSelectItem,
       {
         title: d("Title field"),
-        options: z,
+        options: O,
         value: (W = (H = c == null ? void 0 : c.componentProps) == null ? void 0 : H.fieldNames) == null ? void 0 : W.label,
         onChange: (X) => {
           var Q, Z;
@@ -39219,7 +39227,7 @@ AssociationSelect.Designer = function e() {
   ] });
 };
 AssociationSelect.FilterDesigner = function e() {
-  var I, w, T, A, D, $, L, z, j, R, B;
+  var I, w, T, A, D, $, z, O, j, R, B;
   const { getCollectionFields: t, getInterface: o, getCollectionJoinField: n } = useCollectionManager_deprecated(), { getField: r } = useCollection_deprecated(), { form: i } = useFormBlockContext(), a = useField(), l = useFieldSchema(), { t: c } = useTranslation(), { dn: u, refresh: d } = useDesignable(), p = useCompile(), m = r(l.name) || n(l["x-collection-field"]), h = o(m == null ? void 0 : m.interface), g = (I = h == null ? void 0 : h.validateSchema) == null ? void 0 : I.call(h, l), f = (w = m == null ? void 0 : m.uiSchema) == null ? void 0 : w.title, C = m != null && m.target ? t(m == null ? void 0 : m.target) : [];
   a.title === f || a.title;
   const S = useSortFields(m == null ? void 0 : m.target), b = ((D = (A = (T = a.componentProps) == null ? void 0 : T.service) == null ? void 0 : A.params) == null ? void 0 : D.sort) || [], y = b == null ? void 0 : b.map((M) => M.startsWith("-") ? {
@@ -39336,8 +39344,8 @@ AssociationSelect.FilterDesigner = function e() {
           if (["percent"].includes(m == null ? void 0 : m.interface))
             for (const E of k)
               (E.maxValue || E.minValue) && (E.percentMode = !0), E.percentFormat && (E.percentFormats = !0);
-          const O = _.concat([], ((q = m == null ? void 0 : m.uiSchema) == null ? void 0 : q["x-validator"]) || [], k);
-          a.validator = O, l["x-validator"] = k, N["x-validator"] = k, u.emit("patch", {
+          const L = _.concat([], ((q = m == null ? void 0 : m.uiSchema) == null ? void 0 : q["x-validator"]) || [], k);
+          a.validator = L, l["x-validator"] = k, N["x-validator"] = k, u.emit("patch", {
             schema: N
           }), d();
         }
@@ -39374,7 +39382,7 @@ AssociationSelect.FilterDesigner = function e() {
       SchemaSettingsDataScope,
       {
         collectionName: m == null ? void 0 : m.target,
-        defaultFilter: ((j = (z = (L = a.componentProps) == null ? void 0 : L.service) == null ? void 0 : z.params) == null ? void 0 : j.filter) || {},
+        defaultFilter: ((j = (O = (z = a.componentProps) == null ? void 0 : z.service) == null ? void 0 : O.params) == null ? void 0 : j.filter) || {},
         form: i,
         onSubmit: ({ filter: M }) => {
           M = removeNullCondition(M), _.set(a.componentProps, "service.params.filter", M), l["x-component-props"] = a.componentProps, u.emit("patch", {
@@ -39478,10 +39486,10 @@ AssociationSelect.FilterDesigner = function e() {
         options: v,
         value: (B = (R = a == null ? void 0 : a.componentProps) == null ? void 0 : R.fieldNames) == null ? void 0 : B.label,
         onChange: (M) => {
-          var O, q;
+          var L, q;
           const k = {
             "x-uid": l["x-uid"]
-          }, N = F(x(x({}, (q = (O = m == null ? void 0 : m.uiSchema) == null ? void 0 : O["x-component-props"]) == null ? void 0 : q.fieldNames), a.componentProps.fieldNames), {
+          }, N = F(x(x({}, (q = (L = m == null ? void 0 : m.uiSchema) == null ? void 0 : L["x-component-props"]) == null ? void 0 : q.fieldNames), a.componentProps.fieldNames), {
             label: M
           });
           a.componentProps.fieldNames = N, l["x-component-props"] = l["x-component-props"] || {}, l["x-component-props"].fieldNames = N, k["x-component-props"] = l["x-component-props"], u.emit("patch", {
@@ -41020,8 +41028,8 @@ const InternalListBlockProvider = (e) => {
   const d = i ? o.fontSizeLG * o.lineHeightLG + o.padding * 2 - 1 : 0, m = Object.keys(((g = t.parent.properties.actionBar) == null ? void 0 : g.properties) || {}).length > 0 || n ? o.controlHeight + 2 * o.marginLG : o.marginLG, h = u ? o.controlHeight + o.paddingLG + o.marginLG : o.marginLG;
   return e - m - h - d;
 }, InternalList = (e) => {
-  var z, j, R;
-  const { service: t } = useListBlockContext(), { run: o, params: n } = t, r = useFieldSchema(), i = useDesigner(), a = (z = t == null ? void 0 : t.data) == null ? void 0 : z.meta, { pageSize: l, count: c, hasNext: u, page: d } = a || {}, p = useField(), [m] = useState(/* @__PURE__ */ new Map()), { wrapSSR: h, componentCls: g, hashId: f } = useStyles$5(), C = useListBlockHeight(), { token: S } = theme.useToken(), b = useCallback(
+  var O, j, R;
+  const { service: t } = useListBlockContext(), { run: o, params: n } = t, r = useFieldSchema(), i = useDesigner(), a = (O = t == null ? void 0 : t.data) == null ? void 0 : O.meta, { pageSize: l, count: c, hasNext: u, page: d } = a || {}, p = useField(), [m] = useState(/* @__PURE__ */ new Map()), { wrapSSR: h, componentCls: g, hashId: f } = useStyles$5(), C = useListBlockHeight(), { token: S } = theme.useToken(), b = useCallback(
     (B) => (m.has(B) || m.set(
       B,
       new Schema({
@@ -41045,7 +41053,7 @@ const InternalListBlockProvider = (e) => {
     labelAlign: T = "left",
     labelWidth: A = 120,
     labelWrap: D = !0
-  } = (I == null ? void 0 : I["x-component-props"]) || {}, L = (() => {
+  } = (I == null ? void 0 : I["x-component-props"]) || {}, z = (() => {
     var B;
     return c ? {
       onChange: v,
@@ -41122,7 +41130,7 @@ const InternalListBlockProvider = (e) => {
                   children: /* @__PURE__ */ jsx(
                     List$1,
                     F(x({}, e), {
-                      pagination: !a || !((j = p.value) != null && j.length) ? !1 : L,
+                      pagination: !a || !((j = p.value) != null && j.length) ? !1 : z,
                       loading: t == null ? void 0 : t.loading,
                       children: (R = p.value) != null && R.length ? p.value.map((B, M) => /* @__PURE__ */ jsx(
                         RecursionField,
@@ -42161,7 +42169,7 @@ const useSideMenuRef = () => {
 MenuItemDesignerContext.displayName = "MenuItemDesignerContext";
 const Menu = observer$1(
   (e) => {
-    const L = useProps(e), {
+    const z = useProps(e), {
       onSelect: t,
       mode: o,
       selectedUid: n,
@@ -42170,7 +42178,7 @@ const Menu = observer$1(
       defaultSelectedKeys: a,
       defaultOpenKeys: l,
       children: c
-    } = L, u = K(L, [
+    } = z, u = K(z, [
       "onSelect",
       "mode",
       "selectedUid",
@@ -42181,14 +42189,14 @@ const Menu = observer$1(
       "children"
     ]), { t: d } = useTranslation(), p = useDesigner(), m = useFieldSchema(), { refresh: h } = useDesignable(), g = useAPIClient(), { render: f } = useSchemaInitializerRender(m["x-initializer"], m["x-initializer-props"]), C = useSideMenuRef(), [S, b] = useState(), [y, v] = useState(() => a || (r ? findKeysByUid(m, r) : [])), [I, w] = useState(!1), [T, A] = useState(() => ["inline", "mix"].includes(o) ? l || y : l), D = useMemo(() => {
       var j;
-      let z;
+      let O;
       if (n) {
         const R = findKeysByUid(m, n);
-        z = (R == null ? void 0 : R[0]) || null;
+        O = (R == null ? void 0 : R[0]) || null;
       } else
-        z = (y == null ? void 0 : y[0]) || null;
-      if (o === "mix" && z) {
-        const R = (j = m.properties) == null ? void 0 : j[z];
+        O = (y == null ? void 0 : y[0]) || null;
+      if (o === "mix" && O) {
+        const R = (j = m.properties) == null ? void 0 : j[O];
         if ((R == null ? void 0 : R["x-component"]) === "Menu.SubMenu")
           return R;
       }
@@ -42199,8 +42207,8 @@ const Menu = observer$1(
         b(void 0);
         return;
       }
-      const z = findKeysByUid(m, n);
-      b(z), ["inline", "mix"].includes(o) && A(l || z);
+      const O = findKeysByUid(m, n);
+      b(O), ["inline", "mix"].includes(o) && A(l || O);
     }, [n]), useEffect(() => {
       ["inline", "mix"].includes(o) && A(y);
     }, [y]);
@@ -42756,9 +42764,9 @@ const toValue = (e, t) => e == null ? t : e, ReadPrettyRecordPicker = observer$1
         /* @__PURE__ */ jsx("span", { className: "test-record-picker-read-pretty-item", children: g || f ? $ : /* @__PURE__ */ jsx(
           "a",
           {
-            onClick: (L) => {
-              var z;
-              L.stopPropagation(), L.preventDefault(), l(!0), p(w), (z = C == null ? void 0 : C.current) == null || z.setPopoverVisible(!1);
+            onClick: (z) => {
+              var O;
+              z.stopPropagation(), z.preventDefault(), l(!0), p(w), (O = C == null ? void 0 : C.current) == null || O.setPopoverVisible(!1);
             },
             children: $
           }
@@ -44174,18 +44182,18 @@ const TableActionColumnDesigner = (e) => {
     "sort-field"
   );
 }, TableBlockDesigner = () => {
-  var A, D, $, L, z, j, R, B, M, k, N;
-  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 = (A = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : A.params) == null ? void 0 : D.sort) || [], h = (($ = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : $.resource) || ((L = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : L.association), g = !((z = i == null ? void 0 : i["x-decorator-props"]) != null && z.disableTemplate), f = m == null ? void 0 : m.map((O) => O != null && O.startsWith("-") ? {
-    field: O.substring(1),
+  var A, D, $, z, O, j, R, B, M, k, N;
+  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 = (A = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : A.params) == null ? void 0 : D.sort) || [], h = (($ = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : $.resource) || ((z = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : z.association), g = !((O = i == null ? void 0 : i["x-decorator-props"]) != null && O.disableTemplate), f = m == null ? void 0 : m.map((L) => L != null && L.startsWith("-") ? {
+    field: L.substring(1),
     direction: "desc"
   } : {
-    field: O,
+    field: L,
     direction: "asc"
   }), C = useSchemaTemplate(), S = useCollection_deprecated(), { dragSort: b, resource: y } = r.decoratorProps, v = y && o(y), I = y != null && y.includes(".") ? (j = n(v == null ? void 0 : v.target)) == null ? void 0 : j.tree : !!(S != null && S.tree), w = useCallback(
-    ({ filter: O }) => {
-      O = removeNullCondition(O);
+    ({ filter: L }) => {
+      L = removeNullCondition(L);
       const q = r.decoratorProps.params || {};
-      q.filter = O, r.decoratorProps.params = q, i["x-decorator-props"].params = q, d.emit("patch", {
+      q.filter = L, r.decoratorProps.params = q, i["x-decorator-props"].params = q, d.emit("patch", {
         schema: {
           "x-uid": i["x-uid"],
           "x-decorator-props": i["x-decorator-props"]
@@ -44203,11 +44211,11 @@ const TableActionColumnDesigner = (e) => {
         title: u("Tree table"),
         defaultChecked: !0,
         checked: I ? r.decoratorProps.treeTable : !1,
-        onChange: (O) => {
+        onChange: (L) => {
           var E;
-          r.decoratorProps.treeTable = O, i["x-decorator-props"].treeTable = O;
+          r.decoratorProps.treeTable = L, i["x-decorator-props"].treeTable = L;
           const q = F(x({}, (E = c.params) == null ? void 0 : E[0]), {
-            tree: O ? !0 : null
+            tree: L ? !0 : null
           });
           d.emit("patch", {
             schema: i
@@ -44220,13 +44228,13 @@ const TableActionColumnDesigner = (e) => {
       {
         title: u("Enable drag and drop sorting"),
         checked: r.decoratorProps.dragSort,
-        onChange: (O) => V(void 0, null, function* () {
-          O && v && (yield T.resource("collections.fields", v.collectionName).update({
+        onChange: (L) => V(void 0, null, function* () {
+          L && v && (yield T.resource("collections.fields", v.collectionName).update({
             filterByTk: v.name,
             values: {
               sortable: !0
             }
-          })), r.decoratorProps.dragSort = O, i["x-decorator-props"].dragSort = O, d.emit("patch", {
+          })), r.decoratorProps.dragSort = L, i["x-decorator-props"].dragSort = L, d.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
               "x-decorator-props": i["x-decorator-props"]
@@ -44320,9 +44328,9 @@ const TableActionColumnDesigner = (e) => {
             }
           }
         },
-        onSubmit: ({ sort: O }) => {
+        onSubmit: ({ sort: L }) => {
           var U;
-          const q = O.map((G) => G.direction === "desc" ? `-${G.field}` : G.field), E = r.decoratorProps.params || {};
+          const q = L.map((G) => G.direction === "desc" ? `-${G.field}` : G.field), E = r.decoratorProps.params || {};
           E.sort = q, r.decoratorProps.params = E, i["x-decorator-props"].params = E, d.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
@@ -44346,10 +44354,10 @@ const TableActionColumnDesigner = (e) => {
           { label: "100", value: 100 },
           { label: "200", value: 200 }
         ],
-        onChange: (O) => {
+        onChange: (L) => {
           var E;
           const q = r.decoratorProps.params || {};
-          q.pageSize = O, r.decoratorProps.params = q, i["x-decorator-props"].params = q, c.run(F(x({}, (E = c.params) == null ? void 0 : E[0]), { pageSize: O, page: 1 })), d.emit("patch", {
+          q.pageSize = L, r.decoratorProps.params = q, i["x-decorator-props"].params = q, c.run(F(x({}, (E = c.params) == null ? void 0 : E[0]), { pageSize: L, page: 1 })), d.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
               "x-decorator-props": i["x-decorator-props"]
@@ -44368,12 +44376,12 @@ const TableActionColumnDesigner = (e) => {
           { label: u("Middle"), value: "middle" },
           { label: u("Small"), value: "small" }
         ],
-        onChange: (O) => {
+        onChange: (L) => {
           const q = i.reduceProperties((E, U) => {
             if (U["x-component"] === "TableV2")
               return U;
           }, null);
-          q["x-component-props"] = q["x-component-props"] || {}, q["x-component-props"].size = O, d.emit("patch", {
+          q["x-component-props"] = q["x-component-props"] || {}, q["x-component-props"].size = L, d.emit("patch", {
             schema: {
               "x-uid": q["x-uid"],
               "x-decorator-props": q["x-component-props"]
@@ -44420,7 +44428,7 @@ TableField.ActionBar = observer$1(
   { displayName: "TableField.ActionBar" }
 );
 const TableSelectorDesigner = () => {
-  var T, A, D, $, L, z;
+  var T, A, D, $, z, O;
   const { name: e, title: t } = useCollection_deprecated(), { getCollectionJoinField: o, getAllCollectionsInheritChain: n } = useCollectionManager_deprecated(), r = useField(), i = useFieldSchema(), { form: a } = useFormBlockContext(), l = useSortFields(e), { service: c, extraFilter: u } = useTableSelectorContext(), { t: d } = useTranslation(), { dn: p } = useDesignable(), m = ((A = (T = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : T.params) == null ? void 0 : A.sort) || [], h = recursiveParent$1(i, "CollectionField"), g = o(h == null ? void 0 : h["x-collection-field"]), f = m == null ? void 0 : m.map((j) => j.startsWith("-") ? {
     field: j.substring(1),
     direction: "desc"
@@ -44578,7 +44586,7 @@ const TableSelectorDesigner = () => {
       SchemaSettingsSelectItem,
       {
         title: d("Records per page"),
-        value: ((z = (L = r.decoratorProps) == null ? void 0 : L.params) == null ? void 0 : z.pageSize) || 20,
+        value: ((O = (z = r.decoratorProps) == null ? void 0 : z.params) == null ? void 0 : O.pageSize) || 20,
         options: [
           { label: "5", value: 5 },
           { label: "10", value: 10 },
@@ -46349,10 +46357,10 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
             const D = ((A = r(T)) == null ? void 0 : A.fields) || [];
             n(
               D == null ? void 0 : D.filter(($) => supportTypes.includes($.type)).map(($) => {
-                var L;
+                var z;
                 return {
                   value: $.name,
-                  label: g(((L = $.uiSchema) == null ? void 0 : L.title) || $.name)
+                  label: g(((z = $.uiSchema) == null ? void 0 : z.title) || $.name)
                 };
               })
             );
@@ -46534,14 +46542,14 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   const t = useRecord();
   return /* @__PURE__ */ jsx(AddFieldAction, x({ item: t }, e));
 }, AddFieldAction = (e) => {
-  var z, j;
-  const { scope: t, getContainer: o, item: n, children: r, trigger: i, align: a, database: l } = e, { getInterface: c, getTemplate: u, collections: d, getCollection: p } = useCollectionManager_deprecated(), [m, h] = useState(!1), [g, f] = useState(), [C, S] = useState({}), b = useCompile(), { t: y } = useTranslation(), { isDialect: v } = useDialect(), I = useFieldInterfaceOptions(), w = ((j = (z = p(n.name)) == null ? void 0 : z.options) == null ? void 0 : j.fields) || n.fields || [], T = useMemo(() => d.map((R) => ({
+  var O, j;
+  const { scope: t, getContainer: o, item: n, children: r, trigger: i, align: a, database: l } = e, { getInterface: c, getTemplate: u, collections: d, getCollection: p } = useCollectionManager_deprecated(), [m, h] = useState(!1), [g, f] = useState(), [C, S] = useState({}), b = useCompile(), { t: y } = useTranslation(), { isDialect: v } = useDialect(), I = useFieldInterfaceOptions(), w = ((j = (O = p(n.name)) == null ? void 0 : O.options) == null ? void 0 : j.fields) || n.fields || [], T = useMemo(() => d.map((R) => ({
     label: b(R.title),
     value: R.name
   })), []), A = useCallback(() => {
     const { availableFieldInterfaces: R } = u(n.template) || {}, { exclude: B, include: M } = R || {}, k = [];
     return I.forEach((N) => {
-      var O;
+      var L;
       if (N.key === "systemInfo")
         k.push(F(x({}, N), {
           children: N.children.filter((q) => q.hidden ? !1 : q.value === "tableoid" ? M != null && M.length ? M.includes(q.value) : (l == null ? void 0 : l.dialect) === "postgres" : typeof n[q.value] == "boolean" ? n[q.value] : !0)
@@ -46554,7 +46562,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           U && q.push(F(x({}, U), {
             targetScope: E == null ? void 0 : E.targetScope
           }));
-        }) : B != null && B.length ? q = (O = N == null ? void 0 : N.children) == null ? void 0 : O.filter((E) => !B.includes(E.name)) : q = N == null ? void 0 : N.children, q != null && q.length && k.push(F(x({}, N), {
+        }) : B != null && B.length ? q = (L = N == null ? void 0 : N.children) == null ? void 0 : L.filter((E) => !B.includes(E.name)) : q = N == null ? void 0 : N.children, q != null && q.length && k.push(F(x({}, N), {
           children: q
         }));
       }
@@ -46599,7 +46607,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       M && (S(M), h(!0));
     },
     items: D
-  }), [c, D, n]), L = useMemo(() => w.filter((R) => ["string", "bigInt", "integer"].includes(R.type)).map((R) => {
+  }), [c, D, n]), z = useMemo(() => w.filter((R) => ["string", "bigInt", "integer"].includes(R.type)).map((R) => {
     var B;
     return {
       value: R.name,
@@ -46627,7 +46635,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           collections: T,
           isDialect: v,
           disabledJSONB: !1,
-          scopeKeyOptions: L,
+          scopeKeyOptions: z,
           createMainOnly: !0,
           editMainOnly: !0
         }, t)
@@ -46733,14 +46741,14 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       "a",
       F(x({}, a), {
         onClick: () => V(void 0, null, function* () {
-          var L, z;
+          var z, O;
           const { data: T } = yield g.resource("collections.fields", n.collectionName).get({
             filterByTk: n.name,
             appends: ["reverseField"]
           });
           b(T == null ? void 0 : T.data);
           const A = l(n.interface), D = cloneDeep(T == null ? void 0 : T.data) || {};
-          D != null && D.reverseField || (D.autoCreateReverseField = !1, D.reverseField = (L = A == null ? void 0 : A.default) == null ? void 0 : L.reverseField, set(D.reverseField, "name", `f_${uid()}`), set(D.reverseField, "uiSchema.title", (z = n.__parent) == null ? void 0 : z.title));
+          D != null && D.reverseField || (D.autoCreateReverseField = !1, D.reverseField = (z = A == null ? void 0 : A.default) == null ? void 0 : z.reverseField, set(D.reverseField, "name", `f_${uid()}`), set(D.reverseField, "uiSchema.title", (O = n.__parent) == null ? void 0 : O.title));
           const $ = getSchema$7(A, D, n, C);
           h($), p(!0);
         }),
@@ -46840,13 +46848,13 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   }, [w, T] = useState({}), A = p(a), D = getIsOverriding(A, n), $ = useMemo(() => h.map((j) => ({
     label: v(j.title),
     value: j.name
-  })), []), L = () => {
+  })), []), z = () => {
     const j = useForm(), { refresh: R } = useResourceActionContext(), { refreshCM: B } = useCollectionManager_deprecated(), M = useActionContext(), { resource: k } = useResourceContext();
     return {
       run() {
         return V(this, null, function* () {
           yield j.submit();
-          const O = cloneDeep(j.values), q = omit$1(O, [
+          const L = cloneDeep(j.values), q = omit$1(L, [
             "key",
             "uiSchemaUid",
             "collectionName",
@@ -46864,7 +46872,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
         });
       }
     };
-  }, z = useMemo(() => {
+  }, O = useMemo(() => {
     var j;
     return (n == null ? void 0 : n.fields) || ((j = d(n.collectionName)) == null ? void 0 : j.options.fields.filter((R) => ["string", "bigInt", "integer"].includes(R.type)).map((R) => {
       var B;
@@ -46909,7 +46917,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
         components: F(x({}, components$1), { ArrayTable }),
         scope: x({
           getContainer: o,
-          useOverridingCollectionField: L,
+          useOverridingCollectionField: z,
           useCancelAction,
           showReverseFieldConfig: !(w != null && w.reverseField),
           createOnly: !0,
@@ -46917,7 +46925,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           isOverride: !0,
           targetScope: { target: I(l), through: I(c) },
           collections: $,
-          scopeKeyOptions: z
+          scopeKeyOptions: O
         }, t)
       }
     )
@@ -47349,7 +47357,7 @@ const getSchema$4 = (e, t, o) => {
     });
   }), o.filter((n) => n.children.length > 0);
 }, PreviewCom = (e) => {
-  const { databaseView: t, viewName: o, sources: n, schema: r } = e, { data: i } = useContext(ResourceActionContext), a = useAPIClient(), { t: l } = useTranslation(), [c, u] = useState(!1), [d, p] = useState([]), [m, h] = useState([]), [g, f] = useState(n), [C, S] = useState([]), b = useField(), y = useForm(), { getCollection: v, getInterface: I, getCollectionFields: w, getInheritCollections: T, getParentCollectionFields: A } = useCollectionManager_deprecated(), D = useCompile(), L = useFieldInterfaceOptions().filter((R) => !["relation", "systemInfo"].includes(R.key));
+  const { databaseView: t, viewName: o, sources: n, schema: r } = e, { data: i } = useContext(ResourceActionContext), a = useAPIClient(), { t: l } = useTranslation(), [c, u] = useState(!1), [d, p] = useState([]), [m, h] = useState([]), [g, f] = useState(n), [C, S] = useState([]), b = useField(), y = useForm(), { getCollection: v, getInterface: I, getCollectionFields: w, getInheritCollections: T, getParentCollectionFields: A } = useCollectionManager_deprecated(), D = useCompile(), z = useFieldInterfaceOptions().filter((R) => !["relation", "systemInfo"].includes(R.key));
   useEffect(() => {
     const R = [];
     g.forEach((B) => {
@@ -47368,14 +47376,14 @@ const getSchema$4 = (e, t, o) => {
             };
           })
         };
-      }), O = (q = M.fields.filter((E) => !["obo", "oho", "m2m", "o2m"].includes(E == null ? void 0 : E.interface))) == null ? void 0 : q.map((E) => {
+      }), L = (q = M.fields.filter((E) => !["obo", "oho", "m2m", "o2m"].includes(E == null ? void 0 : E.interface))) == null ? void 0 : q.map((E) => {
         var U;
         return { value: E.name, key: E.name, label: l(((U = E.uiSchema) == null ? void 0 : U.title) || E.name) };
       }).concat(N);
       R.push({
         value: B,
         label: l(M.title || M.name),
-        children: O
+        children: L
       });
     }), h(R);
   }, [g, t]), useEffect(() => {
@@ -47384,11 +47392,11 @@ const getSchema$4 = (e, t, o) => {
       if (R) {
         u(!1), p([]);
         const k = (M = Object.values((B = R == null ? void 0 : R.data) == null ? void 0 : B.fields)) == null ? void 0 : M.map((N) => {
-          var O, q;
+          var L, q;
           if (N.source) {
             const E = (i == null ? void 0 : i.data.find((U) => U.name === N.name)) || N;
             return F(x({}, N), {
-              uiSchema: F(x({}, omit$1(E.uiSchema, "rawTitle")), { title: ((O = E.uiSchema) == null ? void 0 : O.title) || E.name })
+              uiSchema: F(x({}, omit$1(E.uiSchema, "rawTitle")), { title: ((L = E.uiSchema) == null ? void 0 : L.title) || E.name })
             });
           } else {
             const E = (i == null ? void 0 : i.data.find((U) => U.name === N.name)) || N;
@@ -47398,16 +47406,16 @@ const getSchema$4 = (e, t, o) => {
           }
         });
         b.value = k, setTimeout(() => {
-          var N, O, q;
-          p(k), y.setValuesIn("sources", (N = R.data) == null ? void 0 : N.sources), f((O = R.data) == null ? void 0 : O.sources), S((q = R == null ? void 0 : R.data) == null ? void 0 : q.unsupportedFields);
+          var N, L, q;
+          p(k), y.setValuesIn("sources", (N = R.data) == null ? void 0 : N.sources), f((L = R.data) == null ? void 0 : L.sources), S((q = R == null ? void 0 : R.data) == null ? void 0 : q.unsupportedFields);
         });
       }
     }).catch);
   }, [t]);
-  const z = (R, B) => {
+  const O = (R, B) => {
     d.splice(B, 1, R), p(d), b.value = d.map((M) => {
-      var N, O, q;
-      const k = typeof M.source == "string" ? M.source : (q = (O = (N = M.source) == null ? void 0 : N.filter) == null ? void 0 : O.call(N, Boolean)) == null ? void 0 : q.join(".");
+      var N, L, q;
+      const k = typeof M.source == "string" ? M.source : (q = (L = (N = M.source) == null ? void 0 : N.filter) == null ? void 0 : L.call(N, Boolean)) == null ? void 0 : q.join(".");
       return F(x({}, M), {
         source: k
       });
@@ -47433,8 +47441,8 @@ const getSchema$4 = (e, t, o) => {
           options: D(m),
           onChange: (k, N) => {
             var q;
-            const O = (q = w(k == null ? void 0 : k[0])) == null ? void 0 : q.find((E) => E.name === last(k));
-            z(F(x({}, B), { source: k, uiSchema: O == null ? void 0 : O.uiSchema }), M);
+            const L = (q = w(k == null ? void 0 : k[0])) == null ? void 0 : q.find((E) => E.name === last(k));
+            O(F(x({}, B), { source: k, uiSchema: L == null ? void 0 : L.uiSchema }), M);
           },
           placeholder: l("Select field source")
         }
@@ -47454,7 +47462,7 @@ const getSchema$4 = (e, t, o) => {
             popupMatchSelectWidth: !1,
             style: { width: "100%" },
             options: (k == null ? void 0 : k.possibleTypes.map((N) => ({ label: N, value: N }))) || [],
-            onChange: (N) => z(F(x({}, k), { type: N }), M)
+            onChange: (N) => O(F(x({}, k), { type: N }), M)
           }
         );
       }
@@ -47465,19 +47473,19 @@ const getSchema$4 = (e, t, o) => {
       key: "interface",
       width: 150,
       render: (R, B, M) => {
-        const k = d[M], N = getInterfaceOptions(L, k.type);
+        const k = d[M], N = getInterfaceOptions(z, k.type);
         return k.source ? R : /* @__PURE__ */ jsx(
           Select$1,
           {
             defaultValue: R,
             style: { width: "100%" },
             popupMatchSelectWidth: !1,
-            onChange: (O) => {
+            onChange: (L) => {
               var E;
-              const q = I(O);
-              z(F(x({}, k), { interface: O, uiSchema: (E = q == null ? void 0 : q.default) == null ? void 0 : E.uiSchema }), M);
+              const q = I(L);
+              O(F(x({}, k), { interface: L, uiSchema: (E = q == null ? void 0 : q.default) == null ? void 0 : E.uiSchema }), M);
             },
-            children: N.map((O) => /* @__PURE__ */ jsx(Select$1.OptGroup, { label: D(O.label), children: O.children.map((q) => /* @__PURE__ */ jsx(Select$1.Option, { value: q.name, children: D(q.label) }, q.value)) }, O.key))
+            children: N.map((L) => /* @__PURE__ */ jsx(Select$1.OptGroup, { label: D(L.label), children: L.children.map((q) => /* @__PURE__ */ jsx(Select$1.Option, { value: q.name, children: D(q.label) }, q.value)) }, L.key))
           }
         );
       }
@@ -47494,8 +47502,8 @@ const getSchema$4 = (e, t, o) => {
           Input$3,
           {
             defaultValue: ((N = k == null ? void 0 : k.uiSchema) == null ? void 0 : N.title) || R,
-            onChange: (O) => z(
-              F(x({}, k), { uiSchema: F(x({}, omit$1(k == null ? void 0 : k.uiSchema, "rawTitle")), { title: O.target.value }) }),
+            onChange: (L) => O(
+              F(x({}, k), { uiSchema: F(x({}, omit$1(k == null ? void 0 : k.uiSchema, "rawTitle")), { title: L.target.value }) }),
               M
             )
           }
@@ -47549,15 +47557,15 @@ 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 $, L, z, j, R, B;
-      const w = typeof (I == null ? void 0 : I.source) == "string" ? ($ = I == null ? void 0 : I.source) == null ? void 0 : $.split(".") : I == null ? void 0 : I.source, T = (z = (L = h(w == null ? void 0 : w[0])) == null ? void 0 : L.find((M) => M.name === (w == null ? void 0 : w[1]))) == null ? void 0 : z.uiSchema, A = ((j = I == null ? void 0 : I.uiSchema) == null ? void 0 : j.title) || (T == null ? void 0 : T.title) || I.name, D = I.source ? T : (B = (R = m(I.interface)) == null ? void 0 : R.default) == null ? void 0 : B.uiSchema;
+      var $, z, O, j, R, B;
+      const w = typeof (I == null ? void 0 : I.source) == "string" ? ($ = I == null ? void 0 : I.source) == null ? void 0 : $.split(".") : I == null ? void 0 : I.source, T = (O = (z = h(w == null ? void 0 : w[0])) == null ? void 0 : z.find((M) => M.name === (w == null ? void 0 : w[1]))) == null ? void 0 : O.uiSchema, A = ((j = I == null ? void 0 : I.uiSchema) == null ? void 0 : j.title) || (T == null ? void 0 : T.title) || I.name, D = I.source ? T : (B = (R = m(I.interface)) == null ? void 0 : R.default) == null ? void 0 : B.uiSchema;
       return {
         title: u(A),
         dataIndex: I.name,
         key: I.name,
         width: 200,
         render: (M, k, N) => {
-          const O = k[I.name], q = {
+          const L = k[I.name], q = {
             type: "object",
             properties: {
               [I.name]: {
@@ -47565,7 +47573,7 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
                 "x-component": D && w ? "CollectionField" : "Input",
                 "x-read-pretty": !0,
                 "x-collection-field": w == null ? void 0 : w.join("."),
-                default: I.interface === "json" ? JSON.stringify(O) : O
+                default: I.interface === "json" ? JSON.stringify(L) : L
               }
             }
           };
@@ -47789,9 +47797,9 @@ const AsyncDataProvider = (e) => {
       () => h.filter((A) => !["relation"].includes(A.key)).map((A, D) => ({
         key: D,
         label: d(A.label),
-        options: A.children.map(($, L) => ({
+        options: A.children.map(($, z) => ({
           value: $.name,
-          key: `${D}-${L}`,
+          key: `${D}-${z}`,
           label: d($.label)
         }))
       })),
@@ -47800,29 +47808,29 @@ const AsyncDataProvider = (e) => {
     if (useEffect(() => {
       var $;
       const A = /* @__PURE__ */ new Map();
-      i || (a && a.length ? Object.entries((a == null ? void 0 : a[0]) || {}).forEach(([L, z]) => {
+      i || (a && a.length ? Object.entries((a == null ? void 0 : a[0]) || {}).forEach(([z, O]) => {
         var k;
-        const j = l[L], R = inferInterface(L, z), B = (k = C.current(R)) == null ? void 0 : k.default, M = (j == null ? void 0 : j.uiSchema) || (B == null ? void 0 : B.uiSchema) || {};
-        A.set(L, {
-          name: L,
+        const j = l[z], R = inferInterface(z, O), B = (k = C.current(R)) == null ? void 0 : k.default, M = (j == null ? void 0 : j.uiSchema) || (B == null ? void 0 : B.uiSchema) || {};
+        A.set(z, {
+          name: z,
           interface: (j == null ? void 0 : j.interface) || R,
           type: (j == null ? void 0 : j.type) || (B == null ? void 0 : B.type),
           source: j == null ? void 0 : j.source,
           uiSchema: x({
-            title: L
+            title: z
           }, M)
         });
       }) : Object.entries(l || {}).forEach(
-        ([L, z]) => A.set(L, F(x({
-          name: L,
+        ([z, O]) => A.set(z, F(x({
+          name: z,
           type: "string"
-        }, z), {
+        }, O), {
           uiSchema: x({
-            title: L
-          }, (z == null ? void 0 : z.uiSchema) || {})
+            title: z
+          }, (O == null ? void 0 : O.uiSchema) || {})
         }))
-      )), ($ = c.value) != null && $.length && c.value.forEach((L) => {
-        A.has(L.name) && A.set(L.name, L);
+      )), ($ = c.value) != null && $.length && c.value.forEach((z) => {
+        A.has(z.name) && A.set(z.name, z);
       });
       const D = Array.from(A.values());
       D.length && (o(D), c.setValue(D));
@@ -47839,10 +47847,10 @@ const AsyncDataProvider = (e) => {
     const b = (A, D) => {
       const $ = [...t];
       $.splice(D, 1, A), o($), c.setValue(
-        $.map((L) => {
-          var z, j, R;
-          return F(x({}, L), {
-            source: typeof L.source == "string" ? L.source : ((R = (j = (z = L.source) == null ? void 0 : z.filter) == null ? void 0 : j.call(z, Boolean)) == null ? void 0 : R.join(".")) || null
+        $.map((z) => {
+          var O, j, R;
+          return F(x({}, z), {
+            source: typeof z.source == "string" ? z.source : ((R = (j = (O = z.source) == null ? void 0 : O.filter) == null ? void 0 : j.call(O, Boolean)) == null ? void 0 : R.join(".")) || null
           });
         })
       );
@@ -47859,7 +47867,7 @@ const AsyncDataProvider = (e) => {
         key: "source",
         width: 200,
         render: (A, D, $) => {
-          const L = t[$];
+          const z = t[$];
           return /* @__PURE__ */ jsx(
             Cascader$1,
             {
@@ -47867,11 +47875,11 @@ const AsyncDataProvider = (e) => {
               allowClear: !0,
               options: d(f),
               placeholder: e("Select field source"),
-              onChange: (z) => {
-                let j = l[z == null ? void 0 : z[1]];
-                j != null && j.interface || (j = m((z == null ? void 0 : z.join(".")) || "")), b(
-                  F(x({}, L), {
-                    source: z,
+              onChange: (O) => {
+                let j = l[O == null ? void 0 : O[1]];
+                j != null && j.interface || (j = m((O == null ? void 0 : O.join(".")) || "")), b(
+                  F(x({}, z), {
+                    source: O,
                     interface: j == null ? void 0 : j.interface,
                     type: j == null ? void 0 : j.type,
                     uiSchema: j == null ? void 0 : j.uiSchema
@@ -47889,24 +47897,24 @@ const AsyncDataProvider = (e) => {
         key: "interface",
         width: 150,
         render: (A, D, $) => {
-          var z;
-          const L = t[$];
-          return L.source ? /* @__PURE__ */ jsx(Tag, { children: d((z = p(A)) == null ? void 0 : z.title) || A }) : /* @__PURE__ */ jsx(
+          var O;
+          const z = t[$];
+          return z.source ? /* @__PURE__ */ jsx(Tag, { children: d((O = p(A)) == null ? void 0 : O.title) || A }) : /* @__PURE__ */ jsx(
             Select$1,
             {
-              defaultValue: L.interface || "input",
+              defaultValue: z.interface || "input",
               style: { width: "100%" },
               popupMatchSelectWidth: !1,
               onChange: (j) => {
-                var B, M, k, N, O;
+                var B, M, k, N, L;
                 const R = p(j);
                 b(
-                  F(x({}, L), {
+                  F(x({}, z), {
                     interface: j || null,
                     uiSchema: F(x({}, (B = R == null ? void 0 : R.default) == null ? void 0 : B.uiSchema), {
-                      title: ((k = (M = R == null ? void 0 : R.default) == null ? void 0 : M.uiSchema) == null ? void 0 : k.title) || ((N = L.uiSchema) == null ? void 0 : N.title)
+                      title: ((k = (M = R == null ? void 0 : R.default) == null ? void 0 : M.uiSchema) == null ? void 0 : k.title) || ((N = z.uiSchema) == null ? void 0 : N.title)
                     }),
-                    type: (O = R == null ? void 0 : R.default) == null ? void 0 : O.type
+                    type: (L = R == null ? void 0 : R.default) == null ? void 0 : L.type
                   }),
                   $
                 );
@@ -47923,14 +47931,14 @@ const AsyncDataProvider = (e) => {
         key: "title",
         width: 180,
         render: (A, D, $) => {
-          var z, j;
-          const L = t[$];
+          var O, j;
+          const z = t[$];
           return /* @__PURE__ */ jsx(
             Input$3,
             {
-              value: ((z = L.uiSchema) == null ? void 0 : z.title) || A,
-              defaultValue: ((j = L.uiSchema) == null ? void 0 : j.title) !== void 0 ? L.uiSchema.title : L == null ? void 0 : L.name,
-              onChange: (R) => b(F(x({}, L), { uiSchema: F(x({}, L == null ? void 0 : L.uiSchema), { title: R.target.value }) }), $)
+              value: ((O = z.uiSchema) == null ? void 0 : O.title) || A,
+              defaultValue: ((j = z.uiSchema) == null ? void 0 : j.title) !== void 0 ? z.uiSchema.title : z == null ? void 0 : z.name,
+              onChange: (R) => b(F(x({}, z), { uiSchema: F(x({}, z == null ? void 0 : z.uiSchema), { title: R.target.value }) }), $)
             }
           );
         }
@@ -54119,7 +54127,7 @@ const RolesResourcesActions = connect((e) => {
                       const D = m[T.name] || {
                         name: T.name
                       };
-                      A ? D.fields = [] : D.fields = ($ = c == null ? void 0 : c.map) == null ? void 0 : $.call(c, (L) => L.name), m[T.name] = D, o(Object.values(m));
+                      A ? D.fields = [] : D.fields = ($ = c == null ? void 0 : c.map) == null ? void 0 : $.call(c, (z) => z.name), m[T.name] = D, o(Object.values(m));
                     }
                   }
                 ),
@@ -54132,15 +54140,15 @@ const RolesResourcesActions = connect((e) => {
                   checked: D,
                   "aria-label": `${T.name}_checkbox`,
                   onChange: () => {
-                    const L = m[T.name] || {
+                    const z = m[T.name] || {
                       name: T.name
-                    }, z = L.fields || [];
+                    }, O = z.fields || [];
                     if (D) {
-                      const j = z.indexOf($.name);
-                      z.splice(j, 1);
+                      const j = O.indexOf($.name);
+                      O.splice(j, 1);
                     } else
-                      z.push($.name);
-                    L.fields = z, m[T.name] = L, o(Object.values(m));
+                      O.push($.name);
+                    z.fields = O, m[T.name] = z, o(Object.values(m));
                   }
                 }
               )
@@ -55024,11 +55032,11 @@ function BulkEnableButton({ plugins: e = [] }) {
     /* @__PURE__ */ jsxs(
       Modal,
       {
-        width: 800,
+        width: 1e3,
         title: t("Bulk enable"),
         open: i,
         onOk: () => V(this, null, function* () {
-          console.log(l), yield o.request({
+          yield o.request({
             url: "pm:enable",
             params: {
               filterByTk: l
@@ -55060,8 +55068,13 @@ function BulkEnableButton({ plugins: e = [] }) {
             {
               rowSelection: {
                 type: "checkbox",
+                selectedRowKeys: l,
                 onChange(u) {
-                  c(u);
+                  const d = n.map((p) => p.name);
+                  c((p) => u.length === 0 ? p.filter((m) => !d.includes(m)) : u.length === d.length ? _.uniq([...p, ...u]) : p);
+                },
+                onSelect(u) {
+                  c((d) => d.includes(u.name) ? d.filter((p) => p !== u.name) : d.concat(u.name));
                 }
               },
               rowKey: "name",
@@ -55074,18 +55087,18 @@ function BulkEnableButton({ plugins: e = [] }) {
                 {
                   title: t("Plugin"),
                   dataIndex: "displayName",
-                  ellipsis: !0,
-                  width: 200
+                  ellipsis: !0
                 },
                 {
                   title: t("Description"),
                   dataIndex: "description",
-                  ellipsis: !0
+                  ellipsis: !0,
+                  width: 300
                 },
                 {
                   title: t("Package name"),
                   dataIndex: "packageName",
-                  width: 260,
+                  width: 300,
                   ellipsis: !0
                 }
               ],
@@ -55975,8 +55988,8 @@ const useMenuProps = () => {
       onSuccess(A) {
         const D = filterByACL(A == null ? void 0 : A.data, g);
         if (u) {
-          const L = findMenuItem(D);
-          L ? (a(`/admin/${L["x-uid"]}`), i(L.title)) : a("/admin/");
+          const z = findMenuItem(D);
+          z ? (a(`/admin/${z["x-uid"]}`), i(z.title)) : a("/admin/");
           return;
         }
         if (!d || !m)
@@ -55985,18 +55998,18 @@ const useMenuProps = () => {
         if ($)
           i($.title);
         else {
-          const L = findMenuItem(D);
-          L ? (a(`/admin/${L["x-uid"]}`), i(L.title)) : a("/admin/");
+          const z = findMenuItem(D);
+          z ? (a(`/admin/${z["x-uid"]}`), i(z.title)) : a("/admin/");
         }
       }
     }
   );
   useEffect(() => {
-    var D, $, L;
-    const A = (($ = Object.values(((D = f == null ? void 0 : f.root) == null ? void 0 : D.properties) || {}).shift()) == null ? void 0 : $.properties) || ((L = v == null ? void 0 : v.data) == null ? void 0 : L.properties);
+    var D, $, z;
+    const A = (($ = Object.values(((D = f == null ? void 0 : f.root) == null ? void 0 : D.properties) || {}).shift()) == null ? void 0 : $.properties) || ((z = v == null ? void 0 : v.data) == null ? void 0 : z.properties);
     if (h.current) {
-      const z = A && Object.values(A).find((R) => R["x-uid"] === l.name && R["x-component"] === "Menu.Item"), j = c == null ? void 0 : c.pathname.includes("/settings");
-      z || j ? h.current.style.display = "none" : h.current.style.display = "block";
+      const O = A && Object.values(A).find((R) => R["x-uid"] === l.name && R["x-component"] === "Menu.Item"), j = c == null ? void 0 : c.pathname.includes("/settings");
+      O || j ? h.current.style.display = "none" : h.current.style.display = "block";
     }
   }, [v == null ? void 0 : v.data, l.name, h, c == null ? void 0 : c.pathname]);
   const w = useMemo(() => {
@@ -56966,15 +56979,15 @@ const ActionInitializerItem = (e) => {
     ), I = f || (i == null ? void 0 : i.targetKey) || "id", w = C || ((U = (E = a["x-component-props"]) == null ? void 0 : E.fieldNames) == null ? void 0 : U.label) || I, T = {
       title: w || I,
       key: I
-    }, [A, D] = useState([]), [$, L] = useState(a.default || []), [z, j] = useState(!0), R = useLabelUiSchema(i, (T == null ? void 0 : T.title) || "label");
+    }, [A, D] = useState([]), [$, z] = useState(a.default || []), [O, j] = useState(!0), R = useLabelUiSchema(i, (T == null ? void 0 : T.title) || "label");
     if (useEffect(() => {
-      a.default && (d(a.default), L(a.default));
+      a.default && (d(a.default), z(a.default));
     }, [a.default, d]), !i)
       return null;
     const B = (W) => {
       D(W), j(!1);
     }, M = (W) => {
-      L(W), d(W), p == null || p(W);
+      z(W), d(W), p == null || p(W);
     }, k = (W) => {
       var J;
       const X = (J = h == null ? void 0 : h[0]) == null ? void 0 : J.filter;
@@ -56983,7 +56996,7 @@ const ActionInitializerItem = (e) => {
       })), y(!b), W.stopPropagation();
     }, N = (W) => {
       W.stopPropagation();
-    }, O = (W) => {
+    }, L = (W) => {
       m(W);
     }, q = (H = a.title) != null ? H : (G = i == null ? void 0 : i.uiSchema) == null ? void 0 : G.title;
     return t(
@@ -57010,7 +57023,7 @@ const ActionInitializerItem = (e) => {
                       placeholder: "Search...",
                       className: "search",
                       onClick: N,
-                      onChange: O
+                      onChange: L
                     }
                   ) : c(q) }),
                   /* @__PURE__ */ jsx(
@@ -57031,7 +57044,7 @@ const ActionInitializerItem = (e) => {
                 className: "Tree",
                 onExpand: B,
                 expandedKeys: A,
-                autoExpandParent: z,
+                autoExpandParent: O,
                 treeData: u,
                 onSelect: M,
                 fieldNames: T,
@@ -57443,8 +57456,8 @@ const DataBlockInitializer = (e) => {
       if (f)
         return f(M);
       if (k.template) {
-        const O = yield w(k);
-        y(t ? t(O, { item: k, fromOthersInPopup: N }) : O);
+        const L = yield w(k);
+        y(t ? t(L, { item: k, fromOthersInPopup: N }) : L);
       } else
         o && o({ item: k, fromOthersInPopup: N });
       v(!1);
@@ -57464,7 +57477,7 @@ const DataBlockInitializer = (e) => {
     onClick: T,
     currentText: S,
     otherText: b
-  }), D = useGetSchemaInitializerMenuItems(T), $ = useMemo(() => D(A, i), [D, A, i]), [L, z] = useState([]), j = useMenuSearch({ data: $, openKeys: L, hideSearch: u }), R = useMemo(() => {
+  }), D = useGetSchemaInitializerMenuItems(T), $ = useMemo(() => D(A, i), [D, A, i]), [z, O] = useState([]), j = useMenuSearch({ data: $, openKeys: z, hideSearch: u }), R = useMemo(() => {
     let M = j.filter((k) => k.key !== "search" && k.key !== "empty");
     return p && M.length === 1 ? M = M[0].children : M = j, [
       {
@@ -57482,7 +57495,7 @@ const DataBlockInitializer = (e) => {
     SchemaInitializerMenu,
     {
       onOpenChange: (M) => {
-        z(M);
+        O(M);
       },
       items: R
     }
@@ -58547,7 +58560,7 @@ const SelectActionInitializer = (e) => {
   return /* @__PURE__ */ jsx(
     DataBlockInitializer,
     F(x({}, c), {
-      icon: /* @__PURE__ */ jsx(TableOutlined, {}),
+      icon: /* @__PURE__ */ jsx(ProfileOutlined, {}),
       componentType: n,
       onCreateBlockSchema: (d) => V(void 0, null, function* () {
         if (r)
@@ -59270,7 +59283,7 @@ const commonOptions$h = {
   return /* @__PURE__ */ jsx(
     DataBlockInitializer,
     F(x({}, l), {
-      icon: /* @__PURE__ */ jsx(OrderedListOutlined, {}),
+      icon: /* @__PURE__ */ jsx(AppstoreOutlined, {}),
       componentType: "GridCard",
       onCreateBlockSchema: (u) => V(void 0, null, function* () {
         if (n)
@@ -60101,7 +60114,7 @@ const commonOptions$h = {
     DataBlockInitializer,
     F(x({}, n), {
       onlyCurrentDataSource: t,
-      icon: /* @__PURE__ */ jsx(TableOutlined, {}),
+      icon: /* @__PURE__ */ jsx(RightSquareOutlined, {}),
       componentType: "FilterCollapse",
       onCreateBlockSchema: (a) => V(void 0, [a], function* ({ item: i }) {
         const l = createCollapseBlockSchema({
@@ -62110,6 +62123,7 @@ export {
   getUniqueKeyFromCollection,
   getVariablesFromExpression,
   gridRowColWrap,
+  handleDateChangeOnForm,
   hasIcon,
   i18n,
   icons,