@nocobase/client 1.9.54 → 1.9.55

package/es/index.mjs

@@ -57,7 +57,7 @@ import { Observer, SchemaOptionsContext, SchemaComponentsContext, ExpressionScop
 import * as ahooks from "ahooks";
 import { useSetState, useRequest as useRequest$1, useBoolean, useUpdate, useMemoizedFn, useDeepCompareEffect, useEventListener, useLocalStorageState, useCreation, useDebounce } from "ahooks";
 import * as antd from "antd";
-import { notification, ConfigProvider, theme, message, Result, Button, Space as Space$1, Radio as Radio$1, Input as Input$3, Tag, Spin, App, Popover, Menu as Menu$1, Modal, Typography, Tooltip, Skeleton, Table as Table$3, Select as Select$1, DatePicker as DatePicker$1, Cascader as Cascader$1, Slider, Switch, Card, Empty, Collapse, Badge, Tree as Tree$2, Dropdown, Alert, Image, InputNumber as InputNumber$1, Drawer as Drawer$1, Divider as Divider$1, QRCode, Tabs as Tabs$1, TreeSelect as TreeSelect$2, Upload as Upload$1, Progress, Checkbox as Checkbox$1, AutoComplete as AutoComplete$1, ColorPicker as ColorPicker$1, List as List$1, Col, Flex, Pagination as Pagination$1, TimePicker as TimePicker$1, Form as Form$2, Row, Popconfirm, Layout as Layout$1 } from "antd";
+import { notification, ConfigProvider, theme, message, Result, Button, Space as Space$1, Radio as Radio$1, Input as Input$3, Tag, Spin, App, Popover, Menu as Menu$1, Modal, Typography, Tooltip, Skeleton, Table as Table$3, Select as Select$1, DatePicker as DatePicker$1, Cascader as Cascader$1, Slider, Switch, Card, Empty, Collapse, Badge, Tree as Tree$2, Dropdown, Alert, Image, InputNumber as InputNumber$1, Drawer as Drawer$1, Divider as Divider$1, QRCode, Checkbox as Checkbox$1, Tabs as Tabs$1, TreeSelect as TreeSelect$2, Upload as Upload$1, Progress, AutoComplete as AutoComplete$1, ColorPicker as ColorPicker$1, List as List$1, Col, Flex, Pagination as Pagination$1, TimePicker as TimePicker$1, Form as Form$2, Row, Popconfirm, Layout as Layout$1 } from "antd";
 import _, { filter, capitalize, cloneDeep as cloneDeep$1, set, every, some, findIndex, isArray, isFunction, get, isObject as isObject$1, isEmpty as isEmpty$1, isString, omit, last, first, isEqual, concat, clone, debounce, castArray, uniqBy, differenceBy, unionBy, cloneDeepWith, isBoolean, groupBy, toString, uniq as uniq$2, pick as pick$1 } from "lodash";
 import template from "lodash/template";
 import React, { createContext, useContext, useMemo, Fragment, useCallback, useEffect, memo, useState, useRef, Suspense, createElement, isValidElement, lazy as lazy$1, useDeferredValue, useLayoutEffect, startTransition, forwardRef, useImperativeHandle, createRef } from "react";
@@ -7208,12 +7208,12 @@ const collectFieldStateOfLinkageRules = ({
           if ((t == null ? void 0 : t.mode) === "express") {
             if ((t.value || t.result) == null)
               return;
-            const { exp: E, scope: z } = yield replaceVariables(t.value || t.result, {
+            const { exp: E, scope: L } = yield replaceVariables(t.value || t.result, {
               variables: r,
               localVariables: a
             });
             try {
-              return f(E, x({ now: () => (/* @__PURE__ */ new Date()).toString() }, z));
+              return f(E, x({ now: () => (/* @__PURE__ */ new Date()).toString() }, L));
             } catch (V) {
               console.error(V);
             }
@@ -8858,7 +8858,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.9.54", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.9.55", 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.6.1",
@@ -8879,9 +8879,9 @@ const name = "@nocobase/client", version = "1.9.54", license = "AGPL-3.0", main
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.9.54",
-  "@nocobase/sdk": "1.9.54",
-  "@nocobase/utils": "1.9.54",
+  "@nocobase/evaluators": "1.9.55",
+  "@nocobase/sdk": "1.9.55",
+  "@nocobase/utils": "1.9.55",
   ahooks: "^3.7.2",
   antd: "5.24.2",
   "antd-mobile": "^5.41.1",
@@ -10139,11 +10139,11 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
           ${o.paddingSM}px;
       }
     `, [o.paddingContentVerticalLG, o.marginSM, o.margin]), b = useCollection(), S = useMemo(() => withTooltipComponent(NocoBaseRecursionField), []), y = useMemo(() => (d == null ? void 0 : d.map((D) => {
-    var z, V, L, G, H;
+    var L, V, z, G, H;
     const B = D.reduceProperties((U, K) => {
       if (isCollectionFieldComponent(K))
         return U.concat([K]);
-    }, []), N = (B == null ? void 0 : B.length) > 0 ? B[0].name : D.name, M = D["x-uid"] || D.name, j = !!((z = D["x-component-props"]) != null && z.columnHidden), R = ((V = D["x-component-props"]) == null ? void 0 : V.width) || 100, O = (L = D["x-component-props"]) == null ? void 0 : L.fixed, { uiSchema: $, defaultValue: A, interface: E } = (b == null ? void 0 : b.getField(N)) || {};
+    }, []), N = (B == null ? void 0 : B.length) > 0 ? B[0].name : D.name, M = D["x-uid"] || D.name, j = !!((L = D["x-component-props"]) != null && L.columnHidden), R = ((V = D["x-component-props"]) == null ? void 0 : V.width) || 100, O = (z = D["x-component-props"]) == null ? void 0 : z.fixed, { uiSchema: $, defaultValue: A, interface: E } = (b == null ? void 0 : b.getField(N)) || {};
     return D.title = n(D == null ? void 0 : D.title, { ns: NAMESPACE_UI_SCHEMA }), $ && ($.default = A), P(x({
       title: /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: g, children: /* @__PURE__ */ jsx(
         S,
@@ -10566,7 +10566,7 @@ const Table$2 = withDynamicSchemaProps(
         "onClickRow",
         "value"
       ]), y = useArrayField$1(S), v = useFieldSchema(), { size: I = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, F = useCollection(), T = ((ye = v == null ? void 0 : v.parent) == null ? void 0 : ye["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: B, enableIndexColumn: N } = T, M = useMemoizedFn(S.onRowDragEnd || (() => {
-      })), j = usePaginationProps$3(n, a, e), R = useTableColumns$3(S, j), [O, $] = useState(() => D ? B : []), [A, E] = useState(((ie = y == null ? void 0 : y.data) == null ? void 0 : ie.selectedRowKeys) || []), [z, V] = useState([]), L = (p == null ? void 0 : p.type) !== "none", G = useRef(/* @__PURE__ */ new Map()), H = useMemo(() => css`
+      })), j = usePaginationProps$3(n, a, e), R = useTableColumns$3(S, j), [O, $] = useState(() => D ? B : []), [A, E] = useState(((ie = y == null ? void 0 : y.data) == null ? void 0 : ie.selectedRowKeys) || []), [L, V] = useState([]), z = (p == null ? void 0 : p.type) !== "none", G = useRef(/* @__PURE__ */ new Map()), H = useMemo(() => css`
           & > td {
             background-color: ${t.controlItemBgActive} !important;
           }
@@ -10582,14 +10582,14 @@ const Table$2 = withDynamicSchemaProps(
       }, [U == null ? void 0 : U.field]);
       const Y = useMemo(() => C ? H : "", [H, C]), X = useMemo(() => C ? (te, oe) => ({
         onClick: (le) => {
-          isPortalInBody(le.target) || C(te, V, z);
+          isPortalInBody(le.target) || C(te, V, L);
         },
         rowIndex: oe,
         record: te
       }) : (te, oe) => ({
         rowIndex: oe,
         record: te
-      }), [C, z]);
+      }), [C, L]);
       useDeepCompareEffect(() => {
         const te = D ? B : [];
         _.isEqual(te, O) || $(te);
@@ -10662,14 +10662,14 @@ const Table$2 = withDynamicSchemaProps(
                   role: "button",
                   "aria-label": `table-index-${le}`,
                   className: cls(te ? "checked" : null, rowSelectCheckboxWrapperClass$1, {
-                    [rowSelectCheckboxWrapperClassHover$1]: L
+                    [rowSelectCheckboxWrapperClassHover$1]: z
                   }),
                   children: [
                     /* @__PURE__ */ jsxs("div", { className: cls(te ? "checked" : null, rowSelectCheckboxContentClass$1), children: [
                       l && /* @__PURE__ */ jsx(SortHandle$2, { id: Z(oe) }),
                       c && /* @__PURE__ */ jsx(TableIndex$3, { index: le })
                     ] }),
-                    L && /* @__PURE__ */ jsx(
+                    z && /* @__PURE__ */ jsx(
                       "div",
                       {
                         className: cls(
@@ -10694,7 +10694,7 @@ const Table$2 = withDynamicSchemaProps(
           l,
           y,
           Z,
-          L,
+          z,
           re,
           j,
           U,
@@ -10717,8 +10717,8 @@ const Table$2 = withDynamicSchemaProps(
         x: "max-content",
         y: ae
       }), [ae, Q]), ce = useCallback(
-        (te) => z.includes(te[m]) ? Y : "",
-        [z, Y, JSON.stringify(m)]
+        (te) => L.includes(te[m]) ? Y : "",
+        [L, Y, JSON.stringify(m)]
       ), ge = useCallback(
         (te, oe) => {
           const le = te ? [...O, oe[F.getPrimaryKey()]] : O.filter((me) => oe[F.getPrimaryKey()] !== me);
@@ -10967,10 +10967,10 @@ const InternalTableBlockProvider = (e) => {
     [t, p]
   ), v = useCallback(
     (R, O = !1, $) => {
-      var z;
+      var L;
       if (!R)
         return [];
-      const A = (z = p($)) == null ? void 0 : z.getCollection(R);
+      const A = (L = p($)) == null ? void 0 : L.getCollection(R);
       return (A == null ? void 0 : A.getChildrenCollections(O)) || [];
     },
     [t, p]
@@ -10985,19 +10985,19 @@ const InternalTableBlockProvider = (e) => {
       var Z;
       const {
         association: E = !1,
-        cached: z = {},
+        cached: L = {},
         collectionNames: V = [R],
-        maxDepth: L = 1,
+        maxDepth: z = 1,
         allowAllTypes: G = !1,
         exceptInterfaces: H = [],
         prefixFieldValue: U = "",
         usePrefix: K = !1,
         dataSource: Y
       } = A || {};
-      if (V.length - 1 > L)
+      if (V.length - 1 > z)
         return;
-      if (z[R])
-        return _.cloneDeep(z[R]);
+      if (L[R])
+        return _.cloneDeep(L[R]);
       O && typeof O == "string" && (O = [O]), $ && typeof $ == "string" && ($ = [$]);
       const X = b(R, Y), J = (Z = X == null ? void 0 : X.filter(
         (Q) => Q.interface && !H.includes(Q.interface) && (G || O && O.includes(Q.type) || $ && $.includes(Q.interface) || (E && Q.target && Q.target !== R && Array.isArray(E) ? E.includes(Q.interface) : !1))
@@ -11008,14 +11008,14 @@ const InternalTableBlockProvider = (e) => {
           label: f((ee = Q == null ? void 0 : Q.uiSchema) == null ? void 0 : ee.title) || Q.name
         }, Q);
         return E && Q.target && (ne.children = V.includes(Q.target) ? [] : F(Q.target, O, $, P(x({}, A), {
-          cached: z,
+          cached: L,
           dataSource: Y,
           collectionNames: [...V, Q.target],
           prefixFieldValue: K ? U ? `${U}.${Q.name}` : Q.name : "",
           usePrefix: K
         })), !((re = ne.children) != null && re.length)) ? null : ne;
       }).filter(Boolean);
-      return z[R] = J, J;
+      return L[R] = J, J;
     },
     [b]
   ), w = useCallback(
@@ -11289,12 +11289,12 @@ const popupsContextStorage = {}, defaultPopupsContextStorage = {}, getStoredPopu
       recordData: $,
       sourceId: A,
       collection: E,
-      puid: z
+      puid: L
     }) => {
       const V = c.getFilterByTK(u || l, $);
       return getPopupPathFromParams({
         popupuid: O,
-        puid: z,
+        puid: L,
         collection: E,
         filterbytk: V,
         sourceid: A,
@@ -11319,27 +11319,27 @@ const popupsContextStorage = {}, defaultPopupsContextStorage = {}, getStoredPopu
     } = {}) => {
       if (!f())
         return F == null ? void 0 : F(!0);
-      const z = E || o, V = z == null ? void 0 : z["x-uid"], L = y(O);
+      const L = E || o, V = L == null ? void 0 : L["x-uid"], z = y(O);
       R = R || (a == null ? void 0 : a.data);
       const G = w({
         popupUid: V,
         recordData: R,
-        sourceId: L,
+        sourceId: z,
         collection: $,
         puid: A
       });
       let H = n.pathname;
       if (_.last(H) === "/" && (H = H.slice(0, -1)), storePopupContext(V, {
-        schema: z,
+        schema: L,
         record: new CollectionRecord({ isNew: !1, data: R }),
         parentRecord: O ? new CollectionRecord({ isNew: !1, data: O }) : i,
         service: g(),
         dataSource: r,
         collection: l == null ? void 0 : l.name,
         association: u,
-        sourceId: L,
+        sourceId: z,
         tableBlockContext: P(x({}, I), { collection: l == null ? void 0 : l.name, blockData: v })
-      }), b(T(), E), z.properties) {
+      }), b(T(), E), L.properties) {
         const U = h + 1;
         if (getPopupLayerState(U))
           return;
@@ -11347,7 +11347,7 @@ const popupsContextStorage = {}, defaultPopupsContextStorage = {}, getStoredPopu
       } else
         console.error(
           `[NocoBase] The popup schema is invalid, please check the schema: 
-${JSON.stringify(z, null, 2)}`
+${JSON.stringify(L, null, 2)}`
         );
     },
     [
@@ -14080,14 +14080,14 @@ const ParentCollectionProvider = (e) => {
   targetFieldSchema: a,
   record: i
 }) => {
-  var E, z;
+  var E, L;
   const l = useApp(), c = ((E = l == null ? void 0 : l.getVariables) == null ? void 0 : E.call(l).map((V) => {
-    const { visible: L = !0, option: G } = V.useOption();
+    const { visible: z = !0, option: G } = V.useOption();
     return {
-      visible: L,
+      visible: z,
       option: G
     };
-  }).filter(({ visible: V }) => V)) || [], { filterVariables: u = () => !0 } = useVariables$1() || {}, d = (z = i == null ? void 0 : i.__parent) == null ? void 0 : z.__collectionName, { currentUserSettings: p } = useCurrentUserVariable({
+  }).filter(({ visible: V }) => V)) || [], { filterVariables: u = () => !0 } = useVariables$1() || {}, d = (L = i == null ? void 0 : i.__parent) == null ? void 0 : L.__collectionName, { currentUserSettings: p } = useCurrentUserVariable({
     maxDepth: 3,
     uiSchema: n,
     collectionField: e,
@@ -14558,33 +14558,33 @@ const getActionContext = (e) => {
   var n;
   return ((n = e.fieldSchema) == null ? void 0 : n["x-action-context"]) || {};
 }, SchemaSettingsDefaultValue = function(t) {
-  var E, z, V;
-  const n = useFieldSchema(), o = (E = t == null ? void 0 : t.fieldSchema) != null ? E : n, r = useField(), { dn: a } = useDesignable(), { t: i } = useTranslation(), l = useActionContext(), c = getActionContext(l).collection;
+  var A, E, L;
+  const n = useFieldSchema(), o = (A = t == null ? void 0 : t.fieldSchema) != null ? A : n, r = useField(), { dn: a } = useDesignable(), { t: i } = 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, type: y } = useFormBlockContext(), { getFields: v } = useCollectionFilterOptionsV2(C), { isInSubForm: I, isInSubTable: F } = useFlag() || {}, { name: w } = C, T = useMemo(
     () => d(o.name) || p(o["x-collection-field"]),
     [o, p, d]
   ), D = _.omit(o, "required");
   T != null && T.target && (u = p(
-    `${T.target}.${((V = (z = o["x-component-props"]) == null ? void 0 : z.fieldNames) == null ? void 0 : V.label) || "id"}`
+    `${T.target}.${((L = (E = o["x-component-props"]) == null ? void 0 : E.fieldNames) == null ? void 0 : L.label) || "id"}`
   ));
-  const B = (T == null ? void 0 : T.interface) === "m2o" && findParentFieldSchema(o), N = B && p(B == null ? void 0 : B["x-collection-field"]), M = useTableBlockContext(), j = (T == null ? void 0 : T.interface) === "m2m" || (T == null ? void 0 : T.interface) === "mbm" || (N == null ? void 0 : N.type) === "hasMany" && (T == null ? void 0 : T.interface) === "m2o", R = useCallback(
-    (L) => {
-      const G = L.find((U) => U.value === "$nForm"), H = m(w);
-      return !(H != null && H.length) && G && (G.children = formatVariableScop(v())), L;
+  const B = (T == null ? void 0 : T.interface) === "m2o" && findParentFieldSchema(o), N = B && p(B == null ? void 0 : B["x-collection-field"]), M = (T == null ? void 0 : T.interface) === "m2m" || (T == null ? void 0 : T.interface) === "mbm" || (N == null ? void 0 : N.type) === "hasMany" && (T == null ? void 0 : T.interface) === "m2o", j = useCallback(
+    (V) => {
+      const z = V.find((H) => H.value === "$nForm"), G = m(w);
+      return !(G != null && G.length) && z && (z.children = formatVariableScop(v())), V;
     },
-    [v, w]
-  ), O = useMemo(() => ({
+    [m, v, w]
+  ), R = useMemo(() => ({
     ArrayCollapse: ArrayCollapse$2,
     FormLayout,
-    VariableInput: (L) => /* @__PURE__ */ jsx(SchemaComponentContext.Provider, { value: { designable: !1 }, children: /* @__PURE__ */ jsx(
+    VariableInput: (V) => /* @__PURE__ */ jsx(SchemaComponentContext.Provider, { value: { designable: !1 }, children: /* @__PURE__ */ jsx(
       VariableInput,
-      P(x({}, L), {
-        value: L.value || void 0,
+      P(x({}, V), {
+        value: V.value || void 0,
         hideVariableButton: t == null ? void 0 : t.hideVariableButton
       })
     ) })
-  }), []), $ = useMemo(() => ({
+  }), [t == null ? void 0 : t.hideVariableButton]), O = useMemo(() => ({
     type: "object",
     title: i("Set default value"),
     properties: {
@@ -14593,45 +14593,49 @@ const getActionContext = (e) => {
         "x-component": "VariableInput",
         "x-component-props": P(x({}, (o == null ? void 0 : o["x-component-props"]) || {}), {
           collectionField: T,
-          contextCollectionName: j ? c : "",
+          contextCollectionName: M ? c : "",
           schema: T == null ? void 0 : T.uiSchema,
           targetFieldSchema: o,
           className: defaultInputStyle,
           form: S,
           record: b,
-          returnScope: R,
+          returnScope: j,
           shouldChange: getShouldChange({
             collectionField: T,
             variables: g,
             localVariables: f,
             getAllCollectionsInheritChain: h
           }),
-          renderSchemaComponent: function(G) {
-            const H = useMemo(
+          renderSchemaComponent: function(z) {
+            const G = useMemo(
               () => _.cloneDeep(D.toJSON()) || {},
               []
             );
-            H["x-read-pretty"] = !1, H["x-disabled"] = !1, _.set(H, "x-decorator-props.showTitle", !1);
-            const U = getFieldDefaultValue(H, T);
-            T.target && H["x-component-props"] && (H["x-component-props"].mode = "Select"), T != null && T.uiSchema.type && (H.type = T.uiSchema.type), (T == null ? void 0 : T.uiSchema["x-component"]) === "Checkbox" && (_.set(H, "x-component-props.defaultChecked", U), H.type = "void");
-            const K = useMemo(
-              () => P(x({}, H || {}), {
+            G["x-read-pretty"] = !1, G["x-disabled"] = !1, _.set(G, "x-decorator-props.showTitle", !1);
+            const H = getFieldDefaultValue(G, T);
+            if (G["x-component"] === "CollectionField" && (T != null && T.uiSchema)) {
+              const K = _.cloneDeep(T.uiSchema);
+              G["x-component"] = K["x-component"] || "Input", G["x-use-component-props"] = G["x-use-component-props"] || K["x-use-component-props"], G["x-component-props"] = x(x({}, K["x-component-props"] || {}), G["x-component-props"] || {}), K.type && (G.type = K.type);
+            }
+            T.target && G["x-component-props"] && (G["x-component-props"].mode = "Select"), T != null && T.uiSchema.type && (G.type = T.uiSchema.type), (T == null ? void 0 : T.uiSchema["x-component"]) === "Checkbox" && (_.set(G, "x-component-props.defaultChecked", H), G.type = "void");
+            const U = useMemo(
+              () => P(x({}, G || {}), {
                 "x-decorator": "FormItem",
-                "x-component-props": P(x({}, H["x-component-props"]), {
+                "x-component-props": P(x({}, G["x-component-props"]), {
                   collectionName: T == null ? void 0 : T.collectionName,
                   targetField: u,
-                  defaultValue: isVariable$1(U) ? "" : U,
+                  defaultValue: isVariable$1(H) ? "" : H,
                   style: {
                     width: "100%",
                     verticalAlign: "top",
                     minWidth: "200px"
                   }
                 }),
-                default: isVariable$1(U) ? "" : U
+                default: isVariable$1(H) ? "" : H
               }),
-              [H, U]
+              [G, H]
             );
-            return _.set(K, "x-component-props.onChange", G.onChange), /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(SchemaComponent, { schema: K }) });
+            return _.set(U, "x-component-props.onChange", z.onChange), /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(SchemaComponent, { schema: U }) });
           }
         }),
         title: i("Default value"),
@@ -14639,27 +14643,27 @@ const getActionContext = (e) => {
       }
     }
   }), [
+    c,
     T,
     o,
     D,
     S,
     h,
-    j,
+    M,
     f,
     b,
-    R,
+    j,
     i,
-    M.collection,
     u,
     g
-  ]), A = useCallback(
-    (L) => {
-      var H, U, K;
-      const G = {
+  ]), $ = useCallback(
+    (V) => {
+      var G, H, U;
+      const z = {
         "x-uid": o["x-uid"]
       };
-      o.default = (H = L.default) != null ? H : null, isVariable$1(L.default) || (b.__isNewRecord__ || y === "create") && ((U = r.setInitialValue) == null || U.call(r, L.default)), G.default = (K = L.default) != null ? K : null, a.emit("patch", {
-        schema: G,
+      o.default = (G = V.default) != null ? G : null, isVariable$1(V.default) || (b.__isNewRecord__ || y === "create") && ((H = r.setInitialValue) == null || H.call(r, V.default)), z.default = (U = V.default) != null ? U : null, a.emit("patch", {
+        schema: z,
         currentSchema: n
       });
     },
@@ -14669,18 +14673,18 @@ const getActionContext = (e) => {
     SchemaSettingsModalItem,
     {
       title: i("Set default value"),
-      components: O,
+      components: R,
       width: 800,
-      schema: $,
-      onSubmit: A,
-      ModalContextProvider: (L) => /* @__PURE__ */ jsx(
+      schema: O,
+      onSubmit: $,
+      ModalContextProvider: (V) => /* @__PURE__ */ jsx(
         FlagProvider,
         {
           isInSubForm: I,
           isInSubTable: F,
           isInSetDefaultValueDialog: !0,
           collectionField: T,
-          children: L.children
+          children: V.children
         }
       )
     }
@@ -15547,7 +15551,7 @@ const useGetFilterOptions = () => {
     };
   });
 }, TableColumnDesigner$1 = (e) => {
-  var N, M, j, R, O, $, A, E, z, V, L, G;
+  var N, M, j, R, O, $, A, E, L, V, z, G;
   const { uiSchema: t, fieldSchema: n, collectionField: o } = e, { form: r } = useFormBlockContext(), { getInterface: a, getCollection: i } = useCollectionManager_deprecated(), l = useField(), { t: c } = useTranslation(), u = useFieldSchema(), { dn: d } = useDesignable(), p = ((N = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : N.fieldNames) || ((M = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : M.fieldNames), m = useLabelFields$1((j = o == null ? void 0 : o.target) != null ? j : o == null ? void 0 : o.targetCollection), h = useColorFields((R = o == null ? void 0 : o.target) != null ? R : o == null ? void 0 : o.targetCollection), g = a(o == null ? void 0 : o.interface), f = i(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), I = ["obo", "oho", "o2o", "o2m", "m2m", "m2o", "snapshot"].includes(
     o == null ? void 0 : o.interface
   ), F = useFieldModeOptions({ fieldSchema: n }), w = ((O = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : O.mode) || "Select";
@@ -15590,7 +15594,7 @@ const useGetFilterOptions = () => {
       SchemaSettingsDataScope,
       {
         collectionName: o == null ? void 0 : o.target,
-        defaultFilter: ((z = (E = (A = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : A.service) == null ? void 0 : E.params) == null ? void 0 : z.filter) || {},
+        defaultFilter: ((L = (E = (A = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : A.service) == null ? void 0 : E.params) == null ? void 0 : L.filter) || {},
         form: r,
         onSubmit: ({ filter: H }) => {
           var K, Y;
@@ -15659,7 +15663,7 @@ const useGetFilterOptions = () => {
       SchemaSettingsSwitchItem,
       {
         title: c("Enable link"),
-        checked: ((L = n["x-component-props"]) == null ? void 0 : L.enableLink) !== !1,
+        checked: ((z = n["x-component-props"]) == null ? void 0 : z.enableLink) !== !1,
         onChange: (H) => {
           n["x-component-props"] = P(x({}, n == null ? void 0 : n["x-component-props"]), {
             enableLink: H
@@ -18213,7 +18217,7 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
   ), { render: O, exists: $ } = useSchemaInitializerRender(
     o || (t == null ? void 0 : t["x-initializer"]),
     t == null ? void 0 : t["x-initializer-props"]
-  ), A = useGridRowContext(), E = useGridContext(), z = useMemo(() => {
+  ), A = useGridRowContext(), E = useGridContext(), L = useMemo(() => {
     var X;
     return {
       insertPosition: "afterEnd",
@@ -18227,15 +18231,15 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
         })
       )
     };
-  }, [v, (Y = A == null ? void 0 : A.cols) == null ? void 0 : Y.length]), V = useMemo(() => u === !1 || C === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": v("drag-handler") }) }), [u, v, C]), L = useMemo(() => {
+  }, [v, (Y = A == null ? void 0 : A.cols) == null ? void 0 : Y.length]), V = useMemo(() => u === !1 || C === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": v("drag-handler") }) }), [u, v, C]), z = useMemo(() => {
     var X;
     if (o === !1)
       return null;
     if ($)
-      return O(z);
+      return O(L);
     if (E != null && E.InitializerComponent || E != null && E.renderSchemaInitializer)
-      return E != null && E.InitializerComponent ? /* @__PURE__ */ jsx(E.InitializerComponent, x({}, z)) : (X = E.renderSchemaInitializer) == null ? void 0 : X.call(E, z);
-  }, [E, o, z, $, O]), G = useMemo(() => r !== !1 && R ? j() : null, [R, j, r]), H = useRef(null), U = "hidden";
+      return E != null && E.InitializerComponent ? /* @__PURE__ */ jsx(E.InitializerComponent, x({}, L)) : (X = E.renderSchemaInitializer) == null ? void 0 : X.call(E, L);
+  }, [E, o, L, $, O]), G = useMemo(() => r !== !1 && R ? j() : null, [R, j, r]), H = useRef(null), U = "hidden";
   useEffect(() => {
     const X = H.current;
     let J = X == null ? void 0 : X.parentElement;
@@ -18276,7 +18280,7 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
         ] }) }),
         /* @__PURE__ */ jsx("div", { className: cls("toolbar-icons", i), style: l, children: /* @__PURE__ */ jsxs(Space$1, { size: 3, align: "center", className: d, style: p, children: [
           V,
-          /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: N, children: L }),
+          /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: N, children: z }),
           G
         ] }) })
       ]
@@ -18992,9 +18996,9 @@ const useTableBlockProps = () => {
     ),
     onChange: useCallback(
       ({ current: S, pageSize: y }, v, I) => {
-        var B, N, M, j, R, O, $, A, E, z;
+        var B, N, M, j, R, O, $, A, E, L;
         const F = (M = (N = (B = t.parent) == null ? void 0 : B["x-decorator-props"]) == null ? void 0 : N.params) == null ? void 0 : M.sort, w = I.order ? I.order === "ascend" ? [I.field] : [`-${I.field}`] : F || a.dragSortBy, T = y || ((O = (R = (j = t.parent) == null ? void 0 : j["x-decorator-props"]) == null ? void 0 : R.params) == null ? void 0 : O.pageSize), D = P(x({}, (E = (A = ($ = i.current) == null ? void 0 : $.service) == null ? void 0 : A.params) == null ? void 0 : E[0]), { page: S || 1, pageSize: T });
-        w && (D.sort = w), (z = i.current) == null || z.service.run(D);
+        w && (D.sort = w), (L = i.current) == null || L.service.run(D);
       },
       [t.parent]
     ),
@@ -19007,13 +19011,13 @@ const useTableBlockProps = () => {
         }
         const T = w.find((D) => D.uid === t.parent["x-uid"]);
         w.forEach((D) => {
-          var $, A, E, z;
+          var $, A, E, L;
           const B = I.find((V) => V.uid === D.uid);
           if (!B)
             return;
           const N = getSourceKey(T, B.field) || a.rowKey || "id", M = [S[N]], j = (($ = D.service.params) == null ? void 0 : $[0]) || {}, R = ((E = (A = D.service.params) == null ? void 0 : A[1]) == null ? void 0 : E.filters) || {};
           if (v.includes(S[a.rowKey])) {
-            if ((z = D.clearSelection) == null || z.call(D), D.dataLoadingMode === "manual")
+            if ((L = D.clearSelection) == null || L.call(D), D.dataLoadingMode === "manual")
               return D.clearData();
             delete R[F];
           } else
@@ -19390,10 +19394,10 @@ const useTableSelectorParams = () => useContext(TableSelectorParamsContext), Tab
   var i, l, c, u, d, p, m, h, g, f, C, b, S, y, v, I;
   const e = useField(), t = useTableSelectorContext(), n = useFieldSchema(), { getCollectionJoinField: o } = useCollectionManager_deprecated(), r = recursiveParent(n, "CollectionField"), a = o(r == null ? void 0 : r["x-collection-field"]);
   return useEffect(() => {
-    var w, T, D, B, N, M, j, R, O, $, A, E, z;
+    var w, T, D, B, N, M, j, R, O, $, A, E, L;
     if (!((w = t == null ? void 0 : t.service) != null && w.loading)) {
-      const V = (D = (T = t == null ? void 0 : t.service) == null ? void 0 : T.data) == null ? void 0 : D.data.map((L) => L);
-      e.value = V, (B = e == null ? void 0 : e.setInitialValue) == null || B.call(e, V), e.data = e.data || {}, e.data.selectedRowKeys = [], e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (j = (M = (N = t == null ? void 0 : t.service) == null ? void 0 : N.data) == null ? void 0 : M.meta) == null ? void 0 : j.pageSize, e.componentProps.pagination.total = ($ = (O = (R = t == null ? void 0 : t.service) == null ? void 0 : R.data) == null ? void 0 : O.meta) == null ? void 0 : $.count, e.componentProps.pagination.current = (z = (E = (A = t == null ? void 0 : t.service) == null ? void 0 : A.data) == null ? void 0 : E.meta) == null ? void 0 : z.page;
+      const V = (D = (T = t == null ? void 0 : t.service) == null ? void 0 : T.data) == null ? void 0 : D.data.map((z) => z);
+      e.value = V, (B = e == null ? void 0 : e.setInitialValue) == null || B.call(e, V), e.data = e.data || {}, e.data.selectedRowKeys = [], e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (j = (M = (N = t == null ? void 0 : t.service) == null ? void 0 : N.data) == null ? void 0 : M.meta) == null ? void 0 : j.pageSize, e.componentProps.pagination.total = ($ = (O = (R = t == null ? void 0 : t.service) == null ? void 0 : R.data) == null ? void 0 : O.meta) == null ? void 0 : $.count, e.componentProps.pagination.current = (L = (E = (A = t == null ? void 0 : t.service) == null ? void 0 : A.data) == null ? void 0 : E.meta) == null ? void 0 : L.page;
     }
   }, [
     a == null ? void 0 : a.foreignKey,
@@ -22177,7 +22181,7 @@ const SchemaSettingsModalItem = (e) => {
     "noRecord",
     "ModalContextProvider",
     "dialogRootClassName"
-  ]), g = useContext(SchemaOptionsContext), f = useCollection(), C = useAPIClient(), b = useApp(), { theme: S } = useGlobalTheme(), y = useBlockRequestContext(), v = useFormActiveFields(), { locale: I } = useContext(ConfigProvider.ConfigContext), F = useDataSourceManager(), w = useDataSourceKey(), T = useCollectionRecord(), { association: D } = useDataBlockProps() || {}, B = useCurrentRecord(), N = useFormBlockContext(), M = useBlockContext(), { getOperators: j } = useOperators(), R = useLocationSearch(), O = useVariables$1(), $ = useContext(AllDataBlocksContext), A = useContext(SchemaComponentContext), E = useContext(VariableScopeContext$1), { formValue: z, collection: V, parent: L } = useSubFormValue(), G = useCurrentPopupRecord(), H = useParentPopupRecord();
+  ]), g = useContext(SchemaOptionsContext), f = useCollection(), C = useAPIClient(), b = useApp(), { theme: S } = useGlobalTheme(), y = useBlockRequestContext(), v = useFormActiveFields(), { locale: I } = useContext(ConfigProvider.ConfigContext), F = useDataSourceManager(), w = useDataSourceKey(), T = useCollectionRecord(), { association: D } = useDataBlockProps() || {}, B = useCurrentRecord(), N = useFormBlockContext(), M = useBlockContext(), { getOperators: j } = useOperators(), R = useLocationSearch(), O = useVariables$1(), $ = useContext(AllDataBlocksContext), A = useContext(SchemaComponentContext), E = useContext(VariableScopeContext$1), { formValue: L, collection: V, parent: z } = useSubFormValue(), G = useCurrentPopupRecord(), H = useParentPopupRecord();
   return t ? null : /* @__PURE__ */ jsx(
     SchemaSettingsItem,
     P(x({
@@ -22199,7 +22203,7 @@ const SchemaSettingsModalItem = (e) => {
               children: /* @__PURE__ */ jsx(CollectionRecordProvider, { record: d ? null : T, children: /* @__PURE__ */ jsx(CurrentRecordContextProvider, P(x({}, B), { children: /* @__PURE__ */ jsx(FormBlockContext$1.Provider, { value: N, children: /* @__PURE__ */ jsx(
                 SubFormProvider,
                 {
-                  value: { value: z, collection: V, parent: L },
+                  value: { value: L, collection: V, parent: z },
                   children: /* @__PURE__ */ jsx(
                     FormActiveFieldsProvider,
                     {
@@ -22401,13 +22405,13 @@ const SchemaSettingsModalItem = (e) => {
     (O) => {
       var V;
       const $ = [];
-      for (const L of O.fieldReaction.rules)
-        $.push(_.omit(_.pickBy(L, _.identity), ["conditionBasic", "conditionAdvanced"]));
-      const A = y["x-component"] === "BlockTemplate" && ((V = y["x-component-props"]) == null ? void 0 : V.templateId), z = {
+      for (const z of O.fieldReaction.rules)
+        $.push(_.omit(_.pickBy(z, _.identity), ["conditionBasic", "conditionAdvanced"]));
+      const A = y["x-component"] === "BlockTemplate" && ((V = y["x-component-props"]) == null ? void 0 : V.templateId), L = {
         "x-uid": b !== LinkageRuleCategory.block ? A && m(A).uid || y["x-uid"] : c["x-uid"]
       };
-      y[w] = $, z[w] = $, c[w] = $, d.emit("patch", {
-        schema: z
+      y[w] = $, L[w] = $, c[w] = $, d.emit("patch", {
+        schema: L
       }), d.refresh(), a == null || a();
     },
     [d, m, y, w, a, b]
@@ -23553,7 +23557,7 @@ function Input$1(e) {
   useAntdInputStyle(`${y}-input`);
   const v = useCompile(), { t: I } = useTranslation(), F = useForm(), [w, T] = React.useState([]), [D, B] = React.useState([]), [N, M] = React.useState(
     m || !!(o && t != null)
-  ), [j, R] = React.useState(null), O = useMemo(() => parseValue(t, p), [p, t]), $ = typeof O == "string", A = $ ? O : "", E = $ ? null : O, z = Object.assign(
+  ), [j, R] = React.useState(null), O = useMemo(() => parseValue(t, p), [p, t]), $ = typeof O == "string", A = $ ? O : "", E = $ ? null : O, L = Object.assign(
     {
       label: "label",
       value: "value",
@@ -23563,9 +23567,9 @@ function Input$1(e) {
   ), V = useMemo(() => h ? o ? {
     value: "$",
     label: I("Constant"),
-    [z.value]: "$",
-    [z.label]: I("Constant")
-  } : a ? getTypedConstantOption(A, a, z) : null : null, [A, a]), L = (ne = V == null ? void 0 : V.component) != null ? ne : NullComponent, G = Array.isArray(a) ? (re = (ee = a.find((se) => Array.isArray(se) && se[0] === A)) == null ? void 0 : ee[1]) != null ? re : {} : {};
+    [L.value]: "$",
+    [L.label]: I("Constant")
+  } : a ? getTypedConstantOption(A, a, L) : null : null, [A, a]), z = (ne = V == null ? void 0 : V.component) != null ? ne : NullComponent, G = Array.isArray(a) ? (re = (ee = a.find((se) => Array.isArray(se) && se[0] === A)) == null ? void 0 : ee[1]) != null ? re : {} : {};
   let H;
   t == null ? i ? o && N ? H = ["$"] : H = [""] : o ? H = ["$"] : H = [" ", A] : H = o ? ["$"] : [" ", A], m && (H = ["$"]), useEffect(() => {
     const pe = V != null ? V : {}, { component: se } = pe, ae = W(pe, ["component"]), ue = [
@@ -23573,24 +23577,24 @@ function Input$1(e) {
         {
           value: "",
           label: I("Null"),
-          [z.value]: "",
-          [z.label]: I("Null")
+          [L.value]: "",
+          [L.label]: I("Null")
         }
       ] : [],
       ...V ? [v(ae)] : [],
       ...f ? [...f] : []
-    ].filter((ce) => !ce.deprecated || (E == null ? void 0 : E[0]) === ce[z.value]);
+    ].filter((ce) => !ce.deprecated || (E == null ? void 0 : E[0]) === ce[L.value]);
     T(ue);
   }, [f, E, V, i]);
   const U = (se) => q(this, null, function* () {
     var ue;
     const ae = se[se.length - 1];
     if (!((ue = ae.children) != null && ue.length) && !ae.isLeaf && ae.loadChildren) {
-      se.length && R(se.map((ce) => ce == null ? void 0 : ce[z.value]));
+      se.length && R(se.map((ce) => ce == null ? void 0 : ce[L.value]));
       let pe;
       if (E && E.length >= 2) {
         for (const ce of E)
-          if (ce === ae[z.value]) {
+          if (ce === ae[L.value]) {
             pe = ce;
             break;
           }
@@ -23636,9 +23640,9 @@ function Input$1(e) {
       for (let ce = 0; ce < E.length; ce++) {
         const ge = E[ce];
         try {
-          if (ce === 0 ? ae = w.find((he) => he[z.value] === ge) : (ae.loadChildren && !((pe = ae.children) != null && pe.length) && (yield ae.loadChildren(ae, ge, E)), ae = ae.children.find((he) => he[z.value] === ge)), !ae)
+          if (ce === 0 ? ae = w.find((he) => he[L.value] === ge) : (ae.loadChildren && !((pe = ae.children) != null && pe.length) && (yield ae.loadChildren(ae, ge, E)), ae = ae.children.find((he) => he[L.value] === ge)), !ae)
             return;
-          ue.push(ae[z.label]);
+          ue.push(ae[L.label]);
         } catch (he) {
           error(he);
         }
@@ -23707,8 +23711,8 @@ function Input$1(e) {
               )
             ]
           }
-        ) : /* @__PURE__ */ jsx("div", { style: { flex: 1 }, children: o && (N || !i) ? o : L ? /* @__PURE__ */ jsx(
-          L,
+        ) : /* @__PURE__ */ jsx("div", { style: { flex: 1 }, children: o && (N || !i) ? o : z ? /* @__PURE__ */ jsx(
+          z,
           P(x({
             role: "button",
             "aria-label": "variable-constant"
@@ -24023,23 +24027,23 @@ function TextArea(e) {
   ), [S, y] = useState(!1), [v, I] = useState(!1), [F, w] = useState(() => renderHTML(p != null ? p : "", b, c)), [T, D] = useState([-1, 0, -1, 0]);
   useAntdInputStyle("ant-input");
   const { token: B } = theme.useToken(), N = c.join(" "), M = useCallback(
-    (L) => {
+    (z) => {
       var H;
-      const G = getValue(L, c);
+      const G = getValue(z, c);
       (H = e.onChange) == null || H.call(e, d ? G.trim() : G);
     },
     [N, e.onChange, d]
   );
   useEffect(() => {
-    preloadOptions(r, m).then((L) => {
-      f(L);
+    preloadOptions(r, m).then((z) => {
+      f(z);
     }).catch(console.error);
   }, [r, JSON.stringify(m)]), useEffect(() => {
     w(renderHTML(p != null ? p : "", b, c)), v || D([-1, 0, -1, 0]);
   }, [p, b, N]), useEffect(() => {
     var H;
-    const { current: L } = h;
-    if (!L)
+    const { current: z } = h;
+    if (!z)
       return;
     const G = new Range();
     if (v) {
@@ -24048,22 +24052,22 @@ function TextArea(e) {
       const U = (H = window.getSelection) == null ? void 0 : H.call(window);
       if (U)
         try {
-          const K = Array.from(L.childNodes);
+          const K = Array.from(z.childNodes);
           K.length && (T[0] === -1 ? T[1] && G.setStartAfter(K[T[1] - 1]) : G.setStart(K[T[0]], T[1]), T[2] === -1 ? T[3] && G.setEndAfter(K[T[3] - 1]) : G.setEnd(K[T[2]], T[3])), G.collapse(!0), U.removeAllRanges(), U.addRange(G);
         } catch (K) {
         }
     } else {
-      const { lastChild: U } = L;
+      const { lastChild: U } = z;
       if (U) {
         G.setStartAfter(U), G.setEndAfter(U);
-        const K = Array.from(L.childNodes), Y = G.startContainer === L ? -1 : K.indexOf(U), X = G.startContainer === L ? -1 : K.indexOf(U);
+        const K = Array.from(z.childNodes), Y = G.startContainer === z ? -1 : K.indexOf(U), X = G.startContainer === z ? -1 : K.indexOf(U);
         D([Y, G.startOffset, X, G.endOffset]);
       }
     }
   }, [F]);
   const j = useCallback(
-    function(L) {
-      const G = L.filter((K) => !!K.trim()), { current: H } = h;
+    function(z) {
+      const G = z.filter((K) => !!K.trim()), { current: H } = h;
       if (!H || !G)
         return;
       H.focus();
@@ -24074,25 +24078,25 @@ function TextArea(e) {
     },
     [b, M, T]
   ), R = useCallback(
-    function({ currentTarget: L }) {
-      S || (I(!0), D(getCurrentRange(L)), M(L));
+    function({ currentTarget: z }) {
+      S || (I(!0), D(getCurrentRange(z)), M(z));
     },
     [S, M]
-  ), O = useCallback(function({ currentTarget: L }) {
-    D(getCurrentRange(L));
-  }, []), $ = useCallback(function(L) {
-    L.key === "Enter" && L.preventDefault();
+  ), O = useCallback(function({ currentTarget: z }) {
+    D(getCurrentRange(z));
+  }, []), $ = useCallback(function(z) {
+    z.key === "Enter" && z.preventDefault();
   }, []), A = useCallback(function() {
     y(!0);
   }, []), E = useCallback(
-    ({ currentTarget: L }) => {
-      y(!1), I(!0), D(getCurrentRange(L)), M(L);
+    ({ currentTarget: z }) => {
+      y(!1), I(!0), D(getCurrentRange(z)), M(z);
     },
     [M]
-  ), z = useCallback(
-    function(L) {
-      L.preventDefault();
-      const G = L.clipboardData.getData("text/html") || L.clipboardData.getData("text"), H = sanitizeHTML(G, {
+  ), L = useCallback(
+    function(z) {
+      z.preventDefault();
+      const G = z.clipboardData.getData("text/html") || z.clipboardData.getData("text"), H = sanitizeHTML(G, {
         allowedTags: ["span"],
         allowedAttributes: {
           span: ["data-variable", "contenteditable"]
@@ -24109,7 +24113,7 @@ function TextArea(e) {
           }
         }
       }).replace(/\n/g, " ");
-      I(!0), pasteHTML(L.currentTarget, H), D(getCurrentRange(L.currentTarget)), M(L.currentTarget);
+      I(!0), pasteHTML(z.currentTarget, H), D(getCurrentRange(z.currentTarget)), M(z.currentTarget);
     },
     [M]
   ), V = e.disabled || C.disabled;
@@ -24164,7 +24168,7 @@ function TextArea(e) {
                 onInput: R,
                 onBlur: O,
                 onKeyDown: $,
-                onPaste: z,
+                onPaste: L,
                 onCompositionStart: A,
                 onCompositionEnd: E,
                 placeholder: e.placeholder,
@@ -27162,26 +27166,26 @@ https://requirejs.org/docs/errors.html#` + e);
       config: {}
     }, l = {}, c = {}, u = {}, d = [], p = {}, m = {}, h = {}, g = 1, f = 1;
     function C(A) {
-      var E, z;
+      var E, L;
       for (E = 0; E < A.length; E++)
-        if (z = A[E], z === ".")
+        if (L = A[E], L === ".")
           A.splice(E, 1), E -= 1;
-        else if (z === "..") {
+        else if (L === "..") {
           if (E === 0 || E === 1 && A[2] === ".." || A[E - 1] === "..")
             continue;
           E > 0 && (A.splice(E - 1, 2), E -= 2);
         }
     }
-    function b(A, E, z) {
-      var V, L, G, H, U, K, Y, X, J, Z, Q, ne, ee = E && E.split("/"), re = i.map, de = re && re["*"];
-      if (A && (A = A.split("/"), Y = A.length - 1, i.nodeIdCompat && jsSuffixRegExp.test(A[Y]) && (A[Y] = A[Y].replace(jsSuffixRegExp, "")), A[0].charAt(0) === "." && ee && (ne = ee.slice(0, ee.length - 1), A = ne.concat(A)), C(A), A = A.join("/")), z && re && (ee || de)) {
+    function b(A, E, L) {
+      var V, z, G, H, U, K, Y, X, J, Z, Q, ne, ee = E && E.split("/"), re = i.map, de = re && re["*"];
+      if (A && (A = A.split("/"), Y = A.length - 1, i.nodeIdCompat && jsSuffixRegExp.test(A[Y]) && (A[Y] = A[Y].replace(jsSuffixRegExp, "")), A[0].charAt(0) === "." && ee && (ne = ee.slice(0, ee.length - 1), A = ne.concat(A)), C(A), A = A.join("/")), L && re && (ee || de)) {
         G = A.split("/");
         e:
           for (H = G.length; H > 0; H -= 1) {
             if (K = G.slice(0, H).join("/"), ee) {
               for (U = ee.length; U > 0; U -= 1)
-                if (L = getOwn(re, ee.slice(0, U).join("/")), L && (L = getOwn(L, K), L)) {
-                  X = L, J = H;
+                if (z = getOwn(re, ee.slice(0, U).join("/")), z && (z = getOwn(z, K), z)) {
+                  X = z, J = H;
                   break e;
                 }
             }
@@ -27205,36 +27209,36 @@ https://requirejs.org/docs/errors.html#` + e);
         })([A]), !0;
     }
     function v(A) {
-      var E, z = A ? A.indexOf("!") : -1;
-      return z > -1 && (E = A.substring(0, z), A = A.substring(z + 1, A.length)), [E, A];
+      var E, L = A ? A.indexOf("!") : -1;
+      return L > -1 && (E = A.substring(0, L), A = A.substring(L + 1, A.length)), [E, A];
     }
-    function I(A, E, z, V) {
-      var L, G, H, U, K = null, Y = E ? E.name : null, X = A, J = !0, Z = "";
-      return A || (J = !1, A = "_@r" + (g += 1)), U = v(A), K = U[0], A = U[1], K && (K = b(K, Y, V), G = getOwn(p, K)), A && (K ? z ? Z = A : G && G.normalize ? Z = G.normalize(A, function(Q) {
+    function I(A, E, L, V) {
+      var z, G, H, U, K = null, Y = E ? E.name : null, X = A, J = !0, Z = "";
+      return A || (J = !1, A = "_@r" + (g += 1)), U = v(A), K = U[0], A = U[1], K && (K = b(K, Y, V), G = getOwn(p, K)), A && (K ? L ? Z = A : G && G.normalize ? Z = G.normalize(A, function(Q) {
         return b(Q, Y, V);
-      }) : Z = A.indexOf("!") === -1 ? b(A, Y, V) : A : (Z = b(A, Y, V), U = v(Z), K = U[0], Z = U[1], z = !0, L = o.nameToUrl(Z))), H = K && !G && !z ? "_unnormalized" + (f += 1) : "", {
+      }) : Z = A.indexOf("!") === -1 ? b(A, Y, V) : A : (Z = b(A, Y, V), U = v(Z), K = U[0], Z = U[1], L = !0, z = o.nameToUrl(Z))), H = K && !G && !L ? "_unnormalized" + (f += 1) : "", {
         prefix: K,
         name: Z,
         parentMap: E,
         unnormalized: !!H,
-        url: L,
+        url: z,
         originalName: X,
         isDefine: J,
         id: (K ? K + "!" + Z : Z) + H
       };
     }
     function F(A) {
-      var E = A.id, z = getOwn(l, E);
-      return z || (z = l[E] = new o.Module(A)), z;
+      var E = A.id, L = getOwn(l, E);
+      return L || (L = l[E] = new o.Module(A)), L;
     }
-    function w(A, E, z) {
-      var V = A.id, L = getOwn(l, V);
-      hasProp(p, V) && (!L || L.defineEmitComplete) ? E === "defined" && z(p[V]) : (L = F(A), L.error && E === "error" ? z(L.error) : L.on(E, z));
+    function w(A, E, L) {
+      var V = A.id, z = getOwn(l, V);
+      hasProp(p, V) && (!z || z.defineEmitComplete) ? E === "defined" && L(p[V]) : (z = F(A), z.error && E === "error" ? L(z.error) : z.on(E, L));
     }
     function T(A, E) {
-      var z = A.requireModules, V = !1;
-      E ? E(A) : (each(z, function(L) {
-        var G = getOwn(l, L);
+      var L = A.requireModules, V = !1;
+      E ? E(A) : (each(L, function(z) {
+        var G = getOwn(l, z);
         G && (G.error = A, G.events.error && (V = !0, G.emit("error", A)));
       }), V || req.onError(A));
     }
@@ -27266,26 +27270,26 @@ https://requirejs.org/docs/errors.html#` + e);
     function B(A) {
       delete l[A], delete c[A];
     }
-    function N(A, E, z) {
+    function N(A, E, L) {
       var V = A.map.id;
-      A.error ? A.emit("error", A.error) : (E[V] = !0, each(A.depMaps, function(L, G) {
-        var H = L.id, U = getOwn(l, H);
-        U && !A.depMatched[G] && !z[H] && (getOwn(E, H) ? (A.defineDep(G, p[H]), A.check()) : N(U, E, z));
-      }), z[V] = !0);
+      A.error ? A.emit("error", A.error) : (E[V] = !0, each(A.depMaps, function(z, G) {
+        var H = z.id, U = getOwn(l, H);
+        U && !A.depMatched[G] && !L[H] && (getOwn(E, H) ? (A.defineDep(G, p[H]), A.check()) : N(U, E, L));
+      }), L[V] = !0);
     }
     function M() {
-      var A, E, z = i.waitSeconds * 1e3, V = z && o.startTime + z < (/* @__PURE__ */ new Date()).getTime(), L = [], G = [], H = !1, U = !0;
+      var A, E, L = i.waitSeconds * 1e3, V = L && o.startTime + L < (/* @__PURE__ */ new Date()).getTime(), z = [], G = [], H = !1, U = !0;
       if (!t) {
         if (t = !0, eachProp(c, function(K) {
           var Y = K.map, X = Y.id;
           if (K.enabled && (Y.isDefine || G.push(K), !K.error)) {
             if (!K.inited && V)
-              y(X) ? (E = !0, H = !0) : (L.push(X), S(X));
+              y(X) ? (E = !0, H = !0) : (z.push(X), S(X));
             else if (!K.inited && K.fetched && Y.isDefine && (H = !0, !Y.prefix))
               return U = !1;
           }
-        }), V && L.length)
-          return A = makeError("timeout", "Load timeout for modules: " + L, null, L), A.contextName = o.contextName, T(A);
+        }), V && z.length)
+          return A = makeError("timeout", "Load timeout for modules: " + z, null, z), A.contextName = o.contextName, T(A);
         U && each(G, function(K) {
           N(K, {}, {});
         }), (!V || E) && H && (isBrowser || isWebWorker) && !a && (a = setTimeout(function() {
@@ -27296,10 +27300,10 @@ https://requirejs.org/docs/errors.html#` + e);
     n = function(A) {
       this.events = getOwn(u, A.id) || {}, this.map = A, this.shim = getOwn(i.shim, A.id), this.depExports = [], this.depMaps = [], this.depMatched = [], this.pluginMaps = {}, this.depCount = 0;
     }, n.prototype = {
-      init: function(A, E, z, V) {
-        V = V || {}, !this.inited && (this.factory = E, z ? this.on("error", z) : this.events.error && (z = bind(this, function(L) {
-          this.emit("error", L);
-        })), this.depMaps = A && A.slice(0), this.errback = z, this.inited = !0, this.ignore = V.ignore, V.enabled || this.enabled ? this.enable() : this.check());
+      init: function(A, E, L, V) {
+        V = V || {}, !this.inited && (this.factory = E, L ? this.on("error", L) : this.events.error && (L = bind(this, function(z) {
+          this.emit("error", z);
+        })), this.depMaps = A && A.slice(0), this.errback = L, this.inited = !0, this.ignore = V.ignore, V.enabled || this.enabled ? this.enable() : this.check());
       },
       defineDep: function(A, E) {
         this.depMatched[A] || (this.depMatched[A] = !0, this.depCount -= 1, this.depExports[A] = E);
@@ -27328,9 +27332,9 @@ https://requirejs.org/docs/errors.html#` + e);
        */
       check: function() {
         if (!(!this.enabled || this.enabling)) {
-          var A, E, z = this.map.id, V = this.depExports, L = this.exports, G = this.factory;
+          var A, E, L = this.map.id, V = this.depExports, z = this.exports, G = this.factory;
           if (!this.inited)
-            hasProp(o.defQueueMap, z) || this.fetch();
+            hasProp(o.defQueueMap, L) || this.fetch();
           else if (this.error)
             this.emit("error", this.error);
           else if (!this.defining) {
@@ -27338,32 +27342,32 @@ https://requirejs.org/docs/errors.html#` + e);
               if (isFunction(G)) {
                 if (this.events.error && this.map.isDefine || req.onError !== defaultOnError)
                   try {
-                    L = o.execCb(z, G, V, L);
+                    z = o.execCb(L, G, V, z);
                   } catch (U) {
                     A = U;
                   }
                 else
-                  L = o.execCb(z, G, V, L);
-                if (this.map.isDefine && L === void 0 && (E = this.module, E ? L = E.exports : this.usingExports && (L = this.exports)), A)
+                  z = o.execCb(L, G, V, z);
+                if (this.map.isDefine && z === void 0 && (E = this.module, E ? z = E.exports : this.usingExports && (z = this.exports)), A)
                   return A.requireMap = this.map, A.requireModules = this.map.isDefine ? [this.map.id] : null, A.requireType = this.map.isDefine ? "define" : "require", T(this.error = A);
               } else
-                L = G;
-              if (this.exports = L, this.map.isDefine && !this.ignore && (p[z] = L, req.onResourceLoad)) {
+                z = G;
+              if (this.exports = z, this.map.isDefine && !this.ignore && (p[L] = z, req.onResourceLoad)) {
                 var H = [];
                 each(this.depMaps, function(U) {
                   H.push(U.normalizedMap || U);
                 }), req.onResourceLoad(o, this.map, H);
               }
-              B(z), this.defined = !0;
+              B(L), this.defined = !0;
             }
             this.defining = !1, this.defined && !this.defineEmitted && (this.defineEmitted = !0, this.emit("defined", this.exports), this.defineEmitComplete = !0);
           }
         }
       },
       callPlugin: function() {
-        var A = this.map, E = A.id, z = I(A.prefix);
-        this.depMaps.push(z), w(z, "defined", bind(this, function(V) {
-          var L, G, H, U = getOwn(h, this.map.id), K = this.map.name, Y = this.map.parentMap ? this.map.parentMap.name : null, X = o.makeRequire(A.parentMap, {
+        var A = this.map, E = A.id, L = I(A.prefix);
+        this.depMaps.push(L), w(L, "defined", bind(this, function(V) {
+          var z, G, H, U = getOwn(h, this.map.id), K = this.map.name, Y = this.map.parentMap ? this.map.parentMap.name : null, X = o.makeRequire(A.parentMap, {
             enableBuildCallback: !0
           });
           if (this.map.unnormalized) {
@@ -27393,17 +27397,17 @@ https://requirejs.org/docs/errors.html#` + e);
             this.map.url = o.nameToUrl(U), this.load();
             return;
           }
-          L = bind(this, function(J) {
+          z = bind(this, function(J) {
             this.init([], function() {
               return J;
             }, null, {
               enabled: !0
             });
-          }), L.error = bind(this, function(J) {
+          }), z.error = bind(this, function(J) {
             this.inited = !0, this.error = J, J.requireModules = [E], eachProp(l, function(Z) {
               Z.map.id.indexOf(E + "_unnormalized") === 0 && B(Z.map.id);
             }), T(J);
-          }), L.fromText = bind(this, function(J, Z) {
+          }), z.fromText = bind(this, function(J, Z) {
             var Q = A.name, ne = I(Q), ee = useInteractive;
             Z && (J = Z), ee && (useInteractive = !1), F(ne), hasProp(i.config, E) && (i.config[Q] = i.config[E]);
             try {
@@ -27416,21 +27420,21 @@ https://requirejs.org/docs/errors.html#` + e);
                 [E]
               ));
             }
-            ee && (useInteractive = !0), this.depMaps.push(ne), o.completeLoad(Q), X([Q], L);
-          }), V.load(A.name, X, L, i);
-        })), o.enable(z, this), this.pluginMaps[z.id] = z;
+            ee && (useInteractive = !0), this.depMaps.push(ne), o.completeLoad(Q), X([Q], z);
+          }), V.load(A.name, X, z, i);
+        })), o.enable(L, this), this.pluginMaps[L.id] = L;
       },
       enable: function() {
         c[this.map.id] = this, this.enabled = !0, this.enabling = !0, each(this.depMaps, bind(this, function(A, E) {
-          var z, V, L;
+          var L, V, z;
           if (typeof A == "string") {
             if (A = I(
               A,
               this.map.isDefine ? this.map : this.map.parentMap,
               !1,
               !this.skipMap
-            ), this.depMaps[E] = A, L = getOwn(r, A.id), L) {
-              this.depExports[E] = L(this);
+            ), this.depMaps[E] = A, z = getOwn(r, A.id), z) {
+              this.depExports[E] = z(this);
               return;
             }
             this.depCount += 1, w(A, "defined", bind(this, function(G) {
@@ -27439,27 +27443,27 @@ https://requirejs.org/docs/errors.html#` + e);
               this.emit("error", G);
             }));
           }
-          z = A.id, V = l[z], !hasProp(r, z) && V && !V.enabled && o.enable(A, this);
+          L = A.id, V = l[L], !hasProp(r, L) && V && !V.enabled && o.enable(A, this);
         })), eachProp(this.pluginMaps, bind(this, function(A) {
           var E = getOwn(l, A.id);
           E && !E.enabled && o.enable(A, this);
         })), this.enabling = !1, this.check();
       },
       on: function(A, E) {
-        var z = this.events[A];
-        z || (z = this.events[A] = []), z.push(E);
+        var L = this.events[A];
+        L || (L = this.events[A] = []), L.push(E);
       },
       emit: function(A, E) {
-        each(this.events[A], function(z) {
-          z(E);
+        each(this.events[A], function(L) {
+          L(E);
         }), A === "error" && delete this.events[A];
       }
     };
     function j(A) {
       hasProp(p, A[0]) || F(I(A[0], null, !0)).init(A[1], A[2]);
     }
-    function R(A, E, z, V) {
-      A.detachEvent && !isOpera ? V && A.detachEvent(V, E) : A.removeEventListener(z, E, !1);
+    function R(A, E, L, V) {
+      A.detachEvent && !isOpera ? V && A.detachEvent(V, E) : A.removeEventListener(L, E, !1);
     }
     function O(A) {
       var E = A.currentTarget || A.srcElement;
@@ -27496,51 +27500,51 @@ https://requirejs.org/docs/errors.html#` + e);
       configure: function(A) {
         if (A.baseUrl && A.baseUrl.charAt(A.baseUrl.length - 1) !== "/" && (A.baseUrl += "/"), typeof A.urlArgs == "string") {
           var E = A.urlArgs;
-          A.urlArgs = function(L, G) {
+          A.urlArgs = function(z, G) {
             return (G.indexOf("?") === -1 ? "?" : "&") + E;
           };
         }
-        var z = i.shim, V = {
+        var L = i.shim, V = {
           paths: !0,
           bundles: !0,
           config: !0,
           map: !0
         };
-        eachProp(A, function(L, G) {
-          V[G] ? (i[G] || (i[G] = {}), mixin(i[G], L, !0, !0)) : i[G] = L;
-        }), A.bundles && eachProp(A.bundles, function(L, G) {
-          each(L, function(H) {
+        eachProp(A, function(z, G) {
+          V[G] ? (i[G] || (i[G] = {}), mixin(i[G], z, !0, !0)) : i[G] = z;
+        }), A.bundles && eachProp(A.bundles, function(z, G) {
+          each(z, function(H) {
             H !== G && (h[H] = G);
           });
-        }), A.shim && (eachProp(A.shim, function(L, G) {
-          isArray(L) && (L = {
-            deps: L
-          }), (L.exports || L.init) && !L.exportsFn && (L.exportsFn = o.makeShimExports(L)), z[G] = L;
-        }), i.shim = z), A.packages && each(A.packages, function(L) {
+        }), A.shim && (eachProp(A.shim, function(z, G) {
+          isArray(z) && (z = {
+            deps: z
+          }), (z.exports || z.init) && !z.exportsFn && (z.exportsFn = o.makeShimExports(z)), L[G] = z;
+        }), i.shim = L), A.packages && each(A.packages, function(z) {
           var G, H;
-          L = typeof L == "string" ? { name: L } : L, H = L.name, G = L.location, G && (i.paths[H] = L.location), i.pkgs[H] = L.name + "/" + (L.main || "main").replace(currDirRegExp, "").replace(jsSuffixRegExp, "");
-        }), eachProp(l, function(L, G) {
-          !L.inited && !L.map.unnormalized && (L.map = I(G, null, !0));
+          z = typeof z == "string" ? { name: z } : z, H = z.name, G = z.location, G && (i.paths[H] = z.location), i.pkgs[H] = z.name + "/" + (z.main || "main").replace(currDirRegExp, "").replace(jsSuffixRegExp, "");
+        }), eachProp(l, function(z, G) {
+          !z.inited && !z.map.unnormalized && (z.map = I(G, null, !0));
         }), (A.deps || A.callback) && o.require(A.deps || [], A.callback);
       },
       makeShimExports: function(A) {
         function E() {
-          var z;
-          return A.init && (z = A.init.apply(global, arguments)), z || A.exports && getGlobal(A.exports);
+          var L;
+          return A.init && (L = A.init.apply(global, arguments)), L || A.exports && getGlobal(A.exports);
         }
         return E;
       },
       makeRequire: function(A, E) {
         E = E || {};
-        function z(V, L, G) {
+        function L(V, z, G) {
           var H, U, K;
-          return E.enableBuildCallback && L && isFunction(L) && (L.__requireJsBuild = !0), typeof V == "string" ? isFunction(L) ? T(makeError("requireargs", "Invalid require call"), G) : A && hasProp(r, V) ? r[V](l[A.id]) : req.get ? req.get(o, V, A, z) : (U = I(V, A, !1, !0), H = U.id, hasProp(p, H) ? p[H] : T(makeError("notloaded", 'Module name "' + H + '" has not been loaded yet for context: ' + e + (A ? "" : ". Use require([])")))) : ($(), o.nextTick(function() {
-            $(), K = F(I(null, A)), K.skipMap = E.skipMap, K.init(V, L, G, {
+          return E.enableBuildCallback && z && isFunction(z) && (z.__requireJsBuild = !0), typeof V == "string" ? isFunction(z) ? T(makeError("requireargs", "Invalid require call"), G) : A && hasProp(r, V) ? r[V](l[A.id]) : req.get ? req.get(o, V, A, L) : (U = I(V, A, !1, !0), H = U.id, hasProp(p, H) ? p[H] : T(makeError("notloaded", 'Module name "' + H + '" has not been loaded yet for context: ' + e + (A ? "" : ". Use require([])")))) : ($(), o.nextTick(function() {
+            $(), K = F(I(null, A)), K.skipMap = E.skipMap, K.init(V, z, G, {
               enabled: !0
             }), M();
-          }), z);
+          }), L);
         }
-        return mixin(z, {
+        return mixin(L, {
           isBrowser,
           /**
            * Converts a module name + .extension into an URL path.
@@ -27548,12 +27552,12 @@ https://requirejs.org/docs/errors.html#` + e);
            * plain URLs like nameToUrl.
            */
           toUrl: function(V) {
-            var L, G = V.lastIndexOf("."), H = V.split("/")[0], U = H === "." || H === "..";
-            return G !== -1 && (!U || G > 1) && (L = V.substring(G, V.length), V = V.substring(0, G)), o.nameToUrl(b(
+            var z, G = V.lastIndexOf("."), H = V.split("/")[0], U = H === "." || H === "..";
+            return G !== -1 && (!U || G > 1) && (z = V.substring(G, V.length), V = V.substring(0, G)), o.nameToUrl(b(
               V,
               A && A.id,
               !0
-            ), L, !0);
+            ), z, !0);
           },
           defined: function(V) {
             return hasProp(p, I(V, A, !1, !0).id);
@@ -27561,13 +27565,13 @@ https://requirejs.org/docs/errors.html#` + e);
           specified: function(V) {
             return V = I(V, A, !1, !0).id, hasProp(p, V) || hasProp(l, V);
           }
-        }), A || (z.undef = function(V) {
+        }), A || (L.undef = function(V) {
           D();
-          var L = I(V, A, !0), G = getOwn(l, V);
-          G.undefed = !0, S(V), delete p[V], delete m[L.url], delete u[V], eachReverse(d, function(H, U) {
+          var z = I(V, A, !0), G = getOwn(l, V);
+          G.undefed = !0, S(V), delete p[V], delete m[z.url], delete u[V], eachReverse(d, function(H, U) {
             H[0] === V && d.splice(U, 1);
           }), delete o.defQueueMap[V], G && (G.events.defined && (u[V] = G.events), B(V));
-        }), z;
+        }), L;
       },
       /**
        * Called to enable a module if it is still in the registry
@@ -27586,15 +27590,15 @@ https://requirejs.org/docs/errors.html#` + e);
        * @param {String} moduleName the name of the module to potentially complete.
        */
       completeLoad: function(A) {
-        var E, z, V, L = getOwn(i.shim, A) || {}, G = L.exports;
+        var E, L, V, z = getOwn(i.shim, A) || {}, G = z.exports;
         for (D(); d.length; ) {
-          if (z = d.shift(), z[0] === null) {
-            if (z[0] = A, E)
+          if (L = d.shift(), L[0] === null) {
+            if (L[0] = A, E)
               break;
             E = !0;
           } else
-            z[0] === A && (E = !0);
-          j(z);
+            L[0] === A && (E = !0);
+          j(L);
         }
         if (o.defQueueMap = {}, V = getOwn(l, A), !E && !hasProp(p, A) && V && !V.inited) {
           if (i.enforceDefine && (!G || !getGlobal(G)))
@@ -27604,7 +27608,7 @@ https://requirejs.org/docs/errors.html#` + e);
               null,
               [A]
             ));
-          j([A, L.deps || [], L.exportsFn]);
+          j([A, z.deps || [], z.exportsFn]);
         }
         M();
       },
@@ -27615,19 +27619,19 @@ 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(A, E, z) {
-        var V, L, G, H, U, K, Y, X = getOwn(i.pkgs, A);
+      nameToUrl: function(A, E, L) {
+        var V, z, G, H, U, K, Y, X = getOwn(i.pkgs, A);
         if (X && (A = X), Y = getOwn(h, A), Y)
-          return o.nameToUrl(Y, E, z);
+          return o.nameToUrl(Y, E, L);
         if (req.jsExtRegExp.test(A))
           U = A + (E || "");
         else {
-          for (V = i.paths, L = A.split("/"), G = L.length; G > 0; G -= 1)
-            if (H = L.slice(0, G).join("/"), K = getOwn(V, H), K) {
-              isArray(K) && (K = K[0]), L.splice(0, G, K);
+          for (V = i.paths, z = A.split("/"), G = z.length; G > 0; G -= 1)
+            if (H = z.slice(0, G).join("/"), K = getOwn(V, H), K) {
+              isArray(K) && (K = K[0]), z.splice(0, G, K);
               break;
             }
-          U = L.join("/"), U += E || (/^data\:|^blob\:|\?/.test(U) || z ? "" : ".js"), U = (U.charAt(0) === "/" || U.match(/^[\w\+\.\-]+:/) ? "" : i.baseUrl) + U;
+          U = z.join("/"), U += E || (/^data\:|^blob\:|\?/.test(U) || L ? "" : ".js"), U = (U.charAt(0) === "/" || U.match(/^[\w\+\.\-]+:/) ? "" : i.baseUrl) + U;
         }
         return i.urlArgs && !/^blob\:/.test(U) ? U + i.urlArgs(A, U) : U;
       },
@@ -27643,8 +27647,8 @@ https://requirejs.org/docs/errors.html#` + e);
        *
        * @private
        */
-      execCb: function(A, E, z, V) {
-        return E.apply(V, z);
+      execCb: function(A, E, L, V) {
+        return E.apply(V, L);
       },
       /**
        * callback for script loads, used to check status of loading.
@@ -27665,13 +27669,13 @@ https://requirejs.org/docs/errors.html#` + e);
       onScriptError: function(A) {
         var E = O(A);
         if (!y(E.id)) {
-          var z = [];
-          return eachProp(l, function(V, L) {
-            L.indexOf("_@r") !== 0 && each(V.depMaps, function(G) {
+          var L = [];
+          return eachProp(l, function(V, z) {
+            z.indexOf("_@r") !== 0 && each(V.depMaps, function(G) {
               if (G.id === E.id)
-                return z.push(L), !0;
+                return L.push(z), !0;
             });
-          }), T(makeError("scripterror", 'Script error for "' + E.id + (z.length ? '", needed by: ' + z.join(", ") : '"'), A, [E.id]));
+          }), T(makeError("scripterror", 'Script error for "' + E.id + (L.length ? '", needed by: ' + L.join(", ") : '"'), A, [E.id]));
         }
       }
     }, o.require = o.makeRequire(), o;
@@ -29543,7 +29547,7 @@ const useCreateActionProps = () => {
             filterKeys: b,
             filterByTk: e,
             // TODO(refactor): should change to inject by plugin
-            triggerWorkflows: T != null && T.length ? T.map((z) => [z.workflowKey, z.context].filter(Boolean).join("!")).join(",") : void 0,
+            triggerWorkflows: T != null && T.length ? T.map((L) => [L.workflowKey, L.context].filter(Boolean).join("!")).join(",") : void 0,
             updateAssociationValues: g
           });
           let E = N;
@@ -29572,14 +29576,14 @@ const useCreateActionProps = () => {
   return {
     onClick() {
       return q(this, null, function* () {
-        var E, z, V, L, G, H;
+        var E, L, V, z, G, H;
         const w = u.map((U) => U.name), {
           assignedValues: T = {},
           onSuccess: D,
           overwriteValues: B,
           skipValidator: N,
           triggerWorkflows: M
-        } = (E = l == null ? void 0 : l["x-action-settings"]) != null ? E : {}, j = (z = a == null ? void 0 : a["x-component-props"]) == null ? void 0 : z.addChild, { successMessage: R } = D || {}, O = {}, $ = Object.keys(T).map((U) => q(this, null, function* () {
+        } = (E = l == null ? void 0 : l["x-action-settings"]) != null ? E : {}, j = (L = a == null ? void 0 : a["x-component-props"]) == null ? void 0 : L.addChild, { successMessage: R } = D || {}, O = {}, $ = Object.keys(T).map((U) => q(this, null, function* () {
           const K = T[U], Y = d(U);
           if (isVariable$1(K)) {
             const { value: X } = (yield C == null ? void 0 : C.parseVariable(K, b)) || {};
@@ -29599,7 +29603,7 @@ const useCreateActionProps = () => {
         });
         if (j) {
           const U = p();
-          A[(V = U == null ? void 0 : U.name) != null ? V : "parent"] = f, A[(L = U == null ? void 0 : U.foreignKey) != null ? L : "parentId"] = f.id;
+          A[(V = U == null ? void 0 : U.name) != null ? V : "parent"] = f, A[(z = U == null ? void 0 : U.foreignKey) != null ? z : "parentId"] = f.id;
         }
         c.data = t.data || {}, c.data.loading = !0;
         try {
@@ -29729,12 +29733,12 @@ const useCreateActionProps = () => {
           successMessage: B,
           actionAfterSuccess: N
         } = v || {}, M = {}, j = Object.keys(y).map((E) => q(this, null, function* () {
-          const z = y[E], V = g(E);
-          if (isVariable$1(z)) {
-            const { value: L } = (yield p == null ? void 0 : p.parseVariable(z, m)) || {};
-            M[E] = transformVariableValue(L, { targetCollectionField: V });
+          const L = y[E], V = g(E);
+          if (isVariable$1(L)) {
+            const { value: z } = (yield p == null ? void 0 : p.parseVariable(L, m)) || {};
+            M[E] = transformVariableValue(z, { targetCollectionField: V });
           } else
-            z !== "" && (M[E] = z);
+            L !== "" && (M[E] = L);
         }));
         if (yield Promise.all(j), I === !1 && (yield u.submit()), i.data = i.data || {}, !i.data.loading) {
           i.data.loading = !0;
@@ -29745,8 +29749,8 @@ const useCreateActionProps = () => {
               // TODO(refactor): should change to inject by plugin
               triggerWorkflows: F != null && F.length ? F.map((V) => [V.workflowKey, V.context].filter(Boolean).join("!")).join(",") : void 0
             });
-            let z = D;
-            if (D && (z = yield getVariableValue(D, {
+            let L = D;
+            if (D && (L = yield getVariableValue(D, {
               variables: p,
               localVariables: [...m, { name: "$record", ctx: new Proxy((O = E == null ? void 0 : E.data) == null ? void 0 : O.data, {}) }]
             })), (N === "previous" || !N && T !== !0) && (f == null || f(!1)), S && (S == null || S()), e instanceof TableFieldResource || (A = ($ = t == null ? void 0 : t.service) == null ? void 0 : $.refresh) == null || A.call($), !B)
@@ -29754,9 +29758,9 @@ const useCreateActionProps = () => {
             w ? d.success({
               title: c(B),
               onOk: () => q(this, null, function* () {
-                (T && !N || N === "redirect") && z && (isURL(z) ? window.location.href = z : l(z));
+                (T && !N || N === "redirect") && L && (isURL(L) ? window.location.href = L : l(L));
               })
-            }) : (message.success(c(B)), (T && !N || N === "redirect") && z && (isURL(z) ? window.location.href = z : l(z)));
+            }) : (message.success(c(B)), (T && !N || N === "redirect") && L && (isURL(L) ? window.location.href = L : l(L)));
           } catch (E) {
             console.error(E);
           } finally {
@@ -29782,12 +29786,12 @@ const useCreateActionProps = () => {
         } = (E = a == null ? void 0 : a["x-action-settings"]) != null ? E : {}, { manualClose: N, redirecting: M, redirectTo: j, successMessage: R, actionAfterSuccess: O } = D || {};
         m.data = e.data || {}, m.data.loading = !0;
         const $ = {}, A = Object.keys(T).map((V) => q(this, null, function* () {
-          const L = T[V], G = C(V);
-          if (isVariable$1(L)) {
-            const { value: H } = (yield g == null ? void 0 : g.parseVariable(L, b)) || {};
+          const z = T[V], G = C(V);
+          if (isVariable$1(z)) {
+            const { value: H } = (yield g == null ? void 0 : g.parseVariable(z, b)) || {};
             $[V] = transformVariableValue(H, { targetCollectionField: G });
           } else
-            L !== "" && ($[V] = L);
+            z !== "" && ($[V] = z);
         }));
         yield Promise.all(A), (O === "previous" || !O && M !== !0) && (S == null || S(!1)), h.confirm({
           title: p("Bulk update"),
@@ -29795,7 +29799,7 @@ const useCreateActionProps = () => {
           onOk() {
             return q(this, null, function* () {
               var G, H, U, K;
-              const { filter: V } = (H = (G = o.params) == null ? void 0 : G[0]) != null ? H : {}, L = {
+              const { filter: V } = (H = (G = o.params) == null ? void 0 : G[0]) != null ? H : {}, z = {
                 values: x({}, $),
                 filter: V,
                 forceUpdate: !1
@@ -29805,11 +29809,11 @@ const useCreateActionProps = () => {
                   message.error(p("Please select the records to be updated")), m.data.loading = !1;
                   return;
                 }
-                L.filter = { $and: [{ [l || "id"]: { $in: c } }] };
+                z.filter = { $and: [{ [l || "id"]: { $in: c } }] };
               }
-              L.filter || (L.forceUpdate = !0);
+              z.filter || (z.forceUpdate = !0);
               try {
-                yield t.update(L);
+                yield t.update(z);
               } catch (Y) {
               } finally {
                 m.data.loading = !1;
@@ -29837,7 +29841,7 @@ const useCreateActionProps = () => {
   return {
     onClick() {
       return q(this, null, function* () {
-        var V, L, G, H;
+        var V, z, G, H;
         const { skipValidator: F, onSuccess: w, requestSettings: T } = (V = o == null ? void 0 : o["x-action-settings"]) != null ? V : {}, { manualClose: D, redirecting: B, redirectTo: N, successMessage: M, actionAfterSuccess: j } = w || {}, R = o == null ? void 0 : o["x-action"];
         if (!T.url)
           return;
@@ -29855,7 +29859,7 @@ const useCreateActionProps = () => {
           });
           Object.assign(A, K);
         }
-        const z = {
+        const L = {
           url: renderTemplate(T.url, { currentRecord: m, currentUser: g }),
           method: T.method,
           headers: parse(O)({ currentRecord: m, currentUser: g }),
@@ -29864,7 +29868,7 @@ const useCreateActionProps = () => {
         };
         f.data = c.data || {}, f.data.loading = !0;
         try {
-          yield e.request(x({}, z)), f.data.loading = !1, u instanceof TableFieldResource || (G = (L = d == null ? void 0 : d.service) == null ? void 0 : L.refresh) == null || G.call(L), (H = p == null ? void 0 : p.refresh) == null || H.call(p), R === "customize:form:request" && (j === "previous" || !j && B !== !0) && (b == null || b(!1)), M || (message.success(C("Saved successfully")), yield resetFormCorrectly(a), (B && !j || j === "redirect") && N && (isURL(N) ? window.location.href = N : t(N))), D ? S.success({
+          yield e.request(x({}, L)), f.data.loading = !1, u instanceof TableFieldResource || (G = (z = d == null ? void 0 : d.service) == null ? void 0 : z.refresh) == null || G.call(z), (H = p == null ? void 0 : p.refresh) == null || H.call(p), R === "customize:form:request" && (j === "previous" || !j && B !== !0) && (b == null || b(!1)), M || (message.success(C("Saved successfully")), yield resetFormCorrectly(a), (B && !j || j === "redirect") && N && (isURL(N) ? window.location.href = N : t(N))), D ? S.success({
             title: r(M),
             onOk: () => q(this, null, function* () {
               (B && !j || j === "redirect") && N && (isURL(N) ? window.location.href = N : t(N));
@@ -29881,14 +29885,14 @@ const useCreateActionProps = () => {
   return {
     onClick(I, F) {
       return q(this, null, function* () {
-        var L, G;
+        var z, G;
         const {
           assignedValues: w = {},
           onSuccess: T,
           overwriteValues: D,
           skipValidator: B,
           triggerWorkflows: N
-        } = (L = l == null ? void 0 : l["x-action-settings"]) != null ? L : {}, {
+        } = (z = l == null ? void 0 : l["x-action-settings"]) != null ? z : {}, {
           manualClose: M,
           redirecting: j,
           redirectTo: R,
@@ -29903,11 +29907,11 @@ const useCreateActionProps = () => {
             U !== "" && (A[H] = U);
         }));
         yield Promise.all(E), B || (yield e.submit());
-        const z = u.map((H) => H.name), V = getFormValues({
+        const L = u.map((H) => H.name), V = getFormValues({
           filterByTk: t,
           field: n,
           form: e,
-          fieldNames: z,
+          fieldNames: L,
           getField: d,
           resource: o,
           actionFields: (y == null ? void 0 : y("form")) || []
@@ -30278,25 +30282,25 @@ const useCreateActionProps = () => {
         var H, U, K, Y;
         if (!O.find((X) => X.uid === A.uid))
           return;
-        const z = `${$}${t.name}`, V = ((H = A.service.params) == null ? void 0 : H[0]) || {};
+        const L = `${$}${t.name}`, V = ((H = A.service.params) == null ? void 0 : H[0]) || {};
         (K = (U = A.service.params) == null ? void 0 : U[1]) != null && K.filters || _.set(A.service.params, "[1].filters", {});
-        const L = A.service.params[1].filters;
+        const z = A.service.params[1].filters;
         if (R.length)
-          L[z] = {
+          z[L] = {
             [S]: R
           };
         else {
           if ((Y = A.clearSelection) == null || Y.call(A), A.dataLoadingMode === "manual")
             return A.clearData();
-          delete L[z];
+          delete z[L];
         }
-        const G = mergeFilter([...Object.values(L), A.defaultFilter]);
+        const G = mergeFilter([...Object.values(z), A.defaultFilter]);
         return A.doFilter(
           P(x({}, V), {
             page: 1,
             filter: G
           }),
-          { filters: L }
+          { filters: z }
         );
       });
     },
@@ -30318,7 +30322,7 @@ const useCreateActionProps = () => {
         p = $;
         return;
       }
-      p = $.filter((z) => z.label.includes(E));
+      p = $.filter((L) => L.label.includes(E));
     };
   } else
     S = `${r}.${C}.$in`, p = (f == null ? void 0 : f.data) || [], m = (R) => {
@@ -31088,16 +31092,65 @@ const DragHandler = (e) => {
 ], SmartDatePicker = (e) => {
   const r = e, { isRange: t, defaultValue: n } = r, o = W(r, ["isRange", "defaultValue"]);
   return t ? /* @__PURE__ */ jsx(DatePicker.RangePicker, x({}, o)) : /* @__PURE__ */ jsx(DatePicker.FilterWithPicker, x({}, o));
+}, normalizeRelativeDateValue = (e) => {
+  var n;
+  if (!e || !e.type || e.type === "exact")
+    return;
+  if (!["past", "next"].includes(e.type))
+    return {
+      type: e.type
+    };
+  const t = {
+    type: e.type,
+    number: e.number === void 0 ? 1 : e.number,
+    unit: (n = e.unit) != null ? n : "day"
+  };
+  return e.includeCurrent && (t.includeCurrent = !0), t;
 }, DateFilterDynamicComponent = (e) => {
-  const { value: t, onChange: n } = e, o = useCompile(), { t: r } = useTranslation(), { token: a } = theme.useToken(), [i, l] = useState(!1), c = (d) => {
-    if (l(!1), d === "exact")
+  const { value: t, onChange: n } = e, o = useCompile(), { t: r } = useTranslation(), { token: a } = theme.useToken(), [i, l] = useState(!1), c = useMemo(() => ({
+    day: r("Include today"),
+    hour: r("Include this hour"),
+    minute: r("Include this minute"),
+    week: r("Include this week"),
+    isoWeek: r("Include this week"),
+    month: r("Include this month"),
+    quarter: r("Include this quarter"),
+    year: r("Include this year")
+  })[(t == null ? void 0 : t.unit) || "day"], [r, t == null ? void 0 : t.unit]), u = useMemo(
+    () => P(x({}, e.style), {
+      width: "100%",
+      display: "flex",
+      alignItems: "center",
+      gap: a.marginSM
+    }),
+    [e.style, a.marginSM]
+  ), d = useMemo(
+    () => ({
+      flex: 1,
+      minWidth: 0
+    }),
+    []
+  ), p = useMemo(
+    () => ({
+      flexShrink: 0,
+      display: "inline-flex",
+      alignItems: "center",
+      minHeight: a.controlHeight,
+      marginInlineStart: a.marginXXS,
+      color: a.colorTextSecondary,
+      whiteSpace: "nowrap"
+    }),
+    [a]
+  ), m = (g) => {
+    var C, b;
+    if (l(!1), g === "exact")
       return n(void 0);
-    const p = {
-      type: d
-    };
-    ["past", "next"].includes(d) && (p.number = 1, p.unit = "day"), n(p);
-  }, u = () => {
-    const d = options.slice(0, 3), p = options.slice(3), m = css`
+    const f = normalizeRelativeDateValue({
+      type: g
+    });
+    ["past", "next"].includes(g) && (f.number = (t == null ? void 0 : t.type) === g && (C = t == null ? void 0 : t.number) != null ? C : 1, f.unit = (t == null ? void 0 : t.type) === g && (b = t == null ? void 0 : t.unit) != null ? b : "day", ((t == null ? void 0 : t.type) === "past" || (t == null ? void 0 : t.type) === "next") && (f.includeCurrent = t == null ? void 0 : t.includeCurrent)), n(f);
+  }, h = () => {
+    const g = options.slice(0, 3), f = options.slice(3), C = css`
       padding: 3px 10px;
       cursor: pointer;
       white-space: nowrap;
@@ -31108,77 +31161,102 @@ const DragHandler = (e) => {
       }
     `;
     return /* @__PURE__ */ jsxs("div", { style: { maxHeight: 300, overflowY: "auto" }, children: [
-      d.map((h) => /* @__PURE__ */ jsx("div", { role: "option", onClick: () => c(h.value), className: m, children: o(h.label) }, h.value)),
+      g.map((b) => /* @__PURE__ */ jsx("div", { role: "option", onClick: () => m(b.value), className: C, children: o(b.label) }, b.value)),
       /* @__PURE__ */ jsx(Divider$1, { style: { margin: "4px 0" } }),
-      p.map((h) => /* @__PURE__ */ jsx(
+      f.map((b) => /* @__PURE__ */ jsx(
         "div",
         {
           role: "option",
-          className: m,
-          onClick: () => c(h.value),
-          title: o(h.label),
-          children: o(h.label)
+          className: C,
+          onClick: () => m(b.value),
+          title: o(b.label),
+          children: o(b.label)
         },
-        h.value
+        b.value
       ))
     ] });
   };
-  return /* @__PURE__ */ jsxs(Space$1.Compact, { style: P(x({}, e.style), { width: "100%" }), children: [
-    /* @__PURE__ */ jsx(
-      Select$1,
-      P(x({
-        options: o(options),
-        open: i,
-        onDropdownVisibleChange: l
-      }, e), {
-        allowClear: !1,
-        style: {
-          width: "100%",
-          minWidth: 100,
-          maxWidth: ["past", "next", "exact", void 0].includes(t == null ? void 0 : t.type) ? 100 : null
-        },
-        value: (t == null ? void 0 : t.type) || "exact",
-        onChange: c,
-        dropdownRender: u
-      })
-    ),
-    ["past", "next"].includes(t == null ? void 0 : t.type) && [
-      /* @__PURE__ */ jsx(
-        InputNumber$1,
-        {
-          value: t == null ? void 0 : t.number,
-          onChange: (d) => {
-            const p = P(x({}, t), {
-              number: d
-            });
-            n(p);
-          }
-        },
-        "number"
-      ),
+  return /* @__PURE__ */ jsxs("div", { style: u, children: [
+    /* @__PURE__ */ jsxs(Space$1.Compact, { block: !0, style: d, children: [
       /* @__PURE__ */ jsx(
         Select$1,
-        {
-          value: t == null ? void 0 : t.unit,
-          style: { minWidth: 130, maxWidth: 140 },
-          onChange: (d) => {
-            const p = P(x({}, t), {
-              unit: d
-            });
-            n(p);
+        P(x({
+          "data-testid": "date-filter-type-select",
+          options: o(options),
+          open: i,
+          onDropdownVisibleChange: l
+        }, e), {
+          allowClear: !1,
+          style: {
+            width: "100%",
+            minWidth: 100,
+            maxWidth: ["past", "next", "exact", void 0].includes(t == null ? void 0 : t.type) ? 100 : null
           },
-          options: [
-            { value: "day", label: r("Day") },
-            { value: "week", label: r("Calendar week") },
-            { value: "month", label: r("Calendar Month") },
-            { value: "year", label: r("Calendar Year") }
-          ],
-          popupMatchSelectWidth: !0
+          value: (t == null ? void 0 : t.type) || "exact",
+          onChange: m,
+          dropdownRender: h
+        })
+      ),
+      ["past", "next"].includes(t == null ? void 0 : t.type) && [
+        /* @__PURE__ */ jsx(
+          InputNumber$1,
+          {
+            min: 1,
+            "data-testid": "date-filter-number-input",
+            value: t == null ? void 0 : t.number,
+            onChange: (g) => {
+              const f = normalizeRelativeDateValue(P(x({}, t), {
+                number: g
+              }));
+              n(f);
+            }
+          },
+          "number"
+        ),
+        /* @__PURE__ */ jsx(
+          Select$1,
+          {
+            "data-testid": "date-filter-unit-select",
+            value: t == null ? void 0 : t.unit,
+            style: { minWidth: 130, maxWidth: 140 },
+            onChange: (g) => {
+              const f = normalizeRelativeDateValue(P(x({}, t), {
+                unit: g
+              }));
+              n(f);
+            },
+            options: [
+              { value: "day", label: r("Day") },
+              { value: "hour", label: r("Hour") },
+              { value: "minute", label: r("Minute") },
+              { value: "week", label: r("Calendar week") },
+              { value: "month", label: r("Calendar Month") },
+              { value: "quarter", label: r("Calendar Quarter") },
+              { value: "year", label: r("Calendar Year") }
+            ],
+            popupMatchSelectWidth: !0
+          },
+          "unit"
+        )
+      ],
+      ((t == null ? void 0 : t.type) === "exact" || !(t != null && t.type)) && /* @__PURE__ */ jsx(SmartDatePicker, x({}, e))
+    ] }),
+    ["past", "next"].includes(t == null ? void 0 : t.type) && c ? /* @__PURE__ */ jsx(
+      Checkbox$1,
+      {
+        "data-testid": "include-current-checkbox",
+        style: p,
+        checked: !!(t != null && t.includeCurrent),
+        onChange: (g) => {
+          n(
+            normalizeRelativeDateValue(P(x({}, t), {
+              includeCurrent: g.target.checked || void 0
+            }))
+          );
         },
-        "unit"
-      )
-    ],
-    ((t == null ? void 0 : t.type) === "exact" || !(t != null && t.type)) && /* @__PURE__ */ jsx(SmartDatePicker, x({}, e))
+        children: c
+      }
+    ) : null
   ] });
 }, common = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
@@ -38103,10 +38181,10 @@ const enabledIndexColumn$1 = {
   name: "fieldSettings:component:CascadeSelect",
   items: [fieldComponent$6, titleField$1, ellipsisSettingsItem, setTheDataScope]
 }), SchemaSettingsDateRange = function e(t) {
-  var w, T, D, B, N, M, j, R, O, $, A, E, z, V, L, G;
+  var w, T, D, B, N, M, j, R, O, $, A, E, L, V, z, G;
   const { fieldSchema: n } = t, o = useField(), { dn: r } = useDesignable(), { t: a } = useTranslation(), { getCollectionJoinField: i } = useCollectionManager_deprecated(), { isInSubForm: l, isInSubTable: c } = useFlag() || {}, u = i(n == null ? void 0 : n["x-collection-field"]) || {}, d = ((w = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : w.showTime) || ((D = (T = u == null ? void 0 : u.uiSchema) == null ? void 0 : T["x-component-props"]) == null ? void 0 : D.showTime) || !1, p = ((B = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : B.dateFormat) || ((M = (N = u == null ? void 0 : u.uiSchema) == null ? void 0 : N["x-component-props"]) == null ? void 0 : M.dateFormat) || "YYYY-MM-DD", m = ((j = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : j.timeFormat) || ((O = (R = u == null ? void 0 : u.uiSchema) == null ? void 0 : R["x-component-props"]) == null ? void 0 : O.timeFormat) || "HH:mm:ss", h = (($ = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : $.picker) || ((E = (A = u == null ? void 0 : u.uiSchema) == null ? void 0 : A["x-component-props"]) == null ? void 0 : E.picker) || "date";
   n["x-read-pretty"] || o.readOnly || o.readPretty;
-  const g = (z = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : z._minDate, f = (V = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : V._maxDate, C = ((L = u == null ? void 0 : u.uiSchema) == null ? void 0 : L["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 = (L = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : L._minDate, f = (V = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : V._maxDate, C = ((z = u == null ? void 0 : u.uiSchema) == null ? void 0 : z["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(
     (H) => /* @__PURE__ */ jsx(
       SchemaComponent,
       {
@@ -39603,11 +39681,11 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
           };
         if (_.isFunction(F))
           break;
-        const A = y[$], E = y.slice(0, $ + 1).join("."), { fieldPath: z } = getFieldPath$1(E, I), V = r(z, T), L = (O = a(B, T)) == null ? void 0 : O.getPrimaryKey();
+        const A = y[$], E = y.slice(0, $ + 1).join("."), { fieldPath: L } = getFieldPath$1(E, I), V = r(L, T), z = (O = a(B, T)) == null ? void 0 : O.getPrimaryKey();
         if (Array.isArray(F)) {
           const G = F.map((H) => {
-            if (!(S != null && S.doNotRequest) && shouldToRequest(H == null ? void 0 : H[A], H, E) && (H == null ? void 0 : H[L]) != null && V != null && V.target) {
-              const U = `/${B}/${H[V.sourceKey || L]}/${A}:${getAction(V.type)}`;
+            if (!(S != null && S.doNotRequest) && shouldToRequest(H == null ? void 0 : H[A], H, E) && (H == null ? void 0 : H[z]) != null && V != null && V.target) {
+              const U = `/${B}/${H[V.sourceKey || z]}/${A}:${getAction(V.type)}`;
               if (hasRequested(U))
                 return getRequested(U);
               const K = o.request({
@@ -39622,8 +39700,8 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
             return H == null ? void 0 : H[A];
           });
           F = removeThroughCollectionFields(_.flatten(yield Promise.all(G)), V);
-        } else if (!(S != null && S.doNotRequest) && shouldToRequest(F[A], F, E) && F[L] != null && (V != null && V.target)) {
-          const G = `/${B}/${F[V.sourceKey || L]}/${A}:${getAction(V.type)}`;
+        } else if (!(S != null && S.doNotRequest) && shouldToRequest(F[A], F, E) && F[z] != null && (V != null && V.target)) {
+          const G = `/${B}/${F[V.sourceKey || z]}/${A}:${getAction(V.type)}`;
           let H = null;
           if (hasRequested(G))
             H = yield getRequested(G);
@@ -40236,7 +40314,7 @@ const ActionLink = withDynamicSchemaProps(
         return ((X = F == null ? void 0 : F["x-linkage-rules"]) == null ? void 0 : X.filter((J) => !J.disabled)) || [];
       },
       [F == null ? void 0 : F["x-linkage-rules"]]
-    ), { designable: N } = useDesignable(), M = useComponent(o) || o, j = useVariables$1(), R = useLocalVariables$1(), { visibleWithURL: O, setVisibleWithURL: $ } = usePopupUtils(), { setSubmitted: A } = useActionContext(), { getAriaLabel: E } = useGetAriaLabelOfAction(l), z = useCollectionParentRecordData(), V = useApp(), { getAllDataBlocks: L } = useAllDataBlocks(), G = useForm();
+    ), { designable: N } = useDesignable(), M = useComponent(o) || o, j = useVariables$1(), R = useLocalVariables$1(), { visibleWithURL: O, setVisibleWithURL: $ } = usePopupUtils(), { setSubmitted: A } = useActionContext(), { getAriaLabel: E } = useGetAriaLabelOfAction(l), L = useCollectionParentRecordData(), V = useApp(), { getAllDataBlocks: z } = useAllDataBlocks(), G = useForm();
     useEffect(() => {
       I.stateOfLinkageRules && setInitialActionState(I);
       const X = uid(), J = [];
@@ -40280,7 +40358,7 @@ const ActionLink = withDynamicSchemaProps(
       var Q, ne;
       yield c == null ? void 0 : c(X, J);
       const Z = ((ne = (Q = F["x-action-settings"]) == null ? void 0 : Q.onSuccess) == null ? void 0 : ne.blocksToRefresh) || [];
-      Z.length > 0 && L().forEach((ee) => {
+      Z.length > 0 && z().forEach((ee) => {
         var re;
         if (Z.includes(ee.uid))
           try {
@@ -40289,7 +40367,7 @@ const ActionLink = withDynamicSchemaProps(
             console.error("Failed to refresh block:", ee.uid, de);
           }
       });
-    })), [c, F, L]);
+    })), [c, F, z]);
     return /* @__PURE__ */ jsx(VariableScope, { scopeId: F == null ? void 0 : F["x-uid"], type: "action", children: /* @__PURE__ */ jsx(
       InternalAction,
       x({
@@ -40318,7 +40396,7 @@ const ActionLink = withDynamicSchemaProps(
         setVisibleWithURL: $,
         setSubmitted: A,
         getAriaLabel: E,
-        parentRecordData: z,
+        parentRecordData: L,
         actionCallback: h
       }, y)
     ) });
@@ -40382,7 +40460,7 @@ const ActionLink = withDynamicSchemaProps(
     "setSubmitted",
     "getAriaLabel",
     "parentRecordData"
-  ]), [R, O] = useState(!1), { wrapSSR: $, componentCls: A, hashId: E } = useStyles$8(), [z, V] = useState(!1), L = o["x-toolbar-props"] || o["x-designer-props"], G = (pe = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : pe.openMode, H = (ce = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : ce.openSize, U = (ge = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : ge.refreshDataBlockRequest, { modal: K } = App.useApp(), Y = useForm(), X = useACLActionParamsContext(), {
+  ]), [R, O] = useState(!1), { wrapSSR: $, componentCls: A, hashId: E } = useStyles$8(), [L, V] = useState(!1), z = o["x-toolbar-props"] || o["x-designer-props"], G = (pe = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : pe.openMode, H = (ce = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : ce.openSize, U = (ge = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : ge.refreshDataBlockRequest, { modal: K } = App.useApp(), Y = useForm(), X = useACLActionParamsContext(), {
     run: J,
     element: Z,
     disabled: Q,
@@ -40403,7 +40481,7 @@ const ActionLink = withDynamicSchemaProps(
     buttonStyle: re,
     handleMouseEnter: c,
     tarComponent: u,
-    designerProps: L,
+    designerProps: z,
     componentCls: A,
     hashId: E,
     className: d,
@@ -40433,7 +40511,7 @@ const ActionLink = withDynamicSchemaProps(
       button: RenderButton(de),
       visible: R || T,
       setVisible: se,
-      formValueChanged: z,
+      formValueChanged: L,
       setFormValueChanged: V,
       openMode: G,
       openSize: H,
@@ -40522,12 +40600,12 @@ const RenderButton = ({
   confirmTitle: D,
   title: B
 }) => {
-  const { getDataBlockRequest: N } = useDataBlockRequestGetter(), { t: M } = useTranslation(), { isPopupVisibleControlledByURL: j } = usePopupSettings(), { openPopup: R } = usePopupUtils(), O = useVariables$1(), $ = useLocalVariables$1(), A = useRef(null), E = useCompile(), z = useForm();
+  const { getDataBlockRequest: N } = useDataBlockRequestGetter(), { t: M } = useTranslation(), { isPopupVisibleControlledByURL: j } = usePopupSettings(), { openPopup: R } = usePopupUtils(), O = useVariables$1(), $ = useLocalVariables$1(), A = useRef(null), E = useCompile(), L = useForm();
   A.current = R;
   const V = {
     variables: O,
     localVariables: $
-  }, L = useCallback(
+  }, z = useCallback(
     (G, H = !0) => q(void 0, null, function* () {
       var Y, X;
       if (H && isPortalInBody(G.target))
@@ -40541,7 +40619,7 @@ const RenderButton = ({
             S !== !1 && (T == null || T(!0), (Q = (Z = N()) == null ? void 0 : Z.refresh) == null || Q.call(Z));
           }) : isBulkEditAction(y) || !j() ? (v(!0), I == null || I()) : ["view", "update", "create", "customize:popup"].includes(y["x-action"]) && y["x-uid"] ? A.current() : (v(!0), I == null || I());
         };
-        (F == null ? void 0 : F.enable) !== !1 && (F != null && F.content) ? ((Y = y == null ? void 0 : y["x-action-settings"]) != null && Y.skipValidator || (yield (X = z == null ? void 0 : z.submit) == null ? void 0 : X.call(z)), w.confirm({
+        (F == null ? void 0 : F.enable) !== !1 && (F != null && F.content) ? ((Y = y == null ? void 0 : y["x-action-settings"]) != null && Y.skipValidator || (yield (X = L == null ? void 0 : L.submit) == null ? void 0 : X.call(L)), w.confirm({
           title: M(U, { title: D || B || (t == null ? void 0 : t.title) }),
           content: M(K, { title: D || B || (t == null ? void 0 : t.title) }),
           onOk: J
@@ -40581,7 +40659,7 @@ const RenderButton = ({
       buttonStyle: i,
       handleMouseEnter: l,
       getAriaLabel: g,
-      handleButtonClick: L,
+      handleButtonClick: z,
       tarComponent: c,
       componentCls: d,
       hashId: p,
@@ -40641,8 +40719,8 @@ const RenderButtonInner = observer$1(
       "onlyIcon"
     ]), { t: F } = useTranslation(), w = useCallback(
       debounce$1(
-        (z, V = !0) => {
-          d(z, V);
+        (L, V = !0) => {
+          d(L, V);
         },
         300,
         { leading: !0, trailing: !1 }
@@ -40655,8 +40733,8 @@ const RenderButtonInner = observer$1(
     const T = useMemo(
       () => React.forwardRef(
         (K, U) => {
-          var Y = K, { component: z = p || Button, icon: V, onlyIcon: L, children: G } = Y, H = W(Y, ["component", "icon", "onlyIcon", "children"]);
-          return /* @__PURE__ */ jsxs(z, P(x({ ref: U }, H), { children: [
+          var Y = K, { component: L = p || Button, icon: V, onlyIcon: z, children: G } = Y, H = W(Y, ["component", "icon", "onlyIcon", "children"]);
+          return /* @__PURE__ */ jsxs(L, P(x({ ref: U }, H), { children: [
             v ? /* @__PURE__ */ jsx(Tooltip, { title: H.title, children: /* @__PURE__ */ jsx("span", { style: { padding: 3 }, children: V && typeof V == "string" ? /* @__PURE__ */ jsx(Icon, { type: V }) : V }) }) : /* @__PURE__ */ jsx("span", { style: { paddingRight: 3 }, children: V && typeof V == "string" ? /* @__PURE__ */ jsx(Icon, { type: V }) : V }),
             v ? G[1] : G
           ] }));
@@ -41306,9 +41384,9 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
           onSuccess: f
         }, n.defaultParams ? { defaultParams: [n.defaultParams] } : {})
       ), {
-        data: z,
+        data: L,
         run: V,
-        loading: L
+        loading: z
       } = useRequest(
         P(x({
           action: "get"
@@ -41355,12 +41433,12 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
         }), w.current = ne;
       }), K = useMemo(() => {
         var de;
-        const ne = i ? r || a : z == null ? void 0 : z.data;
+        const ne = i ? r || a : L == null ? void 0 : L.data;
         if (!((de = $ == null ? void 0 : $.data) != null && de.length))
           return ne != null ? Array.isArray(ne) ? ne : [ne] : [];
         const ee = ne != null && (Array.isArray(ne) ? ne.map((se) => P(x({}, se), { [t.value]: se[t.value] || se })) : [P(x({}, ne), { [t.value]: ne[t.value] || ne })]) || [], re = typeof p == "function" ? $.data.filter(p) : $.data;
         return uniqBy(re.concat(ee != null ? ee : []), t.value);
-      }, [i, r, a, z == null ? void 0 : z.data, $ == null ? void 0 : $.data, t.value, p]), Y = (ne) => {
+      }, [i, r, a, L == null ? void 0 : L.data, $ == null ? void 0 : $.data, t.value, p]), Y = (ne) => {
         w.current = null, ne && A(), y.current = !0;
       }, X = useMemo(
         () => h(O(K)),
@@ -42498,8 +42576,8 @@ const insertPositionToMethod = {
     }
   }), [h, l]), { moveRoute: F } = useNocoBaseRoutes(), w = useCallback(
     (j) => q(void 0, [j], function* ({ target: N, position: M }) {
-      var z;
-      const [R] = ((z = N == null ? void 0 : N.split) == null ? void 0 : z.call(N, "||")) || [];
+      var L;
+      const [R] = ((L = N == null ? void 0 : N.split) == null ? void 0 : L.call(N, "||")) || [];
       if (!R)
         return;
       const O = findByUid(c, R), $ = createDesignable({
@@ -43887,14 +43965,14 @@ const FieldsTreeSelect = (e) => {
       const $ = O.split(".");
       let A = h[$[0]];
       for (let E = 1; E < $.length && A; E++) {
-        const z = $.slice(0, E + 1).join(".");
-        if (h[z]) {
-          A = h[z];
+        const L = $.slice(0, E + 1).join(".");
+        if (h[L]) {
+          A = h[L];
           break;
         }
         if (!A.isLeaf && A.loadChildren) {
           const V = A.loadChildren(A);
-          V != null && V.length && (R.push(...V), A = V.find((L) => L.value === $.slice(0, E + 1).join(".")));
+          V != null && V.length && (R.push(...V), A = V.find((z) => z.value === $.slice(0, E + 1).join(".")));
         }
       }
     }), g((O) => R.reduce(($, A) => Object.assign($, { [A.value]: A }), x({}, O)));
@@ -43915,19 +43993,19 @@ const FieldsTreeSelect = (e) => {
         u && R.forEach((A) => {
           const E = A.split(".");
           if (E.length)
-            for (let z = 1; z <= E.length; z++)
-              O.add(E.slice(0, z).join("."));
+            for (let L = 1; L <= E.length; L++)
+              O.add(E.slice(0, L).join("."));
         });
       o(Array.from(O));
     },
     [e.multiple, F, o, h]
   ), D = useCallback(
     (j) => {
-      var z;
+      var L;
       const { value: R, onClose: O, disabled: $, closable: A } = j;
       if (!R)
         return null;
-      const { fullTitle: E } = (z = h[R]) != null ? z : {};
+      const { fullTitle: E } = (L = h[R]) != null ? L : {};
       return /* @__PURE__ */ jsx(Tag, { closable: A && !$, onClose: O, children: E == null ? void 0 : E.join(" / ") });
     },
     [h]
@@ -43986,9 +44064,9 @@ const InternalAssociationSelect$1 = observer$1(
       const N = uid();
       return f.addEffects(N, () => {
         onFieldInputValueChange("*", (M) => {
-          var $, A, E, z, V, L;
+          var $, A, E, L, V, z;
           const j = filterAnalyses((E = (A = ($ = r.componentProps) == null ? void 0 : $.service) == null ? void 0 : A.params) == null ? void 0 : E.filter) || [], R = getFieldPath(M.address.entire), O = getFieldPath(r.address.entire);
-          j.includes((z = M == null ? void 0 : M.props) == null ? void 0 : z.name) && r.value && isEqual(M == null ? void 0 : M.indexes, r == null ? void 0 : r.indexes) && ((V = M == null ? void 0 : M.props) == null ? void 0 : V.name) !== r.props.name && (!((L = r == null ? void 0 : r.indexes) != null && L.length) || isEqual(R, O)) && (r.setValue(null), p(null));
+          j.includes((L = M == null ? void 0 : M.props) == null ? void 0 : L.name) && r.value && isEqual(M == null ? void 0 : M.indexes, r == null ? void 0 : r.indexes) && ((V = M == null ? void 0 : M.props) == null ? void 0 : V.name) !== r.props.name && (!((z = r == null ? void 0 : r.indexes) != null && z.length) || isEqual(R, O)) && (r.setValue(null), p(null));
         });
       }), () => {
         f.removeEffects(N);
@@ -45159,14 +45237,14 @@ const InternalFileManager = (e) => {
           let O = p(R[y.label]);
           if (($ = v == null ? void 0 : v.uiSchema) != null && $.enum)
             if (Array.isArray(O))
-              O = O.map((z, V) => {
+              O = O.map((L, V) => {
                 var G, H;
-                const L = (H = (G = v.uiSchema.enum).find) == null ? void 0 : H.call(G, (U) => U.value === z);
-                return L ? /* @__PURE__ */ jsx(Tag, { color: L.color, style: { marginRight: 3 }, children: (L == null ? void 0 : L.label) || z }, V) : /* @__PURE__ */ jsx(Tag, { children: z }, z);
+                const z = (H = (G = v.uiSchema.enum).find) == null ? void 0 : H.call(G, (U) => U.value === L);
+                return z ? /* @__PURE__ */ jsx(Tag, { color: z.color, style: { marginRight: 3 }, children: (z == null ? void 0 : z.label) || L }, V) : /* @__PURE__ */ jsx(Tag, { children: L }, L);
               }).reverse();
             else {
-              const z = (E = (A = v.uiSchema.enum).find) == null ? void 0 : E.call(A, (V) => V.value === O);
-              z && (O = /* @__PURE__ */ jsx(Tag, { color: z.color, children: z.label }));
+              const L = (E = (A = v.uiSchema.enum).find) == null ? void 0 : E.call(A, (V) => V.value === O);
+              L && (O = /* @__PURE__ */ jsx(Tag, { color: L.color, children: L.label }));
             }
           return (v == null ? void 0 : v.type) === "date" && (O = dayjs(O).format("YYYY-MM-DD")), n ? n({
             [y.label]: O || EMPTY,
@@ -45202,10 +45280,10 @@ const InternalFileManager = (e) => {
     var $, A, E;
     if (j) {
       d(!0);
-      const z = yield T({ parentId: R == null ? void 0 : R.key });
-      if (d(!1), c(z), O === (a == null ? void 0 : a.length) - 1 && (($ = R == null ? void 0 : R.value) != null && $.id)) {
-        const V = yield T({ parentId: (A = R == null ? void 0 : R.value) == null ? void 0 : A.id }), L = [...a];
-        L.splice(O + 1), L[O] = P(x({}, L[O]), { value: R == null ? void 0 : R.value }), L[O + 1] = { key: (E = R == null ? void 0 : R.value) == null ? void 0 : E.id, children: (V == null ? void 0 : V.length) > 0 ? V : null }, i(L), o == null || o(L);
+      const L = yield T({ parentId: R == null ? void 0 : R.key });
+      if (d(!1), c(L), O === (a == null ? void 0 : a.length) - 1 && (($ = R == null ? void 0 : R.value) != null && $.id)) {
+        const V = yield T({ parentId: (A = R == null ? void 0 : R.value) == null ? void 0 : A.id }), z = [...a];
+        z.splice(O + 1), z[O] = P(x({}, z[O]), { value: R == null ? void 0 : R.value }), z[O + 1] = { key: (E = R == null ? void 0 : R.value) == null ? void 0 : E.id, children: (V == null ? void 0 : V.length) > 0 ? V : null }, i(z), o == null || o(z);
       }
     }
   }), N = (j, R) => q(void 0, null, function* () {
@@ -45239,7 +45317,7 @@ const InternalFileManager = (e) => {
         onSearch: (E) => N(E, j),
         fieldNames: y,
         style: { minWidth: 150 },
-        onChange: (E, z) => D(E, z, R),
+        onChange: (E, L) => D(E, L, R),
         options: u ? [] : w(l),
         onDropdownVisibleChange: (E) => B(E, j, R),
         notFoundContent: u ? /* @__PURE__ */ jsx(Spin, { size: "small" }) : null
@@ -45550,10 +45628,10 @@ const useTableSelectorProps$2 = () => {
   });
 }, InternalPicker = observer$1(
   (e) => {
-    var z;
-    const E = e, { value: t, multiple: n, openSize: o, onChange: r, quickUpload: a, selectFile: i, shouldMountElement: l } = E, c = W(E, ["value", "multiple", "openSize", "onChange", "quickUpload", "selectFile", "shouldMountElement"]), u = useField(), d = useFieldNames$1(e), [p, m] = useState(!1), h = useFieldSchema(), g = useInsertSchema$1("Selector"), { options: f } = useAssociationFieldContext(), { collectionName: C } = useFormBlockContext(), b = useCompile(), S = useLabelUiSchema$1(f, (d == null ? void 0 : d.label) || "label"), y = h["x-add-new"], [v, I] = useState([]), F = useCollectionRecordData(), w = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((L) => {
-      const G = L == null ? void 0 : L[d.label];
-      return P(x({}, L), {
+    var L;
+    const E = e, { value: t, multiple: n, openSize: o, onChange: r, quickUpload: a, selectFile: i, shouldMountElement: l } = E, c = W(E, ["value", "multiple", "openSize", "onChange", "quickUpload", "selectFile", "shouldMountElement"]), u = useField(), d = useFieldNames$1(e), [p, m] = useState(!1), h = useFieldSchema(), g = useInsertSchema$1("Selector"), { options: f } = useAssociationFieldContext(), { collectionName: C } = useFormBlockContext(), b = useCompile(), S = useLabelUiSchema$1(f, (d == null ? void 0 : d.label) || "label"), y = h["x-add-new"], [v, I] = useState([]), F = useCollectionRecordData(), w = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((z) => {
+      const G = z == null ? void 0 : z[d.label];
+      return P(x({}, z), {
         [d.label]: getLabelFormatValue$1(b(S), b(G))
       });
     }) : [], [t == null ? void 0 : t.length, d.label]), T = {
@@ -45571,28 +45649,28 @@ const useTableSelectorProps$2 = () => {
       currentFormCollection: C
     }, { isMobileLayout: D } = useMobileLayout(), B = () => {
       var V;
-      return n == null ? null : Array.isArray(t) ? (V = t.filter(Boolean)) == null ? void 0 : V.map((L) => L == null ? void 0 : L[d.value]) : t == null ? void 0 : t[d.value];
+      return n == null ? null : Array.isArray(t) ? (V = t.filter(Boolean)) == null ? void 0 : V.map((z) => z == null ? void 0 : z[d.value]) : t == null ? void 0 : t[d.value];
     }, N = () => {
       var V;
-      return n == null ? null : Array.isArray(t) ? (V = t.filter(Boolean)) == null ? void 0 : V.map((L) => ({
-        [d.label]: b(L == null ? void 0 : L[d.label]),
-        [d.value]: L == null ? void 0 : L[d.value]
+      return n == null ? null : Array.isArray(t) ? (V = t.filter(Boolean)) == null ? void 0 : V.map((z) => ({
+        [d.label]: b(z == null ? void 0 : z[d.label]),
+        [d.value]: z == null ? void 0 : z[d.value]
       })) : [{ [d.label]: b(t == null ? void 0 : t[d.label]), [d.value]: t == null ? void 0 : t[d.value] }];
     }, M = () => {
-      const V = (f == null ? void 0 : f.targetKey) || "id", L = w.map((H) => H[V]).filter(Boolean);
-      return L.length ? { $and: [{ [`${V}.$ne`]: L }] } : {};
+      const V = (f == null ? void 0 : f.targetKey) || "id", z = w.map((H) => H[V]).filter(Boolean);
+      return z.length ? { $and: [{ [`${V}.$ne`]: z }] } : {};
     };
     useEffect(() => {
       t || I([]);
     }, [t]);
     const j = () => {
-      const { setVisible: V } = useActionContext(), { multiple: L, selectedRows: G, onChange: H, options: U, collectionField: K } = useContext(RecordPickerContext);
+      const { setVisible: V } = useActionContext(), { multiple: z, selectedRows: G, onChange: H, options: U, collectionField: K } = useContext(RecordPickerContext);
       return {
         onClick() {
-          H(L ? unionBy(G, U, (K == null ? void 0 : K.targetKey) || "id") : (G == null ? void 0 : G[0]) || null), V(!1);
+          H(z ? unionBy(G, U, (K == null ? void 0 : K.targetKey) || "id") : (G == null ? void 0 : G[0]) || null), V(!1);
         },
         style: {
-          display: L === !1 ? "none" : "block"
+          display: z === !1 ? "none" : "block"
         }
       };
     }, R = useMemo(
@@ -45632,12 +45710,12 @@ const useTableSelectorProps$2 = () => {
                     r([]), I([]);
                     return;
                   }
-                  const L = w == null ? void 0 : w.filter((G) => V.includes(G[d.value]));
-                  r(L), I(L);
+                  const z = w == null ? void 0 : w.filter((G) => V.includes(G[d.value]));
+                  r(z), I(z);
                 }
               } else {
-                const L = n ? [] : null;
-                r(L), I(L);
+                const z = n ? [] : null;
+                r(z), I(z);
               }
             },
             options: N(),
@@ -45659,7 +45737,7 @@ const useTableSelectorProps$2 = () => {
         ActionContextProvider,
         {
           value: {
-            openSize: ((z = h["x-component-props"]) == null ? void 0 : z.openSize) || o,
+            openSize: ((L = h["x-component-props"]) == null ? void 0 : L.openSize) || o,
             openMode: "drawer",
             visible: p,
             setVisible: m
@@ -47086,7 +47164,7 @@ const Table$1 = withDynamicSchemaProps(
       "onClickRow",
       "enableIndexColumn"
     ]), y = useArrayField(S), v = useFieldSchema(), { size: I = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, F = useCollection(), T = ((fe = v == null ? void 0 : v.parent) == null ? void 0 : fe["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: B } = T, N = useMemoizedFn(S.onRowDragEnd || (() => {
-    })), M = usePaginationProps$2(n, a), j = useTableColumns$1(S, M), [R, O] = useState(() => D ? B : []), [$, A] = useState(((be = y == null ? void 0 : y.data) == null ? void 0 : be.selectedRowKeys) || []), [E, z] = useState([]), V = (p == null ? void 0 : p.type) !== "none", L = useRef(/* @__PURE__ */ new Map()), G = useMemo(() => css`
+    })), M = usePaginationProps$2(n, a), j = useTableColumns$1(S, M), [R, O] = useState(() => D ? B : []), [$, A] = useState(((be = y == null ? void 0 : y.data) == null ? void 0 : be.selectedRowKeys) || []), [E, L] = useState([]), V = (p == null ? void 0 : p.type) !== "none", z = useRef(/* @__PURE__ */ new Map()), G = useMemo(() => css`
         & > td {
           background-color: ${t.controlItemBgActive} !important;
         }
@@ -47095,7 +47173,7 @@ const Table$1 = withDynamicSchemaProps(
         }
       `, [t.controlItemBgActive, t.controlItemBgActiveHover]), H = useMemo(() => C ? G : "", [G, C]), U = useMemo(() => C ? (ie, te) => ({
       onClick: (oe) => {
-        isPortalInBody(oe.target) || C(ie, z, E);
+        isPortalInBody(oe.target) || C(ie, L, E);
       },
       rowIndex: te
     }) : null, [C, E]);
@@ -47108,10 +47186,10 @@ const Table$1 = withDynamicSchemaProps(
         return Y(ie);
       if (ie.key)
         return ie.key;
-      if (L.current.has(ie))
-        return L.current.get(ie);
+      if (z.current.has(ie))
+        return z.current.get(ie);
       const te = uid();
-      return L.current.set(ie, te), te;
+      return z.current.set(ie, te), te;
     }, []), Y = useCallback(
       (ie) => {
         var te;
@@ -47312,23 +47390,23 @@ const Table$1 = withDynamicSchemaProps(
   }
 `, SubTable = observer$1(
   (e) => {
-    var A, E, z;
+    var A, E, L;
     const { openSize: t } = e, { field: n, options: o, fieldSchema: r } = useAssociationFieldContext(), { t: a } = useTranslation(), [i, 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, enableIndexColumn: y } = n.componentProps;
     useSubTableSpecialCase({ rootField: n, rootSchema: r });
-    const v = (V, L) => {
-      if (L !== void 0 && isArr(n.value) && V !== L)
+    const v = (V, z) => {
+      if (z !== void 0 && isArr(n.value) && V !== z)
         return action(() => {
           const G = n.value[V];
-          return n.value.splice(V, 1), n.value.splice(L, 0, G), exchangeArrayState(n, {
+          return n.value.splice(V, 1), n.value.splice(z, 0, G), exchangeArrayState(n, {
             fromIndex: V,
-            toIndex: L
+            toIndex: z
           }), n.onInput(n.value);
         });
     };
     n.move = v;
-    const I = useMemo(() => n.value && Object.keys(n.value).length > 0 ? (Array.isArray(n.value) ? n.value : n.value ? [n.value] : []).filter(Boolean).map((L) => {
-      const G = L == null ? void 0 : L[d.label];
-      return P(x({}, L), {
+    const I = useMemo(() => n.value && Object.keys(n.value).length > 0 ? (Array.isArray(n.value) ? n.value : n.value ? [n.value] : []).filter(Boolean).map((z) => {
+      const G = z == null ? void 0 : z[d.label];
+      return P(x({}, z), {
         [d.label]: getLabelFormatValue$1(m(h), m(G))
       });
     }) : [], [n.value, d == null ? void 0 : d.label]), F = {
@@ -47344,26 +47422,26 @@ const Table$1 = withDynamicSchemaProps(
       setSelectedRows: u,
       collectionField: o
     }, w = () => {
-      const { setVisible: V } = useActionContext(), { selectedRows: L, setSelectedRows: G } = useContext(RecordPickerContext);
+      const { setVisible: V } = useActionContext(), { selectedRows: z, setSelectedRows: G } = useContext(RecordPickerContext);
       return {
         onClick() {
           var U;
-          Array.isArray(n.value) || (n.value = []), L.forEach((K) => n.value.push(markRecordAsNew(K))), n.onInput(n.value), n.initialValue = n.value, G([]), V(!1);
+          Array.isArray(n.value) || (n.value = []), z.forEach((K) => n.value.push(markRecordAsNew(K))), n.onInput(n.value), n.initialValue = n.value, G([]), V(!1);
           const H = Math.ceil(n.value.length / (((U = n.componentProps) == null ? void 0 : U.pageSize) || 10));
           B(H);
         }
       };
     }, T = () => {
-      const V = (o == null ? void 0 : o.targetKey) || "id", L = (n.value || []).map((H) => H == null ? void 0 : H[V]).filter(Boolean);
-      return L.length ? { $and: [{ [`${V}.$ne`]: L }] } : {};
+      const V = (o == null ? void 0 : o.targetKey) || "id", z = (n.value || []).map((H) => H == null ? void 0 : H[V]).filter(Boolean);
+      return z.length ? { $and: [{ [`${V}.$ne`]: z }] } : {};
     }, [D, B] = useState(1), [N, M] = useState(((A = n.componentProps) == null ? void 0 : A.pageSize) || 10), { setFormValueChanged: j } = useActionContext();
     useEffect(() => {
       var V;
       M((V = n.componentProps) == null ? void 0 : V.pageSize);
     }, [(E = n.componentProps) == null ? void 0 : E.pageSize]);
     const R = useMemo(() => {
-      var L;
-      const V = Math.ceil(((L = n.value) == null ? void 0 : L.length) / 10);
+      var z;
+      const V = Math.ceil(((z = n.value) == null ? void 0 : z.length) / 10);
       return {
         current: D > V ? V : D,
         pageSize: N || 10,
@@ -47375,14 +47453,14 @@ const Table$1 = withDynamicSchemaProps(
         pageSizeOptions: ["10", "20", "50", "100"],
         hideOnSinglePage: !1
       };
-    }, [(z = n.value) == null ? void 0 : z.length, N, D]), O = () => {
+    }, [(L = n.value) == null ? void 0 : L.length, N, D]), O = () => {
       const { field: V } = useAssociationFieldContext();
       return {
         run() {
           var G;
           V.value = V.value || [], V.value.push(markRecordAsNew({}));
-          const L = Math.ceil(V.value.length / (((G = V.componentProps) == null ? void 0 : G.pageSize) || 10));
-          return B(L), V.onInput(V.value);
+          const z = Math.ceil(V.value.length / (((G = V.componentProps) == null ? void 0 : G.pageSize) || 10));
+          return B(z), V.onInput(V.value);
         }
       };
     }, $ = () => ({
@@ -47566,10 +47644,10 @@ const ReadPretty$6 = observer$1(
 InternalAssociationSelect.displayName = "InternalAssociationSelect";
 const AssociationSelect = InternalAssociationSelect;
 AssociationSelect.Designer = function e() {
-  var O, $, A, E, z, V, L, G, H, U, K;
+  var O, $, A, E, L, V, z, G, H, U, K;
   const { getCollectionFields: t, getInterface: n, getCollectionJoinField: o, getCollection: r, isTitleField: a } = useCollectionManager_deprecated(), { getField: i } = 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 = i(u.name) || o(u["x-collection-field"]), y = useFieldComponentOptions(), v = c.address.segments.includes("__form_grid"), I = n(S == null ? void 0 : S.interface), F = (O = I == null ? void 0 : I.validateSchema) == null ? void 0 : O.call(I, u), w = ($ = S == null ? void 0 : S.uiSchema) == null ? void 0 : $.title, T = S != null && S.target ? t(S == null ? void 0 : S.target) : [];
   c.title === w || c.title;
-  const D = useSortFields(S == null ? void 0 : S.target), B = ((z = (E = (A = c.componentProps) == null ? void 0 : A.service) == null ? void 0 : E.params) == null ? void 0 : z.sort) || [];
+  const D = useSortFields(S == null ? void 0 : S.target), B = ((L = (E = (A = c.componentProps) == null ? void 0 : A.service) == null ? void 0 : E.params) == null ? void 0 : L.sort) || [];
   useEffect(() => {
     c.readPretty !== u["x-read-pretty"] && (c.readPretty = !!u["x-read-pretty"]);
   }, [u["x-read-pretty"]]);
@@ -47796,7 +47874,7 @@ AssociationSelect.Designer = function e() {
       SchemaSettingsDataScope,
       {
         collectionName: S == null ? void 0 : S.target,
-        defaultFilter: ((H = (G = (L = c.componentProps) == null ? void 0 : L.service) == null ? void 0 : G.params) == null ? void 0 : H.filter) || {},
+        defaultFilter: ((H = (G = (z = c.componentProps) == null ? void 0 : z.service) == null ? void 0 : G.params) == null ? void 0 : H.filter) || {},
         form: l,
         onSubmit: ({ filter: Y }) => {
           Y = removeNullCondition(Y), _.set(c.componentProps, "service.params.filter", Y), u["x-component-props"] = c.componentProps, m.emit("patch", {
@@ -48074,16 +48152,16 @@ AssociationSelect.FilterDesigner = function e() {
         onSubmit: ($) => {
           var V;
           const A = [];
-          for (const L of $.rules)
-            A.push(_.pickBy(L, _.identity));
+          for (const z of $.rules)
+            A.push(_.pickBy(z, _.identity));
           const E = {
             "x-uid": l["x-uid"]
           };
           if (["percent"].includes(m == null ? void 0 : m.interface))
-            for (const L of A)
-              (L.maxValue || L.minValue) && (L.percentMode = !0), L.percentFormat && (L.percentFormats = !0);
-          const z = _.concat([], ((V = m == null ? void 0 : m.uiSchema) == null ? void 0 : V["x-validator"]) || [], A);
-          i.validator = z, l["x-validator"] = A, E["x-validator"] = A, u.emit("patch", {
+            for (const z of A)
+              (z.maxValue || z.minValue) && (z.percentMode = !0), z.percentFormat && (z.percentFormats = !0);
+          const L = _.concat([], ((V = m == null ? void 0 : m.uiSchema) == null ? void 0 : V["x-validator"]) || [], A);
+          i.validator = L, l["x-validator"] = A, E["x-validator"] = A, u.emit("patch", {
             schema: E
           }), d();
         }
@@ -48224,10 +48302,10 @@ AssociationSelect.FilterDesigner = function e() {
         options: v,
         value: (O = (R = i == null ? void 0 : i.componentProps) == null ? void 0 : R.fieldNames) == null ? void 0 : O.label,
         onChange: ($) => {
-          var z, V;
+          var L, V;
           const A = {
             "x-uid": l["x-uid"]
-          }, E = P(x(x({}, (V = (z = m == null ? void 0 : m.uiSchema) == null ? void 0 : z["x-component-props"]) == null ? void 0 : V.fieldNames), i.componentProps.fieldNames), {
+          }, E = P(x(x({}, (V = (L = m == null ? void 0 : m.uiSchema) == null ? void 0 : L["x-component-props"]) == null ? void 0 : V.fieldNames), i.componentProps.fieldNames), {
             label: $
           });
           i.componentProps.fieldNames = E, l["x-component-props"] = l["x-component-props"] || {}, l["x-component-props"].fieldNames = E, A["x-component-props"] = l["x-component-props"], u.emit("patch", {
@@ -50334,7 +50412,7 @@ const InternalListBlockProvider = (e) => {
               display: none !important;
             }
           `,
-        itemRender: (A, E, z) => E === "prev" ? /* @__PURE__ */ jsxs(
+        itemRender: (A, E, L) => E === "prev" ? /* @__PURE__ */ jsxs(
           "div",
           {
             style: { display: "flex" },
@@ -50344,12 +50422,12 @@ const InternalListBlockProvider = (e) => {
                     }
                   `,
             children: [
-              z,
+              L,
               " ",
               /* @__PURE__ */ jsx("div", { style: { marginLeft: "7px" }, children: d })
             ]
           }
-        ) : z
+        ) : L
       };
     })();
     return useMobileLayout(), h(
@@ -52287,9 +52365,9 @@ const TableActionColumnDesigner = (e) => {
         defaultChecked: !0,
         checked: S ? r.decoratorProps.treeTable : !1,
         onChange: (A) => {
-          var z;
+          var L;
           r.decoratorProps.treeTable = A, a["x-decorator-props"].treeTable = A;
-          const E = P(x({}, (z = c.params) == null ? void 0 : z[0]), {
+          const E = P(x({}, (L = c.params) == null ? void 0 : L[0]), {
             tree: A ? !0 : null
           });
           d.emit("patch", {
@@ -52420,8 +52498,8 @@ const TableActionColumnDesigner = (e) => {
         },
         onSubmit: ({ sort: A }) => {
           var V;
-          const E = A.map((L) => L.direction === "desc" ? `-${L.field}` : L.field), z = r.decoratorProps.params || {};
-          z.sort = E, r.decoratorProps.params = z, a["x-decorator-props"].params = z, d.emit("patch", {
+          const E = A.map((z) => z.direction === "desc" ? `-${z.field}` : z.field), L = r.decoratorProps.params || {};
+          L.sort = E, r.decoratorProps.params = L, a["x-decorator-props"].params = L, d.emit("patch", {
             schema: {
               "x-uid": a["x-uid"],
               "x-decorator-props": a["x-decorator-props"]
@@ -52445,9 +52523,9 @@ const TableActionColumnDesigner = (e) => {
           { label: "200", value: 200 }
         ],
         onChange: (A) => {
-          var z;
+          var L;
           const E = r.decoratorProps.params || {};
-          E.pageSize = A, r.decoratorProps.params = E, a["x-decorator-props"].params = E, c.run(P(x({}, (z = c.params) == null ? void 0 : z[0]), { pageSize: A, page: 1 })), d.emit("patch", {
+          E.pageSize = A, r.decoratorProps.params = E, a["x-decorator-props"].params = E, c.run(P(x({}, (L = c.params) == null ? void 0 : L[0]), { pageSize: A, page: 1 })), d.emit("patch", {
             schema: {
               "x-uid": a["x-uid"],
               "x-decorator-props": a["x-decorator-props"]
@@ -52467,7 +52545,7 @@ const TableActionColumnDesigner = (e) => {
           { label: u("Small"), value: "small" }
         ],
         onChange: (A) => {
-          const E = a.reduceProperties((z, V) => {
+          const E = a.reduceProperties((L, V) => {
             if (V["x-component"] === "TableV2")
               return V;
           }, null);
@@ -54599,8 +54677,8 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
     const R = x({}, j), O = (E) => {
       if (Array.isArray(E))
         return E.filter(Boolean);
-      const z = String(E != null ? E : "").trim();
-      return z ? z.split(/[\s,]+/).map((V) => V.trim()).filter(Boolean) : [];
+      const L = String(E != null ? E : "").trim();
+      return L ? L.split(/[\s,]+/).map((V) => V.trim()).filter(Boolean) : [];
     }, $ = R.tlds;
     let A = "iana";
     if ($ === "iana" || $ === !0 || $ === "true" ? A = "iana" : $ === "disable" || $ === !1 || $ === "false" ? A = "disable" : $ === "allow" ? A = "allow" : $ === "deny" ? A = "deny" : $ && typeof $ == "object" && ($.allow === !0 ? A = "iana" : Array.isArray($.allow) ? A = "allow" : Array.isArray($.deny) ? A = "deny" : A = "iana"), A === "iana")
@@ -54662,16 +54740,16 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
     const j = [];
     try {
       g.forEach(($) => {
-        const A = S.find((z) => z.key === $.name);
+        const A = S.find((L) => L.key === $.name);
         if (!A || !A.params)
           return;
         let E = !1;
-        A.params.forEach((z) => {
-          var L, G;
-          if (!z.required)
+        A.params.forEach((L) => {
+          var z, G;
+          if (!L.required)
             return;
-          const V = (G = (L = $.args) == null ? void 0 : L[z.key]) != null ? G : z.defaultValue;
-          b(z.componentType, V) && (M = !0, E = !0);
+          const V = (G = (z = $.args) == null ? void 0 : z[L.key]) != null ? G : L.defaultValue;
+          b(L.componentType, V) && (M = !0, E = !0);
         }), E && j.push($.key);
       });
     } catch ($) {
@@ -54708,11 +54786,11 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
     const O = g.map((A) => {
       var E;
       if (A.key === M) {
-        let z = P(x({}, A.args), { [j]: R });
-        z = f(A.name, z);
-        const V = S.find((L) => L.key === A.name);
+        let L = P(x({}, A.args), { [j]: R });
+        L = f(A.name, L);
+        const V = S.find((z) => z.key === A.name);
         return P(x({}, A), {
-          args: z,
+          args: L,
           paramsType: (E = V == null ? void 0 : V.paramsType) != null ? E : A.paramsType
         });
       }
@@ -54728,7 +54806,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   }, T = (M) => {
     const j = S.find((R) => R.key === M.name);
     return j ? !j.hasValue || j.params.length === 0 ? /* @__PURE__ */ jsx("div", { style: { color: c.colorTextSecondary }, children: l("This validation rule has no additional parameters") }) : /* @__PURE__ */ jsx(Form$2, { size: "small", children: j.params.map((R) => {
-      var A, E, z, V, L, G, H;
+      var A, E, L, V, z, G, H;
       let O = (E = (A = M.args) == null ? void 0 : A[R.key]) != null ? E : R.defaultValue;
       R.componentType === "radio" && R.key === "tlds" && (j.key === "email" || j.key === "domain") && (O = C(M.args));
       const $ = !!R.required && b(R.componentType, O);
@@ -54771,7 +54849,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
                   } else
                     F(M.key, R.key, U.target.value);
                 },
-                children: (z = R.options) == null ? void 0 : z.map((U) => /* @__PURE__ */ jsx(Radio$1, { value: U.value, children: l(U.label) }, U.value))
+                children: (L = R.options) == null ? void 0 : L.map((U) => /* @__PURE__ */ jsx(Radio$1, { value: U.value, children: l(U.label) }, U.value))
               }
             ),
             (V = R.options) == null ? void 0 : V.map((U) => {
@@ -54843,7 +54921,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
                 placeholder: l("Please select"),
                 style: { width: "100%", height: "100%" },
                 allowClear: !0,
-                children: (L = R.options) == null ? void 0 : L.map((U) => /* @__PURE__ */ jsx(Select$1.Option, { value: U.value, children: l(U.label) }, U.value))
+                children: (z = R.options) == null ? void 0 : z.map((U) => /* @__PURE__ */ jsx(Select$1.Option, { value: U.value, children: l(U.label) }, U.value))
               }
             ),
             (G = R.options) == null ? void 0 : G.map((U) => U.value === O && U.componentType ? /* @__PURE__ */ jsx(Fragment$1, {}) : null)
@@ -55409,20 +55487,20 @@ const supportTypes = ["string", "bigInt", "integer", "uuid", "uid", "nanoid"], S
   })), []), T = useCallback(() => {
     const { availableFieldInterfaces: R } = u(o.template) || {}, { exclude: O, include: $ } = R || {}, A = [];
     return I.forEach((E) => {
-      var z;
+      var L;
       if (E.key === "systemInfo")
         A.push(P(x({}, E), {
           children: E.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((L) => {
+        $ != null && $.length ? $.forEach((z) => {
           var H;
-          const G = (H = E == null ? void 0 : E.children) == null ? void 0 : H.find((U) => [L, L.interface].includes(U.name));
+          const G = (H = E == null ? void 0 : E.children) == null ? void 0 : H.find((U) => [z, z.interface].includes(U.name));
           G && V.push(P(x({}, G), {
-            targetScope: L == null ? void 0 : L.targetScope
+            targetScope: z == null ? void 0 : z.targetScope
           }));
-        }) : O != null && O.length ? V = (z = E == null ? void 0 : E.children) == null ? void 0 : z.filter((L) => !O.includes(L.name)) : V = E == null ? void 0 : E.children, V != null && V.length && A.push(P(x({}, E), {
+        }) : O != null && O.length ? V = (L = E == null ? void 0 : E.children) == null ? void 0 : L.filter((z) => !O.includes(z.name)) : V = E == null ? void 0 : E.children, V != null && V.length && A.push(P(x({}, E), {
           children: V
         }));
       }
@@ -55717,7 +55795,7 @@ const supportTypes = ["string", "bigInt", "integer", "uuid", "uid", "nanoid"], S
       run() {
         return q(this, null, function* () {
           yield j.submit();
-          const z = cloneDeep(j.values), V = omit(z, [
+          const L = cloneDeep(j.values), V = omit(L, [
             "key",
             "uiSchemaUid",
             "collectionName",
@@ -56232,12 +56310,12 @@ const getSchema$4 = (e, t, n) => {
     const R = [];
     g.forEach((O) => {
       var V;
-      const $ = v(O), E = w(O).map((L) => {
-        const G = T(L, O);
+      const $ = v(O), E = w(O).map((z) => {
+        const G = T(z, O);
         return {
           type: "group",
-          key: L,
-          label: l("Parent collection fields") + l(`(${v(L).title})`),
+          key: z,
+          label: l("Parent collection fields") + l(`(${v(z).title})`),
           children: G.filter((H) => !["hasOne", "hasMany", "belongsToMany"].includes(H == null ? void 0 : H.type)).map((H) => {
             var U;
             return {
@@ -56246,14 +56324,14 @@ const getSchema$4 = (e, t, n) => {
             };
           })
         };
-      }), z = (V = $.fields.filter((L) => !["obo", "oho", "m2m", "o2m"].includes(L == null ? void 0 : L.interface))) == null ? void 0 : V.map((L) => {
+      }), L = (V = $.fields.filter((z) => !["obo", "oho", "m2m", "o2m"].includes(z == null ? void 0 : z.interface))) == null ? void 0 : V.map((z) => {
         var G;
-        return { value: L.name, key: L.name, label: l(((G = L.uiSchema) == null ? void 0 : G.title) || L.name) };
+        return { value: z.name, key: z.name, label: l(((G = z.uiSchema) == null ? void 0 : G.title) || z.name) };
       }).concat(E);
       R.push({
         value: O,
         label: l($.title || $.name),
-        children: z
+        children: L
       });
     }), h(R);
   }, [g, t]), useEffect(() => {
@@ -56262,21 +56340,21 @@ const getSchema$4 = (e, t, n) => {
       if (R) {
         u(!1), p([]);
         const A = ($ = Object.values((O = R == null ? void 0 : R.data) == null ? void 0 : O.fields)) == null ? void 0 : $.map((E) => {
-          var V, L;
-          const z = (a == null ? void 0 : a.data.find((G) => G.name === E.name)) || E;
-          if (!(z != null && z.uiSchema)) {
+          var V, z;
+          const L = (a == null ? void 0 : a.data.find((G) => G.name === E.name)) || E;
+          if (!(L != null && L.uiSchema)) {
             const G = I(E.interface);
-            z.uiSchema = (G == null ? void 0 : G.default.uiSchema) || {};
+            L.uiSchema = (G == null ? void 0 : G.default.uiSchema) || {};
           }
           return E.source ? P(x({}, E), {
-            uiSchema: P(x({}, omit(z.uiSchema, "rawTitle")), { title: ((V = z.uiSchema) == null ? void 0 : V.title) || z.name })
-          }) : P(x({}, z), {
-            uiSchema: P(x({}, omit(z.uiSchema, "rawTitle")), { title: ((L = z.uiSchema) == null ? void 0 : L.title) || z.name })
+            uiSchema: P(x({}, omit(L.uiSchema, "rawTitle")), { title: ((V = L.uiSchema) == null ? void 0 : V.title) || L.name })
+          }) : P(x({}, L), {
+            uiSchema: P(x({}, omit(L.uiSchema, "rawTitle")), { title: ((z = L.uiSchema) == null ? void 0 : z.title) || L.name })
           });
         });
         S.value = A, setTimeout(() => {
-          var E, z, V;
-          p(A), y.setValuesIn("sources", (E = R.data) == null ? void 0 : E.sources), f((z = R.data) == null ? void 0 : z.sources), b((V = R == null ? void 0 : R.data) == null ? void 0 : V.unsupportedFields);
+          var E, L, V;
+          p(A), y.setValuesIn("sources", (E = R.data) == null ? void 0 : E.sources), f((L = R.data) == null ? void 0 : L.sources), b((V = R == null ? void 0 : R.data) == null ? void 0 : V.unsupportedFields);
         });
       }
     }).catch);
@@ -56284,8 +56362,8 @@ const getSchema$4 = (e, t, n) => {
   const M = (R, O) => {
     const $ = _.cloneDeep(d);
     $[O] = R, p($), S.value = $.map((A) => {
-      var z, V, L;
-      const E = typeof A.source == "string" ? A.source : (L = (V = (z = A.source) == null ? void 0 : z.filter) == null ? void 0 : V.call(z, Boolean)) == null ? void 0 : L.join(".");
+      var L, V, z;
+      const E = typeof A.source == "string" ? A.source : (z = (V = (L = A.source) == null ? void 0 : L.filter) == null ? void 0 : V.call(L, Boolean)) == null ? void 0 : z.join(".");
       return P(x({}, A), {
         source: E
       });
@@ -56311,8 +56389,8 @@ const getSchema$4 = (e, t, n) => {
           options: D(m),
           onChange: (A, E) => {
             var V;
-            const z = (V = F(A == null ? void 0 : A[0])) == null ? void 0 : V.find((L) => L.name === last(A));
-            M(P(x({}, O), { source: A, uiSchema: z == null ? void 0 : z.uiSchema }), $);
+            const L = (V = F(A == null ? void 0 : A[0])) == null ? void 0 : V.find((z) => z.name === last(A));
+            M(P(x({}, O), { source: A, uiSchema: L == null ? void 0 : L.uiSchema }), $);
           },
           placeholder: l("Select field source")
         }
@@ -56350,10 +56428,10 @@ const getSchema$4 = (e, t, n) => {
             defaultValue: R,
             style: { width: "100%" },
             popupMatchSelectWidth: !1,
-            onChange: (z) => {
-              M(P(x({}, A), { interface: z }), $);
+            onChange: (L) => {
+              M(P(x({}, A), { interface: L }), $);
             },
-            children: E.map((z) => /* @__PURE__ */ jsx(Select$1.OptGroup, { label: D(z.label), children: z.children.map((V) => /* @__PURE__ */ jsx(Select$1.Option, { value: V.name, children: D(V.label) }, V.value)) }, z.key))
+            children: E.map((L) => /* @__PURE__ */ jsx(Select$1.OptGroup, { label: D(L.label), children: L.children.map((V) => /* @__PURE__ */ jsx(Select$1.Option, { value: V.name, children: D(V.label) }, V.value)) }, L.key))
           }
         );
       }
@@ -56370,8 +56448,8 @@ const getSchema$4 = (e, t, n) => {
           Input$3,
           {
             defaultValue: ((E = A == null ? void 0 : A.uiSchema) == null ? void 0 : E.title) || R,
-            onChange: (z) => M(
-              P(x({}, A), { uiSchema: P(x({}, omit(A == null ? void 0 : A.uiSchema, "rawTitle")), { title: z.target.value }) }),
+            onChange: (L) => M(
+              P(x({}, A), { uiSchema: P(x({}, omit(A == null ? void 0 : A.uiSchema, "rawTitle")), { title: L.target.value }) }),
               $
             )
           }
@@ -56433,7 +56511,7 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
         key: I.name,
         width: 200,
         render: ($, A, E) => {
-          const z = A[I.name], V = {
+          const L = A[I.name], V = {
             type: "object",
             properties: {
               [I.name]: {
@@ -56441,7 +56519,7 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
                 "x-component": D && F ? "CollectionField" : "Input",
                 "x-read-pretty": !0,
                 "x-collection-field": F == null ? void 0 : F.join("."),
-                default: I.interface === "json" ? JSON.stringify(z) : z
+                default: I.interface === "json" ? JSON.stringify(L) : L
               }
             }
           };
@@ -56774,7 +56852,7 @@ const AsyncDataProvider = (e) => {
               style: { width: "100%" },
               popupMatchSelectWidth: !1,
               onChange: (j) => {
-                var O, $, A, E, z;
+                var O, $, A, E, L;
                 const R = p(j);
                 S(
                   P(x({}, N), {
@@ -56782,7 +56860,7 @@ const AsyncDataProvider = (e) => {
                     uiSchema: P(x({}, (O = R == null ? void 0 : R.default) == null ? void 0 : O.uiSchema), {
                       title: ((A = ($ = R == null ? void 0 : R.default) == null ? void 0 : $.uiSchema) == null ? void 0 : A.title) || ((E = N.uiSchema) == null ? void 0 : E.title)
                     }),
-                    type: (z = R == null ? void 0 : R.default) == null ? void 0 : z.type
+                    type: (L = R == null ? void 0 : R.default) == null ? void 0 : L.type
                   }),
                   B
                 );
@@ -65385,11 +65463,11 @@ const ActionInitializerItem = (e) => {
       (y || X) && g(P(x({}, h == null ? void 0 : h[0]), {
         filter: f
       })), v(!y), Y.stopPropagation();
-    }, z = (Y) => {
+    }, L = (Y) => {
       Y.stopPropagation();
     }, V = (Y) => {
       m(Y);
-    }, L = (K = i.title) != null ? K : (U = a == null ? void 0 : a.uiSchema) == null ? void 0 : U.title;
+    }, z = (K = i.title) != null ? K : (U = a == null ? void 0 : a.uiSchema) == null ? void 0 : U.title;
     return t(
       /* @__PURE__ */ jsxs(SortableItem, { className: cls(n, o, "nb-block-item", e.className, "SortableItem"), children: [
         /* @__PURE__ */ jsx(l, {}),
@@ -65406,17 +65484,17 @@ const ActionInitializerItem = (e) => {
                 },
                 gutter: 5,
                 children: [
-                  /* @__PURE__ */ jsx(Col, { title: c(L), className: "headerCol", children: y ? /* @__PURE__ */ jsx(
+                  /* @__PURE__ */ jsx(Col, { title: c(z), className: "headerCol", children: y ? /* @__PURE__ */ jsx(
                     Input$3,
                     {
                       bordered: !1,
                       autoFocus: !0,
                       placeholder: "Search...",
                       className: "search",
-                      onClick: z,
+                      onClick: L,
                       onChange: V
                     }
-                  ) : c(L) }),
+                  ) : c(z) }),
                   /* @__PURE__ */ jsx(
                     Col,
                     {
@@ -65856,21 +65934,21 @@ const DataBlockInitializer = (e) => {
     otherText: S,
     alwaysRenderMenu: y
   } = e, { insert: v, setVisible: I } = useSchemaInitializer(), F = useCompile(), { getTemplateSchemaByMode: w } = useSchemaTemplateManager(), T = useTemplateBlockNotifier(), D = useCallback(
-    (z) => q(void 0, null, function* () {
+    (L) => q(void 0, null, function* () {
       T({
-        collection: z.item.name,
-        dataSource: z.item.dataSource,
+        collection: L.item.name,
+        dataSource: L.item.dataSource,
         componentType: o,
         menuName: a
       });
-      const { item: V, fromOthersInPopup: L } = z;
+      const { item: V, fromOthersInPopup: z } = L;
       if (f)
-        return f(z);
+        return f(L);
       if (V.template) {
         const G = yield w(V);
-        v(t ? t(G, { item: V, fromOthersInPopup: L }) : G);
+        v(t ? t(G, { item: V, fromOthersInPopup: z }) : G);
       } else
-        V.schemaInsertor ? yield V.schemaInsertor(v, { item: V, name: a, fromOthersInPopup: L }) : n && n({ item: V, fromOthersInPopup: L });
+        V.schemaInsertor ? yield V.schemaInsertor(v, { item: V, name: a, fromOthersInPopup: z }) : n && n({ item: V, fromOthersInPopup: z });
       I(!1);
     }),
     [
@@ -65899,8 +65977,8 @@ const DataBlockInitializer = (e) => {
     currentText: b,
     otherText: S
   }), N = useGetSchemaInitializerMenuItems(D), M = useMemo(() => N(B, a), [N, B, a]), [j, R] = useState([]), O = useMenuSearch({ data: M, openKeys: j, hideSearch: u }), $ = useMemo(() => {
-    let z = O.filter((V) => V.key !== "search" && V.key !== "empty");
-    return p && z.length === 1 ? z = z[0].children : z = O, [
+    let L = O.filter((V) => V.key !== "search" && V.key !== "empty");
+    return p && L.length === 1 ? L = L[0].children : L = O, [
       {
         key: a,
         label: F(i),
@@ -65908,15 +65986,15 @@ const DataBlockInitializer = (e) => {
         onClick: (V) => {
           V.key === a && D(P(x({}, V), { item: e }));
         },
-        children: z
+        children: L
       }
     ];
   }, [O, p, a, F, i, r, D, e]);
   return M.length > 1 || M.length === 1 && ((E = (A = M[0]) == null ? void 0 : A.children) == null ? void 0 : E.length) > 0 || y ? /* @__PURE__ */ jsx(
     SchemaInitializerMenu,
     {
-      onOpenChange: (z) => {
-        R(z);
+      onOpenChange: (L) => {
+        R(L);
       },
       items: $
     }