@nocobase/client 1.5.18 → 1.5.20

package/es/index.mjs

@@ -5946,8 +5946,8 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
           if (D > 2)
             return w;
           if (L != null && L.length && (w.children = L), z) {
-            const T = o(k.target), N = A(T, D + 1).filter(Boolean);
-            w.children = w.children || [], w.children.push(...N);
+            const T = o(k.target), O = A(T, D + 1).filter(Boolean);
+            w.children = w.children || [], w.children.push(...O);
           }
           return w;
         }
@@ -10500,7 +10500,7 @@ const Table$2 = withDynamicSchemaProps(
         "onClickRow",
         "value"
       ]), y = useArrayField$1(S), v = useFieldSchema(), { size: F = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, A = useCollection(), k = ((ce = v == null ? void 0 : v.parent) == null ? void 0 : ce["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: j } = k, z = useMemoizedFn(S.onRowDragEnd || (() => {
-      })), L = usePaginationProps$3(n, i, e), M = useTableColumns$2(S, L), [w, B] = useState(() => D ? 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`
+      })), L = usePaginationProps$3(n, i, e), M = useTableColumns$2(S, L), [w, B] = useState(() => D ? j : []), [$, T] = useState(((Ce = y == null ? void 0 : y.data) == null ? void 0 : Ce.selectedRowKeys) || []), [O, N] = useState([]), V = (p == null ? void 0 : p.type) !== "none", E = useRef(/* @__PURE__ */ new Map()), G = useMemo(() => css`
           & > td {
             background-color: ${t.controlItemBgActive} !important;
           }
@@ -10509,14 +10509,14 @@ const Table$2 = withDynamicSchemaProps(
           }
         `, [t.controlItemBgActive, t.controlItemBgActiveHover]), U = useMemo(() => C ? G : "", [G, C]), H = useMemo(() => C ? (re, ee) => ({
         onClick: (ne) => {
-          isPortalInBody(ne.target) || C(re, O, N);
+          isPortalInBody(ne.target) || C(re, N, O);
         },
         rowIndex: ee,
         record: re
       }) : (re, ee) => ({
         rowIndex: ee,
         record: re
-      }), [C, N]);
+      }), [C, O]);
       useDeepCompareEffect(() => {
         const re = D ? j : [];
         _.isEqual(re, w) || B(re);
@@ -10638,8 +10638,8 @@ const Table$2 = withDynamicSchemaProps(
         x: "max-content",
         y: ie
       }), [ie, J]), xe = useCallback(
-        (re) => N.includes(re[m]) ? U : "",
-        [N, U, JSON.stringify(m)]
+        (re) => O.includes(re[m]) ? U : "",
+        [O, U, JSON.stringify(m)]
       ), pe = useCallback(
         (re, ee) => {
           const ne = re ? [...w, ee[A.getPrimaryKey()]] : w.filter((se) => ee[A.getPrimaryKey()] !== se);
@@ -10884,14 +10884,14 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
       popupUid: B,
       recordData: $,
       sourceId: T,
-      collection: N,
-      puid: O
+      collection: O,
+      puid: N
     }) => {
       const V = c.getFilterByTK(u || l, $);
       return getPopupPathFromParams({
         popupuid: B,
-        puid: O,
-        collection: N,
+        puid: N,
+        collection: O,
         filterbytk: V,
         sourceid: T,
         tab: w
@@ -10911,11 +10911,11 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
       parentRecordData: B,
       collectionNameUsedInURL: $,
       popupUidUsedInURL: T,
-      customActionSchema: N
+      customActionSchema: O
     } = {}) => {
       if (!f())
         return A == null ? void 0 : A(!0);
-      const O = N || o, V = O == null ? void 0 : O["x-uid"], E = y(B);
+      const N = O || o, V = N == null ? void 0 : N["x-uid"], E = y(B);
       w = w || (i == null ? void 0 : i.data);
       const G = R({
         popupUid: V,
@@ -10926,7 +10926,7 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
       });
       let U = n.pathname;
       if (_.last(U) === "/" && (U = U.slice(0, -1)), storePopupContext(V, {
-        schema: O,
+        schema: N,
         record: new CollectionRecord({ isNew: !1, data: w }),
         parentRecord: B ? new CollectionRecord({ isNew: !1, data: B }) : a,
         service: g(),
@@ -10935,7 +10935,7 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
         association: u,
         sourceId: E,
         tableBlockContext: P(x({}, F), { collection: l == null ? void 0 : l.name, blockData: v })
-      }), b(k(), N), O.properties) {
+      }), b(k(), O), N.properties) {
         const H = h + 1;
         if (getPopupLayerState(H))
           return;
@@ -10943,7 +10943,7 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
       } else
         console.error(
           `[NocoBase] The popup schema is invalid, please check the schema: 
-${JSON.stringify(O, null, 2)}`
+${JSON.stringify(N, null, 2)}`
         );
     },
     [
@@ -12612,9 +12612,9 @@ const useTableBlockProps = () => {
     ),
     onChange: useCallback(
       ({ current: S, pageSize: y }, v, F) => {
-        var j, z, L, M, w, B, $, T, N, O;
-        const A = (L = (z = (j = t.parent) == null ? void 0 : j["x-decorator-props"]) == null ? void 0 : z.params) == null ? void 0 : L.sort, R = F.order ? F.order === "ascend" ? [F.field] : [`-${F.field}`] : A || i.dragSortBy, k = y || ((B = (w = (M = t.parent) == null ? void 0 : M["x-decorator-props"]) == null ? void 0 : w.params) == null ? void 0 : B.pageSize), D = P(x({}, (N = (T = ($ = a.current) == null ? void 0 : $.service) == null ? void 0 : T.params) == null ? void 0 : N[0]), { page: S || 1, pageSize: k });
-        R && (D.sort = R), (O = a.current) == null || O.service.run(D);
+        var j, z, L, M, w, B, $, T, O, N;
+        const A = (L = (z = (j = t.parent) == null ? void 0 : j["x-decorator-props"]) == null ? void 0 : z.params) == null ? void 0 : L.sort, R = F.order ? F.order === "ascend" ? [F.field] : [`-${F.field}`] : A || i.dragSortBy, k = y || ((B = (w = (M = t.parent) == null ? void 0 : M["x-decorator-props"]) == null ? void 0 : w.params) == null ? void 0 : B.pageSize), D = P(x({}, (O = (T = ($ = a.current) == null ? void 0 : $.service) == null ? void 0 : T.params) == null ? void 0 : O[0]), { page: S || 1, pageSize: k });
+        R && (D.sort = R), (N = a.current) == null || N.service.run(D);
       },
       [t.parent]
     ),
@@ -12627,11 +12627,11 @@ const useTableBlockProps = () => {
         }
         const k = R.find((D) => D.uid === t.parent["x-uid"]);
         R.forEach((D) => {
-          var $, T, N;
-          const j = F.find((O) => O.uid === D.uid);
+          var $, T, O;
+          const j = F.find((N) => N.uid === D.uid);
           if (!j)
             return;
-          const z = getSourceKey(k, j.field) || i.rowKey || "id", L = [S[z]], M = (($ = D.service.params) == null ? void 0 : $[0]) || {}, w = ((N = (T = D.service.params) == null ? void 0 : T[1]) == null ? void 0 : N.filters) || {};
+          const z = getSourceKey(k, j.field) || i.rowKey || "id", L = [S[z]], M = (($ = D.service.params) == null ? void 0 : $[0]) || {}, w = ((O = (T = D.service.params) == null ? void 0 : T[1]) == null ? void 0 : O.filters) || {};
           if (v.includes(S[i.rowKey])) {
             if (D.dataLoadingMode === "manual")
               return D.clearData();
@@ -12647,7 +12647,7 @@ const useTableBlockProps = () => {
               ]
             };
           const B = mergeFilter([
-            ...Object.values(w).map((O) => removeNullCondition(O)),
+            ...Object.values(w).map((N) => removeNullCondition(N)),
             D.defaultFilter
           ]);
           return D.doFilter(
@@ -13113,10 +13113,10 @@ const useTableSelectorParams = () => useContext(TableSelectorParamsContext), Tab
   var a, l, c, u, d, p, m, h, g, f, C, b, S, y, v, F;
   const e = useField(), t = useTableSelectorContext(), n = useFieldSchema(), { getCollectionJoinField: o } = useCollectionManager_deprecated(), r = recursiveParent$1(n, "CollectionField"), i = o(r == null ? void 0 : r["x-collection-field"]);
   return useEffect(() => {
-    var R, k, D, j, z, L, M, w, B, $, T, N, O;
+    var R, k, D, j, z, L, M, w, B, $, T, O, N;
     if (!((R = t == null ? void 0 : t.service) != null && R.loading)) {
       const V = (D = (k = t == null ? void 0 : t.service) == null ? void 0 : k.data) == null ? void 0 : D.data.map((E) => E);
-      e.value = V, (j = e == null ? void 0 : e.setInitialValue) == null || j.call(e, V), e.data = e.data || {}, e.data.selectedRowKeys = [], e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (M = (L = (z = t == null ? void 0 : t.service) == null ? void 0 : z.data) == null ? void 0 : L.meta) == null ? void 0 : M.pageSize, e.componentProps.pagination.total = ($ = (B = (w = t == null ? void 0 : t.service) == null ? void 0 : w.data) == null ? void 0 : B.meta) == null ? void 0 : $.count, e.componentProps.pagination.current = (O = (N = (T = t == null ? void 0 : t.service) == null ? void 0 : T.data) == null ? void 0 : N.meta) == null ? void 0 : O.page;
+      e.value = V, (j = e == null ? void 0 : e.setInitialValue) == null || j.call(e, V), e.data = e.data || {}, e.data.selectedRowKeys = [], e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (M = (L = (z = t == null ? void 0 : t.service) == null ? void 0 : z.data) == null ? void 0 : L.meta) == null ? void 0 : M.pageSize, e.componentProps.pagination.total = ($ = (B = (w = t == null ? void 0 : t.service) == null ? void 0 : w.data) == null ? void 0 : B.meta) == null ? void 0 : $.count, e.componentProps.pagination.current = (N = (O = (T = t == null ? void 0 : t.service) == null ? void 0 : T.data) == null ? void 0 : O.meta) == null ? void 0 : N.page;
     }
   }, [
     i == null ? void 0 : i.foreignKey,
@@ -15175,7 +15175,7 @@ const useGetAriaLabelOfDesigner = () => {
         })
       )
     };
-  }, [y, (H = B == null ? void 0 : B.cols) == null ? void 0 : H.length]), N = useMemo(() => u === !1 || f === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": y("drag-handler") }) }), [u, y, f]), O = useMemo(() => {
+  }, [y, (H = B == null ? void 0 : B.cols) == null ? void 0 : H.length]), O = useMemo(() => u === !1 || f === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": y("drag-handler") }) }), [u, y, f]), N = useMemo(() => {
     var K;
     if (o === !1)
       return null;
@@ -15222,8 +15222,8 @@ const useGetAriaLabelOfDesigner = () => {
           j[1] && /* @__PURE__ */ jsx("span", { className: "toolbar-title-tag", children: `${S("Reference template")}: ${`${j[1]}` || S("Untitled")}` })
         ] }) }),
         /* @__PURE__ */ jsx("div", { className: cls("toolbar-icons", a), style: l, children: /* @__PURE__ */ jsxs(Space$1, { size: 3, align: "center", className: d, style: p, children: [
-          N,
-          /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: D, children: O }),
+          O,
+          /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: D, children: N }),
           V
         ] }) })
       ]
@@ -16619,7 +16619,7 @@ const ActionLink = withDynamicSchemaProps(
       "onMouseEnter",
       "refreshDataBlockRequest",
       "confirmTitle"
-    ]), v = useDesigner(), F = useField(), A = useFieldSchema(), R = useCompile(), k = useCollectionRecordData(), D = R((G = A["x-component-props"]) == null ? void 0 : G.confirm) || g, j = useMemo(() => (A == null ? void 0 : A["x-linkage-rules"]) || [], [A == null ? void 0 : A["x-linkage-rules"]]), { designable: z } = useDesignable(), L = useComponent(o) || o, M = useVariables$1(), w = useLocalVariables$1({ currentForm: { values: k, readPretty: !1 } }), { visibleWithURL: B, setVisibleWithURL: $ } = usePopupUtils(), { setSubmitted: T } = useActionContext(), { getAriaLabel: N } = useGetAriaLabelOfAction(l), O = useCollectionParentRecordData();
+    ]), v = useDesigner(), F = useField(), A = useFieldSchema(), R = useCompile(), k = useCollectionRecordData(), D = R((G = A["x-component-props"]) == null ? void 0 : G.confirm) || g, j = useMemo(() => (A == null ? void 0 : A["x-linkage-rules"]) || [], [A == null ? void 0 : A["x-linkage-rules"]]), { designable: z } = useDesignable(), L = useComponent(o) || o, M = useVariables$1(), w = useLocalVariables$1({ currentForm: { values: k, readPretty: !1 } }), { visibleWithURL: B, setVisibleWithURL: $ } = usePopupUtils(), { setSubmitted: T } = useActionContext(), { getAriaLabel: O } = useGetAriaLabelOfAction(l), N = useCollectionParentRecordData();
     useEffect(() => {
       F.stateOfLinkageRules && setInitialActionState(F), F.stateOfLinkageRules = {}, j.filter((U) => !U.disabled).forEach((U) => {
         var H;
@@ -16667,8 +16667,8 @@ const ActionLink = withDynamicSchemaProps(
         visibleWithURL: B,
         setVisibleWithURL: $,
         setSubmitted: T,
-        getAriaLabel: N,
-        parentRecordData: O,
+        getAriaLabel: O,
+        parentRecordData: N,
         actionCallback: h
       }, y)
     );
@@ -16732,7 +16732,7 @@ const ActionLink = withDynamicSchemaProps(
     "setSubmitted",
     "getAriaLabel",
     "parentRecordData"
-  ]), [w, B] = useState(!1), { wrapSSR: $, componentCls: T, hashId: N } = useStyles$e(), [O, V] = useState(!1), E = o["x-toolbar-props"] || o["x-designer-props"], G = (pe = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : pe.openMode, U = (fe = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : fe.openSize, H = (me = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : me.refreshDataBlockRequest, { modal: K } = App.useApp(), Y = useForm(), J = useACLActionParamsContext(), { run: X, element: Q, disabled: Z } = (A == null ? void 0 : A(R)) || {}, oe = Y.disabled || i.disabled || ((he = i.data) == null ? void 0 : he.disabled) || F || Z, te = useMemo(() => {
+  ]), [w, B] = useState(!1), { wrapSSR: $, componentCls: T, hashId: O } = useStyles$e(), [N, V] = useState(!1), E = o["x-toolbar-props"] || o["x-designer-props"], G = (pe = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : pe.openMode, U = (fe = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : fe.openSize, H = (me = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : me.refreshDataBlockRequest, { modal: K } = App.useApp(), Y = useForm(), J = useACLActionParamsContext(), { run: X, element: Q, disabled: Z } = (A == null ? void 0 : A(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,
@@ -16750,7 +16750,7 @@ const ActionLink = withDynamicSchemaProps(
     tarComponent: u,
     designerProps: E,
     componentCls: T,
-    hashId: N,
+    hashId: O,
     className: d,
     others: M,
     getAriaLabel: z,
@@ -16778,7 +16778,7 @@ const ActionLink = withDynamicSchemaProps(
       button: RenderButton(ie),
       visible: w || k,
       setVisible: ae,
-      formValueChanged: O,
+      formValueChanged: N,
       setFormValueChanged: V,
       openMode: G,
       openSize: U,
@@ -16868,9 +16868,9 @@ const RenderButton = ({
   const { getDataBlockRequest: z } = useDataBlockRequestGetter(), { t: L } = useTranslation(), { isPopupVisibleControlledByURL: M } = usePopupSettings(), { openPopup: w } = usePopupUtils(), B = useRef(null);
   B.current = w;
   const $ = useCallback(
-    (T, N = !0) => {
-      if (!(N && isPortalInBody(T.target)) && (T.preventDefault(), T.stopPropagation(), !i && n)) {
-        const O = () => {
+    (T, O = !0) => {
+      if (!(O && isPortalInBody(T.target)) && (T.preventDefault(), T.stopPropagation(), !i && n)) {
+        const N = () => {
           b ? b(T, () => {
             var V, E;
             S !== !1 && (k == null || k(!0), (E = (V = z()) == null ? void 0 : V.refresh) == null || E.call(V));
@@ -16879,8 +16879,8 @@ const RenderButton = ({
         (A == null ? void 0 : A.enable) !== !1 && (A != null && A.content) ? R.confirm({
           title: L(A.title, { title: D || j || (t == null ? void 0 : t.title) }),
           content: L(A.content, { title: D || j || (t == null ? void 0 : t.title) }),
-          onOk: O
-        }) : O();
+          onOk: N
+        }) : N();
       }
     },
     [
@@ -17933,19 +17933,19 @@ https://requirejs.org/docs/errors.html#` + e);
       config: {}
     }, l = {}, c = {}, u = {}, d = [], p = {}, m = {}, h = {}, g = 1, f = 1;
     function C(T) {
-      var N, O;
-      for (N = 0; N < T.length; N++)
-        if (O = T[N], O === ".")
-          T.splice(N, 1), N -= 1;
-        else if (O === "..") {
-          if (N === 0 || N === 1 && T[2] === ".." || T[N - 1] === "..")
+      var O, N;
+      for (O = 0; O < T.length; O++)
+        if (N = T[O], N === ".")
+          T.splice(O, 1), O -= 1;
+        else if (N === "..") {
+          if (O === 0 || O === 1 && T[2] === ".." || T[O - 1] === "..")
             continue;
-          N > 0 && (T.splice(N - 1, 2), N -= 2);
+          O > 0 && (T.splice(O - 1, 2), O -= 2);
         }
     }
-    function b(T, N, O) {
-      var V, E, G, U, H, K, Y, J, X, Q, Z, oe, te = N && N.split("/"), ie = a.map, ae = ie && ie["*"];
-      if (T && (T = T.split("/"), Y = T.length - 1, a.nodeIdCompat && jsSuffixRegExp.test(T[Y]) && (T[Y] = T[Y].replace(jsSuffixRegExp, "")), T[0].charAt(0) === "." && te && (oe = te.slice(0, te.length - 1), T = oe.concat(T)), C(T), T = T.join("/")), O && ie && (te || ae)) {
+    function b(T, O, N) {
+      var V, E, G, U, H, K, Y, J, X, Q, Z, oe, te = O && O.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("/")), N && ie && (te || ae)) {
         G = T.split("/");
         e:
           for (U = G.length; U > 0; U -= 1) {
@@ -17963,30 +17963,30 @@ https://requirejs.org/docs/errors.html#` + e);
       return V = getOwn(a.pkgs, T), V || T;
     }
     function S(T) {
-      isBrowser && each(scripts(), function(N) {
-        if (N.getAttribute("data-requiremodule") === T && N.getAttribute("data-requirecontext") === o.contextName)
-          return N.parentNode.removeChild(N), !0;
+      isBrowser && each(scripts(), function(O) {
+        if (O.getAttribute("data-requiremodule") === T && O.getAttribute("data-requirecontext") === o.contextName)
+          return O.parentNode.removeChild(O), !0;
       });
     }
     function y(T) {
-      var N = getOwn(a.paths, T);
-      if (N && isArray(N) && N.length > 1)
-        return N.shift(), o.require.undef(T), o.makeRequire(null, {
+      var O = getOwn(a.paths, T);
+      if (O && isArray(O) && O.length > 1)
+        return O.shift(), o.require.undef(T), o.makeRequire(null, {
           skipMap: !0
         })([T]), !0;
     }
     function v(T) {
-      var N, O = T ? T.indexOf("!") : -1;
-      return O > -1 && (N = T.substring(0, O), T = T.substring(O + 1, T.length)), [N, T];
+      var O, N = T ? T.indexOf("!") : -1;
+      return N > -1 && (O = T.substring(0, N), T = T.substring(N + 1, T.length)), [O, T];
     }
-    function F(T, N, O, V) {
-      var E, G, U, H, K = null, Y = N ? N.name : null, J = T, X = !0, Q = "";
-      return T || (X = !1, T = "_@r" + (g += 1)), H = v(T), K = H[0], T = H[1], K && (K = b(K, Y, V), G = getOwn(p, K)), T && (K ? O ? Q = T : G && G.normalize ? Q = G.normalize(T, function(Z) {
+    function F(T, O, N, V) {
+      var E, G, U, H, K = null, Y = O ? O.name : null, J = T, X = !0, Q = "";
+      return T || (X = !1, T = "_@r" + (g += 1)), H = v(T), K = H[0], T = H[1], K && (K = b(K, Y, V), G = getOwn(p, K)), T && (K ? N ? 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), K = H[0], Q = H[1], O = !0, E = o.nameToUrl(Q))), U = K && !G && !O ? "_unnormalized" + (f += 1) : "", {
+      }) : Q = T.indexOf("!") === -1 ? b(T, Y, V) : T : (Q = b(T, Y, V), H = v(Q), K = H[0], Q = H[1], N = !0, E = o.nameToUrl(Q))), U = K && !G && !N ? "_unnormalized" + (f += 1) : "", {
         prefix: K,
         name: Q,
-        parentMap: N,
+        parentMap: O,
         unnormalized: !!U,
         url: E,
         originalName: J,
@@ -17995,24 +17995,24 @@ https://requirejs.org/docs/errors.html#` + e);
       };
     }
     function A(T) {
-      var N = T.id, O = getOwn(l, N);
-      return O || (O = l[N] = new o.Module(T)), O;
+      var O = T.id, N = getOwn(l, O);
+      return N || (N = l[O] = new o.Module(T)), N;
     }
-    function R(T, N, O) {
+    function R(T, O, N) {
       var V = T.id, E = getOwn(l, V);
-      hasProp(p, V) && (!E || E.defineEmitComplete) ? N === "defined" && O(p[V]) : (E = A(T), E.error && N === "error" ? O(E.error) : E.on(N, O));
+      hasProp(p, V) && (!E || E.defineEmitComplete) ? O === "defined" && N(p[V]) : (E = A(T), E.error && O === "error" ? N(E.error) : E.on(O, N));
     }
-    function k(T, N) {
-      var O = T.requireModules, V = !1;
-      N ? N(T) : (each(O, function(E) {
+    function k(T, O) {
+      var N = T.requireModules, V = !1;
+      O ? O(T) : (each(N, function(E) {
         var G = getOwn(l, E);
         G && (G.error = T, G.events.error && (V = !0, G.emit("error", T)));
       }), V || req.onError(T));
     }
     function D() {
       globalDefQueue.length && (each(globalDefQueue, function(T) {
-        var N = T[0];
-        typeof N == "string" && (o.defQueueMap[N] = !0), d.push(T);
+        var O = T[0];
+        typeof O == "string" && (o.defQueueMap[O] = !0), d.push(T);
       }), globalDefQueue = []);
     }
     r = {
@@ -18037,21 +18037,21 @@ https://requirejs.org/docs/errors.html#` + e);
     function j(T) {
       delete l[T], delete c[T];
     }
-    function z(T, N, O) {
+    function z(T, O, N) {
       var V = T.map.id;
-      T.error ? T.emit("error", T.error) : (N[V] = !0, each(T.depMaps, function(E, G) {
+      T.error ? T.emit("error", T.error) : (O[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);
+        H && !T.depMatched[G] && !N[U] && (getOwn(O, U) ? (T.defineDep(G, p[U]), T.check()) : z(H, O, N));
+      }), N[V] = !0);
     }
     function L() {
-      var T, N, O = a.waitSeconds * 1e3, V = O && o.startTime + O < (/* @__PURE__ */ new Date()).getTime(), E = [], G = [], U = !1, H = !0;
+      var T, O, N = a.waitSeconds * 1e3, V = N && o.startTime + N < (/* @__PURE__ */ new Date()).getTime(), E = [], G = [], U = !1, H = !0;
       if (!t) {
         if (t = !0, eachProp(c, function(K) {
           var Y = K.map, J = Y.id;
           if (K.enabled && (Y.isDefine || G.push(K), !K.error)) {
             if (!K.inited && V)
-              y(J) ? (N = !0, U = !0) : (E.push(J), S(J));
+              y(J) ? (O = !0, U = !0) : (E.push(J), S(J));
             else if (!K.inited && K.fetched && Y.isDefine && (U = !0, !Y.prefix))
               return H = !1;
           }
@@ -18059,7 +18059,7 @@ https://requirejs.org/docs/errors.html#` + e);
           return T = makeError("timeout", "Load timeout for modules: " + E, null, E), T.contextName = o.contextName, k(T);
         H && each(G, function(K) {
           z(K, {}, {});
-        }), (!V || N) && U && (isBrowser || isWebWorker) && !i && (i = setTimeout(function() {
+        }), (!V || O) && U && (isBrowser || isWebWorker) && !i && (i = setTimeout(function() {
           i = 0, L();
         }, 50)), t = !1;
       }
@@ -18067,13 +18067,13 @@ https://requirejs.org/docs/errors.html#` + e);
     n = function(T) {
       this.events = getOwn(u, T.id) || {}, this.map = T, this.shim = getOwn(a.shim, T.id), this.depExports = [], this.depMaps = [], this.depMatched = [], this.pluginMaps = {}, this.depCount = 0;
     }, n.prototype = {
-      init: function(T, N, O, V) {
-        V = V || {}, !this.inited && (this.factory = N, O ? this.on("error", O) : this.events.error && (O = bind(this, function(E) {
+      init: function(T, O, N, V) {
+        V = V || {}, !this.inited && (this.factory = O, N ? this.on("error", N) : this.events.error && (N = bind(this, function(E) {
           this.emit("error", E);
-        })), this.depMaps = T && T.slice(0), this.errback = O, this.inited = !0, this.ignore = V.ignore, V.enabled || this.enabled ? this.enable() : this.check());
+        })), this.depMaps = T && T.slice(0), this.errback = N, this.inited = !0, this.ignore = V.ignore, V.enabled || this.enabled ? this.enable() : this.check());
       },
-      defineDep: function(T, N) {
-        this.depMatched[T] || (this.depMatched[T] = !0, this.depCount -= 1, this.depExports[T] = N);
+      defineDep: function(T, O) {
+        this.depMatched[T] || (this.depMatched[T] = !0, this.depCount -= 1, this.depExports[T] = O);
       },
       fetch: function() {
         if (!this.fetched) {
@@ -18099,9 +18099,9 @@ 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, G = this.factory;
+          var T, O, N = this.map.id, V = this.depExports, E = this.exports, G = this.factory;
           if (!this.inited)
-            hasProp(o.defQueueMap, O) || this.fetch();
+            hasProp(o.defQueueMap, N) || this.fetch();
           else if (this.error)
             this.emit("error", this.error);
           else if (!this.defining) {
@@ -18109,31 +18109,31 @@ https://requirejs.org/docs/errors.html#` + e);
               if (isFunction(G)) {
                 if (this.events.error && this.map.isDefine || req.onError !== defaultOnError)
                   try {
-                    E = o.execCb(O, G, V, E);
+                    E = o.execCb(N, G, V, E);
                   } catch (H) {
                     T = H;
                   }
                 else
-                  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)
+                  E = o.execCb(N, G, V, E);
+                if (this.map.isDefine && E === void 0 && (O = this.module, O ? E = O.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 = G;
-              if (this.exports = E, this.map.isDefine && !this.ignore && (p[O] = E, req.onResourceLoad)) {
+              if (this.exports = E, this.map.isDefine && !this.ignore && (p[N] = E, req.onResourceLoad)) {
                 var U = [];
                 each(this.depMaps, function(H) {
                   U.push(H.normalizedMap || H);
                 }), req.onResourceLoad(o, this.map, U);
               }
-              j(O), this.defined = !0;
+              j(N), this.defined = !0;
             }
             this.defining = !1, this.defined && !this.defineEmitted && (this.defineEmitted = !0, this.emit("defined", this.exports), this.defineEmitComplete = !0);
           }
         }
       },
       callPlugin: function() {
-        var T = this.map, N = T.id, O = F(T.prefix);
-        this.depMaps.push(O), R(O, "defined", bind(this, function(V) {
+        var T = this.map, O = T.id, N = F(T.prefix);
+        this.depMaps.push(N), R(N, "defined", bind(this, function(V) {
           var E, G, U, H = getOwn(h, this.map.id), K = this.map.name, Y = this.map.parentMap ? this.map.parentMap.name : null, J = o.makeRequire(T.parentMap, {
             enableBuildCallback: !0
           });
@@ -18171,72 +18171,72 @@ https://requirejs.org/docs/errors.html#` + e);
               enabled: !0
             });
           }), E.error = bind(this, function(X) {
-            this.inited = !0, this.error = X, X.requireModules = [N], eachProp(l, function(Q) {
-              Q.map.id.indexOf(N + "_unnormalized") === 0 && j(Q.map.id);
+            this.inited = !0, this.error = X, X.requireModules = [O], eachProp(l, function(Q) {
+              Q.map.id.indexOf(O + "_unnormalized") === 0 && j(Q.map.id);
             }), k(X);
           }), E.fromText = bind(this, function(X, Q) {
             var Z = T.name, oe = F(Z), te = useInteractive;
-            Q && (X = Q), te && (useInteractive = !1), A(oe), hasProp(a.config, N) && (a.config[Z] = a.config[N]);
+            Q && (X = Q), te && (useInteractive = !1), A(oe), hasProp(a.config, O) && (a.config[Z] = a.config[O]);
             try {
               req.exec(X);
             } catch (ie) {
               return k(makeError(
                 "fromtexteval",
-                "fromText eval for " + N + " failed: " + ie,
+                "fromText eval for " + O + " failed: " + ie,
                 ie,
-                [N]
+                [O]
               ));
             }
             te && (useInteractive = !0), this.depMaps.push(oe), o.completeLoad(Z), J([Z], E);
           }), V.load(T.name, J, E, a);
-        })), o.enable(O, this), this.pluginMaps[O.id] = O;
+        })), o.enable(N, this), this.pluginMaps[N.id] = N;
       },
       enable: function() {
-        c[this.map.id] = this, this.enabled = !0, this.enabling = !0, each(this.depMaps, bind(this, function(T, N) {
-          var O, V, E;
+        c[this.map.id] = this, this.enabled = !0, this.enabling = !0, each(this.depMaps, bind(this, function(T, O) {
+          var N, V, E;
           if (typeof T == "string") {
             if (T = F(
               T,
               this.map.isDefine ? this.map : this.map.parentMap,
               !1,
               !this.skipMap
-            ), this.depMaps[N] = T, E = getOwn(r, T.id), E) {
-              this.depExports[N] = E(this);
+            ), this.depMaps[O] = T, E = getOwn(r, T.id), E) {
+              this.depExports[O] = E(this);
               return;
             }
             this.depCount += 1, R(T, "defined", bind(this, function(G) {
-              this.undefed || (this.defineDep(N, G), this.check());
+              this.undefed || (this.defineDep(O, 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);
+          N = T.id, V = l[N], !hasProp(r, N) && V && !V.enabled && o.enable(T, this);
         })), eachProp(this.pluginMaps, bind(this, function(T) {
-          var N = getOwn(l, T.id);
-          N && !N.enabled && o.enable(T, this);
+          var O = getOwn(l, T.id);
+          O && !O.enabled && o.enable(T, this);
         })), this.enabling = !1, this.check();
       },
-      on: function(T, N) {
-        var O = this.events[T];
-        O || (O = this.events[T] = []), O.push(N);
+      on: function(T, O) {
+        var N = this.events[T];
+        N || (N = this.events[T] = []), N.push(O);
       },
-      emit: function(T, N) {
-        each(this.events[T], function(O) {
-          O(N);
+      emit: function(T, O) {
+        each(this.events[T], function(N) {
+          N(O);
         }), T === "error" && delete this.events[T];
       }
     };
     function M(T) {
       hasProp(p, T[0]) || A(F(T[0], null, !0)).init(T[1], T[2]);
     }
-    function w(T, N, O, V) {
-      T.detachEvent && !isOpera ? V && T.detachEvent(V, N) : T.removeEventListener(O, N, !1);
+    function w(T, O, N, V) {
+      T.detachEvent && !isOpera ? V && T.detachEvent(V, O) : T.removeEventListener(N, O, !1);
     }
     function B(T) {
-      var N = T.currentTarget || T.srcElement;
-      return w(N, o.onScriptLoad, "load", "onreadystatechange"), w(N, o.onScriptError, "error"), {
-        node: N,
-        id: N && N.getAttribute("data-requiremodule")
+      var O = T.currentTarget || T.srcElement;
+      return w(O, o.onScriptLoad, "load", "onreadystatechange"), w(O, o.onScriptError, "error"), {
+        node: O,
+        id: O && O.getAttribute("data-requiremodule")
       };
     }
     function $() {
@@ -18266,12 +18266,12 @@ 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;
+          var O = T.urlArgs;
           T.urlArgs = function(E, G) {
-            return (G.indexOf("?") === -1 ? "?" : "&") + N;
+            return (G.indexOf("?") === -1 ? "?" : "&") + O;
           };
         }
-        var O = a.shim, V = {
+        var N = a.shim, V = {
           paths: !0,
           bundles: !0,
           config: !0,
@@ -18286,8 +18286,8 @@ https://requirejs.org/docs/errors.html#` + e);
         }), 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[G] = E;
-        }), a.shim = O), T.packages && each(T.packages, function(E) {
+          }), (E.exports || E.init) && !E.exportsFn && (E.exportsFn = o.makeShimExports(E)), N[G] = E;
+        }), a.shim = N), T.packages && each(T.packages, function(E) {
           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) {
@@ -18295,23 +18295,23 @@ https://requirejs.org/docs/errors.html#` + e);
         }), (T.deps || T.callback) && o.require(T.deps || [], T.callback);
       },
       makeShimExports: function(T) {
-        function N() {
-          var O;
-          return T.init && (O = T.init.apply(global, arguments)), O || T.exports && getGlobal(T.exports);
+        function O() {
+          var N;
+          return T.init && (N = T.init.apply(global, arguments)), N || T.exports && getGlobal(T.exports);
         }
-        return N;
+        return O;
       },
-      makeRequire: function(T, N) {
-        N = N || {};
-        function O(V, E, G) {
+      makeRequire: function(T, O) {
+        O = O || {};
+        function N(V, E, G) {
           var U, H, K;
-          return N.enableBuildCallback && E && isFunction(E) && (E.__requireJsBuild = !0), typeof V == "string" ? isFunction(E) ? k(makeError("requireargs", "Invalid require call"), G) : T && hasProp(r, V) ? r[V](l[T.id]) : req.get ? req.get(o, V, T, O) : (H = F(V, T, !1, !0), U = H.id, hasProp(p, U) ? p[U] : k(makeError("notloaded", 'Module name "' + U + '" has not been loaded yet for context: ' + e + (T ? "" : ". Use require([])")))) : ($(), o.nextTick(function() {
-            $(), K = A(F(null, T)), K.skipMap = N.skipMap, K.init(V, E, G, {
+          return O.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, N) : (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([])")))) : ($(), o.nextTick(function() {
+            $(), K = A(F(null, T)), K.skipMap = O.skipMap, K.init(V, E, G, {
               enabled: !0
             }), L();
-          }), O);
+          }), N);
         }
-        return mixin(O, {
+        return mixin(N, {
           isBrowser,
           /**
            * Converts a module name + .extension into an URL path.
@@ -18332,13 +18332,13 @@ https://requirejs.org/docs/errors.html#` + e);
           specified: function(V) {
             return V = F(V, T, !1, !0).id, hasProp(p, V) || hasProp(l, V);
           }
-        }), T || (O.undef = function(V) {
+        }), T || (N.undef = function(V) {
           D();
           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), j(V));
-        }), O;
+        }), N;
       },
       /**
        * Called to enable a module if it is still in the registry
@@ -18347,8 +18347,8 @@ https://requirejs.org/docs/errors.html#` + e);
        * the optimizer. Not shown here to keep code compact.
        */
       enable: function(T) {
-        var N = getOwn(l, T.id);
-        N && A(T).enable();
+        var O = getOwn(l, T.id);
+        O && A(T).enable();
       },
       /**
        * Internal method used by environment adapters to complete a load event.
@@ -18357,17 +18357,17 @@ 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) || {}, G = E.exports;
+        var O, N, 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)
+          if (N = d.shift(), N[0] === null) {
+            if (N[0] = T, O)
               break;
-            N = !0;
+            O = !0;
           } else
-            O[0] === T && (N = !0);
-          M(O);
+            N[0] === T && (O = !0);
+          M(N);
         }
-        if (o.defQueueMap = {}, V = getOwn(l, T), !N && !hasProp(p, T) && V && !V.inited) {
+        if (o.defQueueMap = {}, V = getOwn(l, T), !O && !hasProp(p, T) && V && !V.inited) {
           if (a.enforceDefine && (!G || !getGlobal(G)))
             return y(T) ? void 0 : k(makeError(
               "nodefine",
@@ -18386,26 +18386,26 @@ https://requirejs.org/docs/errors.html#` + e);
        * it is assumed to have already been normalized. This is an
        * internal API, not a public one. Use toUrl for the public API.
        */
-      nameToUrl: function(T, N, O) {
+      nameToUrl: function(T, O, N) {
         var V, E, G, U, H, K, Y, J = getOwn(a.pkgs, T);
         if (J && (T = J), Y = getOwn(h, T), Y)
-          return o.nameToUrl(Y, N, O);
+          return o.nameToUrl(Y, O, N);
         if (req.jsExtRegExp.test(T))
-          H = T + (N || "");
+          H = T + (O || "");
         else {
           for (V = a.paths, E = T.split("/"), G = E.length; G > 0; G -= 1)
             if (U = E.slice(0, G).join("/"), K = getOwn(V, U), K) {
               isArray(K) && (K = K[0]), E.splice(0, G, K);
               break;
             }
-          H = E.join("/"), H += N || (/^data\:|^blob\:|\?/.test(H) || O ? "" : ".js"), H = (H.charAt(0) === "/" || H.match(/^[\w\+\.\-]+:/) ? "" : a.baseUrl) + H;
+          H = E.join("/"), H += O || (/^data\:|^blob\:|\?/.test(H) || N ? "" : ".js"), H = (H.charAt(0) === "/" || H.match(/^[\w\+\.\-]+:/) ? "" : a.baseUrl) + H;
         }
         return a.urlArgs && !/^blob\:/.test(H) ? H + a.urlArgs(T, H) : H;
       },
       //Delegates to req.load. Broken out as a separate function to
       //allow overriding in the optimizer.
-      load: function(T, N) {
-        req.load(o, T, N);
+      load: function(T, O) {
+        req.load(o, T, O);
       },
       /**
        * Executes a module callback function. Broken out as a separate function
@@ -18414,8 +18414,8 @@ https://requirejs.org/docs/errors.html#` + e);
        *
        * @private
        */
-      execCb: function(T, N, O, V) {
-        return N.apply(V, O);
+      execCb: function(T, O, N, V) {
+        return O.apply(V, N);
       },
       /**
        * callback for script loads, used to check status of loading.
@@ -18426,23 +18426,23 @@ https://requirejs.org/docs/errors.html#` + e);
       onScriptLoad: function(T) {
         if (T.type === "load" || readyRegExp.test((T.currentTarget || T.srcElement).readyState)) {
           interactiveScript = null;
-          var N = B(T);
-          o.completeLoad(N.id);
+          var O = B(T);
+          o.completeLoad(O.id);
         }
       },
       /**
        * Callback for script errors.
        */
       onScriptError: function(T) {
-        var N = B(T);
-        if (!y(N.id)) {
-          var O = [];
+        var O = B(T);
+        if (!y(O.id)) {
+          var N = [];
           return eachProp(l, function(V, E) {
             E.indexOf("_@r") !== 0 && each(V.depMaps, function(G) {
-              if (G.id === N.id)
-                return O.push(E), !0;
+              if (G.id === O.id)
+                return N.push(E), !0;
             });
-          }), k(makeError("scripterror", 'Script error for "' + N.id + (O.length ? '", needed by: ' + O.join(", ") : '"'), T, [N.id]));
+          }), k(makeError("scripterror", 'Script error for "' + O.id + (N.length ? '", needed by: ' + N.join(", ") : '"'), T, [O.id]));
         }
       }
     }, o.require = o.makeRequire(), o;
@@ -18606,6 +18606,7 @@ class Application {
     I(this, "schemaSettingsManager");
     I(this, "dataSourceManager");
     I(this, "name");
+    I(this, "favicon");
     I(this, "loading", !0);
     I(this, "maintained", !1);
     I(this, "maintaining", !1);
@@ -18630,6 +18631,10 @@ class Application {
   get isWsAuthorized() {
     return this.wsAuthorized;
   }
+  updateFavicon(t) {
+    let n = document.querySelector('link[rel="shortcut icon"]');
+    t && (this.favicon = t), n ? n.href = this.favicon || "/favicon/favicon.ico" : (n = document.createElement("link"), n.rel = "shortcut icon", n.href = this.favicon || "/favicon/favicon.ico", document.head.appendChild(n));
+  }
   setWsAuthorized(t) {
     this.wsAuthorized = t;
   }
@@ -18749,7 +18754,7 @@ class Application {
           code: "LOAD_ERROR"
         }, n(t)), console.error(t, this.error);
       }
-      this.loading = !1;
+      this.loading = !1, this.updateFavicon();
     });
   }
   loadWebSocket() {
@@ -19017,11 +19022,11 @@ const useCollectionManager_deprecated = (e) => {
     [t, p]
   ), b = useCallback(
     (w, B) => {
-      var T, N;
+      var T, O;
       if (!w)
         return [];
       const $ = (T = p(B)) == null ? void 0 : T.getCollection(w);
-      return ((N = $ == null ? void 0 : $.getAllFields) == null ? void 0 : N.call($)) || ($ == null ? void 0 : $.getFields()) || [];
+      return ((O = $ == null ? void 0 : $.getAllFields) == null ? void 0 : O.call($)) || ($ == null ? void 0 : $.getFields()) || [];
     },
     [t, p]
   ), S = useCallback(
@@ -19039,10 +19044,10 @@ const useCollectionManager_deprecated = (e) => {
     [t, p]
   ), v = useCallback(
     (w, B = !1, $) => {
-      var O;
+      var N;
       if (!w)
         return [];
-      const T = (O = p($)) == null ? void 0 : O.getCollection(w);
+      const T = (N = p($)) == null ? void 0 : N.getCollection(w);
       return (T == null ? void 0 : T.getChildrenCollections(B)) || [];
     },
     [t, p]
@@ -19057,8 +19062,8 @@ const useCollectionManager_deprecated = (e) => {
       var X;
       const {
         association: T = !1,
-        cached: N = {},
-        collectionNames: O = [w],
+        cached: O = {},
+        collectionNames: N = [w],
         maxDepth: V = 1,
         allowAllTypes: E = !1,
         exceptInterfaces: G = [],
@@ -19066,10 +19071,10 @@ const useCollectionManager_deprecated = (e) => {
         usePrefix: H = !1,
         dataSource: K
       } = $ || {};
-      if (O.length - 1 > V)
+      if (N.length - 1 > V)
         return;
-      if (N[w])
-        return _.cloneDeep(N[w]);
+      if (O[w])
+        return _.cloneDeep(O[w]);
       typeof B == "string" && (B = [B]);
       const Y = b(w, K), J = (X = Y == null ? void 0 : Y.filter(
         (Q) => Q.interface && !G.includes(Q.interface) && (E || B.includes(Q.type) || (T && Q.target && Q.target !== w && Array.isArray(T) ? T.includes(Q.interface) : !1))
@@ -19079,15 +19084,15 @@ const useCollectionManager_deprecated = (e) => {
           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) ? [] : A(Q.target, B, P(x({}, $), {
-          cached: N,
+        return T && Q.target && (Z.children = N.includes(Q.target) ? [] : A(Q.target, B, P(x({}, $), {
+          cached: O,
           dataSource: K,
-          collectionNames: [...O, Q.target],
+          collectionNames: [...N, Q.target],
           prefixFieldValue: H ? U ? `${U}.${Q.name}` : Q.name : "",
           usePrefix: H
         })), !((te = Z.children) != null && te.length)) ? null : Z;
       }).filter(Boolean);
-      return N[w] = J, J;
+      return O[w] = J, J;
     },
     [b]
   ), R = useCallback(
@@ -19119,8 +19124,8 @@ const useCollectionManager_deprecated = (e) => {
     [j]
   ), L = useCallback(
     (w, B, $) => {
-      var T, N;
-      return (N = (T = p($)) == null ? void 0 : T.getCollection(B)) == null ? void 0 : N.getParentCollectionFields(w);
+      var T, O;
+      return (O = (T = p($)) == null ? void 0 : T.getCollection(B)) == null ? void 0 : O.getParentCollectionFields(w);
     },
     [t, p]
   ), M = useCallback(
@@ -22399,7 +22404,7 @@ const SchemaSettingsSwitchItem = (e) => {
   }, [D]), z = useCallback(() => q(void 0, null, function* () {
     yield D.submit();
     try {
-      const B = D.values, $ = Object.keys(B).reduce((T, N) => (D.query(N).take() && (T[N] = B[N]), T), {});
+      const B = D.values, $ = Object.keys(B).reduce((T, O) => (D.query(O).take() && (T[O] = B[O]), T), {});
       yield n == null ? void 0 : n(cloneDeep$1($)), h(!1);
     } catch (B) {
       console.error(B);
@@ -22471,7 +22476,7 @@ const SchemaSettingsModalItem = (e) => {
     "width",
     "noRecord",
     "ModalContextProvider"
-  ]), h = useContext(SchemaOptionsContext), g = useCollection(), f = useAPIClient(), C = useApp(), { theme: b } = useGlobalTheme(), S = useBlockRequestContext(), y = useFormActiveFields(), { locale: v } = useContext(ConfigProvider.ConfigContext), F = useDataSourceManager(), A = useDataSourceKey(), R = useCollectionRecord(), { association: k } = useDataBlockProps() || {}, D = useCurrentRecord(), j = useFormBlockContext(), z = useBlockContext(), { getOperators: L } = useOperators(), M = useLocationSearch(), w = useVariables$1(), { formValue: B, collection: $, parent: T } = useSubFormValue(), N = useCurrentPopupRecord(), O = useParentPopupRecord();
+  ]), h = useContext(SchemaOptionsContext), g = useCollection(), f = useAPIClient(), C = useApp(), { theme: b } = useGlobalTheme(), S = useBlockRequestContext(), y = useFormActiveFields(), { locale: v } = useContext(ConfigProvider.ConfigContext), F = useDataSourceManager(), A = useDataSourceKey(), R = useCollectionRecord(), { association: k } = useDataBlockProps() || {}, D = useCurrentRecord(), j = useFormBlockContext(), z = useBlockContext(), { getOperators: L } = useOperators(), M = useLocationSearch(), w = useVariables$1(), { formValue: B, collection: $, parent: T } = useSubFormValue(), O = useCurrentPopupRecord(), N = useParentPopupRecord();
   return t ? null : /* @__PURE__ */ jsx(
     SchemaSettingsItem,
     P(x({
@@ -22484,11 +22489,11 @@ const SchemaSettingsModalItem = (e) => {
           () => /* @__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,
             {
-              recordData: N == null ? void 0 : N.value,
-              collection: N == null ? void 0 : N.collection,
+              recordData: O == null ? void 0 : O.value,
+              collection: O == null ? void 0 : O.collection,
               parent: {
-                recordData: O == null ? void 0 : O.value,
-                collection: O == null ? void 0 : O.collection
+                recordData: N == null ? void 0 : N.value,
+                collection: N == null ? void 0 : N.collection
               },
               children: /* @__PURE__ */ jsx(CollectionRecordProvider, { record: d ? null : R, children: /* @__PURE__ */ jsx(CurrentRecordContextProvider, P(x({}, D), { children: /* @__PURE__ */ jsx(FormBlockContext$1.Provider, { value: j, children: /* @__PURE__ */ jsx(SubFormProvider, { value: { value: B, collection: $, parent: T }, children: /* @__PURE__ */ jsx(
                 FormActiveFieldsProvider,
@@ -22674,8 +22679,8 @@ const SchemaSettingsModalItem = (e) => {
     (L) => {
       var T;
       const M = [];
-      for (const N of L.fieldReaction.rules)
-        M.push(_.pickBy(N, _.identity));
+      for (const O of L.fieldReaction.rules)
+        M.push(_.pickBy(O, _.identity));
       const w = b["x-component"] === "BlockTemplate" && ((T = b["x-component-props"]) == null ? void 0 : T.templateId), $ = {
         "x-uid": w && d(w).uid || b["x-uid"]
       };
@@ -23372,7 +23377,7 @@ const getActionContext = (e) => {
   var n;
   return ((n = e.fieldSchema) == null ? void 0 : n["x-action-context"]) || {};
 }, SchemaSettingsDefaultValue = function e(t) {
-  var T, N, O;
+  var T, O, N;
   const n = useFieldSchema(), o = (T = t == null ? void 0 : t.fieldSchema) != null ? T : n, r = useField(), { dn: i } = useDesignable(), { t: a } = useTranslation(), l = useActionContext(), c = getActionContext(l).collection;
   let u;
   const { getField: d } = useCollection_deprecated(), { getCollectionJoinField: p, getCollectionFields: m, getAllCollectionsInheritChain: h } = useCollectionManager_deprecated(), g = useVariables$1(), f = useLocalVariables$1(), C = useCollection_deprecated(), b = useRecord(), { form: S } = useFormBlockContext(), { getFields: y } = useCollectionFilterOptionsV2(C), { isInSubForm: v, isInSubTable: F } = useFlag() || {}, { name: A } = C, R = useMemo(
@@ -23380,7 +23385,7 @@ const getActionContext = (e) => {
     [o, p, d]
   ), k = _.omit(o, "required");
   R != null && R.target && (u = p(
-    `${R.target}.${((O = (N = o["x-component-props"]) == null ? void 0 : N.fieldNames) == null ? void 0 : O.label) || "id"}`
+    `${R.target}.${((N = (O = o["x-component-props"]) == null ? void 0 : O.fieldNames) == null ? void 0 : N.label) || "id"}`
   ));
   const D = (R == null ? void 0 : R.interface) === "m2o" && findParentFieldSchema(o), j = 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" || (j == null ? void 0 : j.type) === "hasMany" && (R == null ? void 0 : R.interface) === "m2o", M = useCallback(
     (V) => {
@@ -24252,7 +24257,7 @@ const useGetFilterOptions = () => {
     };
   });
 }, TableColumnDesigner$1 = (e) => {
-  var z, L, M, w, B, $, T, N, O, V, E, G;
+  var z, L, M, w, B, $, T, O, N, 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((M = o == null ? void 0 : o.target) != null ? M : 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
   ), A = useFieldModeOptions({ fieldSchema: n }), R = ((B = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : B.mode) || "Select";
@@ -24295,7 +24300,7 @@ const useGetFilterOptions = () => {
       SchemaSettingsDataScope,
       {
         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) || {},
+        defaultFilter: ((N = (O = (T = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : T.service) == null ? void 0 : O.params) == null ? void 0 : N.filter) || {},
         form: r,
         onSubmit: ({ filter: U }) => {
           var K, Y;
@@ -25561,14 +25566,14 @@ const useCreateActionProps = () => {
   return {
     onClick() {
       return q(this, null, function* () {
-        var N, O, V, E, G, U;
+        var O, N, V, E, G, U;
         const R = u.map((H) => H.name), {
           assignedValues: k = {},
           onSuccess: D,
           overwriteValues: j,
           skipValidator: z,
           triggerWorkflows: L
-        } = (N = l == null ? void 0 : l["x-action-settings"]) != null ? N : {}, M = (O = i == null ? void 0 : i["x-component-props"]) == null ? void 0 : O.addChild, { successMessage: w } = D || {}, B = {}, $ = Object.keys(k).map((H) => q(this, null, function* () {
+        } = (O = l == null ? void 0 : l["x-action-settings"]) != null ? O : {}, M = (N = i == null ? void 0 : i["x-component-props"]) == null ? void 0 : N.addChild, { successMessage: w } = D || {}, B = {}, $ = Object.keys(k).map((H) => q(this, null, function* () {
           const K = k[H], Y = d(H);
           if (isVariable(K)) {
             const { value: J } = (yield C == null ? void 0 : C.parseVariable(K, b)) || {};
@@ -25714,8 +25719,8 @@ const useCreateActionProps = () => {
         } = (L = r == null ? void 0 : r["x-action-settings"]) != null ? L : {}, { manualClose: F, redirecting: A, redirectTo: R, successMessage: k, actionAfterSuccess: D } = S || {}, j = {}, z = Object.keys(b).map((B) => q(this, null, function* () {
           const $ = b[B], T = m(B);
           if (isVariable($)) {
-            const { value: N } = (yield u == null ? void 0 : u.parseVariable($, d)) || {};
-            N && (j[B] = transformVariableValue(N, { targetCollectionField: T }));
+            const { value: O } = (yield u == null ? void 0 : u.parseVariable($, d)) || {};
+            O && (j[B] = transformVariableValue(O, { targetCollectionField: T }));
           } else
             $ != null && $ !== "" && (j[B] = $);
         }));
@@ -25741,12 +25746,12 @@ const useCreateActionProps = () => {
   return {
     onClick() {
       return q(this, null, function* () {
-        var N;
+        var O;
         const {
           assignedValues: k = {},
           onSuccess: D,
           updateMode: j
-        } = (N = i == null ? void 0 : i["x-action-settings"]) != null ? N : {}, { manualClose: z, redirecting: L, redirectTo: M, successMessage: w, actionAfterSuccess: B } = D || {};
+        } = (O = i == null ? void 0 : i["x-action-settings"]) != null ? O : {}, { manualClose: z, redirecting: L, redirectTo: M, successMessage: w, actionAfterSuccess: B } = D || {};
         m.data = e.data || {}, m.data.loading = !0;
         const $ = {}, T = Object.keys(k).map((V) => q(this, null, function* () {
           const E = k[V], G = C(V);
@@ -25822,7 +25827,7 @@ const useCreateActionProps = () => {
           });
           Object.assign(T, K);
         }
-        const O = {
+        const N = {
           url: renderTemplate(k.url, { currentRecord: m, currentUser: g }),
           method: k.method,
           headers: parse(B)({ currentRecord: m, currentUser: g }),
@@ -25831,7 +25836,7 @@ const useCreateActionProps = () => {
         };
         f.data = c.data || {}, f.data.loading = !0;
         try {
-          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" && (M === "previous" || !M && j !== !0) && (b == null || b(!1)), L || (message.success(C("Saved successfully")), yield resetFormCorrectly(i), (j && !M || M === "redirect") && z && (isURL(z) ? window.location.href = z : t(z))), D ? S.success({
+          yield e.request(x({}, N)), 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" && (M === "previous" || !M && j !== !0) && (b == null || b(!1)), L || (message.success(C("Saved successfully")), yield resetFormCorrectly(i), (j && !M || M === "redirect") && z && (isURL(z) ? window.location.href = z : t(z))), D ? S.success({
             title: r(L),
             onOk: () => q(this, null, function* () {
               (j && !M || M === "redirect") && z && (isURL(z) ? window.location.href = z : t(z));
@@ -25855,7 +25860,7 @@ const useCreateActionProps = () => {
           overwriteValues: D,
           skipValidator: j,
           triggerWorkflows: z
-        } = (E = l == null ? void 0 : l["x-action-settings"]) != null ? E : {}, { manualClose: L, redirecting: M, redirectTo: w, successMessage: B, actionAfterSuccess: $ } = k || {}, T = {}, N = Object.keys(R).map((G) => q(this, null, function* () {
+        } = (E = l == null ? void 0 : l["x-action-settings"]) != null ? E : {}, { manualClose: L, redirecting: M, redirectTo: w, successMessage: B, actionAfterSuccess: $ } = k || {}, T = {}, O = Object.keys(R).map((G) => q(this, null, function* () {
           const U = R[G], H = d(G);
           if (isVariable(U)) {
             const { value: K } = (yield b == null ? void 0 : b.parseVariable(U, S)) || {};
@@ -25863,12 +25868,12 @@ const useCreateActionProps = () => {
           } else
             U != null && U !== "" && (T[G] = U);
         }));
-        yield Promise.all(N), j || (yield e.submit());
-        const O = u.map((G) => G.name), V = getFormValues({
+        yield Promise.all(O), j || (yield e.submit());
+        const N = u.map((G) => G.name), V = getFormValues({
           filterByTk: t,
           field: n,
           form: e,
-          fieldNames: O,
+          fieldNames: N,
           getField: d,
           resource: o,
           actionFields: (y == null ? void 0 : y("form")) || []
@@ -26115,17 +26120,17 @@ const useCreateActionProps = () => {
         var U, H, K;
         if (!B.find((Y) => Y.uid === T.uid))
           return;
-        const O = `${$}${t.name}`, V = ((U = T.service.params) == null ? void 0 : U[0]) || {};
+        const N = `${$}${t.name}`, V = ((U = T.service.params) == null ? void 0 : U[0]) || {};
         (K = (H = T.service.params) == null ? void 0 : H[1]) != null && K.filters || _.set(T.service.params, "[1].filters", {});
         const E = T.service.params[1].filters;
         if (w.length)
-          E[O] = {
+          E[N] = {
             [S]: w
           };
         else {
           if (T.dataLoadingMode === "manual")
             return T.clearData();
-          delete E[O];
+          delete E[N];
         }
         const G = mergeFilter([...Object.values(E), T.defaultFilter]);
         return T.doFilter(
@@ -26150,12 +26155,12 @@ const useCreateActionProps = () => {
     }, $ = ((M = w == null ? void 0 : w.uiSchema) == null ? void 0 : M.enum) || [];
     C = "value", b = "label", p = $, h = {}, g = () => {
     }, S = `${w.name}.${B[w.interface]}`, m = (T) => {
-      const N = T.target.value;
-      if (!N) {
+      const O = T.target.value;
+      if (!O) {
         p = $;
         return;
       }
-      p = $.filter((O) => O.label.includes(N));
+      p = $.filter((N) => N.label.includes(O));
     };
   } else
     S = `${r}.${C}.$in`, p = (f == null ? void 0 : f.data) || [], m = (w) => {
@@ -26526,8 +26531,8 @@ const useSyncFromForm = (e, t, n) => {
             const D = R || F, j = k["x-collection-field"] && o(k["x-collection-field"]), z = k.name.includes("."), L = j && ["hasOne", "hasMany", "belongsTo", "belongsToMany"].includes(j.type), M = !L && z ? getAssociationPath(k.name) : k.name, w = D === "" || !D ? M : D + "." + M;
             if (j && !(["hasOne", "hasMany"].includes(j.type) || ["SubForm", "Nester"].includes((B = k["x-component-props"]) == null ? void 0 : B.mode)) && C.add(w), j && (L || z) && k["x-component"] !== "TableField") {
               if (f.add({ name: w, fieldMode: (($ = k["x-component-props"]) == null ? void 0 : $.mode) || "Select" }), ["Nester", "SubTable"].includes((T = k["x-component-props"]) == null ? void 0 : T.mode)) {
-                const N = D && D !== "" ? D + "." + k.name : k.name;
-                b(k, N);
+                const O = D && D !== "" ? D + "." + k.name : k.name;
+                b(k, O);
               }
             } else
               [
@@ -29006,9 +29011,9 @@ function Input$1(e) {
     label: y("Constant"),
     [B.value]: "$",
     [B.label]: y("Constant")
-  } : i ? getTypedConstantOption(M, i, B) : null, [M, i]), T = (H = $ == null ? void 0 : $.component) != null ? H : NullComponent, N = Array.isArray(i) ? (Y = (K = i.find((J) => Array.isArray(J) && J[0] === M)) == null ? void 0 : K[1]) != null ? Y : {} : {};
-  let O;
-  t == null ? a ? o && D ? O = ["$"] : O = [""] : o ? O = ["$"] : O = [" ", M] : O = o ? ["$"] : [" ", M], m && (O = ["$"]), useEffect(() => {
+  } : i ? getTypedConstantOption(M, i, B) : null, [M, i]), T = (H = $ == null ? void 0 : $.component) != null ? H : NullComponent, O = Array.isArray(i) ? (Y = (K = i.find((J) => Array.isArray(J) && J[0] === M)) == null ? void 0 : K[1]) != null ? Y : {} : {};
+  let N;
+  t == null ? a ? o && D ? N = ["$"] : N = [""] : o ? N = ["$"] : N = [" ", M] : N = o ? ["$"] : [" ", M], m && (N = ["$"]), useEffect(() => {
     const Z = $ != null ? $ : {}, { component: J } = Z, X = W(Z, ["component"]), Q = [
       ...a ? [
         {
@@ -29149,7 +29154,7 @@ function Input$1(e) {
         P(x({
           role: "button",
           "aria-label": "variable-constant"
-        }, N), {
+        }, O), {
           value: t,
           onChange: n
         })
@@ -29158,7 +29163,7 @@ function Input$1(e) {
         Cascader$1,
         {
           options: F,
-          value: w != null ? w : O,
+          value: w != null ? w : N,
           onChange: E,
           loadData: V,
           changeOnSelect: u,
@@ -29440,15 +29445,15 @@ function TextArea(e) {
   useAntdInputStyle("ant-input");
   const { token: D } = theme$1.useToken(), j = u.join(" ");
   useEffect(() => {
-    preloadOptions(r, p).then((O) => {
-      g(O);
+    preloadOptions(r, p).then((N) => {
+      g(N);
     }).catch(console.error);
   }, [r, JSON.stringify(p)]), useEffect(() => {
     A(renderHTML(d != null ? d : "", C, u)), y || k([-1, 0, -1, 0]);
   }, [d, C, j]), useEffect(() => {
     var E;
-    const { current: O } = m;
-    if (!O)
+    const { current: N } = m;
+    if (!N)
       return;
     const V = new Range();
     if (y) {
@@ -29457,22 +29462,22 @@ function TextArea(e) {
       const G = (E = window.getSelection) == null ? void 0 : E.call(window);
       if (G)
         try {
-          const U = Array.from(O.childNodes);
+          const U = Array.from(N.childNodes);
           U.length && (R[0] === -1 ? R[1] && V.setStartAfter(U[R[1] - 1]) : V.setStart(U[R[0]], R[1]), R[2] === -1 ? R[3] && V.setEndAfter(U[R[3] - 1]) : V.setEnd(U[R[2]], R[3])), V.collapse(!0), G.removeAllRanges(), G.addRange(V);
         } catch (U) {
         }
     } else {
-      const { lastChild: G } = O;
+      const { lastChild: G } = N;
       if (G) {
         V.setStartAfter(G), V.setEndAfter(G);
-        const U = Array.from(O.childNodes), H = V.startContainer === O ? -1 : U.indexOf(G), K = V.startContainer === O ? -1 : U.indexOf(G);
+        const U = Array.from(N.childNodes), H = V.startContainer === N ? -1 : U.indexOf(G), K = V.startContainer === N ? -1 : U.indexOf(G);
         k([H, V.startOffset, K, V.endOffset]);
       }
     }
   }, [F]);
   const z = useCallback(
-    function(O) {
-      const V = O.filter((U) => !!U.trim()), { current: E } = m;
+    function(N) {
+      const V = N.filter((U) => !!U.trim()), { current: E } = m;
       if (!E || !V)
         return;
       E.focus();
@@ -29483,25 +29488,25 @@ function TextArea(e) {
     },
     [C, i, R, j]
   ), L = useCallback(
-    function({ currentTarget: O }) {
-      b || (v(!0), k(getCurrentRange(O)), i(getValue(O, u)));
+    function({ currentTarget: N }) {
+      b || (v(!0), k(getCurrentRange(N)), i(getValue(N, u)));
     },
     [b, i, j]
-  ), M = useCallback(function({ currentTarget: O }) {
-    k(getCurrentRange(O));
-  }, []), w = useCallback(function(O) {
-    O.key === "Enter" && O.preventDefault();
+  ), M = useCallback(function({ currentTarget: N }) {
+    k(getCurrentRange(N));
+  }, []), w = useCallback(function(N) {
+    N.key === "Enter" && N.preventDefault();
   }, []), B = useCallback(function() {
     S(!0);
   }, []), $ = useCallback(
-    ({ currentTarget: O }) => {
-      S(!1), v(!0), k(getCurrentRange(O)), i(getValue(O, u));
+    ({ currentTarget: N }) => {
+      S(!1), v(!0), k(getCurrentRange(N)), i(getValue(N, u));
     },
     [i, j]
   ), T = useCallback(
-    function(O) {
-      O.preventDefault();
-      const V = O.clipboardData.getData("text/html") || O.clipboardData.getData("text"), E = sanitizeHTML(V, {
+    function(N) {
+      N.preventDefault();
+      const V = N.clipboardData.getData("text/html") || N.clipboardData.getData("text"), E = sanitizeHTML(V, {
         allowedTags: ["span"],
         allowedAttributes: {
           span: ["data-variable", "contenteditable"]
@@ -29518,10 +29523,10 @@ function TextArea(e) {
           }
         }
       }).replace(/\n/g, " ");
-      v(!0), pasteHTML(O.currentTarget, E), k(getCurrentRange(O.currentTarget)), i(getValue(O.currentTarget, u));
+      v(!0), pasteHTML(N.currentTarget, E), k(getCurrentRange(N.currentTarget)), i(getValue(N.currentTarget, u));
     },
     [i, j]
-  ), N = e.disabled || f.disabled;
+  ), O = e.disabled || f.disabled;
   return t(
     /* @__PURE__ */ jsxs(
       Space$1.Compact,
@@ -29565,7 +29570,7 @@ function TextArea(e) {
               className: cx(
                 n,
                 "ant-input",
-                { "ant-input-disabled": N },
+                { "ant-input-disabled": O },
                 // NOTE: `pre-wrap` here for avoid the `&nbsp;` (\x160) issue when paste content, we need normal space (\x32).
                 css`
             min-height: ${D.controlHeight}px;
@@ -29587,7 +29592,7 @@ function TextArea(e) {
           `
               ),
               ref: m,
-              contentEditable: !N,
+              contentEditable: !O,
               dangerouslySetInnerHTML: { __html: F }
             }
           ),
@@ -29599,7 +29604,7 @@ function TextArea(e) {
               onInsert: z,
               changeOnSelect: a,
               fieldNames: c || defaultFieldNames$2,
-              disabled: N
+              disabled: O
             }
           )
         ]
@@ -33159,10 +33164,10 @@ const tableBlockSettings = new SchemaSettings({
   name: "fieldSettings:component:CascadeSelect",
   items: [fieldComponent$7, titleField$2, ellipsisSettingsItem]
 }), SchemaSettingsDateRange = function e(t) {
-  var R, k, D, j, z, L, M, w, B, $, 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 = ((j = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : j.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 = ((M = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : M.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 = (($ = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : $.picker) || ((N = (T = u == null ? void 0 : u.uiSchema) == null ? void 0 : T["x-component-props"]) == null ? void 0 : N.picker) || "date";
+  var R, k, D, j, z, L, M, w, B, $, T, O, N, 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 = ((j = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : j.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 = ((M = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : M.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 = (($ = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : $.picker) || ((O = (T = u == null ? void 0 : u.uiSchema) == null ? void 0 : T["x-component-props"]) == null ? void 0 : O.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 = ((G = u == null ? void 0 : u.uiSchema) == null ? void 0 : G["x-component-props"].utc) || !1, S = useRecord(), { form: y } = useFormBlockContext(), v = useCallback(
+  const g = (N = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : N._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,
       {
@@ -34798,10 +34803,10 @@ const variablesStore = {}, getFieldPath = (e, t) => {
             dataSource: k,
             collectionName: L
           };
-        const T = y[$], N = y.slice(0, $ + 1).join("."), { fieldPath: O } = getFieldPath(N, F), V = r(O, k), E = (B = i(j, k)) == null ? void 0 : B.getPrimaryKey();
+        const T = y[$], O = y.slice(0, $ + 1).join("."), { fieldPath: N } = getFieldPath(O, F), V = r(N, k), E = (B = i(j, k)) == null ? void 0 : B.getPrimaryKey();
         if (Array.isArray(A)) {
           const G = A.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) {
+            if (!(S != null && S.doNotRequest) && shouldToRequest(U == null ? void 0 : U[T], U, O) && (U == null ? void 0 : U[E]) != null && V != null && V.target) {
               const H = `/${j}/${U[V.sourceKey || E]}/${T}:${getAction(V.type)}`;
               if (hasRequested(H))
                 return getRequested(H);
@@ -34814,14 +34819,14 @@ const variablesStore = {}, getFieldPath = (e, t) => {
               }).then((Y) => {
                 clearRequested(H);
                 const J = Y.data.data;
-                return cacheLazyLoadedValues(U, N, J), J;
+                return cacheLazyLoadedValues(U, O, J), J;
               });
               return stashRequested(H, K), K;
             }
-            return getCachedLazyLoadedValues(U, N) || (U == null ? void 0 : U[T]);
+            return getCachedLazyLoadedValues(U, O) || (U == null ? void 0 : U[T]);
           });
           A = removeThroughCollectionFields(_.flatten(yield Promise.all(G)), V);
-        } else if (!(S != null && S.doNotRequest) && shouldToRequest(A[T], A, N) && A[E] != null && (V != null && V.target)) {
+        } else if (!(S != null && S.doNotRequest) && shouldToRequest(A[T], A, O) && A[E] != null && (V != null && V.target)) {
           const G = `/${j}/${A[V.sourceKey || E]}/${T}:${getAction(V.type)}`;
           let U = null;
           if (hasRequested(G))
@@ -34837,10 +34842,10 @@ const variablesStore = {}, getFieldPath = (e, t) => {
             stashRequested(G, K), U = yield K, clearRequested(G);
           }
           const H = U.data.data;
-          getCachedLazyLoadedValues(A, N) || cacheLazyLoadedValues(A, N, H), A = removeThroughCollectionFields(H, V);
+          getCachedLazyLoadedValues(A, O) || cacheLazyLoadedValues(A, O, H), A = removeThroughCollectionFields(H, V);
         } else
           A = removeThroughCollectionFields(
-            getCachedLazyLoadedValues(A, N) || getValuesByPath(A, T),
+            getCachedLazyLoadedValues(A, O) || getValuesByPath(A, T),
             V
           );
         V != null && V.target && (j = V.target);
@@ -35206,7 +35211,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.5.18", 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.20", 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",
@@ -35228,9 +35233,9 @@ const name = "@nocobase/client", version = "1.5.18", 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.18",
-  "@nocobase/sdk": "1.5.18",
-  "@nocobase/utils": "1.5.18",
+  "@nocobase/evaluators": "1.5.20",
+  "@nocobase/sdk": "1.5.20",
+  "@nocobase/utils": "1.5.20",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -36579,7 +36584,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
           }
         },
         [M == null ? void 0 : M.uiSchema, t]
-      ), { data: T, run: N, loading: O } = useRequest(
+      ), { data: T, run: O, loading: N } = useRequest(
         P(x({
           action: "list"
         }, n), {
@@ -36610,11 +36615,11 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
         }
       ) : null, [k.current]);
       useEffect(() => {
-        v.current && N();
+        v.current && O();
       }, [V]);
       const G = (X) => q(void 0, null, function* () {
         var Q;
-        N({
+        O({
           filter: mergeFilter([
             X ? {
               [t.label]: {
@@ -36643,13 +36648,13 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
           fieldNames: t,
           onSearch: G,
           onDropdownVisibleChange: (X) => {
-            y(X), k.current = null, X && N(), v.current = !0;
+            y(X), k.current = null, X && O(), v.current = !0;
           },
           objectValue: a,
           value: r,
           defaultValue: i
         }, f), {
-          loading: T ? O : !0,
+          loading: T ? N : !0,
           options: h($(U)),
           rawOptions: U,
           dropdownRender: (X) => {
@@ -38065,14 +38070,14 @@ const AppendsTreeSelect = (e) => {
       const B = w.split(".");
       let $ = m[B[0]];
       for (let T = 1; T < B.length && $; T++) {
-        const N = B.slice(0, T + 1).join(".");
-        if (m[N]) {
-          $ = m[N];
+        const O = B.slice(0, T + 1).join(".");
+        if (m[O]) {
+          $ = m[O];
           break;
         }
         if (!$.isLeaf && $.loadChildren) {
-          const O = $.loadChildren($);
-          O != null && O.length && (M.push(...O), $ = O.find((V) => V.value === B.slice(0, T + 1).join(".")));
+          const N = $.loadChildren($);
+          N != null && N.length && (M.push(...N), $ = N.find((V) => V.value === B.slice(0, T + 1).join(".")));
         }
       }
     }), h((w) => M.reduce((B, $) => Object.assign(B, { [$.value]: $ }), x({}, w)));
@@ -38093,19 +38098,19 @@ const AppendsTreeSelect = (e) => {
         M.forEach(($) => {
           const T = $.split(".");
           if (T.length)
-            for (let N = 1; N <= T.length; N++)
-              w.add(T.slice(0, N).join("."));
+            for (let O = 1; O <= T.length; O++)
+              w.add(T.slice(0, O).join("."));
         });
       o(Array.from(w));
     },
     [e.multiple, F, o, m]
   ), k = useCallback(
     (L) => {
-      var N;
+      var O;
       const { value: M, onClose: w, disabled: B, closable: $ } = L;
       if (!M)
         return null;
-      const { fullTitle: T } = (N = m[M]) != null ? N : {};
+      const { fullTitle: T } = (O = m[M]) != null ? O : {};
       return /* @__PURE__ */ jsx(Tag, { closable: $ && !B, onClose: w, children: T == null ? void 0 : T.join(" / ") });
     },
     [m]
@@ -39211,18 +39216,18 @@ const InternalFileManager = (e) => {
     (M) => {
       try {
         return M == null ? void 0 : M.filter((w) => ["number", "string"].includes(typeof w[y.value])).map((w) => {
-          var $, T, N;
+          var $, T, O;
           let B = p(w[y.label]);
           if (($ = v == null ? void 0 : v.uiSchema) != null && $.enum)
             if (Array.isArray(B))
-              B = B.map((O, V) => {
+              B = B.map((N, V) => {
                 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);
+                const E = (U = (G = v.uiSchema.enum).find) == null ? void 0 : U.call(G, (H) => H.value === N);
+                return E ? /* @__PURE__ */ jsx(Tag, { color: E.color, style: { marginRight: 3 }, children: (E == null ? void 0 : E.label) || N }, V) : /* @__PURE__ */ jsx(Tag, { children: N }, N);
               }).reverse();
             else {
-              const O = (N = (T = v.uiSchema.enum).find) == null ? void 0 : N.call(T, (V) => V.value === B);
-              O && (B = /* @__PURE__ */ jsx(Tag, { color: O.color, children: O.label }));
+              const N = (O = (T = v.uiSchema.enum).find) == null ? void 0 : O.call(T, (V) => V.value === B);
+              N && (B = /* @__PURE__ */ jsx(Tag, { color: N.color, children: N.label }));
             }
           return (v == null ? void 0 : v.type) === "date" && (B = dayjs(B).format("YYYY-MM-DD")), n ? n({
             [y.label]: B || EMPTY,
@@ -39249,19 +39254,19 @@ const InternalFileManager = (e) => {
   }), D = (M, w, B) => q(void 0, null, function* () {
     const $ = yield k({ parentId: w == null ? void 0 : w.id }), T = [...i];
     if (T.splice(B + 1), T[B] = P(x({}, T[B]), { value: w }), w != null && w.id && (T[B + 1] = { key: w == null ? void 0 : w.id, children: ($ == null ? void 0 : $.length) > 0 ? $ : null }), a(T), ["o2m", "m2m"].includes(g.interface)) {
-      const N = Array.isArray(f.fieldValue) ? f.fieldValue : [];
-      N[A.index] = w, f.fieldValue = N;
+      const O = Array.isArray(f.fieldValue) ? f.fieldValue : [];
+      O[A.index] = w, f.fieldValue = O;
     } else
       f.value = w;
     o == null || o(T);
   }), j = (M, w, B) => q(void 0, null, function* () {
-    var $, T, N;
+    var $, T, O;
     if (M) {
       d(!0);
-      const O = yield k({ parentId: w == null ? void 0 : w.key });
-      if (d(!1), c(O), B === (i == null ? void 0 : i.length) - 1 && (($ = w == null ? void 0 : w.value) != null && $.id)) {
+      const N = yield k({ parentId: w == null ? void 0 : w.key });
+      if (d(!1), c(N), B === (i == null ? void 0 : i.length) - 1 && (($ = w == null ? void 0 : w.value) != null && $.id)) {
         const V = yield k({ parentId: (T = w == null ? void 0 : w.value) == null ? void 0 : T.id }), E = [...i];
-        E.splice(B + 1), E[B] = P(x({}, E[B]), { value: w == null ? void 0 : w.value }), E[B + 1] = { key: (N = w == null ? void 0 : w.value) == null ? void 0 : N.id, children: (V == null ? void 0 : V.length) > 0 ? V : null }, a(E), o == null || o(E);
+        E.splice(B + 1), E[B] = P(x({}, E[B]), { value: w == null ? void 0 : w.value }), E[B + 1] = { key: (O = w == null ? void 0 : w.value) == null ? void 0 : O.id, children: (V == null ? void 0 : V.length) > 0 ? V : null }, a(E), o == null || o(E);
       }
     }
   }), z = (M, w) => q(void 0, null, function* () {
@@ -39292,12 +39297,12 @@ const InternalFileManager = (e) => {
           value: ($ = M == null ? void 0 : M.value) == null ? void 0 : $[y.value]
         },
         labelInValue: !0,
-        onSearch: (N) => z(N, M),
+        onSearch: (O) => z(O, M),
         fieldNames: y,
         style: { minWidth: 150 },
-        onChange: (N, O) => D(N, O, w),
+        onChange: (O, N) => D(O, N, w),
         options: u ? [] : R(l),
-        onDropdownVisibleChange: (N) => j(N, M, w),
+        onDropdownVisibleChange: (O) => j(O, M, w),
         notFoundContent: u ? /* @__PURE__ */ jsx(Spin, { size: "small" }) : null
       },
       `${(T = M.value) == null ? void 0 : T.id}+ ${M.key} + ${y.label}`
@@ -39538,13 +39543,13 @@ const InternalNesterCardCss = css`
       const w = (f == null ? void 0 : f.targetKey) || "id", B = R.map((T) => T[w]).filter(Boolean);
       return B.length ? { $and: [{ [`${w}.$ne`]: B }] } : {};
     }, z = () => {
-      const { setVisible: w } = useActionContext(), { multiple: B, selectedRows: $, onChange: T, options: N, collectionField: O } = useContext(RecordPickerContext);
+      const { setVisible: w } = useActionContext(), { multiple: B, selectedRows: $, onChange: T, options: O, collectionField: N } = useContext(RecordPickerContext);
       return {
         onClick() {
-          T(B ? unionBy($, N, (O == null ? void 0 : O.targetKey) || "id") : ($ == null ? void 0 : $[0]) || null), w(!1);
+          T(B ? unionBy($, O, (N == null ? void 0 : N.targetKey) || "id") : ($ == null ? void 0 : $[0]) || null), w(!1);
         },
         style: {
-          display: B !== !1 && ["o2m", "m2m", "mbm"].includes(O == null ? void 0 : O.interface) ? "block" : "none"
+          display: B !== !1 && ["o2m", "m2m", "mbm"].includes(N == null ? void 0 : N.interface) ? "block" : "none"
         }
       };
     };
@@ -39754,7 +39759,15 @@ const getSourceData = (e, t) => {
     F,
     h && (y() ? (
       // The recordData here is only provided when the popup is opened, not the current row record
-      /* @__PURE__ */ jsx(VariablePopupRecordProvider, { children: /* @__PURE__ */ jsx(WithoutTableFieldResource.Provider, { value: !0, children: /* @__PURE__ */ jsx(NocoBaseRecursionField, { schema: o, onlyRenderProperties: !0, basePath: l.address }) }) })
+      /* @__PURE__ */ jsx(VariablePopupRecordProvider, { children: /* @__PURE__ */ jsx(WithoutTableFieldResource.Provider, { value: !0, children: /* @__PURE__ */ jsx(
+        NocoBaseRecursionField,
+        {
+          schema: o,
+          onlyRenderProperties: !0,
+          basePath: l.address,
+          filterProperties: (k) => k["x-component"] !== "Action"
+        }
+      ) }) })
     ) : /* @__PURE__ */ jsx(CollectionRecordProvider, { isNew: !1, record: b, parentRecord: C, children: /* @__PURE__ */ jsx(VariablePopupRecordProvider, { children: /* @__PURE__ */ jsx(WithoutTableFieldResource.Provider, { value: !0, children: /* @__PURE__ */ jsx(NocoBaseRecursionField, { schema: o, onlyRenderProperties: !0, basePath: l.address }) }) }) }))
   ] }) });
 }, InternalPopoverNesterContentCss = css`
@@ -40833,7 +40846,7 @@ const Table$1 = withDynamicSchemaProps(
       "loading",
       "onClickRow"
     ]), S = useArrayField(b), y = useFieldSchema(), { size: v = "small" } = (y == null ? void 0 : y["x-component-props"]) || {}, F = useCollection(), R = ((ce = y == null ? void 0 : y.parent) == null ? void 0 : ce["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: k, allIncludesChildren: D } = R, j = useMemoizedFn(b.onRowDragEnd || (() => {
-    })), z = usePaginationProps$2(n, i), L = useTableColumns$1(b, z), [M, w] = useState(() => k ? D : []), [B, $] = useState(((Ce = S == null ? void 0 : S.data) == null ? void 0 : Ce.selectedRowKeys) || []), [T, N] = useState([]), O = (p == null ? void 0 : p.type) !== "none", V = useRef(/* @__PURE__ */ new Map()), E = useMemo(() => css`
+    })), z = usePaginationProps$2(n, i), L = useTableColumns$1(b, z), [M, w] = useState(() => k ? D : []), [B, $] = useState(((Ce = S == null ? void 0 : S.data) == null ? void 0 : Ce.selectedRowKeys) || []), [T, O] = useState([]), N = (p == null ? void 0 : p.type) !== "none", V = useRef(/* @__PURE__ */ new Map()), E = useMemo(() => css`
         & > td {
           background-color: ${t.controlItemBgActive} !important;
         }
@@ -40842,7 +40855,7 @@ const Table$1 = withDynamicSchemaProps(
         }
       `, [t.controlItemBgActive, t.controlItemBgActiveHover]), G = useMemo(() => C ? E : "", [E, C]), U = useMemo(() => C ? (ee, ne) => ({
       onClick: (se) => {
-        isPortalInBody(se.target) || C(ee, N, T);
+        isPortalInBody(se.target) || C(ee, O, T);
       },
       rowIndex: ne
     }) : null, [C, T]);
@@ -40914,14 +40927,14 @@ const Table$1 = withDynamicSchemaProps(
                 role: "button",
                 "aria-label": `table-index-${se}`,
                 className: cls(ee ? "checked" : floatLeftClass, rowSelectCheckboxWrapperClass, {
-                  [rowSelectCheckboxWrapperClassHover]: O
+                  [rowSelectCheckboxWrapperClassHover]: N
                 }),
                 children: [
                   /* @__PURE__ */ jsxs("div", { className: cls(ee ? "checked" : null, rowSelectCheckboxContentClass), children: [
                     l && /* @__PURE__ */ jsx(SortHandle$1, { id: K(ne) }),
                     c && /* @__PURE__ */ jsx(TableIndex$2, { index: se })
                   ] }),
-                  O && /* @__PURE__ */ jsx(
+                  N && /* @__PURE__ */ jsx(
                     "div",
                     {
                       className: cls(
@@ -40946,7 +40959,7 @@ const Table$1 = withDynamicSchemaProps(
         l,
         S,
         K,
-        O,
+        N,
         Q,
         z
       ]
@@ -41047,15 +41060,15 @@ const Table$1 = withDynamicSchemaProps(
   }
 `, SubTable = observer$1(
   (e) => {
-    var B, $, T, N;
+    var B, $, T, O;
     const { openSize: t } = e, { field: n, options: o, fieldSchema: r } = useAssociationFieldContext(), { t: i } = useTranslation(), [a, l] = useState(!1), [c, u] = useState([]), d = useFieldNames$1(e), p = useFieldSchema(), m = useCompile(), h = useLabelUiSchema$1(o, (d == null ? void 0 : d.label) || "label"), g = useCollectionRecord(), f = useCollection(), { allowSelectExistingRecord: C, allowAddnew: b, allowDisassociation: S } = n.componentProps;
     useSubTableSpecialCase({ rootField: n, rootSchema: r });
-    const y = (O, V) => {
-      if (V !== void 0 && isArr(n.value) && O !== V)
+    const y = (N, V) => {
+      if (V !== void 0 && isArr(n.value) && N !== V)
         return action(() => {
-          const E = n.value[O];
-          return n.value.splice(O, 1), n.value.splice(V, 0, E), exchangeArrayState(n, {
-            fromIndex: O,
+          const E = n.value[N];
+          return n.value.splice(N, 1), n.value.splice(V, 0, E), exchangeArrayState(n, {
+            fromIndex: N,
             toIndex: V
           }), n.onInput(n.value);
         });
@@ -41079,28 +41092,28 @@ const Table$1 = withDynamicSchemaProps(
       setSelectedRows: u,
       collectionField: o
     }, A = () => {
-      const { setVisible: O } = useActionContext(), { selectedRows: V, setSelectedRows: E } = useContext(RecordPickerContext);
+      const { setVisible: N } = useActionContext(), { selectedRows: V, setSelectedRows: E } = useContext(RecordPickerContext);
       return {
         onClick() {
           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);
+          Array.isArray(n.value) || (n.value = []), V.forEach((H) => n.value.push(markRecordAsNew(H))), n.onInput(n.value), n.initialValue = n.value, E([]), N(!1);
           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((G) => G == null ? void 0 : G[O]).filter(Boolean);
-      return V.length ? { $and: [{ [`${O}.$ne`]: V }] } : {};
+      const N = (o == null ? void 0 : o.targetKey) || "id", V = (n.value || []).map((G) => G == null ? void 0 : G[N]).filter(Boolean);
+      return V.length ? { $and: [{ [`${N}.$ne`]: V }] } : {};
     }, [k, D] = useState(1), [j, z] = useState(((B = n.componentProps) == null ? void 0 : B.pageSize) || 10);
     useEffect(() => {
-      var O;
-      z((O = n.componentProps) == null ? void 0 : O.pageSize);
+      var N;
+      z((N = n.componentProps) == null ? void 0 : N.pageSize);
     }, [($ = n.componentProps) == null ? void 0 : $.pageSize]);
     const L = useMemo(() => {
       var V;
-      const O = Math.ceil(((V = n.value) == null ? void 0 : V.length) / 10);
+      const N = Math.ceil(((V = n.value) == null ? void 0 : V.length) / 10);
       return {
-        current: k > O ? O : k,
+        current: k > N ? N : k,
         pageSize: j || 10,
         total: n == null ? void 0 : n.value,
         onChange: (E, G) => {
@@ -41111,13 +41124,13 @@ const Table$1 = withDynamicSchemaProps(
         hideOnSinglePage: !1
       };
     }, [(T = n.value) == null ? void 0 : T.length, j, k]), M = () => {
-      const { field: O } = useAssociationFieldContext();
+      const { field: N } = useAssociationFieldContext();
       return {
         run() {
           var E;
-          O.value = O.value || [], O.value.push(markRecordAsNew({}));
-          const V = Math.ceil(O.value.length / (((E = O.componentProps) == null ? void 0 : E.pageSize) || 10));
-          return D(V), O.onInput(O.value);
+          N.value = N.value || [], N.value.push(markRecordAsNew({}));
+          const V = Math.ceil(N.value.length / (((E = N.componentProps) == null ? void 0 : E.pageSize) || 10));
+          return D(V), N.onInput(N.value);
         }
       };
     }, w = () => ({
@@ -41135,7 +41148,7 @@ const Table$1 = withDynamicSchemaProps(
             field: n,
             showIndex: !0,
             dragSort: !1,
-            showDel: n.editable && (b !== !1 || C !== !1 || S !== !1) ? (O) => n.editable ? S !== !1 ? !0 : O == null ? void 0 : O.__isNewRecord__ : !1 : !1,
+            showDel: n.editable && (b !== !1 || C !== !1 || S !== !1) ? (N) => n.editable ? S !== !1 ? !0 : N == null ? void 0 : N.__isNewRecord__ : !1 : !1,
             pagination: L,
             rowSelection: { type: "none", hideSelectAll: !0 },
             isSubTable: !0,
@@ -41152,7 +41165,7 @@ const Table$1 = withDynamicSchemaProps(
           {
             style: {
               marginTop: "10px",
-              position: (N = n.value) != null && N.length ? "absolute" : "relative",
+              position: (O = n.value) != null && O.length ? "absolute" : "relative",
               bottom: "0",
               gap: 15
             },
@@ -41206,7 +41219,7 @@ const Table$1 = withDynamicSchemaProps(
                   onlyRenderProperties: !0,
                   basePath: n.address,
                   schema: p.parent,
-                  filterProperties: (O) => O["x-component"] === "AssociationField.Selector"
+                  filterProperties: (N) => N["x-component"] === "AssociationField.Selector"
                 }
               )
             }
@@ -41305,10 +41318,10 @@ const ReadPretty$7 = observer$1(
 InternalAssociationSelect.displayName = "InternalAssociationSelect";
 const AssociationSelect = InternalAssociationSelect;
 AssociationSelect.Designer = function e() {
-  var B, $, T, N, O, V, E, G, U, H, K;
+  var B, $, T, O, N, V, E, G, U, H, K;
   const { getCollectionFields: t, getInterface: n, getCollectionJoinField: o, getCollection: r, isTitleField: i } = useCollectionManager_deprecated(), { getField: a } = useCollection_deprecated(), { form: l } = useFormBlockContext(), c = useField(), u = useFieldSchema(), { t: d } = useTranslation(), p = useFilterByTk(), { dn: m, refresh: h, insertAdjacent: g } = useDesignable(), f = useCompile(), C = useIsShowMultipleSwitch(), { isAllowToSetDefaultValue: b } = useIsAllowToSetDefaultValue(), S = a(u.name) || o(u["x-collection-field"]), y = useFieldComponentOptions(), v = c.address.segments.includes("__form_grid"), F = n(S == null ? void 0 : S.interface), A = (B = F == null ? void 0 : F.validateSchema) == null ? void 0 : B.call(F, u), R = ($ = S == null ? void 0 : S.uiSchema) == null ? void 0 : $.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), j = ((O = (N = (T = c.componentProps) == null ? void 0 : T.service) == null ? void 0 : N.params) == null ? void 0 : O.sort) || [];
+  const D = useSortFields(S == null ? void 0 : S.target), j = ((N = (O = (T = c.componentProps) == null ? void 0 : T.service) == null ? void 0 : O.params) == null ? void 0 : N.sort) || [];
   useEffect(() => {
     c.readPretty !== u["x-read-pretty"] && (c.readPretty = !!u["x-read-pretty"]);
   }, [u["x-read-pretty"]]);
@@ -41815,15 +41828,15 @@ AssociationSelect.FilterDesigner = function e() {
           const T = [];
           for (const E of $.rules)
             T.push(_.pickBy(E, _.identity));
-          const N = {
+          const O = {
             "x-uid": l["x-uid"]
           };
           if (["percent"].includes(m == null ? void 0 : m.interface))
             for (const E of T)
               (E.maxValue || E.minValue) && (E.percentMode = !0), E.percentFormat && (E.percentFormats = !0);
-          const O = _.concat([], ((V = m == null ? void 0 : m.uiSchema) == null ? void 0 : V["x-validator"]) || [], T);
-          a.validator = O, l["x-validator"] = T, N["x-validator"] = T, u.emit("patch", {
-            schema: N
+          const N = _.concat([], ((V = m == null ? void 0 : m.uiSchema) == null ? void 0 : V["x-validator"]) || [], T);
+          a.validator = N, l["x-validator"] = T, O["x-validator"] = T, u.emit("patch", {
+            schema: O
           }), d();
         }
       }
@@ -41946,7 +41959,7 @@ AssociationSelect.FilterDesigner = function e() {
           }
         },
         onSubmit: ({ sort: $ }) => {
-          const T = $.map((N) => N.direction === "desc" ? `-${N.field}` : N.field);
+          const T = $.map((O) => O.direction === "desc" ? `-${O.field}` : O.field);
           _.set(a.componentProps, "service.params.sort", T), l["x-component-props"] = a.componentProps, u.emit("patch", {
             schema: {
               "x-uid": l["x-uid"],
@@ -41963,13 +41976,13 @@ AssociationSelect.FilterDesigner = function e() {
         options: v,
         value: (B = (w = a == null ? void 0 : a.componentProps) == null ? void 0 : w.fieldNames) == null ? void 0 : B.label,
         onChange: ($) => {
-          var O, V;
+          var N, V;
           const T = {
             "x-uid": l["x-uid"]
-          }, N = P(x(x({}, (V = (O = m == null ? void 0 : m.uiSchema) == null ? void 0 : O["x-component-props"]) == null ? void 0 : V.fieldNames), a.componentProps.fieldNames), {
+          }, O = P(x(x({}, (V = (N = m == null ? void 0 : m.uiSchema) == null ? void 0 : N["x-component-props"]) == null ? void 0 : V.fieldNames), a.componentProps.fieldNames), {
             label: $
           });
-          a.componentProps.fieldNames = N, l["x-component-props"] = l["x-component-props"] || {}, l["x-component-props"].fieldNames = N, T["x-component-props"] = l["x-component-props"], u.emit("patch", {
+          a.componentProps.fieldNames = O, l["x-component-props"] = l["x-component-props"] || {}, l["x-component-props"].fieldNames = O, T["x-component-props"] = l["x-component-props"], u.emit("patch", {
             schema: T
           }), u.refresh();
         }
@@ -43541,7 +43554,7 @@ const InternalListBlockProvider = (e) => {
               display: none !important;
             }
           `,
-        itemRender: ($, T, N) => T === "prev" ? /* @__PURE__ */ jsxs(
+        itemRender: ($, T, O) => T === "prev" ? /* @__PURE__ */ jsxs(
           "div",
           {
             style: { display: "flex" },
@@ -43551,12 +43564,12 @@ const InternalListBlockProvider = (e) => {
                     }
                   `,
             children: [
-              N,
+              O,
               " ",
               /* @__PURE__ */ jsx("div", { style: { marginLeft: "7px" }, children: d })
             ]
           }
-        ) : N
+        ) : O
       };
     })();
     return h(
@@ -46656,18 +46669,18 @@ const TableActionColumnDesigner = (e) => {
     "sort-field"
   );
 }, TableBlockDesigner = () => {
-  var k, D, j, z, L, M, w, B, $, T, N;
-  const { name: e, title: t } = useCollection_deprecated(), { getCollectionField: n, getCollection: o } = useCollectionManager_deprecated(), r = useField(), i = useFieldSchema(), { form: a } = useFormBlockContext(), l = useSortFields(e), { service: c } = useTableBlockContext(), { t: u } = useTranslation(), { dn: d } = useDesignable(), { componentNamePrefix: p } = useBlockTemplateContext(), m = ((D = (k = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : k.params) == null ? void 0 : D.sort) || [], h = ((j = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : j.resource) || ((z = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : z.association), g = !((L = i == null ? void 0 : i["x-decorator-props"]) != null && L.disableTemplate), f = m == null ? void 0 : m.map((O) => O != null && O.startsWith("-") ? {
-    field: O.substring(1),
+  var k, D, j, z, L, M, w, B, $, T, O;
+  const { name: e, title: t } = useCollection_deprecated(), { getCollectionField: n, getCollection: o } = useCollectionManager_deprecated(), r = useField(), i = useFieldSchema(), { form: a } = useFormBlockContext(), l = useSortFields(e), { service: c } = useTableBlockContext(), { t: u } = useTranslation(), { dn: d } = useDesignable(), { componentNamePrefix: p } = useBlockTemplateContext(), m = ((D = (k = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : k.params) == null ? void 0 : D.sort) || [], h = ((j = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : j.resource) || ((z = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : z.association), g = !((L = i == null ? void 0 : i["x-decorator-props"]) != null && L.disableTemplate), f = m == null ? void 0 : m.map((N) => N != null && N.startsWith("-") ? {
+    field: N.substring(1),
     direction: "desc"
   } : {
-    field: O,
+    field: N,
     direction: "asc"
   }), C = useSchemaTemplate(), b = useCollection_deprecated(), { dragSort: S, resource: y } = r.decoratorProps, v = y && n(y), F = y != null && y.includes(".") ? (M = o(v == null ? void 0 : v.target)) == null ? void 0 : M.tree : !!(b != null && b.tree), A = useCallback(
-    ({ filter: O }) => {
-      O = removeNullCondition(O);
+    ({ filter: N }) => {
+      N = removeNullCondition(N);
       const V = r.decoratorProps.params || {};
-      V.filter = O, r.decoratorProps.params = V, i["x-decorator-props"].params = V, d.emit("patch", {
+      V.filter = N, r.decoratorProps.params = V, i["x-decorator-props"].params = V, d.emit("patch", {
         schema: {
           "x-uid": i["x-uid"],
           "x-decorator-props": i["x-decorator-props"]
@@ -46685,11 +46698,11 @@ const TableActionColumnDesigner = (e) => {
         title: u("Tree table"),
         defaultChecked: !0,
         checked: F ? r.decoratorProps.treeTable : !1,
-        onChange: (O) => {
+        onChange: (N) => {
           var E;
-          r.decoratorProps.treeTable = O, i["x-decorator-props"].treeTable = O;
+          r.decoratorProps.treeTable = N, i["x-decorator-props"].treeTable = N;
           const V = P(x({}, (E = c.params) == null ? void 0 : E[0]), {
-            tree: O ? !0 : null
+            tree: N ? !0 : null
           });
           d.emit("patch", {
             schema: i
@@ -46702,13 +46715,13 @@ const TableActionColumnDesigner = (e) => {
       {
         title: u("Enable drag and drop sorting"),
         checked: r.decoratorProps.dragSort,
-        onChange: (O) => q(void 0, null, function* () {
-          O && v && (yield R.resource("collections.fields", v.collectionName).update({
+        onChange: (N) => q(void 0, null, function* () {
+          N && v && (yield R.resource("collections.fields", v.collectionName).update({
             filterByTk: v.name,
             values: {
               sortable: !0
             }
-          })), r.decoratorProps.dragSort = O, i["x-decorator-props"].dragSort = O, d.emit("patch", {
+          })), r.decoratorProps.dragSort = N, i["x-decorator-props"].dragSort = N, d.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
               "x-decorator-props": i["x-decorator-props"]
@@ -46802,9 +46815,9 @@ const TableActionColumnDesigner = (e) => {
             }
           }
         },
-        onSubmit: ({ sort: O }) => {
+        onSubmit: ({ sort: N }) => {
           var G;
-          const V = O.map((U) => U.direction === "desc" ? `-${U.field}` : U.field), E = r.decoratorProps.params || {};
+          const V = N.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"],
@@ -46828,10 +46841,10 @@ const TableActionColumnDesigner = (e) => {
           { label: "100", value: 100 },
           { label: "200", value: 200 }
         ],
-        onChange: (O) => {
+        onChange: (N) => {
           var E;
           const V = r.decoratorProps.params || {};
-          V.pageSize = O, r.decoratorProps.params = V, i["x-decorator-props"].params = V, c.run(P(x({}, (E = c.params) == null ? void 0 : E[0]), { pageSize: O, page: 1 })), d.emit("patch", {
+          V.pageSize = N, r.decoratorProps.params = V, i["x-decorator-props"].params = V, c.run(P(x({}, (E = c.params) == null ? void 0 : E[0]), { pageSize: N, page: 1 })), d.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
               "x-decorator-props": i["x-decorator-props"]
@@ -46844,18 +46857,18 @@ const TableActionColumnDesigner = (e) => {
       SchemaSettingsSelectItem,
       {
         title: u("Table size"),
-        value: ((N = r.componentProps) == null ? void 0 : N.size) || "middle",
+        value: ((O = r.componentProps) == null ? void 0 : O.size) || "middle",
         options: [
           { label: u("Large"), value: "large" },
           { label: u("Middle"), value: "middle" },
           { label: u("Small"), value: "small" }
         ],
-        onChange: (O) => {
+        onChange: (N) => {
           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", {
+          V["x-component-props"] = V["x-component-props"] || {}, V["x-component-props"].size = N, d.emit("patch", {
             schema: {
               "x-uid": V["x-uid"],
               "x-decorator-props": V["x-component-props"]
@@ -48705,21 +48718,21 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
     value: w.name
   })), []), k = useCallback(() => {
     const { availableFieldInterfaces: w } = u(o.template) || {}, { exclude: B, include: $ } = w || {}, T = [];
-    return F.forEach((N) => {
-      var O;
-      if (N.key === "systemInfo")
-        T.push(P(x({}, N), {
-          children: N.children.filter((V) => V.hidden ? !1 : V.value === "tableoid" ? $ != null && $.length ? $.includes(V.value) : (l == null ? void 0 : l.dialect) === "postgres" : typeof o[V.value] == "boolean" ? o[V.value] : !0)
+    return F.forEach((O) => {
+      var N;
+      if (O.key === "systemInfo")
+        T.push(P(x({}, O), {
+          children: O.children.filter((V) => V.hidden ? !1 : V.value === "tableoid" ? $ != null && $.length ? $.includes(V.value) : (l == null ? void 0 : l.dialect) === "postgres" : typeof o[V.value] == "boolean" ? o[V.value] : !0)
         }));
       else {
         let V = [];
         $ != null && $.length ? $.forEach((E) => {
           var U;
-          const G = (U = N == null ? void 0 : N.children) == null ? void 0 : U.find((H) => [E, E.interface].includes(H.name));
+          const G = (U = O == null ? void 0 : O.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), {
+        }) : B != null && B.length ? V = (N = O == null ? void 0 : O.children) == null ? void 0 : N.filter((E) => !B.includes(E.name)) : V = O == null ? void 0 : O.children, V != null && V.length && T.push(P(x({}, O), {
           children: V
         }));
       }
@@ -49011,7 +49024,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       run() {
         return q(this, null, function* () {
           yield M.submit();
-          const O = cloneDeep(M.values), V = omit(O, [
+          const N = cloneDeep(M.values), V = omit(N, [
             "key",
             "uiSchemaUid",
             "collectionName",
@@ -49519,7 +49532,7 @@ const getSchema$4 = (e, t, n) => {
     const w = [];
     g.forEach((B) => {
       var V;
-      const $ = v(B), N = R(B).map((E) => {
+      const $ = v(B), O = R(B).map((E) => {
         const G = k(E, B);
         return {
           type: "group",
@@ -49533,14 +49546,14 @@ const getSchema$4 = (e, t, n) => {
             };
           })
         };
-      }), O = (V = $.fields.filter((E) => !["obo", "oho", "m2m", "o2m"].includes(E == null ? void 0 : E.interface))) == null ? void 0 : V.map((E) => {
+      }), N = (V = $.fields.filter((E) => !["obo", "oho", "m2m", "o2m"].includes(E == null ? void 0 : E.interface))) == null ? void 0 : V.map((E) => {
         var G;
         return { value: E.name, key: E.name, label: l(((G = E.uiSchema) == null ? void 0 : G.title) || E.name) };
-      }).concat(N);
+      }).concat(O);
       w.push({
         value: B,
         label: l($.title || $.name),
-        children: O
+        children: N
       });
     }), h(w);
   }, [g, t]), useEffect(() => {
@@ -49548,31 +49561,31 @@ const getSchema$4 = (e, t, n) => {
       var B, $;
       if (w) {
         u(!1), p([]);
-        const T = ($ = Object.values((B = w == null ? void 0 : w.data) == null ? void 0 : B.fields)) == null ? void 0 : $.map((N) => {
-          var O, V;
-          if (N.source) {
-            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 })
+        const T = ($ = Object.values((B = w == null ? void 0 : w.data) == null ? void 0 : B.fields)) == null ? void 0 : $.map((O) => {
+          var N, V;
+          if (O.source) {
+            const E = (i == null ? void 0 : i.data.find((G) => G.name === O.name)) || O;
+            return P(x({}, O), {
+              uiSchema: P(x({}, omit(E.uiSchema, "rawTitle")), { title: ((N = E.uiSchema) == null ? void 0 : N.title) || E.name })
             });
           } else {
-            const E = (i == null ? void 0 : i.data.find((G) => G.name === N.name)) || N;
+            const E = (i == null ? void 0 : i.data.find((G) => G.name === O.name)) || O;
             return P(x({}, E), {
               uiSchema: P(x({}, omit(E.uiSchema, "rawTitle")), { title: ((V = E.uiSchema) == null ? void 0 : V.title) || E.name })
             });
           }
         });
         S.value = T, setTimeout(() => {
-          var N, O, V;
-          p(T), y.setValuesIn("sources", (N = w.data) == null ? void 0 : N.sources), f((O = w.data) == null ? void 0 : O.sources), b((V = w == null ? void 0 : w.data) == null ? void 0 : V.unsupportedFields);
+          var O, N, V;
+          p(T), y.setValuesIn("sources", (O = w.data) == null ? void 0 : O.sources), f((N = w.data) == null ? void 0 : N.sources), b((V = w == null ? void 0 : w.data) == null ? void 0 : V.unsupportedFields);
         });
       }
     }).catch);
   }, [t]);
   const L = (w, B) => {
     d.splice(B, 1, w), p(d), S.value = d.map(($) => {
-      var N, O, V;
-      const T = typeof $.source == "string" ? $.source : (V = (O = (N = $.source) == null ? void 0 : N.filter) == null ? void 0 : O.call(N, Boolean)) == null ? void 0 : V.join(".");
+      var O, N, V;
+      const T = typeof $.source == "string" ? $.source : (V = (N = (O = $.source) == null ? void 0 : O.filter) == null ? void 0 : N.call(O, Boolean)) == null ? void 0 : V.join(".");
       return P(x({}, $), {
         source: T
       });
@@ -49596,10 +49609,10 @@ const getSchema$4 = (e, t, n) => {
           allowClear: !0,
           style: { width: "100%" },
           options: D(m),
-          onChange: (T, N) => {
+          onChange: (T, O) => {
             var V;
-            const O = (V = A(T == null ? void 0 : T[0])) == null ? void 0 : V.find((E) => E.name === last(T));
-            L(P(x({}, B), { source: T, uiSchema: O == null ? void 0 : O.uiSchema }), $);
+            const N = (V = A(T == null ? void 0 : T[0])) == null ? void 0 : V.find((E) => E.name === last(T));
+            L(P(x({}, B), { source: T, uiSchema: N == null ? void 0 : N.uiSchema }), $);
           },
           placeholder: l("Select field source")
         }
@@ -49618,8 +49631,8 @@ const getSchema$4 = (e, t, n) => {
             defaultValue: w,
             popupMatchSelectWidth: !1,
             style: { width: "100%" },
-            options: (T == null ? void 0 : T.possibleTypes.map((N) => ({ label: N, value: N }))) || [],
-            onChange: (N) => L(P(x({}, T), { type: N }), $)
+            options: (T == null ? void 0 : T.possibleTypes.map((O) => ({ label: O, value: O }))) || [],
+            onChange: (O) => L(P(x({}, T), { type: O }), $)
           }
         );
       }
@@ -49630,19 +49643,19 @@ const getSchema$4 = (e, t, n) => {
       key: "interface",
       width: 150,
       render: (w, B, $) => {
-        const T = d[$], N = getInterfaceOptions(z, T.type);
+        const T = d[$], O = getInterfaceOptions(z, T.type);
         return T.source ? w : /* @__PURE__ */ jsx(
           Select$1,
           {
             defaultValue: w,
             style: { width: "100%" },
             popupMatchSelectWidth: !1,
-            onChange: (O) => {
+            onChange: (N) => {
               var E;
-              const V = F(O);
-              L(P(x({}, T), { interface: O, uiSchema: (E = V == null ? void 0 : V.default) == null ? void 0 : E.uiSchema }), $);
+              const V = F(N);
+              L(P(x({}, T), { interface: N, uiSchema: (E = V == null ? void 0 : V.default) == null ? void 0 : E.uiSchema }), $);
             },
-            children: N.map((O) => /* @__PURE__ */ jsx(Select$1.OptGroup, { label: D(O.label), children: O.children.map((V) => /* @__PURE__ */ jsx(Select$1.Option, { value: V.name, children: D(V.label) }, V.value)) }, O.key))
+            children: O.map((N) => /* @__PURE__ */ jsx(Select$1.OptGroup, { label: D(N.label), children: N.children.map((V) => /* @__PURE__ */ jsx(Select$1.Option, { value: V.name, children: D(V.label) }, V.value)) }, N.key))
           }
         );
       }
@@ -49653,14 +49666,14 @@ const getSchema$4 = (e, t, n) => {
       key: "title",
       width: 180,
       render: (w, B, $) => {
-        var N;
+        var O;
         const T = d[$];
         return /* @__PURE__ */ jsx(
           Input$3,
           {
-            defaultValue: ((N = T == null ? void 0 : T.uiSchema) == null ? void 0 : N.title) || w,
-            onChange: (O) => L(
-              P(x({}, T), { uiSchema: P(x({}, omit(T == null ? void 0 : T.uiSchema, "rawTitle")), { title: O.target.value }) }),
+            defaultValue: ((O = T == null ? void 0 : T.uiSchema) == null ? void 0 : O.title) || w,
+            onChange: (N) => L(
+              P(x({}, T), { uiSchema: P(x({}, omit(T == null ? void 0 : T.uiSchema, "rawTitle")), { title: N.target.value }) }),
               $
             )
           }
@@ -49721,8 +49734,8 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
         dataIndex: F.name,
         key: F.name,
         width: 200,
-        render: ($, T, N) => {
-          const O = T[F.name], V = {
+        render: ($, T, O) => {
+          const N = T[F.name], V = {
             type: "object",
             properties: {
               [F.name]: {
@@ -49730,11 +49743,11 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
                 "x-component": D && A ? "CollectionField" : "Input",
                 "x-read-pretty": !0,
                 "x-collection-field": A == null ? void 0 : A.join("."),
-                default: F.interface === "json" ? JSON.stringify(O) : O
+                default: F.interface === "json" ? JSON.stringify(N) : N
               }
             }
           };
-          return /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: /* @__PURE__ */ jsx(RecursionField, { schema: V, name: N, onlyRenderProperties: !0 }) });
+          return /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: /* @__PURE__ */ jsx(RecursionField, { schema: V, name: O, onlyRenderProperties: !0 }) });
         }
       };
     });
@@ -50063,15 +50076,15 @@ const AsyncDataProvider = (e) => {
               style: { width: "100%" },
               popupMatchSelectWidth: !1,
               onChange: (M) => {
-                var B, $, T, N, O;
+                var B, $, T, O, N;
                 const w = p(M);
                 S(
                   P(x({}, z), {
                     interface: M || null,
                     uiSchema: P(x({}, (B = w == null ? void 0 : w.default) == null ? void 0 : B.uiSchema), {
-                      title: ((T = ($ = w == null ? void 0 : w.default) == null ? void 0 : $.uiSchema) == null ? void 0 : T.title) || ((N = z.uiSchema) == null ? void 0 : N.title)
+                      title: ((T = ($ = w == null ? void 0 : w.default) == null ? void 0 : $.uiSchema) == null ? void 0 : T.title) || ((O = z.uiSchema) == null ? void 0 : O.title)
                     }),
-                    type: (O = w == null ? void 0 : w.default) == null ? void 0 : O.type
+                    type: (N = w == null ? void 0 : w.default) == null ? void 0 : N.type
                   }),
                   j
                 );
@@ -58976,9 +58989,9 @@ const ActionInitializerItem = (e) => {
       (S || Y) && g(P(x({}, h == null ? void 0 : h[0]), {
         filter: void 0
       })), y(!S), K.stopPropagation();
-    }, N = (K) => {
-      K.stopPropagation();
     }, O = (K) => {
+      K.stopPropagation();
+    }, N = (K) => {
       m(K);
     }, V = (H = a.title) != null ? H : (U = i == null ? void 0 : i.uiSchema) == null ? void 0 : U.title;
     return t(
@@ -59004,8 +59017,8 @@ const ActionInitializerItem = (e) => {
                       autoFocus: !0,
                       placeholder: "Search...",
                       className: "search",
-                      onClick: N,
-                      onChange: O
+                      onClick: O,
+                      onChange: N
                     }
                   ) : c(V) }),
                   /* @__PURE__ */ jsx(
@@ -59412,7 +59425,7 @@ function useMenuSearch({
   })) : g, [e, c, u, g]);
 }
 const DataBlockInitializer = (e) => {
-  var B, $;
+  var $, T;
   const {
     templateWrap: t,
     onCreateBlockSchema: n,
@@ -59431,21 +59444,22 @@ const DataBlockInitializer = (e) => {
     onClick: f,
     filterOtherRecordsCollection: C,
     currentText: b,
-    otherText: S
-  } = e, { insert: y, setVisible: v } = useSchemaInitializer(), F = useCompile(), { getTemplateSchemaByMode: A } = useSchemaTemplateManager(), R = useCallback(
-    (T) => q(void 0, null, function* () {
-      const { item: N, fromOthersInPopup: O } = T;
+    otherText: S,
+    alwaysRenderMenu: y
+  } = e, { insert: v, setVisible: F } = useSchemaInitializer(), A = useCompile(), { getTemplateSchemaByMode: R } = useSchemaTemplateManager(), k = useCallback(
+    (O) => q(void 0, null, function* () {
+      const { item: N, fromOthersInPopup: V } = O;
       if (f)
-        return f(T);
+        return f(O);
       if (N.template) {
-        const V = yield A(N);
-        y(t ? t(V, { item: N, fromOthersInPopup: O }) : V);
+        const E = yield R(N);
+        v(t ? t(E, { item: N, fromOthersInPopup: V }) : E);
       } else
-        n && n({ item: N, fromOthersInPopup: O });
-      v(!1);
+        n && n({ item: N, fromOthersInPopup: V });
+      F(!1);
     }),
-    [A, y, v, n, f, t]
-  ), k = h || // eslint-disable-next-line react-hooks/rules-of-hooks
+    [R, v, F, n, f, t]
+  ), D = h || // eslint-disable-next-line react-hooks/rules-of-hooks
   useCollectionDataSourceItems({
     name: i,
     componentName: o,
@@ -59456,32 +59470,32 @@ const DataBlockInitializer = (e) => {
     showAssociationFields: d,
     dataBlockInitializerProps: e,
     hideOtherRecordsInPopup: g,
-    onClick: R,
+    onClick: k,
     currentText: b,
     otherText: S
-  }), D = useGetSchemaInitializerMenuItems(R), j = useMemo(() => D(k, i), [D, k, i]), [z, L] = useState([]), M = useMenuSearch({ data: j, openKeys: z, hideSearch: u }), w = useMemo(() => {
-    let T = M.filter((N) => N.key !== "search" && N.key !== "empty");
-    return p && T.length === 1 ? T = T[0].children : T = M, [
+  }), j = useGetSchemaInitializerMenuItems(k), z = useMemo(() => j(D, i), [j, D, i]), [L, M] = useState([]), w = useMenuSearch({ data: z, openKeys: L, hideSearch: u }), B = useMemo(() => {
+    let O = w.filter((N) => N.key !== "search" && N.key !== "empty");
+    return p && O.length === 1 ? O = O[0].children : O = w, [
       {
         key: i,
-        label: F(a),
+        label: A(a),
         icon: typeof r == "string" ? /* @__PURE__ */ jsx(antIcons__default, { type: r }) : r,
         onClick: (N) => {
-          N.key === i && R(P(x({}, N), { item: e }));
+          N.key === i && k(P(x({}, N), { item: e }));
         },
-        children: T
+        children: O
       }
     ];
-  }, [M, p, i, F, a, r, R, e]);
-  return j.length > 1 || j.length === 1 && (($ = (B = j[0]) == null ? void 0 : B.children) == null ? void 0 : $.length) > 0 ? /* @__PURE__ */ jsx(
+  }, [w, p, i, A, a, r, k, e]);
+  return z.length > 1 || z.length === 1 && ((T = ($ = z[0]) == null ? void 0 : $.children) == null ? void 0 : T.length) > 0 || y ? /* @__PURE__ */ jsx(
     SchemaInitializerMenu,
     {
-      onOpenChange: (T) => {
-        L(T);
+      onOpenChange: (O) => {
+        M(O);
       },
-      items: w
+      items: B
     }
-  ) : /* @__PURE__ */ jsx(SchemaInitializerItem, P(x({}, e), { onClick: R }));
+  ) : /* @__PURE__ */ jsx(SchemaInitializerItem, P(x({}, e), { onClick: k }));
 }, G2PlotInitializer = () => {
   const e = useSchemaInitializerItem(), { insert: t } = useSchemaInitializer();
   return /* @__PURE__ */ jsx(