@nocobase/client 1.4.3 → 1.4.5

package/es/index.mjs

@@ -3902,7 +3902,7 @@ class APIClient extends APIClient$1 {
       (o) => o,
       (o) => {
         const n = this.toErrMessages(o);
-        throw n.find((r) => r.code === "ROLE_NOT_FOUND_ERR") && this.auth.setRole(null), n.find((r) => r.code === "TOKEN_INVALID") && this.auth.setToken(null), o;
+        throw n.find((r) => r.code === "ROLE_NOT_FOUND_ERR") && (this.auth.setRole(null), window.location.reload()), n.find((r) => r.code === "TOKEN_INVALID") && this.auth.setToken(null), n.find((r) => r.code === "ROLE_NOT_FOUND_FOR_USER") && (this.auth.setRole(null), window.location.reload()), o;
       }
     );
   }
@@ -4295,7 +4295,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.4.3", 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.5", 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",
@@ -4317,9 +4317,9 @@ const name = "@nocobase/client", version$1 = "1.4.3", license = "AGPL-3.0", main
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.4.3",
-  "@nocobase/sdk": "1.4.3",
-  "@nocobase/utils": "1.4.3",
+  "@nocobase/evaluators": "1.4.5",
+  "@nocobase/sdk": "1.4.5",
+  "@nocobase/utils": "1.4.5",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -5000,7 +5000,7 @@ const TreeNode = (e) => {
         const $ = a(A.interface);
         if (!($ != null && $.filterable))
           return;
-        const { nested: L, children: z, operators: j } = $.filterable, R = {
+        const { nested: L, 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,
@@ -5010,7 +5010,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), L) {
             const T = n(A.target), N = w(T, D + 1).filter(Boolean);
             R.children = R.children || [], R.children.push(...N);
           }
@@ -5019,8 +5019,8 @@ const TreeNode = (e) => {
       }, w = (A, D) => {
         const $ = [];
         return A.forEach((L) => {
-          const z = I(L, D);
-          z && $.push(z);
+          const O = I(L, D);
+          O && $.push(O);
         }), $;
       };
       return w(v, 1);
@@ -8823,20 +8823,20 @@ class PluginSettingsManager {
 const AppComponent = observer(
   (o) => {
     var n = o, { children: e } = n, t = K(n, ["children"]);
-    var l;
-    const { app: r } = t, i = useCallback((c, u) => {
-      console.error(c);
-      const d = new Error();
-      d.stack = u.componentStack.trim(), console.error(d);
+    var l, c;
+    const { app: r } = t, i = useCallback((u, d) => {
+      console.error(u);
+      const p = new Error();
+      p.stack = d.componentStack.trim(), console.error(p);
     }, []);
     useEffect(() => {
       r.load();
     }, [r]);
     const a = r.getComponent("AppError");
-    return r.loading ? r.renderComponent("AppSpin", { app: r }) : !r.maintained && r.maintaining ? r.renderComponent("AppMaintaining", { app: r }) : (l = r.error) != null && l.code ? /* @__PURE__ */ jsx(a, { app: r, error: r.error }) : /* @__PURE__ */ jsx(
+    return r.loading ? r.renderComponent("AppSpin", { app: r }) : !r.maintained && r.maintaining ? r.renderComponent("AppMaintaining", { app: r }) : (l = r.error) != null && l.code && ((c = r.error) == null ? void 0 : c.code) !== "APP_COMMANDING" ? /* @__PURE__ */ jsx(a, { app: r, error: r.error }) : /* @__PURE__ */ jsx(
       ErrorBoundary,
       {
-        FallbackComponent: (c) => /* @__PURE__ */ jsx(a, x({ app: r, error: r.error }, c)),
+        FallbackComponent: (u) => /* @__PURE__ */ jsx(a, x({ app: r, error: r.error }, u)),
         onError: i,
         children: /* @__PURE__ */ jsxs(ApplicationContext.Provider, { value: r, children: [
           r.maintained && r.maintaining && r.renderComponent("AppMaintainingDialog", { app: r }),
@@ -9263,7 +9263,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: k } = useSchemaInitializerStyles(), [A, D] = useState(!1), { token: $ } = theme.useToken(), L = useNiceDropdownMaxHeight([A]), z = useMemo(
+      ), { wrapSSR: I, hashId: w, componentCls: k } = useSchemaInitializerStyles(), [A, D] = useState(!1), { token: $ } = theme.useToken(), L = useNiceDropdownMaxHeight([A]), O = useMemo(
         () => x({
           options: o,
           style: C
@@ -9289,7 +9289,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"
@@ -9326,7 +9326,7 @@ function withInitializer(e) {
                   }
                 )
               ),
-              children: React.createElement(e, z)
+              children: React.createElement(e, O)
             })
           )
         }
@@ -10455,7 +10455,7 @@ const variablesStore = {}, getFieldPath = (e, t) => {
       let w = mergeCtxWithLocalVariables(o.current, S);
       const { fieldPath: k, dataSource: A, variableOption: D } = getFieldPath(v, I);
       let $ = k;
-      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: L } = getFieldPath(C, I), O = y.length === 1 ? D == null ? void 0 : D.collectionName : (R = r(L, 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++) {
@@ -10463,13 +10463,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 T = 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 T = y[M], { fieldPath: N } = getFieldPath(y.slice(0, M + 1).join("."), I), z = 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[T]) && (U == null ? void 0 : U[q]) != null && O != null && O.target) {
-              const G = `/${$}/${U[O.sourceKey || q]}/${T}:${getAction(O.type)}`;
+            if (!(b != null && b.doNotRequest) && shouldToRequest(U == null ? void 0 : U[T]) && (U == null ? void 0 : U[q]) != null && z != null && z.target) {
+              const G = `/${$}/${U[z.sourceKey || q]}/${T}:${getAction(z.type)}`;
               if (hasRequested(G))
                 return getRequested(G);
               const H = n.request({
@@ -10483,9 +10483,9 @@ const variablesStore = {}, getFieldPath = (e, t) => {
             }
             return U == null ? void 0 : U[T];
           });
-          w = removeThroughCollectionFields(_.flatten(yield Promise.all(E)), O);
-        } else if (!(b != null && b.doNotRequest) && shouldToRequest(w[T]) && w[q] != null && (O != null && O.target)) {
-          const E = `/${$}/${w[O.sourceKey || q]}/${T}:${getAction(O.type)}`;
+          w = removeThroughCollectionFields(_.flatten(yield Promise.all(E)), z);
+        } else if (!(b != null && b.doNotRequest) && shouldToRequest(w[T]) && w[q] != null && (z != null && z.target)) {
+          const E = `/${$}/${w[z.sourceKey || q]}/${T}:${getAction(z.type)}`;
           let U = null;
           if (hasRequested(E))
             U = yield getRequested(E);
@@ -10499,10 +10499,10 @@ const variablesStore = {}, getFieldPath = (e, t) => {
             });
             stashRequested(E, G), U = yield G, clearRequested(E);
           }
-          raw(w)[T] || (raw(w)[T] = U.data.data), w = removeThroughCollectionFields(getValuesByPath(w, T), O);
+          raw(w)[T] || (raw(w)[T] = U.data.data), w = removeThroughCollectionFields(getValuesByPath(w, T), z);
         } else
-          w = removeThroughCollectionFields(getValuesByPath(w, T), O);
-        O != null && O.target && ($ = O.target);
+          w = removeThroughCollectionFields(getValuesByPath(w, T), z);
+        z != null && z.target && ($ = z.target);
       }
       const j = a(
         _.isFunction(w) ? w({ fieldOperator: b == null ? void 0 : b.fieldOperator, isParsingVariable: !0 }) : w
@@ -10510,7 +10510,7 @@ const variablesStore = {}, getFieldPath = (e, t) => {
       return {
         value: j === void 0 ? D.defaultValue : j,
         dataSource: A,
-        collectionName: z
+        collectionName: O
       };
     }),
     [r]
@@ -11838,14 +11838,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,
@@ -11859,20 +11859,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]), k = useCallback(
     ({
-      recordData: z,
+      recordData: O,
       parentRecordData: j,
       collectionNameUsedInURL: R,
       popupUidUsedInURL: B,
@@ -11881,10 +11881,10 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
       if (!g())
         return v == null ? void 0 : v(!0);
       const T = (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 z = I({
         popupUid: T,
-        recordData: z,
+        recordData: O,
         sourceId: N,
         collection: R,
         puid: B
@@ -11892,7 +11892,7 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
       let q = o.pathname;
       _.last(q) === "/" && (q = q.slice(0, -1)), storePopupContext(T, {
         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,
@@ -11900,7 +11900,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}${z}`));
     },
     [
       u,
@@ -11924,9 +11924,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
@@ -11937,9 +11937,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;
+  }, []), L = useCallback((O) => O.__popup, []);
   return {
     /**
      * used to open popup by changing the url
@@ -12981,7 +12981,7 @@ const ColDivider = (e) => {
         return;
       const D = l.current, $ = D.previousElementSibling, L = 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 * (L.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: [
           {
@@ -13274,8 +13274,8 @@ const TableColumnSchemaToolbar = (e) => /* @__PURE__ */ jsx(GridRowContext.Provi
     ),
     onChange: useCallback(
       ({ current: h, pageSize: g }, f, C) => {
-        var I, w, k, A, D, $, L, z, j, R;
-        const S = (k = (w = (I = t.parent) == null ? void 0 : I["x-decorator-props"]) == null ? void 0 : w.params) == null ? void 0 : k.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, k, A, D, $, L, O, j, R;
+        const S = (k = (w = (I = t.parent) == null ? void 0 : I["x-decorator-props"]) == null ? void 0 : w.params) == null ? void 0 : k.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 = (L = i.current) == null ? void 0 : L.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]
@@ -13289,11 +13289,11 @@ const TableColumnSchemaToolbar = (e) => /* @__PURE__ */ jsx(GridRowContext.Provi
         }
         const y = b.find((v) => v.uid === t.parent["x-uid"]);
         b.forEach((v) => {
-          var L, z, j;
+          var L, O, j;
           const I = C.find((R) => R.uid === v.uid);
           if (!I)
             return;
-          const w = getSourceKey(y, I.field) || o.rowKey || "id", k = [h[w]], A = ((L = v.service.params) == null ? void 0 : L[0]) || {}, D = ((j = (z = v.service.params) == null ? void 0 : z[1]) == null ? void 0 : j.filters) || {};
+          const w = getSourceKey(y, I.field) || o.rowKey || "id", k = [h[w]], A = ((L = v.service.params) == null ? void 0 : L[0]) || {}, D = ((j = (O = v.service.params) == null ? void 0 : O[1]) == null ? void 0 : j.filters) || {};
           if (f.includes(h[o.rowKey])) {
             if (v.dataLoadingMode === "manual")
               return v.clearData();
@@ -13646,10 +13646,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 k, A, D, $, L, z, j, R, B, M, T, N, O;
+    var k, A, D, $, L, O, j, R, B, M, T, N, z;
     if (!((k = t == null ? void 0 : t.service) != null && k.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 = (T = t == null ? void 0 : t.service) == null ? void 0 : T.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 = (L = t == null ? void 0 : t.service) == null ? void 0 : L.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 = (z = (N = (T = t == null ? void 0 : t.service) == null ? void 0 : T.data) == null ? void 0 : N.meta) == null ? void 0 : z.page;
     }
   }, [
     i == null ? void 0 : i.foreignKey,
@@ -14203,7 +14203,7 @@ const useUpdateSchemaTemplateActionProps = () => {
 ];
 function useTableColumnInitializerFields() {
   const { name: e, currentFields: t = [] } = useCollection_deprecated(), { getInterface: o, getCollection: n } = useCollectionManager_deprecated(), i = useFieldSchema()["x-component"] === "AssociationField.SubTable", a = useForm(), l = i ? a.readPretty : !0;
-  return t.filter((c) => (c == null ? void 0 : c.interface) && (c == null ? void 0 : c.interface) !== "subTable" && !(c != null && c.treeChildren)).map((c) => {
+  return t.filter((c) => !c.collectionName || c.collectionName === e).filter((c) => (c == null ? void 0 : c.interface) && (c == null ? void 0 : c.interface) !== "subTable" && !(c != null && c.treeChildren)).map((c) => {
     var h, g, f, C;
     const u = o(c.interface), d = (c == null ? void 0 : c.target) && ((h = n(c == null ? void 0 : c.target)) == null ? void 0 : h.template) === "file", p = ((g = c == null ? void 0 : c.uiSchema) == null ? void 0 : g["x-component"]) === "Preview", m = {
       name: c.name,
@@ -14384,62 +14384,62 @@ function useInheritsTableColumnInitializerFields() {
   });
 }
 const useFormItemInitializerFields = (e) => {
-  var d;
+  var d, p;
   const { name: t, currentFields: o } = useCollection_deprecated(), { getInterface: n, getCollection: r } = useCollectionManager_deprecated(), i = useForm(), { readPretty: a = i.readPretty, block: l = "Form" } = e || {}, { fieldSchema: c } = useActionContext(), u = c == null ? void 0 : c["x-action"];
-  return (d = o == null ? void 0 : o.filter((p) => (p == null ? void 0 : p.interface) && !(p != null && p.treeChildren))) == null ? void 0 : d.map((p) => {
-    var y, v, I, w, k;
-    const m = n(p.interface), h = r(p.target), g = (p == null ? void 0 : p.target) && ((y = r(p == null ? void 0 : p.target)) == null ? void 0 : y.template) === "file", f = h, C = (I = (v = p == null ? void 0 : p.uiSchema) == null ? void 0 : v["x-component-props"]) == null ? void 0 : I.fieldNames, S = {
+  return (p = (d = o.filter((m) => !m.collectionName || m.collectionName === t)) == null ? void 0 : d.filter((m) => (m == null ? void 0 : m.interface) && !(m != null && m.treeChildren))) == null ? void 0 : p.map((m) => {
+    var v, I, w, k, A;
+    const h = n(m.interface), g = r(m.target), f = (m == null ? void 0 : m.target) && ((v = r(m == null ? void 0 : m.target)) == null ? void 0 : v.template) === "file", C = g, S = (w = (I = m == null ? void 0 : m.uiSchema) == null ? void 0 : I["x-component-props"]) == null ? void 0 : w.fieldNames, b = {
       type: "string",
-      name: p.name,
+      name: m.name,
       "x-toolbar": "FormItemSchemaToolbar",
       "x-settings": "fieldSettings:FormItem",
       "x-component": "CollectionField",
       "x-decorator": "FormItem",
-      "x-collection-field": `${t}.${p.name}`,
-      "x-component-props": g ? {
+      "x-collection-field": `${t}.${m.name}`,
+      "x-component-props": f ? {
         fieldNames: {
           label: "preview",
           value: "id"
         }
-      } : f && C ? {
-        fieldNames: F(x({}, C), { label: (h == null ? void 0 : h.titleField) || C.label })
+      } : C && S ? {
+        fieldNames: F(x({}, S), { label: (g == null ? void 0 : g.titleField) || S.label })
       } : {},
-      "x-read-pretty": (w = p == null ? void 0 : p.uiSchema) == null ? void 0 : w["x-read-pretty"]
-    }, b = {
+      "x-read-pretty": (k = m == null ? void 0 : m.uiSchema) == null ? void 0 : k["x-read-pretty"]
+    }, y = {
       type: "item",
-      name: p.name,
-      title: ((k = p == null ? void 0 : p.uiSchema) == null ? void 0 : k.title) || p.name,
+      name: m.name,
+      title: ((A = m == null ? void 0 : m.uiSchema) == null ? void 0 : A.title) || m.name,
       Component: "CollectionFieldInitializer",
       remove: removeGridFormItem,
-      schemaInitialize: (A) => {
-        var D;
-        (D = m == null ? void 0 : m.schemaInitialize) == null || D.call(m, A, {
-          field: p,
+      schemaInitialize: (D) => {
+        var $;
+        ($ = h == null ? void 0 : h.schemaInitialize) == null || $.call(h, D, {
+          field: m,
           block: l,
           readPretty: a,
           action: u,
-          targetCollection: h
+          targetCollection: g
         });
       },
-      schema: S
+      schema: b
     };
-    return l == "Kanban" && (b.find = (A, D, $) => {
-      const L = findSchema(A, "x-component", l);
-      return findSchema(L, D, $);
-    }), b;
+    return l == "Kanban" && (y.find = (D, $, L) => {
+      const O = findSchema(D, "x-component", l);
+      return findSchema(O, $, L);
+    }), y;
   });
 }, useFilterFormItemInitializerFields = (e) => {
-  var p;
+  var p, m;
   const { name: t, currentFields: o } = useCollection_deprecated(), { getInterface: n, getCollection: r } = useCollectionManager_deprecated(), i = useForm(), { readPretty: a = i.readPretty, block: l = "FilterForm" } = e || {}, { snapshot: c, fieldSchema: u } = useActionContext(), d = u == null ? void 0 : u["x-action"];
-  return (p = o == null ? void 0 : o.filter((m) => {
-    var h;
-    return (m == null ? void 0 : m.interface) && ((h = n(m.interface)) == null ? void 0 : h.filterable);
-  })) == null ? void 0 : p.map((m) => {
-    var S, b, y;
-    const h = n(m.interface), g = r(m.target);
-    let f = {
+  return (m = (p = o.filter((h) => !h.collectionName || h.collectionName === t)) == null ? void 0 : p.filter((h) => {
+    var g;
+    return (h == null ? void 0 : h.interface) && ((g = n(h.interface)) == null ? void 0 : g.filterable);
+  })) == null ? void 0 : m.map((h) => {
+    var b, y, v;
+    const g = n(h.interface), f = r(h.target);
+    let C = {
       type: "string",
-      name: m.name,
+      name: h.name,
       required: !1,
       // 'x-designer': 'FormItem.FilterFormDesigner',
       "x-toolbar": "FormItemSchemaToolbar",
@@ -14447,15 +14447,15 @@ const useFormItemInitializerFields = (e) => {
       "x-component": "CollectionField",
       "x-decorator": "FormItem",
       "x-use-decorator-props": "useFormItemProps",
-      "x-collection-field": `${t}.${m.name}`,
+      "x-collection-field": `${t}.${h.name}`,
       "x-component-props": {
         utc: !1,
         underFilter: !0
       }
     };
-    return isAssocField(m) && (f = {
+    return isAssocField(h) && (C = {
       type: "string",
-      name: `${m.name}`,
+      name: `${h.name}`,
       required: !1,
       // 'x-designer': 'FormItem.FilterFormDesigner',
       "x-toolbar": "FormItemSchemaToolbar",
@@ -14463,25 +14463,25 @@ const useFormItemInitializerFields = (e) => {
       "x-component": "CollectionField",
       "x-decorator": "FormItem",
       "x-use-decorator-props": "useFormItemProps",
-      "x-collection-field": `${t}.${m.name}`,
-      "x-component-props": F(x({}, (S = m.uiSchema) == null ? void 0 : S["x-component-props"]), { utc: !1, underFilter: !0 })
+      "x-collection-field": `${t}.${h.name}`,
+      "x-component-props": F(x({}, (b = h.uiSchema) == null ? void 0 : b["x-component-props"]), { utc: !1, underFilter: !0 })
     }), {
-      name: ((b = m == null ? void 0 : m.uiSchema) == null ? void 0 : b.title) || m.name,
+      name: ((y = h == null ? void 0 : h.uiSchema) == null ? void 0 : y.title) || h.name,
       type: "item",
-      title: ((y = m == null ? void 0 : m.uiSchema) == null ? void 0 : y.title) || m.name,
+      title: ((v = h == null ? void 0 : h.uiSchema) == null ? void 0 : v.title) || h.name,
       Component: "CollectionFieldInitializer",
       remove: removeGridFormItem,
-      schemaInitialize: (v) => {
-        var I;
-        (I = h == null ? void 0 : h.schemaInitialize) == null || I.call(h, v, {
-          field: m,
+      schemaInitialize: (I) => {
+        var w;
+        (w = g == null ? void 0 : g.schemaInitialize) == null || w.call(g, I, {
+          field: h,
           block: l,
           readPretty: a,
           action: d,
-          targetCollection: g
+          targetCollection: f
         });
       },
-      schema: f
+      schema: C
     };
   });
 }, useAssociatedFormItemInitializerFields = (e) => {
@@ -14795,7 +14795,7 @@ const useFormItemInitializerFields = (e) => {
     ]
   })), [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,
@@ -14866,7 +14866,7 @@ const useFormItemInitializerFields = (e) => {
     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];
@@ -15598,10 +15598,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(), k = (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), {
@@ -15642,7 +15642,7 @@ const useGetAriaLabelOfDesigner = () => {
     ] }) })
   ] }) })) : null;
 }, InternalSchemaToolbar = (e) => {
-  var O;
+  var z;
   const t = useFieldSchema(), {
     title: o,
     initializer: n,
@@ -15669,11 +15669,11 @@ const useGetAriaLabelOfDesigner = () => {
   ), { render: $, exists: L } = 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), {
@@ -15683,7 +15683,7 @@ 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, (z = O == null ? void 0 : O.cols) == null ? void 0 : z.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;
@@ -17154,7 +17154,7 @@ const ActionLink = withDynamicSchemaProps(
       "onMouseEnter",
       "refreshDataBlockRequest",
       "confirmTitle"
-    ]), { t: v } = useTranslation(), I = useDesigner(), w = useField(), k = useFieldSchema(), A = useCompile(), D = useCollectionRecordData(), $ = A((H = k["x-component-props"]) == null ? void 0 : H.confirm) || g, L = useMemo(() => (k == null ? void 0 : k["x-linkage-rules"]) || [], [k == null ? void 0 : k["x-linkage-rules"]]), { designable: z } = useDesignable(), j = useComponent(n) || n, R = useVariables(), B = useLocalVariables({ currentForm: { values: D, readPretty: !1 } }), { visibleWithURL: M, setVisibleWithURL: T } = usePopupUtils(), { setSubmitted: N } = useActionContext(), { getAriaLabel: O } = useGetAriaLabelOfAction(l), q = useCollectionParentRecordData(), E = useMemo(() => {
+    ]), { t: v } = useTranslation(), I = useDesigner(), w = useField(), k = useFieldSchema(), A = useCompile(), D = useCollectionRecordData(), $ = A((H = k["x-component-props"]) == null ? void 0 : H.confirm) || g, L = useMemo(() => (k == null ? void 0 : k["x-linkage-rules"]) || [], [k == null ? void 0 : k["x-linkage-rules"]]), { designable: O } = useDesignable(), j = useComponent(n) || n, R = useVariables(), B = useLocalVariables({ currentForm: { values: D, readPretty: !1 } }), { visibleWithURL: M, setVisibleWithURL: T } = usePopupUtils(), { setSubmitted: N } = useActionContext(), { getAriaLabel: z } = useGetAriaLabelOfAction(l), q = useCollectionParentRecordData(), E = useMemo(() => {
       const W = l || A(k.title);
       return _.isString(W) ? v(W) : W;
     }, [l, k.title, v]);
@@ -17183,7 +17183,7 @@ const ActionLink = withDynamicSchemaProps(
       x({
         containerRefKey: o,
         fieldSchema: k,
-        designable: z,
+        designable: O,
         field: w,
         actionTitle: E,
         icon: a,
@@ -17206,7 +17206,7 @@ const ActionLink = withDynamicSchemaProps(
         visibleWithURL: M,
         setVisibleWithURL: T,
         setSubmitted: N,
-        getAriaLabel: O,
+        getAriaLabel: z,
         parentRecordData: q,
         actionCallback: h
       }, y)
@@ -17242,7 +17242,7 @@ const ActionLink = withDynamicSchemaProps(
     visibleWithURL: D,
     setVisibleWithURL: $,
     setSubmitted: L,
-    getAriaLabel: z,
+    getAriaLabel: O,
     parentRecordData: j
   } = ge, R = K(ge, [
     "containerRefKey",
@@ -17273,7 +17273,7 @@ const ActionLink = withDynamicSchemaProps(
     "setSubmitted",
     "getAriaLabel",
     "parentRecordData"
-  ]), [B, M] = useState(!1), { wrapSSR: T, 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 } = (k == null ? void 0 : k(A)) || {}, ee = J.disabled || i.disabled || ((pe = i.data) == null ? void 0 : pe.disabled) || w || te, se = useMemo(() => {
+  ]), [B, M] = useState(!1), { wrapSSR: T, componentCls: N, hashId: z } = 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 } = (k == null ? void 0 : k(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,
@@ -17292,10 +17292,10 @@ const ActionLink = withDynamicSchemaProps(
     tarComponent: d,
     designerProps: U,
     componentCls: N,
-    hashId: O,
+    hashId: z,
     className: p,
     others: R,
-    getAriaLabel: z,
+    getAriaLabel: O,
     type: m,
     Designer: h,
     openMode: G,
@@ -17405,15 +17405,15 @@ function RenderButton({
   setSubmitted: $,
   confirmTitle: L
 }) {
-  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 T = useRef(null);
   T.current = B;
   const N = useCallback(
-    (O, q = !0) => {
-      if (!(q && isPortalInBody(O.target)) && (O.preventDefault(), O.stopPropagation(), !a && o)) {
+    (z, q = !0) => {
+      if (!(q && isPortalInBody(z.target)) && (z.preventDefault(), z.stopPropagation(), !a && o)) {
         const E = () => {
-          y ? y(O, () => {
+          y ? y(z, () => {
             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), k == null || k()) : ["view", "update", "create", "customize:popup"].includes(I["x-action"]) && I["x-uid"] ? T.current() : (w(!0), k == null || k());
@@ -18041,19 +18041,19 @@ https://requirejs.org/docs/errors.html#` + e);
       config: {}
     }, l = {}, c = {}, u = {}, d = [], p = {}, m = {}, h = {}, g = 1, f = 1;
     function C(T) {
-      var N, O;
+      var N, z;
       for (N = 0; N < T.length; N++)
-        if (O = T[N], O === ".")
+        if (z = T[N], z === ".")
           T.splice(N, 1), N -= 1;
-        else if (O === "..") {
+        else if (z === "..") {
           if (N === 0 || N === 1 && T[2] === ".." || T[N - 1] === "..")
             continue;
           N > 0 && (T.splice(N - 1, 2), N -= 2);
         }
     }
-    function S(T, N, O) {
+    function S(T, N, z) {
       var q, E, U, G, H, W, X, J, Y, Q, Z, te, ee = N && N.split("/"), se = a.map, ie = se && se["*"];
-      if (T && (T = T.split("/"), X = T.length - 1, a.nodeIdCompat && jsSuffixRegExp.test(T[X]) && (T[X] = T[X].replace(jsSuffixRegExp, "")), T[0].charAt(0) === "." && ee && (te = ee.slice(0, ee.length - 1), T = te.concat(T)), C(T), T = T.join("/")), O && se && (ee || ie)) {
+      if (T && (T = T.split("/"), X = T.length - 1, a.nodeIdCompat && jsSuffixRegExp.test(T[X]) && (T[X] = T[X].replace(jsSuffixRegExp, "")), T[0].charAt(0) === "." && ee && (te = ee.slice(0, ee.length - 1), T = te.concat(T)), C(T), T = T.join("/")), z && se && (ee || ie)) {
         U = T.split("/");
         e:
           for (G = U.length; G > 0; G -= 1) {
@@ -18084,14 +18084,14 @@ https://requirejs.org/docs/errors.html#` + e);
         })([T]), !0;
     }
     function v(T) {
-      var N, O = T ? T.indexOf("!") : -1;
-      return O > -1 && (N = T.substring(0, O), T = T.substring(O + 1, T.length)), [N, T];
+      var N, z = T ? T.indexOf("!") : -1;
+      return z > -1 && (N = T.substring(0, z), T = T.substring(z + 1, T.length)), [N, T];
     }
-    function I(T, N, O, q) {
+    function I(T, N, z, q) {
       var E, U, G, H, W = null, X = N ? N.name : null, J = T, Y = !0, Q = "";
-      return T || (Y = !1, T = "_@r" + (g += 1)), H = v(T), W = H[0], T = H[1], W && (W = S(W, X, q), U = getOwn(p, W)), T && (W ? O ? Q = T : U && U.normalize ? Q = U.normalize(T, function(Z) {
+      return T || (Y = !1, T = "_@r" + (g += 1)), H = v(T), W = H[0], T = H[1], W && (W = S(W, X, q), U = getOwn(p, W)), T && (W ? z ? Q = T : U && U.normalize ? Q = U.normalize(T, function(Z) {
         return S(Z, X, q);
-      }) : Q = T.indexOf("!") === -1 ? S(T, X, q) : T : (Q = S(T, 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 = T.indexOf("!") === -1 ? S(T, X, q) : T : (Q = S(T, X, q), H = v(Q), W = H[0], Q = H[1], z = !0, E = n.nameToUrl(Q))), G = W && !U && !z ? "_unnormalized" + (f += 1) : "", {
         prefix: W,
         name: Q,
         parentMap: N,
@@ -18103,16 +18103,16 @@ https://requirejs.org/docs/errors.html#` + e);
       };
     }
     function w(T) {
-      var N = T.id, O = getOwn(l, N);
-      return O || (O = l[N] = new n.Module(T)), O;
+      var N = T.id, z = getOwn(l, N);
+      return z || (z = l[N] = new n.Module(T)), z;
     }
-    function k(T, N, O) {
+    function k(T, N, z) {
       var q = T.id, E = getOwn(l, q);
-      hasProp(p, q) && (!E || E.defineEmitComplete) ? N === "defined" && O(p[q]) : (E = w(T), E.error && N === "error" ? O(E.error) : E.on(N, O));
+      hasProp(p, q) && (!E || E.defineEmitComplete) ? N === "defined" && z(p[q]) : (E = w(T), E.error && N === "error" ? z(E.error) : E.on(N, z));
     }
     function A(T, N) {
-      var O = T.requireModules, q = !1;
-      N ? N(T) : (each(O, function(E) {
+      var z = T.requireModules, q = !1;
+      N ? N(T) : (each(z, function(E) {
         var U = getOwn(l, E);
         U && (U.error = T, U.events.error && (q = !0, U.emit("error", T)));
       }), q || req.onError(T));
@@ -18145,15 +18145,15 @@ https://requirejs.org/docs/errors.html#` + e);
     function $(T) {
       delete l[T], delete c[T];
     }
-    function L(T, N, O) {
+    function L(T, N, z) {
       var q = T.map.id;
       T.error ? T.emit("error", T.error) : (N[q] = !0, each(T.depMaps, function(E, U) {
         var G = E.id, H = getOwn(l, G);
-        H && !T.depMatched[U] && !O[G] && (getOwn(N, G) ? (T.defineDep(U, p[G]), T.check()) : L(H, N, O));
-      }), O[q] = !0);
+        H && !T.depMatched[U] && !z[G] && (getOwn(N, G) ? (T.defineDep(U, p[G]), T.check()) : L(H, N, z));
+      }), z[q] = !0);
     }
-    function z() {
-      var T, N, O = a.waitSeconds * 1e3, q = O && n.startTime + O < (/* @__PURE__ */ new Date()).getTime(), E = [], U = [], G = !1, H = !0;
+    function O() {
+      var T, N, z = a.waitSeconds * 1e3, q = z && n.startTime + z < (/* @__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;
@@ -18168,17 +18168,17 @@ https://requirejs.org/docs/errors.html#` + e);
         H && each(U, function(W) {
           L(W, {}, {});
         }), (!q || N) && G && (isBrowser || isWebWorker) && !i && (i = setTimeout(function() {
-          i = 0, z();
+          i = 0, O();
         }, 50)), t = !1;
       }
     }
     o = function(T) {
       this.events = getOwn(u, T.id) || {}, this.map = T, this.shim = getOwn(a.shim, T.id), this.depExports = [], this.depMaps = [], this.depMatched = [], this.pluginMaps = {}, this.depCount = 0;
     }, o.prototype = {
-      init: function(T, 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(T, N, z, q) {
+        q = q || {}, !this.inited && (this.factory = N, z ? this.on("error", z) : this.events.error && (z = bind(this, function(E) {
           this.emit("error", E);
-        })), this.depMaps = T && T.slice(0), this.errback = O, this.inited = !0, this.ignore = q.ignore, q.enabled || this.enabled ? this.enable() : this.check());
+        })), this.depMaps = T && T.slice(0), this.errback = z, this.inited = !0, this.ignore = q.ignore, q.enabled || this.enabled ? this.enable() : this.check());
       },
       defineDep: function(T, N) {
         this.depMatched[T] || (this.depMatched[T] = !0, this.depCount -= 1, this.depExports[T] = N);
@@ -18207,9 +18207,9 @@ https://requirejs.org/docs/errors.html#` + e);
        */
       check: function() {
         if (!(!this.enabled || this.enabling)) {
-          var T, N, O = this.map.id, q = this.depExports, E = this.exports, U = this.factory;
+          var T, N, z = this.map.id, q = this.depExports, E = this.exports, U = this.factory;
           if (!this.inited)
-            hasProp(n.defQueueMap, O) || this.fetch();
+            hasProp(n.defQueueMap, z) || this.fetch();
           else if (this.error)
             this.emit("error", this.error);
           else if (!this.defining) {
@@ -18217,31 +18217,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(z, U, q, E);
                   } catch (H) {
                     T = H;
                   }
                 else
-                  E = n.execCb(O, U, q, E);
+                  E = n.execCb(z, U, q, E);
                 if (this.map.isDefine && E === void 0 && (N = this.module, N ? E = N.exports : this.usingExports && (E = this.exports)), T)
                   return T.requireMap = this.map, T.requireModules = this.map.isDefine ? [this.map.id] : null, T.requireType = this.map.isDefine ? "define" : "require", A(this.error = T);
               } 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[z] = 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;
+              $(z), this.defined = !0;
             }
             this.defining = !1, this.defined && !this.defineEmitted && (this.defineEmitted = !0, this.emit("defined", this.exports), this.defineEmitComplete = !0);
           }
         }
       },
       callPlugin: function() {
-        var T = this.map, N = T.id, O = I(T.prefix);
-        this.depMaps.push(O), k(O, "defined", bind(this, function(q) {
+        var T = this.map, N = T.id, z = I(T.prefix);
+        this.depMaps.push(z), k(z, "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(T.parentMap, {
             enableBuildCallback: !0
           });
@@ -18297,11 +18297,11 @@ https://requirejs.org/docs/errors.html#` + e);
             }
             ee && (useInteractive = !0), this.depMaps.push(te), n.completeLoad(Z), J([Z], E);
           }), q.load(T.name, J, E, a);
-        })), n.enable(O, this), this.pluginMaps[O.id] = O;
+        })), n.enable(z, this), this.pluginMaps[z.id] = z;
       },
       enable: function() {
         c[this.map.id] = this, this.enabled = !0, this.enabling = !0, each(this.depMaps, bind(this, function(T, N) {
-          var O, q, E;
+          var z, q, E;
           if (typeof T == "string") {
             if (T = I(
               T,
@@ -18318,27 +18318,27 @@ https://requirejs.org/docs/errors.html#` + e);
               this.emit("error", U);
             }));
           }
-          O = T.id, q = l[O], !hasProp(r, O) && q && !q.enabled && n.enable(T, this);
+          z = T.id, q = l[z], !hasProp(r, z) && q && !q.enabled && n.enable(T, this);
         })), eachProp(this.pluginMaps, bind(this, function(T) {
           var N = getOwn(l, T.id);
           N && !N.enabled && n.enable(T, this);
         })), this.enabling = !1, this.check();
       },
       on: function(T, N) {
-        var O = this.events[T];
-        O || (O = this.events[T] = []), O.push(N);
+        var z = this.events[T];
+        z || (z = this.events[T] = []), z.push(N);
       },
       emit: function(T, N) {
-        each(this.events[T], function(O) {
-          O(N);
+        each(this.events[T], function(z) {
+          z(N);
         }), T === "error" && delete this.events[T];
       }
     };
     function j(T) {
       hasProp(p, T[0]) || w(I(T[0], null, !0)).init(T[1], T[2]);
     }
-    function R(T, N, O, q) {
-      T.detachEvent && !isOpera ? q && T.detachEvent(q, N) : T.removeEventListener(O, N, !1);
+    function R(T, N, z, q) {
+      T.detachEvent && !isOpera ? q && T.detachEvent(q, N) : T.removeEventListener(z, N, !1);
     }
     function B(T) {
       var N = T.currentTarget || T.srcElement;
@@ -18379,7 +18379,7 @@ https://requirejs.org/docs/errors.html#` + e);
             return (U.indexOf("?") === -1 ? "?" : "&") + N;
           };
         }
-        var O = a.shim, q = {
+        var z = a.shim, q = {
           paths: !0,
           bundles: !0,
           config: !0,
@@ -18394,8 +18394,8 @@ https://requirejs.org/docs/errors.html#` + e);
         }), T.shim && (eachProp(T.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), T.packages && each(T.packages, function(E) {
+          }), (E.exports || E.init) && !E.exportsFn && (E.exportsFn = n.makeShimExports(E)), z[U] = E;
+        }), a.shim = z), T.packages && each(T.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) {
@@ -18404,22 +18404,22 @@ https://requirejs.org/docs/errors.html#` + e);
       },
       makeShimExports: function(T) {
         function N() {
-          var O;
-          return T.init && (O = T.init.apply(global, arguments)), O || T.exports && getGlobal(T.exports);
+          var z;
+          return T.init && (z = T.init.apply(global, arguments)), z || T.exports && getGlobal(T.exports);
         }
         return N;
       },
       makeRequire: function(T, N) {
         N = N || {};
-        function O(q, E, U) {
+        function z(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) : T && hasProp(r, q) ? r[q](l[T.id]) : req.get ? req.get(n, q, T, O) : (H = I(q, T, !1, !0), G = H.id, hasProp(p, G) ? p[G] : A(makeError("notloaded", 'Module name "' + G + '" has not been loaded yet for context: ' + e + (T ? "" : ". 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) : T && hasProp(r, q) ? r[q](l[T.id]) : req.get ? req.get(n, q, T, z) : (H = I(q, T, !1, !0), G = H.id, hasProp(p, G) ? p[G] : A(makeError("notloaded", 'Module name "' + G + '" has not been loaded yet for context: ' + e + (T ? "" : ". Use require([])")))) : (M(), n.nextTick(function() {
             M(), W = w(I(null, T)), W.skipMap = N.skipMap, W.init(q, E, U, {
               enabled: !0
-            }), z();
-          }), O);
+            }), O();
+          }), z);
         }
-        return mixin(O, {
+        return mixin(z, {
           isBrowser,
           /**
            * Converts a module name + .extension into an URL path.
@@ -18440,13 +18440,13 @@ https://requirejs.org/docs/errors.html#` + e);
           specified: function(q) {
             return q = I(q, T, !1, !0).id, hasProp(p, q) || hasProp(l, q);
           }
-        }), T || (O.undef = function(q) {
+        }), T || (z.undef = function(q) {
           D();
           var E = I(q, T, !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;
+        }), z;
       },
       /**
        * Called to enable a module if it is still in the registry
@@ -18465,15 +18465,15 @@ https://requirejs.org/docs/errors.html#` + e);
        * @param {String} moduleName the name of the module to potentially complete.
        */
       completeLoad: function(T) {
-        var N, O, q, E = getOwn(a.shim, T) || {}, U = E.exports;
+        var N, z, q, E = getOwn(a.shim, T) || {}, U = E.exports;
         for (D(); d.length; ) {
-          if (O = d.shift(), O[0] === null) {
-            if (O[0] = T, N)
+          if (z = d.shift(), z[0] === null) {
+            if (z[0] = T, N)
               break;
             N = !0;
           } else
-            O[0] === T && (N = !0);
-          j(O);
+            z[0] === T && (N = !0);
+          j(z);
         }
         if (n.defQueueMap = {}, q = getOwn(l, T), !N && !hasProp(p, T) && q && !q.inited) {
           if (a.enforceDefine && (!U || !getGlobal(U)))
@@ -18485,7 +18485,7 @@ https://requirejs.org/docs/errors.html#` + e);
             ));
           j([T, E.deps || [], E.exportsFn]);
         }
-        z();
+        O();
       },
       /**
        * Converts a module name to a file path. Supports cases where
@@ -18494,10 +18494,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(T, N, O) {
+      nameToUrl: function(T, N, z) {
         var q, E, U, G, H, W, X, J = getOwn(a.pkgs, T);
         if (J && (T = J), X = getOwn(h, T), X)
-          return n.nameToUrl(X, N, O);
+          return n.nameToUrl(X, N, z);
         if (req.jsExtRegExp.test(T))
           H = T + (N || "");
         else {
@@ -18506,7 +18506,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) || z ? "" : ".js"), H = (H.charAt(0) === "/" || H.match(/^[\w\+\.\-]+:/) ? "" : a.baseUrl) + H;
         }
         return a.urlArgs && !/^blob\:/.test(H) ? H + a.urlArgs(T, H) : H;
       },
@@ -18522,8 +18522,8 @@ https://requirejs.org/docs/errors.html#` + e);
        *
        * @private
        */
-      execCb: function(T, N, O, q) {
-        return N.apply(q, O);
+      execCb: function(T, N, z, q) {
+        return N.apply(q, z);
       },
       /**
        * callback for script loads, used to check status of loading.
@@ -18544,13 +18544,13 @@ https://requirejs.org/docs/errors.html#` + e);
       onScriptError: function(T) {
         var N = B(T);
         if (!y(N.id)) {
-          var O = [];
+          var z = [];
           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 z.push(E), !0;
             });
-          }), A(makeError("scripterror", 'Script error for "' + N.id + (O.length ? '", needed by: ' + O.join(", ") : '"'), T, [N.id]));
+          }), A(makeError("scripterror", 'Script error for "' + N.id + (z.length ? '", needed by: ' + z.join(", ") : '"'), T, [N.id]));
         }
       }
     }, n.require = n.makeRequire(), n;
@@ -19092,10 +19092,10 @@ const useCollectionManager_deprecated = (e) => {
     [t, p]
   ), v = useCallback(
     (R, B = !1, M) => {
-      var O;
+      var z;
       if (!R)
         return [];
-      const T = (O = p(M)) == null ? void 0 : O.getCollection(R);
+      const T = (z = p(M)) == null ? void 0 : z.getCollection(R);
       return (T == null ? void 0 : T.getChildrenCollections(B)) || [];
     },
     [t, p]
@@ -19111,7 +19111,7 @@ const useCollectionManager_deprecated = (e) => {
       const {
         association: T = !1,
         cached: N = {},
-        collectionNames: O = [R],
+        collectionNames: z = [R],
         maxDepth: q = 1,
         allowAllTypes: E = !1,
         exceptInterfaces: U = [],
@@ -19119,7 +19119,7 @@ const useCollectionManager_deprecated = (e) => {
         usePrefix: H = !1,
         dataSource: W
       } = M || {};
-      if (O.length - 1 > q)
+      if (z.length - 1 > q)
         return;
       if (N[R])
         return _.cloneDeep(N[R]);
@@ -19132,10 +19132,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 T && Q.target && (Z.children = O.includes(Q.target) ? [] : w(Q.target, B, F(x({}, M), {
+        return T && Q.target && (Z.children = z.includes(Q.target) ? [] : w(Q.target, B, F(x({}, M), {
           cached: N,
           dataSource: W,
-          collectionNames: [...O, Q.target],
+          collectionNames: [...z, Q.target],
           prefixFieldValue: H ? G ? `${G}.${Q.name}` : Q.name : "",
           usePrefix: H
         })), !((ee = Z.children) != null && ee.length)) ? null : Z;
@@ -19170,7 +19170,7 @@ const useCollectionManager_deprecated = (e) => {
       return (B = $(R.interface)) == null ? void 0 : B.titleUsable;
     },
     [$]
-  ), z = useCallback(
+  ), O = useCallback(
     (R, B, M) => {
       var T, N;
       return (N = (T = p(M)) == null ? void 0 : T.getCollection(B)) == null ? void 0 : N.getParentCollectionFields(R);
@@ -19188,7 +19188,7 @@ const useCollectionManager_deprecated = (e) => {
     getTemplate: j,
     getInterface: $,
     getCollections: d,
-    getParentCollectionFields: z,
+    getParentCollectionFields: O,
     getInheritCollections: y,
     getChildrenCollections: v,
     refreshCM: g,
@@ -19428,7 +19428,7 @@ const useUserVariable = ({
     collectionField: e,
     noDisabled: r,
     targetFieldSchema: i
-  }), { urlSearchParamsSettings: L, shouldDisplay: z } = useURLSearchParamsVariable();
+  }), { urlSearchParamsSettings: L, shouldDisplay: O } = useURLSearchParamsVariable();
   return useMemo(() => [
     u,
     d,
@@ -19441,7 +19441,7 @@ const useUserVariable = ({
     $ && D,
     w && I,
     A && k,
-    z && L
+    O && L
   ].filter(Boolean).filter(l), [
     u,
     d,
@@ -19459,7 +19459,7 @@ const useUserVariable = ({
     D,
     w,
     I,
-    z,
+    O,
     L
   ]);
 }, RemoveConditionContext = createContext(null);
@@ -21523,7 +21523,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: [
@@ -21532,7 +21532,7 @@ const SchemaSettingsProvider = (e) => {
       F(x({
         title: v(t)
       }, p), {
-        onClick: z,
+        onClick: O,
         onKeyDown: j,
         children: e.children || e.title
       })
@@ -21566,7 +21566,7 @@ const SchemaSettingsProvider = (e) => {
 });
 SchemaSettingsActionModalItem.displayName = "SchemaSettingsActionModalItem";
 const SchemaSettingsModalItem = (e) => {
-  const O = e, {
+  const z = e, {
     hidden: t,
     title: o,
     components: n,
@@ -21578,7 +21578,7 @@ const SchemaSettingsModalItem = (e) => {
     width: u = "fit-content",
     noRecord: d = !1,
     ModalContextProvider: p = (q) => /* @__PURE__ */ jsx(Fragment, { children: q.children })
-  } = O, m = K(O, [
+  } = z, m = K(z, [
     "hidden",
     "title",
     "components",
@@ -21590,7 +21590,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(), k = useCollectionRecord(), { association: A } = useDataBlockProps() || {}, D = useFormBlockContext(), $ = useBlockContext(), { getOperators: L } = useOperators(), z = useLocationSearch(), j = useVariables(), { formValue: R, collection: B, parent: M } = useSubFormValue(), T = 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(), k = useCollectionRecord(), { association: A } = useDataBlockProps() || {}, D = useFormBlockContext(), $ = useBlockContext(), { getOperators: L } = useOperators(), O = useLocationSearch(), j = useVariables(), { formValue: R, collection: B, parent: M } = useSubFormValue(), T = useCurrentPopupRecord(), N = useParentPopupRecord();
   return t ? null : /* @__PURE__ */ jsx(
     SchemaSettingsItem,
     F(x({
@@ -21614,7 +21614,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,
@@ -21790,10 +21790,10 @@ const SchemaSettingsModalItem = (e) => {
     }),
     [o, a, l, S, m, h, u, p, w, r]
   ), D = useMemo(() => ({ ArrayCollapse: ArrayCollapse$2, FormLayout }), []), $ = useCallback(
-    (z) => {
+    (O) => {
       var T;
       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" && ((T = S["x-component-props"]) == null ? void 0 : T.templateId), M = {
         "x-uid": R && d(R).uid || S["x-uid"]
@@ -22476,8 +22476,8 @@ const useColumnSchema$1 = () => {
         (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 O = L.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: $
@@ -22499,7 +22499,7 @@ const getActionContext = (e) => {
   var o;
   return ((o = e.fieldSchema) == null ? void 0 : o["x-action-context"]) || {};
 }, SchemaSettingsDefaultValue = function e(t) {
-  var T, N, O;
+  var T, N, z;
   const o = useFieldSchema(), n = (T = t == null ? void 0 : t.fieldSchema) != null ? T : 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, k = useMemo(
@@ -22507,9 +22507,9 @@ const getActionContext = (e) => {
     [n, p, d]
   ), A = _.omit(n, "required");
   k != null && k.target && (u = p(
-    `${k.target}.${((O = (N = n["x-component-props"]) == null ? void 0 : N.fieldNames) == null ? void 0 : O.label) || "id"}`
+    `${k.target}.${((z = (N = n["x-component-props"]) == null ? void 0 : N.fieldNames) == null ? void 0 : z.label) || "id"}`
   ));
-  const D = (k == null ? void 0 : k.interface) === "m2o" && findParentFieldSchema(n), $ = D && p(D == null ? void 0 : D["x-collection-field"]), L = useTableBlockContext(), z = (k == null ? void 0 : k.interface) === "m2m" || ($ == null ? void 0 : $.type) === "hasMany" && (k == null ? void 0 : k.interface) === "m2o", j = useCallback(
+  const D = (k == null ? void 0 : k.interface) === "m2o" && findParentFieldSchema(n), $ = D && p(D == null ? void 0 : D["x-collection-field"]), L = useTableBlockContext(), O = (k == null ? void 0 : k.interface) === "m2m" || ($ == null ? void 0 : $.type) === "hasMany" && (k == null ? void 0 : k.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;
@@ -22534,7 +22534,7 @@ const getActionContext = (e) => {
         "x-component": "VariableInput",
         "x-component-props": F(x({}, (n == null ? void 0 : n["x-component-props"]) || {}), {
           collectionField: k,
-          contextCollectionName: z ? c : "",
+          contextCollectionName: O ? c : "",
           schema: k == null ? void 0 : k.uiSchema,
           targetFieldSchema: n,
           className: defaultInputStyle,
@@ -22582,7 +22582,7 @@ const getActionContext = (e) => {
     A,
     b,
     h,
-    z,
+    O,
     f,
     S,
     j,
@@ -23357,8 +23357,8 @@ const useGetFilterOptions = () => {
     };
   });
 }, TableColumnDesigner$1 = (e) => {
-  var L, z, j, R, B, M, T, 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 L, O, j, R, B, M, T, N, z, 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) || ((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 }), k = ((B = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : B.mode) || "Select";
   let A = "editable";
@@ -23400,7 +23400,7 @@ const useGetFilterOptions = () => {
       SchemaSettingsDataScope,
       {
         collectionName: n == null ? void 0 : n.target,
-        defaultFilter: ((O = (N = (T = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : T.service) == null ? void 0 : N.params) == null ? void 0 : O.filter) || {},
+        defaultFilter: ((z = (N = (T = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : T.service) == null ? void 0 : N.params) == null ? void 0 : z.filter) || {},
         form: r,
         onSubmit: ({ filter: G }) => {
           var W, X;
@@ -24594,8 +24594,8 @@ function useCollectValuesToSubmit() {
     }), b = {}, y = Object.keys(f).map((D) => V(this, null, function* () {
       const $ = f[D], L = 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: L }));
       } else
         $ != null && $ !== "" && (b[D] = $);
     }));
@@ -24630,11 +24630,11 @@ const useCreateActionProps = () => {
         var j;
         const { onSuccess: v, skipValidator: I, triggerWorkflows: w } = (j = u == null ? void 0 : u["x-action-settings"]) != null ? j : {}, { manualClose: k, redirecting: A, redirectTo: D, successMessage: $, actionAfterSuccess: L } = 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
@@ -24663,14 +24663,14 @@ const useCreateActionProps = () => {
   return {
     onClick() {
       return V(this, null, function* () {
-        var N, O, q, E, U, G;
+        var N, z, q, E, U, G;
         const k = 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* () {
+          triggerWorkflows: O
+        } = (N = l == null ? void 0 : l["x-action-settings"]) != null ? N : {}, j = (z = i == null ? void 0 : i["x-component-props"]) == null ? void 0 : z.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)) || {};
@@ -24698,7 +24698,7 @@ const useCreateActionProps = () => {
             values: x(x(x({}, T), $), 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;
@@ -24805,13 +24805,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: k, 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: k, successMessage: A, actionAfterSuccess: D } = b || {}, $ = {}, L = Object.keys(S).map((B) => V(this, null, function* () {
           const M = S[B], T = m(B);
           if (isVariable(M)) {
             const { value: N } = (yield u == null ? void 0 : u.parseVariable(M, d)) || {};
@@ -24846,7 +24846,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: L, redirecting: O, redirectTo: j, successMessage: R, actionAfterSuccess: B } = D || {};
         m.data = e.data || {}, m.data.loading = !0;
         const M = {}, T = Object.keys(A).map((q) => V(this, null, function* () {
           const E = A[q], U = C(q);
@@ -24856,7 +24856,7 @@ const useCreateActionProps = () => {
           } else
             E != null && E !== "" && (M[q] = E);
         }));
-        yield Promise.all(T), (B === "previous" || !B && z !== !0) && (b == null || b(!1)), h.confirm({
+        yield Promise.all(T), (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() {
@@ -24884,9 +24884,9 @@ const useCreateActionProps = () => {
               t instanceof TableFieldResource || (W = (H = o == null ? void 0 : o.service) == null ? void 0 : H.refresh) == null || W.call(H), R && (L ? 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() {
@@ -24905,7 +24905,7 @@ const useCreateActionProps = () => {
     onClick() {
       return V(this, null, function* () {
         var q, E, U, G;
-        const { skipValidator: w, onSuccess: k, requestSettings: A } = (q = n == null ? void 0 : n["x-action-settings"]) != null ? q : {}, { manualClose: D, redirecting: $, redirectTo: L, successMessage: z, actionAfterSuccess: j } = k || {}, R = n == null ? void 0 : n["x-action"];
+        const { skipValidator: w, onSuccess: k, requestSettings: A } = (q = n == null ? void 0 : n["x-action-settings"]) != null ? q : {}, { manualClose: D, redirecting: $, redirectTo: L, successMessage: O, actionAfterSuccess: j } = k || {}, R = n == null ? void 0 : n["x-action"];
         if (!A.url)
           return;
         w !== !0 && R === "customize:form:request" && (yield i.submit());
@@ -24922,7 +24922,7 @@ const useCreateActionProps = () => {
           });
           Object.assign(T, W);
         }
-        const O = {
+        const z = {
           url: renderTemplate(A.url, { currentRecord: m, currentUser: g }),
           method: A.method,
           headers: parse(B)({ currentRecord: m, currentUser: g }),
@@ -24931,12 +24931,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({}, z)), 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") && L && (isURL(L) ? window.location.href = L : t(L))), D ? b.success({
+            title: r(O),
             onOk: () => V(this, null, function* () {
               ($ && !j || j === "redirect") && L && (isURL(L) ? window.location.href = L : t(L));
             })
-          }) : message.success(r(z));
+          }) : message.success(r(O));
         } finally {
           f.data.loading = !1;
         }
@@ -24955,7 +24955,7 @@ const useCreateActionProps = () => {
           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 || {}, T = {}, N = Object.keys(k).map((U) => V(this, null, function* () {
+        } = (E = l == null ? void 0 : l["x-action-settings"]) != null ? E : {}, { manualClose: O, redirecting: j, redirectTo: R, successMessage: B, actionAfterSuccess: M } = A || {}, T = {}, N = Object.keys(k).map((U) => V(this, null, function* () {
           const G = k[U], H = d(U);
           if (isVariable(G)) {
             const { value: W } = (yield S == null ? void 0 : S.parseVariable(G, b)) || {};
@@ -24964,11 +24964,11 @@ const useCreateActionProps = () => {
             G != null && G !== "" && (T[U] = G);
         }));
         yield Promise.all(N), $ || (yield e.submit());
-        const O = u.map((U) => U.name), q = getFormValues({
+        const z = u.map((U) => U.name), q = getFormValues({
           filterByTk: t,
           field: o,
           form: e,
-          fieldNames: O,
+          fieldNames: z,
           getField: d,
           resource: n,
           actionFields: (y == null ? void 0 : y("form")) || []
@@ -24984,7 +24984,7 @@ const useCreateActionProps = () => {
             triggerWorkflows: L != null && L.length ? L.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));
@@ -25195,7 +25195,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, k, A, D, $, L, z, j;
+  var v, I, w, k, A, D, $, L, 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 = (k = t["x-component-props"]) == null ? void 0 : k.fieldNames) == null ? void 0 : A.label) || C, { data: f, params: h, run: g } = useRequest(
@@ -25224,7 +25224,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 = (L = i.componentProps) == null ? void 0 : L.params) == null ? void 0 : O.sort,
     d
   ]);
   const y = useCallback(
@@ -25234,17 +25234,17 @@ const useCreateActionProps = () => {
         var G, H, W;
         if (!B.find((X) => X.uid === T.uid))
           return;
-        const O = `${M}${t.name}`, q = ((G = T.service.params) == null ? void 0 : G[0]) || {};
+        const z = `${M}${t.name}`, q = ((G = T.service.params) == null ? void 0 : G[0]) || {};
         (W = (H = T.service.params) == null ? void 0 : H[1]) != null && W.filters || _.set(T.service.params, "[1].filters", {});
         const E = T.service.params[1].filters;
         if (R.length)
-          E[O] = {
+          E[z] = {
             [b]: R
           };
         else {
           if (T.dataLoadingMode === "manual")
             return T.clearData();
-          delete E[O];
+          delete E[z];
         }
         const U = mergeFilter([...Object.values(E), T.defaultFilter]);
         return T.doFilter(
@@ -25274,7 +25274,7 @@ const useCreateActionProps = () => {
         p = M;
         return;
       }
-      p = M.filter((O) => O.label.includes(N));
+      p = M.filter((z) => z.label.includes(N));
     };
   } else
     b = `${r}.${C}.$in`, p = (f == null ? void 0 : f.data) || [], m = (R) => {
@@ -25557,35 +25557,35 @@ const useSyncFromForm = (e, t, o) => {
       const L = {
         type: "duplicate",
         tag: c((R = $.uiSchema) == null ? void 0 : R.title) || $.name
-      }, z = F(x({}, L), {
+      }, O = F(x({}, L), {
         title: React.createElement(TreeNode, L),
         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, {
+        L.type = "reference", O.type = "reference", O.title = React.createElement(TreeNode, F(x({}, L), { 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(k, D), D;
   })(new LRUCache({ max: 100 })), m = /* @__PURE__ */ ((f) => (C, { prefix: S, maxDepth: b, depth: y = 0, exclude: v = [] }) => {
@@ -25595,7 +25595,7 @@ const useSyncFromForm = (e, t, o) => {
     if (y > b)
       return [];
     const k = r(C).map((A) => {
-      var L, z;
+      var L, O;
       if (!A.target || !A.interface || v.includes(A.name))
         return;
       const D = {
@@ -25604,7 +25604,7 @@ const useSyncFromForm = (e, t, o) => {
       }, $ = 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,
@@ -25635,8 +25635,8 @@ const useSyncFromForm = (e, t, o) => {
           var w;
           (w = v == null ? void 0 : v.reduceProperties) == null || w.call(v, (k, A) => {
             var B, M, T;
-            const D = k || 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 = k || I, $ = A["x-collection-field"] && n(A["x-collection-field"]), L = A.name.includes("."), O = $ && ["hasOne", "hasMany", "belongsTo", "belongsToMany"].includes($.type), j = !O && 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), $ && (O || L) && A["x-component"] !== "TableField") {
               if (f.add({ name: R, fieldMode: ((M = A["x-component-props"]) == null ? void 0 : M.mode) || "Select" }), ["Nester", "SubTable"].includes((T = A["x-component-props"]) == null ? void 0 : T.mode)) {
                 const N = D && D !== "" ? D + "." + A.name : A.name;
                 S(A, N);
@@ -26486,7 +26486,7 @@ const useParseDefaultValue = () => {
         const D = !t.name.toString().includes(".") && (d == null ? void 0 : d.getField(t.name)), {
           value: $,
           collectionName: L,
-          dataSource: z = "main"
+          dataSource: O = "main"
         } = yield o.parseVariable(t.default, n, {
           fieldOperator: C(t.name)
         });
@@ -26494,7 +26494,7 @@ const useParseDefaultValue = () => {
           collectionName: D.target,
           targetCollectionName: L,
           dm: S,
-          dataSource: z
+          dataSource: O
         })) {
           e.loading = !1;
           return;
@@ -26510,8 +26510,8 @@ const useParseDefaultValue = () => {
       const k = getVariableName(t.default), A = b(k);
       return A ? (y(), reaction(
         () => {
-          const $ = { [k]: (A == null ? void 0 : A.ctx) || {} }, L = getPath(t.default), z = getValuesByPath($, L);
-          return z === void 0 ? Math.random() : z;
+          const $ = { [k]: (A == null ? void 0 : A.ctx) || {} }, L = getPath(t.default), O = getValuesByPath($, L);
+          return O === void 0 ? Math.random() : O;
         },
         () => v({ forceUpdate: !0 }),
         {
@@ -27917,7 +27917,7 @@ function Input$1(e) {
   useAntdInputStyle(`${S}-input`);
   const b = useCompile(), { t: y } = useTranslation(), v = useForm(), [I, w] = React.useState([]), [k, 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(
+  ), L = useMemo(() => parseValue(t, p), [p, t]), O = typeof L == "string", j = O ? L : "", R = O ? null : L, B = Object.assign(
     {
       label: "label",
       value: "value",
@@ -27930,8 +27930,8 @@ function Input$1(e) {
     [B.value]: "$",
     [B.label]: y("Constant")
   } : i ? getTypedConstantOption(j, i, B) : null, [j, i]), T = (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 z;
+  t == null ? a ? n && D ? z = ["$"] : z = [""] : n ? z = ["$"] : z = [" ", j] : z = n ? ["$"] : [" ", j], m && (z = ["$"]), useEffect(() => {
     const Z = M != null ? M : {}, { component: J } = Z, Y = K(Z, ["component"]), Q = [
       ...a ? [
         {
@@ -28081,7 +28081,7 @@ function Input$1(e) {
         Cascader$1,
         {
           options: I,
-          value: R != null ? R : O,
+          value: R != null ? R : z,
           onChange: E,
           loadData: q,
           changeOnSelect: u,
@@ -28371,7 +28371,7 @@ function TextArea(e) {
     const { current: N } = m;
     if (!N)
       return;
-    const O = new Range();
+    const z = new Range();
     if (y) {
       if (k.join() === "-1,0,-1,0")
         return;
@@ -28379,25 +28379,25 @@ function TextArea(e) {
       if (E)
         try {
           const U = Array.from(N.childNodes);
-          U.length && (k[0] === -1 ? k[1] && O.setStartAfter(U[k[1] - 1]) : O.setStart(U[k[0]], k[1]), k[2] === -1 ? k[3] && O.setEndAfter(U[k[3] - 1]) : O.setEnd(U[k[2]], k[3])), O.collapse(!0), E.removeAllRanges(), E.addRange(O);
+          U.length && (k[0] === -1 ? k[1] && z.setStartAfter(U[k[1] - 1]) : z.setStart(U[k[0]], k[1]), k[2] === -1 ? k[3] && z.setEndAfter(U[k[3] - 1]) : z.setEnd(U[k[2]], k[3])), z.collapse(!0), E.removeAllRanges(), E.addRange(z);
         } 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]);
+        z.setStartAfter(E), z.setEndAfter(E);
+        const U = Array.from(N.childNodes), G = z.startContainer === N ? -1 : U.indexOf(E), H = z.startContainer === N ? -1 : U.indexOf(E);
+        A([G, z.startOffset, H, z.endOffset]);
       }
     }
   }, [I]);
   const $ = useCallback(
     function(N) {
-      const O = N.filter((U) => !!U.trim()), { current: q } = m;
-      if (!q || !O)
+      const z = N.filter((U) => !!U.trim()), { current: q } = m;
+      if (!q || !z)
         return;
       q.focus();
-      const E = createVariableTagHTML(O.join("."), C);
+      const E = createVariableTagHTML(z.join("."), C);
       pasteHTML(q, E, {
         range: k
       }), v(!0), A(getCurrentRange(q)), i(getValue(q, u));
@@ -28408,7 +28408,7 @@ function TextArea(e) {
       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();
@@ -28422,7 +28422,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 z = N.clipboardData.getData("text/html") || N.clipboardData.getData("text"), q = sanitizeHTML(z, {
         allowedTags: ["span"],
         allowedAttributes: {
           span: ["data-variable", "contenteditable"]
@@ -28476,7 +28476,7 @@ function TextArea(e) {
               role: "button",
               "aria-label": "textbox",
               onInput: L,
-              onBlur: z,
+              onBlur: O,
               onKeyDown: j,
               onPaste: M,
               onCompositionStart: R,
@@ -33583,8 +33583,8 @@ const useFieldComponentOptions = () => {
   const { refresh: t } = useDesignable(), o = useAPIClient(), { t: n } = useTranslation();
   return useCallback(
     (r) => {
-      var f, C, S, b, y, v, I, w, k, 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 = (k = a == null ? void 0 : a.data) == null ? void 0 : k.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, k, A, D, $, L, 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 = (k = a == null ? void 0 : a.data) == null ? void 0 : k.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 = (L = a == null ? void 0 : a.data) == null ? void 0 : L.current) == null ? void 0 : O.removeParentsIfNoChildren) != null ? j : !0;
       if (!l || !c) {
         e == null || e(r);
         return;
@@ -33904,7 +33904,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 = i.value && u.map((m, h) => /* @__PURE__ */ jsx(Tag, { color: m[l.color], icon: m.icon, children: m[l.label] }, h));
+      const d = i.value !== null && 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,
@@ -34104,7 +34104,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: k } = useCollection_deprecated(), A = useRef(null), { getCollectionJoinField: D, getInterface: $ } = useCollectionManager_deprecated(), L = I["x-collection-field"] || I.name, z = k(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: k } = useCollection_deprecated(), A = useRef(null), { getCollectionJoinField: D, getInterface: $ } = useCollectionManager_deprecated(), L = I["x-collection-field"] || I.name, O = k(L) || D(L), 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";
@@ -34140,7 +34140,7 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
           }
         },
         [j == null ? void 0 : j.uiSchema, t]
-      ), { data: T, run: N, loading: O } = useRequest(
+      ), { data: T, run: N, loading: z } = useRequest(
         F(x({
           action: "list"
         }, o), {
@@ -34210,7 +34210,7 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
           value: r,
           defaultValue: i
         }, f), {
-          loading: T ? O : !0,
+          loading: T ? z : !0,
           options: h(M(G)),
           rawOptions: G,
           dropdownRender: (Y) => {
@@ -35176,7 +35176,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 z = e, { children: t } = z, o = K(z, ["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);
@@ -35188,7 +35188,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: L, 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"]}`
@@ -35294,7 +35294,7 @@ const useStyles$9 = genStyleHook("nb-page", (e) => {
     S
   ]);
   return L(
-    /* @__PURE__ */ jsxs("div", { className: `${j} ${z} ${R.styles}`, children: [
+    /* @__PURE__ */ jsxs("div", { className: `${j} ${O} ${R.styles}`, children: [
       /* @__PURE__ */ jsx(PageDesigner, { title: l.title || i }),
       /* @__PURE__ */ jsx(
         "div",
@@ -35645,35 +35645,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 T = 1; T < B.length && M; T++) {
@@ -35683,19 +35683,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, T + 1).join(".")));
+          const z = M.loadChildren(M);
+          z != null && z.length && (j.push(...z), M = z.find((q) => q.value === B.slice(0, T + 1).join(".")));
         }
       }
     }), h((R) => j.reduce((B, M) => Object.assign(B, { [M.value]: M }), x({}, R)));
   }, [o, v.length, e.multiple]);
   const k = 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((T) => {
@@ -35712,16 +35712,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: T } = (N = m[j]) != null ? N : {};
       return /* @__PURE__ */ jsx(Tag, { closable: M && !B, onClose: R, children: T == null ? void 0 : T.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({
@@ -35766,20 +35766,20 @@ const AppendsTreeSelect = (e) => {
       const k = uid();
       return f.addEffects(k, () => {
         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 $, L, O, j, R;
+          (filterAnalyses((O = (L = ($ = r.componentProps) == null ? void 0 : $.service) == null ? void 0 : L.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(k);
       };
     }, []);
     const y = (k) => V(void 0, null, function* () {
-      var L, z;
+      var L, O;
       const { search: A, callBack: D } = k, {
         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 = (L = r == null ? void 0 : r.componentProps) == null ? void 0 : L.fieldNames) == null ? void 0 : O.label) || "id"]: A
         }
       });
       if ($) {
@@ -36376,8 +36376,8 @@ function Uploader(o) {
         const D = k.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);
+            var O;
+            return c((O = L.response) == null ? void 0 : O.data);
           })];
           l == null || l($);
         }
@@ -36711,9 +36711,9 @@ const InternalFileManager = (e) => {
   };
   useEffect(() => {
     if (t && Object.keys(t).length > 0) {
-      const L = (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((z) => {
-        const j = z[p.label];
-        return F(x({}, z), {
+      const L = (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))
         });
       });
@@ -36724,7 +36724,7 @@ const InternalFileManager = (e) => {
   const w = {
     size: "small",
     fieldNames: p,
-    multiple: ["o2m", "m2m"].includes(S == null ? void 0 : S.interface) && o,
+    multiple: ["o2m", "m2m", "mbm"].includes(S == null ? void 0 : S.interface) && o,
     association: {
       target: S == null ? void 0 : S.target
     },
@@ -36734,10 +36734,10 @@ const InternalFileManager = (e) => {
     setSelectedRows: u,
     collectionField: S
   }, k = () => {
-    const { setVisible: L } = useActionContext(), { multiple: z, selectedRows: j, onChange: R, options: B, collectionField: M } = useContext(RecordPickerContext);
+    const { setVisible: L } = useActionContext(), { multiple: O, selectedRows: j, onChange: R, options: B, collectionField: M } = useContext(RecordPickerContext);
     return {
       onClick() {
-        R(z ? unionBy(j, B, (M == null ? void 0 : M.targetKey) || "id") : (j == null ? void 0 : j[0]) || null), L(!1);
+        R(O ? unionBy(j, B, (M == null ? void 0 : M.targetKey) || "id") : (j == null ? void 0 : j[0]) || null), L(!1);
       }
     };
   };
@@ -36789,10 +36789,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();
@@ -36815,14 +36815,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((z, 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 === z);
+                return E ? /* @__PURE__ */ jsx(Tag, { color: E.color, style: { marginRight: 3 }, children: (E == null ? void 0 : E.label) || z }, q) : /* @__PURE__ */ jsx(Tag, { children: z }, z);
               }).reverse();
             else {
-              const O = (N = (T = v.uiSchema.enum).find) == null ? void 0 : N.call(T, (q) => q.value === B);
-              O && (B = /* @__PURE__ */ jsx(Tag, { color: O.color, children: O.label }));
+              const z = (N = (T = v.uiSchema.enum).find) == null ? void 0 : N.call(T, (q) => q.value === B);
+              z && (B = /* @__PURE__ */ jsx(Tag, { color: z.color, children: z.label }));
             }
           return (v == null ? void 0 : v.type) === "date" && (B = dayjs(B).format("YYYY-MM-DD")), o ? o({
             [y.label]: B || EMPTY,
@@ -36858,8 +36858,8 @@ const InternalFileManager = (e) => {
     var M, T, 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 z = yield A({ parentId: R == null ? void 0 : R.key });
+      if (d(!1), c(z), B === (i == null ? void 0 : i.length) - 1 && ((M = R == null ? void 0 : R.value) != null && M.id)) {
         const q = yield A({ parentId: (T = R == null ? void 0 : R.value) == null ? void 0 : T.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);
       }
@@ -36895,7 +36895,7 @@ const InternalFileManager = (e) => {
         onSearch: (N) => L(N, j),
         fieldNames: y,
         style: { minWidth: 150 },
-        onChange: (N, O) => D(N, O, R),
+        onChange: (N, z) => D(N, z, R),
         options: u ? [] : k(l),
         onDropdownVisibleChange: (N) => $(N, j, R),
         notFoundContent: u ? /* @__PURE__ */ jsx(Spin, { size: "small" }) : null
@@ -37111,7 +37111,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(), k = 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(), k = 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))
@@ -37136,13 +37136,13 @@ const InternalNesterCss = css`
       const R = (f == null ? void 0 : f.targetKey) || "id", B = k.map((T) => T[R]).filter(Boolean);
       return B.length ? { $and: [{ [`${R}.$ne`]: B }] } : {};
     }, L = () => {
-      const { setVisible: R } = useActionContext(), { multiple: B, selectedRows: M, onChange: T, options: N, collectionField: O } = useContext(RecordPickerContext);
+      const { setVisible: R } = useActionContext(), { multiple: B, selectedRows: M, onChange: T, options: N, collectionField: z } = useContext(RecordPickerContext);
       return {
         onClick() {
-          T(B ? unionBy(M, N, (O == null ? void 0 : O.targetKey) || "id") : (M == null ? void 0 : M[0]) || null), R(!1);
+          T(B ? unionBy(M, N, (z == null ? void 0 : z.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(z == null ? void 0 : z.interface) ? "block" : "none"
         }
       };
     };
@@ -37249,7 +37249,7 @@ const RenderRecord = React.memo(
     const [f, C] = useState(!0), [S, b] = useState([]);
     return useEffect(() => {
       const y = toArr$3(h).map((v, I, w) => {
-        const k = 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(k) ? JSON.stringify(k) : k, D = toValue$3(o(A), "N/A"), $ = n(
+        const k = 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(k) ? JSON.stringify(k) : k, 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);
@@ -37260,9 +37260,9 @@ const RenderRecord = React.memo(
               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);
@@ -38050,8 +38050,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 L = (j = n.value) == null ? void 0 : j.indexOf($), O = 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: O, children: /* @__PURE__ */ jsx("span", { role: "button", className: g, children: /* @__PURE__ */ jsx(RecursionField, { basePath: O, schema: b, onlyRenderProperties: !0 }) }) }) }) }) });
         },
         onCell: (D, $) => ({
           record: D,
@@ -38393,7 +38393,7 @@ const Table$1 = withDynamicSchemaProps(
       "loading",
       "onClickRow"
     ]), b = useArrayField(S), y = useFieldSchema(), { size: v = "small" } = (y == null ? void 0 : y["x-component-props"]) || {}, I = useCollection(), k = ((ce = y == null ? void 0 : y.parent) == null ? void 0 : ce["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: A, allIncludesChildren: D } = k, $ = 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) || []), [T, N] = useState([]), O = (p == null ? void 0 : p.type) !== "none", q = useRef(/* @__PURE__ */ new Map()), E = useMemo(() => css`
+    })), L = usePaginationProps$2(o, i), O = useTableColumns$1(S, L), [j, R] = useState(() => A ? D : []), [B, M] = useState(((ye = b == null ? void 0 : b.data) == null ? void 0 : ye.selectedRowKeys) || []), [T, N] = useState([]), z = (p == null ? void 0 : p.type) !== "none", q = useRef(/* @__PURE__ */ new Map()), E = useMemo(() => css`
         & > td {
           background-color: ${t.controlItemBgActive} !important;
         }
@@ -38474,14 +38474,14 @@ const Table$1 = withDynamicSchemaProps(
                 role: "button",
                 "aria-label": `table-index-${re}`,
                 className: cls(oe ? "checked" : floatLeftClass, rowSelectCheckboxWrapperClass, {
-                  [rowSelectCheckboxWrapperClassHover]: O
+                  [rowSelectCheckboxWrapperClassHover]: z
                 }),
                 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(
+                  z && /* @__PURE__ */ jsx(
                     "div",
                     {
                       className: cls(
@@ -38506,7 +38506,7 @@ const Table$1 = withDynamicSchemaProps(
         l,
         b,
         W,
-        O,
+        z,
         Q,
         L
       ]
@@ -38557,7 +38557,7 @@ const Table$1 = withDynamicSchemaProps(
           onRow: G,
           rowClassName: ge,
           scroll: le,
-          columns: z,
+          columns: O,
           expandable: xe,
           field: b,
           size: v
@@ -38611,7 +38611,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) => {
@@ -38646,16 +38646,16 @@ const Table$1 = withDynamicSchemaProps(
       const { setVisible: B } = useActionContext(), { selectedRows: M, setSelectedRows: T } = useContext(RecordPickerContext);
       return {
         onClick() {
-          var O;
+          var z;
           M.map((q) => o.value.push(markRecordAsNew(q))), o.onInput(o.value), o.initialValue = o.value, T([]), 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 / (((z = o.componentProps) == null ? void 0 : z.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 }] } : {};
-    }, [k, A] = useState(1), [D, $] = useState(((z = o.componentProps) == null ? void 0 : z.pageSize) || 10);
+    }, [k, 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);
@@ -38841,10 +38841,10 @@ const ReadPretty$7 = observer$1(
 InternalAssociationSelect.displayName = "InternalAssociationSelect";
 const AssociationSelect = InternalAssociationSelect;
 AssociationSelect.Designer = function e() {
-  var B, M, T, N, O, q, E, U, G, H, W;
+  var B, M, T, N, z, 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), k = (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 === k || c.title;
-  const D = useSortFields(b == null ? void 0 : b.target), $ = ((O = (N = (T = c.componentProps) == null ? void 0 : T.service) == null ? void 0 : N.params) == null ? void 0 : O.sort) || [];
+  const D = useSortFields(b == null ? void 0 : b.target), $ = ((z = (N = (T = c.componentProps) == null ? void 0 : T.service) == null ? void 0 : N.params) == null ? void 0 : z.sort) || [];
   useEffect(() => {
     c.readPretty !== u["x-read-pretty"] && (c.readPretty = !!u["x-read-pretty"]);
   }, [u["x-read-pretty"]]);
@@ -38856,7 +38856,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,
@@ -39207,7 +39207,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;
@@ -39240,7 +39240,7 @@ AssociationSelect.Designer = function e() {
   ] });
 };
 AssociationSelect.FilterDesigner = function e() {
-  var I, w, k, A, D, $, L, z, j, R, B;
+  var I, w, k, A, D, $, L, 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 = (k = a.componentProps) == null ? void 0 : k.service) == null ? void 0 : A.params) == null ? void 0 : D.sort) || [], y = b == null ? void 0 : b.map((M) => M.startsWith("-") ? {
@@ -39357,8 +39357,8 @@ AssociationSelect.FilterDesigner = function e() {
           if (["percent"].includes(m == null ? void 0 : m.interface))
             for (const E of T)
               (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"]) || [], T);
-          a.validator = O, l["x-validator"] = T, N["x-validator"] = T, u.emit("patch", {
+          const z = _.concat([], ((q = m == null ? void 0 : m.uiSchema) == null ? void 0 : q["x-validator"]) || [], T);
+          a.validator = z, l["x-validator"] = T, N["x-validator"] = T, u.emit("patch", {
             schema: N
           }), d();
         }
@@ -39395,7 +39395,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 = (L = a.componentProps) == null ? void 0 : L.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", {
@@ -39499,10 +39499,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 z, q;
           const T = {
             "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 = (z = m == null ? void 0 : m.uiSchema) == null ? void 0 : z["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, T["x-component-props"] = l["x-component-props"], u.emit("patch", {
@@ -41041,8 +41041,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({
@@ -42202,14 +42202,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), [k, 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;
       }
@@ -42220,8 +42220,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]);
@@ -42778,8 +42778,8 @@ const toValue = (e, t) => e == null ? t : e, ReadPrettyRecordPicker = observer$1
           "a",
           {
             onClick: (L) => {
-              var z;
-              L.stopPropagation(), L.preventDefault(), l(!0), p(w), (z = C == null ? void 0 : C.current) == null || z.setPopoverVisible(!1);
+              var O;
+              L.stopPropagation(), L.preventDefault(), l(!0), p(w), (O = C == null ? void 0 : C.current) == null || O.setPopoverVisible(!1);
             },
             children: $
           }
@@ -44195,18 +44195,18 @@ const TableActionColumnDesigner = (e) => {
     "sort-field"
   );
 }, TableBlockDesigner = () => {
-  var A, D, $, L, z, j, R, B, M, T, 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, $, L, O, j, R, B, M, T, 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 = !((O = i == null ? void 0 : i["x-decorator-props"]) != null && O.disableTemplate), f = m == null ? void 0 : m.map((z) => z != null && z.startsWith("-") ? {
+    field: z.substring(1),
     direction: "desc"
   } : {
-    field: O,
+    field: z,
     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: z }) => {
+      z = removeNullCondition(z);
       const q = r.decoratorProps.params || {};
-      q.filter = O, r.decoratorProps.params = q, i["x-decorator-props"].params = q, d.emit("patch", {
+      q.filter = z, 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"]
@@ -44224,11 +44224,11 @@ const TableActionColumnDesigner = (e) => {
         title: u("Tree table"),
         defaultChecked: !0,
         checked: I ? r.decoratorProps.treeTable : !1,
-        onChange: (O) => {
+        onChange: (z) => {
           var E;
-          r.decoratorProps.treeTable = O, i["x-decorator-props"].treeTable = O;
+          r.decoratorProps.treeTable = z, i["x-decorator-props"].treeTable = z;
           const q = F(x({}, (E = c.params) == null ? void 0 : E[0]), {
-            tree: O ? !0 : null
+            tree: z ? !0 : null
           });
           d.emit("patch", {
             schema: i
@@ -44241,13 +44241,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 k.resource("collections.fields", v.collectionName).update({
+        onChange: (z) => V(void 0, null, function* () {
+          z && v && (yield k.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 = z, i["x-decorator-props"].dragSort = z, d.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
               "x-decorator-props": i["x-decorator-props"]
@@ -44341,9 +44341,9 @@ const TableActionColumnDesigner = (e) => {
             }
           }
         },
-        onSubmit: ({ sort: O }) => {
+        onSubmit: ({ sort: z }) => {
           var U;
-          const q = O.map((G) => G.direction === "desc" ? `-${G.field}` : G.field), E = r.decoratorProps.params || {};
+          const q = z.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"],
@@ -44367,10 +44367,10 @@ const TableActionColumnDesigner = (e) => {
           { label: "100", value: 100 },
           { label: "200", value: 200 }
         ],
-        onChange: (O) => {
+        onChange: (z) => {
           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 = z, r.decoratorProps.params = q, i["x-decorator-props"].params = q, c.run(F(x({}, (E = c.params) == null ? void 0 : E[0]), { pageSize: z, page: 1 })), d.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
               "x-decorator-props": i["x-decorator-props"]
@@ -44389,12 +44389,12 @@ const TableActionColumnDesigner = (e) => {
           { label: u("Middle"), value: "middle" },
           { label: u("Small"), value: "small" }
         ],
-        onChange: (O) => {
+        onChange: (z) => {
           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 = z, d.emit("patch", {
             schema: {
               "x-uid": q["x-uid"],
               "x-decorator-props": q["x-component-props"]
@@ -44441,7 +44441,7 @@ TableField.ActionBar = observer$1(
   { displayName: "TableField.ActionBar" }
 );
 const TableSelectorDesigner = () => {
-  var k, A, D, $, L, z;
+  var k, A, D, $, L, 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 = (k = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : k.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"
@@ -44599,7 +44599,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 = (L = r.decoratorProps) == null ? void 0 : L.params) == null ? void 0 : O.pageSize) || 20,
         options: [
           { label: "5", value: 5 },
           { label: "10", value: 10 },
@@ -46555,14 +46555,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 || [], k = 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 || [], k = useMemo(() => d.map((R) => ({
     label: b(R.title),
     value: R.name
   })), []), A = useCallback(() => {
     const { availableFieldInterfaces: R } = u(n.template) || {}, { exclude: B, include: M } = R || {}, T = [];
     return I.forEach((N) => {
-      var O;
+      var z;
       if (N.key === "systemInfo")
         T.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)
@@ -46575,7 +46575,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 && T.push(F(x({}, N), {
+        }) : B != null && B.length ? q = (z = N == null ? void 0 : N.children) == null ? void 0 : z.filter((E) => !B.includes(E.name)) : q = N == null ? void 0 : N.children, q != null && q.length && T.push(F(x({}, N), {
           children: q
         }));
       }
@@ -46754,14 +46754,14 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       "a",
       F(x({}, a), {
         onClick: () => V(void 0, null, function* () {
-          var L, z;
+          var L, O;
           const { data: k } = yield g.resource("collections.fields", n.collectionName).get({
             filterByTk: n.name,
             appends: ["reverseField"]
           });
           b(k == null ? void 0 : k.data);
           const A = l(n.interface), D = cloneDeep(k == null ? void 0 : k.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 = (L = A == null ? void 0 : A.default) == null ? void 0 : L.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);
         }),
@@ -46854,11 +46854,11 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
 }, OverridingCollectionField = (e) => {
   const t = useRecord(), o = useCollectionParentRecordData();
   return /* @__PURE__ */ jsx(OverridingFieldAction, x({ item: t, parentItem: o }, e));
-}, getIsOverriding = (e, t) => e.find((n) => n.name === t.name), OverridingFieldAction = (e) => {
+}, getIsOverriding = (e, t, o) => t.find((r) => r.name === o.name).collectionName === e, OverridingFieldAction = (e) => {
   const { scope: t, getContainer: o, item: n, parentItem: r, children: i, currentCollection: a } = e, { target: l, through: c } = n, { getInterface: u, getCollection: d, getCurrentCollectionFields: p, getChildrenCollections: m, collections: h } = useCollectionManager_deprecated(), [g, f] = useState(!1), [C, S] = useState({}), b = useAPIClient(), { t: y } = useTranslation(), v = useCompile(), I = (j) => {
     var B;
     return j && ((B = m(j)) == null ? void 0 : B.map((M) => M.name).concat([j]));
-  }, [w, k] = useState({}), A = p(a), D = getIsOverriding(A, n), $ = useMemo(() => h.map((j) => ({
+  }, [w, k] = useState({}), A = p(a), D = getIsOverriding(a, A, n), $ = useMemo(() => h.map((j) => ({
     label: v(j.title),
     value: j.name
   })), []), L = () => {
@@ -46867,7 +46867,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       run() {
         return V(this, null, function* () {
           yield j.submit();
-          const O = cloneDeep(j.values), q = omit$1(O, [
+          const z = cloneDeep(j.values), q = omit$1(z, [
             "key",
             "uiSchemaUid",
             "collectionName",
@@ -46885,7 +46885,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;
@@ -46938,7 +46938,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           isOverride: !0,
           targetScope: { target: I(l), through: I(c) },
           collections: $,
-          scopeKeyOptions: z
+          scopeKeyOptions: O
         }, t)
       }
     )
@@ -47389,14 +47389,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) => {
+      }), z = (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: z
       });
     }), h(R);
   }, [g, t]), useEffect(() => {
@@ -47405,11 +47405,11 @@ const getSchema$4 = (e, t, o) => {
       if (R) {
         u(!1), p([]);
         const T = (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 z, 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: ((z = E.uiSchema) == null ? void 0 : z.title) || E.name })
             });
           } else {
             const E = (i == null ? void 0 : i.data.find((U) => U.name === N.name)) || N;
@@ -47419,16 +47419,16 @@ const getSchema$4 = (e, t, o) => {
           }
         });
         b.value = T, setTimeout(() => {
-          var N, O, q;
-          p(T), 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, z, q;
+          p(T), y.setValuesIn("sources", (N = R.data) == null ? void 0 : N.sources), f((z = R.data) == null ? void 0 : z.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 T = 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, z, q;
+      const T = typeof M.source == "string" ? M.source : (q = (z = (N = M.source) == null ? void 0 : N.filter) == null ? void 0 : z.call(N, Boolean)) == null ? void 0 : q.join(".");
       return F(x({}, M), {
         source: T
       });
@@ -47454,8 +47454,8 @@ const getSchema$4 = (e, t, o) => {
           options: D(m),
           onChange: (T, N) => {
             var q;
-            const O = (q = w(T == null ? void 0 : T[0])) == null ? void 0 : q.find((E) => E.name === last(T));
-            z(F(x({}, B), { source: T, uiSchema: O == null ? void 0 : O.uiSchema }), M);
+            const z = (q = w(T == null ? void 0 : T[0])) == null ? void 0 : q.find((E) => E.name === last(T));
+            O(F(x({}, B), { source: T, uiSchema: z == null ? void 0 : z.uiSchema }), M);
           },
           placeholder: l("Select field source")
         }
@@ -47475,7 +47475,7 @@ const getSchema$4 = (e, t, o) => {
             popupMatchSelectWidth: !1,
             style: { width: "100%" },
             options: (T == null ? void 0 : T.possibleTypes.map((N) => ({ label: N, value: N }))) || [],
-            onChange: (N) => z(F(x({}, T), { type: N }), M)
+            onChange: (N) => O(F(x({}, T), { type: N }), M)
           }
         );
       }
@@ -47493,12 +47493,12 @@ const getSchema$4 = (e, t, o) => {
             defaultValue: R,
             style: { width: "100%" },
             popupMatchSelectWidth: !1,
-            onChange: (O) => {
+            onChange: (z) => {
               var E;
-              const q = I(O);
-              z(F(x({}, T), { interface: O, uiSchema: (E = q == null ? void 0 : q.default) == null ? void 0 : E.uiSchema }), M);
+              const q = I(z);
+              O(F(x({}, T), { interface: z, 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((z) => /* @__PURE__ */ jsx(Select$1.OptGroup, { label: D(z.label), children: z.children.map((q) => /* @__PURE__ */ jsx(Select$1.Option, { value: q.name, children: D(q.label) }, q.value)) }, z.key))
           }
         );
       }
@@ -47515,8 +47515,8 @@ const getSchema$4 = (e, t, o) => {
           Input$3,
           {
             defaultValue: ((N = T == null ? void 0 : T.uiSchema) == null ? void 0 : N.title) || R,
-            onChange: (O) => z(
-              F(x({}, T), { uiSchema: F(x({}, omit$1(T == null ? void 0 : T.uiSchema, "rawTitle")), { title: O.target.value }) }),
+            onChange: (z) => O(
+              F(x({}, T), { uiSchema: F(x({}, omit$1(T == null ? void 0 : T.uiSchema, "rawTitle")), { title: z.target.value }) }),
               M
             )
           }
@@ -47570,15 +47570,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, k = (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) || (k == null ? void 0 : k.title) || I.name, D = I.source ? k : (B = (R = m(I.interface)) == null ? void 0 : R.default) == null ? void 0 : B.uiSchema;
+      var $, L, 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, k = (O = (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 : O.uiSchema, A = ((j = I == null ? void 0 : I.uiSchema) == null ? void 0 : j.title) || (k == null ? void 0 : k.title) || I.name, D = I.source ? k : (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, T, N) => {
-          const O = T[I.name], q = {
+          const z = T[I.name], q = {
             type: "object",
             properties: {
               [I.name]: {
@@ -47586,7 +47586,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(z) : z
               }
             }
           };
@@ -47821,9 +47821,9 @@ 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(([L, O]) => {
         var T;
-        const j = l[L], R = inferInterface(L, z), B = (T = C.current(R)) == null ? void 0 : T.default, M = (j == null ? void 0 : j.uiSchema) || (B == null ? void 0 : B.uiSchema) || {};
+        const j = l[L], R = inferInterface(L, O), B = (T = C.current(R)) == null ? void 0 : T.default, M = (j == null ? void 0 : j.uiSchema) || (B == null ? void 0 : B.uiSchema) || {};
         A.set(L, {
           name: L,
           interface: (j == null ? void 0 : j.interface) || R,
@@ -47834,13 +47834,13 @@ const AsyncDataProvider = (e) => {
           }, M)
         });
       }) : Object.entries(l || {}).forEach(
-        ([L, z]) => A.set(L, F(x({
+        ([L, O]) => A.set(L, F(x({
           name: L,
           type: "string"
-        }, z), {
+        }, O), {
           uiSchema: x({
             title: L
-          }, (z == null ? void 0 : z.uiSchema) || {})
+          }, (O == null ? void 0 : O.uiSchema) || {})
         }))
       )), ($ = c.value) != null && $.length && c.value.forEach((L) => {
         A.has(L.name) && A.set(L.name, L);
@@ -47861,9 +47861,9 @@ const AsyncDataProvider = (e) => {
       const $ = [...t];
       $.splice(D, 1, A), o($), c.setValue(
         $.map((L) => {
-          var z, j, R;
+          var O, 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
+            source: typeof L.source == "string" ? L.source : ((R = (j = (O = L.source) == null ? void 0 : O.filter) == null ? void 0 : j.call(O, Boolean)) == null ? void 0 : R.join(".")) || null
           });
         })
       );
@@ -47888,11 +47888,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(
+              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({}, L), {
-                    source: z,
+                    source: O,
                     interface: j == null ? void 0 : j.interface,
                     type: j == null ? void 0 : j.type,
                     uiSchema: j == null ? void 0 : j.uiSchema
@@ -47910,16 +47910,16 @@ const AsyncDataProvider = (e) => {
         key: "interface",
         width: 150,
         render: (A, D, $) => {
-          var z;
+          var O;
           const L = t[$];
-          return L.source ? /* @__PURE__ */ jsx(Tag, { children: d((z = p(A)) == null ? void 0 : z.title) || A }) : /* @__PURE__ */ jsx(
+          return L.source ? /* @__PURE__ */ jsx(Tag, { children: d((O = p(A)) == null ? void 0 : O.title) || A }) : /* @__PURE__ */ jsx(
             Select$1,
             {
               defaultValue: L.interface || "input",
               style: { width: "100%" },
               popupMatchSelectWidth: !1,
               onChange: (j) => {
-                var B, M, T, N, O;
+                var B, M, T, N, z;
                 const R = p(j);
                 b(
                   F(x({}, L), {
@@ -47927,7 +47927,7 @@ const AsyncDataProvider = (e) => {
                     uiSchema: F(x({}, (B = R == null ? void 0 : R.default) == null ? void 0 : B.uiSchema), {
                       title: ((T = (M = R == null ? void 0 : R.default) == null ? void 0 : M.uiSchema) == null ? void 0 : T.title) || ((N = L.uiSchema) == null ? void 0 : N.title)
                     }),
-                    type: (O = R == null ? void 0 : R.default) == null ? void 0 : O.type
+                    type: (z = R == null ? void 0 : R.default) == null ? void 0 : z.type
                   }),
                   $
                 );
@@ -47944,12 +47944,12 @@ const AsyncDataProvider = (e) => {
         key: "title",
         width: 180,
         render: (A, D, $) => {
-          var z, j;
+          var O, j;
           const L = t[$];
           return /* @__PURE__ */ jsx(
             Input$3,
             {
-              value: ((z = L.uiSchema) == null ? void 0 : z.title) || A,
+              value: ((O = L.uiSchema) == null ? void 0 : O.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 }) }), $)
             }
@@ -52182,7 +52182,7 @@ class InheritanceCollectionMixin extends Collection {
     return l > 0 && (r.splice(l), r.forEach((u) => {
       const d = this.collectionManager.getCollection(u);
       c = c.concat(d.getCurrentFields());
-    })), this.parentCollectionFields[o] = a.filter((u) => !c.find((d) => d.name === u.name)), this.parentCollectionFields[o];
+    })), this.parentCollectionFields[o] = a.filter((u) => c.find((p) => p.name === u.name).collectionName !== this.name), this.parentCollectionFields[o];
   }
   getAllCollectionsInheritChain() {
     if (this.allCollectionsInheritChain)
@@ -54155,13 +54155,13 @@ const RolesResourcesActions = connect((e) => {
                   onChange: () => {
                     const L = m[k.name] || {
                       name: k.name
-                    }, z = L.fields || [];
+                    }, O = L.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[k.name] = L, o(Object.values(m));
+                      O.push($.name);
+                    L.fields = O, m[k.name] = L, o(Object.values(m));
                   }
                 }
               )
@@ -56021,8 +56021,8 @@ const useMenuProps = () => {
     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);
     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(() => {
@@ -56992,7 +56992,7 @@ 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, k = {
       title: w || I,
       key: I
-    }, [A, D] = useState([]), [$, L] = useState(a.default || []), [z, j] = useState(!0), R = useLabelUiSchema(i, (k == null ? void 0 : k.title) || "label");
+    }, [A, D] = useState([]), [$, L] = useState(a.default || []), [O, j] = useState(!0), R = useLabelUiSchema(i, (k == null ? void 0 : k.title) || "label");
     if (useEffect(() => {
       a.default && (d(a.default), L(a.default));
     }, [a.default, d]), !i)
@@ -57009,7 +57009,7 @@ const ActionInitializerItem = (e) => {
       })), y(!b), W.stopPropagation();
     }, N = (W) => {
       W.stopPropagation();
-    }, O = (W) => {
+    }, z = (W) => {
       m(W);
     }, q = (H = a.title) != null ? H : (G = i == null ? void 0 : i.uiSchema) == null ? void 0 : G.title;
     return t(
@@ -57036,7 +57036,7 @@ const ActionInitializerItem = (e) => {
                       placeholder: "Search...",
                       className: "search",
                       onClick: N,
-                      onChange: O
+                      onChange: z
                     }
                   ) : c(q) }),
                   /* @__PURE__ */ jsx(
@@ -57057,7 +57057,7 @@ const ActionInitializerItem = (e) => {
                 className: "Tree",
                 onExpand: B,
                 expandedKeys: A,
-                autoExpandParent: z,
+                autoExpandParent: O,
                 treeData: u,
                 onSelect: M,
                 fieldNames: k,
@@ -57469,8 +57469,8 @@ const DataBlockInitializer = (e) => {
       if (f)
         return f(M);
       if (T.template) {
-        const O = yield w(T);
-        y(t ? t(O, { item: T, fromOthersInPopup: N }) : O);
+        const z = yield w(T);
+        y(t ? t(z, { item: T, fromOthersInPopup: N }) : z);
       } else
         o && o({ item: T, fromOthersInPopup: N });
       v(!1);
@@ -57490,7 +57490,7 @@ const DataBlockInitializer = (e) => {
     onClick: k,
     currentText: S,
     otherText: b
-  }), D = useGetSchemaInitializerMenuItems(k), $ = useMemo(() => D(A, i), [D, A, i]), [L, z] = useState([]), j = useMenuSearch({ data: $, openKeys: L, hideSearch: u }), R = useMemo(() => {
+  }), D = useGetSchemaInitializerMenuItems(k), $ = useMemo(() => D(A, i), [D, A, i]), [L, O] = useState([]), j = useMenuSearch({ data: $, openKeys: L, hideSearch: u }), R = useMemo(() => {
     let M = j.filter((T) => T.key !== "search" && T.key !== "empty");
     return p && M.length === 1 ? M = M[0].children : M = j, [
       {
@@ -57508,7 +57508,7 @@ const DataBlockInitializer = (e) => {
     SchemaInitializerMenu,
     {
       onOpenChange: (M) => {
-        z(M);
+        O(M);
       },
       items: R
     }
@@ -61472,25 +61472,24 @@ const mockAPIClient = () => {
   const e = new MockAPIClient(), t = e.mockAdapter();
   return { apiClient: e, mockRequest: t };
 }, PopupContextProvider = (e) => {
-  var u, d;
-  const [t, o] = useState(!1), { visible: n, setVisible: r } = useContext(PopupVisibleProviderContext) || {
+  var p, m;
+  const { visible: t, setVisible: o } = e, [n, r] = useState(!1), { visible: i, setVisible: a } = useContext(PopupVisibleProviderContext) || {
     visible: !1,
     setVisible: () => {
     }
-  }, i = useFieldSchema(), a = useCallback(
-    (p) => {
-      var m;
-      (m = e.setVisible) == null || m.call(e, p), o == null || o(p), r == null || r(p);
+  }, l = useFieldSchema(), c = useCallback(
+    (h) => {
+      o == null || o(h), r == null || r(h), a == null || a(h);
     },
-    [e, r]
-  ), l = ((u = i["x-component-props"]) == null ? void 0 : u.openMode) || "drawer", c = (d = i["x-component-props"]) == null ? void 0 : d.openSize;
+    [o, a]
+  ), u = ((p = l["x-component-props"]) == null ? void 0 : p.openMode) || "drawer", d = (m = l["x-component-props"]) == null ? void 0 : m.openSize;
   return /* @__PURE__ */ jsx(PopupVisibleProvider, { visible: !1, children: /* @__PURE__ */ jsx(
     ActionContextProvider,
     {
-      visible: e.visible || t || n,
-      setVisible: a,
-      openMode: l,
-      openSize: c,
+      visible: t || n || i,
+      setVisible: c,
+      openMode: u,
+      openSize: d,
       children: e.children
     }
   ) });