@nocobase/client 1.5.6 → 1.5.7

package/es/index.mjs

@@ -11,7 +11,7 @@ var Te = (e, t, n) => t in e ? Me(e, t, { enumerable: !0, configurable: !0, writ
       je.call(t, n) && Te(e, n, t[n]);
   return e;
 }, P = (e, t) => $e(e, Be(t));
-var K = (e, t) => {
+var W = (e, t) => {
   var n = {};
   for (var o in e)
     De.call(e, o) && t.indexOf(o) < 0 && (n[o] = e[o]);
@@ -58,7 +58,7 @@ import * as ahooks from "ahooks";
 import { useSetState, useRequest as useRequest$1, useBoolean, useUpdate, useMemoizedFn, useDeepCompareEffect, useLocalStorageState, useEventListener, useCreation, useDebounce } from "ahooks";
 import * as antd from "antd";
 import { notification, Result, Button, Space as Space$1, Radio as Radio$1, Input as Input$3, Tag, Spin, Select as Select$1, theme as theme$1, App, ConfigProvider, message, Popover, Menu as Menu$1, Modal, Typography, Tooltip, Skeleton, Table as Table$3, Drawer as Drawer$1, Slider, Tree as Tree$2, Alert, Flex, Switch, Divider as Divider$1, Empty, DatePicker as DatePicker$1, Card, Collapse, Badge, Dropdown, Cascader as Cascader$1, Image, InputNumber as InputNumber$1, Tabs as Tabs$1, TreeSelect as TreeSelect$2, Upload as Upload$1, Progress, AutoComplete as AutoComplete$1, Checkbox as Checkbox$1, ColorPicker as ColorPicker$1, List as List$1, Col, QRCode, Pagination as Pagination$1, TimePicker as TimePicker$1, Row, Popconfirm, Layout as Layout$1 } from "antd";
-import _, { filter, get, capitalize, cloneDeep as cloneDeep$1, isArray, every, some, findIndex, set, isObject as isObject$1, isEmpty as isEmpty$1, isString, omit, isEqual, concat, last, clone, debounce, castArray, uniqBy, differenceBy, unionBy, isFunction as isFunction$1, isBoolean, uniq as uniq$2, pick as pick$1 } from "lodash";
+import _, { filter, get, capitalize, cloneDeep as cloneDeep$1, isArray, every, some, findIndex, set, isObject as isObject$1, isEmpty as isEmpty$1, isString, omit, isEqual, concat, last, clone, debounce, castArray, uniqBy, differenceBy, unionBy, isFunction as isFunction$1, isBoolean, toString, uniq as uniq$2, pick as pick$1 } from "lodash";
 import template from "lodash/template";
 import React, { createContext, useContext, useMemo, useRef, useEffect, isValidElement, useCallback, memo, useState, Suspense, useDeferredValue, createElement, Fragment as Fragment$1, startTransition, useLayoutEffect, forwardRef, useImperativeHandle, lazy as lazy$1, createRef } from "react";
 import * as ReactRouterDom from "react-router-dom";
@@ -4561,7 +4561,7 @@ function toSchema(e) {
   }) : new Schema(e);
 }
 const useMemoizedSchema = (e) => useMemo(() => toSchema(e), []), SchemaComponentOnChangeContext = createContext({ onChange: _.noop }), RecursionSchemaComponent = memo((e) => {
-  const m = e, { components: t, scope: n, schema: o, distributed: r, onChange: i } = m, a = K(m, ["components", "scope", "schema", "distributed", "onChange"]), l = useContext(SchemaComponentContext), c = useMemo(() => toSchema(o), [o]), u = useMemo(
+  const m = e, { components: t, scope: n, schema: o, distributed: r, onChange: i } = m, a = W(m, ["components", "scope", "schema", "distributed", "onChange"]), l = useContext(SchemaComponentContext), c = useMemo(() => toSchema(o), [o]), u = useMemo(
     () => P(x({}, l), {
       distributed: l.distributed == !1 ? !1 : r,
       /**
@@ -4582,13 +4582,13 @@ const useMemoizedSchema = (e) => useMemo(() => toSchema(e), []), SchemaComponent
 });
 RecursionSchemaComponent.displayName = "RecursionSchemaComponent";
 const MemoizedSchemaComponent = memo((e) => {
-  const r = e, { schema: t } = r, n = K(r, ["schema"]), o = useMemoizedSchema(t);
+  const r = e, { schema: t } = r, n = W(r, ["schema"]), o = useMemoizedSchema(t);
   return /* @__PURE__ */ jsx(RecursionSchemaComponent, P(x({}, n), { schema: o }));
 });
 MemoizedSchemaComponent.displayName = "MemoizedSchemaComponent";
 const SchemaComponent = memo(
   (e) => {
-    const o = e, { memoized: t } = o, n = K(o, ["memoized"]);
+    const o = e, { memoized: t } = o, n = W(o, ["memoized"]);
     return t ? /* @__PURE__ */ jsx(MemoizedSchemaComponent, x({}, n)) : /* @__PURE__ */ jsx(RecursionSchemaComponent, x({}, n));
   }
 );
@@ -6391,7 +6391,7 @@ const DataBlockResourceContext = createContext(null), RerenderDataBlockProvider
   return /* @__PURE__ */ jsx(r.Component, { name: r.name, allowNull: o, children: e.children });
 }, DataBlockProvider = withDynamicSchemaProps(
   React.memo((e) => {
-    const c = e, { collection: t, association: n, dataSource: o, children: r, hidden: i } = c, a = K(c, ["collection", "association", "dataSource", "children", "hidden"]), { dn: l } = useDesignable();
+    const c = e, { collection: t, association: n, dataSource: o, children: r, hidden: i } = c, a = W(c, ["collection", "association", "dataSource", "children", "hidden"]), { dn: l } = useDesignable();
     return i ? null : /* @__PURE__ */ jsx(
       DataBlockContext.Provider,
       {
@@ -8503,7 +8503,7 @@ Object.keys(antIcons).forEach((e) => {
   e.endsWith("Outlined") && registerIcon(e, antIcons[e]);
 });
 const Icon = (e) => {
-  const r = e, { type: t = "", component: n } = r, o = K(r, ["type", "component"]);
+  const r = e, { type: t = "", component: n } = r, o = W(r, ["type", "component"]);
   if (n)
     return /* @__PURE__ */ jsx(antIcons__default, x({ component: n }, o));
   if (t && icons.has(t.toLowerCase())) {
@@ -8575,7 +8575,7 @@ class PluginSettingsManager {
     const o = this.hasAuth(t), r = this.getSetting(t);
     if (n && !o || !r)
       return null;
-    const i = Object.keys(r.children || {}).sort((p, m) => p.localeCompare(m)).map((p) => this.get(r.children[p].name, n)).filter(Boolean).sort((p, m) => (p.sort || 0) - (m.sort || 0)), d = r, { title: a, icon: l, aclSnippet: c } = d, u = K(d, ["title", "icon", "aclSnippet"]);
+    const i = Object.keys(r.children || {}).sort((p, m) => p.localeCompare(m)).map((p) => this.get(r.children[p].name, n)).filter(Boolean).sort((p, m) => (p.sort || 0) - (m.sort || 0)), d = r, { title: a, icon: l, aclSnippet: c } = d, u = W(d, ["title", "icon", "aclSnippet"]);
     return P(x({
       isTopLevel: t === r.topLevelName
     }, u), {
@@ -8603,7 +8603,7 @@ const ApplicationContext = createContext(null);
 ApplicationContext.displayName = "ApplicationContext";
 const AppComponent = observer(
   (n) => {
-    var o = n, { children: e } = o, t = K(o, ["children"]);
+    var o = n, { children: e } = o, t = W(o, ["children"]);
     var l;
     const { app: r } = t, i = useCallback((c, u) => {
       console.error(c);
@@ -8686,7 +8686,7 @@ class RouterManager {
       if (Object.keys(i).length === 1 && i.children)
         r.push(...n(i.children));
       else {
-        const a = i, { Component: l, element: c, children: u } = a, d = K(a, ["Component", "element", "children"]);
+        const a = i, { Component: l, element: c, children: u } = a, d = W(a, ["Component", "element", "children"]);
         let p = c;
         l && (typeof l == "string" ? p = this.app.renderComponent(l) : p = React.createElement(l));
         const m = P(x({}, d), {
@@ -8715,7 +8715,7 @@ class RouterManager {
    * @internal
    */
   getRouterComponent(t) {
-    const u = this.options, { type: n = "browser" } = u, o = K(u, ["type"]), i = {
+    const u = this.options, { type: n = "browser" } = u, o = W(u, ["type"]), i = {
       hash: HashRouter,
       browser: BrowserRouter,
       memory: MemoryRouter
@@ -8861,7 +8861,7 @@ const useNiceDropdownMaxHeight = (e = []) => {
 }, FlagContext = React.createContext(null), FlagProvider = (e) => /* @__PURE__ */ jsx(FlagContext.Provider, { value: e, children: e.children }), useFlag = () => useContext(FlagContext) || {}, { ConfigContext } = ConfigProvider, useConfig = () => useContext(ConfigContext), usePrefixCls = (e, t) => {
   const { getPrefixCls: n } = useContext(ConfigProvider.ConfigContext) || {};
   return "ConfigContext" in ConfigProvider ? (n == null ? void 0 : n(e, t == null ? void 0 : t.prefixCls)) || "" : `ant-${e != null ? e : ""}`;
-}, useToken = () => theme$1.useToken(), loading$1 = (e = "Loading...", t) => q(void 0, null, function* () {
+}, useToken = () => theme$1.useToken(), loading = (e = "Loading...", t) => q(void 0, null, function* () {
   let n = null;
   const o = setTimeout(() => {
     n = message.loading(e);
@@ -9124,7 +9124,7 @@ function withInitializer(e) {
   );
 }
 const SchemaInitializerSubMenuContext = React.createContext({}), SchemaInitializerMenuProvider = (e) => /* @__PURE__ */ jsx(SchemaInitializerSubMenuContext.Provider, { value: { isInMenu: !0 }, children: e.children }), useSchemaInitializerSubMenuContext = () => React.useContext(SchemaInitializerSubMenuContext), SchemaInitializerMenu = (e) => {
-  const { componentCls: t, hashId: n } = useSchemaInitializerStyles(), l = e, { items: o } = l, r = K(l, ["items"]), { token: i } = theme$1.useToken(), a = useMemo(
+  const { componentCls: t, hashId: n } = useSchemaInitializerStyles(), l = e, { items: o } = l, r = W(l, ["items"]), { token: i } = theme$1.useToken(), a = useMemo(
     () => o.map((c) => P(x({}, c), {
       popupClassName: `${n} ${t}-menu-sub`
     })),
@@ -9173,7 +9173,7 @@ const SchemaInitializerSubMenuContext = React.createContext({}), SchemaInitializ
   ) });
 }, SchemaInitializerSubMenu = (e) => {
   var f;
-  const g = e, { children: t, items: n, title: o, name: r, onOpenChange: i, icon: a } = g, l = K(g, ["children", "items", "title", "name", "onOpenChange", "icon"]), c = useCompile(), u = useSchemaInitializerItem(), d = useMemo(() => r || (u == null ? void 0 : u.name) || uid(), [r, u]), p = (f = n || t) == null ? void 0 : f.filter((C) => C.useVisible ? C.useVisible() : !0), m = useSchemaInitializerMenuItems(p, r), h = useMemo(() => [
+  const g = e, { children: t, items: n, title: o, name: r, onOpenChange: i, icon: a } = g, l = W(g, ["children", "items", "title", "name", "onOpenChange", "icon"]), c = useCompile(), u = useSchemaInitializerItem(), d = useMemo(() => r || (u == null ? void 0 : u.name) || uid(), [r, u]), p = (f = n || t) == null ? void 0 : f.filter((C) => C.useVisible ? C.useVisible() : !0), m = useSchemaInitializerMenuItems(p, r), h = useMemo(() => [
     P(x({}, l), {
       key: d,
       label: c(o),
@@ -9290,10 +9290,10 @@ const designableStyle = {
     }
   ) });
 }, WithForm$1 = (e) => {
-  const c = e, { children: t, form: n } = c, o = K(c, ["children", "form"]), r = useContext(SchemaOptionsContext), i = useContext(SchemaExpressionScopeContext), a = x(x({}, r == null ? void 0 : r.scope), i), l = x({}, r == null ? void 0 : r.components);
+  const c = e, { children: t, form: n } = c, o = W(c, ["children", "form"]), r = useContext(SchemaOptionsContext), i = useContext(SchemaExpressionScopeContext), a = x(x({}, r == null ? void 0 : r.scope), i), l = x({}, r == null ? void 0 : r.components);
   return /* @__PURE__ */ jsx(FormProvider$1, P(x({}, o), { form: n, children: /* @__PURE__ */ jsx(SchemaComponentOptions, { components: l, scope: a, children: t }) }));
 }, WithoutForm$1 = (e) => {
-  const c = e, { children: t } = c, n = K(c, ["children"]), o = useContext(SchemaOptionsContext), r = useContext(SchemaExpressionScopeContext), i = x(x({}, o == null ? void 0 : o.scope), r), a = x({}, o == null ? void 0 : o.components), l = useMemo(() => createForm(), []);
+  const c = e, { children: t } = c, n = W(c, ["children"]), o = useContext(SchemaOptionsContext), r = useContext(SchemaExpressionScopeContext), i = x(x({}, o == null ? void 0 : o.scope), r), a = x({}, o == null ? void 0 : o.components), l = useMemo(() => createForm(), []);
   return /* @__PURE__ */ jsx(FormProvider$1, P(x({}, n), { form: l, children: /* @__PURE__ */ jsx(SchemaComponentOptions, { components: a, scope: i, children: t }) }));
 }, FormProvider = (e) => e.form ? /* @__PURE__ */ jsx(WithForm$1, x({}, e)) : /* @__PURE__ */ jsx(WithoutForm$1, x({}, e)), CollectionHistoryContext = createContext({
   historyCollections: [],
@@ -9709,7 +9709,7 @@ class SchemaComponentPlugin extends Plugin {
   }
 }
 const TabsContext = React.createContext({}), TabsContextProvider = (n) => {
-  var o = n, { children: e } = o, t = K(o, ["children"]);
+  var o = n, { children: e } = o, t = W(o, ["children"]);
   return /* @__PURE__ */ jsx(TabsContext.Provider, { value: t, children: e });
 }, useTabsContext = () => React.useContext(TabsContext), PopupSettingsContext = React.createContext({
   enableURL: !0
@@ -10183,7 +10183,7 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
   var m, g, f, C, b, S;
   const { token: t } = useToken(), n = (m = e["data-row-key"]) == null ? void 0 : m.toString(), { setNodeRef: o, isOver: r, active: i, over: a } = useSortable({
     id: n
-  }), h = e, { rowIndex: l } = h, c = K(h, ["rowIndex"]), u = useMemo(() => {
+  }), h = e, { rowIndex: l } = h, c = W(h, ["rowIndex"]), u = useMemo(() => {
     const y = new TinyColor(t.colorSettings).setAlpha(0.6).toHex8String();
     return {
       topActiveClass: css`
@@ -10209,12 +10209,12 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
     })
   );
 }, SortHandle$2 = (e) => {
-  const i = e, { id: t } = i, n = K(i, ["id"]), { listeners: o, setNodeRef: r } = useSortable({
+  const i = e, { id: t } = i, n = W(i, ["id"]), { listeners: o, setNodeRef: r } = useSortable({
     id: t
   });
   return /* @__PURE__ */ jsx(MenuOutlined, P(x(x({ ref: r }, n), o), { style: { cursor: "grab" } }));
 }, TableIndex$3 = (e) => {
-  const o = e, { index: t } = o, n = K(o, ["index"]);
+  const o = e, { index: t } = o, n = W(o, ["index"]);
   return /* @__PURE__ */ jsx("div", P(x({ className: cls("nb-table-index"), style: { padding: "0 8px 0 16px" } }, n), { children: t }));
 }, pageSizeOptions$3 = [5, 10, 20, 50, 100, 200], usePaginationProps$3 = (e, t, n) => {
   var S, y, v, F, I, R;
@@ -10342,7 +10342,7 @@ const BodyRowComponent$1 = React.memo((e) => {
 });
 BodyRowComponent$1.displayName = "BodyRowComponent";
 const InternalBodyCellComponent$1 = React.memo((e) => {
-  const p = e, { record: t, schema: n, rowIndex: o, isSubTable: r } = p, i = K(p, ["record", "schema", "rowIndex", "isSubTable"]), a = n == null ? void 0 : n[LinkageRuleDataKeyMap.style], [l, c] = useState({}), u = !!(n != null && n.properties) && Object.values(n.properties).some((m) => m["x-read-pretty"] === !0), d = useMemo(() => x(x({}, e.style), l), [e.style, l]);
+  const p = e, { record: t, schema: n, rowIndex: o, isSubTable: r } = p, i = W(p, ["record", "schema", "rowIndex", "isSubTable"]), a = n == null ? void 0 : n[LinkageRuleDataKeyMap.style], [l, c] = useState({}), u = !!(n != null && n.properties) && Object.values(n.properties).some((m) => m["x-read-pretty"] === !0), d = useMemo(() => x(x({}, e.style), l), [e.style, l]);
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     !_.isEmpty(a) && /* @__PURE__ */ jsx(GetStyleRules, { record: t, schema: n, onStyleChange: u ? c : _.noop }),
     /* @__PURE__ */ jsx("td", P(x({}, i), { className: cls(e.className, cellClass$1), style: d, children: e.children }))
@@ -10371,7 +10371,7 @@ const TableElementRefContext = createContext(null), useTableElementRef = () => u
       columns: m,
       expandable: h,
       field: g
-    } = y, f = K(y, [
+    } = y, f = W(y, [
       "tableHeight",
       "SortableWrapper",
       "tableSizeRefCallback",
@@ -10465,7 +10465,7 @@ const Table$2 = withDynamicSchemaProps(
   withSkeletonComponent(
     observer$1((e) => {
       var ce, Ce;
-      const { token: t } = useToken(), me = omit(e, ["onBlur", "onFocus"]), { pagination: n, useProps: o } = me, r = K(me, ["pagination", "useProps"]), he = (o == null ? void 0 : o()) || {}, { pagination: i } = he, a = K(he, ["pagination"]), ge = x(x({}, r), a), {
+      const { token: t } = useToken(), me = omit(e, ["onBlur", "onFocus"]), { pagination: n, useProps: o } = me, r = W(me, ["pagination", "useProps"]), he = (o == null ? void 0 : o()) || {}, { pagination: i } = he, a = W(he, ["pagination"]), ge = x(x({}, r), a), {
         dragSort: l = !1,
         showIndex: c = !0,
         onRowSelectionChange: u,
@@ -10477,7 +10477,7 @@ const Table$2 = withDynamicSchemaProps(
         loading: f,
         onClickRow: C,
         value: b
-      } = ge, S = K(ge, [
+      } = ge, S = W(ge, [
         "dragSort",
         "showIndex",
         "onRowSelectionChange",
@@ -10490,14 +10490,14 @@ const Table$2 = withDynamicSchemaProps(
         "onClickRow",
         "value"
       ]), y = useArrayField$1(S), v = useFieldSchema(), { size: F = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, I = useCollection(), k = ((ce = v == null ? void 0 : v.parent) == null ? void 0 : ce["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: M } = k, z = useMemoizedFn(S.onRowDragEnd || (() => {
-      })), L = usePaginationProps$3(n, i, e), $ = useTableColumns$2(S, L), [w, B] = useState(() => D ? M : []), [j, T] = useState(((Ce = y == null ? void 0 : y.data) == null ? void 0 : Ce.selectedRowKeys) || []), [N, O] = useState([]), V = (p == null ? void 0 : p.type) !== "none", E = useRef(/* @__PURE__ */ new Map()), U = useMemo(() => css`
+      })), L = usePaginationProps$3(n, i, e), $ = useTableColumns$2(S, L), [w, B] = useState(() => D ? M : []), [j, T] = useState(((Ce = y == null ? void 0 : y.data) == null ? void 0 : Ce.selectedRowKeys) || []), [N, O] = useState([]), V = (p == null ? void 0 : p.type) !== "none", E = useRef(/* @__PURE__ */ new Map()), G = useMemo(() => css`
           & > td {
             background-color: ${t.controlItemBgActive} !important;
           }
           &:hover > td {
             background-color: ${t.controlItemBgActiveHover} !important;
           }
-        `, [t.controlItemBgActive, t.controlItemBgActiveHover]), G = useMemo(() => C ? U : "", [U, C]), H = useMemo(() => C ? (re, ee) => ({
+        `, [t.controlItemBgActive, t.controlItemBgActiveHover]), U = useMemo(() => C ? G : "", [G, C]), H = useMemo(() => C ? (re, ee) => ({
         onClick: (ne) => {
           isPortalInBody(ne.target) || C(re, O, N);
         },
@@ -10511,7 +10511,7 @@ const Table$2 = withDynamicSchemaProps(
         const re = D ? M : [];
         _.isEqual(re, w) || B(re);
       }, [D, M]);
-      const W = useCallback((re) => {
+      const K = useCallback((re) => {
         if (m)
           return Y(re);
         if (re.key)
@@ -10526,9 +10526,9 @@ const Table$2 = withDynamicSchemaProps(
           return Array.isArray(m) ? m.map((ne) => {
             var se;
             return ((se = re[ne]) == null ? void 0 : se.toString()) || "";
-          }).join("-") : typeof m == "string" ? re[m] : (ee = (m != null ? m : W)(re)) == null ? void 0 : ee.toString();
+          }).join("-") : typeof m == "string" ? re[m] : (ee = (m != null ? m : K)(re)) == null ? void 0 : ee.toString();
         },
-        [JSON.stringify(m), W]
+        [JSON.stringify(m), K]
       ), J = useMemo(() => (Array.isArray(b) ? b : []).filter(Boolean), [b, b == null ? void 0 : b.length]), X = useMemo(() => (re) => {
         const ee = useCallback((ne) => {
           var Ie, Se, ye, ve, Pe, Fe;
@@ -10628,8 +10628,8 @@ const Table$2 = withDynamicSchemaProps(
         x: "max-content",
         y: ie
       }), [ie, J]), xe = useCallback(
-        (re) => N.includes(re[m]) ? G : "",
-        [N, G, JSON.stringify(m)]
+        (re) => N.includes(re[m]) ? U : "",
+        [N, U, JSON.stringify(m)]
       ), pe = useCallback(
         (re, ee) => {
           const ne = re ? [...w, ee[I.getPrimaryKey()]] : w.filter((se) => ee[I.getPrimaryKey()] !== se);
@@ -10649,7 +10649,7 @@ const Table$2 = withDynamicSchemaProps(
             tableHeight: ie,
             SortableWrapper: te,
             tableSizeRefCallback: ae,
-            defaultRowKey: W,
+            defaultRowKey: K,
             dataSource: J
           }, S), oe), {
             paginationProps: L,
@@ -10780,15 +10780,14 @@ const InternalTableBlockProvider = (e) => {
   return c ? null : /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: { treeTable: a }, children: /* @__PURE__ */ jsx(FormContext.Provider, { value: d, children: /* @__PURE__ */ jsx(BlockProvider, P(x({ name: e.name || "table" }, e), { params: l, runWhenParamsChanged: !0, children: /* @__PURE__ */ jsx(InternalTableBlockProvider, P(x({}, e), { childrenColumnName: u, params: l })) })) }) });
 }), useTableBlockContext = () => useContext(TableBlockContext), useTableBlockContextBasicValue = () => useContext(TableBlockContextBasicValue), ActionContext = createContext({});
 ActionContext.displayName = "ActionContext";
-let loading = !1;
 const ActionContextProvider = React.memo(
   (e) => {
     const [t, n] = useState(!1), { visible: o } = x(x({}, e), e.value), { setSubmitted: r } = x(x({}, e), e.value), i = useBlockServiceInActionButton(), a = useIsSubPageClosedByPageMenu(useFieldSchema());
-    useEffect(() => (q(void 0, null, function* () {
-      o === !1 && i && !loading && (t || a) && (loading = !0, yield i.refreshAsync(), loading = !1, r == null || r(!0));
-    }), () => {
-      n(!1);
-    }), [o, i == null ? void 0 : i.refresh, r, a]);
+    useEffect(() => {
+      q(void 0, null, function* () {
+        o === !1 && i && !i.loading && (t || a) && (i.loading = !0, yield i.refreshAsync(), i.loading = !1, n(!1), r == null || r(!0));
+      });
+    }, [o, i == null ? void 0 : i.refresh, r, a]);
     const l = useMemo(() => P(x(x({}, e), e == null ? void 0 : e.value), { submitted: t, setSubmitted: n }), [e, t]);
     return /* @__PURE__ */ jsx(ActionContext.Provider, { value: l, children: e.children });
   }
@@ -10908,15 +10907,15 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
         return I == null ? void 0 : I(!0);
       const O = N || o, V = O == null ? void 0 : O["x-uid"], E = y(B);
       w = w || (i == null ? void 0 : i.data);
-      const U = R({
+      const G = R({
         popupUid: V,
         recordData: w,
         sourceId: E,
         collection: j,
         puid: T
       });
-      let G = n.pathname;
-      if (_.last(G) === "/" && (G = G.slice(0, -1)), storePopupContext(V, {
+      let U = n.pathname;
+      if (_.last(U) === "/" && (U = U.slice(0, -1)), storePopupContext(V, {
         schema: O,
         record: new CollectionRecord({ isNew: !1, data: w }),
         parentRecord: B ? new CollectionRecord({ isNew: !1, data: B }) : a,
@@ -10930,7 +10929,7 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
         const H = h + 1;
         if (getPopupLayerState(H))
           return;
-        t(withSearchParams(`${G}${U}`)), setPopupLayerState(H, !0);
+        t(withSearchParams(`${U}${G}`)), setPopupLayerState(H, !0);
       } else
         console.error(
           `[NocoBase] The popup schema is invalid, please check the schema: 
@@ -11427,7 +11426,7 @@ const DrawerErrorFallback = (e) => {
 ActionDrawerContent.displayName = "ActionDrawerContent";
 const InternalActionDrawer = observer$1(
   (e) => {
-    const F = e, { footerNodeName: t = "Action.Drawer.Footer", zIndex: n, onClose: o } = F, r = K(F, ["footerNodeName", "zIndex", "onClose"]), { visible: i, setVisible: a, openSize: l = "middle", drawerProps: c } = useActionContext(), u = useFieldSchema(), d = useField(), { componentCls: p, hashId: m } = useStyles$h(), h = useTabsContext(), g = useZIndexContext(), f = u.reduceProperties((I, R) => R["x-component"] === t ? R : I), { hidden: C } = useCurrentPopupContext(), b = useMemo(() => P(x(x({}, c == null ? void 0 : c.style), r == null ? void 0 : r.style), {
+    const F = e, { footerNodeName: t = "Action.Drawer.Footer", zIndex: n, onClose: o } = F, r = W(F, ["footerNodeName", "zIndex", "onClose"]), { visible: i, setVisible: a, openSize: l = "middle", drawerProps: c } = useActionContext(), u = useFieldSchema(), d = useField(), { componentCls: p, hashId: m } = useStyles$h(), h = useTabsContext(), g = useZIndexContext(), f = u.reduceProperties((I, R) => R["x-component"] === t ? R : I), { hidden: C } = useCurrentPopupContext(), b = useMemo(() => P(x(x({}, c == null ? void 0 : c.style), r == null ? void 0 : r.style), {
       display: C ? "none" : "block"
     }), [C, c == null ? void 0 : c.style, r == null ? void 0 : r.style]), S = n || g + (e.level || 0), y = useCallback(
       (I) => {
@@ -11506,7 +11505,7 @@ const useGetAriaLabelOfModal = () => {
   }
 ), InternalActionModal = observer$1(
   (e) => {
-    const v = e, { footerNodeName: t = "Action.Modal.Footer", width: n, zIndex: o } = v, r = K(v, ["footerNodeName", "width", "zIndex"]), { visible: i, setVisible: a, openSize: l = "middle", modalProps: c } = useActionContext(), u = n != null ? n : openSizeWidthMap.get(l), d = useFieldSchema(), p = useField(), { token: m } = useToken$1(), h = useTabsContext(), g = useZIndexContext(), f = d.reduceProperties((F, I) => I["x-component"] === t ? I : F), { hidden: C } = useCurrentPopupContext(), b = useMemo(() => ({
+    const v = e, { footerNodeName: t = "Action.Modal.Footer", width: n, zIndex: o } = v, r = W(v, ["footerNodeName", "width", "zIndex"]), { visible: i, setVisible: a, openSize: l = "middle", modalProps: c } = useActionContext(), u = n != null ? n : openSizeWidthMap.get(l), d = useFieldSchema(), p = useField(), { token: m } = useToken$1(), h = useTabsContext(), g = useZIndexContext(), f = d.reduceProperties((F, I) => I["x-component"] === t ? I : F), { hidden: C } = useCurrentPopupContext(), b = useMemo(() => ({
       mask: {
         display: C ? "none" : "block"
       },
@@ -11608,7 +11607,7 @@ const CurrentPopupRecordContext = React.createContext(null), CurrentParentPopupR
 });
 VariablePopupRecordProvider.displayName = "VariablePopupRecordProvider";
 const useCurrentPopupRecord = () => React.useContext(CurrentPopupRecordContext), useParentPopupRecord = () => React.useContext(CurrentParentPopupRecordContext), useDef$3 = () => ({}), useProps = (e = {}) => {
-  const i = e, { useProps: t = useDef$3 } = i, n = K(i, ["useProps"]);
+  const i = e, { useProps: t = useDef$3 } = i, n = W(i, ["useProps"]);
   let o = t;
   typeof t != "function" && (o = useDef$3);
   const r = o();
@@ -11630,7 +11629,7 @@ ActionContainer.Footer = observer$1(
 const SchemaToolbarContext = createContext({});
 SchemaToolbarContext.displayName = "SchemaToolbarContext";
 const SchemaToolbarProvider = (e) => {
-  const o = e, { children: t } = o, n = K(o, ["children"]);
+  const o = e, { children: t } = o, n = W(o, ["children"]);
   return /* @__PURE__ */ jsx(SchemaToolbarContext.Provider, { value: n, children: t });
 };
 function useSchemaToolbar() {
@@ -14376,7 +14375,7 @@ const useFormItemInitializerFields = (e) => {
     template: a,
     settings: l,
     action: c = "list"
-  } = m, u = K(m, [
+  } = m, u = W(m, [
     "formItemInitializers",
     "actionInitializers",
     "collection",
@@ -14452,7 +14451,7 @@ const useFormItemInitializerFields = (e) => {
     template: d,
     title: p,
     settings: m
-  } = C, h = K(C, [
+  } = C, h = W(C, [
     "formItemInitializers",
     "actionInitializers",
     "collection",
@@ -14524,7 +14523,7 @@ const useFormItemInitializerFields = (e) => {
     resource: a,
     template: l,
     settings: c
-  } = m, u = K(m, [
+  } = m, u = W(m, [
     "formItemInitializers",
     "actionInitializers",
     "collection",
@@ -14590,7 +14589,7 @@ const useFormItemInitializerFields = (e) => {
     dataSource: c,
     blockType: u,
     pageSize: d = 20
-  } = h, p = K(h, [
+  } = h, p = W(h, [
     "collection",
     "rowKey",
     "tableActionInitializers",
@@ -15157,10 +15156,10 @@ const useGetAriaLabelOfDesigner = () => {
     o || (t == null ? void 0 : t["x-initializer"]),
     t == null ? void 0 : t["x-initializer-props"]
   ), B = useGridRowContext(), j = useGridContext(), T = useMemo(() => {
-    var W;
+    var K;
     return {
       insertPosition: "afterEnd",
-      wrap: ((W = B == null ? void 0 : B.cols) == null ? void 0 : W.length) === 1 ? gridRowColWrap : void 0,
+      wrap: ((K = B == null ? void 0 : B.cols) == null ? void 0 : K.length) === 1 ? gridRowColWrap : void 0,
       Component: (Y) => /* @__PURE__ */ jsx(
         PlusOutlined,
         P(x({}, Y), {
@@ -15171,34 +15170,34 @@ const useGetAriaLabelOfDesigner = () => {
       )
     };
   }, [y, (H = B == null ? void 0 : B.cols) == null ? void 0 : H.length]), N = useMemo(() => u === !1 || f === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": y("drag-handler") }) }), [u, y, f]), O = useMemo(() => {
-    var W;
+    var K;
     if (o === !1)
       return null;
     if (w)
       return $(T);
     if (j != null && j.InitializerComponent || j != null && j.renderSchemaInitializer)
-      return j != null && j.InitializerComponent ? /* @__PURE__ */ jsx(j.InitializerComponent, x({}, T)) : (W = j.renderSchemaInitializer) == null ? void 0 : W.call(j, T);
-  }, [j, o, T, w, $]), V = useMemo(() => r !== !1 && L ? z() : null, [L, z, r]), E = useRef(null), U = "hidden";
+      return j != null && j.InitializerComponent ? /* @__PURE__ */ jsx(j.InitializerComponent, x({}, T)) : (K = j.renderSchemaInitializer) == null ? void 0 : K.call(j, T);
+  }, [j, o, T, w, $]), V = useMemo(() => r !== !1 && L ? z() : null, [L, z, r]), E = useRef(null), G = "hidden";
   useEffect(() => {
-    const W = E.current;
-    let Y = W == null ? void 0 : W.parentElement;
+    const K = E.current;
+    let Y = K == null ? void 0 : K.parentElement;
     for (; Y && Y.clientHeight === 0; )
       Y = Y.parentElement;
     if (!Y)
       return;
     function J() {
       var Z;
-      W && (W.classList.remove(U), (Z = e.onVisibleChange) == null || Z.call(e, !0));
+      K && (K.classList.remove(G), (Z = e.onVisibleChange) == null || Z.call(e, !0));
     }
     function X() {
       var Z;
-      W && (W.classList.add(U), (Z = e.onVisibleChange) == null || Z.call(e, !1));
+      K && (K.classList.add(G), (Z = e.onVisibleChange) == null || Z.call(e, !1));
     }
     return window.getComputedStyle(Y).position === "static" && (Y.style.position = "relative"), Y.addEventListener("mouseenter", J), Y.addEventListener("mouseleave", X), () => {
       Y.removeEventListener("mouseenter", J), Y.removeEventListener("mouseleave", X);
     };
   }, [e.onVisibleChange]);
-  const G = useMemo(
+  const U = useMemo(
     () => x({
       border: c ? "auto" : 0,
       background: i ? "auto" : 0
@@ -15209,8 +15208,8 @@ const useGetAriaLabelOfDesigner = () => {
     "div",
     {
       ref: E,
-      className: cls(C, b, m, "schema-toolbar", U),
-      style: G,
+      className: cls(C, b, m, "schema-toolbar", G),
+      style: U,
       children: [
         M && /* @__PURE__ */ jsx("div", { className: "toolbar-title", children: /* @__PURE__ */ jsxs(Space$1, { size: 2, children: [
           /* @__PURE__ */ jsx("span", { className: "toolbar-title-tag", children: R ? `${g(R == null ? void 0 : R.displayName)} > ${M[0]}` : M[0] }, M[0]),
@@ -15983,7 +15982,7 @@ function RemoveButton(e = {}) {
   ] });
 }
 function WorkflowSelect(r) {
-  var i = r, { formAction: e, buttonAction: t, actionType: n } = i, o = K(i, ["formAction", "buttonAction", "actionType"]);
+  var i = r, { formAction: e, buttonAction: t, actionType: n } = i, o = W(i, ["formAction", "buttonAction", "actionType"]);
   const { t: a } = useTranslation(), l = ArrayTable.useIndex(), { setValuesIn: c } = useForm(), u = useCollection_deprecated(), { getCollection: d } = useCollectionManager_deprecated(), p = useDataSourceKey(), [m, h] = useState(joinCollectionName(p, u.name)), g = useCompile(), f = usePlugin("workflow"), C = f.useTriggersOptions(), b = useMemo(
     () => C.filter((y) => typeof y.options.isActionTriggerable == "function" || y.options.isActionTriggerable === !0).map((y) => y.value),
     [C]
@@ -16466,7 +16465,7 @@ const actionSettings = new SchemaSettings({
     linkageRulesProps: i,
     schemaSettings: a = "ActionSettings",
     enableDrag: l = !0
-  } = f, c = K(f, [
+  } = f, c = W(f, [
     "modalTip",
     "linkageAction",
     "removeButtonProps",
@@ -16574,7 +16573,7 @@ const ActionLink = withDynamicSchemaProps(
   }
 }), handleError = console.log, Action = withDynamicSchemaProps(
   React.memo((e) => {
-    var U;
+    var G;
     const E = useProps(e), {
       popover: t,
       containerRefKey: n,
@@ -16594,7 +16593,7 @@ const ActionLink = withDynamicSchemaProps(
       onMouseEnter: C,
       refreshDataBlockRequest: b,
       confirmTitle: S
-    } = E, y = K(E, [
+    } = E, y = W(E, [
       "popover",
       "containerRefKey",
       "component",
@@ -16614,15 +16613,15 @@ const ActionLink = withDynamicSchemaProps(
       "onMouseEnter",
       "refreshDataBlockRequest",
       "confirmTitle"
-    ]), v = useDesigner(), F = useField(), I = useFieldSchema(), R = useCompile(), k = useCollectionRecordData(), D = R((U = I["x-component-props"]) == null ? void 0 : U.confirm) || g, M = useMemo(() => (I == null ? void 0 : I["x-linkage-rules"]) || [], [I == null ? void 0 : I["x-linkage-rules"]]), { designable: z } = useDesignable(), L = useComponent(o) || o, $ = useVariables$1(), w = useLocalVariables$1({ currentForm: { values: k, readPretty: !1 } }), { visibleWithURL: B, setVisibleWithURL: j } = usePopupUtils(), { setSubmitted: T } = useActionContext(), { getAriaLabel: N } = useGetAriaLabelOfAction(l), O = useCollectionParentRecordData();
+    ]), v = useDesigner(), F = useField(), I = useFieldSchema(), R = useCompile(), k = useCollectionRecordData(), D = R((G = I["x-component-props"]) == null ? void 0 : G.confirm) || g, M = useMemo(() => (I == null ? void 0 : I["x-linkage-rules"]) || [], [I == null ? void 0 : I["x-linkage-rules"]]), { designable: z } = useDesignable(), L = useComponent(o) || o, $ = useVariables$1(), w = useLocalVariables$1({ currentForm: { values: k, readPretty: !1 } }), { visibleWithURL: B, setVisibleWithURL: j } = usePopupUtils(), { setSubmitted: T } = useActionContext(), { getAriaLabel: N } = useGetAriaLabelOfAction(l), O = useCollectionParentRecordData();
     useEffect(() => {
-      F.stateOfLinkageRules && setInitialActionState(F), F.stateOfLinkageRules = {}, M.filter((G) => !G.disabled).forEach((G) => {
+      F.stateOfLinkageRules && setInitialActionState(F), F.stateOfLinkageRules = {}, M.filter((U) => !U.disabled).forEach((U) => {
         var H;
-        (H = G.actions) == null || H.forEach((W) => {
+        (H = U.actions) == null || H.forEach((K) => {
           linkageAction({
-            operator: W.operator,
+            operator: K.operator,
             field: F,
-            condition: G.condition,
+            condition: U.condition,
             variables: $,
             localVariables: w
           });
@@ -16630,8 +16629,8 @@ const ActionLink = withDynamicSchemaProps(
       });
     }, [F, M, w, $]);
     const V = useCallback(
-      (G) => {
-        C == null || C(G);
+      (U) => {
+        C == null || C(U);
       },
       [C]
     );
@@ -16699,7 +16698,7 @@ const ActionLink = withDynamicSchemaProps(
     setSubmitted: M,
     getAriaLabel: z,
     parentRecordData: L
-  } = xe, $ = K(xe, [
+  } = xe, $ = W(xe, [
     "containerRefKey",
     "fieldSchema",
     "designable",
@@ -16727,7 +16726,7 @@ const ActionLink = withDynamicSchemaProps(
     "setSubmitted",
     "getAriaLabel",
     "parentRecordData"
-  ]), [w, B] = useState(!1), { wrapSSR: j, componentCls: T, hashId: N } = useStyles$e(), [O, V] = useState(!1), E = o["x-toolbar-props"] || o["x-designer-props"], U = (pe = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : pe.openMode, G = (fe = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : fe.openSize, H = (me = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : me.refreshDataBlockRequest, { modal: W } = App.useApp(), Y = useForm(), J = useACLActionParamsContext(), { run: X, element: Q, disabled: Z } = (I == null ? void 0 : I(R)) || {}, oe = Y.disabled || i.disabled || ((he = i.data) == null ? void 0 : he.disabled) || F || Z, te = useMemo(() => {
+  ]), [w, B] = useState(!1), { wrapSSR: j, componentCls: T, hashId: N } = useStyles$e(), [O, V] = useState(!1), E = o["x-toolbar-props"] || o["x-designer-props"], G = (pe = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : pe.openMode, U = (fe = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : fe.openSize, H = (me = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : me.refreshDataBlockRequest, { modal: K } = App.useApp(), Y = useForm(), J = useACLActionParamsContext(), { run: X, element: Q, disabled: Z } = (I == null ? void 0 : I(R)) || {}, oe = Y.disabled || i.disabled || ((he = i.data) == null ? void 0 : he.disabled) || F || Z, te = useMemo(() => {
     var ce;
     return P(x({}, v), {
       opacity: r && (((ce = i == null ? void 0 : i.data) == null ? void 0 : ce.hidden) || !J) && 0.1,
@@ -16757,7 +16756,7 @@ const ActionLink = withDynamicSchemaProps(
     setVisible: B,
     run: X,
     confirm: g,
-    modal: W,
+    modal: K,
     setSubmitted: M,
     confirmTitle: f,
     title: y
@@ -16775,8 +16774,8 @@ const ActionLink = withDynamicSchemaProps(
       setVisible: ae,
       formValueChanged: O,
       setFormValueChanged: V,
-      openMode: U,
-      openSize: G,
+      openMode: G,
+      openSize: U,
       containerRefKey: n,
       fieldSchema: o,
       setSubmitted: M,
@@ -16946,7 +16945,7 @@ const RenderButtonInner = observer$1(
       Designer: C,
       designerProps: b,
       title: S
-    } = F, y = K(F, [
+    } = F, y = W(F, [
       "designable",
       "field",
       "aclCtx",
@@ -16996,14 +16995,14 @@ RenderButtonInner.displayName = "RenderButtonInner";
 const ActionBarContext = React.createContext({
   container: null
 }), ActionBarProvider = (n) => {
-  var o = n, { children: e } = o, t = K(o, ["children"]);
+  var o = n, { children: e } = o, t = W(o, ["children"]);
   return /* @__PURE__ */ jsx(ActionBarContext.Provider, { value: t, children: e });
 }, useActionBarContext = () => useContext(ActionBarContext), Portal = (e) => {
   const t = useFieldSchema(), { container: n, parentComponents: o = ["BlockItem", "CardItem"] } = useActionBarContext();
   return /* @__PURE__ */ jsx(Fragment, { children: n && o.includes(t.parent["x-component"]) ? createPortal(e.children, n) : e.children });
 }, InternalActionBar = (e) => {
   var p;
-  const { forceProps: t = {} } = useActionBarContext(), d = x(x({}, useProps(e)), t), { layout: n = "two-columns", style: o, spaceProps: r } = d, i = K(d, ["layout", "style", "spaceProps"]), a = useFieldSchema(), { render: l } = useSchemaInitializerRender(a["x-initializer"], a["x-initializer-props"]), { designable: c } = useDesignable();
+  const { forceProps: t = {} } = useActionBarContext(), d = x(x({}, useProps(e)), t), { layout: n = "two-columns", style: o, spaceProps: r } = d, i = W(d, ["layout", "style", "spaceProps"]), a = useFieldSchema(), { render: l } = useSchemaInitializerRender(a["x-initializer"], a["x-initializer-props"]), { designable: c } = useDesignable();
   if (n === "one-column")
     return /* @__PURE__ */ jsx(Portal, { children: /* @__PURE__ */ jsx(DndContext, { children: /* @__PURE__ */ jsxs(
       "div",
@@ -17214,7 +17213,7 @@ const SchemaInitializerItemInternal = () => {
   const e = useSchemaInitializerItem();
   return /* @__PURE__ */ jsx(SchemaInitializerItem, x({}, e));
 }, switchStyle = { marginLeft: 20 }, itemStyle = { display: "flex", alignItems: "center", justifyContent: "space-between" }, SchemaInitializerSwitch = (e) => {
-  const i = e, { title: t, checked: n } = i, o = K(i, ["title", "checked"]), r = useCompile();
+  const i = e, { title: t, checked: n } = i, o = W(i, ["title", "checked"]), r = useCompile();
   return /* @__PURE__ */ jsx(SchemaInitializerItem, P(x({}, o), { closeInitializerMenuWhenClick: !1, children: /* @__PURE__ */ jsxs("div", { style: itemStyle, children: [
     r(t),
     /* @__PURE__ */ jsx(Switch, { disabled: e.disabled, style: switchStyle, size: "small", checked: n })
@@ -17246,7 +17245,7 @@ const SchemaInitializerItemInternal = () => {
     hideIfNoChildren: c,
     componentProps: u,
     sort: d
-  } = F, p = K(F, [
+  } = F, p = W(F, [
     "type",
     "Component",
     "component",
@@ -17378,7 +17377,7 @@ const useMenuSearch$1 = (e) => {
   const { items: t } = e;
   return t.length === 0 ? null : /* @__PURE__ */ jsx(SchemaInitializerChildren, { children: t });
 }, SchemaInitializerActionModalItemComponent = React.forwardRef((e, t) => {
-  const r = e, { onClick: n } = r, o = K(r, ["onClick"]);
+  const r = e, { onClick: n } = r, o = W(r, ["onClick"]);
   return /* @__PURE__ */ jsx(SchemaInitializerItem, P(x({ ref: t }, o), { onClick: (i) => n == null ? void 0 : n(i.event, !1) }));
 }), SchemaInitializerActionModal = (e) => {
   const { title: t, icon: n, width: o, schema: r, buttonText: i, btnStyles: a, isItem: l, component: c, onCancel: u, onSubmit: d } = e, { setVisible: p } = useSchemaInitializer(), m = useCallback(() => {
@@ -17476,7 +17475,7 @@ const useMenuSearch$1 = (e) => {
   const e = useSchemaInitializerItem();
   return /* @__PURE__ */ jsx(SchemaInitializerActionModal, x({}, e));
 }, SchemaInitializerSelect = (e) => {
-  const h = e, { title: t, options: n, value: o, onChange: r, openOnHover: i, onClick: a } = h, l = K(h, ["title", "options", "value", "onChange", "openOnHover", "onClick"]), [c, u] = useState(!1), d = useCallback(
+  const h = e, { title: t, options: n, value: o, onChange: r, openOnHover: i, onClick: a } = h, l = W(h, ["title", "options", "value", "onChange", "openOnHover", "onClick"]), [c, u] = useState(!1), d = useCallback(
     (...g) => {
       u(!1), a == null || a(...g);
     },
@@ -17541,7 +17540,7 @@ const useMenuSearch$1 = (e) => {
     [e, t]
   ) };
 }, SchemaInitializerButton = React.memo((e) => {
-  const a = e, { style: t, options: n } = a, o = K(a, ["style", "options"]), r = useCompile(), { getAriaLabel: i } = useGetAriaLabelOfSchemaInitializer();
+  const a = e, { style: t, options: n } = a, o = W(a, ["style", "options"]), r = useCompile(), { getAriaLabel: i } = useGetAriaLabelOfSchemaInitializer();
   return /* @__PURE__ */ jsx(
     Button,
     P(x({
@@ -17643,7 +17642,7 @@ function useGetSchemaInitializerMenuItems(e) {
       }
       if (i.isMenuType) {
         const f = i, { isMenuType: C } = f;
-        return K(f, ["isMenuType"]);
+        return W(f, ["isMenuType"]);
       }
       const d = c || u, p = i.key || `${r}-${u}-${a}`, m = (C) => {
         C.domEvent.stopPropagation(), C.key === p && (i.onClick ? i.onClick(P(x({}, C), { item: i })) : e == null || e(P(x({}, C), { item: i })));
@@ -17939,21 +17938,21 @@ https://requirejs.org/docs/errors.html#` + e);
         }
     }
     function b(T, N, O) {
-      var V, E, U, G, H, W, Y, J, X, Q, Z, oe, te = N && N.split("/"), ie = a.map, ae = ie && ie["*"];
+      var V, E, G, U, H, K, Y, J, X, Q, Z, oe, te = N && N.split("/"), ie = a.map, ae = ie && ie["*"];
       if (T && (T = T.split("/"), Y = T.length - 1, a.nodeIdCompat && jsSuffixRegExp.test(T[Y]) && (T[Y] = T[Y].replace(jsSuffixRegExp, "")), T[0].charAt(0) === "." && te && (oe = te.slice(0, te.length - 1), T = oe.concat(T)), C(T), T = T.join("/")), O && ie && (te || ae)) {
-        U = T.split("/");
+        G = T.split("/");
         e:
-          for (G = U.length; G > 0; G -= 1) {
-            if (W = U.slice(0, G).join("/"), te) {
+          for (U = G.length; U > 0; U -= 1) {
+            if (K = G.slice(0, U).join("/"), te) {
               for (H = te.length; H > 0; H -= 1)
-                if (E = getOwn(ie, te.slice(0, H).join("/")), E && (E = getOwn(E, W), E)) {
-                  J = E, X = G;
+                if (E = getOwn(ie, te.slice(0, H).join("/")), E && (E = getOwn(E, K), E)) {
+                  J = E, X = U;
                   break e;
                 }
             }
-            !Q && ae && getOwn(ae, W) && (Q = getOwn(ae, W), Z = G);
+            !Q && ae && getOwn(ae, K) && (Q = getOwn(ae, K), Z = U);
           }
-        !J && Q && (J = Q, X = Z), J && (U.splice(0, X, J), T = U.join("/"));
+        !J && Q && (J = Q, X = Z), J && (G.splice(0, X, J), T = G.join("/"));
       }
       return V = getOwn(a.pkgs, T), V || T;
     }
@@ -17975,18 +17974,18 @@ https://requirejs.org/docs/errors.html#` + e);
       return O > -1 && (N = T.substring(0, O), T = T.substring(O + 1, T.length)), [N, T];
     }
     function F(T, N, O, V) {
-      var E, U, G, H, W = null, Y = N ? N.name : null, J = T, X = !0, Q = "";
-      return T || (X = !1, T = "_@r" + (g += 1)), H = v(T), W = H[0], T = H[1], W && (W = b(W, Y, V), U = getOwn(p, W)), T && (W ? O ? Q = T : U && U.normalize ? Q = U.normalize(T, function(Z) {
+      var E, G, U, H, K = null, Y = N ? N.name : null, J = T, X = !0, Q = "";
+      return T || (X = !1, T = "_@r" + (g += 1)), H = v(T), K = H[0], T = H[1], K && (K = b(K, Y, V), G = getOwn(p, K)), T && (K ? O ? Q = T : G && G.normalize ? Q = G.normalize(T, function(Z) {
         return b(Z, Y, V);
-      }) : Q = T.indexOf("!") === -1 ? b(T, Y, V) : T : (Q = b(T, Y, V), H = v(Q), W = H[0], Q = H[1], O = !0, E = o.nameToUrl(Q))), G = W && !U && !O ? "_unnormalized" + (f += 1) : "", {
-        prefix: W,
+      }) : Q = T.indexOf("!") === -1 ? b(T, Y, V) : T : (Q = b(T, Y, V), H = v(Q), K = H[0], Q = H[1], O = !0, E = o.nameToUrl(Q))), U = K && !G && !O ? "_unnormalized" + (f += 1) : "", {
+        prefix: K,
         name: Q,
         parentMap: N,
-        unnormalized: !!G,
+        unnormalized: !!U,
         url: E,
         originalName: J,
         isDefine: X,
-        id: (W ? W + "!" + Q : Q) + G
+        id: (K ? K + "!" + Q : Q) + U
       };
     }
     function I(T) {
@@ -18000,8 +17999,8 @@ https://requirejs.org/docs/errors.html#` + e);
     function k(T, N) {
       var O = T.requireModules, V = !1;
       N ? N(T) : (each(O, function(E) {
-        var U = getOwn(l, E);
-        U && (U.error = T, U.events.error && (V = !0, U.emit("error", T)));
+        var G = getOwn(l, E);
+        G && (G.error = T, G.events.error && (V = !0, G.emit("error", T)));
       }), V || req.onError(T));
     }
     function D() {
@@ -18034,27 +18033,27 @@ https://requirejs.org/docs/errors.html#` + e);
     }
     function z(T, N, O) {
       var V = T.map.id;
-      T.error ? T.emit("error", T.error) : (N[V] = !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()) : z(H, N, O));
+      T.error ? T.emit("error", T.error) : (N[V] = !0, each(T.depMaps, function(E, G) {
+        var U = E.id, H = getOwn(l, U);
+        H && !T.depMatched[G] && !O[U] && (getOwn(N, U) ? (T.defineDep(G, p[U]), T.check()) : z(H, N, O));
       }), O[V] = !0);
     }
     function L() {
-      var T, N, O = a.waitSeconds * 1e3, V = O && o.startTime + O < (/* @__PURE__ */ new Date()).getTime(), E = [], U = [], G = !1, H = !0;
+      var T, N, O = a.waitSeconds * 1e3, V = O && o.startTime + O < (/* @__PURE__ */ new Date()).getTime(), E = [], G = [], U = !1, H = !0;
       if (!t) {
-        if (t = !0, eachProp(c, function(W) {
-          var Y = W.map, J = Y.id;
-          if (W.enabled && (Y.isDefine || U.push(W), !W.error)) {
-            if (!W.inited && V)
-              y(J) ? (N = !0, G = !0) : (E.push(J), S(J));
-            else if (!W.inited && W.fetched && Y.isDefine && (G = !0, !Y.prefix))
+        if (t = !0, eachProp(c, function(K) {
+          var Y = K.map, J = Y.id;
+          if (K.enabled && (Y.isDefine || G.push(K), !K.error)) {
+            if (!K.inited && V)
+              y(J) ? (N = !0, U = !0) : (E.push(J), S(J));
+            else if (!K.inited && K.fetched && Y.isDefine && (U = !0, !Y.prefix))
               return H = !1;
           }
         }), V && E.length)
           return T = makeError("timeout", "Load timeout for modules: " + E, null, E), T.contextName = o.contextName, k(T);
-        H && each(U, function(W) {
-          z(W, {}, {});
-        }), (!V || N) && G && (isBrowser || isWebWorker) && !i && (i = setTimeout(function() {
+        H && each(G, function(K) {
+          z(K, {}, {});
+        }), (!V || N) && U && (isBrowser || isWebWorker) && !i && (i = setTimeout(function() {
           i = 0, L();
         }, 50)), t = !1;
       }
@@ -18094,31 +18093,31 @@ https://requirejs.org/docs/errors.html#` + e);
        */
       check: function() {
         if (!(!this.enabled || this.enabling)) {
-          var T, N, O = this.map.id, V = this.depExports, E = this.exports, U = this.factory;
+          var T, N, O = this.map.id, V = this.depExports, E = this.exports, G = this.factory;
           if (!this.inited)
             hasProp(o.defQueueMap, O) || this.fetch();
           else if (this.error)
             this.emit("error", this.error);
           else if (!this.defining) {
             if (this.defining = !0, this.depCount < 1 && !this.defined) {
-              if (isFunction(U)) {
+              if (isFunction(G)) {
                 if (this.events.error && this.map.isDefine || req.onError !== defaultOnError)
                   try {
-                    E = o.execCb(O, U, V, E);
+                    E = o.execCb(O, G, V, E);
                   } catch (H) {
                     T = H;
                   }
                 else
-                  E = o.execCb(O, U, V, E);
+                  E = o.execCb(O, G, V, 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", k(this.error = T);
               } else
-                E = U;
+                E = G;
               if (this.exports = E, this.map.isDefine && !this.ignore && (p[O] = E, req.onResourceLoad)) {
-                var G = [];
+                var U = [];
                 each(this.depMaps, function(H) {
-                  G.push(H.normalizedMap || H);
-                }), req.onResourceLoad(o, this.map, G);
+                  U.push(H.normalizedMap || H);
+                }), req.onResourceLoad(o, this.map, U);
               }
               M(O), this.defined = !0;
             }
@@ -18129,30 +18128,30 @@ https://requirejs.org/docs/errors.html#` + e);
       callPlugin: function() {
         var T = this.map, N = T.id, O = F(T.prefix);
         this.depMaps.push(O), R(O, "defined", bind(this, function(V) {
-          var E, U, G, H = getOwn(h, this.map.id), W = this.map.name, Y = this.map.parentMap ? this.map.parentMap.name : null, J = o.makeRequire(T.parentMap, {
+          var E, G, U, H = getOwn(h, this.map.id), K = this.map.name, Y = this.map.parentMap ? this.map.parentMap.name : null, J = o.makeRequire(T.parentMap, {
             enableBuildCallback: !0
           });
           if (this.map.unnormalized) {
-            V.normalize && (W = V.normalize(W, function(X) {
+            V.normalize && (K = V.normalize(K, function(X) {
               return b(X, Y, !0);
-            }) || ""), U = F(
-              T.prefix + "!" + W,
+            }) || ""), G = F(
+              T.prefix + "!" + K,
               this.map.parentMap,
               !0
             ), R(
-              U,
+              G,
               "defined",
               bind(this, function(X) {
-                this.map.normalizedMap = U, this.init([], function() {
+                this.map.normalizedMap = G, this.init([], function() {
                   return X;
                 }, null, {
                   enabled: !0,
                   ignore: !0
                 });
               })
-            ), G = getOwn(l, U.id), G && (this.depMaps.push(U), this.events.error && G.on("error", bind(this, function(X) {
+            ), U = getOwn(l, G.id), U && (this.depMaps.push(G), this.events.error && U.on("error", bind(this, function(X) {
               this.emit("error", X);
-            })), G.enable());
+            })), U.enable());
             return;
           }
           if (H) {
@@ -18199,10 +18198,10 @@ https://requirejs.org/docs/errors.html#` + e);
               this.depExports[N] = E(this);
               return;
             }
-            this.depCount += 1, R(T, "defined", bind(this, function(U) {
-              this.undefed || (this.defineDep(N, U), this.check());
-            })), this.errback ? R(T, "error", bind(this, this.errback)) : this.events.error && R(T, "error", bind(this, function(U) {
-              this.emit("error", U);
+            this.depCount += 1, R(T, "defined", bind(this, function(G) {
+              this.undefed || (this.defineDep(N, G), this.check());
+            })), this.errback ? R(T, "error", bind(this, this.errback)) : this.events.error && R(T, "error", bind(this, function(G) {
+              this.emit("error", G);
             }));
           }
           O = T.id, V = l[O], !hasProp(r, O) && V && !V.enabled && o.enable(T, this);
@@ -18262,8 +18261,8 @@ https://requirejs.org/docs/errors.html#` + e);
       configure: function(T) {
         if (T.baseUrl && T.baseUrl.charAt(T.baseUrl.length - 1) !== "/" && (T.baseUrl += "/"), typeof T.urlArgs == "string") {
           var N = T.urlArgs;
-          T.urlArgs = function(E, U) {
-            return (U.indexOf("?") === -1 ? "?" : "&") + N;
+          T.urlArgs = function(E, G) {
+            return (G.indexOf("?") === -1 ? "?" : "&") + N;
           };
         }
         var O = a.shim, V = {
@@ -18272,21 +18271,21 @@ https://requirejs.org/docs/errors.html#` + e);
           config: !0,
           map: !0
         };
-        eachProp(T, function(E, U) {
-          V[U] ? (a[U] || (a[U] = {}), mixin(a[U], E, !0, !0)) : a[U] = E;
-        }), T.bundles && eachProp(T.bundles, function(E, U) {
-          each(E, function(G) {
-            G !== U && (h[G] = U);
+        eachProp(T, function(E, G) {
+          V[G] ? (a[G] || (a[G] = {}), mixin(a[G], E, !0, !0)) : a[G] = E;
+        }), T.bundles && eachProp(T.bundles, function(E, G) {
+          each(E, function(U) {
+            U !== G && (h[U] = G);
           });
-        }), T.shim && (eachProp(T.shim, function(E, U) {
+        }), T.shim && (eachProp(T.shim, function(E, G) {
           isArray(E) && (E = {
             deps: E
-          }), (E.exports || E.init) && !E.exportsFn && (E.exportsFn = o.makeShimExports(E)), O[U] = E;
+          }), (E.exports || E.init) && !E.exportsFn && (E.exportsFn = o.makeShimExports(E)), O[G] = E;
         }), a.shim = O), 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) {
-          !E.inited && !E.map.unnormalized && (E.map = F(U, null, !0));
+          var G, U;
+          E = typeof E == "string" ? { name: E } : E, U = E.name, G = E.location, G && (a.paths[U] = E.location), a.pkgs[U] = E.name + "/" + (E.main || "main").replace(currDirRegExp, "").replace(jsSuffixRegExp, "");
+        }), eachProp(l, function(E, G) {
+          !E.inited && !E.map.unnormalized && (E.map = F(G, null, !0));
         }), (T.deps || T.callback) && o.require(T.deps || [], T.callback);
       },
       makeShimExports: function(T) {
@@ -18298,10 +18297,10 @@ https://requirejs.org/docs/errors.html#` + e);
       },
       makeRequire: function(T, N) {
         N = N || {};
-        function O(V, E, U) {
-          var G, H, W;
-          return N.enableBuildCallback && E && isFunction(E) && (E.__requireJsBuild = !0), typeof V == "string" ? isFunction(E) ? k(makeError("requireargs", "Invalid require call"), U) : T && hasProp(r, V) ? r[V](l[T.id]) : req.get ? req.get(o, V, T, O) : (H = F(V, T, !1, !0), G = H.id, hasProp(p, G) ? p[G] : k(makeError("notloaded", 'Module name "' + G + '" has not been loaded yet for context: ' + e + (T ? "" : ". Use require([])")))) : (j(), o.nextTick(function() {
-            j(), W = I(F(null, T)), W.skipMap = N.skipMap, W.init(V, E, U, {
+        function O(V, E, G) {
+          var U, H, K;
+          return N.enableBuildCallback && E && isFunction(E) && (E.__requireJsBuild = !0), typeof V == "string" ? isFunction(E) ? k(makeError("requireargs", "Invalid require call"), G) : T && hasProp(r, V) ? r[V](l[T.id]) : req.get ? req.get(o, V, T, O) : (H = F(V, T, !1, !0), U = H.id, hasProp(p, U) ? p[U] : k(makeError("notloaded", 'Module name "' + U + '" has not been loaded yet for context: ' + e + (T ? "" : ". Use require([])")))) : (j(), o.nextTick(function() {
+            j(), K = I(F(null, T)), K.skipMap = N.skipMap, K.init(V, E, G, {
               enabled: !0
             }), L();
           }), O);
@@ -18314,8 +18313,8 @@ https://requirejs.org/docs/errors.html#` + e);
            * plain URLs like nameToUrl.
            */
           toUrl: function(V) {
-            var E, U = V.lastIndexOf("."), G = V.split("/")[0], H = G === "." || G === "..";
-            return U !== -1 && (!H || U > 1) && (E = V.substring(U, V.length), V = V.substring(0, U)), o.nameToUrl(b(
+            var E, G = V.lastIndexOf("."), U = V.split("/")[0], H = U === "." || U === "..";
+            return G !== -1 && (!H || G > 1) && (E = V.substring(G, V.length), V = V.substring(0, G)), o.nameToUrl(b(
               V,
               T && T.id,
               !0
@@ -18329,10 +18328,10 @@ https://requirejs.org/docs/errors.html#` + e);
           }
         }), T || (O.undef = function(V) {
           D();
-          var E = F(V, T, !0), U = getOwn(l, V);
-          U.undefed = !0, S(V), delete p[V], delete m[E.url], delete u[V], eachReverse(d, function(G, H) {
-            G[0] === V && d.splice(H, 1);
-          }), delete o.defQueueMap[V], U && (U.events.defined && (u[V] = U.events), M(V));
+          var E = F(V, T, !0), G = getOwn(l, V);
+          G.undefed = !0, S(V), delete p[V], delete m[E.url], delete u[V], eachReverse(d, function(U, H) {
+            U[0] === V && d.splice(H, 1);
+          }), delete o.defQueueMap[V], G && (G.events.defined && (u[V] = G.events), M(V));
         }), O;
       },
       /**
@@ -18352,7 +18351,7 @@ https://requirejs.org/docs/errors.html#` + e);
        * @param {String} moduleName the name of the module to potentially complete.
        */
       completeLoad: function(T) {
-        var N, O, V, E = getOwn(a.shim, T) || {}, U = E.exports;
+        var N, O, V, E = getOwn(a.shim, T) || {}, G = E.exports;
         for (D(); d.length; ) {
           if (O = d.shift(), O[0] === null) {
             if (O[0] = T, N)
@@ -18363,7 +18362,7 @@ https://requirejs.org/docs/errors.html#` + e);
           $(O);
         }
         if (o.defQueueMap = {}, V = getOwn(l, T), !N && !hasProp(p, T) && V && !V.inited) {
-          if (a.enforceDefine && (!U || !getGlobal(U)))
+          if (a.enforceDefine && (!G || !getGlobal(G)))
             return y(T) ? void 0 : k(makeError(
               "nodefine",
               "No define call for " + T,
@@ -18382,15 +18381,15 @@ https://requirejs.org/docs/errors.html#` + e);
        * internal API, not a public one. Use toUrl for the public API.
        */
       nameToUrl: function(T, N, O) {
-        var V, E, U, G, H, W, Y, J = getOwn(a.pkgs, T);
+        var V, E, G, U, H, K, Y, J = getOwn(a.pkgs, T);
         if (J && (T = J), Y = getOwn(h, T), Y)
           return o.nameToUrl(Y, N, O);
         if (req.jsExtRegExp.test(T))
           H = T + (N || "");
         else {
-          for (V = a.paths, E = T.split("/"), U = E.length; U > 0; U -= 1)
-            if (G = E.slice(0, U).join("/"), W = getOwn(V, G), W) {
-              isArray(W) && (W = W[0]), E.splice(0, U, W);
+          for (V = a.paths, E = T.split("/"), G = E.length; G > 0; G -= 1)
+            if (U = E.slice(0, G).join("/"), K = getOwn(V, U), K) {
+              isArray(K) && (K = K[0]), E.splice(0, G, K);
               break;
             }
           H = E.join("/"), H += N || (/^data\:|^blob\:|\?/.test(H) || O ? "" : ".js"), H = (H.charAt(0) === "/" || H.match(/^[\w\+\.\-]+:/) ? "" : a.baseUrl) + H;
@@ -18433,8 +18432,8 @@ https://requirejs.org/docs/errors.html#` + e);
         if (!y(N.id)) {
           var O = [];
           return eachProp(l, function(V, E) {
-            E.indexOf("_@r") !== 0 && each(V.depMaps, function(U) {
-              if (U.id === N.id)
+            E.indexOf("_@r") !== 0 && each(V.depMaps, function(G) {
+              if (G.id === N.id)
                 return O.push(E), !0;
             });
           }), k(makeError("scripterror", 'Script error for "' + N.id + (O.length ? '", needed by: ' + O.join(", ") : '"'), T, [N.id]));
@@ -18559,7 +18558,7 @@ const DataSourceApplicationProvider = (o) => {
   var r = o, {
     children: e,
     dataSourceManager: t
-  } = r, n = K(r, [
+  } = r, n = W(r, [
     "children",
     "dataSourceManager"
   ]);
@@ -19056,29 +19055,29 @@ const useCollectionManager_deprecated = (e) => {
         collectionNames: O = [w],
         maxDepth: V = 1,
         allowAllTypes: E = !1,
-        exceptInterfaces: U = [],
-        prefixFieldValue: G = "",
+        exceptInterfaces: G = [],
+        prefixFieldValue: U = "",
         usePrefix: H = !1,
-        dataSource: W
+        dataSource: K
       } = j || {};
       if (O.length - 1 > V)
         return;
       if (N[w])
         return _.cloneDeep(N[w]);
       typeof B == "string" && (B = [B]);
-      const Y = b(w, W), J = (X = Y == null ? void 0 : Y.filter(
-        (Q) => Q.interface && !U.includes(Q.interface) && (E || B.includes(Q.type) || (T && Q.target && Q.target !== w && Array.isArray(T) ? T.includes(Q.interface) : !1))
+      const Y = b(w, K), J = (X = Y == null ? void 0 : Y.filter(
+        (Q) => Q.interface && !G.includes(Q.interface) && (E || B.includes(Q.type) || (T && Q.target && Q.target !== w && Array.isArray(T) ? T.includes(Q.interface) : !1))
       )) == null ? void 0 : X.map((Q) => {
         var oe, te;
         const Z = x({
-          value: H && G ? `${G}.${Q.name}` : Q.name,
+          value: H && U ? `${U}.${Q.name}` : Q.name,
           label: f((oe = Q == null ? void 0 : Q.uiSchema) == null ? void 0 : oe.title) || Q.name
         }, Q);
         return T && Q.target && (Z.children = O.includes(Q.target) ? [] : I(Q.target, B, P(x({}, j), {
           cached: N,
-          dataSource: W,
+          dataSource: K,
           collectionNames: [...O, Q.target],
-          prefixFieldValue: H ? G ? `${G}.${Q.name}` : Q.name : "",
+          prefixFieldValue: H ? U ? `${U}.${Q.name}` : Q.name : "",
           usePrefix: H
         })), !((te = Z.children) != null && te.length)) ? null : Z;
       }).filter(Boolean);
@@ -19228,7 +19227,7 @@ function FormDialog(e, t, n, o) {
     open: (p) => q(this, null, function* () {
       return r.promise || (r.promise = new Promise((m, h) => q(this, null, function* () {
         try {
-          p = yield loading$1(l.loadingText, () => applyMiddleware(p, r.openMiddlewares)), r.form = r.form || createForm(p);
+          p = yield loading(l.loadingText, () => applyMiddleware(p, r.openMiddlewares)), r.form = r.form || createForm(p);
         } catch (g) {
           h(g);
         }
@@ -19246,7 +19245,7 @@ function FormDialog(e, t, n, o) {
               });
             },
             () => q(this, null, function* () {
-              yield loading$1(l.loadingText, () => applyMiddleware(r.form, r.cancelMiddlewares)), d.close();
+              yield loading(l.loadingText, () => applyMiddleware(r.form, r.cancelMiddlewares)), d.close();
             })
           )
         );
@@ -20940,7 +20939,7 @@ function getSelectedIdFilter(e) {
   } : null;
 }
 function SelectItem(e) {
-  const a = e, { title: t, options: n, value: o, onChange: r } = a, i = K(a, ["title", "options", "value", "onChange"]);
+  const a = e, { title: t, options: n, value: o, onChange: r } = a, i = W(a, ["title", "options", "value", "onChange"]);
   return /* @__PURE__ */ jsx(SchemaSettingsItem, P(x({ title: t }, i), { children: /* @__PURE__ */ jsxs("div", { style: { alignItems: "center", display: "flex", justifyContent: "space-between" }, children: [
     t,
     /* @__PURE__ */ jsx(
@@ -20966,7 +20965,7 @@ const Tree = connect(
 Tree.displayName = "Tree";
 const compatibleDataId = (e, t) => e == null ? void 0 : e.map((n) => {
   var l;
-  const a = n, { dataId: o } = a, r = K(a, ["dataId"]), i = x({}, r);
+  const a = n, { dataId: o } = a, r = W(a, ["dataId"]), i = x({}, r);
   return o && (i.dataScope = { $and: [{ id: { $eq: o } }] }, i.titleField = (i == null ? void 0 : i.titleField) || ((l = t == null ? void 0 : t[n.collection]) == null ? void 0 : l.titleField) || "id"), i;
 }), FormDataTemplates = withDynamicSchemaProps(
   observer$1((e) => {
@@ -22072,7 +22071,7 @@ const SchemaSettingsProvider = (e) => {
   );
   return /* @__PURE__ */ jsx(SchemaSettingsContext.Provider, { value: a, children: t });
 }, SchemaSettingsDropdown = React.memo((e) => {
-  const f = e, { title: t, dn: n } = f, o = K(f, ["title", "dn"]), [r, i] = useState(!1), { Component: a, getMenuItems: l } = useMenuItem(), c = useNiceDropdownMaxHeight([r]), [u, d] = useState(!1), p = useContext(SchemaToolbarVisibleContext);
+  const f = e, { title: t, dn: n } = f, o = W(f, ["title", "dn"]), [r, i] = useState(!1), { Component: a, getMenuItems: l } = useMenuItem(), c = useNiceDropdownMaxHeight([r]), [u, d] = useState(!1), p = useContext(SchemaToolbarVisibleContext);
   useEffect(() => {
     p && d(!1);
   }, [p]);
@@ -22291,10 +22290,10 @@ const findGridSchema = (e) => e.reduceProperties((t, n) => {
     }
   );
 }, SchemaSettingsSelectItem = (e) => {
-  const a = e, { title: t, options: n, value: o, onChange: r } = a, i = K(a, ["title", "options", "value", "onChange"]);
+  const a = e, { title: t, options: n, value: o, onChange: r } = a, i = W(a, ["title", "options", "value", "onChange"]);
   return /* @__PURE__ */ jsx(SchemaSettingsItem, P(x({ title: t }, i), { children: /* @__PURE__ */ jsx(SelectWithTitle, { title: t, defaultValue: o, onChange: r, options: n }) }));
 }, SchemaSettingsCascaderItem = (e) => {
-  const a = e, { title: t, options: n, value: o, onChange: r } = a, i = K(a, ["title", "options", "value", "onChange"]);
+  const a = e, { title: t, options: n, value: o, onChange: r } = a, i = W(a, ["title", "options", "value", "onChange"]);
   return /* @__PURE__ */ jsx(SchemaSettingsItem, P(x({ title: t }, i), { children: /* @__PURE__ */ jsxs("div", { style: { alignItems: "center", display: "flex", justifyContent: "space-between" }, children: [
     t,
     /* @__PURE__ */ jsx(
@@ -22311,7 +22310,7 @@ const findGridSchema = (e) => e.reduceProperties((t, n) => {
 }, ml32 = { marginLeft: 32 }, MenuItemSwitch = observer$1(({ state: e }) => /* @__PURE__ */ jsx(Switch, { size: "small", checked: e.checked, style: ml32 }));
 MenuItemSwitch.displayName = "MenuItemSwitch";
 const SchemaSettingsSwitchItem = (e) => {
-  const i = e, { title: t, onChange: n } = i, o = K(i, ["title", "onChange"]), [r] = useState(() => observable({ checked: !!e.checked }));
+  const i = e, { title: t, onChange: n } = i, o = W(i, ["title", "onChange"]), [r] = useState(() => observable({ checked: !!e.checked }));
   return /* @__PURE__ */ jsx(
     SchemaSettingsItem,
     P(x({
@@ -22327,7 +22326,7 @@ const SchemaSettingsSwitchItem = (e) => {
     })
   );
 }, SchemaSettingsPopupItem = (e) => {
-  const a = e, { schema: t } = a, n = K(a, ["schema"]), [o, r] = useState(!1), i = useContext(SchemaSettingsContext);
+  const a = e, { schema: t } = a, n = W(a, ["schema"]), [o, r] = useState(!1), i = useContext(SchemaSettingsContext);
   return /* @__PURE__ */ jsxs(ActionContextProvider, { value: { visible: o, setVisible: r }, children: [
     /* @__PURE__ */ jsx(
       SchemaSettingsItem,
@@ -22361,7 +22360,7 @@ const SchemaSettingsSwitchItem = (e) => {
     modalTip: c,
     components: u,
     scope: d
-  } = w, p = K(w, [
+  } = w, p = W(w, [
     "title",
     "onSubmit",
     "width",
@@ -22447,7 +22446,7 @@ const SchemaSettingsModalItem = (e) => {
     width: u = "fit-content",
     noRecord: d = !1,
     ModalContextProvider: p = (E) => /* @__PURE__ */ jsx(Fragment, { children: E.children })
-  } = V, m = K(V, [
+  } = V, m = W(V, [
     "hidden",
     "title",
     "components",
@@ -22466,9 +22465,9 @@ const SchemaSettingsModalItem = (e) => {
       title: n
     }, m), {
       onClick: () => q(void 0, null, function* () {
-        const E = l ? yield l() : c, U = _.isFunction(e.schema) ? e.schema() : e.schema;
+        const E = l ? yield l() : c, G = _.isFunction(e.schema) ? e.schema() : e.schema;
         FormDialog(
-          { title: U.title || n, width: u },
+          { title: G.title || n, width: u },
           () => /* @__PURE__ */ jsx(p, { children: /* @__PURE__ */ jsx(CollectOperators, { defaultOperators: L(), children: /* @__PURE__ */ jsx(VariablesContext.Provider, { value: w, children: /* @__PURE__ */ jsx(BlockContext.Provider, { value: z, children: /* @__PURE__ */ jsx(
             VariablePopupRecordProvider,
             {
@@ -22509,7 +22508,7 @@ const SchemaSettingsModalItem = (e) => {
                             {
                               components: o,
                               scope: r,
-                              schema: U
+                              schema: G
                             }
                           ) }) }) })
                         }
@@ -22524,8 +22523,8 @@ const SchemaSettingsModalItem = (e) => {
         ).open({
           initialValues: E,
           effects: i
-        }).then((G) => (a(G), G)).catch((G) => {
-          console.error(G);
+        }).then((U) => (a(U), U)).catch((U) => {
+          console.error(U);
         });
       }),
       children: e.children || e.title
@@ -22836,7 +22835,7 @@ const typeComponentMap = {
   actionModal: SchemaSettingsActionModalItem,
   modal: SchemaSettingsModalItem
 }, SchemaSettingsChildErrorFallback = (e) => {
-  const o = e, { title: t } = o, n = K(o, ["title"]);
+  const o = e, { title: t } = o, n = W(o, ["title"]);
   return /* @__PURE__ */ jsx(SchemaSettingsItem, { title: t, children: /* @__PURE__ */ jsx(ErrorFallback.Modal, x({}, n)) });
 }, getFallbackComponent = _.memoize((e) => (t) => /* @__PURE__ */ jsx(SchemaSettingsChildErrorFallback, P(x({}, t), { title: e }))), SchemaSettingsChildren = (e) => {
   const { children: t } = e, { visible: n } = useSchemaSettings(), o = useRef(!1), r = useFieldComponentName();
@@ -22872,7 +22871,7 @@ const typeComponentMap = {
 });
 SchemaSettingsIcon.displayName = "SchemaSettingsIcon";
 const SchemaSettingsWrapper = React.memo((e) => {
-  const p = e, { items: t, Component: n = SchemaSettingsIcon, name: o, componentProps: r, style: i } = p, a = K(p, ["items", "Component", "name", "componentProps", "style"]), { dn: l } = useDesignable(), c = useField(), u = useFieldSchema(), d = useMemo(
+  const p = e, { items: t, Component: n = SchemaSettingsIcon, name: o, componentProps: r, style: i } = p, a = W(p, ["items", "Component", "name", "componentProps", "style"]), { dn: l } = useDesignable(), c = useField(), u = useFieldSchema(), d = useMemo(
     () => x({
       options: e,
       style: i
@@ -23372,8 +23371,8 @@ const getActionContext = (e) => {
   ));
   const D = (R == null ? void 0 : R.interface) === "m2o" && findParentFieldSchema(o), M = D && p(D == null ? void 0 : D["x-collection-field"]), z = useTableBlockContext(), L = (R == null ? void 0 : R.interface) === "m2m" || (R == null ? void 0 : R.interface) === "mbm" || (M == null ? void 0 : M.type) === "hasMany" && (R == null ? void 0 : R.interface) === "m2o", $ = useCallback(
     (V) => {
-      const E = V.find((G) => G.value === "$nForm"), U = m(I);
-      return !(U != null && U.length) && E && (E.children = formatVariableScop(y())), V;
+      const E = V.find((U) => U.value === "$nForm"), G = m(I);
+      return !(G != null && G.length) && E && (E.children = formatVariableScop(y())), V;
     },
     [y, I]
   ), w = useMemo(() => ({
@@ -23409,26 +23408,26 @@ const getActionContext = (e) => {
             getAllCollectionsInheritChain: h
           }),
           renderSchemaComponent: function(E) {
-            const U = useMemo(() => _.cloneDeep(k) || {}, []);
-            U["x-read-pretty"] = !1, U["x-disabled"] = !1, _.set(U, "x-decorator-props.showTitle", !1);
-            const G = getFieldDefaultValue(U, R);
-            R.target && U["x-component-props"] && (U["x-component-props"].mode = "Select"), R != null && R.uiSchema.type && (U.type = R.uiSchema.type), (R == null ? void 0 : R.uiSchema["x-component"]) === "Checkbox" && (_.set(U, "x-component-props.defaultChecked", G), U.type = "void");
+            const G = useMemo(() => _.cloneDeep(k) || {}, []);
+            G["x-read-pretty"] = !1, G["x-disabled"] = !1, _.set(G, "x-decorator-props.showTitle", !1);
+            const U = getFieldDefaultValue(G, R);
+            R.target && G["x-component-props"] && (G["x-component-props"].mode = "Select"), R != null && R.uiSchema.type && (G.type = R.uiSchema.type), (R == null ? void 0 : R.uiSchema["x-component"]) === "Checkbox" && (_.set(G, "x-component-props.defaultChecked", U), G.type = "void");
             const H = useMemo(
-              () => P(x({}, U || {}), {
+              () => P(x({}, G || {}), {
                 "x-decorator": "FormItem",
-                "x-component-props": P(x({}, U["x-component-props"]), {
+                "x-component-props": P(x({}, G["x-component-props"]), {
                   collectionName: R == null ? void 0 : R.collectionName,
                   targetField: u,
-                  defaultValue: isVariable(G) ? "" : G,
+                  defaultValue: isVariable(U) ? "" : U,
                   style: {
                     width: "100%",
                     verticalAlign: "top",
                     minWidth: "200px"
                   }
                 }),
-                default: isVariable(G) ? "" : G
+                default: isVariable(U) ? "" : U
               }),
-              [U, G]
+              [G, U]
             );
             return _.set(H, "x-component-props.onChange", E.onChange), /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(SchemaComponent, { schema: H }) });
           }
@@ -23453,11 +23452,11 @@ const getActionContext = (e) => {
     g
   ]), j = useCallback(
     (V) => {
-      var U, G, H;
+      var G, U, H;
       const E = {
         "x-uid": o["x-uid"]
       };
-      o.default = (U = V.default) != null ? U : null, isVariable(V.default) || (G = r.setInitialValue) == null || G.call(r, V.default), E.default = (H = V.default) != null ? H : null, i.emit("patch", {
+      o.default = (G = V.default) != null ? G : null, isVariable(V.default) || (U = r.setInitialValue) == null || U.call(r, V.default), E.default = (H = V.default) != null ? H : null, i.emit("patch", {
         schema: E,
         currentSchema: n
       });
@@ -24240,15 +24239,15 @@ const useGetFilterOptions = () => {
     };
   });
 }, TableColumnDesigner$1 = (e) => {
-  var z, L, $, w, B, j, T, N, O, V, E, U;
+  var z, L, $, w, B, j, T, N, O, V, E, G;
   const { uiSchema: t, fieldSchema: n, collectionField: o } = e, { form: r } = useFormBlockContext(), { getInterface: i, getCollection: a } = useCollectionManager_deprecated(), l = useField(), { t: c } = useTranslation(), u = useFieldSchema(), { dn: d } = useDesignable(), p = ((z = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : z.fieldNames) || ((L = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : L.fieldNames), m = useLabelFields$1(($ = o == null ? void 0 : o.target) != null ? $ : o == null ? void 0 : o.targetCollection), h = useColorFields((w = o == null ? void 0 : o.target) != null ? w : o == null ? void 0 : o.targetCollection), g = i(o == null ? void 0 : o.interface), f = a(o == null ? void 0 : o.target), C = isFileCollection$2(f), b = ["QuickEdit", "FormItem"].includes(n["x-decorator"]), { currentMode: S } = useAssociationFieldContext(), { isAllowToSetDefaultValue: y } = useIsAllowToSetDefaultValue({ collectionField: o, fieldSchema: n }), v = ["datetime", "createdAt", "updatedAt"].includes(o == null ? void 0 : o.interface), F = ["obo", "oho", "o2o", "o2m", "m2m", "m2o", "snapshot"].includes(
     o == null ? void 0 : o.interface
   ), I = useFieldModeOptions({ fieldSchema: n }), R = ((B = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : B.mode) || "Select";
   let k = "editable";
   n["x-disabled"] === !0 && (k = "readonly"), n["x-read-pretty"] === !0 && (k = "read-pretty");
   const D = F && R === "Select", M = () => {
-    const { name: G } = useCollection(), { linkageRulesProps: H } = useSchemaToolbar();
-    return /* @__PURE__ */ jsx(SchemaSettingsLinkageRules, x({ category: "style" }, P(x({}, H), { collectionName: G })));
+    const { name: U } = useCollection(), { linkageRulesProps: H } = useSchemaToolbar();
+    return /* @__PURE__ */ jsx(SchemaSettingsLinkageRules, x({ category: "style" }, P(x({}, H), { collectionName: U })));
   };
   return /* @__PURE__ */ jsxs(GeneralSchemaDesigner, { disableInitializer: !0, children: [
     /* @__PURE__ */ jsx(
@@ -24269,8 +24268,8 @@ const useGetFilterOptions = () => {
             }
           }
         },
-        onSubmit: ({ title: G }) => {
-          G && (l.title = G, u.title = G, d.emit("patch", {
+        onSubmit: ({ title: U }) => {
+          U && (l.title = U, u.title = U, d.emit("patch", {
             schema: {
               "x-uid": u["x-uid"],
               title: u.title
@@ -24285,12 +24284,12 @@ const useGetFilterOptions = () => {
         collectionName: o == null ? void 0 : o.target,
         defaultFilter: ((O = (N = (T = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : T.service) == null ? void 0 : N.params) == null ? void 0 : O.filter) || {},
         form: r,
-        onSubmit: ({ filter: G }) => {
-          var W, Y;
-          G = removeNullCondition(G), set(l.componentProps, "service.params.filter", G), n["x-component-props"] = l.componentProps;
-          const H = (Y = l.path) == null ? void 0 : Y.splice(((W = l.path) == null ? void 0 : W.length) - 1, 1);
+        onSubmit: ({ filter: U }) => {
+          var K, Y;
+          U = removeNullCondition(U), set(l.componentProps, "service.params.filter", U), n["x-component-props"] = l.componentProps;
+          const H = (Y = l.path) == null ? void 0 : Y.splice(((K = l.path) == null ? void 0 : K.length) - 1, 1);
           l.form.query(`${H.concat("*." + n.name)}`).forEach((J) => {
-            J.componentProps.service = J.componentProps.service || { params: {} }, J.componentProps.service.params.filter = G;
+            J.componentProps.service = J.componentProps.service || { params: {} }, J.componentProps.service.params.filter = U;
           }), d.emit("patch", {
             schema: {
               "x-uid": n["x-uid"],
@@ -24316,14 +24315,14 @@ const useGetFilterOptions = () => {
             }
           }
         },
-        onSubmit: ({ width: G }) => {
+        onSubmit: ({ width: U }) => {
           const H = u["x-component-props"] || {};
-          H.width = G;
-          const W = {
+          H.width = U;
+          const K = {
             "x-uid": u["x-uid"]
           };
-          W["x-component-props"] = H, u["x-component-props"] = H, l.componentProps.width = G, d.emit("patch", {
-            schema: W
+          K["x-component-props"] = H, u["x-component-props"] = H, l.componentProps.width = U, d.emit("patch", {
+            schema: K
           }), d.refresh();
         }
       }
@@ -24334,13 +24333,13 @@ const useGetFilterOptions = () => {
       {
         title: c("Sortable"),
         checked: l.componentProps.sorter,
-        onChange: (G) => {
+        onChange: (U) => {
           const H = {
             "x-uid": u["x-uid"]
           };
           u["x-component-props"] = P(x({}, u["x-component-props"]), {
-            sorter: G
-          }), H["x-component-props"] = u["x-component-props"], l.componentProps.sorter = G, d.emit("patch", {
+            sorter: U
+          }), H["x-component-props"] = u["x-component-props"], l.componentProps.sorter = U, d.emit("patch", {
             schema: H
           }), d.refresh();
         }
@@ -24353,11 +24352,11 @@ const useGetFilterOptions = () => {
       {
         title: c("Enable link"),
         checked: ((E = n["x-component-props"]) == null ? void 0 : E.enableLink) !== !1,
-        onChange: (G) => {
+        onChange: (U) => {
           n["x-component-props"] = P(x({}, n == null ? void 0 : n["x-component-props"]), {
-            enableLink: G
+            enableLink: U
           }), l.componentProps = P(x({}, n == null ? void 0 : n["x-component-props"]), {
-            enableLink: G
+            enableLink: U
           }), d.emit("patch", {
             schema: {
               "x-uid": n["x-uid"],
@@ -24373,14 +24372,14 @@ const useGetFilterOptions = () => {
         title: c("Title field"),
         options: m,
         value: p == null ? void 0 : p.label,
-        onChange: (G) => {
+        onChange: (U) => {
           var Y, J, X, Q, Z;
           const H = P(x(x({}, (J = (Y = o == null ? void 0 : o.uiSchema) == null ? void 0 : Y["x-component-props"]) == null ? void 0 : J.fieldNames), (X = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : X.fieldNames), {
-            label: G
+            label: U
           });
           _.set(n, "x-component-props.fieldNames", H);
-          const W = (Z = l.path) == null ? void 0 : Z.splice(((Q = l.path) == null ? void 0 : Q.length) - 1, 1);
-          l.form.query(`${W.concat("*." + n.name)}`).forEach((oe) => {
+          const K = (Z = l.path) == null ? void 0 : Z.splice(((Q = l.path) == null ? void 0 : Q.length) - 1, 1);
+          l.form.query(`${K.concat("*." + n.name)}`).forEach((oe) => {
             oe.componentProps.fieldNames = H;
           }), d.emit("patch", {
             schema: {
@@ -24401,11 +24400,11 @@ const useGetFilterOptions = () => {
           { label: c("Tag"), value: "Tag" }
         ].filter(Boolean) : I,
         value: R,
-        onChange: (G) => {
+        onChange: (U) => {
           const H = {
             "x-uid": n["x-uid"]
           };
-          n["x-component-props"] = n["x-component-props"] || {}, n["x-component-props"].mode = G, H["x-component-props"] = n["x-component-props"], l.componentProps = l.componentProps || {}, l.componentProps.mode = G, d.emit("patch", {
+          n["x-component-props"] = n["x-component-props"] || {}, n["x-component-props"].mode = U, H["x-component-props"] = n["x-component-props"], l.componentProps = l.componentProps || {}, l.componentProps.mode = U, d.emit("patch", {
             schema: H
           }), d.refresh();
         }
@@ -24417,12 +24416,12 @@ const useGetFilterOptions = () => {
       {
         title: c("Tag color field"),
         options: h,
-        value: (U = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : U.tagColorField,
-        onChange: (G) => {
+        value: (G = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : G.tagColorField,
+        onChange: (U) => {
           const H = {
             "x-uid": n["x-uid"]
           };
-          n["x-component-props"] = n["x-component-props"] || {}, n["x-component-props"].tagColorField = G, H["x-component-props"] = n["x-component-props"], l.componentProps.tagColorField = G, d.emit("patch", {
+          n["x-component-props"] = n["x-component-props"] || {}, n["x-component-props"].tagColorField = U, H["x-component-props"] = n["x-component-props"], l.componentProps.tagColorField = U, d.emit("patch", {
             schema: H
           }), d.refresh();
         }
@@ -24434,15 +24433,15 @@ const useGetFilterOptions = () => {
       {
         title: c("Required"),
         checked: n.required,
-        onChange: (G) => {
+        onChange: (U) => {
           var Y, J;
           const H = {
             "x-uid": n["x-uid"]
           };
-          n.required = G, H.required = G;
-          const W = (J = l.path) == null ? void 0 : J.splice(((Y = l.path) == null ? void 0 : Y.length) - 1, 1);
-          l.form.query(`${W.concat("*." + n.name)}`).forEach((X) => {
-            X.required = G;
+          n.required = U, H.required = U;
+          const K = (J = l.path) == null ? void 0 : J.splice(((Y = l.path) == null ? void 0 : Y.length) - 1, 1);
+          l.form.query(`${K.concat("*." + n.name)}`).forEach((X) => {
+            X.required = U;
           }), d.emit("patch", {
             schema: H
           }), d.refresh();
@@ -24460,26 +24459,26 @@ const useGetFilterOptions = () => {
           { label: c("Easy-reading"), value: "read-pretty" }
         ],
         value: k,
-        onChange: (G) => {
+        onChange: (U) => {
           var Y, J;
           const H = {
             "x-uid": n["x-uid"]
-          }, W = (J = l.path) == null ? void 0 : J.splice(((Y = l.path) == null ? void 0 : Y.length) - 1, 1);
-          switch (G) {
+          }, K = (J = l.path) == null ? void 0 : J.splice(((Y = l.path) == null ? void 0 : Y.length) - 1, 1);
+          switch (U) {
             case "readonly": {
-              n["x-read-pretty"] = !1, n["x-disabled"] = !0, H["x-read-pretty"] = !1, H["x-disabled"] = !0, l.form.query(`${W.concat("*." + n.name)}`).forEach((X) => {
+              n["x-read-pretty"] = !1, n["x-disabled"] = !0, H["x-read-pretty"] = !1, H["x-disabled"] = !0, l.form.query(`${K.concat("*." + n.name)}`).forEach((X) => {
                 X.readonly = !0, X.disabled = !0;
               });
               break;
             }
             case "read-pretty": {
-              n["x-read-pretty"] = !0, n["x-disabled"] = !1, H["x-read-pretty"] = !0, H["x-disabled"] = !1, l.form.query(`${W.concat("*." + n.name)}`).forEach((X) => {
+              n["x-read-pretty"] = !0, n["x-disabled"] = !1, H["x-read-pretty"] = !0, H["x-disabled"] = !1, l.form.query(`${K.concat("*." + n.name)}`).forEach((X) => {
                 X.readPretty = !0;
               });
               break;
             }
             default: {
-              n["x-read-pretty"] = !1, n["x-disabled"] = !1, H["x-read-pretty"] = !1, H["x-disabled"] = !1, l.form.query(`${W.concat("*." + n.name)}`).forEach((X) => {
+              n["x-read-pretty"] = !1, n["x-disabled"] = !1, H["x-read-pretty"] = !1, H["x-disabled"] = !1, l.form.query(`${K.concat("*." + n.name)}`).forEach((X) => {
                 X.readPretty = !1, X.disabled + !1;
               });
               break;
@@ -24497,11 +24496,11 @@ const useGetFilterOptions = () => {
       SchemaSettingsSortingRule,
       {
         fieldSchema: n,
-        onSubmitCallBack: (G) => {
-          var W, Y;
-          const H = (Y = l.path) == null ? void 0 : Y.splice(((W = l.path) == null ? void 0 : W.length) - 1, 1);
+        onSubmitCallBack: (U) => {
+          var K, Y;
+          const H = (Y = l.path) == null ? void 0 : Y.splice(((K = l.path) == null ? void 0 : K.length) - 1, 1);
           l.form.query(`${H.concat("*." + n.name)}`).forEach((J) => {
-            J.componentProps.service = J.componentProps.service || { params: {} }, J.componentProps.service.params.sort = G;
+            J.componentProps.service = J.componentProps.service || { params: {} }, J.componentProps.service.params.sort = U;
           });
         }
       }
@@ -25549,7 +25548,7 @@ const useCreateActionProps = () => {
   return {
     onClick() {
       return q(this, null, function* () {
-        var N, O, V, E, U, G;
+        var N, O, V, E, G, U;
         const R = u.map((H) => H.name), {
           assignedValues: k = {},
           onSuccess: D,
@@ -25557,12 +25556,12 @@ const useCreateActionProps = () => {
           skipValidator: z,
           triggerWorkflows: L
         } = (N = l == null ? void 0 : l["x-action-settings"]) != null ? N : {}, $ = (O = i == null ? void 0 : i["x-component-props"]) == null ? void 0 : O.addChild, { successMessage: w } = D || {}, B = {}, j = Object.keys(k).map((H) => q(this, null, function* () {
-          const W = k[H], Y = d(H);
-          if (isVariable(W)) {
-            const { value: J } = (yield C == null ? void 0 : C.parseVariable(W, b)) || {};
+          const K = k[H], Y = d(H);
+          if (isVariable(K)) {
+            const { value: J } = (yield C == null ? void 0 : C.parseVariable(K, b)) || {};
             J && (B[H] = transformVariableValue(J, { targetCollectionField: Y }));
           } else
-            W != null && W !== "" && (B[H] = W);
+            K != null && K !== "" && (B[H] = K);
         }));
         yield Promise.all(j), z || (yield e.submit());
         const T = getFormValues({
@@ -25584,9 +25583,9 @@ const useCreateActionProps = () => {
             values: x(x(x({}, T), M), B),
             filterKeys: v,
             // TODO(refactor): should change to inject by plugin
-            triggerWorkflows: L != null && L.length ? L.map((W) => [W.workflowKey, W.context].filter(Boolean).join("!")).join(",") : void 0
+            triggerWorkflows: L != null && L.length ? L.map((K) => [K.workflowKey, K.context].filter(Boolean).join("!")).join(",") : void 0
           });
-          if (c.data.loading = !1, c.data.data = H, (G = (U = o == null ? void 0 : o.service) == null ? void 0 : U.refresh) == null || G.call(U), r == null || r(!1), a == null || a(!0), !w)
+          if (c.data.loading = !1, c.data.data = H, (U = (G = o == null ? void 0 : o.service) == null ? void 0 : G.refresh) == null || U.call(G), r == null || r(!1), a == null || a(!0), !w)
             return;
           message.success(h(w));
         } catch (H) {
@@ -25737,10 +25736,10 @@ const useCreateActionProps = () => {
         } = (N = i == null ? void 0 : i["x-action-settings"]) != null ? N : {}, { manualClose: z, redirecting: L, redirectTo: $, successMessage: w, actionAfterSuccess: B } = D || {};
         m.data = e.data || {}, m.data.loading = !0;
         const j = {}, T = Object.keys(k).map((V) => q(this, null, function* () {
-          const E = k[V], U = C(V);
+          const E = k[V], G = C(V);
           if (isVariable(E)) {
-            const { value: G } = (yield g == null ? void 0 : g.parseVariable(E, b)) || {};
-            G && (j[V] = transformVariableValue(G, { targetCollectionField: U }));
+            const { value: U } = (yield g == null ? void 0 : g.parseVariable(E, b)) || {};
+            U && (j[V] = transformVariableValue(U, { targetCollectionField: G }));
           } else
             E != null && E !== "" && (j[V] = E);
         }));
@@ -25749,8 +25748,8 @@ const useCreateActionProps = () => {
           content: p(M === "selected" ? "Update selected data?" : "Update all data?"),
           onOk() {
             return q(this, null, function* () {
-              var U, G, H, W;
-              const { filter: V } = (G = (U = o.params) == null ? void 0 : U[0]) != null ? G : {}, E = {
+              var G, U, H, K;
+              const { filter: V } = (U = (G = o.params) == null ? void 0 : G[0]) != null ? U : {}, E = {
                 values: x({}, j),
                 filter: V,
                 forceUpdate: !1
@@ -25769,7 +25768,7 @@ const useCreateActionProps = () => {
               } finally {
                 m.data.loading = !1;
               }
-              t instanceof TableFieldResource || (W = (H = n == null ? void 0 : n.service) == null ? void 0 : H.refresh) == null || W.call(H), w && (z ? h.success({
+              t instanceof TableFieldResource || (K = (H = n == null ? void 0 : n.service) == null ? void 0 : H.refresh) == null || K.call(H), w && (z ? h.success({
                 title: d(w),
                 onOk: () => q(this, null, function* () {
                   (L && !B || B === "redirect") && $ && (isURL($) ? window.location.href = $ : u($));
@@ -25792,14 +25791,14 @@ const useCreateActionProps = () => {
   return {
     onClick() {
       return q(this, null, function* () {
-        var V, E, U, G;
+        var V, E, G, U;
         const { skipValidator: I, onSuccess: R, requestSettings: k } = (V = o == null ? void 0 : o["x-action-settings"]) != null ? V : {}, { manualClose: D, redirecting: M, redirectTo: z, successMessage: L, actionAfterSuccess: $ } = R || {}, w = o == null ? void 0 : o["x-action"];
         if (!k.url)
           return;
         I !== !0 && w === "customize:form:request" && (yield i.submit());
         const B = k.headers ? JSON.parse(k.headers) : {}, j = k.params ? JSON.parse(k.params) : {}, T = k.data ? JSON.parse(k.data) : {};
         if (w === "customize:form:request" && ["POST", "PUT", "PATCH"].includes(k.method)) {
-          const H = a.map((Y) => Y.name), W = getFormValues({
+          const H = a.map((Y) => Y.name), K = getFormValues({
             filterByTk: n,
             field: c,
             form: i,
@@ -25808,7 +25807,7 @@ const useCreateActionProps = () => {
             resource: u,
             actionFields: (y == null ? void 0 : y("form")) || []
           });
-          Object.assign(T, W);
+          Object.assign(T, K);
         }
         const O = {
           url: renderTemplate(k.url, { currentRecord: m, currentUser: g }),
@@ -25819,7 +25818,7 @@ 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), w === "customize:form:request" && ($ === "previous" || !$ && M !== !0) && (b == null || b(!1)), L || (message.success(C("Saved successfully")), yield resetFormCorrectly(i), (M && !$ || $ === "redirect") && z && (isURL(z) ? window.location.href = z : t(z))), D ? S.success({
+          yield e.request(x({}, O)), f.data.loading = !1, u instanceof TableFieldResource || (G = (E = d == null ? void 0 : d.service) == null ? void 0 : E.refresh) == null || G.call(E), (U = p == null ? void 0 : p.refresh) == null || U.call(p), w === "customize:form:request" && ($ === "previous" || !$ && M !== !0) && (b == null || b(!1)), L || (message.success(C("Saved successfully")), yield resetFormCorrectly(i), (M && !$ || $ === "redirect") && z && (isURL(z) ? window.location.href = z : t(z))), D ? S.success({
             title: r(L),
             onOk: () => q(this, null, function* () {
               (M && !$ || $ === "redirect") && z && (isURL(z) ? window.location.href = z : t(z));
@@ -25843,16 +25842,16 @@ const useCreateActionProps = () => {
           overwriteValues: D,
           skipValidator: M,
           triggerWorkflows: z
-        } = (E = l == null ? void 0 : l["x-action-settings"]) != null ? E : {}, { manualClose: L, redirecting: $, redirectTo: w, successMessage: B, actionAfterSuccess: j } = k || {}, T = {}, N = Object.keys(R).map((U) => q(this, null, function* () {
-          const G = R[U], H = d(U);
-          if (isVariable(G)) {
-            const { value: W } = (yield b == null ? void 0 : b.parseVariable(G, S)) || {};
-            W && (T[U] = transformVariableValue(W, { targetCollectionField: H }));
+        } = (E = l == null ? void 0 : l["x-action-settings"]) != null ? E : {}, { manualClose: L, redirecting: $, redirectTo: w, successMessage: B, actionAfterSuccess: j } = k || {}, T = {}, N = Object.keys(R).map((G) => q(this, null, function* () {
+          const U = R[G], H = d(G);
+          if (isVariable(U)) {
+            const { value: K } = (yield b == null ? void 0 : b.parseVariable(U, S)) || {};
+            K && (T[G] = transformVariableValue(K, { targetCollectionField: H }));
           } else
-            G != null && G !== "" && (T[U] = G);
+            U != null && U !== "" && (T[G] = U);
         }));
         yield Promise.all(N), M || (yield e.submit());
-        const O = u.map((U) => U.name), V = getFormValues({
+        const O = u.map((G) => G.name), V = getFormValues({
           filterByTk: t,
           field: n,
           form: e,
@@ -25869,7 +25868,7 @@ const useCreateActionProps = () => {
           }, C), {
             updateAssociationValues: g,
             // TODO(refactor): should change to inject by plugin
-            triggerWorkflows: z != null && z.length ? z.map((U) => [U.workflowKey, U.context].filter(Boolean).join("!")).join(",") : void 0
+            triggerWorkflows: z != null && z.length ? z.map((G) => [G.workflowKey, G.context].filter(Boolean).join("!")).join(",") : void 0
           })), h.data.loading = !1, I && (I == null || I()), (j === "previous" || !j && $ !== !0) && (i == null || i(!1)), a == null || a(!1), !B)
             return;
           L ? f.success({
@@ -25878,7 +25877,7 @@ const useCreateActionProps = () => {
               yield e.reset(), ($ && !j || j === "redirect") && w && (isURL(w) ? window.location.href = w : c(w));
             })
           }) : (message.success(m(B)), ($ && !j || j === "redirect" || j === "redirect") && w && (isURL(w) ? window.location.href = w : c(w)));
-        } catch (U) {
+        } catch (G) {
           h.data.loading = !1;
         }
       });
@@ -26100,11 +26099,11 @@ const useCreateActionProps = () => {
     (w) => {
       const { targets: B, uid: j } = findFilterTargets(t);
       o().forEach((T) => {
-        var G, H, W;
+        var U, H, K;
         if (!B.find((Y) => Y.uid === T.uid))
           return;
-        const O = `${j}${t.name}`, V = ((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 O = `${j}${t.name}`, V = ((U = T.service.params) == null ? void 0 : U[0]) || {};
+        (K = (H = T.service.params) == null ? void 0 : H[1]) != null && K.filters || _.set(T.service.params, "[1].filters", {});
         const E = T.service.params[1].filters;
         if (w.length)
           E[O] = {
@@ -26115,11 +26114,11 @@ const useCreateActionProps = () => {
             return T.clearData();
           delete E[O];
         }
-        const U = mergeFilter([...Object.values(E), T.defaultFilter]);
+        const G = mergeFilter([...Object.values(E), T.defaultFilter]);
         return T.doFilter(
           P(x({}, V), {
             page: 1,
-            filter: U
+            filter: G
           }),
           { filters: E }
         );
@@ -26747,7 +26746,10 @@ const UnitConversion = ({ unitConversionType: e }) => {
               { value: "0.01", label: "1.00" },
               { value: "0.001", label: "1.000" },
               { value: "0.0001", label: "1.0000" },
-              { value: "0.00001", label: "1.00000" }
+              { value: "0.00001", label: "1.00000" },
+              { value: "0.000001", label: "1.000000" },
+              { value: "0.0000001", label: "1.0000000" },
+              { value: "0.00000001", label: "1.00000000" }
             ]
           },
           addonBefore: {
@@ -26878,7 +26880,7 @@ const UnitConversion = ({ unitConversionType: e }) => {
     /* @__PURE__ */ jsx(DragHandler, {})
   ] });
 }, BlockItemCard = React.forwardRef((o, n) => {
-  var r = o, { children: e } = r, t = K(r, ["children"]);
+  var r = o, { children: e } = r, t = W(r, ["children"]);
   const { token: i } = useToken$1(), a = useMemo(() => ({ marginBottom: i.marginBlock }), [i.marginBlock]);
   return /* @__PURE__ */ jsx(Card, P(x({ ref: n, bordered: !1, style: a }, t), { children: e }));
 });
@@ -27637,7 +27639,7 @@ const jsonCss = css`
   font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
 `, Json = React.forwardRef(
   (a, i) => {
-    var l = a, { value: e, onChange: t, space: n = 2, json5: o = !1 } = l, r = K(l, ["value", "onChange", "space", "json5"]);
+    var l = a, { value: e, onChange: t, space: n = 2, json5: o = !1 } = l, r = W(l, ["value", "onChange", "space", "json5"]);
     const c = o ? JSON5 : JSON, u = useField(), [d, p] = useState("");
     return useEffect(() => {
       try {
@@ -28861,7 +28863,7 @@ const ConstantTypes = {
     label: '{{t("String")}}',
     value: "string",
     component: function e(r) {
-      var i = r, { onChange: t, value: n } = i, o = K(i, ["onChange", "value"]);
+      var i = r, { onChange: t, value: n } = i, o = W(i, ["onChange", "value"]);
       return /* @__PURE__ */ jsx(Input$3, x({ value: n, onChange: (a) => t(a.target.value) }, o));
     },
     default() {
@@ -28872,7 +28874,7 @@ const ConstantTypes = {
     label: '{{t("Number")}}',
     value: "number",
     component: function e(r) {
-      var i = r, { onChange: t, value: n } = i, o = K(i, ["onChange", "value"]);
+      var i = r, { onChange: t, value: n } = i, o = W(i, ["onChange", "value"]);
       return /* @__PURE__ */ jsx(InputNumber$1, x({ value: n, onChange: t }, o));
     },
     default() {
@@ -28883,7 +28885,7 @@ const ConstantTypes = {
     label: '{{t("Boolean")}}',
     value: "boolean",
     component: function e(r) {
-      var i = r, { onChange: t, value: n } = i, o = K(i, ["onChange", "value"]);
+      var i = r, { onChange: t, value: n } = i, o = W(i, ["onChange", "value"]);
       const { t: a } = useTranslation();
       return /* @__PURE__ */ jsx(
         Select$1,
@@ -28908,7 +28910,7 @@ const ConstantTypes = {
     label: '{{t("Date")}}',
     value: "date",
     component: function e(r) {
-      var i = r, { onChange: t, value: n } = i, o = K(i, ["onChange", "value"]);
+      var i = r, { onChange: t, value: n } = i, o = W(i, ["onChange", "value"]);
       return /* @__PURE__ */ jsx(
         DatePicker$1,
         x({
@@ -28965,7 +28967,7 @@ function getTypedConstantOption(e, t, n) {
   };
 }
 function Input$1(e) {
-  var H, W, Y;
+  var H, K, Y;
   const {
     value: t = "",
     onChange: n,
@@ -28995,10 +28997,10 @@ function Input$1(e) {
     label: y("Constant"),
     [B.value]: "$",
     [B.label]: y("Constant")
-  } : i ? getTypedConstantOption($, i, B) : null, [$, i]), T = (H = j == null ? void 0 : j.component) != null ? H : NullComponent, N = Array.isArray(i) ? (Y = (W = i.find((J) => Array.isArray(J) && J[0] === $)) == null ? void 0 : W[1]) != null ? Y : {} : {};
+  } : i ? getTypedConstantOption($, i, B) : null, [$, i]), T = (H = j == null ? void 0 : j.component) != null ? H : NullComponent, N = Array.isArray(i) ? (Y = (K = i.find((J) => Array.isArray(J) && J[0] === $)) == null ? void 0 : K[1]) != null ? Y : {} : {};
   let O;
   t == null ? a ? o && D ? O = ["$"] : O = [""] : o ? O = ["$"] : O = [" ", $] : O = o ? ["$"] : [" ", $], m && (O = ["$"]), useEffect(() => {
-    const Z = j != null ? j : {}, { component: J } = Z, X = K(Z, ["component"]), Q = [
+    const Z = j != null ? j : {}, { component: J } = Z, X = W(Z, ["component"]), Q = [
       ...a ? [
         {
           value: "",
@@ -29045,7 +29047,7 @@ function Input$1(e) {
       n(`{{${J.join(".")}}}`, X);
     },
     [$, w, n]
-  ), U = useCallback(() => {
+  ), G = useCallback(() => {
     var J;
     if (M(!!o), (J = j == null ? void 0 : j.children) != null && J.length) {
       const X = j.children[0].default();
@@ -29073,7 +29075,7 @@ function Input$1(e) {
       I([...F]), k([...Q]);
     });
   }, [w, F.length]);
-  const G = e.disabled || v.disabled;
+  const U = e.disabled || v.disabled;
   return g(
     /* @__PURE__ */ jsxs(Space$1.Compact, { style: l, className: cls(C, f, c), children: [
       w ? /* @__PURE__ */ jsxs(
@@ -29094,7 +29096,7 @@ function Input$1(e) {
               .ant-input {
                 overflow: auto;
                 white-space: nowrap;
-                ${G ? "" : "padding-right: 28px;"}
+                ${U ? "" : "padding-right: 28px;"}
 
                 .ant-tag {
                   display: inline;
@@ -29113,21 +29115,21 @@ function Input$1(e) {
                 role: "button",
                 "aria-label": "variable-tag",
                 style: { overflow: "hidden" },
-                className: cx("ant-input", { "ant-input-disabled": G }, f),
+                className: cx("ant-input", { "ant-input-disabled": U }, f),
                 children: /* @__PURE__ */ jsx(Tag, { color: "blue", children: R.map((J, X) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
                   X ? " / " : "",
                   J
                 ] }, J)) })
               }
             ),
-            G ? null : /* @__PURE__ */ jsx(
+            U ? null : /* @__PURE__ */ jsx(
               "span",
               {
                 role: "button",
                 "aria-label": "icon-close",
                 className: cx("clear-button"),
                 unselectable: "on",
-                onClick: U,
+                onClick: G,
                 children: /* @__PURE__ */ jsx(CloseCircleFilled, {})
               }
             )
@@ -29152,7 +29154,7 @@ function Input$1(e) {
           loadData: V,
           changeOnSelect: u,
           fieldNames: d,
-          disabled: G,
+          disabled: U,
           children: r != null ? r : /* @__PURE__ */ jsx(
             XButton,
             {
@@ -29160,7 +29162,7 @@ function Input$1(e) {
               margin-left: -1px;
             `),
               type: w ? "primary" : "default",
-              disabled: G
+              disabled: U
             }
           )
         }
@@ -29263,7 +29265,7 @@ function setNativeInputValue(e, t) {
   );
 }
 function RawTextArea(e) {
-  const t = useRef(null), m = e, { changeOnSelect: n, component: o = Input$3.TextArea, fieldNames: r, scope: i, buttonClass: a } = m, l = K(m, ["changeOnSelect", "component", "fieldNames", "scope", "buttonClass"]), c = typeof i == "function" ? i() : i, [u, d] = useState(c || []);
+  const t = useRef(null), m = e, { changeOnSelect: n, component: o = Input$3.TextArea, fieldNames: r, scope: i, buttonClass: a } = m, l = W(m, ["changeOnSelect", "component", "fieldNames", "scope", "buttonClass"]), c = typeof i == "function" ? i() : i, [u, d] = useState(c || []);
   function p(h) {
     if (!t.current)
       return;
@@ -29444,22 +29446,22 @@ function TextArea(e) {
       const E = (V = window.getSelection) == null ? void 0 : V.call(window);
       if (E)
         try {
-          const U = Array.from(N.childNodes);
-          U.length && (R[0] === -1 ? R[1] && O.setStartAfter(U[R[1] - 1]) : O.setStart(U[R[0]], R[1]), R[2] === -1 ? R[3] && O.setEndAfter(U[R[3] - 1]) : O.setEnd(U[R[2]], R[3])), O.collapse(!0), E.removeAllRanges(), E.addRange(O);
-        } catch (U) {
+          const G = Array.from(N.childNodes);
+          G.length && (R[0] === -1 ? R[1] && O.setStartAfter(G[R[1] - 1]) : O.setStart(G[R[0]], R[1]), R[2] === -1 ? R[3] && O.setEndAfter(G[R[3] - 1]) : O.setEnd(G[R[2]], R[3])), O.collapse(!0), E.removeAllRanges(), E.addRange(O);
+        } catch (G) {
         }
     } 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);
-        k([G, O.startOffset, H, O.endOffset]);
+        const G = Array.from(N.childNodes), U = O.startContainer === N ? -1 : G.indexOf(E), H = O.startContainer === N ? -1 : G.indexOf(E);
+        k([U, O.startOffset, H, O.endOffset]);
       }
     }
   }, [F]);
   const M = useCallback(
     function(N) {
-      const O = N.filter((U) => !!U.trim()), { current: V } = m;
+      const O = N.filter((G) => !!G.trim()), { current: V } = m;
       if (!V || !O)
         return;
       V.focus();
@@ -29497,10 +29499,10 @@ function TextArea(e) {
           span: ["ant-tag", "ant-tag-*"]
         },
         transformTags: {
-          span(E, U) {
-            return U["data-variable"] ? {
+          span(E, G) {
+            return G["data-variable"] ? {
               tagName: E,
-              attribs: U
+              attribs: G
             } : {};
           }
         }
@@ -33144,11 +33146,11 @@ const tableBlockSettings = new SchemaSettings({
   name: "fieldSettings:component:CascadeSelect",
   items: [fieldComponent$7, titleField$2, ellipsisSettingsItem]
 }), SchemaSettingsDateRange = function e(t) {
-  var R, k, D, M, z, L, $, w, B, j, T, N, O, V, E, U;
+  var R, k, D, M, z, L, $, w, B, j, T, N, O, V, E, G;
   const { fieldSchema: n } = t, o = useField(), { dn: r } = useDesignable(), { t: i } = useTranslation(), { getCollectionJoinField: a } = useCollectionManager_deprecated(), { isInSubForm: l, isInSubTable: c } = useFlag() || {}, u = a(n == null ? void 0 : n["x-collection-field"]) || {}, d = ((R = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : R.showTime) || ((D = (k = u == null ? void 0 : u.uiSchema) == null ? void 0 : k["x-component-props"]) == null ? void 0 : D.showTime) || !1, p = ((M = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : M.dateFormat) || ((L = (z = u == null ? void 0 : u.uiSchema) == null ? void 0 : z["x-component-props"]) == null ? void 0 : L.dateFormat) || "YYYY-MM-DD", m = (($ = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : $.timeFormat) || ((B = (w = u == null ? void 0 : u.uiSchema) == null ? void 0 : w["x-component-props"]) == null ? void 0 : B.timeFormat) || "HH:mm:ss", h = ((j = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : j.picker) || ((N = (T = u == null ? void 0 : u.uiSchema) == null ? void 0 : T["x-component-props"]) == null ? void 0 : N.picker) || "date";
   n["x-read-pretty"] || o.readOnly || o.readPretty;
-  const g = (O = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : O._minDate, f = (V = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : V._maxDate, C = ((E = u == null ? void 0 : u.uiSchema) == null ? void 0 : E["x-component-props"].gmt) || !1, b = ((U = u == null ? void 0 : u.uiSchema) == null ? void 0 : U["x-component-props"].utc) || !1, S = useRecord(), { form: y } = useFormBlockContext(), v = useCallback(
-    (G) => /* @__PURE__ */ jsx(
+  const g = (O = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : O._minDate, f = (V = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : V._maxDate, C = ((E = u == null ? void 0 : u.uiSchema) == null ? void 0 : E["x-component-props"].gmt) || !1, b = ((G = u == null ? void 0 : u.uiSchema) == null ? void 0 : G["x-component-props"].utc) || !1, S = useRecord(), { form: y } = useFormBlockContext(), v = useCallback(
+    (U) => /* @__PURE__ */ jsx(
       SchemaComponent,
       {
         schema: {
@@ -33174,9 +33176,9 @@ const tableBlockSettings = new SchemaSettings({
     ),
     [p, C, h, d, m, b]
   ), F = useCallback(
-    (G) => /* @__PURE__ */ jsx(
+    (U) => /* @__PURE__ */ jsx(
       VariableInput,
-      P(x({}, G), {
+      P(x({}, U), {
         form: y,
         record: S,
         noDisabled: !0,
@@ -33185,12 +33187,12 @@ const tableBlockSettings = new SchemaSettings({
     ),
     [n, y, S, v]
   );
-  function I(G) {
-    if (G != null) {
-      if (typeof G == "string")
-        return G;
-      if (typeof G == "object" && Object.prototype.hasOwnProperty.call(G, "value"))
-        return I(G.value);
+  function I(U) {
+    if (U != null) {
+      if (typeof U == "string")
+        return U;
+      if (typeof U == "object" && Object.prototype.hasOwnProperty.call(U, "value"))
+        return I(U.value);
     }
   }
   return /* @__PURE__ */ jsx(
@@ -33224,27 +33226,27 @@ const tableBlockSettings = new SchemaSettings({
           }
         }
       },
-      onSubmit: (G) => {
+      onSubmit: (U) => {
         const H = {
           "x-uid": n["x-uid"]
         };
         H["x-component-props"] = o.componentProps || {}, n["x-component-props"] = P(x({}, o.componentProps || {}), {
-          _maxDate: I(G == null ? void 0 : G._maxDate),
-          _minDate: I(G == null ? void 0 : G._minDate)
+          _maxDate: I(U == null ? void 0 : U._maxDate),
+          _minDate: I(U == null ? void 0 : U._minDate)
         }), H["x-component-props"] = n["x-component-props"], o.componentProps = n["x-component-props"];
-        const W = o.path.entire.split(".");
-        W.pop();
-        const Y = W.join(".");
+        const K = o.path.entire.split(".");
+        K.pop();
+        const Y = K.join(".");
         o.query(`${Y}.*[0:].${n.name}`).forEach((J) => {
           J.props.name === n.name && J.setComponentProps({
-            _maxDate: I(G == null ? void 0 : G._maxDate),
-            _minDate: I(G == null ? void 0 : G._minDate)
+            _maxDate: I(U == null ? void 0 : U._maxDate),
+            _minDate: I(U == null ? void 0 : U._minDate)
           });
         }), r.emit("patch", {
           schema: H
         }), r.refresh();
       },
-      ModalContextProvider: (G) => /* @__PURE__ */ jsx(FlagProvider, { isInSubForm: l, isInSubTable: c, isInFormDataTemplate: !0, children: G.children })
+      ModalContextProvider: (U) => /* @__PURE__ */ jsx(FlagProvider, { isInSubForm: l, isInSubTable: c, isInFormDataTemplate: !0, children: U.children })
     }
   );
 }, datePickerComponentFieldSettings = new SchemaSettings({
@@ -34738,6 +34740,12 @@ const useBuiltInVariables = () => {
       defaultValue: a
     }
   ], [t, e, o, a, r, i]) };
+}, cache = /* @__PURE__ */ new Map(), cacheLazyLoadedValues = (e, t, n) => {
+  const o = cache.get(e);
+  o ? o[t] = n : cache.set(e, { [t]: n });
+}, getCachedLazyLoadedValues = (e, t) => {
+  const n = cache.get(e);
+  return n == null ? void 0 : n[t];
 }, filterEmptyValues = (e) => Array.isArray(e) ? e.filter((t) => t === 0 || t === !1 || t) : e, TYPE_TO_ACTION = {
   hasMany: "list?pageSize=9999",
   belongsTo: "get",
@@ -34777,44 +34785,52 @@ const variablesStore = {}, getFieldPath = (e, t) => {
             dataSource: k,
             collectionName: L
           };
-        const T = y[j], { fieldPath: N } = getFieldPath(y.slice(0, j + 1).join("."), F), O = r(N, k), V = (B = i(M, k)) == null ? void 0 : B.getPrimaryKey();
+        const T = y[j], N = y.slice(0, j + 1).join("."), { fieldPath: O } = getFieldPath(N, F), V = r(O, k), E = (B = i(M, k)) == null ? void 0 : B.getPrimaryKey();
         if (Array.isArray(I)) {
-          const E = I.map((U) => {
-            if (!(S != null && S.doNotRequest) && shouldToRequest(U == null ? void 0 : U[T]) && (U == null ? void 0 : U[V]) != null && O != null && O.target) {
-              const G = `/${M}/${U[O.sourceKey || V]}/${T}:${getAction(O.type)}`;
-              if (hasRequested(G))
-                return getRequested(G);
-              const H = o.request({
+          const G = I.map((U) => {
+            if (!(S != null && S.doNotRequest) && shouldToRequest(U == null ? void 0 : U[T], U, N) && (U == null ? void 0 : U[E]) != null && V != null && V.target) {
+              const H = `/${M}/${U[V.sourceKey || E]}/${T}:${getAction(V.type)}`;
+              if (hasRequested(H))
+                return getRequested(H);
+              const K = o.request({
                 headers: getDataSourceHeaders(k),
-                url: G,
+                url: H,
                 params: {
                   appends: S == null ? void 0 : S.appends
                 }
-              }).then((W) => (clearRequested(G), U[T] = W.data.data, U[T]));
-              return stashRequested(G, H), H;
+              }).then((Y) => {
+                clearRequested(H);
+                const J = Y.data.data;
+                return cacheLazyLoadedValues(U, N, J), J;
+              });
+              return stashRequested(H, K), K;
             }
-            return U == null ? void 0 : U[T];
+            return getCachedLazyLoadedValues(U, N) || (U == null ? void 0 : U[T]);
           });
-          I = removeThroughCollectionFields(_.flatten(yield Promise.all(E)), O);
-        } else if (!(S != null && S.doNotRequest) && shouldToRequest(I[T]) && I[V] != null && (O != null && O.target)) {
-          const E = `/${M}/${I[O.sourceKey || V]}/${T}:${getAction(O.type)}`;
+          I = removeThroughCollectionFields(_.flatten(yield Promise.all(G)), V);
+        } else if (!(S != null && S.doNotRequest) && shouldToRequest(I[T], I, N) && I[E] != null && (V != null && V.target)) {
+          const G = `/${M}/${I[V.sourceKey || E]}/${T}:${getAction(V.type)}`;
           let U = null;
-          if (hasRequested(E))
-            U = yield getRequested(E);
+          if (hasRequested(G))
+            U = yield getRequested(G);
           else {
-            const G = o.request({
+            const K = o.request({
               headers: getDataSourceHeaders(k),
-              url: E,
+              url: G,
               params: {
                 appends: S == null ? void 0 : S.appends
               }
             });
-            stashRequested(E, G), U = yield G, clearRequested(E);
+            stashRequested(G, K), U = yield K, clearRequested(G);
           }
-          raw(I)[T] || (raw(I)[T] = U.data.data), I = removeThroughCollectionFields(getValuesByPath(I, T), O);
+          const H = U.data.data;
+          getCachedLazyLoadedValues(I, N) || cacheLazyLoadedValues(I, N, H), I = removeThroughCollectionFields(H, V);
         } else
-          I = removeThroughCollectionFields(getValuesByPath(I, T), O);
-        O != null && O.target && (M = O.target);
+          I = removeThroughCollectionFields(
+            getCachedLazyLoadedValues(I, N) || getValuesByPath(I, T),
+            V
+          );
+        V != null && V.target && (M = V.target);
       }
       const $ = a(
         _.isFunction(I) ? I({ fieldOperator: S == null ? void 0 : S.fieldOperator, isParsingVariable: !0 }) : I
@@ -34847,9 +34863,9 @@ const variablesStore = {}, getFieldPath = (e, t) => {
     [c]
   ), h = useCallback(
     /**
-     * 将变量字符串解析为真正的值
-     * @param str 变量字符串
-     * @param localVariables 局部变量，解析完成后会被清除
+     * Parse the variable string to the actual value
+     * @param str Variable string
+     * @param localVariables Local variables, will be cleared after parsing
      * @returns
      */
     (C, b, S) => q(void 0, null, function* () {
@@ -34903,15 +34919,15 @@ const variablesStore = {}, getFieldPath = (e, t) => {
 };
 VariablesProvider.displayName = "VariablesProvider";
 const VariablesProvider$1 = VariablesProvider;
-function shouldToRequest(e) {
-  let t = !1;
-  return untracked(() => {
+function shouldToRequest(e, t, n) {
+  let o = !1;
+  return getCachedLazyLoadedValues(t, n) ? !1 : (untracked(() => {
     if (JSON.stringify(e) === "[{}]" || JSON.stringify(e) === "{}") {
-      t = !0;
+      o = !0;
       return;
     }
-    t = _.isEmpty(e);
-  }), t;
+    o = _.isEmpty(e);
+  }), o);
 }
 function mergeCtxWithLocalVariables(e, t) {
   return e = x({}, e), t == null || t.forEach((n) => {
@@ -35177,7 +35193,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.5.6", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.5.7", 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",
@@ -35199,9 +35215,9 @@ const name = "@nocobase/client", version = "1.5.6", license = "AGPL-3.0", main =
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.5.6",
-  "@nocobase/sdk": "1.5.6",
-  "@nocobase/utils": "1.5.6",
+  "@nocobase/evaluators": "1.5.7",
+  "@nocobase/sdk": "1.5.7",
+  "@nocobase/utils": "1.5.7",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -36054,7 +36070,7 @@ const SortableProvider = (e) => {
   return /* @__PURE__ */ jsx(SortableContext.Provider, { value: a, children: o });
 }, getComputedColor = (e) => new TinyColor(e).setAlpha(0.15).toHex8String(), Sortable = (e) => {
   var g, f;
-  const h = e, { component: t, overStyle: n, style: o, children: r, openMode: i } = h, a = K(h, ["component", "overStyle", "style", "children", "openMode"]), { token: l } = useToken(), { draggable: c, droppable: u } = useContext(SortableContext), { isOver: d, setNodeRef: p } = u, m = x({}, o);
+  const h = e, { component: t, overStyle: n, style: o, children: r, openMode: i } = h, a = W(h, ["component", "overStyle", "style", "children", "openMode"]), { token: l } = useToken(), { draggable: c, droppable: u } = useContext(SortableContext), { isOver: d, setNodeRef: p } = u, m = x({}, o);
   return d && ((g = c == null ? void 0 : c.active) == null ? void 0 : g.id) !== ((f = u == null ? void 0 : u.over) == null ? void 0 : f.id) && (m[t === "a" ? "color" : "background"] = getComputedColor(l.colorSettings), Object.assign(m, n)), React.createElement(
     t || "div",
     P(x({
@@ -36075,7 +36091,7 @@ const SortableProvider = (e) => {
   return e.id ? e.id : (n = t.address) == null ? void 0 : n.toString();
 }, InternalSortableItem = observer$1(
   (e) => {
-    const l = useSortableItemProps(e), { schema: t, id: n, eid: o, removeParentsIfNoChildren: r } = l, i = K(l, ["schema", "id", "eid", "removeParentsIfNoChildren"]), a = useMemo(() => ({
+    const l = useSortableItemProps(e), { schema: t, id: n, eid: o, removeParentsIfNoChildren: r } = l, i = W(l, ["schema", "id", "eid", "removeParentsIfNoChildren"]), a = useMemo(() => ({
       insertAdjacent: "afterEnd",
       schema: t,
       removeParentsIfNoChildren: r != null ? r : !0
@@ -36084,7 +36100,7 @@ const SortableProvider = (e) => {
   },
   { displayName: "InternalSortableItem" }
 ), SortableItem = React.memo((e) => {
-  const r = e, { component: t } = r, n = K(r, ["component"]), { designable: o } = useDesignable();
+  const r = e, { component: t } = r, n = W(r, ["component"]), { designable: o } = useDesignable();
   return o ? /* @__PURE__ */ jsx(InternalSortableItem, x({}, e)) : React.createElement(
     t || "div",
     _.omit(n, ["children", "schema", "overStyle", "openMode", "id", "eid", "removeParentsIfNoChildren"]),
@@ -36155,10 +36171,10 @@ const DragHandler = (e) => {
     }
   });
 }, FormComponent$1 = (e) => {
-  const l = e, { form: t, children: n } = l, o = K(l, ["form", "children"]), r = useField(), i = useFieldSchema(), a = useAttach(t.createVoidField(P(x({}, r.props), { basePath: "" })));
+  const l = e, { form: t, children: n } = l, o = W(l, ["form", "children"]), r = useField(), i = useFieldSchema(), a = useAttach(t.createVoidField(P(x({}, r.props), { basePath: "" })));
   return /* @__PURE__ */ jsx(FieldContext.Provider, { value: void 0, children: /* @__PURE__ */ jsx(FormContext.Provider, { value: t, children: /* @__PURE__ */ jsx(FormLayout, P(x({ layout: "vertical" }, o), { children: /* @__PURE__ */ jsx(NocoBaseRecursionField, { basePath: a.address, schema: i, onlyRenderProperties: !0 }) })) }) });
 }, Def$1 = (e) => e.children, FormDecorator$1 = (e) => {
-  const u = e, { form: t, children: n, disabled: o } = u, r = K(u, ["form", "children", "disabled"]), i = useField(), a = useFieldSchema(), l = useAttach(t.createVoidField(P(x({}, i.props), { basePath: "" }))), c = useComponent(a["x-component"], Def$1);
+  const u = e, { form: t, children: n, disabled: o } = u, r = W(u, ["form", "children", "disabled"]), i = useField(), a = useFieldSchema(), l = useAttach(t.createVoidField(P(x({}, i.props), { basePath: "" }))), c = useComponent(a["x-component"], Def$1);
   return useEffect(() => {
     t.disabled = o || i.disabled;
   }, [o, i.disabled]), /* @__PURE__ */ jsx(ConfigProvider, { componentDisabled: o, children: /* @__PURE__ */ jsx(FieldContext.Provider, { value: void 0, children: /* @__PURE__ */ jsx(FormContext.Provider, { value: t, children: /* @__PURE__ */ jsx(FormLayout, P(x({ layout: "vertical" }, r), { children: /* @__PURE__ */ jsx(FieldContext.Provider, { value: l, children: /* @__PURE__ */ jsx(c, P(x({}, i.componentProps), { children: /* @__PURE__ */ jsx(NocoBaseRecursionField, { basePath: l.address, schema: a, onlyRenderProperties: !0 }) })) }) })) }) }) });
@@ -36171,7 +36187,7 @@ const DragHandler = (e) => {
 FormBlockContext.displayName = "FormBlockContext";
 const Form$1 = observer$1(
   (e) => {
-    const p = e, { request: t, effects: n, initialValue: o, useValues: r = useDefaultValues } = p, i = K(p, ["request", "effects", "initialValue", "useValues"]), a = useFieldSchema(), l = useField(), c = useMemo(() => createForm({ effects: n }), []), u = r(
+    const p = e, { request: t, effects: n, initialValue: o, useValues: r = useDefaultValues } = p, i = W(p, ["request", "effects", "initialValue", "useValues"]), a = useFieldSchema(), l = useField(), c = useMemo(() => createForm({ effects: n }), []), u = r(
       {
         uid: a["x-uid"],
         onSuccess(h) {
@@ -36326,7 +36342,7 @@ const ReadPrettyInternal = observer$1(
   },
   { displayName: "SelectReadPretty" }
 ), ReadPretty$b = withPopupWrapper(ReadPrettyInternal), isEmptyObject = (e) => !isValid(e) || typeof e == "object" && Object.keys(e).length === 0, ObjectSelect = (e) => {
-  const p = e, { value: t, options: n, onChange: o, fieldNames: r, mode: i, loading: a, rawOptions: l, defaultValue: c } = p, u = K(p, ["value", "options", "onChange", "fieldNames", "mode", "loading", "rawOptions", "defaultValue"]), d = (m) => {
+  const p = e, { value: t, options: n, onChange: o, fieldNames: r, mode: i, loading: a, rawOptions: l, defaultValue: c } = p, u = W(p, ["value", "options", "onChange", "fieldNames", "mode", "loading", "rawOptions", "defaultValue"]), d = (m) => {
     var f;
     if (isEmptyObject(m))
       return;
@@ -36390,7 +36406,7 @@ const ReadPrettyInternal = observer$1(
   return ((n = t == null ? void 0 : t.label) != null ? n : "").toLowerCase().includes((e || "").toLowerCase());
 }, InternalSelect = connect(
   (e) => {
-    const d = e, { objectValue: t, loading: n, value: o, rawOptions: r, defaultValue: i } = d, a = K(d, ["objectValue", "loading", "value", "rawOptions", "defaultValue"]), l = useCompile();
+    const d = e, { objectValue: t, loading: n, value: o, rawOptions: r, defaultValue: i } = d, a = W(d, ["objectValue", "loading", "value", "rawOptions", "defaultValue"]), l = useCompile();
     let c = e.multiple ? "multiple" : e.mode;
     if (c && !["multiple", "tags"].includes(c) && (c = void 0), t)
       return /* @__PURE__ */ jsx(
@@ -36484,7 +36500,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
   connect(
     (e) => {
       var Y, J;
-      const W = e, {
+      const K = e, {
         fieldNames: t = {},
         service: n = {},
         wait: o = 300,
@@ -36499,7 +36515,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
         dataSource: m,
         toOptionsItem: h = (X) => X,
         popupMatchSelectWidth: g = !1
-      } = W, f = K(W, [
+      } = K, f = W(K, [
         "fieldNames",
         "service",
         "wait",
@@ -36583,7 +36599,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
       useEffect(() => {
         v.current && N();
       }, [V]);
-      const U = (X) => q(void 0, null, function* () {
+      const G = (X) => q(void 0, null, function* () {
         var Q;
         N({
           filter: mergeFilter([
@@ -36595,7 +36611,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
             (Q = n == null ? void 0 : n.params) == null ? void 0 : Q.filter
           ])
         }), k.current = X;
-      }), G = useMemo(() => {
+      }), U = useMemo(() => {
         var oe;
         const X = r || i;
         if (!((oe = T == null ? void 0 : T.data) != null && oe.length))
@@ -36612,7 +36628,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
           filterOption: !1,
           filterSort: null,
           fieldNames: t,
-          onSearch: U,
+          onSearch: G,
           onDropdownVisibleChange: (X) => {
             y(X), k.current = null, X && N(), v.current = !0;
           },
@@ -36621,10 +36637,10 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
           defaultValue: i
         }, f), {
           loading: T ? O : !0,
-          options: h(j(G)),
-          rawOptions: G,
+          options: h(j(U)),
+          rawOptions: U,
           dropdownRender: (X) => {
-            const Q = G.some((Z) => Z[t.label] === k.current);
+            const Q = U.some((Z) => Z[t.label] === k.current);
             return /* @__PURE__ */ jsx(Fragment, { children: I ? /* @__PURE__ */ jsxs(Fragment, { children: [
               !((T == null ? void 0 : T.data.length) === 0 && (k != null && k.current)) && X,
               (T == null ? void 0 : T.data.length) > 0 && (k == null ? void 0 : k.current) && !Q && /* @__PURE__ */ jsx(Divider$1, { style: { margin: 0 } }),
@@ -36769,7 +36785,7 @@ const useFormBlockHeight = () => {
   const e = useDataBlockHeight(), t = useFieldSchema(), { token: n } = theme$1.useToken(), { designable: o } = useDesignable(), { heightProps: r } = useBlockHeightProps() || {}, { title: i } = r || {}, { display: a, enabled: l } = useFormDataTemplates(), c = t.reduceProperties((I, R) => R["x-component"] === "ActionBar" ? R : I), u = Object.keys((c == null ? void 0 : c.properties) || {}).length > 0, d = (F = (v = (y = t == null ? void 0 : t.parent) == null ? void 0 : y["x-decorator"]) == null ? void 0 : v.includes) == null ? void 0 : F.call(v, "FormBlockProvider"), p = u || o ? n.controlHeight + (d ? 1 : 2) * n.marginLG : n.marginLG, m = i ? n.fontSizeLG * n.lineHeightLG + n.padding * 2 - 1 : 0, h = useDataBlockRequestData(), { count: g, pageSize: f } = (h == null ? void 0 : h.meta) || {}, b = g > f ? n.controlHeightSM + 1 * n.paddingLG : 0, S = a && l ? n.controlHeight + 2 * n.padding + n.margin : 0;
   return e - p - n.paddingLG - m - b - S;
 }, FormComponent = (e) => {
-  const g = e, { form: t, children: n } = g, o = K(g, ["form", "children"]), r = useField(), i = useFieldSchema(), a = getCardItemSchema == null ? void 0 : getCardItemSchema(i), l = useAttach(t.createVoidField(P(x({}, r.props), { basePath: "" }))), c = useFormBlockHeight(), { token: u } = theme$1.useToken(), {
+  const g = e, { form: t, children: n } = g, o = W(g, ["form", "children"]), r = useField(), i = useFieldSchema(), a = getCardItemSchema == null ? void 0 : getCardItemSchema(i), l = useAttach(t.createVoidField(P(x({}, r.props), { basePath: "" }))), c = useFormBlockHeight(), { token: u } = theme$1.useToken(), {
     layout: d = "vertical",
     labelAlign: p = "left",
     labelWidth: m = 120,
@@ -36807,7 +36823,7 @@ const useFormBlockHeight = () => {
     })
   ) }) });
 }, Def = (e) => e.children, FormDecorator = (e) => {
-  const u = e, { form: t, children: n, disabled: o } = u, r = K(u, ["form", "children", "disabled"]), i = useField(), a = useFieldSchema(), l = useAttach(t.createVoidField(P(x({}, i.props), { basePath: "" }))), c = useComponent(a["x-component"], Def);
+  const u = e, { form: t, children: n, disabled: o } = u, r = W(u, ["form", "children", "disabled"]), i = useField(), a = useFieldSchema(), l = useAttach(t.createVoidField(P(x({}, i.props), { basePath: "" }))), c = useComponent(a["x-component"], Def);
   return /* @__PURE__ */ jsx(FieldContext.Provider, { value: void 0, children: /* @__PURE__ */ jsx(FormContext.Provider, { value: t, children: /* @__PURE__ */ jsx(FormLayout, P(x({ layout: "vertical" }, r), { children: /* @__PURE__ */ jsx(FieldContext.Provider, { value: l, children: /* @__PURE__ */ jsx(c, P(x({}, i.componentProps), { children: /* @__PURE__ */ jsx(
     NocoBaseRecursionField,
     {
@@ -36885,7 +36901,7 @@ const useFormBlockHeight = () => {
   }
 `, Form = withDynamicSchemaProps(
   observer$1((e) => {
-    const t = useField(), { token: n } = useToken$1(), c = useProps(e), { form: o, disabled: r } = c, i = K(c, ["form", "disabled"]), a = useMemo(() => ({
+    const t = useField(), { token: n } = useToken$1(), c = useProps(e), { form: o, disabled: r } = c, i = W(c, ["form", "disabled"]), a = useMemo(() => ({
       token: {
         // 这里是为了防止区块内部也收到 marginBlock 的影响（marginBlock：区块之间的间距）
         // @ts-ignore
@@ -37994,7 +38010,7 @@ const AppendsTreeSelect = (e) => {
     filter: a = trueFilter,
     rootOption: l,
     loadData: c
-  } = z, u = K(z, [
+  } = z, u = W(z, [
     "title",
     "value",
     "onChange",
@@ -38101,6 +38117,9 @@ const AppendsTreeSelect = (e) => {
       loadData: I
     }, u)
   );
+}, AssociationFieldAddNewer = (e) => {
+  const t = useContext(SchemaComponentContext);
+  return /* @__PURE__ */ jsx(SchemaComponentContext.Provider, { value: P(x({}, t), { draggable: !0 }), children: /* @__PURE__ */ jsx(Action.Container, x({}, e)) });
 }, filterAnalyses = (e) => {
   if (!e)
     return;
@@ -38116,7 +38135,7 @@ const AppendsTreeSelect = (e) => {
 }, InternalAssociationSelect$1 = observer$1(
   (e) => {
     var R;
-    const I = e, { objectValue: t = !0, addMode: n } = I, o = K(I, ["objectValue", "addMode"]), r = useField(), i = useFieldSchema(), a = useServiceOptions$1((i == null ? void 0 : i["x-component-props"]) || e), { options: l } = useAssociationFieldContext(), c = isVariable(e.value) ? void 0 : e.value, u = Array.isArray(c) ? c.filter(Boolean) : c, [d, p] = useState(u), m = (R = i["x-component-props"]) == null ? void 0 : R.addMode, { t: h } = useTranslation(), { multiple: g } = e, f = useForm(), b = useAPIClient().resource(l.target), S = useCollectionRecordData(), y = useContext(SchemaComponentContext);
+    const I = e, { objectValue: t = !0, addMode: n } = I, o = W(I, ["objectValue", "addMode"]), r = useField(), i = useFieldSchema(), a = useServiceOptions$1((i == null ? void 0 : i["x-component-props"]) || e), { options: l } = useAssociationFieldContext(), c = isVariable(e.value) ? void 0 : e.value, u = Array.isArray(c) ? c.filter(Boolean) : c, [d, p] = useState(u), m = (R = i["x-component-props"]) == null ? void 0 : R.addMode, { t: h } = useTranslation(), { multiple: g } = e, f = useForm(), b = useAPIClient().resource(l.target), S = useCollectionRecordData(), y = useContext(SchemaComponentContext);
     useEffect(() => {
       const k = isVariable(r.value) ? void 0 : r.value, D = Array.isArray(k) ? k.filter(Boolean) : k;
       p(D);
@@ -38125,7 +38144,7 @@ const AppendsTreeSelect = (e) => {
       return f.addEffects(k, () => {
         onFieldInputValueChange("*", (D) => {
           var z, L, $, w, B;
-          (filterAnalyses(($ = (L = (z = r.componentProps) == null ? void 0 : z.service) == null ? void 0 : L.params) == null ? void 0 : $.filter) || []).includes((w = D == null ? void 0 : D.props) == null ? void 0 : w.name) && r.value && isEqual(D == null ? void 0 : D.indexes, r == null ? void 0 : r.indexes) && ((B = D == null ? void 0 : D.props) == null ? void 0 : B.name) !== r.props.name && (r.setValue(void 0), p(void 0));
+          (filterAnalyses(($ = (L = (z = r.componentProps) == null ? void 0 : z.service) == null ? void 0 : L.params) == null ? void 0 : $.filter) || []).includes((w = D == null ? void 0 : D.props) == null ? void 0 : w.name) && r.value && isEqual(D == null ? void 0 : D.indexes, r == null ? void 0 : r.indexes) && ((B = D == null ? void 0 : D.props) == null ? void 0 : B.name) !== r.props.name && (r.setValue(null), p(null));
         });
       }), () => {
         f.removeEffects(k);
@@ -38159,7 +38178,7 @@ const AppendsTreeSelect = (e) => {
         ]
       }
     );
-    return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsxs(Space$1.Compact, { style: { display: "flex" }, children: [
+    return console.log(i), /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsxs(Space$1.Compact, { style: { display: "flex" }, children: [
       /* @__PURE__ */ jsx(
         RemoteSelect,
         P(x({
@@ -38602,7 +38621,7 @@ function IframePreviewer({ index: e, list: t, onSwitchIndex: n }) {
   );
 }
 function InternalUpload(e) {
-  const r = e, { onChange: t } = r, n = K(r, ["onChange"]), o = useCallback(
+  const r = e, { onChange: t } = r, n = W(r, ["onChange"]), o = useCallback(
     (i) => {
       t == null || t(toFileList(i.fileList));
     },
@@ -38721,7 +38740,7 @@ function AttachmentList(e) {
   ] });
 }
 function Uploader(n) {
-  var o = n, { rules: e } = o, t = K(o, ["rules"]);
+  var o = n, { rules: e } = o, t = W(o, ["rules"]);
   const { disabled: r, multiple: i, value: a, onChange: l, toValueItem: c = toValueItem } = t, [u, d] = useState([]), { t: p } = useTranslation(), { componentCls: m } = useStyles$8(), h = useField(), g = useUploadProps(t), f = useBeforeUpload(e);
   useEffect(() => {
     u.length ? h.setFeedback({
@@ -38804,7 +38823,7 @@ Upload.Attachment = withDynamicSchemaProps(connect(Attachment, mapReadPretty(Att
 });
 Upload.Dragger = connect(
   (e) => {
-    const c = e, { tipContent: t, onChange: n } = c, o = K(c, ["tipContent", "onChange"]), { wrapSSR: r, hashId: i, componentCls: a } = useStyles$8(), l = useCallback(
+    const c = e, { tipContent: t, onChange: n } = c, o = W(c, ["tipContent", "onChange"]), { wrapSSR: r, hashId: i, componentCls: a } = useStyles$8(), l = useCallback(
       (u) => {
         n == null || n(toFileList(u.fileList));
       },
@@ -38824,8 +38843,8 @@ Upload.Dragger = connect(
 Upload.DraggerV2 = withDynamicSchemaProps(
   connect(
     (n) => {
-      var o = n, { rules: e } = o, t = K(o, ["rules"]);
-      const { t: r } = useTranslation(), i = r("Click or drag file to this area to upload"), S = useProps(t), { title: a = i } = S, l = K(S, ["title"]), [c, u] = useState(!1), { wrapSSR: d, hashId: p, componentCls: m } = useStyles$8(), h = useBeforeUpload(e), { size: g, mimetype: f } = e != null ? e : {}, C = useSizeHint(g), b = useCallback(
+      var o = n, { rules: e } = o, t = W(o, ["rules"]);
+      const { t: r } = useTranslation(), i = r("Click or drag file to this area to upload"), S = useProps(t), { title: a = i } = S, l = W(S, ["title"]), [c, u] = useState(!1), { wrapSSR: d, hashId: p, componentCls: m } = useStyles$8(), h = useBeforeUpload(e), { size: g, mimetype: f } = e != null ? e : {}, C = useSizeHint(g), b = useCallback(
         ({ fileList: y }) => {
           const { onChange: v } = l;
           v == null || v(y), y.some((F) => F.status === "uploading") ? u(!0) : u(!1);
@@ -38994,7 +39013,7 @@ const schema$1 = {
     setSelectedRows: o,
     selectedRows: r = [],
     onChange: i
-  } = useContext(RecordPickerContext), d = useTableSelectorProps$4(), { onRowSelectionChange: a, rowKey: l = "id" } = d, c = K(d, ["onRowSelectionChange", "rowKey"]), { setVisible: u } = useActionContext();
+  } = useContext(RecordPickerContext), d = useTableSelectorProps$4(), { onRowSelectionChange: a, rowKey: l = "id" } = d, c = W(d, ["onRowSelectionChange", "rowKey"]), { setVisible: u } = useActionContext();
   return P(x({}, c), {
     rowKey: l,
     rowSelection: {
@@ -39011,7 +39030,7 @@ const schema$1 = {
   });
 };
 function FileSelector(e) {
-  const y = e, { disabled: t, multiple: n, value: o, onChange: r, action: i, onSelect: a, quickUpload: l, selectFile: c } = y, u = K(y, ["disabled", "multiple", "value", "onChange", "action", "onSelect", "quickUpload", "selectFile"]), { wrapSSR: d, hashId: p, componentCls: m } = useStyles$8(), { useFileCollectionStorageRules: h, useAttachmentFieldProps: g } = useExpressionScope(), { t: f } = useTranslation(), C = h(), b = g(), S = c === void 0 && l === void 0;
+  const y = e, { disabled: t, multiple: n, value: o, onChange: r, action: i, onSelect: a, quickUpload: l, selectFile: c } = y, u = W(y, ["disabled", "multiple", "value", "onChange", "action", "onSelect", "quickUpload", "selectFile"]), { wrapSSR: d, hashId: p, componentCls: m } = useStyles$8(), { useFileCollectionStorageRules: h, useAttachmentFieldProps: g } = useExpressionScope(), { t: f } = useTranslation(), C = h(), b = g(), S = c === void 0 && l === void 0;
   return d(
     /* @__PURE__ */ jsx("div", { className: cls(`${m}-wrapper`, `${m}-picture-card-wrapper`, "nb-upload", p), children: /* @__PURE__ */ jsxs("div", { className: cls(`${m}-list`, `${m}-list-picture-card`), children: [
       /* @__PURE__ */ jsx(AttachmentList, { disabled: t, multiple: n, value: o, onChange: r }),
@@ -39067,7 +39086,7 @@ function FileSelector(e) {
 }
 const InternalFileManager = (e) => {
   var D, M;
-  const k = e, { value: t, multiple: n, onChange: o } = k, r = K(k, ["value", "multiple", "onChange"]), i = useFieldSchema(), [a, l] = useState(!1), [c, u] = useState([]), d = useInsertSchema$1("Selector"), p = useFieldNames$1(e), { designable: m } = useDesignable(), h = useField(), [g, f] = useState([]), { getField: C } = useCollection_deprecated(), b = C(h.props.name), S = useLabelUiSchema$1(b == null ? void 0 : b.target, (p == null ? void 0 : p.label) || "label"), y = useCompile(), { modalProps: v } = useActionContext(), F = (z) => {
+  const k = e, { value: t, multiple: n, onChange: o } = k, r = W(k, ["value", "multiple", "onChange"]), i = useFieldSchema(), [a, l] = useState(!1), [c, u] = useState([]), d = useInsertSchema$1("Selector"), p = useFieldNames$1(e), { designable: m } = useDesignable(), h = useField(), [g, f] = useState([]), { getField: C } = useCollection_deprecated(), b = C(h.props.name), S = useLabelUiSchema$1(b == null ? void 0 : b.target, (p == null ? void 0 : p.label) || "label"), y = useCompile(), { modalProps: v } = useActionContext(), F = (z) => {
     z.stopPropagation(), z.preventDefault(), m ? d(schema$1.Selector) : i.reduceProperties(($, w) => w["x-component"] === "AssociationField.Selector" ? w : $, null) || i.addProperty("selector", schema$1.Selector), l(!0), u([]);
   };
   useEffect(() => {
@@ -39177,8 +39196,8 @@ const InternalFileManager = (e) => {
           if ((j = v == null ? void 0 : v.uiSchema) != null && j.enum)
             if (Array.isArray(B))
               B = B.map((O, V) => {
-                var U, G;
-                const E = (G = (U = v.uiSchema.enum).find) == null ? void 0 : G.call(U, (H) => H.value === O);
+                var G, U;
+                const E = (U = (G = v.uiSchema.enum).find) == null ? void 0 : U.call(G, (H) => H.value === O);
                 return E ? /* @__PURE__ */ jsx(Tag, { color: E.color, style: { marginRight: 3 }, children: (E == null ? void 0 : E.label) || O }, V) : /* @__PURE__ */ jsx(Tag, { children: O }, O);
               }).reverse();
             else {
@@ -39372,7 +39391,7 @@ function transformNestedData(e) {
       const { parent: l } = o;
       n(l);
     }
-    const a = o, { parent: r } = a, i = K(a, ["parent"]);
+    const a = o, { parent: r } = a, i = W(a, ["parent"]);
     t.push(i);
   }
   return e && n(e), t;
@@ -39454,7 +39473,7 @@ const InternalNesterCss = css`
     setSelectedRows: o,
     selectedRows: r = [],
     onChange: i
-  } = useContext(RecordPickerContext), d = useTableSelectorProps$4(), { onRowSelectionChange: a, rowKey: l = "id" } = d, c = K(d, ["onRowSelectionChange", "rowKey"]), { setVisible: u } = useActionContext();
+  } = useContext(RecordPickerContext), d = useTableSelectorProps$4(), { onRowSelectionChange: a, rowKey: l = "id" } = d, c = W(d, ["onRowSelectionChange", "rowKey"]), { setVisible: u } = useActionContext();
   return P(x({}, c), {
     rowKey: l,
     rowSelection: {
@@ -39472,7 +39491,7 @@ const InternalNesterCss = css`
 }, InternalPicker = observer$1(
   (e) => {
     var $;
-    const L = e, { value: t, multiple: n, openSize: o, onChange: r, quickUpload: i, selectFile: a, shouldMountElement: l } = L, c = K(L, ["value", "multiple", "openSize", "onChange", "quickUpload", "selectFile", "shouldMountElement"]), u = useField(), d = useFieldNames$1(e), [p, m] = useState(!1), h = useFieldSchema(), g = useInsertSchema$1("Selector"), { options: f } = useAssociationFieldContext(), { collectionName: C } = useFormBlockContext(), b = useCompile(), S = useLabelUiSchema$1(f, (d == null ? void 0 : d.label) || "label"), y = h["x-add-new"], [v, F] = useState([]), I = useCollectionRecordData(), R = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((B) => {
+    const L = e, { value: t, multiple: n, openSize: o, onChange: r, quickUpload: i, selectFile: a, shouldMountElement: l } = L, c = W(L, ["value", "multiple", "openSize", "onChange", "quickUpload", "selectFile", "shouldMountElement"]), u = useField(), d = useFieldNames$1(e), [p, m] = useState(!1), h = useFieldSchema(), g = useInsertSchema$1("Selector"), { options: f } = useAssociationFieldContext(), { collectionName: C } = useFormBlockContext(), b = useCompile(), S = useLabelUiSchema$1(f, (d == null ? void 0 : d.label) || "label"), y = h["x-add-new"], [v, F] = useState([]), I = useCollectionRecordData(), R = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((B) => {
       const j = B == null ? void 0 : B[d.label];
       return P(x({}, B), {
         [d.label]: getLabelFormatValue$1(b(S), b(j))
@@ -40509,7 +40528,7 @@ const useColumnsDeepMemoized = (e) => {
   var g, C, b, S, y, v;
   const { isInSubTable: t } = useFlag(), { token: n } = useToken(), o = (g = e["data-row-key"]) == null ? void 0 : g.toString(), { setNodeRef: r, isOver: i, active: a, over: l } = useSortable({
     id: o
-  }), f = e, { rowIndex: c } = f, u = K(f, ["rowIndex"]), { ref: d, inView: p } = useInView({
+  }), f = e, { rowIndex: c } = f, u = W(f, ["rowIndex"]), { ref: d, inView: p } = useInView({
     threshold: 0,
     triggerOnce: !0,
     initialInView: t || (c || 0) < INITIAL_ROWS_NUMBER,
@@ -40540,12 +40559,12 @@ const useColumnsDeepMemoized = (e) => {
     })
   ) });
 }, SortHandle$1 = (e) => {
-  const i = e, { id: t } = i, n = K(i, ["id"]), { listeners: o, setNodeRef: r } = useSortable({
+  const i = e, { id: t } = i, n = W(i, ["id"]), { listeners: o, setNodeRef: r } = useSortable({
     id: t
   });
   return /* @__PURE__ */ jsx(MenuOutlined, P(x(x({ ref: r }, n), o), { style: { cursor: "grab" } }));
 }, TableIndex$2 = (e) => {
-  const o = e, { index: t } = o, n = K(o, ["index"]);
+  const o = e, { index: t } = o, n = W(o, ["index"]);
   return /* @__PURE__ */ jsx("div", P(x({ className: cls("nb-table-index"), style: { padding: "0 8px 0 16px" } }, n), { children: t }));
 }, pageSizeOptions$1 = [5, 10, 20, 50, 100, 200], usePaginationProps$2 = (e, t) => {
   var S, y, v, F, I, R;
@@ -40652,19 +40671,19 @@ const useColumnsDeepMemoized = (e) => {
 }, columnOpacityStyle = {
   opacity: 0.3
 }, HeaderCellComponent = (n) => {
-  var o = n, { columnHidden: e } = o, t = K(o, ["columnHidden"]);
+  var o = n, { columnHidden: e } = o, t = W(o, ["columnHidden"]);
   const { designable: r } = useDesignable();
   return e ? /* @__PURE__ */ jsx("th", { style: r ? columnOpacityStyle : columnHiddenStyle, children: r ? t.children : null }) : /* @__PURE__ */ jsx("th", P(x({}, t), { className: cls(t.className, headerClass) }));
 }, BodyRowComponent = (e) => /* @__PURE__ */ jsx(SortableRow, x({}, e)), InternalBodyCellComponent = (e) => {
   var m;
-  const { token: t } = useToken(), n = useContext(InViewContext), o = (m = e.className) == null ? void 0 : m.includes("selection-column"), h = e, { record: r, schema: i, rowIndex: a, isSubTable: l } = h, c = K(h, ["record", "schema", "rowIndex", "isSubTable"]), { valueMap: u } = useSatisfiedActionValues({ formValues: r, category: "style", schema: i }), d = useMemo(() => Object.assign(x({}, e.style), u), [e.style, u]), p = {
+  const { token: t } = useToken(), n = useContext(InViewContext), o = (m = e.className) == null ? void 0 : m.includes("selection-column"), h = e, { record: r, schema: i, rowIndex: a, isSubTable: l } = h, c = W(h, ["record", "schema", "rowIndex", "isSubTable"]), { valueMap: u } = useSatisfiedActionValues({ formValues: r, category: "style", schema: i }), d = useMemo(() => Object.assign(x({}, e.style), u), [e.style, u]), p = {
     height: "1em",
     backgroundColor: "rgba(0, 0, 0, 0.06)",
     borderRadius: `${t.borderRadiusSM}px`
   };
   return /* @__PURE__ */ jsx("td", P(x({}, c), { className: cls(e.className, cellClass), style: d, children: l || n || o ? e.children : /* @__PURE__ */ jsx("div", { style: p }) }));
 }, displayNone = { display: "none" }, BodyCellComponent = (n) => {
-  var o = n, { columnHidden: e } = o, t = K(o, ["columnHidden"]);
+  var o = n, { columnHidden: e } = o, t = W(o, ["columnHidden"]);
   const { designable: r } = useDesignable();
   return e ? /* @__PURE__ */ jsx("td", { style: r ? columnOpacityStyle : columnHiddenStyle, children: r ? t.children : /* @__PURE__ */ jsx("span", { style: displayNone, children: t.children }) }) : /* @__PURE__ */ jsx(InternalBodyCellComponent, x({}, t));
 }, InternalNocoBaseTable = React.memo(
@@ -40684,7 +40703,7 @@ const useColumnsDeepMemoized = (e) => {
       columns: m,
       expandable: h,
       field: g
-    } = b, f = K(b, [
+    } = b, f = W(b, [
       "tableHeight",
       "SortableWrapper",
       "tableSizeRefCallback",
@@ -40769,7 +40788,7 @@ InternalNocoBaseTable.displayName = "InternalNocoBaseTable";
 const Table$1 = withDynamicSchemaProps(
   observer$1((e) => {
     var ce, Ce, re;
-    const { token: t } = useToken(), me = omit(e, ["onBlur", "onFocus", "value"]), { pagination: n, useProps: o } = me, r = K(me, ["pagination", "useProps"]), he = (o == null ? void 0 : o()) || {}, { pagination: i } = he, a = K(he, ["pagination"]), ge = x(x({}, r), a), {
+    const { token: t } = useToken(), me = omit(e, ["onBlur", "onFocus", "value"]), { pagination: n, useProps: o } = me, r = W(me, ["pagination", "useProps"]), he = (o == null ? void 0 : o()) || {}, { pagination: i } = he, a = W(he, ["pagination"]), ge = x(x({}, r), a), {
       dragSort: l = !1,
       showIndex: c = !0,
       onRowSelectionChange: u,
@@ -40780,7 +40799,7 @@ const Table$1 = withDynamicSchemaProps(
       onExpand: g,
       loading: f,
       onClickRow: C
-    } = ge, b = K(ge, [
+    } = ge, b = W(ge, [
       "dragSort",
       "showIndex",
       "onRowSelectionChange",
@@ -40799,7 +40818,7 @@ const Table$1 = withDynamicSchemaProps(
         &:hover > td {
           background-color: ${t.controlItemBgActiveHover} !important;
         }
-      `, [t.controlItemBgActive, t.controlItemBgActiveHover]), U = useMemo(() => C ? E : "", [E, C]), G = useMemo(() => C ? (ee, ne) => ({
+      `, [t.controlItemBgActive, t.controlItemBgActiveHover]), G = useMemo(() => C ? E : "", [E, C]), U = useMemo(() => C ? (ee, ne) => ({
       onClick: (se) => {
         isPortalInBody(se.target) || C(ee, N, T);
       },
@@ -40811,14 +40830,14 @@ const Table$1 = withDynamicSchemaProps(
     }, [k, D]);
     const H = useCallback((ee) => {
       if (m)
-        return W(ee);
+        return K(ee);
       if (ee.key)
         return ee.key;
       if (V.current.has(ee))
         return V.current.get(ee);
       const ne = uid();
       return V.current.set(ee, ne), ne;
-    }, []), W = useCallback(
+    }, []), K = useCallback(
       (ee) => {
         var ne;
         return Array.isArray(m) ? m.map((se) => {
@@ -40877,7 +40896,7 @@ const Table$1 = withDynamicSchemaProps(
                 }),
                 children: [
                   /* @__PURE__ */ jsxs("div", { className: cls(ee ? "checked" : null, rowSelectCheckboxContentClass), children: [
-                    l && /* @__PURE__ */ jsx(SortHandle$1, { id: W(ne) }),
+                    l && /* @__PURE__ */ jsx(SortHandle$1, { id: K(ne) }),
                     c && /* @__PURE__ */ jsx(TableIndex$2, { index: se })
                   ] }),
                   O && /* @__PURE__ */ jsx(
@@ -40904,7 +40923,7 @@ const Table$1 = withDynamicSchemaProps(
         c,
         l,
         S,
-        W,
+        K,
         O,
         Q,
         z
@@ -40915,20 +40934,20 @@ const Table$1 = withDynamicSchemaProps(
         return l ? React.createElement(
           SortableContext$1,
           {
-            items: ((se = (ne = S.value) == null ? void 0 : ne.map) == null ? void 0 : se.call(ne, W)) || []
+            items: ((se = (ne = S.value) == null ? void 0 : ne.map) == null ? void 0 : se.call(ne, K)) || []
           },
           ee
         ) : React.createElement(React.Fragment, {}, ee);
       },
-      [S, l, W]
+      [S, l, K]
     ), { height: te, tableSizeRefCallback: ie } = useTableSize(), ae = useMemo(() => ({
       x: "max-content"
     }), []), ue = useMemo(() => ({
       x: "max-content",
       y: Y.length > 0 ? te : void 0
     }), [te, ae, Y]), xe = useCallback(
-      (ee) => T.includes(ee[m]) ? U : "",
-      [T, U, JSON.stringify(m)]
+      (ee) => T.includes(ee[m]) ? G : "",
+      [T, G, JSON.stringify(m)]
     ), pe = useCallback(
       (ee, ne) => {
         const se = ee ? [...$, ne[F.getPrimaryKey()]] : $.filter((le) => ne[F.getPrimaryKey()] !== le);
@@ -40953,7 +40972,7 @@ const Table$1 = withDynamicSchemaProps(
           paginationProps: z,
           components: X,
           onTableChange: d,
-          onRow: G,
+          onRow: U,
           rowClassName: xe,
           scroll: ue,
           columns: L,
@@ -41041,14 +41060,14 @@ const Table$1 = withDynamicSchemaProps(
       const { setVisible: O } = useActionContext(), { selectedRows: V, setSelectedRows: E } = useContext(RecordPickerContext);
       return {
         onClick() {
-          var G;
+          var U;
           Array.isArray(n.value) || (n.value = []), V.forEach((H) => n.value.push(markRecordAsNew(H))), n.onInput(n.value), n.initialValue = n.value, E([]), O(!1);
-          const U = Math.ceil(n.value.length / (((G = n.componentProps) == null ? void 0 : G.pageSize) || 10));
-          D(U);
+          const G = Math.ceil(n.value.length / (((U = n.componentProps) == null ? void 0 : U.pageSize) || 10));
+          D(G);
         }
       };
     }, R = () => {
-      const O = (o == null ? void 0 : o.targetKey) || "id", V = (n.value || []).map((U) => U == null ? void 0 : U[O]).filter(Boolean);
+      const O = (o == null ? void 0 : o.targetKey) || "id", V = (n.value || []).map((G) => G == null ? void 0 : G[O]).filter(Boolean);
       return V.length ? { $and: [{ [`${O}.$ne`]: V }] } : {};
     }, [k, D] = useState(1), [M, z] = useState(((B = n.componentProps) == null ? void 0 : B.pageSize) || 10);
     useEffect(() => {
@@ -41062,8 +41081,8 @@ const Table$1 = withDynamicSchemaProps(
         current: k > O ? O : k,
         pageSize: M || 10,
         total: n == null ? void 0 : n.value,
-        onChange: (E, U) => {
-          D(E), z(U), n.onInput(n.value);
+        onChange: (E, G) => {
+          D(E), z(G), n.onInput(n.value);
         },
         showSizeChanger: !0,
         pageSizeOptions: ["10", "20", "50", "100"],
@@ -41178,7 +41197,7 @@ const Table$1 = withDynamicSchemaProps(
 ), AssociationField = connect(Editable$1, mapReadPretty(ReadPretty$8));
 AssociationField.SubTable = SubTable;
 AssociationField.Nester = Nester;
-AssociationField.AddNewer = Action.Container;
+AssociationField.AddNewer = AssociationFieldAddNewer;
 AssociationField.Selector = Action.Container;
 AssociationField.Viewer = Action.Container;
 AssociationField.InternalSelect = InternalPicker;
@@ -41264,7 +41283,7 @@ const ReadPretty$7 = observer$1(
 InternalAssociationSelect.displayName = "InternalAssociationSelect";
 const AssociationSelect = InternalAssociationSelect;
 AssociationSelect.Designer = function e() {
-  var B, j, T, N, O, V, E, U, G, H, W;
+  var B, j, T, N, O, V, E, G, U, H, K;
   const { getCollectionFields: t, getInterface: n, getCollectionJoinField: o, getCollection: r, isTitleField: i } = useCollectionManager_deprecated(), { getField: a } = useCollection_deprecated(), { form: l } = useFormBlockContext(), c = useField(), u = useFieldSchema(), { t: d } = useTranslation(), p = useFilterByTk(), { dn: m, refresh: h, insertAdjacent: g } = useDesignable(), f = useCompile(), C = useIsShowMultipleSwitch(), { isAllowToSetDefaultValue: b } = useIsAllowToSetDefaultValue(), S = a(u.name) || o(u["x-collection-field"]), y = useFieldComponentOptions(), v = c.address.segments.includes("__form_grid"), F = n(S == null ? void 0 : S.interface), I = (B = F == null ? void 0 : F.validateSchema) == null ? void 0 : B.call(F, u), R = (j = S == null ? void 0 : S.uiSchema) == null ? void 0 : j.title, k = S != null && S.target ? t(S == null ? void 0 : S.target) : [];
   c.title === R || c.title;
   const D = useSortFields(S == null ? void 0 : S.target), M = ((O = (N = (T = c.componentProps) == null ? void 0 : T.service) == null ? void 0 : N.params) == null ? void 0 : O.sort) || [];
@@ -41494,7 +41513,7 @@ AssociationSelect.Designer = function e() {
       SchemaSettingsDataScope,
       {
         collectionName: S == null ? void 0 : S.target,
-        defaultFilter: ((G = (U = (E = c.componentProps) == null ? void 0 : E.service) == null ? void 0 : U.params) == null ? void 0 : G.filter) || {},
+        defaultFilter: ((U = (G = (E = c.componentProps) == null ? void 0 : E.service) == null ? void 0 : G.params) == null ? void 0 : U.filter) || {},
         form: l,
         onSubmit: ({ filter: Y }) => {
           Y = removeNullCondition(Y), _.set(c.componentProps, "service.params.filter", Y), u["x-component-props"] = c.componentProps, m.emit("patch", {
@@ -41631,7 +41650,7 @@ AssociationSelect.Designer = function e() {
       {
         title: d("Title field"),
         options: L,
-        value: (W = (H = c == null ? void 0 : c.componentProps) == null ? void 0 : H.fieldNames) == null ? void 0 : W.label,
+        value: (K = (H = c == null ? void 0 : c.componentProps) == null ? void 0 : H.fieldNames) == null ? void 0 : K.label,
         onChange: (Y) => {
           var Q, Z;
           const J = {
@@ -41984,7 +42003,7 @@ const AutoComplete = withDynamicSchemaProps(
     }
   };
 }), CardItem = (e) => {
-  const p = e, { children: t, name: n, heightMode: o } = p, r = K(p, ["children", "name", "heightMode"]), i = useSchemaTemplate(), a = useFieldSchema(), l = a == null ? void 0 : a["x-template-key"], { wrapSSR: c, componentCls: u, hashId: d } = useStyles$7();
+  const p = e, { children: t, name: n, heightMode: o } = p, r = W(p, ["children", "name", "heightMode"]), i = useSchemaTemplate(), a = useFieldSchema(), l = a == null ? void 0 : a["x-template-key"], { wrapSSR: c, componentCls: u, hashId: d } = useStyles$7();
   return l && !i ? null : c(
     /* @__PURE__ */ jsx(BlockItemError, { children: /* @__PURE__ */ jsx(BlockItem, { name: n, className: `${u} ${d} noco-card-item`, children: /* @__PURE__ */ jsx(BlockItemCard, P(x({}, r), { children: e.children })) }) })
   );
@@ -42025,7 +42044,7 @@ const AutoComplete = withDynamicSchemaProps(
         changeOnSelectLast: c,
         changeOnSelect: u,
         maxLevel: d
-      } = y, p = K(y, [
+      } = y, p = W(y, [
         "value",
         "onChange",
         "labelInValue",
@@ -42153,7 +42172,7 @@ function useCollectionOptions({ filter: e, isTableOid: t }) {
 }
 const CollectionSelect = connect(
   (e) => {
-    const a = e, { filter: t } = a, n = K(a, ["filter"]), o = useCollectionOptions(e), { t: r } = useTranslation(), i = useCallback(
+    const a = e, { filter: t } = a, n = W(a, ["filter"]), o = useCollectionOptions(e), { t: r } = useTranslation(), i = useCallback(
       (l, c) => {
         var u, d;
         return ((u = c == null ? void 0 : c.label.toLowerCase()) != null ? u : "").includes(l.toLocaleLowerCase()) || ((d = c == null ? void 0 : c.value.toString().toLowerCase()) != null ? d : "").includes(l.toLocaleLowerCase());
@@ -42198,7 +42217,7 @@ function useDataSourceOptions({ filter: e }) {
   );
 }
 const DataSourceSelect = connect((e) => {
-  const a = e, { filter: t } = a, n = K(a, ["filter"]), o = useDataSourceOptions(e), { t: r } = useTranslation(), i = useCallback(
+  const a = e, { filter: t } = a, n = W(a, ["filter"]), o = useDataSourceOptions(e), { t: r } = useTranslation(), i = useCallback(
     (l, c) => {
       var u, d;
       return ((u = c == null ? void 0 : c.label.toLowerCase()) != null ? u : "").includes(l.toLocaleLowerCase()) || ((d = c == null ? void 0 : c.value.toString().toLowerCase()) != null ? d : "").includes(l.toLocaleLowerCase());
@@ -42219,7 +42238,7 @@ const DataSourceSelect = connect((e) => {
     })
   );
 }), DataSourceCollectionCascaderReadPretty = observer$1((e) => {
-  const t = useDataSourceManager(), n = useCompile(), f = e, { value: o, onChange: r, dataSourceFilter: i, collectionFilter: a } = f, l = K(f, ["value", "onChange", "dataSourceFilter", "collectionFilter"]), [c, u] = parseCollectionName(o), d = [c, u].filter(Boolean), p = t.getDataSources(), m = useMemo(() => (i ? p.filter(i) : p).map((C) => ({
+  const t = useDataSourceManager(), n = useCompile(), f = e, { value: o, onChange: r, dataSourceFilter: i, collectionFilter: a } = f, l = W(f, ["value", "onChange", "dataSourceFilter", "collectionFilter"]), [c, u] = parseCollectionName(o), d = [c, u].filter(Boolean), p = t.getDataSources(), m = useMemo(() => (i ? p.filter(i) : p).map((C) => ({
     label: n(C.displayName),
     value: C.key,
     children: C.collectionManager.collectionInstancesArr.filter(a != null ? a : (b) => !b.hidden).map((b) => ({
@@ -42236,7 +42255,7 @@ const DataSourceSelect = connect((e) => {
   })(d, m);
   return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(Tag, { children: g.join(" / ") }) });
 }), DataSourceCollectionCascader = connect((e) => {
-  const t = useDataSourceManager(), n = useCompile(), g = e, { value: o, onChange: r, dataSourceFilter: i, collectionFilter: a } = g, l = K(g, ["value", "onChange", "dataSourceFilter", "collectionFilter"]), [c, u] = parseCollectionName(o), d = [c, u].filter(Boolean), p = t.getDataSources(), m = useMemo(() => (i ? p.filter(i) : p).map((f) => ({
+  const t = useDataSourceManager(), n = useCompile(), g = e, { value: o, onChange: r, dataSourceFilter: i, collectionFilter: a } = g, l = W(g, ["value", "onChange", "dataSourceFilter", "collectionFilter"]), [c, u] = parseCollectionName(o), d = [c, u].filter(Boolean), p = t.getDataSources(), m = useMemo(() => (i ? p.filter(i) : p).map((f) => ({
     label: n(f.displayName),
     value: f.key,
     children: f.collectionManager.collectionInstancesArr.filter(a != null ? a : (C) => !C.hidden).map((C) => ({
@@ -42254,7 +42273,7 @@ const DataSourceSelect = connect((e) => {
   return /* @__PURE__ */ jsx(Cascader$1, P(x({ showSearch: !0 }, l), { options: m, value: d, onChange: h }));
 }, mapReadPretty(DataSourceCollectionCascaderReadPretty)), ColorPicker = connect(
   (e) => {
-    const r = e, { value: t, onChange: n } = r, o = K(r, ["value", "onChange"]);
+    const r = e, { value: t, onChange: n } = r, o = W(r, ["value", "onChange"]);
     return /* @__PURE__ */ jsx("div", { role: "button", "aria-label": "color-picker-normal", style: { display: "inline-block" }, children: /* @__PURE__ */ jsx(
       ColorPicker$1,
       P(x({
@@ -42323,7 +42342,7 @@ const DataSourceSelect = connect((e) => {
   default: '{{t("Default")}}'
 }, ColorSelect = connect(
   (e) => {
-    const t = useCompile(), r = e, { colors: n = defaultColors } = r, o = K(r, ["colors"]);
+    const t = useCompile(), r = e, { colors: n = defaultColors } = r, o = W(r, ["colors"]);
     return /* @__PURE__ */ jsx(Select$1, P(x({}, o), { children: Object.keys(n).map((i) => /* @__PURE__ */ jsx(Select$1.Option, { value: i, children: /* @__PURE__ */ jsx(Tag, { color: i, children: t(n[i] || n.default) }) }, i)) }));
   },
   mapProps((e, t) => P(x({}, e), {
@@ -42334,7 +42353,7 @@ const DataSourceSelect = connect((e) => {
     return o[n] ? /* @__PURE__ */ jsx(Tag, { color: n, children: t(o[n] || o.default) }) : null;
   })
 ), Input = (e) => {
-  const o = e, { onChange: t } = o, n = K(o, ["onChange"]);
+  const o = e, { onChange: t } = o, n = W(o, ["onChange"]);
   return /* @__PURE__ */ jsx(
     "fieldset",
     {
@@ -43091,11 +43110,8 @@ const IconPicker = connect(
   mapReadPretty((e) => isValid(e.value) ? /* @__PURE__ */ jsx(Icon, { type: e.value }) : /* @__PURE__ */ jsx("div", {}))
 );
 function countDecimalPlaces(e) {
-  const t = Number(e);
-  if (!Number.isFinite(t))
-    return 0;
-  const n = String(t).split(".")[1];
-  return n ? n.length : 0;
+  const t = toString(e);
+  return t.includes(".") ? t.split(".")[1].replace(/0+$/, "").length : 0;
 }
 const separators = {
   "0,0.00": { thousands: ",", decimal: "." },
@@ -43173,7 +43189,7 @@ function toSafeNumber(e) {
   return e && (e > Number.MAX_SAFE_INTEGER || e < Number.MIN_SAFE_INTEGER ? new BigNumber(e).toString() : Number(e));
 }
 const InputNumber = connect((e) => {
-  const i = e, { onChange: t } = i, n = K(i, ["onChange"]);
+  const i = e, { onChange: t } = i, n = W(i, ["onChange"]);
   let r = x({
     onChange: (a) => {
       Number.isNaN(a) ? t(null) : t(toSafeNumber(a));
@@ -44693,7 +44709,7 @@ const menuItemTitleStyle = {
 };
 Menu.Item = observer$1(
   (e) => {
-    const { t } = useMenuTranslation(), { designable: n } = useDesignable(), { pushMenuItem: o } = useCollectMenuItems(), m = e, { icon: r, children: i, hidden: a } = m, l = K(m, ["icon", "children", "hidden"]), c = useFieldSchema(), u = useField(), d = useContext(MenuItemDesignerContext), p = useMemo(() => P(x({}, l), {
+    const { t } = useMenuTranslation(), { designable: n } = useDesignable(), { pushMenuItem: o } = useCollectMenuItems(), m = e, { icon: r, children: i, hidden: a } = m, l = W(m, ["icon", "children", "hidden"]), c = useFieldSchema(), u = useField(), d = useContext(MenuItemDesignerContext), p = useMemo(() => P(x({}, l), {
       hidden: n ? !1 : a,
       className: menuItemClass,
       key: c.name,
@@ -44759,7 +44775,7 @@ const MenuURLButton = ({ href: e, params: t, icon: n }) => {
 };
 Menu.URL = observer$1(
   (e) => {
-    const { pushMenuItem: t } = useCollectMenuItems(), { designable: n } = useDesignable(), d = e, { icon: o, children: r, hidden: i } = d, a = K(d, ["icon", "children", "hidden"]), l = useFieldSchema(), c = useField();
+    const { pushMenuItem: t } = useCollectMenuItems(), { designable: n } = useDesignable(), d = e, { icon: o, children: r, hidden: i } = d, a = W(d, ["icon", "children", "hidden"]), l = useFieldSchema(), c = useField();
     if (!t)
       return error("Menu.URL must be wrapped by GetMenuItemsContext.Provider"), null;
     const u = useMemo(() => P(x({}, a), {
@@ -44778,7 +44794,7 @@ Menu.URL = observer$1(
 );
 Menu.SubMenu = observer$1(
   (e) => {
-    const { t } = useMenuTranslation(), { designable: n } = useDesignable(), { Component: o, getMenuItems: r } = useMenuItem(), { pushMenuItem: i } = useCollectMenuItems(), f = e, { icon: a, children: l, hidden: c } = f, u = K(f, ["icon", "children", "hidden"]), d = useFieldSchema(), p = useField(), m = useContext(MenuModeContext), h = useContext(MenuItemDesignerContext), g = useMemo(() => P(x({}, u), {
+    const { t } = useMenuTranslation(), { designable: n } = useDesignable(), { Component: o, getMenuItems: r } = useMenuItem(), { pushMenuItem: i } = useCollectMenuItems(), f = e, { icon: a, children: l, hidden: c } = f, u = W(f, ["icon", "children", "hidden"]), d = useFieldSchema(), p = useField(), m = useContext(MenuModeContext), h = useContext(MenuItemDesignerContext), g = useMemo(() => P(x({}, u), {
       hidden: n ? !1 : c,
       className: menuItemClass,
       key: d.name,
@@ -44814,7 +44830,7 @@ const useStyles$3 = genStyleHook("nb-menu-item", (e) => {
 }), Pagination = withDynamicSchemaProps(
   observer$1(
     (e) => {
-      const r = useProps(e), { hidden: t } = r, n = K(r, ["hidden"]);
+      const r = useProps(e), { hidden: t } = r, n = W(r, ["hidden"]);
       return t ? null : /* @__PURE__ */ jsx("div", { onKeyPress: (i) => {
         i.key === "Enter" && i.preventDefault();
       }, children: /* @__PURE__ */ jsx(Pagination$1, x({}, n)) });
@@ -44866,7 +44882,7 @@ const useStyles$3 = genStyleHook("nb-menu-item", (e) => {
   return m += 4 * h, n > 0 && (m += 2 * (h - n)), o > 0 && (m += 2 * (h - o)), t !== h && (m += 4 * t), m += 6 * r, m += 2 * i, m += 2 * p(), h === n + o && (m -= h), h === t && (m -= t), m -= l, m -= 2 * c, m -= 3 * u, m = m < 0 ? 0 : m, m = m > 100 ? 100 : m, m >= 80 ? 100 : m >= 60 ? 80 : m >= 40 ? 60 : m >= 20 ? 40 : 20;
 }, PasswordStrength = (e) => isFn(e.children) ? e.children(getStrength(String(e.value || ""))) : /* @__PURE__ */ jsx(Fragment$1, { children: e.children }), Password = connect(
   (e) => {
-    const a = e, { value: t, className: n, checkStrength: o } = a, r = K(a, ["value", "className", "checkStrength"]), i = {
+    const a = e, { value: t, className: n, checkStrength: o } = a, r = W(a, ["value", "className", "checkStrength"]), i = {
       position: "absolute",
       zIndex: 1,
       height: 8,
@@ -45051,7 +45067,7 @@ const useTableSelectorProps$1 = () => {
     setSelectedRows: o,
     selectedRows: r = [],
     onChange: i
-  } = useContext(RecordPickerContext), d = useTableSelectorProps$4(), { onRowSelectionChange: a, rowKey: l = "id" } = d, c = K(d, ["onRowSelectionChange", "rowKey"]), { setVisible: u } = useActionContext();
+  } = useContext(RecordPickerContext), d = useTableSelectorProps$4(), { onRowSelectionChange: a, rowKey: l = "id" } = d, c = W(d, ["onRowSelectionChange", "rowKey"]), { setVisible: u } = useActionContext();
   return P(x({}, c), {
     rowKey: l,
     rowSelection: {
@@ -45077,7 +45093,7 @@ const useTableSelectorProps$1 = () => {
   const t = useFieldSchema(), { association: n } = e, { getField: o } = useCollection_deprecated();
   return n || o(t.name);
 }, InputRecordPicker = (e) => {
-  const v = e, { value: t, multiple: n, onChange: o, quickUpload: r, selectFile: i } = v, a = K(v, ["value", "multiple", "onChange", "quickUpload", "selectFile"]), l = useFieldNames(e), [c, u] = useState(!1), d = useFieldSchema(), p = useAssociation(e), m = useCompile(), h = useLabelUiSchema(p, (l == null ? void 0 : l.label) || "label"), g = isShowFilePicker(h), [f, C] = useState([]), [b, S] = useState([]);
+  const v = e, { value: t, multiple: n, onChange: o, quickUpload: r, selectFile: i } = v, a = W(v, ["value", "multiple", "onChange", "quickUpload", "selectFile"]), l = useFieldNames(e), [c, u] = useState(!1), d = useFieldSchema(), p = useAssociation(e), m = useCompile(), h = useLabelUiSchema(p, (l == null ? void 0 : l.label) || "label"), g = isShowFilePicker(h), [f, C] = useState([]), [b, S] = useState([]);
   useEffect(() => {
     if (t) {
       const F = (Array.isArray(t) ? t : t ? [t] : []).map((I) => {
@@ -45145,7 +45161,7 @@ const useTableSelectorProps$1 = () => {
     })
   ] });
 }, RecordPickerProvider = (e) => {
-  const c = e, { multiple: t, onChange: n, selectedRows: o, setSelectedRows: r, options: i, collectionField: a } = c, l = K(c, ["multiple", "onChange", "selectedRows", "setSelectedRows", "options", "collectionField"]);
+  const c = e, { multiple: t, onChange: n, selectedRows: o, setSelectedRows: r, options: i, collectionField: a } = c, l = W(c, ["multiple", "onChange", "selectedRows", "setSelectedRows", "options", "collectionField"]);
   return /* @__PURE__ */ jsx(
     RecordPickerContext.Provider,
     {
@@ -45992,7 +46008,7 @@ const useStyles$2 = genStyleHook("nb-rich-text", (e) => {
     data: n.value
   }), e);
 }, SortHandle = (e) => /* @__PURE__ */ jsx(MenuOutlined, x({ className: "drag-handle", style: { cursor: "grab" } }, e)), TableIndex$1 = (e) => {
-  const o = e, { index: t } = o, n = K(o, ["index"]);
+  const o = e, { index: t } = o, n = W(o, ["index"]);
   return /* @__PURE__ */ jsx("div", P(x({ className: cls("nb-table-index"), style: { padding: "0 8px 0 16px" } }, n), { children: t + 1 }));
 }, useDefAction = () => ({
   move() {
@@ -46009,7 +46025,7 @@ const useStyles$2 = genStyleHook("nb-rich-text", (e) => {
       useDataSource: l = useDefDataSource,
       useAction: c = useDefAction,
       onChange: u
-    } = C, d = K(C, [
+    } = C, d = W(C, [
       "dragSort",
       "showIndex",
       "useSelectedRowKeys",
@@ -46766,14 +46782,14 @@ const TableActionColumnDesigner = (e) => {
           }
         },
         onSubmit: ({ sort: O }) => {
-          var U;
-          const V = O.map((G) => G.direction === "desc" ? `-${G.field}` : G.field), E = r.decoratorProps.params || {};
+          var G;
+          const V = O.map((U) => U.direction === "desc" ? `-${U.field}` : U.field), E = r.decoratorProps.params || {};
           E.sort = V, r.decoratorProps.params = E, i["x-decorator-props"].params = E, d.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
               "x-decorator-props": i["x-decorator-props"]
             }
-          }), c.run(P(x({}, (U = c.params) == null ? void 0 : U[0]), { sort: V }));
+          }), c.run(P(x({}, (G = c.params) == null ? void 0 : G[0]), { sort: V }));
         }
       }
     ),
@@ -46814,9 +46830,9 @@ const TableActionColumnDesigner = (e) => {
           { label: u("Small"), value: "small" }
         ],
         onChange: (O) => {
-          const V = i.reduceProperties((E, U) => {
-            if (U["x-component"] === "TableV2")
-              return U;
+          const V = i.reduceProperties((E, G) => {
+            if (G["x-component"] === "TableV2")
+              return G;
           }, null);
           V["x-component-props"] = V["x-component-props"] || {}, V["x-component-props"].size = O, d.emit("patch", {
             schema: {
@@ -47385,12 +47401,12 @@ const useCollectionFields = (e) => {
   const t = useCollection();
   return useMemo(() => t.getFields(e), [t, e]);
 }, collectionTransform = (e, t) => {
-  const a = e, { rawTitle: n, title: o, fields: r = [] } = a, i = K(a, ["rawTitle", "title", "fields"]);
+  const a = e, { rawTitle: n, title: o, fields: r = [] } = a, i = W(a, ["rawTitle", "title", "fields"]);
   return P(x({}, i), {
     title: n ? o : t.i18n.t(o, { ns: "lm-collections" }),
     rawTitle: n || o,
     fields: r == null ? void 0 : r.map((u) => {
-      var d = u, { uiSchema: l } = d, c = K(d, ["uiSchema"]);
+      var d = u, { uiSchema: l } = d, c = W(d, ["uiSchema"]);
       if (l != null && l.title) {
         const p = l.title;
         l.title = l.rawTitle ? p : t.i18n.t(p, { ns: "lm-collections" }), l.rawTitle = l.rawTitle || p;
@@ -47672,7 +47688,7 @@ const SelfFields = (e) => {
   });
   return /* @__PURE__ */ jsx(SchemaInitializerChildren, { children: a });
 }, AssociationCollectionFields = (e) => {
-  const m = e, { filterAssociationField: t, filterSelfField: n = () => !0, getSchema: o } = m, r = K(m, ["filterAssociationField", "filterSelfField", "getSchema"]), { collection: i, t: a, collectionManager: l } = e.context, c = i.getFields(), u = ["o2o", "oho", "obo", "m2o"], d = c.filter((h) => u.includes(h.interface)).filter((h) => n(h, e.context));
+  const m = e, { filterAssociationField: t, filterSelfField: n = () => !0, getSchema: o } = m, r = W(m, ["filterAssociationField", "filterSelfField", "getSchema"]), { collection: i, t: a, collectionManager: l } = e.context, c = i.getFields(), u = ["o2o", "oho", "obo", "m2o"], d = c.filter((h) => u.includes(h.interface)).filter((h) => n(h, e.context));
   if (!d.length)
     return null;
   const p = d.map((h) => {
@@ -48677,9 +48693,9 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       else {
         let V = [];
         j != null && j.length ? j.forEach((E) => {
-          var G;
-          const U = (G = N == null ? void 0 : N.children) == null ? void 0 : G.find((H) => [E, E.interface].includes(H.name));
-          U && V.push(P(x({}, U), {
+          var U;
+          const G = (U = N == null ? void 0 : N.children) == null ? void 0 : U.find((H) => [E, E.interface].includes(H.name));
+          G && V.push(P(x({}, G), {
             targetScope: E == null ? void 0 : E.targetScope
           }));
         }) : B != null && B.length ? V = (O = N == null ? void 0 : N.children) == null ? void 0 : O.filter((E) => !B.includes(E.name)) : V = N == null ? void 0 : N.children, V != null && V.length && T.push(P(x({}, N), {
@@ -48843,7 +48859,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   const t = useRecord(), n = useCollectionParentRecordData();
   return /* @__PURE__ */ jsx(EditFieldAction, x({ item: t, parentItem: n }, e));
 }, EditFieldAction = (e) => {
-  const I = e, { scope: t, getContainer: n, item: o, parentItem: r, children: i } = I, a = K(I, ["scope", "getContainer", "item", "parentItem", "children"]), { getInterface: l, collections: c, getCollection: u } = useCollectionManager_deprecated(), [d, p] = useState(!1), [m, h] = useState({}), g = useAPIClient(), { t: f } = useTranslation(), C = useCompile(), [b, S] = useState({}), { isDialect: y } = useDialect(), v = useMemo(() => {
+  const I = e, { scope: t, getContainer: n, item: o, parentItem: r, children: i } = I, a = W(I, ["scope", "getContainer", "item", "parentItem", "children"]), { getInterface: l, collections: c, getCollection: u } = useCollectionManager_deprecated(), [d, p] = useState(!1), [m, h] = useState({}), g = useAPIClient(), { t: f } = useTranslation(), C = useCompile(), [b, S] = useState({}), { isDialect: y } = useDialect(), v = useMemo(() => {
     var R;
     return (o == null ? void 0 : o.fields) || ((R = u(o.collectionName)) == null ? void 0 : R.options.fields.filter((k) => ["string", "bigInt", "integer"].includes(k.type)).map((k) => {
       var D;
@@ -49414,7 +49430,7 @@ const getSchema$4 = (e, t, n) => {
   const t = useRecord();
   return /* @__PURE__ */ jsx(EditCollectionAction, x({ item: t }, e));
 }, EditCollectionAction = (e) => {
-  const h = e, { scope: t, getContainer: n, item: o, children: r } = h, i = K(h, ["scope", "getContainer", "item", "children"]), { getTemplate: a } = useCollectionManager_deprecated(), [l, c] = useState(!1), [u, d] = useState({}), { t: p } = useTranslation(), m = useCompile();
+  const h = e, { scope: t, getContainer: n, item: o, children: r } = h, i = W(h, ["scope", "getContainer", "item", "children"]), { getTemplate: a } = useCollectionManager_deprecated(), [l, c] = useState(!1), [u, d] = useState({}), { t: p } = useTranslation(), m = useCompile();
   return /* @__PURE__ */ jsx(RecordProvider, { record: o, children: /* @__PURE__ */ jsxs(ActionContextProvider, { value: { visible: l, setVisible: c }, children: [
     /* @__PURE__ */ jsx(
       "a",
@@ -49483,22 +49499,22 @@ const getSchema$4 = (e, t, n) => {
     g.forEach((B) => {
       var V;
       const j = v(B), N = R(B).map((E) => {
-        const U = k(E, B);
+        const G = k(E, B);
         return {
           type: "group",
           key: E,
           label: l("Parent collection fields") + l(`(${v(E).title})`),
-          children: U.filter((G) => !["hasOne", "hasMany", "belongsToMany"].includes(G == null ? void 0 : G.type)).map((G) => {
+          children: G.filter((U) => !["hasOne", "hasMany", "belongsToMany"].includes(U == null ? void 0 : U.type)).map((U) => {
             var H;
             return {
-              value: G.name,
-              label: l((H = G.uiSchema) == null ? void 0 : H.title)
+              value: U.name,
+              label: l((H = U.uiSchema) == null ? void 0 : H.title)
             };
           })
         };
       }), O = (V = j.fields.filter((E) => !["obo", "oho", "m2m", "o2m"].includes(E == null ? void 0 : E.interface))) == null ? void 0 : V.map((E) => {
-        var U;
-        return { value: E.name, key: E.name, label: l(((U = E.uiSchema) == null ? void 0 : U.title) || E.name) };
+        var G;
+        return { value: E.name, key: E.name, label: l(((G = E.uiSchema) == null ? void 0 : G.title) || E.name) };
       }).concat(N);
       w.push({
         value: B,
@@ -49514,12 +49530,12 @@ const getSchema$4 = (e, t, n) => {
         const T = (j = Object.values((B = w == null ? void 0 : w.data) == null ? void 0 : B.fields)) == null ? void 0 : j.map((N) => {
           var O, V;
           if (N.source) {
-            const E = (i == null ? void 0 : i.data.find((U) => U.name === N.name)) || N;
+            const E = (i == null ? void 0 : i.data.find((G) => G.name === N.name)) || N;
             return P(x({}, N), {
               uiSchema: P(x({}, omit(E.uiSchema, "rawTitle")), { title: ((O = E.uiSchema) == null ? void 0 : O.title) || E.name })
             });
           } else {
-            const E = (i == null ? void 0 : i.data.find((U) => U.name === N.name)) || N;
+            const E = (i == null ? void 0 : i.data.find((G) => G.name === N.name)) || N;
             return P(x({}, E), {
               uiSchema: P(x({}, omit(E.uiSchema, "rawTitle")), { title: ((V = E.uiSchema) == null ? void 0 : V.title) || E.name })
             });
@@ -49877,7 +49893,7 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
 }, AsyncDataContext = createContext(null);
 AsyncDataContext.displayName = "AsyncDataContext";
 const AsyncDataProvider = (e) => {
-  const a = e, { value: t, request: n, children: o } = a, r = K(a, ["value", "request", "children"]), i = useRequest(n, x({}, r));
+  const a = e, { value: t, request: n, children: o } = a, r = W(a, ["value", "request", "children"]), i = useRequest(n, x({}, r));
   return t ? /* @__PURE__ */ jsx(AsyncDataContext.Provider, { value: t, children: o }) : /* @__PURE__ */ jsx(AsyncDataContext.Provider, { value: i, children: o });
 }, useAsyncData = () => useContext(AsyncDataContext), inferInterface = (e, t) => e.toLowerCase().includes("id") ? "id" : typeof t == "number" ? Number.isInteger(t) ? "integer" : "number" : typeof t == "boolean" ? "checkbox" : dayjs(t).isValid() ? "datetime" : "input", useSourceFieldsOptions = () => {
   const e = useForm(), { sources: t = [] } = e.values, { t: n } = useTranslation(), { getCollection: o, getInheritCollections: r, getParentCollectionFields: i } = useCollectionManager_deprecated(), a = [];
@@ -50339,7 +50355,7 @@ const AsyncDataProvider = (e) => {
     }
   };
 }, DeleteCollectionAction = (e) => {
-  const h = e, { scope: t, getContainer: n, item: o, children: r, isBulk: i, useAction: a } = h, l = K(h, ["scope", "getContainer", "item", "children", "isBulk", "useAction"]), { t: c } = useTranslation(), [u, d] = useState(!1), p = () => i ? useBulkDestroyActionAndRefreshCM : a || useDestroyActionAndRefreshCM, m = () => /* @__PURE__ */ jsxs("span", { children: [
+  const h = e, { scope: t, getContainer: n, item: o, children: r, isBulk: i, useAction: a } = h, l = W(h, ["scope", "getContainer", "item", "children", "isBulk", "useAction"]), { t: c } = useTranslation(), [u, d] = useState(!1), p = () => i ? useBulkDestroyActionAndRefreshCM : a || useDestroyActionAndRefreshCM, m = () => /* @__PURE__ */ jsxs("span", { children: [
     /* @__PURE__ */ jsx(ExclamationCircleFilled, { style: { color: "#faad14", marginRight: "12px", fontSize: "22px" } }),
     /* @__PURE__ */ jsx("span", { style: { fontSize: "19px" }, children: c("Delete collection") })
   ] });
@@ -54808,7 +54824,7 @@ const useBlockContext = () => useContext(BlockContext), useCompatDataBlockParent
   };
   return n.__collection && a && !["oho", "m2o", "obo"].includes(a.interface) && (u.targetCollection = n.__collection), !t && Object.keys(c).length > 0 && (u.filter = c), u;
 }, RecordLink = (e) => {
-  const t = useField(), n = useRecord(), l = e, { title: o, to: r } = l, i = K(l, ["title", "to"]), a = template(r || "");
+  const t = useField(), n = useRecord(), l = e, { title: o, to: r } = l, i = W(l, ["title", "to"]), a = template(r || "");
   return /* @__PURE__ */ jsx(Link$1, P(x({}, i), { to: a({ record: n || {} }), children: t.title }));
 }, ACLContext = createContext({});
 ACLContext.displayName = "ACLContext";
@@ -54886,9 +54902,9 @@ const useACLCustomContext = () => useContext(ACLCustomContext), useACLRolesCheck
   let o = !1;
   return e.ignoreScope && (o = !0), t != null && t["x-acl-ignore-scope"] && (o = !0), (r = t == null ? void 0 : t["x-acl-action-props"]) != null && r.skipScopeCheck && (o = !0), n || (o = !0), o;
 }, useAllowedActions = () => {
-  var t, n;
-  const e = useResourceActionContext();
-  return (n = (t = e == null ? void 0 : e.data) == null ? void 0 : t.meta) == null ? void 0 : n.allowedActions;
+  var n, o, r, i;
+  const e = useResourceActionContext(), t = useDataBlockRequest();
+  return ((o = (n = e == null ? void 0 : e.data) == null ? void 0 : n.meta) == null ? void 0 : o.allowedActions) || ((i = (r = t == null ? void 0 : t.data) == null ? void 0 : r.meta) == null ? void 0 : i.allowedActions);
 }, useResourceName = () => {
   var n;
   const e = useResourceActionContext(), t = useDataBlockProps();
@@ -57781,7 +57797,7 @@ AppLangContext.displayName = "AppLangContext";
 const useAppLangContext = () => useContext(AppLangContext);
 function AntdConfigProvider(e) {
   var c;
-  const l = e, { remoteLocale: t } = l, n = K(l, ["remoteLocale"]), o = useAPIClient(), { i18n: r } = useTranslation(), { data: i, loading: a } = useRequest(
+  const l = e, { remoteLocale: t } = l, n = W(l, ["remoteLocale"]), o = useAPIClient(), { i18n: r } = useTranslation(), { data: i, loading: a } = useRequest(
     {
       url: "app:getLang",
       params: {
@@ -58906,7 +58922,7 @@ const ActionInitializerItem = (e) => {
   };
 }), { Panel } = Collapse, AssociationFilterItem = withDynamicSchemaProps(
   (e) => {
-    var E, U, G, H;
+    var E, G, U, H;
     const { wrapSSR: t, componentCls: n, hashId: o } = useStyles(), { token: r } = useToken(), i = AssociationFilter.useAssociationField(), a = useFieldSchema(), l = useDesigner(), c = useCompile(), {
       list: u,
       onSelected: d,
@@ -58921,7 +58937,7 @@ const ActionInitializerItem = (e) => {
     } = useProps(e), [S, y] = useState(!1), v = useMemo(
       () => b && (i != null && i.name) ? [i.name] : [],
       [i == null ? void 0 : i.name, b]
-    ), F = f || (i == null ? void 0 : i.targetKey) || "id", I = C || ((U = (E = a["x-component-props"]) == null ? void 0 : E.fieldNames) == null ? void 0 : U.label) || F, R = {
+    ), F = f || (i == null ? void 0 : i.targetKey) || "id", I = C || ((G = (E = a["x-component-props"]) == null ? void 0 : E.fieldNames) == null ? void 0 : G.label) || F, R = {
       title: I || F,
       key: F
     }, [k, D] = useState([]), [M, z] = useState(a.default || []), [L, $] = useState(!0), w = useLabelUiSchema(i, (R == null ? void 0 : R.title) || "label");
@@ -58929,21 +58945,21 @@ const ActionInitializerItem = (e) => {
       a.default && (d(a.default), z(a.default));
     }, [a.default, d]), !i)
       return null;
-    const B = (W) => {
-      D(W), $(!1);
-    }, j = (W) => {
-      z(W), d(W), p == null || p(W);
-    }, T = (W) => {
+    const B = (K) => {
+      D(K), $(!1);
+    }, j = (K) => {
+      z(K), d(K), p == null || p(K);
+    }, T = (K) => {
       var J;
       const Y = (J = h == null ? void 0 : h[0]) == null ? void 0 : J.filter;
       (S || Y) && g(P(x({}, h == null ? void 0 : h[0]), {
         filter: void 0
-      })), y(!S), W.stopPropagation();
-    }, N = (W) => {
-      W.stopPropagation();
-    }, O = (W) => {
-      m(W);
-    }, V = (H = a.title) != null ? H : (G = i == null ? void 0 : i.uiSchema) == null ? void 0 : G.title;
+      })), y(!S), K.stopPropagation();
+    }, N = (K) => {
+      K.stopPropagation();
+    }, O = (K) => {
+      m(K);
+    }, V = (H = a.title) != null ? H : (U = i == null ? void 0 : i.uiSchema) == null ? void 0 : U.title;
     return t(
       /* @__PURE__ */ jsxs(SortableItem, { className: cls(n, o, "nb-block-item", e.className, "SortableItem"), children: [
         /* @__PURE__ */ jsx(l, {}),
@@ -58993,7 +59009,7 @@ const ActionInitializerItem = (e) => {
                 treeData: u,
                 onSelect: j,
                 fieldNames: R,
-                titleRender: (W) => /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: getLabelFormatValue(w, c(W[I])) }),
+                titleRender: (K) => /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: getLabelFormatValue(w, c(K[I])) }),
                 selectedKeys: M,
                 blockNode: !0
               }
@@ -59210,7 +59226,7 @@ const AssociationFilterDesignerDelete = () => {
     }
   );
 }, BlockInitializer = (e) => {
-  const i = e, { item: t, schema: n } = i, o = K(i, ["item", "schema"]), { insert: r } = useSchemaInitializer();
+  const i = e, { item: t, schema: n } = i, o = W(i, ["item", "schema"]), { insert: r } = useSchemaInitializer();
   return /* @__PURE__ */ jsx(
     SchemaInitializerItem,
     P(x({}, o), {
@@ -59222,7 +59238,7 @@ const AssociationFilterDesignerDelete = () => {
     })
   );
 }, BlockItemInitializer = () => {
-  const e = useSchemaInitializerItem(), o = e, { schema: t } = o, n = K(o, ["schema"]);
+  const e = useSchemaInitializerItem(), o = e, { schema: t } = o, n = W(o, ["schema"]);
   return /* @__PURE__ */ jsx(BlockInitializer, P(x({}, n), { item: e }));
 }, CreateFilterActionInitializer = (e) => {
   const t = {
@@ -59532,7 +59548,7 @@ const DataBlockInitializer = (e) => {
     }
   };
 }, RecordAssociationBlockInitializer = () => {
-  const e = useSchemaInitializerItem(), p = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = p, r = K(p, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: i } = useSchemaInitializer(), { getTemplateSchemaByMode: a } = useSchemaTemplateManager(), { getCollection: l } = useCollectionManager_deprecated(), c = e.field, u = l(c.target), d = `${c.collectionName}.${c.name}`;
+  const e = useSchemaInitializerItem(), p = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = p, r = W(p, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: i } = useSchemaInitializer(), { getTemplateSchemaByMode: a } = useSchemaTemplateManager(), { getCollection: l } = useCollectionManager_deprecated(), c = e.field, u = l(c.target), d = `${c.collectionName}.${c.name}`;
   return /* @__PURE__ */ jsx(
     SchemaInitializerItem,
     P(x({
@@ -59628,7 +59644,7 @@ function createDetailsWithPaginationUISchema(e) {
   };
 }
 const RecordAssociationDetailsBlockInitializer = () => {
-  const e = useSchemaInitializerItem(), p = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = p, r = K(p, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: i } = useSchemaInitializer(), { getTemplateSchemaByMode: a } = useSchemaTemplateManager(), { getCollection: l } = useCollectionManager_deprecated(), c = e.field, u = l(c.target), d = `${c.collectionName}.${c.name}`;
+  const e = useSchemaInitializerItem(), p = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = p, r = W(p, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: i } = useSchemaInitializer(), { getTemplateSchemaByMode: a } = useSchemaTemplateManager(), { getCollection: l } = useCollectionManager_deprecated(), c = e.field, u = l(c.target), d = `${c.collectionName}.${c.name}`;
   return /* @__PURE__ */ jsx(
     SchemaInitializerItem,
     P(x({
@@ -59714,7 +59730,7 @@ function createCreateFormBlockUISchema(e) {
   };
 }
 const RecordAssociationFormBlockInitializer = () => {
-  const e = useSchemaInitializerItem(), p = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = p, r = K(p, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: i } = useSchemaInitializer(), { getCollection: a } = useCollectionManager_deprecated(), { getTemplateSchemaByMode: l } = useSchemaTemplateManager(), c = e.field, u = c.target, d = useMemo(() => a(u), [u]);
+  const e = useSchemaInitializerItem(), p = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = p, r = W(p, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: i } = useSchemaInitializer(), { getCollection: a } = useCollectionManager_deprecated(), { getTemplateSchemaByMode: l } = useSchemaTemplateManager(), c = e.field, u = c.target, d = useMemo(() => a(u), [u]);
   return /* @__PURE__ */ jsx(
     SchemaInitializerItem,
     P(x({
@@ -59846,7 +59862,7 @@ const createGridCardBlockUISchema = (e) => {
     }
   };
 }, RecordAssociationGridCardBlockInitializer = () => {
-  const e = useSchemaInitializerItem(), p = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = p, r = K(p, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: i } = useSchemaInitializer(), { getTemplateSchemaByMode: a } = useSchemaTemplateManager(), { getCollection: l } = useCollectionManager_deprecated(), c = e.field, u = l(c.target), d = `${c.collectionName}.${c.name}`;
+  const e = useSchemaInitializerItem(), p = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = p, r = W(p, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: i } = useSchemaInitializer(), { getTemplateSchemaByMode: a } = useSchemaTemplateManager(), { getCollection: l } = useCollectionManager_deprecated(), c = e.field, u = l(c.target), d = `${c.collectionName}.${c.name}`;
   return /* @__PURE__ */ jsx(
     SchemaInitializerItem,
     P(x({
@@ -59951,7 +59967,7 @@ const createListBlockUISchema = (e) => {
     }
   };
 }, RecordAssociationListBlockInitializer = () => {
-  const e = useSchemaInitializerItem(), p = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = p, r = K(p, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: i } = useSchemaInitializer(), { getTemplateSchemaByMode: a } = useSchemaTemplateManager(), { getCollection: l } = useCollectionManager_deprecated(), c = e.field, u = l(c.target), d = `${c.collectionName}.${c.name}`;
+  const e = useSchemaInitializerItem(), p = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = p, r = W(p, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: i } = useSchemaInitializer(), { getTemplateSchemaByMode: a } = useSchemaTemplateManager(), { getCollection: l } = useCollectionManager_deprecated(), c = e.field, u = l(c.target), d = `${c.collectionName}.${c.name}`;
   return /* @__PURE__ */ jsx(
     SchemaInitializerItem,
     P(x({
@@ -60040,7 +60056,7 @@ function createDetailsUISchema(e) {
   });
 }
 const RecordReadPrettyAssociationFormBlockInitializer = () => {
-  const e = useSchemaInitializerItem(), m = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = m, r = K(m, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: i } = useSchemaInitializer(), { getCollection: a } = useCollectionManager_deprecated(), { getTemplateSchemaByMode: l } = useSchemaTemplateManager(), c = e.field, u = c.target, d = a(u), p = `${c.collectionName}.${c.name}`;
+  const e = useSchemaInitializerItem(), m = e, { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = m, r = W(m, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: i } = useSchemaInitializer(), { getCollection: a } = useCollectionManager_deprecated(), { getTemplateSchemaByMode: l } = useSchemaTemplateManager(), c = e.field, u = c.target, d = a(u), p = `${c.collectionName}.${c.name}`;
   return /* @__PURE__ */ jsx(
     SchemaInitializerItem,
     P(x({
@@ -60720,7 +60736,7 @@ const SelectActionInitializer = (e) => {
   }, commonOptions$i),
   readPrettyFormItemInitializers_deprecated
 ), RecordReadPrettyFormBlockInitializer = () => {
-  const l = useSchemaInitializerItem(), { icon: t = !0, targetCollection: n } = l, o = K(l, ["icon", "targetCollection"]), r = useCollection_deprecated(), i = n || r, { createSingleDetailsSchema: a } = useCreateSingleDetailsSchema();
+  const l = useSchemaInitializerItem(), { icon: t = !0, targetCollection: n } = l, o = W(l, ["icon", "targetCollection"]), r = useCollection_deprecated(), i = n || r, { createSingleDetailsSchema: a } = useCreateSingleDetailsSchema();
   return /* @__PURE__ */ jsx(
     SchemaInitializerItem,
     P(x({
@@ -60921,7 +60937,7 @@ function createEditFormBlockUISchema(e) {
   });
 }
 const RecordFormBlockInitializer = () => {
-  const u = useSchemaInitializerItem(), { targetCollection: t } = u, n = K(u, ["targetCollection"]), { insert: o } = useSchemaInitializer(), { getTemplateSchemaByMode: r } = useSchemaTemplateManager(), i = useCollection_deprecated(), a = t || i, { createEditFormBlock: l, templateWrap: c } = useCreateEditFormBlock();
+  const u = useSchemaInitializerItem(), { targetCollection: t } = u, n = W(u, ["targetCollection"]), { insert: o } = useSchemaInitializer(), { getTemplateSchemaByMode: r } = useSchemaTemplateManager(), i = useCollection_deprecated(), a = t || i, { createEditFormBlock: l, templateWrap: c } = useCreateEditFormBlock();
   return /* @__PURE__ */ jsx(
     SchemaInitializerItem,
     P(x({
@@ -61593,7 +61609,7 @@ const commonOptions$h = {
     }
   };
 }, TableSelectorInitializer = () => {
-  const l = useSchemaInitializerItem(), { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = l, r = K(l, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: i } = useSchemaInitializer(), a = useCollection_deprecated();
+  const l = useSchemaInitializerItem(), { onCreateBlockSchema: t, componentType: n, createBlockSchema: o } = l, r = W(l, ["onCreateBlockSchema", "componentType", "createBlockSchema"]), { insert: i } = useSchemaInitializer(), a = useCollection_deprecated();
   return /* @__PURE__ */ jsx(
     SchemaInitializerItem,
     P(x({
@@ -61618,7 +61634,7 @@ const commonOptions$h = {
     {
       title: e("Column width"),
       component: React.forwardRef((r, i) => {
-        const u = r, { children: a, onClick: l } = u, c = K(u, ["children", "onClick"]);
+        const u = r, { children: a, onClick: l } = u, c = W(u, ["children", "onClick"]);
         return /* @__PURE__ */ jsx(
           SchemaInitializerItem,
           P(x({
@@ -62736,7 +62752,7 @@ const commonOptions$h = {
   }, r = useSchemaInitializerItem();
   return /* @__PURE__ */ jsx(BlockInitializer, P(x({}, r), { schema: o, item: r }));
 }, useTableSelectorProps = () => {
-  const { setSelectedRows: e } = useContext(RecordPickerContext), r = useTableSelectorProps$4(), { onRowSelectionChange: t, rowKey: n = "id" } = r, o = K(r, ["onRowSelectionChange", "rowKey"]);
+  const { setSelectedRows: e } = useContext(RecordPickerContext), r = useTableSelectorProps$4(), { onRowSelectionChange: t, rowKey: n = "id" } = r, o = W(r, ["onRowSelectionChange", "rowKey"]);
   return P(x({}, o), {
     rowKey: n,
     rowSelection: {