npm - @nocobase/client - Versions diffs - 1.5.6 → 1.5.8 - Mend

@nocobase/client 1.5.6 → 1.5.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/es/index.mjs +367 -352
package/es/schema-component/antd/association-field/AssociationSelect.d.ts +1 -0
package/es/variables/VariablesProvider.d.ts +3 -2
package/es/variables/utils/cacheLazyLoadedValues.d.ts +10 -0
package/lib/index.js +26 -26
package/package.json +5 -5

package/es/index.mjs CHANGED Viewed

@@ -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";
@@ -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);
@@ -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);
         },
@@ -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);
@@ -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:
@@ -15178,7 +15177,7 @@ const useGetAriaLabelOfDesigner = () => {
       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";
+  }, [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;
@@ -15188,17 +15187,17 @@ const useGetAriaLabelOfDesigner = () => {
       return;
     function J() {
       var Z;
-      W && (W.classList.remove(U), (Z = e.onVisibleChange) == null || Z.call(e, !0));
+      W && (W.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));
+      W && (W.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]),
@@ -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,
@@ -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((W) => {
           linkageAction({
             operator: W.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]
     );
@@ -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: 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(() => {
     var ce;
     return P(x({}, v), {
       opacity: r && (((ce = i == null ? void 0 : i.data) == null ? void 0 : ce.hidden) || !J) && 0.1,
@@ -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,
@@ -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, W, 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 (W = 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;
+                  J = E, X = U;
                   break e;
                 }
             }
-            !Q && ae && getOwn(ae, W) && (Q = getOwn(ae, W), Z = G);
+            !Q && ae && getOwn(ae, W) && (Q = getOwn(ae, W), 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, 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), G = getOwn(p, W)), T && (W ? 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) : "", {
+      }) : 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))), U = W && !G && !O ? "_unnormalized" + (f += 1) : "", {
         prefix: W,
         name: Q,
         parentMap: N,
-        unnormalized: !!G,
+        unnormalized: !!U,
         url: E,
         originalName: J,
         isDefine: X,
-        id: (W ? W + "!" + Q : Q) + G
+        id: (W ? W + "!" + 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.enabled && (Y.isDefine || G.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))
+              y(J) ? (N = !0, U = !0) : (E.push(J), S(J));
+            else if (!W.inited && W.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) {
+        H && each(G, function(W) {
           z(W, {}, {});
-        }), (!V || N) && G && (isBrowser || isWebWorker) && !i && (i = setTimeout(function() {
+        }), (!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), W = 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) {
               return b(X, Y, !0);
-            }) || ""), U = F(
+            }) || ""), G = F(
               T.prefix + "!" + W,
               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, W;
+          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(), W = I(F(null, T)), W.skipMap = N.skipMap, W.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, W, 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("/"), W = getOwn(V, U), W) {
+              isArray(W) && (W = W[0]), E.splice(0, G, W);
               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]));
@@ -19056,8 +19055,8 @@ 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
       } = j || {};
@@ -19067,18 +19066,18 @@ const useCollectionManager_deprecated = (e) => {
         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))
+        (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,
           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();
             })
           )
         );
@@ -19325,47 +19324,50 @@ const useAPITokenVariable = ({
     },
     [e, t]
   );
-}, filterProperties = (e) => e["x-component"] === "Action.Container";
+}, filterProperties = (e) => e["x-component"] === "Action.Container", FieldLink = (e) => {
+  const d = e, { WrappedComponent: t } = d, n = K(d, ["WrappedComponent"]), o = useFieldSchema(), { openPopup: r } = usePopupUtils(), i = useRef(!1), a = useInsertSchema(), l = useRef(o);
+  l.current = o;
+  const c = useCallback(() => l.current, []), u = useCallback(() => {
+    o.properties || (a(popupSchema), i.current = !0), i.current ? (setTimeout(() => {
+      r({ customActionSchema: c() });
+    }), i.current = !1) : o.properties && r();
+  }, [o, a, r, c]);
+  return /* @__PURE__ */ jsx("a", { onClick: u, children: /* @__PURE__ */ jsx(t, x({}, n)) });
+};
 function withPopupWrapper(e) {
   return (t) => {
-    const [n, o] = useState(!1), [r, i] = useState(!1), a = useInsertSchema(), l = useCollection(), c = useActionContext(), u = useField(), d = useFieldSchema(), { enableLink: p, openMode: m, openSize: h } = (d == null ? void 0 : d["x-component-props"]) || {}, { visibleWithURL: g, setVisibleWithURL: f } = usePopupUtils(), { openPopup: C } = usePopupUtils(), b = useRef(!1), S = useRef(d);
-    S.current = d;
-    const y = useCallback(() => S.current, []), v = useCallback(() => {
-      d.properties || (a(popupSchema), b.current = !0), b.current ? (setTimeout(() => {
-        C({
-          customActionSchema: y()
-        });
-      }), b.current = !1) : d.properties && C();
-    }, [d, a, C, y]), { setSubmitted: F } = c, I = useCallback(
-      (R) => {
-        o == null || o(R), f == null || f(R);
-      },
-      [f]
-    );
-    return p ? /* @__PURE__ */ jsx(PopupVisibleProvider, { visible: !1, children: /* @__PURE__ */ jsxs(
+    const [n, o] = useState(!1), [r, i] = useState(!1), a = useCollection(), l = useActionContext(), c = useField(), u = useFieldSchema(), { enableLink: d, openMode: p, openSize: m } = (u == null ? void 0 : u["x-component-props"]) || {}, { visibleWithURL: h, setVisibleWithURL: g } = usePopupUtils(), f = useCallback(
+      (S) => {
+        o == null || o(S), g == null || g(S);
+      },
+      [g]
+    ), C = useRef(u);
+    C.current = u;
+    const { setSubmitted: b } = l;
+    return d ? /* @__PURE__ */ jsx(PopupVisibleProvider, { visible: !1, children: /* @__PURE__ */ jsxs(
       ActionContextProvider,
       {
         button: /* @__PURE__ */ jsx(e, x({}, t)),
-        visible: n || g,
-        setVisible: I,
+        visible: n || h,
+        setVisible: f,
         formValueChanged: r,
         setFormValueChanged: i,
-        openMode: m,
-        openSize: h,
+        openMode: p,
+        openSize: m,
         containerRefKey: "field-popup",
-        fieldSchema: d,
-        setSubmitted: F,
+        fieldSchema: u,
+        setSubmitted: b,
         children: [
-          /* @__PURE__ */ jsx(CollectionProvider, { name: l.name, children: /* @__PURE__ */ jsx(SchemaComponentOptions, { children: /* @__PURE__ */ jsx(VariablePopupRecordProvider, { children: /* @__PURE__ */ jsx(
+          /* @__PURE__ */ jsx(CollectionProvider, { name: a.name, children: /* @__PURE__ */ jsx(SchemaComponentOptions, { children: /* @__PURE__ */ jsx(VariablePopupRecordProvider, { children: /* @__PURE__ */ jsx(
             NocoBaseRecursionField,
             {
               onlyRenderProperties: !0,
-              basePath: u == null ? void 0 : u.address,
-              schema: d,
+              basePath: c == null ? void 0 : c.address,
+              schema: u,
               filterProperties
             }
           ) }) }) }),
-          /* @__PURE__ */ jsx("a", { onClick: v, children: /* @__PURE__ */ jsx(e, x({}, t)) })
+          /* @__PURE__ */ jsx(FieldLink, P(x({}, t), { WrappedComponent: e }))
         ]
       }
     ) }) : /* @__PURE__ */ jsx(e, x({}, t));
@@ -22466,9 +22468,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 +22511,7 @@ const SchemaSettingsModalItem = (e) => {
                             {
                               components: o,
                               scope: r,
-                              schema: U
+                              schema: G
                             }
                           ) }) }) })
                         }
@@ -22524,8 +22526,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
@@ -23372,8 +23374,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 +23411,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 +23455,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 +24242,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 +24271,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 +24287,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 }) => {
+        onSubmit: ({ filter: U }) => {
           var W, Y;
-          G = removeNullCondition(G), set(l.componentProps, "service.params.filter", G), n["x-component-props"] = l.componentProps;
+          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(((W = l.path) == null ? void 0 : W.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,13 +24318,13 @@ const useGetFilterOptions = () => {
             }
           }
         },
-        onSubmit: ({ width: G }) => {
+        onSubmit: ({ width: U }) => {
           const H = u["x-component-props"] || {};
-          H.width = G;
+          H.width = U;
           const W = {
             "x-uid": u["x-uid"]
           };
-          W["x-component-props"] = H, u["x-component-props"] = H, l.componentProps.width = G, d.emit("patch", {
+          W["x-component-props"] = H, u["x-component-props"] = H, l.componentProps.width = U, d.emit("patch", {
             schema: W
           }), d.refresh();
         }
@@ -24334,13 +24336,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 +24355,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,10 +24375,10 @@ 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);
@@ -24401,11 +24403,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 +24419,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 +24436,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;
+          n.required = U, H.required = U;
           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;
+            X.required = U;
           }), d.emit("patch", {
             schema: H
           }), d.refresh();
@@ -24460,12 +24462,12 @@ 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) {
+          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) => {
                 X.readonly = !0, X.disabled = !0;
@@ -24497,11 +24499,11 @@ const useGetFilterOptions = () => {
       SchemaSettingsSortingRule,
       {
         fieldSchema: n,
-        onSubmitCallBack: (G) => {
+        onSubmitCallBack: (U) => {
           var W, Y;
           const H = (Y = l.path) == null ? void 0 : Y.splice(((W = l.path) == null ? void 0 : W.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 +25551,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,
@@ -25586,7 +25588,7 @@ const useCreateActionProps = () => {
             // 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
           });
-          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 +25739,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 +25751,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, W;
+              const { filter: V } = (U = (G = o.params) == null ? void 0 : G[0]) != null ? U : {}, E = {
                 values: x({}, j),
                 filter: V,
                 forceUpdate: !1
@@ -25792,7 +25794,7 @@ 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;
@@ -25819,7 +25821,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 +25845,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: W } = (yield b == null ? void 0 : b.parseVariable(U, S)) || {};
+            W && (T[G] = transformVariableValue(W, { 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 +25871,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 +25880,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,10 +26102,10 @@ const useCreateActionProps = () => {
     (w) => {
       const { targets: B, uid: j } = findFilterTargets(t);
       o().forEach((T) => {
-        var G, H, W;
+        var U, H, W;
         if (!B.find((Y) => Y.uid === T.uid))
           return;
-        const O = `${j}${t.name}`, V = ((G = T.service.params) == null ? void 0 : G[0]) || {};
+        const O = `${j}${t.name}`, V = ((U = T.service.params) == null ? void 0 : U[0]) || {};
         (W = (H = T.service.params) == null ? void 0 : H[1]) != null && W.filters || _.set(T.service.params, "[1].filters", {});
         const E = T.service.params[1].filters;
         if (w.length)
@@ -26115,11 +26117,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 +26749,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: {
@@ -26879,7 +26884,7 @@ const UnitConversion = ({ unitConversionType: e }) => {
   ] });
 }, BlockItemCard = React.forwardRef((o, n) => {
   var r = o, { children: e } = r, t = K(r, ["children"]);
-  const { token: i } = useToken$1(), a = useMemo(() => ({ marginBottom: i.marginBlock }), [i.marginBlock]);
+  const { token: i } = useToken$1(), a = useMemo(() => ({ marginBottom: i.marginBlock, height: t.height || "100%" }), [i.marginBlock]);
   return /* @__PURE__ */ jsx(Card, P(x({ ref: n, bordered: !1, style: a }, t), { children: e }));
 });
 BlockItemCard.displayName = "BlockItemCard";
@@ -27268,35 +27273,31 @@ const FilterFormDesigner = () => /* @__PURE__ */ jsx(GeneralSchemaDesigner, { sc
     "title-field"
   ) : null;
 }, isDisplayField = (e) => e.includes("."), useLazyLoadDisplayAssociationFieldsOfForm = () => {
-  var S;
-  const { name: e } = useCollection_deprecated(), { getCollectionJoinField: t } = useCollectionManager_deprecated(), n = useForm(), o = useCollectionRecordData(), r = useFieldSchema(), i = useVariables$1(), a = useField(), { formValue: l } = useSubFormValue(), { isInSubForm: c, isInSubTable: u } = useFlag() || {}, { getAssociationAppends: d } = useAssociationNames(), p = r.name.toString(), m = useMemo(() => hasPreload(o, p), [o, p]), h = useRef(null), g = useRef(null);
-  h.current == null && isDisplayField(p) && (h.current = t(`${e}.${p}`)), g.current == null && isDisplayField(p) && (g.current = t(`${e}.${p.split(".")[0]}`));
-  const f = useMemo(() => !isDisplayField(p) || !i || e === "fields" || !h.current || m, [p, i, e, h.current, m]), C = f ? {} : untracked(() => _.cloneDeep(c || u ? l : n.values)), b = isDisplayField(p) && g.current ? _.get(C, `${p.split(".")[0]}.${((S = g.current) == null ? void 0 : S.targetKey) || "id"}`) : void 0;
+  var C;
+  const { name: e } = useCollection_deprecated(), { getCollectionJoinField: t } = useCollectionManager_deprecated(), n = useForm(), o = useFieldSchema(), r = useVariables$1(), i = useField(), { formValue: a } = useSubFormValue(), { isInSubForm: l, isInSubTable: c } = useFlag() || {}, { getAssociationAppends: u } = useAssociationNames(), d = o.name.toString(), p = useRef(null), m = useRef(null);
+  p.current == null && isDisplayField(d) && (p.current = t(`${e}.${d}`)), m.current == null && isDisplayField(d) && (m.current = t(`${e}.${d.split(".")[0]}`));
+  const h = useMemo(() => !isDisplayField(d) || !r || e === "fields" || !p.current, [d, r, e, p.current]), g = h ? {} : untracked(() => _.cloneDeep(l || c ? a : n.values)), f = isDisplayField(d) && m.current ? _.get(g, `${d.split(".")[0]}.${((C = m.current) == null ? void 0 : C.targetKey) || "id"}`) : void 0;
   useEffect(() => {
-    if (f || _.isEmpty(C))
+    if (h || _.isEmpty(g))
       return;
-    const y = {
+    const b = {
       name: "$nForm",
-      ctx: C,
+      ctx: g,
       collectionName: e
-    }, v = `{{ $nForm.${p} }}`;
-    if (b == null)
+    }, S = `{{ $nForm.${d} }}`;
+    if (f == null)
       return;
-    const { appends: F } = d();
-    i.parseVariable(v, y, { appends: F }).then(({ value: I }) => {
+    const { appends: y } = u();
+    r.parseVariable(S, b, { appends: y }).then(({ value: v }) => {
       nextTick(() => {
-        const R = transformVariableValue(I, { targetCollectionField: h.current });
-        _.isEmpty(R) && !_.isNumber(R) ? a.value = null : a.value = R;
+        const F = transformVariableValue(v, { targetCollectionField: p.current });
+        _.isEmpty(F) && !_.isNumber(F) ? i.value = null : i.value = F;
       });
-    }).catch((I) => {
-      console.error(I);
+    }).catch((v) => {
+      console.error(v);
     });
-  }, [b, f]);
+  }, [f, h]);
 };
-function hasPreload(e, t) {
-  const n = _.get(e, t);
-  return n != null && JSON.stringify(n) !== "[{}]" && JSON.stringify(n) !== "{}";
-}
 function forEachLinkageRule(e, t) {
   e.forEach((n) => {
     var o;
@@ -27999,7 +28000,7 @@ const HeightMode = {
             },
             "x-validator": [
               {
-                minimum: 200
+                minimum: 40
               }
             ],
             "x-reactions": {
@@ -29045,7 +29046,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 +29074,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 +29095,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 +29114,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 +29153,7 @@ function Input$1(e) {
           loadData: V,
           changeOnSelect: u,
           fieldNames: d,
-          disabled: G,
+          disabled: U,
           children: r != null ? r : /* @__PURE__ */ jsx(
             XButton,
             {
@@ -29160,7 +29161,7 @@ function Input$1(e) {
               margin-left: -1px;
             `),
               type: w ? "primary" : "default",
-              disabled: G
+              disabled: U
             }
           )
         }
@@ -29444,22 +29445,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 +29498,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 +33145,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 +33175,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 +33186,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 +33225,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(".");
         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 +34739,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 +34784,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 W = 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, W), W;
             }
-            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 W = 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, W), U = yield W, 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 +34862,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 +34918,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 +35192,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.8", 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 +35214,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.8",
+  "@nocobase/sdk": "1.5.8",
+  "@nocobase/utils": "1.5.8",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -36583,7 +36598,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 +36610,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 +36627,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 +36636,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 } }),
@@ -37734,7 +37749,7 @@ function navigateToTab({
   basename: n,
   pathname: o = window.location.pathname
 }) {
-  o = o.replace(n, ""), o.endsWith("/") && (o = o.slice(0, -1)), o.startsWith("/") || (o = `/${o}`), isTabPage(o) ? t(`${o.replace(/\/tabs\/[^/]+$/, `/tabs/${e}`)}`, { replace: !0 }) : t(`${o}/tabs/${e}`, { replace: !0 });
+  o = o.replace(n, ""), o.endsWith("/") && (o = o.slice(0, -1)), o.startsWith("/") || (o = `/${o}`), isTabPage(o) ? t(withSearchParams(`${o.replace(/\/tabs\/[^/]+$/, `/tabs/${e}`)}`), { replace: !0 }) : t(withSearchParams(`${o}/tabs/${e}`), { replace: !0 });
 }
 function isTabPage(e) {
   e.endsWith("/") && (e = e.slice(0, -1));
@@ -38101,6 +38116,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;
@@ -38125,7 +38143,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 +38177,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({
@@ -39177,8 +39195,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 {
@@ -40799,7 +40817,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);
       },
@@ -40927,8 +40945,8 @@ const Table$1 = withDynamicSchemaProps(
       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 +40971,7 @@ const Table$1 = withDynamicSchemaProps(
           paginationProps: z,
           components: X,
           onTableChange: d,
-          onRow: G,
+          onRow: U,
           rowClassName: xe,
           scroll: ue,
           columns: L,
@@ -41041,14 +41059,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 +41080,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 +41196,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 +41282,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, W;
   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 +41512,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", {
@@ -43091,11 +43109,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: "." },
@@ -46766,14 +46781,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 +46829,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: {
@@ -48677,9 +48692,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), {
@@ -49483,22 +49498,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 +49529,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 })
             });
@@ -54886,9 +54901,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();
@@ -58906,7 +58921,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 +58936,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");
@@ -58943,7 +58958,7 @@ const ActionInitializerItem = (e) => {
       W.stopPropagation();
     }, O = (W) => {
       m(W);
-    }, V = (H = a.title) != null ? H : (G = i == null ? void 0 : i.uiSchema) == null ? void 0 : G.title;
+    }, 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, {}),