@nocobase/client 1.7.4 → 1.7.6

package/es/index.mjs

@@ -58,21 +58,21 @@ 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, AutoComplete as AutoComplete$1, Checkbox as Checkbox$1, ColorPicker as ColorPicker$1, List as List$1, Col, Flex, Pagination as Pagination$1, TimePicker as TimePicker$1, Row, Popconfirm, Layout as Layout$1 } from "antd";
-import _, { filter, capitalize, cloneDeep as cloneDeep$1, set, isArray, every, some, findIndex, isFunction, get, isObject as isObject$1, isEmpty as isEmpty$1, isString, omit, last, first, isEqual, concat, clone, debounce, castArray, uniqBy, differenceBy, unionBy, isBoolean, groupBy, toString, uniq as uniq$2, pick as pick$1 } from "lodash";
+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, 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, useLayoutEffect, startTransition, forwardRef, useImperativeHandle, useDeferredValue, createRef } from "react";
+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";
 import * as ReactRouterDom from "react-router-dom";
 import { useParams, useHref, useSearchParams, useLocation, useNavigate, UNSAFE_LocationContext, UNSAFE_RouteContext, UNSAFE_DataRouterContext, UNSAFE_DataRouterStateContext, Outlet, createHashRouter, createBrowserRouter, createMemoryRouter, useRouteError, RouterProvider, Router, Navigate, Link as Link$1, NavLink, useOutletContext } from "react-router-dom";
 import * as formilyShared from "@formily/shared";
 import { merge, uid, isFn, applyMiddleware, isNum as isNum$1, isStr, isBool, isArr, toArr as toArr$3, isReactElement, isValid, FormPath, each, isEmpty as isEmpty$2 } from "@formily/shared";
 import * as formilyJsonReactive from "@formily/reactive";
-import { observable, define, reaction, untracked, action, autorun, toJS, raw } from "@formily/reactive";
+import { observable, reaction, define, untracked, action, autorun, toJS, raw } from "@formily/reactive";
 import * as ReactDOM from "react-dom";
 import ReactDOM__default, { createPortal } from "react-dom";
 import * as antdCssinjs from "@ant-design/cssinjs";
 import { useStyleRegister } from "@ant-design/cssinjs";
 import * as nocobaseClientUtils from "@nocobase/utils/client";
-import { isPlainObject, tval as tval$1, toGmt, toLocal, getDefaultFormat, str2moment, getPickerFormat, Handlebars, dayjs as dayjs$1, flatten, getValuesByPath, isPortalInBody, uid as uid$1, error, getDateTimeFormat, unflatten as unflatten$1, sortTree, forEach, transformMultiColumnToSingleColumn, getDayRangeByParams, isURL, parse, nextTick, toFixedByStep, parseHTML } from "@nocobase/utils/client";
+import { isPlainObject, tval as tval$1, toGmt, toLocal, getDefaultFormat, str2moment, getPickerFormat, Handlebars, dayjs as dayjs$1, uid as uid$1, getValuesByPath, flatten, isPortalInBody, error, getDateTimeFormat, unflatten as unflatten$1, sortTree, forEach, transformMultiColumnToSingleColumn, getDayRangeByParams, isURL, parse, nextTick, toFixedByStep, parseHTML } from "@nocobase/utils/client";
 import cls from "classnames";
 import debounce$1 from "lodash/debounce";
 import { ErrorBoundary } from "react-error-boundary";
@@ -6284,7 +6284,7 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
         const B = i(R.interface);
         if (!(B != null && B.filterable))
           return;
-        const { nested: N, children: M, operators: L } = B.filterable, w = {
+        const { nested: N, children: $, operators: L } = B.filterable, w = {
           name: R.name,
           title: ((O = R == null ? void 0 : R.uiSchema) == null ? void 0 : O.title) || R.name,
           schema: R == null ? void 0 : R.uiSchema,
@@ -6294,17 +6294,17 @@ const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
         if (!(R.target && D > 2)) {
           if (D > 2)
             return w;
-          if (M != null && M.length && (w.children = M), N) {
-            const k = n(R.target), $ = I(k, D + 1).filter(Boolean);
-            w.children = w.children || [], w.children.push(...$);
+          if ($ != null && $.length && (w.children = $), N) {
+            const k = n(R.target), M = I(k, D + 1).filter(Boolean);
+            w.children = w.children || [], w.children.push(...M);
           }
           return w;
         }
       }, I = (R, D) => {
         const B = [];
         return R.forEach((N) => {
-          const M = F(N, D);
-          M && B.push(M);
+          const $ = F(N, D);
+          $ && B.push($);
         }), B;
       };
       return I(v, 1);
@@ -6568,159 +6568,7 @@ const InternalFormBlockProvider = (e) => {
     e = e.parent;
   }
   return null;
-}, setDataLoadingModeSettingsItem = {
-  name: "setDataLoadingMode",
-  Component: SetDataLoadingMode
-};
-function useDataLoadingMode() {
-  const { dataLoadingMode: e } = useDataBlockProps() || {};
-  return e || "auto";
-}
-function SetDataLoadingMode() {
-  var c;
-  const { dn: e } = useDesignable(), { t } = useTranslation(), o = useField(), n = useFieldSchema(), r = useCollection(), { getEnableFieldTree: a, getOnLoadData: i } = useCollectionState(r == null ? void 0 : r.name), { getDataBlockRequest: l } = useDataBlockRequestGetter();
-  return /* @__PURE__ */ jsx(
-    SchemaSettingsModalItem,
-    {
-      title: t("Set data loading mode"),
-      scope: { getEnableFieldTree: a, name: r == null ? void 0 : r.name, getOnLoadData: i },
-      schema: {
-        type: "object",
-        title: t("Data loading mode"),
-        properties: {
-          dataLoadingMode: {
-            "x-decorator": "FormItem",
-            "x-component": "Radio.Group",
-            default: ((c = n["x-decorator-props"]) == null ? void 0 : c.dataLoadingMode) || "auto",
-            enum: [
-              { value: "auto", label: t("Load all data when filter is empty") },
-              { value: "manual", label: t("Do not load data when filter is empty") }
-            ]
-          }
-        }
-      },
-      onSubmit: ({ dataLoadingMode: u }) => {
-        const d = l();
-        _.set(n, "x-decorator-props.dataLoadingMode", u), o.decoratorProps.dataLoadingMode = u, e.emit("patch", {
-          schema: {
-            "x-uid": n["x-uid"],
-            "x-decorator-props": x({}, n["x-decorator-props"])
-          }
-        }), e.refresh(), u === "auto" ? d.run() : d.mutate(void 0);
-      }
-    }
-  );
-}
-const useSourceKey = (e) => useCollectionManager().getSourceKeyByAssociation(e), KeepAliveContext = createContext(!0), DesignableInterceptor = ({ children: e, active: t }) => {
-  const o = useContext(SchemaComponentContext), n = useContext(SchemaOptionsContext), r = useContext(SchemaComponentsContext), a = useContext(SchemaExpressionScopeContext), i = useContext(ACLContext), l = useRef(o), c = useRef(n), u = useRef(r), d = useRef(a), p = useRef(i);
-  return t && (l.current = o, c.current = n, u.current = r, d.current = a, p.current = i), /* @__PURE__ */ jsx(SchemaComponentContext.Provider, { value: l.current, children: /* @__PURE__ */ jsx(SchemaOptionsContext.Provider, { value: c.current, children: /* @__PURE__ */ jsx(SchemaComponentsContext.Provider, { value: u.current, children: /* @__PURE__ */ jsx(SchemaExpressionScopeContext.Provider, { value: d.current, children: /* @__PURE__ */ jsx(ACLContext.Provider, { value: p.current, children: e }) }) }) }) });
-}, hidden = { display: "none" }, KeepAliveProvider = memo(
-  ({ children: e, active: t, parentActive: o }) => {
-    const n = useContext(UNSAFE_LocationContext), r = useContext(UNSAFE_RouteContext), a = useContext(UNSAFE_DataRouterContext), i = useContext(UNSAFE_DataRouterStateContext), l = useContext(IsSubPageClosedByPageMenuContext), c = useContext(Context), u = useContext(RouteContext), d = useRef(n), p = useRef(r), m = useRef(a), h = useRef(i), g = useRef(l), f = useRef(c), C = useRef(u);
-    t && (m.current = a, h.current = i, g.current = l, f.current = c, C.current = u), t && // Skip comparing location key to improve LocationContext rendering performance
-    !_.isEqual(_.omit(d.current.location, "key"), _.omit(n.location, "key")) && (d.current = n), t && !_.isEqual(p.current, r) && (p.current = r);
-    const b = /* @__PURE__ */ jsx(RouteContext.Provider, { value: C.current, children: /* @__PURE__ */ jsx(Context.Provider, { value: f.current, children: /* @__PURE__ */ jsx(UNSAFE_DataRouterContext.Provider, { value: m.current, children: /* @__PURE__ */ jsx(UNSAFE_DataRouterStateContext.Provider, { value: h.current, children: /* @__PURE__ */ jsx(UNSAFE_LocationContext.Provider, { value: d.current, children: /* @__PURE__ */ jsx(UNSAFE_RouteContext.Provider, { value: p.current, children: /* @__PURE__ */ jsx(KeepAliveContext.Provider, { value: o === !1 ? !1 : t, children: /* @__PURE__ */ jsx(DesignableInterceptor, { active: t, children: /* @__PURE__ */ jsx(IsSubPageClosedByPageMenuContext.Provider, { value: g.current, children: e }) }) }) }) }) }) }) }) });
-    return /* @__PURE__ */ jsx("div", { style: t ? null : hidden, children: b });
-  }
-), useKeepAlive = () => ({ active: useContext(KeepAliveContext) }), getMaxPageCount = () => {
-  let t = 5;
-  try {
-    const o = navigator.deviceMemory;
-    if (o)
-      return Math.min(Math.max(5, o * 3), 20);
-    const n = performance.memory;
-    if (n != null && n.jsHeapSizeLimit) {
-      const i = n.jsHeapSizeLimit / 1073741824;
-      return Math.min(Math.max(5, Math.floor(i * 3)), 20);
-    }
-    const r = performance.now();
-    for (let i = 0; i < 1e6; i++)
-      ;
-    const a = performance.now() - r;
-    return a < 3 ? t = 20 : a < 5 ? t = 10 : a < 10 && (t = 5), t;
-  } catch (o) {
-    return 5;
-  }
-}, MAX_RENDERED_PAGE_COUNT = getMaxPageCount(), KeepAlive = React.memo(({ children: e, uid: t }) => {
-  const { active: o } = useKeepAlive(), n = useRef([]);
-  return n.current.includes(t) || (n.current.push(t), n.current.length > MAX_RENDERED_PAGE_COUNT && (n.current = n.current.slice(-MAX_RENDERED_PAGE_COUNT))), /* @__PURE__ */ jsx(Fragment$1, { children: n.current.map((r) => /* @__PURE__ */ jsx(KeepAliveProvider, { active: r === t, parentActive: o, children: e(r) }, r)) });
-});
-KeepAlive.displayName = "KeepAlive";
-const DEBOUNCE_WAIT = 100, LOADING_DELAY = void 0, EMPTY_OBJECT = Object.freeze({});
-class CollectionRecord {
-  constructor(t) {
-    A(this, "data");
-    A(this, "parentRecord");
-    A(this, "isNew");
-    const { data: o, parentRecord: n, isNew: r } = t;
-    this.isNew = r, this.data = o, this.parentRecord = n;
-  }
-  setData(t) {
-    this.data = t;
-  }
-  setParentRecord(t) {
-    this.parentRecord = t;
-  }
-}
-const CollectionRecordContext = createContext(null);
-CollectionRecordContext.displayName = "CollectionRecordContext";
-const CollectionRecordProvider = React.memo(
-  ({ isNew: e, record: t, parentRecord: o, children: n }) => {
-    const r = useMemo(() => {
-      if (o)
-        return o instanceof CollectionRecord ? o : new CollectionRecord({ data: o });
-      if (t instanceof CollectionRecord)
-        return t.parentRecord;
-    }, [o, t]), a = useMemo(() => {
-      let i;
-      return t ? t instanceof CollectionRecord ? (i = t, i.isNew = t.isNew || e) : i = new CollectionRecord({ data: t, isNew: e }) : i = new CollectionRecord({ isNew: e }), i.setParentRecord(r), i;
-    }, [t, r, e]);
-    return /* @__PURE__ */ jsx(CollectionRecordContext.Provider, { value: a, children: n });
-  }
-);
-CollectionRecordProvider.displayName = "CollectionRecordProvider";
-function useCollectionRecord() {
-  return useContext(CollectionRecordContext);
-}
-function useCollectionRecordData() {
-  const e = useCollectionRecord();
-  return e == null ? void 0 : e.data;
-}
-function useCollectionParentRecord() {
-  const e = useCollectionRecord();
-  return e == null ? void 0 : e.parentRecord;
-}
-function useCollectionParentRecordData() {
-  var t;
-  const e = useCollectionRecord();
-  return (t = e == null ? void 0 : e.parentRecord) == null ? void 0 : t.data;
-}
-const DataBlockResourceContext$1 = createContext(null);
-DataBlockResourceContext$1.displayName = "DataBlockResourceContext";
-const DataBlockResourceProvider = ({ children: e }) => {
-  const t = useDataBlockProps(), o = useCollectionManager(), { association: n, collection: r, dataSource: a, sourceId: i, parentRecord: l } = t, c = useAPIClient(), u = useDataSourceHeaders(a), d = useMemo(() => typeof r == "string" ? r : r == null ? void 0 : r.name, [r]), p = useMemo(() => {
-    if (i)
-      return i;
-    if (n && l) {
-      const h = o.getSourceKeyByAssociation(n), g = l instanceof CollectionRecord ? l.data : l;
-      if (isArray(h)) {
-        const f = {};
-        for (const C of h)
-          f[C] = g == null ? void 0 : g[C];
-        return encodeURIComponent(JSON.stringify(f));
-      } else
-        return g[h];
-    }
-  }, [n, i, l]), m = useMemo(() => n ? c.resource(n, p, u, !p) : c.resource(d, void 0, u), [c, n, r, p, u]);
-  return /* @__PURE__ */ jsx(DataBlockResourceContext$1.Provider, { value: m, children: e });
-};
-function useDataBlockResource() {
-  const e = useContext(DataBlockResourceContext$1);
-  if (!e)
-    throw new Error("useDataBlockResource() must be used within a DataBlockResourceProvider");
-  return e;
-}
-const REGEX_OF_VARIABLE = /^\s*\{\{\s*([\p{L}0-9_$-.]+?)\s*\}\}\s*$/u, REGEX_OF_VARIABLE_IN_EXPRESSION = /\{\{\s*([a-zA-Z0-9_$-.]+?)\s*\}\}/g, isVariable$1 = (e) => !(typeof e != "string" || !e.match(REGEX_OF_VARIABLE)), getVariablesFromExpression = (e) => {
+}, REGEX_OF_VARIABLE = /^\s*\{\{\s*([\p{L}0-9_$-.]+?)\s*\}\}\s*$/u, REGEX_OF_VARIABLE_IN_EXPRESSION = /\{\{\s*([a-zA-Z0-9_$-.]+?)\s*\}\}/g, isVariable$1 = (e) => !(typeof e != "string" || !e.match(REGEX_OF_VARIABLE)), getVariablesFromExpression = (e) => {
   const t = e.match(REGEX_OF_VARIABLE_IN_EXPRESSION);
   return t || [];
 }, transformVariableValue = (e, t) => {
@@ -6990,6 +6838,465 @@ function getRenderContent(e, t, o, n, r) {
       }
   });
 }
+const getPath = (e) => e && e.match(REGEX_OF_VARIABLE)[0].replace(REGEX_OF_VARIABLE, "$1"), getVariableName = (e) => _.isString(e) ? getPath(e).split(".")[0] : e;
+var ActionType = /* @__PURE__ */ ((e) => (e.Visible = "visible", e.Editable = "editable", e.ReadOnly = "disabled", e.ReadPretty = "readPretty", e.None = "none", e.Hidden = "hidden", e.Required = "required", e.InRequired = "notRequired", e.Disabled = "disabled", e.Value = "value", e.Active = "enabled", e.Color = "color", e.BackgroundColor = "backgroundColor", e.TextAlign = "textAlign", e.Options = "options", e.DateScope = "dateScope", e.FontSize = "fontSize", e.FontWeight = "fontWeight", e.FontStyle = "fontStyle", e))(ActionType || {}), LinkageRuleCategory = /* @__PURE__ */ ((e) => (e.default = "default", e.style = "style", e.button = "button", e.block = "block", e))(LinkageRuleCategory || {});
+const LinkageRuleDataKeyMap = {
+  style: "x-linkage-style-rules",
+  default: "x-linkage-rules",
+  button: "x-linkage-rules",
+  block: "x-block-linkage-rules"
+};
+function bindLinkageRulesToFiled({
+  field: e,
+  linkageRules: t,
+  formValues: o,
+  localVariables: n,
+  action: r,
+  rule: a,
+  variables: i,
+  variableNameOfLeftCondition: l
+}, c) {
+  var u, d, p, m, h, g;
+  return e.initStateOfLinkageRules = {
+    display: ((u = e.initStateOfLinkageRules) == null ? void 0 : u.display) || getTempFieldState(!0, e.display),
+    required: ((d = e.initStateOfLinkageRules) == null ? void 0 : d.required) || getTempFieldState(!0, e.required || !1),
+    pattern: ((p = e.initStateOfLinkageRules) == null ? void 0 : p.pattern) || getTempFieldState(!0, e.pattern),
+    value: ((m = e.initStateOfLinkageRules) == null ? void 0 : m.value) || getTempFieldState(!0, e.value || e.initialValue),
+    dataSource: ((h = e.initStateOfLinkageRules) == null ? void 0 : h.dataSource) || getTempFieldState(!0, e.dataSource || e.options),
+    dateScope: ((g = e.initStateOfLinkageRules) == null ? void 0 : g.dateScope) || getTempFieldState(!0, null)
+  }, reaction(
+    // 这里共依赖 3 部分，当这 3 部分中的任意一部分发生变更后，需要触发联动规则：
+    // 1. 条件中的字段值；
+    // 2. 条件中的变量值；
+    // 3. value 表达式中的变量值；
+    () => (getFieldValuesInCondition({ linkageRules: t, formValues: o }), getVariableValuesInCondition({ linkageRules: t, localVariables: n }), getVariableValuesInExpression({ action: r, localVariables: n }), uid$1()),
+    getSubscriber({ action: r, field: e, rule: a, variables: i, localVariables: n, variableNameOfLeftCondition: l }, c),
+    { fireImmediately: !0, equals: _.isEqual }
+  );
+}
+function getFieldValuesInCondition({ linkageRules: e, formValues: t }) {
+  return e.map((o) => {
+    const n = (r) => {
+      const a = Object.keys(r)[0] || "$and";
+      return r[a].map((l) => {
+        if ("$and" in l || "$or" in l)
+          return n(l);
+        const c = getTargetField$1(l).join(".");
+        return getValuesByPath(t, c);
+      }).filter(Boolean);
+    };
+    return n(o.condition);
+  });
+}
+function getVariableValuesInCondition({
+  linkageRules: e,
+  localVariables: t
+}) {
+  return e.map((o) => {
+    const n = Object.keys(o.condition)[0] || "$and", r = o.condition[n];
+    return o.conditionType === "advanced" ? r.map((a) => {
+      if (!a)
+        return null;
+      if (a.$and || a.$or)
+        return getVariableValuesInCondition({
+          linkageRules: [{ conditionType: "advanced", condition: a }],
+          localVariables: t
+        });
+      const i = (l) => isVariable$1(l) ? getVariableValue$1(l, t) : l;
+      return {
+        leftVar: i(a.leftVar),
+        rightVar: i(a.rightVar)
+      };
+    }).filter(Boolean) : r.map((a) => {
+      const i = getInnermostKeyAndValue(a);
+      return i ? isVariable$1(i.value) ? getVariableValue$1(i.value, t) : i.value : null;
+    }).filter(Boolean);
+  });
+}
+function getVariableValuesInExpression({ action: e, localVariables: t }) {
+  var a;
+  const o = e.value, n = o == null ? void 0 : o.mode, r = (o == null ? void 0 : o.value) || (o == null ? void 0 : o.result);
+  if (n === "express" && r != null)
+    return (a = getVariablesFromExpression(r)) == null ? void 0 : a.map((i) => getVariableValue$1(i, t)).filter(Boolean);
+}
+function getVariableValue$1(e, t) {
+  var r;
+  if (!isVariable$1(e))
+    return;
+  const o = getVariableName(e), n = {
+    [o]: (r = t.find((a) => a.name === o)) == null ? void 0 : r.ctx
+  };
+  return getValuesByPath(n, getPath(e));
+}
+function getSubscriber({
+  action: e,
+  field: t,
+  rule: o,
+  variables: n,
+  localVariables: r,
+  variableNameOfLeftCondition: a
+}, i) {
+  return () => {
+    collectFieldStateOfLinkageRules(
+      {
+        operator: e.operator,
+        value: e.value,
+        field: t,
+        condition: o.condition,
+        variables: n,
+        localVariables: r,
+        variableNameOfLeftCondition: a,
+        action: e,
+        conditionType: o.conditionType
+      },
+      i
+    ), setTimeout(() => z(this, null, function* () {
+      var d, p, m, h, g, f, C, b;
+      const l = getFieldNameByOperator(e.operator);
+      if (!((d = t.stateOfLinkageRules) != null && d[l]))
+        return;
+      let c = t.stateOfLinkageRules[l];
+      c = yield Promise.all(c), c = c.filter((S) => S.condition);
+      const u = c[c.length - 1];
+      if (l === "value")
+        c.length > 1 && (t.value = u.value);
+      else if (l === "dateScope")
+        t.setComponentProps({
+          _maxDate: ((m = (p = u.value) == null ? void 0 : p._maxDate) == null ? void 0 : m.value) || ((h = u.value) == null ? void 0 : h._maxDate),
+          _minDate: ((f = (g = u.value) == null ? void 0 : g._minDate) == null ? void 0 : f.value) || ((C = u.value) == null ? void 0 : C._minDate)
+        });
+      else {
+        if (l === "display" && (u == null ? void 0 : u.value) === "hidden")
+          t.display = "visible", t.data = t.data || {}, t.data.hidden = !0, t.required && (t.required = !1, t.data.prevRequired = !0), requestAnimationFrame(() => {
+            t.setState((S) => {
+              S.display = "visible";
+            });
+          });
+        else if (l === "dataSource") {
+          const S = ((b = u == null ? void 0 : u.value) == null ? void 0 : b.map((y) => y.value)) || [];
+          (!Array.isArray(t.value) && !S.includes(t.value) || Array.isArray(t.value) && _.difference(t.value, S).length > 0) && (t.value = t.initialValue), t[l] = u == null ? void 0 : u.value, t.data = t.data || {}, requestAnimationFrame(() => {
+            t.setState((y) => {
+              y[l] = u == null ? void 0 : u.value;
+            });
+          });
+        } else
+          l === "display" && (u == null ? void 0 : u.value) === "visible" ? (t[l] = u == null ? void 0 : u.value, l === "display" && (u == null ? void 0 : u.value) === "visible" && (t.data = t.data || {}, t.data.hidden = !1, t.data.prevRequired && (delete t.data.prevRequired, t.required = !0)), requestAnimationFrame(() => {
+            t.setState((S) => {
+              S[l] = u == null ? void 0 : u.value;
+            });
+          })) : (t[l] = u == null ? void 0 : u.value, requestAnimationFrame(() => {
+            t.setState((S) => {
+              S[l] = u == null ? void 0 : u.value;
+            });
+          }));
+        l === "display" && (u == null ? void 0 : u.value) === "none" && (t.value = null);
+      }
+      t.stateOfLinkageRules[l] = null;
+    }));
+  };
+}
+function getFieldNameByOperator(e) {
+  switch (e) {
+    case ActionType.Required:
+    case ActionType.InRequired:
+      return "required";
+    case ActionType.Visible:
+    case ActionType.None:
+    case ActionType.Hidden:
+      return "display";
+    case ActionType.Editable:
+    case ActionType.ReadOnly:
+    case ActionType.ReadPretty:
+      return "pattern";
+    case ActionType.Value:
+      return "value";
+    case ActionType.Options:
+      return "dataSource";
+    case ActionType.DateScope:
+      return "dateScope";
+    default:
+      return null;
+  }
+}
+const collectFieldStateOfLinkageRules = ({
+  operator: e,
+  value: t,
+  field: o,
+  condition: n,
+  variables: r,
+  localVariables: a,
+  variableNameOfLeftCondition: i,
+  action: l,
+  conditionType: c
+}, u) => {
+  var S, y, v, F, I, T, R, D, B, N, $, L, w, O;
+  const d = ((S = o == null ? void 0 : o.stateOfLinkageRules) == null ? void 0 : S.required) || [(y = o == null ? void 0 : o.initStateOfLinkageRules) == null ? void 0 : y.required], p = ((v = o == null ? void 0 : o.stateOfLinkageRules) == null ? void 0 : v.display) || [(F = o == null ? void 0 : o.initStateOfLinkageRules) == null ? void 0 : F.display], m = ((I = o == null ? void 0 : o.stateOfLinkageRules) == null ? void 0 : I.pattern) || [(T = o == null ? void 0 : o.initStateOfLinkageRules) == null ? void 0 : T.pattern], h = ((R = o == null ? void 0 : o.stateOfLinkageRules) == null ? void 0 : R.value) || [(D = o == null ? void 0 : o.initStateOfLinkageRules) == null ? void 0 : D.value], g = ((B = o == null ? void 0 : o.stateOfLinkageRules) == null ? void 0 : B.dataSource) || [(N = o == null ? void 0 : o.initStateOfLinkageRules) == null ? void 0 : N.dataSource], { evaluate: f } = evaluators.get("formula.js"), C = {
+    ruleGroup: n,
+    variables: r,
+    localVariables: a,
+    variableNameOfLeftCondition: i,
+    conditionType: c
+  }, b = (($ = o == null ? void 0 : o.stateOfLinkageRules) == null ? void 0 : $.dateScope) || [(L = o == null ? void 0 : o.initStateOfLinkageRules) == null ? void 0 : L.dateScope];
+  switch (e) {
+    case ActionType.Required:
+      d.push(getTempFieldState(conditionAnalyses(C, u), !0)), o.stateOfLinkageRules = P(x({}, o.stateOfLinkageRules), {
+        required: d
+      });
+      break;
+    case ActionType.InRequired:
+      d.push(getTempFieldState(conditionAnalyses(C, u), !1)), o.stateOfLinkageRules = P(x({}, o.stateOfLinkageRules), {
+        required: d
+      });
+      break;
+    case ActionType.Visible:
+    case ActionType.None:
+    case ActionType.Hidden:
+      p.push(getTempFieldState(conditionAnalyses(C, u), e)), o.stateOfLinkageRules = P(x({}, o.stateOfLinkageRules), {
+        display: p
+      });
+      break;
+    case ActionType.Editable:
+    case ActionType.ReadOnly:
+    case ActionType.ReadPretty:
+      m.push(getTempFieldState(conditionAnalyses(C, u), e)), o.stateOfLinkageRules = P(x({}, o.stateOfLinkageRules), {
+        pattern: m
+      });
+      break;
+    case ActionType.Value:
+      {
+        const j = () => z(void 0, null, function* () {
+          var k;
+          if ((t == null ? void 0 : t.mode) === "express") {
+            if ((t.value || t.result) == null)
+              return;
+            const { exp: M, scope: q } = yield replaceVariables(t.value || t.result, {
+              variables: r,
+              localVariables: a
+            });
+            try {
+              return f(M, x({ now: () => (/* @__PURE__ */ new Date()).toString() }, q));
+            } catch (E) {
+              console.error(E);
+            }
+          } else
+            return (t == null ? void 0 : t.mode) === "constant" ? (k = t == null ? void 0 : t.value) != null ? k : t : null;
+        });
+        isConditionEmpty(n) ? h.push(getTempFieldState(!0, j())) : h.push(getTempFieldState(conditionAnalyses(C, u), j())), o.stateOfLinkageRules = P(x({}, o.stateOfLinkageRules), {
+          value: h
+        });
+      }
+      break;
+    case ActionType.Options:
+      {
+        const j = (O = (w = o.data) == null ? void 0 : w.dataSource) == null ? void 0 : O.filter((k) => t.value.includes(k.value));
+        g.push(getTempFieldState(conditionAnalyses(C, u), j || [])), o.stateOfLinkageRules = P(x({}, o.stateOfLinkageRules), {
+          dataSource: g
+        });
+      }
+      break;
+    case ActionType.DateScope: {
+      b.push(
+        getTempFieldState(conditionAnalyses(C, u), {
+          _maxDate: l._maxDate,
+          _minDate: l._minDate
+        })
+      ), o.stateOfLinkageRules = P(x({}, o.stateOfLinkageRules), {
+        dateScope: b
+      });
+      break;
+    }
+    default:
+      return null;
+  }
+};
+function getTempFieldState(e, t) {
+  return z(this, null, function* () {
+    return [e, t] = yield Promise.all([e, t]), {
+      condition: e,
+      value: t
+    };
+  });
+}
+function isConditionEmpty(e) {
+  const t = Object.keys(e)[0] || "$and", o = e[t];
+  return _.isEmpty(o);
+}
+function replaceVariables(n, r) {
+  return z(this, arguments, function* (e, {
+    variables: t,
+    localVariables: o
+  }) {
+    var c;
+    const a = {}, i = {};
+    if (e == null)
+      return;
+    const l = (c = e.match(REGEX_OF_VARIABLE_IN_EXPRESSION)) == null ? void 0 : c.map((u) => z(this, null, function* () {
+      const { value: d } = yield t.parseVariable(u, o), p = `_${uid$1()}`;
+      return i[p] = d, a[u] = p, d;
+    }));
+    return l && (yield Promise.all(l)), {
+      exp: e.replace(REGEX_OF_VARIABLE_IN_EXPRESSION, (u) => `{{${a[u] || u}}}`),
+      scope: i
+    };
+  });
+}
+const getVariableValue = (e, t) => z(void 0, null, function* () {
+  if (!e)
+    return e;
+  const { evaluate: o } = evaluators.get("string"), { exp: n, scope: r } = yield replaceVariables(e, t);
+  return o(n, x({ now: () => (/* @__PURE__ */ new Date()).toString() }, r));
+}), setDataLoadingModeSettingsItem = {
+  name: "setDataLoadingMode",
+  Component: SetDataLoadingMode
+};
+function useDataLoadingMode() {
+  const { dataLoadingMode: e } = useDataBlockProps() || {};
+  return e || "auto";
+}
+function SetDataLoadingMode() {
+  var c;
+  const { dn: e } = useDesignable(), { t } = useTranslation(), o = useField(), n = useFieldSchema(), r = useCollection(), { getEnableFieldTree: a, getOnLoadData: i } = useCollectionState(r == null ? void 0 : r.name), { getDataBlockRequest: l } = useDataBlockRequestGetter();
+  return /* @__PURE__ */ jsx(
+    SchemaSettingsModalItem,
+    {
+      title: t("Set data loading mode"),
+      scope: { getEnableFieldTree: a, name: r == null ? void 0 : r.name, getOnLoadData: i },
+      schema: {
+        type: "object",
+        title: t("Data loading mode"),
+        properties: {
+          dataLoadingMode: {
+            "x-decorator": "FormItem",
+            "x-component": "Radio.Group",
+            default: ((c = n["x-decorator-props"]) == null ? void 0 : c.dataLoadingMode) || "auto",
+            enum: [
+              { value: "auto", label: t("Load all data when filter is empty") },
+              { value: "manual", label: t("Do not load data when filter is empty") }
+            ]
+          }
+        }
+      },
+      onSubmit: ({ dataLoadingMode: u }) => {
+        const d = l();
+        _.set(n, "x-decorator-props.dataLoadingMode", u), o.decoratorProps.dataLoadingMode = u, e.emit("patch", {
+          schema: {
+            "x-uid": n["x-uid"],
+            "x-decorator-props": x({}, n["x-decorator-props"])
+          }
+        }), e.refresh(), u === "auto" ? d.run() : d.mutate(void 0);
+      }
+    }
+  );
+}
+const useSourceKey = (e) => useCollectionManager().getSourceKeyByAssociation(e), KeepAliveContext = createContext(!0), DesignableInterceptor = ({ children: e, active: t }) => {
+  const o = useContext(SchemaComponentContext), n = useContext(SchemaOptionsContext), r = useContext(SchemaComponentsContext), a = useContext(SchemaExpressionScopeContext), i = useContext(ACLContext), l = useRef(o), c = useRef(n), u = useRef(r), d = useRef(a), p = useRef(i);
+  return t && (l.current = o, c.current = n, u.current = r, d.current = a, p.current = i), /* @__PURE__ */ jsx(SchemaComponentContext.Provider, { value: l.current, children: /* @__PURE__ */ jsx(SchemaOptionsContext.Provider, { value: c.current, children: /* @__PURE__ */ jsx(SchemaComponentsContext.Provider, { value: u.current, children: /* @__PURE__ */ jsx(SchemaExpressionScopeContext.Provider, { value: d.current, children: /* @__PURE__ */ jsx(ACLContext.Provider, { value: p.current, children: e }) }) }) }) });
+}, hidden = { display: "none" }, KeepAliveProvider = memo(
+  ({ children: e, active: t, parentActive: o }) => {
+    const n = useContext(UNSAFE_LocationContext), r = useContext(UNSAFE_RouteContext), a = useContext(UNSAFE_DataRouterContext), i = useContext(UNSAFE_DataRouterStateContext), l = useContext(IsSubPageClosedByPageMenuContext), c = useContext(Context), u = useContext(RouteContext), d = useRef(n), p = useRef(r), m = useRef(a), h = useRef(i), g = useRef(l), f = useRef(c), C = useRef(u);
+    t && (m.current = a, h.current = i, g.current = l, f.current = c, C.current = u), t && // Skip comparing location key to improve LocationContext rendering performance
+    !_.isEqual(_.omit(d.current.location, "key"), _.omit(n.location, "key")) && (d.current = n), t && !_.isEqual(p.current, r) && (p.current = r);
+    const b = /* @__PURE__ */ jsx(RouteContext.Provider, { value: C.current, children: /* @__PURE__ */ jsx(Context.Provider, { value: f.current, children: /* @__PURE__ */ jsx(UNSAFE_DataRouterContext.Provider, { value: m.current, children: /* @__PURE__ */ jsx(UNSAFE_DataRouterStateContext.Provider, { value: h.current, children: /* @__PURE__ */ jsx(UNSAFE_LocationContext.Provider, { value: d.current, children: /* @__PURE__ */ jsx(UNSAFE_RouteContext.Provider, { value: p.current, children: /* @__PURE__ */ jsx(KeepAliveContext.Provider, { value: o === !1 ? !1 : t, children: /* @__PURE__ */ jsx(DesignableInterceptor, { active: t, children: /* @__PURE__ */ jsx(IsSubPageClosedByPageMenuContext.Provider, { value: g.current, children: e }) }) }) }) }) }) }) }) });
+    return /* @__PURE__ */ jsx("div", { style: t ? null : hidden, children: b });
+  }
+), useKeepAlive = () => ({ active: useContext(KeepAliveContext) }), getMaxPageCount = () => {
+  let t = 5;
+  try {
+    const o = navigator.deviceMemory;
+    if (o)
+      return Math.min(Math.max(5, o * 3), 20);
+    const n = performance.memory;
+    if (n != null && n.jsHeapSizeLimit) {
+      const i = n.jsHeapSizeLimit / 1073741824;
+      return Math.min(Math.max(5, Math.floor(i * 3)), 20);
+    }
+    const r = performance.now();
+    for (let i = 0; i < 1e6; i++)
+      ;
+    const a = performance.now() - r;
+    return a < 3 ? t = 20 : a < 5 ? t = 10 : a < 10 && (t = 5), t;
+  } catch (o) {
+    return 5;
+  }
+}, MAX_RENDERED_PAGE_COUNT = getMaxPageCount(), KeepAlive = React.memo(({ children: e, uid: t }) => {
+  const { active: o } = useKeepAlive(), n = useRef([]);
+  return n.current.includes(t) || (n.current.push(t), n.current.length > MAX_RENDERED_PAGE_COUNT && (n.current = n.current.slice(-MAX_RENDERED_PAGE_COUNT))), /* @__PURE__ */ jsx(Fragment$1, { children: n.current.map((r) => /* @__PURE__ */ jsx(KeepAliveProvider, { active: r === t, parentActive: o, children: e(r) }, r)) });
+});
+KeepAlive.displayName = "KeepAlive";
+const DEBOUNCE_WAIT = 100, LOADING_DELAY = void 0, EMPTY_OBJECT = Object.freeze({});
+class CollectionRecord {
+  constructor(t) {
+    A(this, "data");
+    A(this, "parentRecord");
+    A(this, "isNew");
+    const { data: o, parentRecord: n, isNew: r } = t;
+    this.isNew = r, this.data = o, this.parentRecord = n;
+  }
+  setData(t) {
+    this.data = t;
+  }
+  setParentRecord(t) {
+    this.parentRecord = t;
+  }
+}
+const CollectionRecordContext = createContext(null);
+CollectionRecordContext.displayName = "CollectionRecordContext";
+const CollectionRecordProvider = React.memo(
+  ({ isNew: e, record: t, parentRecord: o, children: n }) => {
+    const r = useMemo(() => {
+      if (o)
+        return o instanceof CollectionRecord ? o : new CollectionRecord({ data: o });
+      if (t instanceof CollectionRecord)
+        return t.parentRecord;
+    }, [o, t]), a = useMemo(() => {
+      let i;
+      return t ? t instanceof CollectionRecord ? (i = t, i.isNew = t.isNew || e) : i = new CollectionRecord({ data: t, isNew: e }) : i = new CollectionRecord({ isNew: e }), i.setParentRecord(r), i;
+    }, [t, r, e]);
+    return /* @__PURE__ */ jsx(CollectionRecordContext.Provider, { value: a, children: n });
+  }
+);
+CollectionRecordProvider.displayName = "CollectionRecordProvider";
+function useCollectionRecord() {
+  return useContext(CollectionRecordContext);
+}
+function useCollectionRecordData() {
+  const e = useCollectionRecord();
+  return e == null ? void 0 : e.data;
+}
+function useCollectionParentRecord() {
+  const e = useCollectionRecord();
+  return e == null ? void 0 : e.parentRecord;
+}
+function useCollectionParentRecordData() {
+  var t;
+  const e = useCollectionRecord();
+  return (t = e == null ? void 0 : e.parentRecord) == null ? void 0 : t.data;
+}
+const DataBlockResourceContext$1 = createContext(null);
+DataBlockResourceContext$1.displayName = "DataBlockResourceContext";
+const DataBlockResourceProvider = ({ children: e }) => {
+  const t = useDataBlockProps(), o = useCollectionManager(), { association: n, collection: r, dataSource: a, sourceId: i, parentRecord: l } = t, c = useAPIClient(), u = useDataSourceHeaders(a), d = useMemo(() => typeof r == "string" ? r : r == null ? void 0 : r.name, [r]), p = useMemo(() => {
+    if (i)
+      return i;
+    if (n && l) {
+      const h = o.getSourceKeyByAssociation(n), g = l instanceof CollectionRecord ? l.data : l;
+      if (isArray(h)) {
+        const f = {};
+        for (const C of h)
+          f[C] = g == null ? void 0 : g[C];
+        return encodeURIComponent(JSON.stringify(f));
+      } else
+        return g[h];
+    }
+  }, [n, i, l]), m = useMemo(() => n ? c.resource(n, p, u, !p) : c.resource(d, void 0, u), [c, n, r, p, u]);
+  return /* @__PURE__ */ jsx(DataBlockResourceContext$1.Provider, { value: m, children: e });
+};
+function useDataBlockResource() {
+  const e = useContext(DataBlockResourceContext$1);
+  if (!e)
+    throw new Error("useDataBlockResource() must be used within a DataBlockResourceProvider");
+  return e;
+}
 const defaultTheme = {
   name: "",
   token: {
@@ -7945,7 +8252,7 @@ function withInitializer(e) {
           S ? S(y(O, { isInSubTable: a })) : r(d, y(O, { isInSubTable: a }), { onSuccess: p });
         },
         [S, y, a, r, d, p]
-      ), { wrapSSR: F, hashId: I, componentCls: T } = useSchemaInitializerStyles(), [R, D] = useState(!1), { token: B } = theme.useToken(), N = useNiceDropdownMaxHeight([R]), M = useMemo(
+      ), { wrapSSR: F, hashId: I, componentCls: T } = useSchemaInitializerStyles(), [R, D] = useState(!1), { token: B } = theme.useToken(), N = useNiceDropdownMaxHeight([R]), $ = useMemo(
         () => x({
           options: o,
           style: C
@@ -7985,7 +8292,7 @@ function withInitializer(e) {
                 options: o,
                 insert: v
               },
-              children: f === !1 ? React.createElement(e, M) : /* @__PURE__ */ jsx(
+              children: f === !1 ? React.createElement(e, $) : /* @__PURE__ */ jsx(
                 Popover,
                 P(x({
                   zIndex: 9999,
@@ -8013,7 +8320,7 @@ function withInitializer(e) {
                       }
                     ) })
                   ),
-                  children: React.createElement(e, M)
+                  children: React.createElement(e, $)
                 })
               )
             }
@@ -8385,7 +8692,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.7.4", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.7.6", 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",
@@ -8406,9 +8713,9 @@ const name = "@nocobase/client", version = "1.7.4", license = "AGPL-3.0", main =
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.7.4",
-  "@nocobase/sdk": "1.7.4",
-  "@nocobase/utils": "1.7.4",
+  "@nocobase/evaluators": "1.7.6",
+  "@nocobase/sdk": "1.7.6",
+  "@nocobase/utils": "1.7.6",
   ahooks: "^3.7.2",
   antd: "5.24.2",
   "antd-style": "3.7.1",
@@ -9050,7 +9357,7 @@ const useFieldComponentOptions = () => {
   typeof t != "function" && (n = useDef$4);
   const r = n();
   return x(x({}, o), r);
-}, getPath = (e) => e && e.match(REGEX_OF_VARIABLE)[0].replace(REGEX_OF_VARIABLE, "$1"), getVariableName = (e) => _.isString(e) ? getPath(e).split(".")[0] : e;
+};
 function useParsedFilter({ filterOption: e }) {
   const { parseFilter: t, findVariable: o } = useParseDataScopeFilter(), [n, r] = useState({}), [a, i] = useState(!!e);
   return useEffect(() => {
@@ -9132,17 +9439,10 @@ const key = "__isNewRecord__", isNewRecord = (e) => untracked(() => !!(e != null
   return !!((e = useDataBlockRequest()) != null && e.loading);
 }, withSkeletonComponent = (e, t) => {
   const { useLoading: o = useDefaultLoading, displayName: n, SkeletonComponent: r = Skeleton } = t || {}, a = React.memo((i) => {
-    const l = o(), c = useRef(!1);
-    return !c.current && l ? /* @__PURE__ */ jsx(r, {}) : (c.current = !0, /* @__PURE__ */ jsx(e, x({}, i)));
+    const l = o(), c = useRef(!1), u = useDeferredValue(l);
+    return !c.current && u ? /* @__PURE__ */ jsx(r, {}) : (c.current = !0, /* @__PURE__ */ jsx(e, x({}, i)));
   });
   return a.displayName = n || `${e.displayName}(withSkeletonComponent)` || `${e.name}(withSkeletonComponent)`, a;
-};
-var ActionType = /* @__PURE__ */ ((e) => (e.Visible = "visible", e.Editable = "editable", e.ReadOnly = "disabled", e.ReadPretty = "readPretty", e.None = "none", e.Hidden = "hidden", e.Required = "required", e.InRequired = "notRequired", e.Disabled = "disabled", e.Value = "value", e.Active = "enabled", e.Color = "color", e.BackgroundColor = "backgroundColor", e.TextAlign = "textAlign", e.Options = "options", e.DateScope = "dateScope", e.FontSize = "fontSize", e.FontWeight = "fontWeight", e.FontStyle = "fontStyle", e))(ActionType || {}), LinkageRuleCategory = /* @__PURE__ */ ((e) => (e.default = "default", e.style = "style", e.button = "button", e.block = "block", e))(LinkageRuleCategory || {});
-const LinkageRuleDataKeyMap = {
-  style: "x-linkage-style-rules",
-  default: "x-linkage-rules",
-  button: "x-linkage-rules",
-  block: "x-block-linkage-rules"
 }, getActionValue = (e, t) => {
   const o = (n) => (n == null ? void 0 : n.mode) === "constant" ? n.value : null;
   switch (!0) {
@@ -9570,11 +9870,11 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: o, filterProper
       }
     `, [n.paddingContentVerticalLG, n.marginSM, n.margin]), b = useCollection(), S = useMemo(() => withTooltipComponent(NocoBaseRecursionField), []), y = useMemo(
     () => d == null ? void 0 : d.map((F) => {
-      var M, L, w, O;
+      var $, L, w, O;
       const I = F.reduceProperties((j, k) => {
         if (isCollectionFieldComponent(k))
           return j.concat([k]);
-      }, []), T = (I == null ? void 0 : I.length) > 0 ? I[0].name : F.name, R = !!((M = F["x-component-props"]) != null && M.columnHidden), { uiSchema: D, defaultValue: B, interface: N } = (b == null ? void 0 : b.getField(T)) || {};
+      }, []), T = (I == null ? void 0 : I.length) > 0 ? I[0].name : F.name, R = !!(($ = F["x-component-props"]) != null && $.columnHidden), { uiSchema: D, defaultValue: B, interface: N } = (b == null ? void 0 : b.getField(T)) || {};
       return F.title = o(F == null ? void 0 : F.title, { ns: NAMESPACE_UI_SCHEMA }), D && (D.default = B), P(x({
         title: /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: g, children: /* @__PURE__ */ jsx(
           S,
@@ -9592,7 +9892,7 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: o, filterProper
         columnHidden: R
       }, F["x-component-props"]), {
         width: R && !l ? 0 : ((O = F["x-component-props"]) == null ? void 0 : O.width) || 100,
-        render: (j, k, $) => /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: g, children: /* @__PURE__ */ jsx(
+        render: (j, k, M) => /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: g, children: /* @__PURE__ */ jsx(
           TableCellRender,
           {
             record: k,
@@ -9601,7 +9901,7 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: o, filterProper
             filterProperties: f,
             schemaToolbarBigger: C,
             field: r,
-            index: $
+            index: M
           }
         ) }),
         onCell: (j, k) => ({
@@ -9971,8 +10271,8 @@ const Table$2 = withDynamicSchemaProps(
         "loading",
         "onClickRow",
         "value"
-      ]), y = useArrayField$1(S), v = useFieldSchema(), { size: F = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, I = useCollection(), R = ((be = v == null ? void 0 : v.parent) == null ? void 0 : be["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: B, enableIndexÏColumn: N } = R, M = useMemoizedFn(S.onRowDragEnd || (() => {
-      })), L = usePaginationProps$3(o, a, e), w = useTableColumns$2(S, L), [O, j] = useState(() => D ? B : []), [k, $] = useState(((Se = y == null ? void 0 : y.data) == null ? void 0 : Se.selectedRowKeys) || []), [q, E] = useState([]), V = (p == null ? void 0 : p.type) !== "none", G = useRef(/* @__PURE__ */ new Map()), U = useMemo(() => css`
+      ]), y = useArrayField$1(S), v = useFieldSchema(), { size: F = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, I = useCollection(), R = ((be = v == null ? void 0 : v.parent) == null ? void 0 : be["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: B, enableIndexÏColumn: N } = R, $ = useMemoizedFn(S.onRowDragEnd || (() => {
+      })), L = usePaginationProps$3(o, a, e), w = useTableColumns$2(S, L), [O, j] = useState(() => D ? B : []), [k, M] = useState(((Se = y == null ? void 0 : y.data) == null ? void 0 : Se.selectedRowKeys) || []), [q, E] = useState([]), V = (p == null ? void 0 : p.type) !== "none", G = useRef(/* @__PURE__ */ new Map()), U = useMemo(() => css`
           & > td {
             background-color: ${t.controlItemBgActive} !important;
           }
@@ -9983,8 +10283,8 @@ const Table$2 = withDynamicSchemaProps(
       useEffect(() => {
         var Z;
         H != null && H.field && (H.field.data = ((Z = H.field) == null ? void 0 : Z.data) || {}, H.field.data.clearSelectedRowKeys = () => {
-          H.field.data.selectedRowKeys = [], $([]);
-        }, H.field.data.setSelectedRowKeys = $);
+          H.field.data.selectedRowKeys = [], M([]);
+        }, H.field.data.setSelectedRowKeys = M);
       }, [H == null ? void 0 : H.field]);
       const Y = useMemo(() => C ? U : "", [U, C]), J = useMemo(() => C ? (Z, ne) => ({
         onClick: (re) => {
@@ -10026,10 +10326,10 @@ const Table$2 = withDynamicSchemaProps(
             return;
           }
           const ae = (Pe = (ve = (ye = re.active) == null ? void 0 : ye.data.current) == null ? void 0 : ve.sortable) == null ? void 0 : Pe.index, le = (Ae = (Ie = (Fe = re.over) == null ? void 0 : Fe.data.current) == null ? void 0 : Ie.sortable) == null ? void 0 : Ae.index, ge = (b == null ? void 0 : b[ae]) || re.active, Re = (b == null ? void 0 : b[le]) || re.over;
-          y.move(ae, le), M({ from: ge, to: Re });
+          y.move(ae, le), $({ from: ge, to: Re });
         }, []);
         return /* @__PURE__ */ jsx(DndContext, { onDragEnd: ne, children: /* @__PURE__ */ jsx("tbody", x({}, Z)) });
-      }, [y, M]);
+      }, [y, $]);
       ee.displayName = "BodyWrapperComponent";
       const oe = useMemo(() => ({
         header: {
@@ -10047,7 +10347,7 @@ const Table$2 = withDynamicSchemaProps(
             type: "checkbox",
             selectedRowKeys: k,
             onChange(Z, ne) {
-              y.data = y.data || {}, y.data.selectedRowKeys = Z, y.data.selectedRowData = ne, $(Z), u == null || u(Z, ne, $);
+              y.data = y.data || {}, y.data.selectedRowKeys = Z, y.data.selectedRowData = ne, M(Z), u == null || u(Z, ne, M);
             },
             onSelect: (Z, ne, re, ae) => {
               var le;
@@ -10351,11 +10651,11 @@ const InternalTableBlockProvider = (e) => {
     [t, p]
   ), b = useCallback(
     (w, O) => {
-      var k, $;
+      var k, M;
       if (!w)
         return [];
       const j = (k = p(O)) == null ? void 0 : k.getCollection(w);
-      return (($ = j == null ? void 0 : j.getAllFields) == null ? void 0 : $.call(j)) || (j == null ? void 0 : j.getFields()) || [];
+      return ((M = j == null ? void 0 : j.getAllFields) == null ? void 0 : M.call(j)) || (j == null ? void 0 : j.getFields()) || [];
     },
     [t, p]
   ), S = useCallback(
@@ -10390,7 +10690,7 @@ const InternalTableBlockProvider = (e) => {
     (w, O, j, k) => {
       var Q;
       const {
-        association: $ = !1,
+        association: M = !1,
         cached: q = {},
         collectionNames: E = [w],
         maxDepth: V = 1,
@@ -10406,14 +10706,14 @@ const InternalTableBlockProvider = (e) => {
         return _.cloneDeep(q[w]);
       O && typeof O == "string" && (O = [O]), j && typeof j == "string" && (j = [j]);
       const K = b(w, J), X = (Q = K == null ? void 0 : K.filter(
-        (ee) => ee.interface && !U.includes(ee.interface) && (G || O && O.includes(ee.type) || j && j.includes(ee.interface) || ($ && ee.target && ee.target !== w && Array.isArray($) ? $.includes(ee.interface) : !1))
+        (ee) => ee.interface && !U.includes(ee.interface) && (G || O && O.includes(ee.type) || j && j.includes(ee.interface) || (M && ee.target && ee.target !== w && Array.isArray(M) ? M.includes(ee.interface) : !1))
       )) == null ? void 0 : Q.map((ee) => {
         var te, se;
         const oe = x({
           value: Y && H ? `${H}.${ee.name}` : ee.name,
           label: f((te = ee == null ? void 0 : ee.uiSchema) == null ? void 0 : te.title) || ee.name
         }, ee);
-        return $ && ee.target && (oe.children = E.includes(ee.target) ? [] : I(ee.target, O, j, P(x({}, k), {
+        return M && ee.target && (oe.children = E.includes(ee.target) ? [] : I(ee.target, O, j, P(x({}, k), {
           cached: q,
           dataSource: J,
           collectionNames: [...E, ee.target],
@@ -10451,10 +10751,10 @@ const InternalTableBlockProvider = (e) => {
       return (O = B(w.interface)) == null ? void 0 : O.titleUsable;
     },
     [B]
-  ), M = useCallback(
+  ), $ = useCallback(
     (w, O, j) => {
-      var k, $;
-      return ($ = (k = p(j)) == null ? void 0 : k.getCollection(O)) == null ? void 0 : $.getParentCollectionFields(w);
+      var k, M;
+      return (M = (k = p(j)) == null ? void 0 : k.getCollection(O)) == null ? void 0 : M.getParentCollectionFields(w);
     },
     [t, p]
   ), L = useCallback(
@@ -10469,7 +10769,7 @@ const InternalTableBlockProvider = (e) => {
     getTemplate: L,
     getInterface: B,
     getCollections: d,
-    getParentCollectionFields: M,
+    getParentCollectionFields: $,
     getInheritCollections: y,
     getChildrenCollections: v,
     refreshCM: g,
@@ -10690,14 +10990,14 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
       popupUid: O,
       recordData: j,
       sourceId: k,
-      collection: $,
+      collection: M,
       puid: q
     }) => {
       const E = c.getFilterByTK(u || l, j);
       return getPopupPathFromParams({
         popupuid: O,
         puid: q,
-        collection: $,
+        collection: M,
         filterbytk: E,
         sourceid: k,
         tab: w
@@ -10717,11 +11017,11 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
       parentRecordData: O,
       collectionNameUsedInURL: j,
       popupUidUsedInURL: k,
-      customActionSchema: $
+      customActionSchema: M
     } = {}) => {
       if (!f())
         return I == null ? void 0 : I(!0);
-      const q = $ || n, E = q == null ? void 0 : q["x-uid"], V = y(O);
+      const q = M || n, E = q == null ? void 0 : q["x-uid"], V = y(O);
       w = w || (a == null ? void 0 : a.data);
       const G = T({
         popupUid: E,
@@ -10741,7 +11041,7 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
         association: u,
         sourceId: V,
         tableBlockContext: P(x({}, F), { collection: l == null ? void 0 : l.name, blockData: v })
-      }), b(R(), $), q.properties) {
+      }), b(R(), M), q.properties) {
         const H = h + 1;
         if (getPopupLayerState(H))
           return;
@@ -10796,7 +11096,7 @@ ${JSON.stringify(q, null, 2)}`
       });
     },
     [T, t, m == null ? void 0 : m.popupuid, a == null ? void 0 : a.data, o]
-  ), M = useCallback((w, O) => {
+  ), $ = useCallback((w, O) => {
     O.__popup = w;
   }, []), L = useCallback((w) => w.__popup, []);
   return {
@@ -10808,7 +11108,7 @@ ${JSON.stringify(q, null, 2)}`
      * used to close popup by changing the url
      */
     closePopup: B,
-    savePopupSchemaToSchema: M,
+    savePopupSchemaToSchema: $,
     getPopupSchemaFromSchema: L,
     context: S,
     /**
@@ -11643,13 +11943,19 @@ const designerCss$4 = ({ margin: e = "-18px -16px", padding: t = "18px 16px" } =
   }, [e, t]);
   return t ? o : [];
 }, TableColumnDecorator$1 = (e) => {
+  var m, h;
   const t = useDesigner(), o = useField(), { fieldSchema: n, uiSchema: r, collectionField: a } = useColumnSchema$1(), { designable: i } = useSchemaComponentContext(), l = useCompile(), { isInSubTable: c } = useFlag() || {}, { token: u } = useToken$1(), { name: d } = (useBlockContext == null ? void 0 : useBlockContext()) || {};
+  let p = n == null ? void 0 : n.required;
+  if (c) {
+    const g = (h = o.path) == null ? void 0 : h.splice(((m = o.path) == null ? void 0 : m.length) - 1, 1), f = o.form.query(`${g.concat("*." + n.name)}`).take();
+    p = typeof (f == null ? void 0 : f.required) == "boolean" ? f.required : n == null ? void 0 : n.required;
+  }
   return useEffect(() => {
     o.title || n && r != null && r.title && (o.title = r == null ? void 0 : r.title);
   }, [r == null ? void 0 : r.title]), !i || t.isNullComponent ? /* @__PURE__ */ jsxs(CollectionFieldContext.Provider, { value: a, children: [
     /* @__PURE__ */ jsx(t, { fieldSchema: n, uiSchema: r, collectionField: a }),
     /* @__PURE__ */ jsxs("span", { role: "button", children: [
-      (n == null ? void 0 : n.required) && /* @__PURE__ */ jsx("span", { className: "ant-formily-item-asterisk", children: "*" }),
+      p && /* @__PURE__ */ jsx("span", { className: "ant-formily-item-asterisk", children: "*" }),
       /* @__PURE__ */ jsx("span", { children: (o == null ? void 0 : o.title) || l(r == null ? void 0 : r.title) })
     ] })
   ] }) : /* @__PURE__ */ jsx(
@@ -11662,7 +11968,7 @@ const designerCss$4 = ({ margin: e = "-18px -16px", padding: t = "18px 16px" } =
       children: /* @__PURE__ */ jsx(CollectionFieldContext.Provider, { value: a, children: /* @__PURE__ */ jsxs(BlockContext.Provider, { value: { name: c ? d : "taleColumn" }, children: [
         /* @__PURE__ */ jsx(t, { fieldSchema: n, uiSchema: r, collectionField: a }),
         /* @__PURE__ */ jsxs("span", { role: "button", children: [
-          (n == null ? void 0 : n.required) && /* @__PURE__ */ jsx("span", { className: "ant-formily-item-asterisk", children: "*" }),
+          p && /* @__PURE__ */ jsx("span", { className: "ant-formily-item-asterisk", children: "*" }),
           /* @__PURE__ */ jsx("span", { children: (o == null ? void 0 : o.title) || l(r == null ? void 0 : r.title) })
         ] })
       ] }) })
@@ -11862,307 +12168,7 @@ const SchemaToolbarErrorFallback = (e) => {
       });
     }
   }
-];
-function bindLinkageRulesToFiled({
-  field: e,
-  linkageRules: t,
-  formValues: o,
-  localVariables: n,
-  action: r,
-  rule: a,
-  variables: i,
-  variableNameOfLeftCondition: l
-}, c) {
-  var u, d, p, m, h, g;
-  return e.initStateOfLinkageRules = {
-    display: ((u = e.initStateOfLinkageRules) == null ? void 0 : u.display) || getTempFieldState(!0, e.display),
-    required: ((d = e.initStateOfLinkageRules) == null ? void 0 : d.required) || getTempFieldState(!0, e.required || !1),
-    pattern: ((p = e.initStateOfLinkageRules) == null ? void 0 : p.pattern) || getTempFieldState(!0, e.pattern),
-    value: ((m = e.initStateOfLinkageRules) == null ? void 0 : m.value) || getTempFieldState(!0, e.value || e.initialValue),
-    dataSource: ((h = e.initStateOfLinkageRules) == null ? void 0 : h.dataSource) || getTempFieldState(!0, e.dataSource || e.options),
-    dateScope: ((g = e.initStateOfLinkageRules) == null ? void 0 : g.dateScope) || getTempFieldState(!0, null)
-  }, reaction(
-    // 这里共依赖 3 部分，当这 3 部分中的任意一部分发生变更后，需要触发联动规则：
-    // 1. 条件中的字段值；
-    // 2. 条件中的变量值；
-    // 3. value 表达式中的变量值；
-    () => {
-      const f = getFieldValuesInCondition({ linkageRules: t, formValues: o }), C = getVariableValuesInCondition({ linkageRules: t, localVariables: n }), b = getVariableValuesInExpression({ action: r, localVariables: n });
-      return [f, C, b].map((y) => JSON.stringify(y)).join(",");
-    },
-    getSubscriber({ action: r, field: e, rule: a, variables: i, localVariables: n, variableNameOfLeftCondition: l }, c),
-    { fireImmediately: !0, equals: _.isEqual }
-  );
-}
-function getFieldValuesInCondition({ linkageRules: e, formValues: t }) {
-  return e.map((o) => {
-    const n = (r) => {
-      const a = Object.keys(r)[0] || "$and";
-      return r[a].map((l) => {
-        if ("$and" in l || "$or" in l)
-          return n(l);
-        const c = getTargetField$1(l).join(".");
-        return getValuesByPath(t, c);
-      }).filter(Boolean);
-    };
-    return n(o.condition);
-  });
-}
-function getVariableValuesInCondition({
-  linkageRules: e,
-  localVariables: t
-}) {
-  return e.map((o) => {
-    const n = Object.keys(o.condition)[0] || "$and", r = o.condition[n];
-    return o.conditionType === "advanced" ? r.map((a) => {
-      if (!a)
-        return null;
-      if (a.$and || a.$or)
-        return getVariableValuesInCondition({
-          linkageRules: [{ conditionType: "advanced", condition: a }],
-          localVariables: t
-        });
-      const i = (l) => isVariable$1(l) ? getVariableValue$1(l, t) : l;
-      return {
-        leftVar: i(a.leftVar),
-        rightVar: i(a.rightVar)
-      };
-    }).filter(Boolean) : r.map((a) => {
-      const i = getInnermostKeyAndValue(a);
-      return i ? isVariable$1(i.value) ? getVariableValue$1(i.value, t) : i.value : null;
-    }).filter(Boolean);
-  });
-}
-function getVariableValuesInExpression({ action: e, localVariables: t }) {
-  var a;
-  const o = e.value, n = o == null ? void 0 : o.mode, r = (o == null ? void 0 : o.value) || (o == null ? void 0 : o.result);
-  if (n === "express" && r != null)
-    return (a = getVariablesFromExpression(r)) == null ? void 0 : a.map((i) => getVariableValue$1(i, t)).filter(Boolean);
-}
-function getVariableValue$1(e, t) {
-  var r;
-  if (!isVariable$1(e))
-    return;
-  const o = getVariableName(e), n = {
-    [o]: (r = t.find((a) => a.name === o)) == null ? void 0 : r.ctx
-  };
-  return getValuesByPath(n, getPath(e));
-}
-function getSubscriber({
-  action: e,
-  field: t,
-  rule: o,
-  variables: n,
-  localVariables: r,
-  variableNameOfLeftCondition: a
-}, i) {
-  return () => {
-    collectFieldStateOfLinkageRules(
-      {
-        operator: e.operator,
-        value: e.value,
-        field: t,
-        condition: o.condition,
-        variables: n,
-        localVariables: r,
-        variableNameOfLeftCondition: a,
-        action: e,
-        conditionType: o.conditionType
-      },
-      i
-    ), setTimeout(() => z(this, null, function* () {
-      var d, p, m, h, g, f, C, b;
-      const l = getFieldNameByOperator(e.operator);
-      if (!((d = t.stateOfLinkageRules) != null && d[l]))
-        return;
-      let c = t.stateOfLinkageRules[l];
-      c = yield Promise.all(c), c = c.filter((S) => S.condition);
-      const u = c[c.length - 1];
-      if (l === "value")
-        c.length > 1 && (t.value = u.value);
-      else if (l === "dateScope")
-        t.setComponentProps({
-          _maxDate: ((m = (p = u.value) == null ? void 0 : p._maxDate) == null ? void 0 : m.value) || ((h = u.value) == null ? void 0 : h._maxDate),
-          _minDate: ((f = (g = u.value) == null ? void 0 : g._minDate) == null ? void 0 : f.value) || ((C = u.value) == null ? void 0 : C._minDate)
-        });
-      else {
-        if (l === "display" && (u == null ? void 0 : u.value) === "hidden")
-          t.display = "visible", t.data = t.data || {}, t.data.hidden = !0, t.required && (t.required = !1, t.data.prevRequired = !0), requestAnimationFrame(() => {
-            t.setState((S) => {
-              S.display = "visible";
-            });
-          });
-        else if (l === "dataSource") {
-          const S = ((b = u == null ? void 0 : u.value) == null ? void 0 : b.map((y) => y.value)) || [];
-          (!Array.isArray(t.value) && !S.includes(t.value) || Array.isArray(t.value) && _.difference(t.value, S).length > 0) && (t.value = t.initialValue), t[l] = u == null ? void 0 : u.value, t.data = t.data || {}, requestAnimationFrame(() => {
-            t.setState((y) => {
-              y[l] = u == null ? void 0 : u.value;
-            });
-          });
-        } else
-          l === "display" && (u == null ? void 0 : u.value) === "visible" ? (t[l] = u == null ? void 0 : u.value, l === "display" && (u == null ? void 0 : u.value) === "visible" && (t.data = t.data || {}, t.data.hidden = !1, t.data.prevRequired && (delete t.data.prevRequired, t.required = !0)), requestAnimationFrame(() => {
-            t.setState((S) => {
-              S[l] = u == null ? void 0 : u.value;
-            });
-          })) : (t[l] = u == null ? void 0 : u.value, requestAnimationFrame(() => {
-            t.setState((S) => {
-              S[l] = u == null ? void 0 : u.value;
-            });
-          }));
-        l === "display" && (u == null ? void 0 : u.value) === "none" && (t.value = null);
-      }
-      t.stateOfLinkageRules[l] = null;
-    }));
-  };
-}
-function getFieldNameByOperator(e) {
-  switch (e) {
-    case ActionType.Required:
-    case ActionType.InRequired:
-      return "required";
-    case ActionType.Visible:
-    case ActionType.None:
-    case ActionType.Hidden:
-      return "display";
-    case ActionType.Editable:
-    case ActionType.ReadOnly:
-    case ActionType.ReadPretty:
-      return "pattern";
-    case ActionType.Value:
-      return "value";
-    case ActionType.Options:
-      return "dataSource";
-    case ActionType.DateScope:
-      return "dateScope";
-    default:
-      return null;
-  }
-}
-const collectFieldStateOfLinkageRules = ({
-  operator: e,
-  value: t,
-  field: o,
-  condition: n,
-  variables: r,
-  localVariables: a,
-  variableNameOfLeftCondition: i,
-  action: l,
-  conditionType: c
-}, u) => {
-  var S, y, v, F, I, T, R, D, B, N, M, L, w, O;
-  const d = ((S = o == null ? void 0 : o.stateOfLinkageRules) == null ? void 0 : S.required) || [(y = o == null ? void 0 : o.initStateOfLinkageRules) == null ? void 0 : y.required], p = ((v = o == null ? void 0 : o.stateOfLinkageRules) == null ? void 0 : v.display) || [(F = o == null ? void 0 : o.initStateOfLinkageRules) == null ? void 0 : F.display], m = ((I = o == null ? void 0 : o.stateOfLinkageRules) == null ? void 0 : I.pattern) || [(T = o == null ? void 0 : o.initStateOfLinkageRules) == null ? void 0 : T.pattern], h = ((R = o == null ? void 0 : o.stateOfLinkageRules) == null ? void 0 : R.value) || [(D = o == null ? void 0 : o.initStateOfLinkageRules) == null ? void 0 : D.value], g = ((B = o == null ? void 0 : o.stateOfLinkageRules) == null ? void 0 : B.dataSource) || [(N = o == null ? void 0 : o.initStateOfLinkageRules) == null ? void 0 : N.dataSource], { evaluate: f } = evaluators.get("formula.js"), C = {
-    ruleGroup: n,
-    variables: r,
-    localVariables: a,
-    variableNameOfLeftCondition: i,
-    conditionType: c
-  }, b = ((M = o == null ? void 0 : o.stateOfLinkageRules) == null ? void 0 : M.dateScope) || [(L = o == null ? void 0 : o.initStateOfLinkageRules) == null ? void 0 : L.dateScope];
-  switch (e) {
-    case ActionType.Required:
-      d.push(getTempFieldState(conditionAnalyses(C, u), !0)), o.stateOfLinkageRules = P(x({}, o.stateOfLinkageRules), {
-        required: d
-      });
-      break;
-    case ActionType.InRequired:
-      d.push(getTempFieldState(conditionAnalyses(C, u), !1)), o.stateOfLinkageRules = P(x({}, o.stateOfLinkageRules), {
-        required: d
-      });
-      break;
-    case ActionType.Visible:
-    case ActionType.None:
-    case ActionType.Hidden:
-      p.push(getTempFieldState(conditionAnalyses(C, u), e)), o.stateOfLinkageRules = P(x({}, o.stateOfLinkageRules), {
-        display: p
-      });
-      break;
-    case ActionType.Editable:
-    case ActionType.ReadOnly:
-    case ActionType.ReadPretty:
-      m.push(getTempFieldState(conditionAnalyses(C, u), e)), o.stateOfLinkageRules = P(x({}, o.stateOfLinkageRules), {
-        pattern: m
-      });
-      break;
-    case ActionType.Value:
-      {
-        const j = () => z(void 0, null, function* () {
-          var k;
-          if ((t == null ? void 0 : t.mode) === "express") {
-            if ((t.value || t.result) == null)
-              return;
-            const { exp: $, scope: q } = yield replaceVariables(t.value || t.result, {
-              variables: r,
-              localVariables: a
-            });
-            try {
-              return f($, x({ now: () => (/* @__PURE__ */ new Date()).toString() }, q));
-            } catch (E) {
-              console.error(E);
-            }
-          } else
-            return (t == null ? void 0 : t.mode) === "constant" ? (k = t == null ? void 0 : t.value) != null ? k : t : null;
-        });
-        isConditionEmpty(n) ? h.push(getTempFieldState(!0, j())) : h.push(getTempFieldState(conditionAnalyses(C, u), j())), o.stateOfLinkageRules = P(x({}, o.stateOfLinkageRules), {
-          value: h
-        });
-      }
-      break;
-    case ActionType.Options:
-      {
-        const j = (O = (w = o.data) == null ? void 0 : w.dataSource) == null ? void 0 : O.filter((k) => t.value.includes(k.value));
-        g.push(getTempFieldState(conditionAnalyses(C, u), j || [])), o.stateOfLinkageRules = P(x({}, o.stateOfLinkageRules), {
-          dataSource: g
-        });
-      }
-      break;
-    case ActionType.DateScope: {
-      b.push(
-        getTempFieldState(conditionAnalyses(C, u), {
-          _maxDate: l._maxDate,
-          _minDate: l._minDate
-        })
-      ), o.stateOfLinkageRules = P(x({}, o.stateOfLinkageRules), {
-        dateScope: b
-      });
-      break;
-    }
-    default:
-      return null;
-  }
-};
-function getTempFieldState(e, t) {
-  return z(this, null, function* () {
-    return [e, t] = yield Promise.all([e, t]), {
-      condition: e,
-      value: t
-    };
-  });
-}
-function isConditionEmpty(e) {
-  const t = Object.keys(e)[0] || "$and", o = e[t];
-  return _.isEmpty(o);
-}
-function replaceVariables(n, r) {
-  return z(this, arguments, function* (e, {
-    variables: t,
-    localVariables: o
-  }) {
-    var c;
-    const a = {}, i = {};
-    if (e == null)
-      return;
-    const l = (c = e.match(REGEX_OF_VARIABLE_IN_EXPRESSION)) == null ? void 0 : c.map((u) => z(this, null, function* () {
-      const { value: d } = yield t.parseVariable(u, o, {
-        doNotRequest: u.includes("$nForm") || u.includes("$iteration")
-      }), p = `_${uid$1()}`;
-      return i[p] = d, a[u] = p, d;
-    }));
-    return l && (yield Promise.all(l)), {
-      exp: e.replace(REGEX_OF_VARIABLE_IN_EXPRESSION, (u) => `{{${a[u] || u}}}`),
-      scope: i
-    };
-  });
-}
-const RemoveConditionContext$1 = createContext(null);
+], RemoveConditionContext$1 = createContext(null);
 RemoveConditionContext$1.displayName = "RemoveConditionContext";
 const FilterContext$3 = createContext(null);
 FilterContext$3.displayName = "FilterContext";
@@ -12639,12 +12645,7 @@ const CurrentRecordContext = createContext(null), CurrentRecordContextProvider =
     /** 当前记录对应的 collection name */
     collectionName: r
   };
-}, getVariableValue = (e, t) => z(void 0, null, function* () {
-  if (!e)
-    return e;
-  const { evaluate: o } = evaluators.get("string"), { exp: n, scope: r } = yield replaceVariables(e, t);
-  return o(n, x({ now: () => (/* @__PURE__ */ new Date()).toString() }, r));
-}), SettingsMenuProvider = (e) => SelectWithTitle, DropdownVisibleContext = createContext(null);
+}, SettingsMenuProvider = (e) => SelectWithTitle, DropdownVisibleContext = createContext(null);
 DropdownVisibleContext.displayName = "DropdownVisibleContext";
 const CurrentUserContext = createContext(null);
 CurrentUserContext.displayName = "CurrentUserContext";
@@ -12918,10 +12919,10 @@ const DatePickerContext = React.createContext({ utc: !0 }), useDatePickerContext
       return {
         disabledHours: () => {
           const B = [];
-          return F && B.push(...Array.from({ length: g.hour() }, (N, M) => M)), I && B.push(...Array.from({ length: 24 - f.hour() }, (N, M) => M + f.hour() + 1)), B;
+          return F && B.push(...Array.from({ length: g.hour() }, (N, $) => $)), I && B.push(...Array.from({ length: 24 - f.hour() }, (N, $) => $ + f.hour() + 1)), B;
         },
         disabledMinutes: (B) => F && B === g.hour() ? C.filter((N) => N < g.minute()) : I && B === f.hour() ? C.filter((N) => N > f.minute()) : [],
-        disabledSeconds: (B, N) => F && B === g.hour() && N === g.minute() ? C.filter((M) => M < g.second()) : I && B === f.hour() && N === f.minute() ? C.filter((M) => M > f.second()) : []
+        disabledSeconds: (B, N) => F && B === g.hour() && N === g.minute() ? C.filter(($) => $ < g.second()) : I && B === f.hour() && N === f.minute() ? C.filter(($) => $ > f.second()) : []
       };
     };
     i(() => b), c(() => S);
@@ -13828,7 +13829,7 @@ const ParentCollectionProvider = (e) => {
     collectionField: e,
     noDisabled: r,
     targetFieldSchema: a
-  }), { currentParentRecordSettings: N, shouldDisplayCurrentParentRecord: M } = useCurrentParentRecordVariable({
+  }), { currentParentRecordSettings: N, shouldDisplayCurrentParentRecord: $ } = useCurrentParentRecordVariable({
     schema: o,
     collectionName: c,
     collectionField: e,
@@ -13845,7 +13846,7 @@ const ParentCollectionProvider = (e) => {
     S && b,
     v && y,
     I && F,
-    M && N,
+    $ && N,
     R && T,
     B && D,
     w && L
@@ -13862,7 +13863,7 @@ const ParentCollectionProvider = (e) => {
     y,
     I,
     F,
-    M,
+    $,
     N,
     R,
     T,
@@ -13914,20 +13915,20 @@ const ParentCollectionProvider = (e) => {
       }));
     },
     [o, u]
-  ), M = m(
+  ), $ = m(
     B(_.isEmpty(F) ? R : F, {
       value: t
     })
   );
   return useEffect(() => {
-    C == null || C(M);
+    C == null || C($);
   }, [t, F]), /* @__PURE__ */ jsx(
     Variable.Input,
     {
       className: i,
       value: t,
       onChange: N,
-      scope: M,
+      scope: $,
       style: r,
       changeOnSelect: y,
       hideVariableButton: f,
@@ -14229,8 +14230,8 @@ const SchemaSettingsDateFormat = function(t) {
         (n.componentProps.picker || "date") !== D.picker && !m && n.value && (n.value = void 0, n.initialValue = void 0, o.default = void 0, B.default = void 0), B["x-component-props"] = n.componentProps || {}, o["x-component-props"] = x(x({}, n.componentProps || {}), D), B["x-component-props"] = o["x-component-props"], n.componentProps = o["x-component-props"];
         const N = n.path.entire.split(".");
         N.pop();
-        const M = N.join(".");
-        n.query(`${M}.*[0:].${o.name}`).forEach((L) => {
+        const $ = N.join(".");
+        n.query(`${$}.*[0:].${o.name}`).forEach((L) => {
           L.props.name === o.name && ((n.componentProps.picker || "date") !== D.picker && !m && (L.value = void 0, L.initialValue = void 0), L.setComponentProps(x({}, D)));
         }), r.emit("patch", {
           schema: B
@@ -14252,7 +14253,7 @@ const getActionContext = (e) => {
   var o;
   return ((o = e.fieldSchema) == null ? void 0 : o["x-action-context"]) || {};
 }, SchemaSettingsDefaultValue = function(t) {
-  var k, $, q;
+  var k, M, q;
   const o = useFieldSchema(), n = (k = t == null ? void 0 : t.fieldSchema) != null ? k : o, 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 } = useFormBlockContext(), { getFields: y } = useCollectionFilterOptionsV2(C), { isInSubForm: v, isInSubTable: F } = useFlag() || {}, { name: I } = C, T = useMemo(
@@ -14260,9 +14261,9 @@ const getActionContext = (e) => {
     [n, p, d]
   ), R = _.omit(n, "required");
   T != null && T.target && (u = p(
-    `${T.target}.${((q = ($ = n["x-component-props"]) == null ? void 0 : $.fieldNames) == null ? void 0 : q.label) || "id"}`
+    `${T.target}.${((q = (M = n["x-component-props"]) == null ? void 0 : M.fieldNames) == null ? void 0 : q.label) || "id"}`
   ));
-  const D = (T == null ? void 0 : T.interface) === "m2o" && findParentFieldSchema(n), B = D && p(D == null ? void 0 : D["x-collection-field"]), N = useTableBlockContext(), M = (T == null ? void 0 : T.interface) === "m2m" || (T == null ? void 0 : T.interface) === "mbm" || (B == null ? void 0 : B.type) === "hasMany" && (T == null ? void 0 : T.interface) === "m2o", L = useCallback(
+  const D = (T == null ? void 0 : T.interface) === "m2o" && findParentFieldSchema(n), B = D && p(D == null ? void 0 : D["x-collection-field"]), N = useTableBlockContext(), $ = (T == null ? void 0 : T.interface) === "m2m" || (T == null ? void 0 : T.interface) === "mbm" || (B == null ? void 0 : B.type) === "hasMany" && (T == null ? void 0 : T.interface) === "m2o", L = useCallback(
     (E) => {
       const V = E.find((U) => U.value === "$nForm"), G = m(I);
       return !(G != null && G.length) && V && (V.children = formatVariableScop(y())), E;
@@ -14287,7 +14288,7 @@ const getActionContext = (e) => {
         "x-component": "VariableInput",
         "x-component-props": P(x({}, (n == null ? void 0 : n["x-component-props"]) || {}), {
           collectionField: T,
-          contextCollectionName: M ? c : "",
+          contextCollectionName: $ ? c : "",
           schema: T == null ? void 0 : T.uiSchema,
           targetFieldSchema: n,
           className: defaultInputStyle,
@@ -14335,7 +14336,7 @@ const getActionContext = (e) => {
     R,
     S,
     h,
-    M,
+    $,
     f,
     b,
     L,
@@ -15230,8 +15231,8 @@ const useGetFilterOptions = () => {
     };
   });
 }, TableColumnDesigner$1 = (e) => {
-  var N, M, L, w, O, j, k, $, q, E, V, G;
-  const { uiSchema: t, fieldSchema: o, collectionField: n } = e, { form: r } = useFormBlockContext(), { getInterface: a, getCollection: i } = useCollectionManager_deprecated(), l = useField(), { t: c } = useTranslation(), u = useFieldSchema(), { dn: d } = useDesignable(), p = ((N = o == null ? void 0 : o["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((L = n == null ? void 0 : n.target) != null ? L : n == null ? void 0 : n.targetCollection), h = useColorFields((w = n == null ? void 0 : n.target) != null ? w : n == null ? void 0 : n.targetCollection), g = a(n == null ? void 0 : n.interface), f = i(n == null ? void 0 : n.target), C = isFileCollection$2(f), b = ["QuickEdit", "FormItem"].includes(o["x-decorator"]), { currentMode: S } = useAssociationFieldContext(), { isAllowToSetDefaultValue: y } = useIsAllowToSetDefaultValue({ collectionField: n, fieldSchema: o }), v = ["datetime", "createdAt", "updatedAt"].includes(n == null ? void 0 : n.interface), F = ["obo", "oho", "o2o", "o2m", "m2m", "m2o", "snapshot"].includes(
+  var N, $, L, w, O, j, k, M, q, E, V, G;
+  const { uiSchema: t, fieldSchema: o, collectionField: n } = e, { form: r } = useFormBlockContext(), { getInterface: a, getCollection: i } = useCollectionManager_deprecated(), l = useField(), { t: c } = useTranslation(), u = useFieldSchema(), { dn: d } = useDesignable(), p = ((N = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : N.fieldNames) || (($ = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : $.fieldNames), m = useLabelFields$1((L = n == null ? void 0 : n.target) != null ? L : n == null ? void 0 : n.targetCollection), h = useColorFields((w = n == null ? void 0 : n.target) != null ? w : n == null ? void 0 : n.targetCollection), g = a(n == null ? void 0 : n.interface), f = i(n == null ? void 0 : n.target), C = isFileCollection$2(f), b = ["QuickEdit", "FormItem"].includes(o["x-decorator"]), { currentMode: S } = useAssociationFieldContext(), { isAllowToSetDefaultValue: y } = useIsAllowToSetDefaultValue({ collectionField: n, fieldSchema: o }), v = ["datetime", "createdAt", "updatedAt"].includes(n == null ? void 0 : n.interface), F = ["obo", "oho", "o2o", "o2m", "m2m", "m2o", "snapshot"].includes(
     n == null ? void 0 : n.interface
   ), I = useFieldModeOptions({ fieldSchema: o }), T = ((O = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : O.mode) || "Select";
   let R = "editable";
@@ -15273,7 +15274,7 @@ const useGetFilterOptions = () => {
       SchemaSettingsDataScope,
       {
         collectionName: n == null ? void 0 : n.target,
-        defaultFilter: ((q = ($ = (k = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : k.service) == null ? void 0 : $.params) == null ? void 0 : q.filter) || {},
+        defaultFilter: ((q = (M = (k = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : k.service) == null ? void 0 : M.params) == null ? void 0 : q.filter) || {},
         form: r,
         onSubmit: ({ filter: U }) => {
           var Y, J;
@@ -16591,8 +16592,8 @@ const useFormItemInitializerFields = (e) => {
       schema: S
     };
     return l == "Kanban" && (y.find = (D, B, N) => {
-      const M = findSchema(D, "x-component", l);
-      return findSchema(M, B, N);
+      const $ = findSchema(D, "x-component", l);
+      return findSchema($, B, N);
     }), y;
   });
 }, useFilterFormItemInitializerFields = (e) => {
@@ -16971,7 +16972,7 @@ const useFormItemInitializerFields = (e) => {
     ]
   })), [y, C == null ? void 0 : C.inherits, C == null ? void 0 : C.name, t, v, h]);
   return r ? useMemo(() => {
-    var M;
+    var $;
     const I = {
       name: "currentRecord",
       collectionName: C.name,
@@ -17042,7 +17043,7 @@ const useFormItemInitializerFields = (e) => {
     else if (F[0].children.length)
       if (l) {
         if (F[0].children.length <= 1)
-          return F[0].children = ((M = F[0].children[0]) == null ? void 0 : M.children) || [], F;
+          return F[0].children = (($ = F[0].children[0]) == null ? void 0 : $.children) || [], F;
         B = [I];
       } else
         B = [I, D];
@@ -17810,10 +17811,10 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
     t["x-settings"] || a,
     t["x-settings-props"]
   ), S = useGridRowContext(), y = useGridContext(), v = useDataSourceManager(), F = v == null ? void 0 : v.getDataSources(), I = useDataSource(), T = (F == null ? void 0 : F.length) > 1 && I, R = ["FormItem", "ReadPrettyFormItem"].includes(r == null ? void 0 : r.componentName) ? `${r == null ? void 0 : r.name} ${m("(Fields only)")}` : r == null ? void 0 : r.name, D = useMemo(() => {
-    var M;
+    var $;
     return {
       insertPosition: "afterEnd",
-      wrap: ((M = S == null ? void 0 : S.cols) == null ? void 0 : M.length) > 1 ? void 0 : gridRowColWrap,
+      wrap: (($ = S == null ? void 0 : S.cols) == null ? void 0 : $.length) > 1 ? void 0 : gridRowColWrap,
       Component: (L) => /* @__PURE__ */ jsx(
         PlusOutlined,
         P(x({}, L), {
@@ -17881,7 +17882,7 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
     container: g
   } = x(x({}, e), (t == null ? void 0 : t["x-toolbar-props"]) || {}), f = useCompile(), { draggable: C } = useContext(SchemaComponentContext), { componentCls: b, hashId: S } = useStyles$g(), { t: y } = useTranslation(), { getAriaLabel: v } = useGetAriaLabelOfDesigner(), F = useDataSourceManager(), I = F == null ? void 0 : F.getDataSources(), T = useDataSource(), R = (I == null ? void 0 : I.length) > 1 && T, D = useRefreshFieldSchema(), B = useRef(y("Reference template")), N = useCallback(() => {
     D({ refreshParentSchema: !0 });
-  }, [D]), M = useMemo(() => {
+  }, [D]), $ = useMemo(() => {
     if (o) {
       if (typeof o == "string")
         return [f(o)];
@@ -17894,7 +17895,7 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
   ), { render: O, exists: j } = useSchemaInitializerRender(
     n || (t == null ? void 0 : t["x-initializer"]),
     t == null ? void 0 : t["x-initializer-props"]
-  ), k = useGridRowContext(), $ = useGridContext(), q = useMemo(() => {
+  ), k = useGridRowContext(), M = useGridContext(), q = useMemo(() => {
     var K;
     return {
       insertPosition: "afterEnd",
@@ -17914,9 +17915,9 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
       return null;
     if (j)
       return O(q);
-    if ($ != null && $.InitializerComponent || $ != null && $.renderSchemaInitializer)
-      return $ != null && $.InitializerComponent ? /* @__PURE__ */ jsx($.InitializerComponent, x({}, q)) : (K = $.renderSchemaInitializer) == null ? void 0 : K.call($, q);
-  }, [$, n, q, j, O]), G = useMemo(() => r !== !1 && w ? L() : null, [w, L, r]), U = useRef(null), H = "hidden";
+    if (M != null && M.InitializerComponent || M != null && M.renderSchemaInitializer)
+      return M != null && M.InitializerComponent ? /* @__PURE__ */ jsx(M.InitializerComponent, x({}, q)) : (K = M.renderSchemaInitializer) == null ? void 0 : K.call(M, q);
+  }, [M, n, q, j, O]), G = useMemo(() => r !== !1 && w ? L() : null, [w, L, r]), U = useRef(null), H = "hidden";
   useEffect(() => {
     const K = U.current;
     let X = K == null ? void 0 : K.parentElement;
@@ -17951,9 +17952,9 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
       className: cls(b, S, m, "schema-toolbar", H),
       style: Y,
       children: [
-        M && /* @__PURE__ */ jsx("div", { className: "toolbar-title", children: /* @__PURE__ */ jsxs(Space$1, { size: 2, children: [
-          /* @__PURE__ */ jsx("span", { className: "toolbar-title-tag", children: R ? `${f(R == null ? void 0 : R.displayName)} > ${M[0]}` : M[0] }, M[0]),
-          M[1] && /* @__PURE__ */ jsx("span", { className: "toolbar-title-tag", children: `${B.current}: ${`${M[1]}` || y("Untitled")}` })
+        $ && /* @__PURE__ */ jsx("div", { className: "toolbar-title", children: /* @__PURE__ */ jsxs(Space$1, { size: 2, children: [
+          /* @__PURE__ */ jsx("span", { className: "toolbar-title-tag", children: R ? `${f(R == null ? void 0 : R.displayName)} > ${$[0]}` : $[0] }, $[0]),
+          $[1] && /* @__PURE__ */ jsx("span", { className: "toolbar-title-tag", children: `${B.current}: ${`${$[1]}` || y("Untitled")}` })
         ] }) }),
         /* @__PURE__ */ jsx("div", { className: cls("toolbar-icons", i), style: l, children: /* @__PURE__ */ jsxs(Space$1, { size: 3, align: "center", className: d, style: p, children: [
           E,
@@ -18174,8 +18175,8 @@ const useDragEnd = (e) => {
   const { refresh: t } = useDesignable(), o = useAPIClient(), { t: n } = useTranslation();
   return useCallback(
     (r) => {
-      var f, C, b, S, y, v, F, I, T, R, D, B, N, M, L;
-      const { active: a, over: i } = r, l = (C = (f = a == null ? void 0 : a.data) == null ? void 0 : f.current) == null ? void 0 : C.schema, c = (S = (b = i == null ? void 0 : i.data) == null ? void 0 : b.current) == null ? void 0 : S.schema, u = (v = (y = i == null ? void 0 : i.data) == null ? void 0 : y.current) == null ? void 0 : v.insertAdjacent, d = (I = (F = i == null ? void 0 : i.data) == null ? void 0 : F.current) == null ? void 0 : I.breakRemoveOn, p = (R = (T = i == null ? void 0 : i.data) == null ? void 0 : T.current) == null ? void 0 : R.wrapSchema, m = (B = (D = i == null ? void 0 : i.data) == null ? void 0 : D.current) == null ? void 0 : B.onSuccess, h = (L = (M = (N = i == null ? void 0 : i.data) == null ? void 0 : N.current) == null ? void 0 : M.removeParentsIfNoChildren) != null ? L : !0;
+      var f, C, b, S, y, v, F, I, T, R, D, B, N, $, L;
+      const { active: a, over: i } = r, l = (C = (f = a == null ? void 0 : a.data) == null ? void 0 : f.current) == null ? void 0 : C.schema, c = (S = (b = i == null ? void 0 : i.data) == null ? void 0 : b.current) == null ? void 0 : S.schema, u = (v = (y = i == null ? void 0 : i.data) == null ? void 0 : y.current) == null ? void 0 : v.insertAdjacent, d = (I = (F = i == null ? void 0 : i.data) == null ? void 0 : F.current) == null ? void 0 : I.breakRemoveOn, p = (R = (T = i == null ? void 0 : i.data) == null ? void 0 : T.current) == null ? void 0 : R.wrapSchema, m = (B = (D = i == null ? void 0 : i.data) == null ? void 0 : D.current) == null ? void 0 : B.onSuccess, h = (L = ($ = (N = i == null ? void 0 : i.data) == null ? void 0 : N.current) == null ? void 0 : $.removeParentsIfNoChildren) != null ? L : !0;
       if (!l || !c) {
         e == null || e(r);
         return;
@@ -18332,23 +18333,23 @@ const breakRemoveOnGrid = (e) => e["x-component"] === "Grid", breakRemoveOnRow =
       if (!B || !r)
         return;
       o.current = D.active.id;
-      const N = B.current, M = N.previousElementSibling, L = N.nextElementSibling;
-      F([M.clientWidth, L.clientWidth]);
+      const N = B.current, $ = N.previousElementSibling, L = N.nextElementSibling;
+      F([$.clientWidth, L.clientWidth]);
     },
     onDragMove(D) {
       if (!r || !y)
         return;
       o.current === D.active.id && (o.current = o.current + "_move");
-      const B = l.current, N = B.previousElementSibling, M = B.nextElementSibling;
-      N.style.width = `${v[0] + D.delta.x}px`, M.style.width = `${v[1] - D.delta.x}px`;
+      const B = l.current, N = B.previousElementSibling, $ = B.nextElementSibling;
+      N.style.width = `${v[0] + D.delta.x}px`, $.style.width = `${v[1] - D.delta.x}px`;
     },
     onDragEnd(D) {
       var j;
       if (!r || !o.current || (j = o.current) != null && j.startsWith(D.active.id) && !o.current.endsWith("_move") || v[0] <= 0 || v[1] <= 0 || (F([0, 0]), !h || !g))
         return;
-      const B = l.current, N = B.previousElementSibling, M = B.nextElementSibling;
+      const B = l.current, N = B.previousElementSibling, $ = B.nextElementSibling;
       h["x-component-props"] = h["x-component-props"] || {}, g["x-component-props"] = g["x-component-props"] || {};
-      const L = B.clientWidth * (e.cols.length + 1) / e.cols.length, w = (100 * (N.getBoundingClientRect().width + L) / B.parentElement.clientWidth).toFixed(2), O = (100 * (M.getBoundingClientRect().width + L) / B.parentElement.clientWidth).toFixed(2);
+      const L = B.clientWidth * (e.cols.length + 1) / e.cols.length, w = (100 * (N.getBoundingClientRect().width + L) / B.parentElement.clientWidth).toFixed(2), O = (100 * ($.getBoundingClientRect().width + L) / B.parentElement.clientWidth).toFixed(2);
       _.set(h, "x-component-props.width", w), _.set(g, "x-component-props.width", O), n.emit("batchPatch", {
         schemas: [
           {
@@ -18663,8 +18664,8 @@ const useTableBlockProps = () => {
     ),
     onChange: useCallback(
       ({ current: S, pageSize: y }, v, F) => {
-        var B, N, M, L, w, O, j, k, $, q;
-        const I = (M = (N = (B = t.parent) == null ? void 0 : B["x-decorator-props"]) == null ? void 0 : N.params) == null ? void 0 : M.sort, T = F.order ? F.order === "ascend" ? [F.field] : [`-${F.field}`] : I || a.dragSortBy, R = y || ((O = (w = (L = t.parent) == null ? void 0 : L["x-decorator-props"]) == null ? void 0 : w.params) == null ? void 0 : O.pageSize), D = P(x({}, ($ = (k = (j = i.current) == null ? void 0 : j.service) == null ? void 0 : k.params) == null ? void 0 : $[0]), { page: S || 1, pageSize: R });
+        var B, N, $, L, w, O, j, k, M, q;
+        const I = ($ = (N = (B = t.parent) == null ? void 0 : B["x-decorator-props"]) == null ? void 0 : N.params) == null ? void 0 : $.sort, T = F.order ? F.order === "ascend" ? [F.field] : [`-${F.field}`] : I || a.dragSortBy, R = y || ((O = (w = (L = t.parent) == null ? void 0 : L["x-decorator-props"]) == null ? void 0 : w.params) == null ? void 0 : O.pageSize), D = P(x({}, (M = (k = (j = i.current) == null ? void 0 : j.service) == null ? void 0 : k.params) == null ? void 0 : M[0]), { page: S || 1, pageSize: R });
         T && (D.sort = T), (q = i.current) == null || q.service.run(D);
       },
       [t.parent]
@@ -18678,11 +18679,11 @@ const useTableBlockProps = () => {
         }
         const R = T.find((D) => D.uid === t.parent["x-uid"]);
         T.forEach((D) => {
-          var j, k, $, q;
+          var j, k, M, q;
           const B = F.find((E) => E.uid === D.uid);
           if (!B)
             return;
-          const N = getSourceKey(R, B.field) || a.rowKey || "id", M = [S[N]], L = ((j = D.service.params) == null ? void 0 : j[0]) || {}, w = (($ = (k = D.service.params) == null ? void 0 : k[1]) == null ? void 0 : $.filters) || {};
+          const N = getSourceKey(R, B.field) || a.rowKey || "id", $ = [S[N]], L = ((j = D.service.params) == null ? void 0 : j[0]) || {}, w = ((M = (k = D.service.params) == null ? void 0 : k[1]) == null ? void 0 : M.filters) || {};
           if (v.includes(S[a.rowKey])) {
             if ((q = D.clearSelection) == null || q.call(D), D.dataLoadingMode === "manual")
               return D.clearData();
@@ -18692,7 +18693,7 @@ const useTableBlockProps = () => {
               $and: [
                 {
                   [B.field || a.rowKey]: {
-                    [B.field ? "$in" : "$eq"]: M
+                    [B.field ? "$in" : "$eq"]: $
                   }
                 }
               ]
@@ -19058,10 +19059,10 @@ const useTableSelectorParams = () => useContext(TableSelectorParamsContext), Tab
   var i, l, c, u, d, p, m, h, g, f, C, b, S, y, v, F;
   const e = useField(), t = useTableSelectorContext(), o = useFieldSchema(), { getCollectionJoinField: n } = useCollectionManager_deprecated(), r = recursiveParent(o, "CollectionField"), a = n(r == null ? void 0 : r["x-collection-field"]);
   return useEffect(() => {
-    var T, R, D, B, N, M, L, w, O, j, k, $, q;
+    var T, R, D, B, N, $, L, w, O, j, k, M, q;
     if (!((T = t == null ? void 0 : t.service) != null && T.loading)) {
       const E = (D = (R = t == null ? void 0 : t.service) == null ? void 0 : R.data) == null ? void 0 : D.data.map((V) => V);
-      e.value = E, (B = e == null ? void 0 : e.setInitialValue) == null || B.call(e, E), e.data = e.data || {}, e.data.selectedRowKeys = [], e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (L = (M = (N = t == null ? void 0 : t.service) == null ? void 0 : N.data) == null ? void 0 : M.meta) == null ? void 0 : L.pageSize, e.componentProps.pagination.total = (j = (O = (w = t == null ? void 0 : t.service) == null ? void 0 : w.data) == null ? void 0 : O.meta) == null ? void 0 : j.count, e.componentProps.pagination.current = (q = ($ = (k = t == null ? void 0 : t.service) == null ? void 0 : k.data) == null ? void 0 : $.meta) == null ? void 0 : q.page;
+      e.value = E, (B = e == null ? void 0 : e.setInitialValue) == null || B.call(e, E), e.data = e.data || {}, e.data.selectedRowKeys = [], e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (L = ($ = (N = t == null ? void 0 : t.service) == null ? void 0 : N.data) == null ? void 0 : $.meta) == null ? void 0 : L.pageSize, e.componentProps.pagination.total = (j = (O = (w = t == null ? void 0 : t.service) == null ? void 0 : w.data) == null ? void 0 : O.meta) == null ? void 0 : j.count, e.componentProps.pagination.current = (q = (M = (k = t == null ? void 0 : t.service) == null ? void 0 : k.data) == null ? void 0 : M.meta) == null ? void 0 : q.page;
     }
   }, [
     a == null ? void 0 : a.foreignKey,
@@ -20505,7 +20506,7 @@ const DynamicComponent$1 = (e) => {
 }, DateScopeComponent = (e) => {
   var g, f, C, b, S, y, v, F, I, T, R, D, B, N;
   const t = useFieldSchema(), { getCollectionJoinField: o } = useCollectionManager_deprecated(), n = o(t == null ? void 0 : t["x-collection-field"]) || {}, r = ((g = n == null ? void 0 : n.uiSchema) == null ? void 0 : g["x-component-props"].gmt) || !1, a = ((f = n == null ? void 0 : n.uiSchema) == null ? void 0 : f["x-component-props"].utc) || !1, { form: i } = useFormBlockContext(), l = useRecord(), c = ((C = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : C.showTime) || ((S = (b = n == null ? void 0 : n.uiSchema) == null ? void 0 : b["x-component-props"]) == null ? void 0 : S.showTime) || !1, u = ((y = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : y.dateFormat) || ((F = (v = n == null ? void 0 : n.uiSchema) == null ? void 0 : v["x-component-props"]) == null ? void 0 : F.dateFormat) || "YYYY-MM-DD", d = ((I = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : I.timeFormat) || ((R = (T = n == null ? void 0 : n.uiSchema) == null ? void 0 : T["x-component-props"]) == null ? void 0 : R.timeFormat) || "HH:mm:ss", p = ((D = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : D.picker) || ((N = (B = n == null ? void 0 : n.uiSchema) == null ? void 0 : B["x-component-props"]) == null ? void 0 : N.picker) || "date", m = useCallback(
-    (M) => /* @__PURE__ */ jsx(
+    ($) => /* @__PURE__ */ jsx(
       SchemaComponent,
       {
         schema: {
@@ -20531,9 +20532,9 @@ const DynamicComponent$1 = (e) => {
     ),
     [u, r, p, c, d, a]
   ), h = useCallback(
-    (M) => /* @__PURE__ */ jsx(FlagProvider, { collectionField: n, children: /* @__PURE__ */ jsx(
+    ($) => /* @__PURE__ */ jsx(FlagProvider, { collectionField: n, children: /* @__PURE__ */ jsx(
       VariableInput,
-      P(x({}, M), {
+      P(x({}, $), {
         form: i,
         record: l,
         noDisabled: !0,
@@ -21738,12 +21739,12 @@ const SchemaSettingsSwitchItem = (e) => {
   }, [D]), N = useCallback(() => z(void 0, null, function* () {
     yield D.submit();
     try {
-      const O = D.values, j = Object.keys(O).reduce((k, $) => (D.query($).take() && (k[$] = O[$]), k), {});
+      const O = D.values, j = Object.keys(O).reduce((k, M) => (D.query(M).take() && (k[M] = O[M]), k), {});
       h(!1), yield o == null ? void 0 : o(cloneDeep$1(j));
     } catch (O) {
       console.error(O);
     }
-  }), [D, o]), M = useCallback(() => z(void 0, null, function* () {
+  }), [D, o]), $ = useCallback(() => z(void 0, null, function* () {
     !g && (i != null && i["x-uid"]) && (b["x-action-settings"].schemaUid = i["x-uid"], y.emit("patch", { schema: b }), yield F.resource("uiSchemas").insert({ values: i }), f(i["x-uid"])), typeof a == "function" && (a == null || a()), S.setVisible(!1), h(!0);
   }), [F, S, y, b, i, g]), L = useCallback((O) => O.stopPropagation(), []);
   return /* @__PURE__ */ jsxs(zIndexContext.Provider, { value: R, children: [
@@ -21752,7 +21753,7 @@ const SchemaSettingsSwitchItem = (e) => {
       P(x({
         title: v(t)
       }, p), {
-        onClick: M,
+        onClick: $,
         onKeyDown: L,
         children: e.children || e.title
       })
@@ -21812,7 +21813,7 @@ const SchemaSettingsModalItem = (e) => {
     "noRecord",
     "ModalContextProvider",
     "dialogRootClassName"
-  ]), g = useContext(SchemaOptionsContext), f = useCollection(), C = useAPIClient(), b = useApp(), { theme: S } = useGlobalTheme(), y = useBlockRequestContext(), v = useFormActiveFields(), { locale: F } = useContext(ConfigProvider.ConfigContext), I = useDataSourceManager(), T = useDataSourceKey(), R = useCollectionRecord(), { association: D } = useDataBlockProps() || {}, B = useCurrentRecord(), N = useFormBlockContext(), M = useBlockContext(), { getOperators: L } = useOperators(), w = useLocationSearch(), O = useVariables$1(), j = useContext(AllDataBlocksContext), { formValue: k, collection: $, parent: q } = useSubFormValue(), E = useCurrentPopupRecord(), V = useParentPopupRecord();
+  ]), g = useContext(SchemaOptionsContext), f = useCollection(), C = useAPIClient(), b = useApp(), { theme: S } = useGlobalTheme(), y = useBlockRequestContext(), v = useFormActiveFields(), { locale: F } = useContext(ConfigProvider.ConfigContext), I = useDataSourceManager(), T = useDataSourceKey(), R = useCollectionRecord(), { association: D } = useDataBlockProps() || {}, B = useCurrentRecord(), N = useFormBlockContext(), $ = useBlockContext(), { getOperators: L } = useOperators(), w = useLocationSearch(), O = useVariables$1(), j = useContext(AllDataBlocksContext), { formValue: k, collection: M, parent: q } = useSubFormValue(), E = useCurrentPopupRecord(), V = useParentPopupRecord();
   return t ? null : /* @__PURE__ */ jsx(
     SchemaSettingsItem,
     P(x({
@@ -21822,7 +21823,7 @@ const SchemaSettingsModalItem = (e) => {
         const U = l ? yield l() : c, H = _.isFunction(e.schema) ? e.schema() : e.schema;
         FormDialog(
           { title: H.title || o, width: u, rootClassName: m },
-          () => /* @__PURE__ */ jsx(AllDataBlocksContext.Provider, { value: j, children: /* @__PURE__ */ jsx(p, { children: /* @__PURE__ */ jsx(CollectOperators, { defaultOperators: L(), children: /* @__PURE__ */ jsx(VariablesContext.Provider, { value: O, children: /* @__PURE__ */ jsx(BlockContext.Provider, { value: M, children: /* @__PURE__ */ jsx(
+          () => /* @__PURE__ */ jsx(AllDataBlocksContext.Provider, { value: j, children: /* @__PURE__ */ jsx(p, { children: /* @__PURE__ */ jsx(CollectOperators, { defaultOperators: L(), children: /* @__PURE__ */ jsx(VariablesContext.Provider, { value: O, children: /* @__PURE__ */ jsx(BlockContext.Provider, { value: $, children: /* @__PURE__ */ jsx(
             VariablePopupRecordProvider,
             {
               recordData: E == null ? void 0 : E.value,
@@ -21831,7 +21832,7 @@ const SchemaSettingsModalItem = (e) => {
                 recordData: V == null ? void 0 : V.value,
                 collection: V == null ? void 0 : V.collection
               },
-              children: /* @__PURE__ */ jsx(CollectionRecordProvider, { record: d ? null : R, children: /* @__PURE__ */ jsx(CurrentRecordContextProvider, P(x({}, B), { children: /* @__PURE__ */ jsx(FormBlockContext$1.Provider, { value: N, children: /* @__PURE__ */ jsx(SubFormProvider, { value: { value: k, collection: $, parent: q }, children: /* @__PURE__ */ jsx(
+              children: /* @__PURE__ */ jsx(CollectionRecordProvider, { record: d ? null : R, children: /* @__PURE__ */ jsx(CurrentRecordContextProvider, P(x({}, B), { children: /* @__PURE__ */ jsx(FormBlockContext$1.Provider, { value: N, children: /* @__PURE__ */ jsx(SubFormProvider, { value: { value: k, collection: M, parent: q }, children: /* @__PURE__ */ jsx(
                 FormActiveFieldsProvider,
                 {
                   name: "form",
@@ -22026,7 +22027,7 @@ const SchemaSettingsModalItem = (e) => {
       }
     }),
     [o, c, u, y, g, f, p, h, R, r]
-  ), M = useMemo(() => ({ ArrayCollapse: ArrayCollapse$2, FormLayout }), []), L = useCallback(
+  ), $ = useMemo(() => ({ ArrayCollapse: ArrayCollapse$2, FormLayout }), []), L = useCallback(
     (O) => {
       var E;
       const j = [];
@@ -22045,7 +22046,7 @@ const SchemaSettingsModalItem = (e) => {
     SchemaSettingsModalItem,
     {
       title: D,
-      components: M,
+      components: $,
       width: 960,
       schema: N,
       onSubmit: L,
@@ -22918,7 +22919,7 @@ function Input$1(e) {
   useAntdInputStyle(`${S}-input`);
   const y = useCompile(), { t: v } = useTranslation(), F = useForm(), [I, T] = React.useState([]), [R, D] = React.useState([]), [B, N] = React.useState(
     m || !!(n && t != null)
-  ), M = useMemo(() => parseValue(t, p), [p, t]), L = typeof M == "string", w = L ? M : "", O = L ? null : M, j = Object.assign(
+  ), $ = useMemo(() => parseValue(t, p), [p, t]), L = typeof $ == "string", w = L ? $ : "", O = L ? null : $, j = Object.assign(
     {
       label: "label",
       value: "value",
@@ -22930,7 +22931,7 @@ function Input$1(e) {
     label: v("Constant"),
     [j.value]: "$",
     [j.label]: v("Constant")
-  } : a ? getTypedConstantOption(w, a, j) : null : null, [w, a]), $ = (Y = k == null ? void 0 : k.component) != null ? Y : NullComponent, q = Array.isArray(a) ? (K = (J = a.find((X) => Array.isArray(X) && X[0] === w)) == null ? void 0 : J[1]) != null ? K : {} : {};
+  } : a ? getTypedConstantOption(w, a, j) : null : null, [w, a]), M = (Y = k == null ? void 0 : k.component) != null ? Y : NullComponent, q = Array.isArray(a) ? (K = (J = a.find((X) => Array.isArray(X) && X[0] === w)) == null ? void 0 : J[1]) != null ? K : {} : {};
   let E;
   t == null ? i ? n && B ? E = ["$"] : E = [""] : n ? E = ["$"] : E = [" ", w] : E = n ? ["$"] : [" ", w], m && (E = ["$"]), useEffect(() => {
     const oe = k != null ? k : {}, { component: X } = oe, Q = W(oe, ["component"]), ee = [
@@ -23069,8 +23070,8 @@ function Input$1(e) {
               )
             ]
           }
-        ) : /* @__PURE__ */ jsx("div", { style: { flex: 1 }, children: n && (B || !i) ? n : $ ? /* @__PURE__ */ jsx(
-          $,
+        ) : /* @__PURE__ */ jsx("div", { style: { flex: 1 }, children: n && (B || !i) ? n : M ? /* @__PURE__ */ jsx(
+          M,
           P(x({
             role: "button",
             "aria-label": "variable-constant"
@@ -23366,7 +23367,7 @@ function TextArea(e) {
     [l, g]
   ), [S, y] = useState(!1), [v, F] = useState(!1), [I, T] = useState(() => renderHTML(p != null ? p : "", b, c)), [R, D] = useState([-1, 0, -1, 0]);
   useAntdInputStyle("ant-input");
-  const { token: B } = theme.useToken(), N = c.join(" "), M = useCallback(
+  const { token: B } = theme.useToken(), N = c.join(" "), $ = useCallback(
     (V) => {
       var U;
       const G = getValue(V, c);
@@ -23414,25 +23415,25 @@ function TextArea(e) {
       const H = createVariableTagHTML(G.join("."), b);
       pasteHTML(U, H, {
         range: R
-      }), F(!0), D(getCurrentRange(U)), M(U);
+      }), F(!0), D(getCurrentRange(U)), $(U);
     },
-    [b, M, R]
+    [b, $, R]
   ), w = useCallback(
     function({ currentTarget: V }) {
-      S || (F(!0), D(getCurrentRange(V)), M(V));
+      S || (F(!0), D(getCurrentRange(V)), $(V));
     },
-    [S, M]
+    [S, $]
   ), O = useCallback(function({ currentTarget: V }) {
     D(getCurrentRange(V));
   }, []), j = useCallback(function(V) {
     V.key === "Enter" && V.preventDefault();
   }, []), k = useCallback(function() {
     y(!0);
-  }, []), $ = useCallback(
+  }, []), M = useCallback(
     ({ currentTarget: V }) => {
-      y(!1), F(!0), D(getCurrentRange(V)), M(V);
+      y(!1), F(!0), D(getCurrentRange(V)), $(V);
     },
-    [M]
+    [$]
   ), q = useCallback(
     function(V) {
       V.preventDefault();
@@ -23453,9 +23454,9 @@ function TextArea(e) {
           }
         }
       }).replace(/\n/g, " ");
-      F(!0), pasteHTML(V.currentTarget, U), D(getCurrentRange(V.currentTarget)), M(V.currentTarget);
+      F(!0), pasteHTML(V.currentTarget, U), D(getCurrentRange(V.currentTarget)), $(V.currentTarget);
     },
-    [M]
+    [$]
   ), E = e.disabled || C.disabled;
   return t(
     /* @__PURE__ */ jsxs(Fragment$1, { children: [
@@ -23510,7 +23511,7 @@ function TextArea(e) {
                 onKeyDown: j,
                 onPaste: q,
                 onCompositionStart: k,
-                onCompositionEnd: $,
+                onCompositionEnd: M,
                 placeholder: e.placeholder,
                 style: i,
                 className: cx(
@@ -24245,16 +24246,16 @@ const GroupItem$1 = () => {
     }
   );
 }, MoveToMenuItem = () => {
-  const { t: e } = useTranslation(), t = useCallback(
+  const { t: e } = useTranslation(), t = useCurrentRoute(), o = useCallback(
     (u) => {
       onFieldChange("target", (d) => {
-        var m, h;
-        const [, p] = ((h = (m = d == null ? void 0 : d.value) == null ? void 0 : m.split) == null ? void 0 : h.call(m, "||")) || [];
-        d.query("position").take((g) => {
-          g.dataSource = p === NocoBaseDesktopRouteType.group ? [
+        var h, g;
+        const [p, m] = ((g = (h = d == null ? void 0 : d.value) == null ? void 0 : h.split) == null ? void 0 : g.call(h, "||")) || [];
+        d.query("position").take((f) => {
+          f.dataSource = m === NocoBaseDesktopRouteType.group ? [
             { label: e("Before"), value: "beforeBegin" },
             { label: e("After"), value: "afterEnd" },
-            { label: e("Inner"), value: "beforeEnd" }
+            { label: e("Inner"), value: "beforeEnd", disabled: (t == null ? void 0 : t.id) == p }
           ] : [
             { label: e("Before"), value: "beforeBegin" },
             { label: e("After"), value: "afterEnd" }
@@ -24263,13 +24264,13 @@ const GroupItem$1 = () => {
       });
     },
     [e]
-  ), o = useCompile(), { allAccessRoutes: n } = useAllAccessDesktopRoutes(), r = useMemo(() => [...toItems$2(n, { t: e, compile: o }), { label: "", value: "", disabled: !0 }, { label: "", value: "", disabled: !0 }], []), a = useMemo(() => ({
+  ), n = useCompile(), { allAccessRoutes: r } = useAllAccessDesktopRoutes(), a = useMemo(() => [...toItems$2(r, { t: e, compile: n }), { label: "", value: "", disabled: !0 }, { label: "", value: "", disabled: !0 }], []), i = useMemo(() => ({
     type: "object",
     title: e("Move to"),
     properties: {
       target: {
         title: e("Target"),
-        enum: r,
+        enum: a,
         required: !0,
         "x-decorator": "FormItem",
         "x-component": "TreeSelect",
@@ -24287,11 +24288,11 @@ const GroupItem$1 = () => {
         "x-decorator": "FormItem"
       }
     }
-  }), [r, e]), { moveRoute: i } = useNocoBaseRoutes(), l = useCurrentRoute(), c = useCallback(
+  }), [a, e]), { moveRoute: l } = useNocoBaseRoutes(), c = useCallback(
     (p) => z(void 0, [p], function* ({ target: u, position: d }) {
       var f;
       const [m] = ((f = u == null ? void 0 : u.split) == null ? void 0 : f.call(u, "||")) || [];
-      if (!m || m === void 0 || !l)
+      if (!m || m === void 0 || !t)
         return;
       const h = {
         beforeBegin: "insertBefore",
@@ -24303,13 +24304,13 @@ const GroupItem$1 = () => {
       } : {
         targetId: m
       };
-      yield i(x({
-        sourceId: l.id,
+      yield l(x({
+        sourceId: t.id,
         sortField: "sort",
         method: h[d]
       }, g));
     }),
-    [l, i]
+    [t, l]
   );
   return /* @__PURE__ */ jsx(
     SchemaSettingsModalItem,
@@ -24317,8 +24318,8 @@ const GroupItem$1 = () => {
       title: e("Move to"),
       eventKey: "move-to",
       components: components$5,
-      effects: t,
-      schema: a,
+      effects: o,
+      schema: i,
       onSubmit: c
     }
   );
@@ -26422,18 +26423,18 @@ https://requirejs.org/docs/errors.html#` + e);
       config: {}
     }, l = {}, c = {}, u = {}, d = [], p = {}, m = {}, h = {}, g = 1, f = 1;
     function C(k) {
-      var $, q;
-      for ($ = 0; $ < k.length; $++)
-        if (q = k[$], q === ".")
-          k.splice($, 1), $ -= 1;
+      var M, q;
+      for (M = 0; M < k.length; M++)
+        if (q = k[M], q === ".")
+          k.splice(M, 1), M -= 1;
         else if (q === "..") {
-          if ($ === 0 || $ === 1 && k[2] === ".." || k[$ - 1] === "..")
+          if (M === 0 || M === 1 && k[2] === ".." || k[M - 1] === "..")
             continue;
-          $ > 0 && (k.splice($ - 1, 2), $ -= 2);
+          M > 0 && (k.splice(M - 1, 2), M -= 2);
         }
     }
-    function b(k, $, q) {
-      var E, V, G, U, H, Y, J, K, X, Q, ee, oe, te = $ && $.split("/"), se = i.map, ie = se && se["*"];
+    function b(k, M, q) {
+      var E, V, G, U, H, Y, J, K, X, Q, ee, oe, te = M && M.split("/"), se = i.map, ie = se && se["*"];
       if (k && (k = k.split("/"), J = k.length - 1, i.nodeIdCompat && jsSuffixRegExp.test(k[J]) && (k[J] = k[J].replace(jsSuffixRegExp, "")), k[0].charAt(0) === "." && te && (oe = te.slice(0, te.length - 1), k = oe.concat(k)), C(k), k = k.join("/")), q && se && (te || ie)) {
         G = k.split("/");
         e:
@@ -26452,30 +26453,30 @@ https://requirejs.org/docs/errors.html#` + e);
       return E = getOwn(i.pkgs, k), E || k;
     }
     function S(k) {
-      isBrowser && each(scripts(), function($) {
-        if ($.getAttribute("data-requiremodule") === k && $.getAttribute("data-requirecontext") === n.contextName)
-          return $.parentNode.removeChild($), !0;
+      isBrowser && each(scripts(), function(M) {
+        if (M.getAttribute("data-requiremodule") === k && M.getAttribute("data-requirecontext") === n.contextName)
+          return M.parentNode.removeChild(M), !0;
       });
     }
     function y(k) {
-      var $ = getOwn(i.paths, k);
-      if ($ && isArray($) && $.length > 1)
-        return $.shift(), n.require.undef(k), n.makeRequire(null, {
+      var M = getOwn(i.paths, k);
+      if (M && isArray(M) && M.length > 1)
+        return M.shift(), n.require.undef(k), n.makeRequire(null, {
           skipMap: !0
         })([k]), !0;
     }
     function v(k) {
-      var $, q = k ? k.indexOf("!") : -1;
-      return q > -1 && ($ = k.substring(0, q), k = k.substring(q + 1, k.length)), [$, k];
+      var M, q = k ? k.indexOf("!") : -1;
+      return q > -1 && (M = k.substring(0, q), k = k.substring(q + 1, k.length)), [M, k];
     }
-    function F(k, $, q, E) {
-      var V, G, U, H, Y = null, J = $ ? $.name : null, K = k, X = !0, Q = "";
+    function F(k, M, q, E) {
+      var V, G, U, H, Y = null, J = M ? M.name : null, K = k, X = !0, Q = "";
       return k || (X = !1, k = "_@r" + (g += 1)), H = v(k), Y = H[0], k = H[1], Y && (Y = b(Y, J, E), G = getOwn(p, Y)), k && (Y ? q ? Q = k : G && G.normalize ? Q = G.normalize(k, function(ee) {
         return b(ee, J, E);
       }) : Q = k.indexOf("!") === -1 ? b(k, J, E) : k : (Q = b(k, J, E), H = v(Q), Y = H[0], Q = H[1], q = !0, V = n.nameToUrl(Q))), U = Y && !G && !q ? "_unnormalized" + (f += 1) : "", {
         prefix: Y,
         name: Q,
-        parentMap: $,
+        parentMap: M,
         unnormalized: !!U,
         url: V,
         originalName: K,
@@ -26484,24 +26485,24 @@ https://requirejs.org/docs/errors.html#` + e);
       };
     }
     function I(k) {
-      var $ = k.id, q = getOwn(l, $);
-      return q || (q = l[$] = new n.Module(k)), q;
+      var M = k.id, q = getOwn(l, M);
+      return q || (q = l[M] = new n.Module(k)), q;
     }
-    function T(k, $, q) {
+    function T(k, M, q) {
       var E = k.id, V = getOwn(l, E);
-      hasProp(p, E) && (!V || V.defineEmitComplete) ? $ === "defined" && q(p[E]) : (V = I(k), V.error && $ === "error" ? q(V.error) : V.on($, q));
+      hasProp(p, E) && (!V || V.defineEmitComplete) ? M === "defined" && q(p[E]) : (V = I(k), V.error && M === "error" ? q(V.error) : V.on(M, q));
     }
-    function R(k, $) {
+    function R(k, M) {
       var q = k.requireModules, E = !1;
-      $ ? $(k) : (each(q, function(V) {
+      M ? M(k) : (each(q, function(V) {
         var G = getOwn(l, V);
         G && (G.error = k, G.events.error && (E = !0, G.emit("error", k)));
       }), E || req.onError(k));
     }
     function D() {
       globalDefQueue.length && (each(globalDefQueue, function(k) {
-        var $ = k[0];
-        typeof $ == "string" && (n.defQueueMap[$] = !0), d.push(k);
+        var M = k[0];
+        typeof M == "string" && (n.defQueueMap[M] = !0), d.push(k);
       }), globalDefQueue = []);
     }
     r = {
@@ -26526,21 +26527,21 @@ https://requirejs.org/docs/errors.html#` + e);
     function B(k) {
       delete l[k], delete c[k];
     }
-    function N(k, $, q) {
+    function N(k, M, q) {
       var E = k.map.id;
-      k.error ? k.emit("error", k.error) : ($[E] = !0, each(k.depMaps, function(V, G) {
+      k.error ? k.emit("error", k.error) : (M[E] = !0, each(k.depMaps, function(V, G) {
         var U = V.id, H = getOwn(l, U);
-        H && !k.depMatched[G] && !q[U] && (getOwn($, U) ? (k.defineDep(G, p[U]), k.check()) : N(H, $, q));
+        H && !k.depMatched[G] && !q[U] && (getOwn(M, U) ? (k.defineDep(G, p[U]), k.check()) : N(H, M, q));
       }), q[E] = !0);
     }
-    function M() {
-      var k, $, q = i.waitSeconds * 1e3, E = q && n.startTime + q < (/* @__PURE__ */ new Date()).getTime(), V = [], G = [], U = !1, H = !0;
+    function $() {
+      var k, M, q = i.waitSeconds * 1e3, E = q && n.startTime + q < (/* @__PURE__ */ new Date()).getTime(), V = [], G = [], U = !1, H = !0;
       if (!t) {
         if (t = !0, eachProp(c, function(Y) {
           var J = Y.map, K = J.id;
           if (Y.enabled && (J.isDefine || G.push(Y), !Y.error)) {
             if (!Y.inited && E)
-              y(K) ? ($ = !0, U = !0) : (V.push(K), S(K));
+              y(K) ? (M = !0, U = !0) : (V.push(K), S(K));
             else if (!Y.inited && Y.fetched && J.isDefine && (U = !0, !J.prefix))
               return H = !1;
           }
@@ -26548,21 +26549,21 @@ https://requirejs.org/docs/errors.html#` + e);
           return k = makeError("timeout", "Load timeout for modules: " + V, null, V), k.contextName = n.contextName, R(k);
         H && each(G, function(Y) {
           N(Y, {}, {});
-        }), (!E || $) && U && (isBrowser || isWebWorker) && !a && (a = setTimeout(function() {
-          a = 0, M();
+        }), (!E || M) && U && (isBrowser || isWebWorker) && !a && (a = setTimeout(function() {
+          a = 0, $();
         }, 50)), t = !1;
       }
     }
     o = function(k) {
       this.events = getOwn(u, k.id) || {}, this.map = k, this.shim = getOwn(i.shim, k.id), this.depExports = [], this.depMaps = [], this.depMatched = [], this.pluginMaps = {}, this.depCount = 0;
     }, o.prototype = {
-      init: function(k, $, q, E) {
-        E = E || {}, !this.inited && (this.factory = $, q ? this.on("error", q) : this.events.error && (q = bind(this, function(V) {
+      init: function(k, M, q, E) {
+        E = E || {}, !this.inited && (this.factory = M, q ? this.on("error", q) : this.events.error && (q = bind(this, function(V) {
           this.emit("error", V);
         })), this.depMaps = k && k.slice(0), this.errback = q, this.inited = !0, this.ignore = E.ignore, E.enabled || this.enabled ? this.enable() : this.check());
       },
-      defineDep: function(k, $) {
-        this.depMatched[k] || (this.depMatched[k] = !0, this.depCount -= 1, this.depExports[k] = $);
+      defineDep: function(k, M) {
+        this.depMatched[k] || (this.depMatched[k] = !0, this.depCount -= 1, this.depExports[k] = M);
       },
       fetch: function() {
         if (!this.fetched) {
@@ -26588,7 +26589,7 @@ https://requirejs.org/docs/errors.html#` + e);
        */
       check: function() {
         if (!(!this.enabled || this.enabling)) {
-          var k, $, q = this.map.id, E = this.depExports, V = this.exports, G = this.factory;
+          var k, M, q = this.map.id, E = this.depExports, V = this.exports, G = this.factory;
           if (!this.inited)
             hasProp(n.defQueueMap, q) || this.fetch();
           else if (this.error)
@@ -26604,7 +26605,7 @@ https://requirejs.org/docs/errors.html#` + e);
                   }
                 else
                   V = n.execCb(q, G, E, V);
-                if (this.map.isDefine && V === void 0 && ($ = this.module, $ ? V = $.exports : this.usingExports && (V = this.exports)), k)
+                if (this.map.isDefine && V === void 0 && (M = this.module, M ? V = M.exports : this.usingExports && (V = this.exports)), k)
                   return k.requireMap = this.map, k.requireModules = this.map.isDefine ? [this.map.id] : null, k.requireType = this.map.isDefine ? "define" : "require", R(this.error = k);
               } else
                 V = G;
@@ -26621,7 +26622,7 @@ https://requirejs.org/docs/errors.html#` + e);
         }
       },
       callPlugin: function() {
-        var k = this.map, $ = k.id, q = F(k.prefix);
+        var k = this.map, M = k.id, q = F(k.prefix);
         this.depMaps.push(q), T(q, "defined", bind(this, function(E) {
           var V, G, U, H = getOwn(h, this.map.id), Y = this.map.name, J = this.map.parentMap ? this.map.parentMap.name : null, K = n.makeRequire(k.parentMap, {
             enableBuildCallback: !0
@@ -26660,20 +26661,20 @@ https://requirejs.org/docs/errors.html#` + e);
               enabled: !0
             });
           }), V.error = bind(this, function(X) {
-            this.inited = !0, this.error = X, X.requireModules = [$], eachProp(l, function(Q) {
-              Q.map.id.indexOf($ + "_unnormalized") === 0 && B(Q.map.id);
+            this.inited = !0, this.error = X, X.requireModules = [M], eachProp(l, function(Q) {
+              Q.map.id.indexOf(M + "_unnormalized") === 0 && B(Q.map.id);
             }), R(X);
           }), V.fromText = bind(this, function(X, Q) {
             var ee = k.name, oe = F(ee), te = useInteractive;
-            Q && (X = Q), te && (useInteractive = !1), I(oe), hasProp(i.config, $) && (i.config[ee] = i.config[$]);
+            Q && (X = Q), te && (useInteractive = !1), I(oe), hasProp(i.config, M) && (i.config[ee] = i.config[M]);
             try {
               req.exec(X);
             } catch (se) {
               return R(makeError(
                 "fromtexteval",
-                "fromText eval for " + $ + " failed: " + se,
+                "fromText eval for " + M + " failed: " + se,
                 se,
-                [$]
+                [M]
               ));
             }
             te && (useInteractive = !0), this.depMaps.push(oe), n.completeLoad(ee), K([ee], V);
@@ -26681,7 +26682,7 @@ https://requirejs.org/docs/errors.html#` + e);
         })), n.enable(q, this), this.pluginMaps[q.id] = q;
       },
       enable: function() {
-        c[this.map.id] = this, this.enabled = !0, this.enabling = !0, each(this.depMaps, bind(this, function(k, $) {
+        c[this.map.id] = this, this.enabled = !0, this.enabling = !0, each(this.depMaps, bind(this, function(k, M) {
           var q, E, V;
           if (typeof k == "string") {
             if (k = F(
@@ -26689,43 +26690,43 @@ https://requirejs.org/docs/errors.html#` + e);
               this.map.isDefine ? this.map : this.map.parentMap,
               !1,
               !this.skipMap
-            ), this.depMaps[$] = k, V = getOwn(r, k.id), V) {
-              this.depExports[$] = V(this);
+            ), this.depMaps[M] = k, V = getOwn(r, k.id), V) {
+              this.depExports[M] = V(this);
               return;
             }
             this.depCount += 1, T(k, "defined", bind(this, function(G) {
-              this.undefed || (this.defineDep($, G), this.check());
+              this.undefed || (this.defineDep(M, G), this.check());
             })), this.errback ? T(k, "error", bind(this, this.errback)) : this.events.error && T(k, "error", bind(this, function(G) {
               this.emit("error", G);
             }));
           }
           q = k.id, E = l[q], !hasProp(r, q) && E && !E.enabled && n.enable(k, this);
         })), eachProp(this.pluginMaps, bind(this, function(k) {
-          var $ = getOwn(l, k.id);
-          $ && !$.enabled && n.enable(k, this);
+          var M = getOwn(l, k.id);
+          M && !M.enabled && n.enable(k, this);
         })), this.enabling = !1, this.check();
       },
-      on: function(k, $) {
+      on: function(k, M) {
         var q = this.events[k];
-        q || (q = this.events[k] = []), q.push($);
+        q || (q = this.events[k] = []), q.push(M);
       },
-      emit: function(k, $) {
+      emit: function(k, M) {
         each(this.events[k], function(q) {
-          q($);
+          q(M);
         }), k === "error" && delete this.events[k];
       }
     };
     function L(k) {
       hasProp(p, k[0]) || I(F(k[0], null, !0)).init(k[1], k[2]);
     }
-    function w(k, $, q, E) {
-      k.detachEvent && !isOpera ? E && k.detachEvent(E, $) : k.removeEventListener(q, $, !1);
+    function w(k, M, q, E) {
+      k.detachEvent && !isOpera ? E && k.detachEvent(E, M) : k.removeEventListener(q, M, !1);
     }
     function O(k) {
-      var $ = k.currentTarget || k.srcElement;
-      return w($, n.onScriptLoad, "load", "onreadystatechange"), w($, n.onScriptError, "error"), {
-        node: $,
-        id: $ && $.getAttribute("data-requiremodule")
+      var M = k.currentTarget || k.srcElement;
+      return w(M, n.onScriptLoad, "load", "onreadystatechange"), w(M, n.onScriptError, "error"), {
+        node: M,
+        id: M && M.getAttribute("data-requiremodule")
       };
     }
     function j() {
@@ -26755,9 +26756,9 @@ https://requirejs.org/docs/errors.html#` + e);
        */
       configure: function(k) {
         if (k.baseUrl && k.baseUrl.charAt(k.baseUrl.length - 1) !== "/" && (k.baseUrl += "/"), typeof k.urlArgs == "string") {
-          var $ = k.urlArgs;
+          var M = k.urlArgs;
           k.urlArgs = function(V, G) {
-            return (G.indexOf("?") === -1 ? "?" : "&") + $;
+            return (G.indexOf("?") === -1 ? "?" : "&") + M;
           };
         }
         var q = i.shim, E = {
@@ -26784,20 +26785,20 @@ https://requirejs.org/docs/errors.html#` + e);
         }), (k.deps || k.callback) && n.require(k.deps || [], k.callback);
       },
       makeShimExports: function(k) {
-        function $() {
+        function M() {
           var q;
           return k.init && (q = k.init.apply(global, arguments)), q || k.exports && getGlobal(k.exports);
         }
-        return $;
+        return M;
       },
-      makeRequire: function(k, $) {
-        $ = $ || {};
+      makeRequire: function(k, M) {
+        M = M || {};
         function q(E, V, G) {
           var U, H, Y;
-          return $.enableBuildCallback && V && isFunction(V) && (V.__requireJsBuild = !0), typeof E == "string" ? isFunction(V) ? R(makeError("requireargs", "Invalid require call"), G) : k && hasProp(r, E) ? r[E](l[k.id]) : req.get ? req.get(n, E, k, q) : (H = F(E, k, !1, !0), U = H.id, hasProp(p, U) ? p[U] : R(makeError("notloaded", 'Module name "' + U + '" has not been loaded yet for context: ' + e + (k ? "" : ". Use require([])")))) : (j(), n.nextTick(function() {
-            j(), Y = I(F(null, k)), Y.skipMap = $.skipMap, Y.init(E, V, G, {
+          return M.enableBuildCallback && V && isFunction(V) && (V.__requireJsBuild = !0), typeof E == "string" ? isFunction(V) ? R(makeError("requireargs", "Invalid require call"), G) : k && hasProp(r, E) ? r[E](l[k.id]) : req.get ? req.get(n, E, k, q) : (H = F(E, k, !1, !0), U = H.id, hasProp(p, U) ? p[U] : R(makeError("notloaded", 'Module name "' + U + '" has not been loaded yet for context: ' + e + (k ? "" : ". Use require([])")))) : (j(), n.nextTick(function() {
+            j(), Y = I(F(null, k)), Y.skipMap = M.skipMap, Y.init(E, V, G, {
               enabled: !0
-            }), M();
+            }), $();
           }), q);
         }
         return mixin(q, {
@@ -26836,8 +26837,8 @@ https://requirejs.org/docs/errors.html#` + e);
        * the optimizer. Not shown here to keep code compact.
        */
       enable: function(k) {
-        var $ = getOwn(l, k.id);
-        $ && I(k).enable();
+        var M = getOwn(l, k.id);
+        M && I(k).enable();
       },
       /**
        * Internal method used by environment adapters to complete a load event.
@@ -26846,17 +26847,17 @@ https://requirejs.org/docs/errors.html#` + e);
        * @param {String} moduleName the name of the module to potentially complete.
        */
       completeLoad: function(k) {
-        var $, q, E, V = getOwn(i.shim, k) || {}, G = V.exports;
+        var M, q, E, V = getOwn(i.shim, k) || {}, G = V.exports;
         for (D(); d.length; ) {
           if (q = d.shift(), q[0] === null) {
-            if (q[0] = k, $)
+            if (q[0] = k, M)
               break;
-            $ = !0;
+            M = !0;
           } else
-            q[0] === k && ($ = !0);
+            q[0] === k && (M = !0);
           L(q);
         }
-        if (n.defQueueMap = {}, E = getOwn(l, k), !$ && !hasProp(p, k) && E && !E.inited) {
+        if (n.defQueueMap = {}, E = getOwn(l, k), !M && !hasProp(p, k) && E && !E.inited) {
           if (i.enforceDefine && (!G || !getGlobal(G)))
             return y(k) ? void 0 : R(makeError(
               "nodefine",
@@ -26866,7 +26867,7 @@ https://requirejs.org/docs/errors.html#` + e);
             ));
           L([k, V.deps || [], V.exportsFn]);
         }
-        M();
+        $();
       },
       /**
        * Converts a module name to a file path. Supports cases where
@@ -26875,26 +26876,26 @@ https://requirejs.org/docs/errors.html#` + e);
        * it is assumed to have already been normalized. This is an
        * internal API, not a public one. Use toUrl for the public API.
        */
-      nameToUrl: function(k, $, q) {
+      nameToUrl: function(k, M, q) {
         var E, V, G, U, H, Y, J, K = getOwn(i.pkgs, k);
         if (K && (k = K), J = getOwn(h, k), J)
-          return n.nameToUrl(J, $, q);
+          return n.nameToUrl(J, M, q);
         if (req.jsExtRegExp.test(k))
-          H = k + ($ || "");
+          H = k + (M || "");
         else {
           for (E = i.paths, V = k.split("/"), G = V.length; G > 0; G -= 1)
             if (U = V.slice(0, G).join("/"), Y = getOwn(E, U), Y) {
               isArray(Y) && (Y = Y[0]), V.splice(0, G, Y);
               break;
             }
-          H = V.join("/"), H += $ || (/^data\:|^blob\:|\?/.test(H) || q ? "" : ".js"), H = (H.charAt(0) === "/" || H.match(/^[\w\+\.\-]+:/) ? "" : i.baseUrl) + H;
+          H = V.join("/"), H += M || (/^data\:|^blob\:|\?/.test(H) || q ? "" : ".js"), H = (H.charAt(0) === "/" || H.match(/^[\w\+\.\-]+:/) ? "" : i.baseUrl) + H;
         }
         return i.urlArgs && !/^blob\:/.test(H) ? H + i.urlArgs(k, H) : H;
       },
       //Delegates to req.load. Broken out as a separate function to
       //allow overriding in the optimizer.
-      load: function(k, $) {
-        req.load(n, k, $);
+      load: function(k, M) {
+        req.load(n, k, M);
       },
       /**
        * Executes a module callback function. Broken out as a separate function
@@ -26903,8 +26904,8 @@ https://requirejs.org/docs/errors.html#` + e);
        *
        * @private
        */
-      execCb: function(k, $, q, E) {
-        return $.apply(E, q);
+      execCb: function(k, M, q, E) {
+        return M.apply(E, q);
       },
       /**
        * callback for script loads, used to check status of loading.
@@ -26915,23 +26916,23 @@ https://requirejs.org/docs/errors.html#` + e);
       onScriptLoad: function(k) {
         if (k.type === "load" || readyRegExp.test((k.currentTarget || k.srcElement).readyState)) {
           interactiveScript = null;
-          var $ = O(k);
-          n.completeLoad($.id);
+          var M = O(k);
+          n.completeLoad(M.id);
         }
       },
       /**
        * Callback for script errors.
        */
       onScriptError: function(k) {
-        var $ = O(k);
-        if (!y($.id)) {
+        var M = O(k);
+        if (!y(M.id)) {
           var q = [];
           return eachProp(l, function(E, V) {
             V.indexOf("_@r") !== 0 && each(E.depMaps, function(G) {
-              if (G.id === $.id)
+              if (G.id === M.id)
                 return q.push(V), !0;
             });
-          }), R(makeError("scripterror", 'Script error for "' + $.id + (q.length ? '", needed by: ' + q.join(", ") : '"'), k, [$.id]));
+          }), R(makeError("scripterror", 'Script error for "' + M.id + (q.length ? '", needed by: ' + q.join(", ") : '"'), k, [M.id]));
         }
       }
     }, n.require = n.makeRequire(), n;
@@ -28540,7 +28541,10 @@ const MarkdownEditor = (e) => {
     );
   }),
   { displayName: "MarkdownVoid" }
-), MarkdownVoid = (e) => /* @__PURE__ */ jsx(FlagProvider, { collectionField: !0, children: /* @__PURE__ */ jsx(MarkdownVoidInner, x({}, e)) });
+), MarkdownVoid = (e) => {
+  const t = useFlag();
+  return /* @__PURE__ */ jsx(FlagProvider, P(x({}, t), { collectionField: !0, children: /* @__PURE__ */ jsx(MarkdownVoidInner, x({}, e)) }));
+};
 MarkdownVoid.Designer = MarkdownVoidDesigner;
 const Markdown = connect(
   Input$3.TextArea,
@@ -28689,8 +28693,8 @@ function useCollectValuesToSubmit() {
     }), S = {}, y = Object.keys(f).map((D) => z(this, null, function* () {
       const B = f[D], N = a(D);
       if (isVariable$1(B)) {
-        const { value: M } = (yield p == null ? void 0 : p.parseVariable(B, m)) || {};
-        M != null && (S[D] = transformVariableValue(M, { targetCollectionField: N }));
+        const { value: $ } = (yield p == null ? void 0 : p.parseVariable(B, m)) || {};
+        $ != null && (S[D] = transformVariableValue($, { targetCollectionField: N }));
       } else
         B !== "" && (S[D] = B);
     }));
@@ -28727,7 +28731,7 @@ const useCreateActionProps = () => {
           manualClose: D,
           redirecting: B,
           redirectTo: N,
-          successMessage: M,
+          successMessage: $,
           actionAfterSuccess: L
         } = I || {};
         T || (yield o.submit());
@@ -28742,20 +28746,20 @@ const useCreateActionProps = () => {
             triggerWorkflows: R != null && R.length ? R.map((q) => [q.workflowKey, q.context].filter(Boolean).join("!")).join(",") : void 0,
             updateAssociationValues: g
           });
-          let $ = N;
-          if (N && ($ = yield getVariableValue(N, {
+          let M = N;
+          if (N && (M = yield getVariableValue(N, {
             variables: y,
             localVariables: [...S, { name: "$record", ctx: new Proxy((j = k == null ? void 0 : k.data) == null ? void 0 : j.data, {}) }]
-          })), (L === "previous" || !L && B !== !0) && (a == null || a(!1)), i == null || i(!0), l == null || l(!1), d.data.loading = !1, d.data.data = k, !M) {
-            message.success(h("Saved successfully")), yield resetFormCorrectly(o), (B && !L || L === "redirect") && $ && (isURL($) ? window.location.href = $ : c($));
+          })), (L === "previous" || !L && B !== !0) && (a == null || a(!1)), i == null || i(!0), l == null || l(!1), d.data.loading = !1, d.data.data = k, !$) {
+            message.success(h("Saved successfully")), yield resetFormCorrectly(o), (B && !L || L === "redirect") && M && (isURL(M) ? window.location.href = M : c(M));
             return;
           }
           D ? m.success({
-            title: p(M),
+            title: p($),
             onOk: () => z(this, null, function* () {
-              yield resetFormCorrectly(o), (B && !L || L === "redirect") && $ && (isURL($) ? window.location.href = $ : c($));
+              yield resetFormCorrectly(o), (B && !L || L === "redirect") && M && (isURL(M) ? window.location.href = M : c(M));
             })
-          }) : (message.success(p(M)), yield resetFormCorrectly(o), (B && !L || L === "redirect") && $ && (isURL($) ? window.location.href = $ : c($)));
+          }) : (message.success(p($)), yield resetFormCorrectly(o), (B && !L || L === "redirect") && M && (isURL(M) ? window.location.href = M : c(M)));
         } catch (k) {
           d.data.loading = !1;
         }
@@ -28768,14 +28772,14 @@ const useCreateActionProps = () => {
   return {
     onClick() {
       return z(this, null, function* () {
-        var $, q, E, V, G, U;
+        var M, q, E, V, G, U;
         const T = u.map((H) => H.name), {
           assignedValues: R = {},
           onSuccess: D,
           overwriteValues: B,
           skipValidator: N,
-          triggerWorkflows: M
-        } = ($ = l == null ? void 0 : l["x-action-settings"]) != null ? $ : {}, L = (q = a == null ? void 0 : a["x-component-props"]) == null ? void 0 : q.addChild, { successMessage: w } = D || {}, O = {}, j = Object.keys(R).map((H) => z(this, null, function* () {
+          triggerWorkflows: $
+        } = (M = l == null ? void 0 : l["x-action-settings"]) != null ? M : {}, L = (q = a == null ? void 0 : a["x-component-props"]) == null ? void 0 : q.addChild, { successMessage: w } = D || {}, O = {}, j = Object.keys(R).map((H) => z(this, null, function* () {
           const Y = R[H], J = d(H);
           if (isVariable$1(Y)) {
             const { value: K } = (yield C == null ? void 0 : C.parseVariable(Y, b)) || {};
@@ -28803,7 +28807,7 @@ const useCreateActionProps = () => {
             values: x(x(x({}, k), B), O),
             filterKeys: v,
             // TODO(refactor): should change to inject by plugin
-            triggerWorkflows: M != null && M.length ? M.map((Y) => [Y.workflowKey, Y.context].filter(Boolean).join("!")).join(",") : void 0
+            triggerWorkflows: $ != null && $.length ? $.map((Y) => [Y.workflowKey, Y.context].filter(Boolean).join("!")).join(",") : void 0
           });
           if (c.data.loading = !1, c.data.data = H, (U = (G = n == null ? void 0 : n.service) == null ? void 0 : G.refresh) == null || U.call(G), r == null || r(!1), i == null || i(!0), !w)
             return;
@@ -28848,13 +28852,13 @@ const useCreateActionProps = () => {
               m.defaultFilter
             ]);
             if (_.isEmpty(f[l]) && ((v = m.clearSelection) == null || v.call(m)), !(d && _.isEmpty(f[l])))
-              return m.dataLoadingMode === "manual" && _.isEmpty(f[l]) ? m.clearData() : m.doFilter(
+              return m.dataLoadingMode === "manual" && _.isEmpty(f[l]) ? m.clearData() : (_.set(m.service.params, "1.filters", f), m.doFilter(
                 P(x({}, g), {
                   page: 1,
                   filter: C
                 }),
                 { filters: f }
-              );
+              ));
           }))
         );
       } catch (m) {
@@ -28926,25 +28930,25 @@ const useCreateActionProps = () => {
           redirectTo: T,
           successMessage: R,
           actionAfterSuccess: D
-        } = S || {}, B = {}, N = Object.keys(b).map(($) => z(this, null, function* () {
-          const q = b[$], E = m($);
+        } = S || {}, B = {}, N = Object.keys(b).map((M) => z(this, null, function* () {
+          const q = b[M], E = m(M);
           if (isVariable$1(q)) {
             const { value: V } = (yield u == null ? void 0 : u.parseVariable(q, d)) || {};
-            V && (B[$] = transformVariableValue(V, { targetCollectionField: E }));
+            V && (B[M] = transformVariableValue(V, { targetCollectionField: E }));
           } else
-            q !== "" && (B[$] = q);
+            q !== "" && (B[M] = q);
         }));
         yield Promise.all(N), y === !1 && (yield l.submit());
-        const M = yield e.update({
+        const $ = yield e.update({
           filterByTk: n,
           values: x({}, B),
           // TODO(refactor): should change to inject by plugin
-          triggerWorkflows: v != null && v.length ? v.map(($) => [$.workflowKey, $.context].filter(Boolean).join("!")).join(",") : void 0
+          triggerWorkflows: v != null && v.length ? v.map((M) => [M.workflowKey, M.context].filter(Boolean).join("!")).join(",") : void 0
         });
         let L = T;
         T && (L = yield getVariableValue(T, {
           variables: u,
-          localVariables: [...d, { name: "$record", ctx: new Proxy((O = M == null ? void 0 : M.data) == null ? void 0 : O.data, {}) }]
+          localVariables: [...d, { name: "$record", ctx: new Proxy((O = $ == null ? void 0 : $.data) == null ? void 0 : O.data, {}) }]
         })), (D === "previous" || !D && I !== !0) && (h == null || h(!1)), C && (C == null || C()), e instanceof TableFieldResource || (k = (j = t == null ? void 0 : t.service) == null ? void 0 : j.refresh) == null || k.call(j), R && (F ? c.success({
           title: i(R),
           onOk: () => z(this, null, function* () {
@@ -28962,12 +28966,12 @@ const useCreateActionProps = () => {
   return {
     onClick() {
       return z(this, null, function* () {
-        var $;
+        var M;
         const {
           assignedValues: R = {},
           onSuccess: D,
           updateMode: B
-        } = ($ = a == null ? void 0 : a["x-action-settings"]) != null ? $ : {}, { manualClose: N, redirecting: M, redirectTo: L, successMessage: w, actionAfterSuccess: O } = D || {};
+        } = (M = a == null ? void 0 : a["x-action-settings"]) != null ? M : {}, { manualClose: N, redirecting: $, redirectTo: L, successMessage: w, actionAfterSuccess: O } = D || {};
         m.data = e.data || {}, m.data.loading = !0;
         const j = {}, k = Object.keys(R).map((E) => z(this, null, function* () {
           const V = R[E], G = C(E);
@@ -28977,7 +28981,7 @@ const useCreateActionProps = () => {
           } else
             V !== "" && (j[E] = V);
         }));
-        yield Promise.all(k), (O === "previous" || !O && M !== !0) && (S == null || S(!1)), h.confirm({
+        yield Promise.all(k), (O === "previous" || !O && $ !== !0) && (S == null || S(!1)), h.confirm({
           title: p("Bulk update"),
           content: p(B === "selected" ? "Update selected data?" : "Update all data?"),
           onOk() {
@@ -29005,9 +29009,9 @@ const useCreateActionProps = () => {
               t instanceof TableFieldResource || (Y = (H = o == null ? void 0 : o.service) == null ? void 0 : H.refresh) == null || Y.call(H), w && (N ? h.success({
                 title: d(w),
                 onOk: () => z(this, null, function* () {
-                  (M && !O || O === "redirect") && L && (isURL(L) ? window.location.href = L : u(L));
+                  ($ && !O || O === "redirect") && L && (isURL(L) ? window.location.href = L : u(L));
                 })
-              }) : (message.success(d(w)), (M && !O || O === "redirect") && L && (isURL(L) ? window.location.href = L : u(L))));
+              }) : (message.success(d(w)), ($ && !O || O === "redirect") && L && (isURL(L) ? window.location.href = L : u(L))));
             });
           },
           onCancel() {
@@ -29026,7 +29030,7 @@ const useCreateActionProps = () => {
     onClick() {
       return z(this, null, function* () {
         var E, V, G, U;
-        const { skipValidator: I, onSuccess: T, requestSettings: R } = (E = n == null ? void 0 : n["x-action-settings"]) != null ? E : {}, { manualClose: D, redirecting: B, redirectTo: N, successMessage: M, actionAfterSuccess: L } = T || {}, w = n == null ? void 0 : n["x-action"];
+        const { skipValidator: I, onSuccess: T, requestSettings: R } = (E = n == null ? void 0 : n["x-action-settings"]) != null ? E : {}, { manualClose: D, redirecting: B, redirectTo: N, successMessage: $, actionAfterSuccess: L } = T || {}, w = n == null ? void 0 : n["x-action"];
         if (!R.url)
           return;
         I !== !0 && w === "customize:form:request" && (yield a.submit());
@@ -29052,12 +29056,12 @@ const useCreateActionProps = () => {
         };
         f.data = c.data || {}, f.data.loading = !0;
         try {
-          yield e.request(x({}, q)), f.data.loading = !1, u instanceof TableFieldResource || (G = (V = d == null ? void 0 : d.service) == null ? void 0 : V.refresh) == null || G.call(V), (U = p == null ? void 0 : p.refresh) == null || U.call(p), w === "customize:form:request" && (L === "previous" || !L && B !== !0) && (b == null || b(!1)), M || (message.success(C("Saved successfully")), yield resetFormCorrectly(a), (B && !L || L === "redirect") && N && (isURL(N) ? window.location.href = N : t(N))), D ? S.success({
-            title: r(M),
+          yield e.request(x({}, q)), f.data.loading = !1, u instanceof TableFieldResource || (G = (V = d == null ? void 0 : d.service) == null ? void 0 : V.refresh) == null || G.call(V), (U = p == null ? void 0 : p.refresh) == null || U.call(p), w === "customize:form:request" && (L === "previous" || !L && B !== !0) && (b == null || b(!1)), $ || (message.success(C("Saved successfully")), yield resetFormCorrectly(a), (B && !L || L === "redirect") && N && (isURL(N) ? window.location.href = N : t(N))), D ? S.success({
+            title: r($),
             onOk: () => z(this, null, function* () {
               (B && !L || L === "redirect") && N && (isURL(N) ? window.location.href = N : t(N));
             })
-          }) : message.success(r(M));
+          }) : message.success(r($));
         } finally {
           f.data.loading = !1;
         }
@@ -29077,12 +29081,12 @@ const useCreateActionProps = () => {
           skipValidator: B,
           triggerWorkflows: N
         } = (V = l == null ? void 0 : l["x-action-settings"]) != null ? V : {}, {
-          manualClose: M,
+          manualClose: $,
           redirecting: L,
           redirectTo: w,
           successMessage: O,
           actionAfterSuccess: j
-        } = R || {}, k = {}, $ = Object.keys(T).map((U) => z(this, null, function* () {
+        } = R || {}, k = {}, M = Object.keys(T).map((U) => z(this, null, function* () {
           const H = T[U], Y = d(U);
           if (isVariable$1(H)) {
             const { value: J } = (yield b == null ? void 0 : b.parseVariable(H, S)) || {};
@@ -29090,7 +29094,7 @@ const useCreateActionProps = () => {
           } else
             H !== "" && (k[U] = H);
         }));
-        yield Promise.all($), B || (yield e.submit());
+        yield Promise.all(M), B || (yield e.submit());
         const q = u.map((U) => U.name), E = getFormValues({
           filterByTk: t,
           field: o,
@@ -29117,7 +29121,7 @@ const useCreateActionProps = () => {
             localVariables: [...S, { name: "$record", ctx: new Proxy((G = U == null ? void 0 : U.data) == null ? void 0 : G.data, {}) }]
           })), (j === "previous" || !j && L !== !0) && (a == null || a(!1)), i == null || i(!1), !O)
             return;
-          M ? f.success({
+          $ ? f.success({
             title: m(O),
             onOk: () => z(this, null, function* () {
               yield e.reset(), (L && !j || j === "redirect") && H && (isURL(H) ? window.location.href = H : c(H));
@@ -29313,7 +29317,7 @@ const useCreateActionProps = () => {
   var o;
   return ["select", "multipleSelect", "checkbox", "checkboxGroup", "chinaRegion"].includes(e == null ? void 0 : e.interface) && ((o = e == null ? void 0 : e.uiSchema) == null ? void 0 : o.enum);
 }, useAssociationFilterBlockProps = () => {
-  var v, F, I, T, R, D, B, N, M, L;
+  var v, F, I, T, R, D, B, N, $, L;
   const e = AssociationFilter.useAssociationField(), t = useFieldSchema(), o = useOptionalFieldList(), { getDataBlocks: n } = useFilterBlock(), r = e == null ? void 0 : e.name, a = useField(), { props: i } = useBlockRequestContext(), l = useDataSourceHeaders(i == null ? void 0 : i.dataSource), c = useCollectionManager(), { filter: u, parseVariableLoading: d } = useParsedFilter({ filterOption: (F = (v = a.componentProps) == null ? void 0 : v.params) == null ? void 0 : F.filter });
   let p, m, h, g, f, C, b, S;
   C = e != null && e.target ? (I = c == null ? void 0 : c.getCollection(e.target)) == null ? void 0 : I.getPrimaryKey() : "id", b = ((R = (T = t["x-component-props"]) == null ? void 0 : T.fieldNames) == null ? void 0 : R.label) || C, { data: f, params: h, run: g } = useRequest(
@@ -29342,7 +29346,7 @@ const useCreateActionProps = () => {
     g,
     C,
     (B = a.componentProps) == null ? void 0 : B.params,
-    (M = (N = a.componentProps) == null ? void 0 : N.params) == null ? void 0 : M.sort,
+    ($ = (N = a.componentProps) == null ? void 0 : N.params) == null ? void 0 : $.sort,
     d
   ]);
   const y = useCallback(
@@ -29387,12 +29391,12 @@ const useCreateActionProps = () => {
     }, j = ((L = w == null ? void 0 : w.uiSchema) == null ? void 0 : L.enum) || [];
     C = "value", b = "label", p = j, h = {}, g = () => {
     }, S = `${w.name}.${O[w.interface]}`, m = (k) => {
-      const $ = k.target.value;
-      if (!$) {
+      const M = k.target.value;
+      if (!M) {
         p = j;
         return;
       }
-      p = j.filter((q) => q.label.includes($));
+      p = j.filter((q) => q.label.includes(M));
     };
   } else
     S = `${r}.${C}.$in`, p = (f == null ? void 0 : f.data) || [], m = (w) => {
@@ -29683,35 +29687,35 @@ const useSyncFromForm = (e, t, o) => {
       const N = {
         type: "duplicate",
         tag: c((w = B.uiSchema) == null ? void 0 : w.title) || B.name
-      }, M = P(x({}, N), {
+      }, $ = P(x({}, N), {
         title: React.createElement(TreeNode, N),
         key: v ? `${v}.${B.name}` : B.name,
         isLeaf: !0,
         field: B,
         disabled: F
-      }), L = I.find((O) => O.name === M.key);
+      }), L = I.find((O) => O.name === $.key);
       if (["belongsTo", "belongsToMany"].includes(B.type) && (!L || ["Select", "Picker"].includes(L == null ? void 0 : L.fieldMode)))
-        N.type = "reference", M.type = "reference", M.title = React.createElement(TreeNode, P(x({}, N), { type: "reference" })), M.isLeaf = !1, M.children = m(B.target, {
+        N.type = "reference", $.type = "reference", $.title = React.createElement(TreeNode, P(x({}, N), { type: "reference" })), $.isLeaf = !1, $.children = m(B.target, {
           depth: S + 1,
           maxDepth: y,
-          prefix: M.key,
+          prefix: $.key,
           exclude: systemKeys
         });
       else if (["hasOne", "hasMany"].includes(B.type) || ["Nester", "SubTable"].includes(L == null ? void 0 : L.fieldMode)) {
         let O = !1;
-        ["hasOne", "hasMany"].includes(B.type) && ["Select", "Picker"].includes(L == null ? void 0 : L.fieldMode) && (O = !0), M.disabled = !0, M.isLeaf = !1, M.children = p(
+        ["hasOne", "hasMany"].includes(B.type) && ["Select", "Picker"].includes(L == null ? void 0 : L.fieldMode) && (O = !0), $.disabled = !0, $.isLeaf = !1, $.children = p(
           B.target,
           {
             depth: S + 1,
             maxDepth: y,
-            prefix: M.key,
+            prefix: $.key,
             exclude: ["id", ...systemKeys],
             disabled: O
           },
           I
         );
       }
-      return M;
+      return $;
     }).filter(Boolean);
     return f.set(T, D), D;
   })(new LRUCache({ max: 100 })), m = /* @__PURE__ */ ((f) => (C, { prefix: b, maxDepth: S, depth: y = 0, exclude: v = [] }) => {
@@ -29721,7 +29725,7 @@ const useSyncFromForm = (e, t, o) => {
     if (y > S)
       return [];
     const T = r(C).map((R) => {
-      var N, M;
+      var N, $;
       if (!R.target || !R.interface || v.includes(R.name))
         return;
       const D = {
@@ -29730,7 +29734,7 @@ const useSyncFromForm = (e, t, o) => {
       }, B = b ? `${b}.${R.name}` : R.name;
       return {
         type: "preloading",
-        tag: c((M = R.uiSchema) == null ? void 0 : M.title) || R.name,
+        tag: c(($ = R.uiSchema) == null ? void 0 : $.title) || R.name,
         title: React.createElement(TreeNode, D),
         key: B,
         isLeaf: !1,
@@ -29761,11 +29765,11 @@ const useSyncFromForm = (e, t, o) => {
           var I;
           (I = v == null ? void 0 : v.reduceProperties) == null || I.call(v, (T, R) => {
             var O, j, k;
-            const D = T || F, B = R["x-collection-field"] && n(R["x-collection-field"]), N = R.name.includes("."), M = B && ["hasOne", "hasMany", "belongsTo", "belongsToMany"].includes(B.type), L = !M && N ? getAssociationPath(R.name) : R.name, w = D === "" || !D ? L : D + "." + L;
-            if (B && !(["hasOne", "hasMany"].includes(B.type) || ["SubForm", "Nester"].includes((O = R["x-component-props"]) == null ? void 0 : O.mode)) && C.add(w), B && (M || N) && R["x-component"] !== "TableField") {
+            const D = T || F, B = R["x-collection-field"] && n(R["x-collection-field"]), N = R.name.includes("."), $ = B && ["hasOne", "hasMany", "belongsTo", "belongsToMany"].includes(B.type), L = !$ && N ? getAssociationPath(R.name) : R.name, w = D === "" || !D ? L : D + "." + L;
+            if (B && !(["hasOne", "hasMany"].includes(B.type) || ["SubForm", "Nester"].includes((O = R["x-component-props"]) == null ? void 0 : O.mode)) && C.add(w), B && ($ || N) && R["x-component"] !== "TableField") {
               if (f.add({ name: w, fieldMode: ((j = R["x-component-props"]) == null ? void 0 : j.mode) || "Select" }), ["Nester", "SubTable"].includes((k = R["x-component-props"]) == null ? void 0 : k.mode)) {
-                const $ = D && D !== "" ? D + "." + R.name : R.name;
-                b(R, $);
+                const M = D && D !== "" ? D + "." + R.name : R.name;
+                b(R, M);
               }
             } else
               [
@@ -30988,7 +30992,7 @@ const useParseDefaultValue = () => {
         const D = !t.name.toString().includes(".") && (d == null ? void 0 : d.getField(t.name)), {
           value: B,
           collectionName: N,
-          dataSource: M = "main"
+          dataSource: $ = "main"
         } = yield o.parseVariable(t.default, n, {
           fieldOperator: C(t.name)
         });
@@ -30996,7 +31000,7 @@ const useParseDefaultValue = () => {
           collectionName: D.target,
           targetCollectionName: N,
           dm: b,
-          dataSource: M
+          dataSource: $
         })) {
           e.loading = !1;
           return;
@@ -31012,8 +31016,8 @@ const useParseDefaultValue = () => {
       const T = getVariableName(t.default), R = S(T);
       return R ? (y(), reaction(
         () => {
-          const B = { [T]: (R == null ? void 0 : R.ctx) || {} }, N = getPath(t.default), M = getValuesByPath(B, N);
-          return M === void 0 ? Math.random() : M;
+          const B = { [T]: (R == null ? void 0 : R.ctx) || {} }, N = getPath(t.default), $ = getValuesByPath(B, N);
+          return $ === void 0 ? Math.random() : $;
         },
         () => v({ forceUpdate: !0 }),
         {
@@ -36962,8 +36966,8 @@ const enabledIndexColumn$1 = {
   name: "fieldSettings:component:CascadeSelect",
   items: [fieldComponent$6, titleField$1, ellipsisSettingsItem, setTheDataScope]
 }), SchemaSettingsDateRange = function e(t) {
-  var T, R, D, B, N, M, L, w, O, j, k, $, q, E, V, G;
-  const { fieldSchema: o } = t, n = useField(), { dn: r } = useDesignable(), { t: a } = useTranslation(), { getCollectionJoinField: i } = useCollectionManager_deprecated(), { isInSubForm: l, isInSubTable: c } = useFlag() || {}, u = i(o == null ? void 0 : o["x-collection-field"]) || {}, d = ((T = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : T.showTime) || ((D = (R = u == null ? void 0 : u.uiSchema) == null ? void 0 : R["x-component-props"]) == null ? void 0 : D.showTime) || !1, p = ((B = o == null ? void 0 : o["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 = ((L = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : L.timeFormat) || ((O = (w = u == null ? void 0 : u.uiSchema) == null ? void 0 : w["x-component-props"]) == null ? void 0 : O.timeFormat) || "HH:mm:ss", h = ((j = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : j.picker) || (($ = (k = u == null ? void 0 : u.uiSchema) == null ? void 0 : k["x-component-props"]) == null ? void 0 : $.picker) || "date";
+  var T, R, D, B, N, $, L, w, O, j, k, M, q, E, V, G;
+  const { fieldSchema: o } = t, n = useField(), { dn: r } = useDesignable(), { t: a } = useTranslation(), { getCollectionJoinField: i } = useCollectionManager_deprecated(), { isInSubForm: l, isInSubTable: c } = useFlag() || {}, u = i(o == null ? void 0 : o["x-collection-field"]) || {}, d = ((T = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : T.showTime) || ((D = (R = u == null ? void 0 : u.uiSchema) == null ? void 0 : R["x-component-props"]) == null ? void 0 : D.showTime) || !1, p = ((B = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : B.dateFormat) || (($ = (N = u == null ? void 0 : u.uiSchema) == null ? void 0 : N["x-component-props"]) == null ? void 0 : $.dateFormat) || "YYYY-MM-DD", m = ((L = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : L.timeFormat) || ((O = (w = u == null ? void 0 : u.uiSchema) == null ? void 0 : w["x-component-props"]) == null ? void 0 : O.timeFormat) || "HH:mm:ss", h = ((j = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : j.picker) || ((M = (k = u == null ? void 0 : u.uiSchema) == null ? void 0 : k["x-component-props"]) == null ? void 0 : M.picker) || "date";
   o["x-read-pretty"] || n.readOnly || n.readPretty;
   const g = (q = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : q._minDate, f = (E = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : E._maxDate, C = ((V = u == null ? void 0 : u.uiSchema) == null ? void 0 : V["x-component-props"].gmt) || !1, b = ((G = u == null ? void 0 : u.uiSchema) == null ? void 0 : G["x-component-props"].utc) || !1, S = useRecord(), { form: y } = useFormBlockContext(), v = useCallback(
     (U) => /* @__PURE__ */ jsx(
@@ -38449,7 +38453,7 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
       let I = mergeCtxWithLocalVariables(o.current, b);
       const { fieldPath: T, dataSource: R, variableOption: D } = getFieldPath$1(v, F);
       let B = T;
-      const { fieldPath: N } = getFieldPath$1(C, F), M = y.length === 1 ? D == null ? void 0 : D.collectionName : (w = r(N, R)) == null ? void 0 : w.target;
+      const { fieldPath: N } = getFieldPath$1(C, F), $ = y.length === 1 ? D == null ? void 0 : D.collectionName : (w = r(N, R)) == null ? void 0 : w.target;
       if (!(v in I))
         throw new Error(`VariablesProvider: ${v} is not found`);
       for (let j = 0; j < y.length; j++) {
@@ -38457,12 +38461,12 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
           return {
             value: I === void 0 ? D == null ? void 0 : D.defaultValue : I,
             dataSource: R,
-            collectionName: M
+            collectionName: $
           };
-        const k = y[j], $ = y.slice(0, j + 1).join("."), { fieldPath: q } = getFieldPath$1($, F), E = r(q, R), V = (O = a(B, R)) == null ? void 0 : O.getPrimaryKey();
+        const k = y[j], M = y.slice(0, j + 1).join("."), { fieldPath: q } = getFieldPath$1(M, F), E = r(q, R), V = (O = a(B, R)) == null ? void 0 : O.getPrimaryKey();
         if (Array.isArray(I)) {
           const G = I.map((U) => {
-            if (!(S != null && S.doNotRequest) && shouldToRequest(U == null ? void 0 : U[k]) && (U == null ? void 0 : U[V]) != null && E != null && E.target) {
+            if (!(S != null && S.doNotRequest) && shouldToRequest(U == null ? void 0 : U[k], U, M) && (U == null ? void 0 : U[V]) != null && E != null && E.target) {
               const H = `/${B}/${U[E.sourceKey || V]}/${k}:${getAction(E.type)}`;
               if (hasRequested(H))
                 return getRequested(H);
@@ -38478,7 +38482,7 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
             return U == null ? void 0 : U[k];
           });
           I = removeThroughCollectionFields(_.flatten(yield Promise.all(G)), E);
-        } else if (!(S != null && S.doNotRequest) && shouldToRequest(I[k]) && I[V] != null && (E != null && E.target)) {
+        } else if (!(S != null && S.doNotRequest) && shouldToRequest(I[k], I, M) && I[V] != null && (E != null && E.target)) {
           const G = `/${B}/${I[E.sourceKey || V]}/${k}:${getAction(E.type)}`;
           let U = null;
           if (hasRequested(G))
@@ -38505,7 +38509,7 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
       return {
         value: L === void 0 ? D.defaultValue : L,
         dataSource: R,
-        collectionName: M
+        collectionName: $
       };
     }),
     [r]
@@ -38587,6 +38591,8 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
 VariablesProvider.displayName = "VariablesProvider";
 const VariablesProvider$1 = VariablesProvider;
 function shouldToRequest(e, t, o) {
+  if (o.split(".").length === 2 && (o.startsWith("$nForm.") || o.startsWith("$iteration.")))
+    return !1;
   let n = !1;
   return untracked(() => {
     if (JSON.stringify(e) === "[{}]" || JSON.stringify(e) === "{}") {
@@ -38802,8 +38808,8 @@ const NocoBaseField = (e) => {
   !y.parent && p && (y.parent = p, !((B = (D = y.parent) == null ? void 0 : D.properties) != null && B[y.name]) && y.name && _.set(y.parent, `properties.${y.name}`, y));
   const v = useCallback(() => {
     const N = y.parent;
-    h.current = new Schema(y.toJSON(), N), N != null && N.properties && Object.keys(N.properties).forEach((M) => {
-      M === y.name && (N.properties[M] = h.current);
+    h.current = new Schema(y.toJSON(), N), N != null && N.properties && Object.keys(N.properties).forEach(($) => {
+      $ === y.name && (N.properties[$] = h.current);
     }), b(), S == null || S();
   }, [y, S, b]), F = useMemo(() => d ? createMergedSchemaInstance(y, d, n) : f ? (f.default = C, createMergedSchemaInstance(y, f, n)) : y, [f, C, y, n, d]), I = useFieldProps(F), T = (N) => {
     if (!r)
@@ -38959,7 +38965,7 @@ const ActionLink = withDynamicSchemaProps(
         return ((K = I == null ? void 0 : I["x-linkage-rules"]) == null ? void 0 : K.filter((X) => !X.disabled)) || [];
       },
       [I == null ? void 0 : I["x-linkage-rules"]]
-    ), { designable: N } = useDesignable(), M = useComponent(n) || n, L = useVariables$1(), w = useLocalVariables$1(), { visibleWithURL: O, setVisibleWithURL: j } = usePopupUtils(), { setSubmitted: k } = useActionContext(), { getAriaLabel: $ } = useGetAriaLabelOfAction(l), q = useCollectionParentRecordData(), E = useApp(), { getAllDataBlocks: V } = useAllDataBlocks(), G = useForm();
+    ), { designable: N } = useDesignable(), $ = useComponent(n) || n, L = useVariables$1(), w = useLocalVariables$1(), { visibleWithURL: O, setVisibleWithURL: j } = usePopupUtils(), { setSubmitted: k } = useActionContext(), { getAriaLabel: M } = useGetAriaLabelOfAction(l), q = useCollectionParentRecordData(), E = useApp(), { getAllDataBlocks: V } = useAllDataBlocks(), G = useForm();
     useEffect(() => {
       F.stateOfLinkageRules && setInitialActionState(F);
       const K = uid(), X = [];
@@ -39023,7 +39029,7 @@ const ActionLink = withDynamicSchemaProps(
         icon: i,
         loading: d,
         handleMouseEnter: U,
-        tarComponent: M,
+        tarComponent: $,
         className: a,
         type: e.type,
         Designer: v,
@@ -39040,7 +39046,7 @@ const ActionLink = withDynamicSchemaProps(
         visibleWithURL: O,
         setVisibleWithURL: j,
         setSubmitted: k,
-        getAriaLabel: $,
+        getAriaLabel: M,
         parentRecordData: q,
         actionCallback: h
       }, y)
@@ -39076,7 +39082,7 @@ const ActionLink = withDynamicSchemaProps(
     setVisibleWithURL: D,
     setSubmitted: B,
     getAriaLabel: N,
-    parentRecordData: M
+    parentRecordData: $
   } = xe, L = W(xe, [
     "containerRefKey",
     "fieldSchema",
@@ -39105,7 +39111,7 @@ const ActionLink = withDynamicSchemaProps(
     "setSubmitted",
     "getAriaLabel",
     "parentRecordData"
-  ]), [w, O] = useState(!1), { wrapSSR: j, componentCls: k, hashId: $ } = useStyles$8(), [q, E] = useState(!1), V = n["x-toolbar-props"] || n["x-designer-props"], G = (fe = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : fe.openMode, U = (pe = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : pe.openSize, H = (me = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : me.refreshDataBlockRequest, { modal: Y } = App.useApp(), J = useForm(), K = useACLActionParamsContext(), { run: X, element: Q, disabled: ee } = (I == null ? void 0 : I(T)) || {}, oe = J.disabled || a.disabled || ((he = a.data) == null ? void 0 : he.disabled) || F || ee, te = useMemo(() => {
+  ]), [w, O] = useState(!1), { wrapSSR: j, componentCls: k, hashId: M } = useStyles$8(), [q, E] = useState(!1), V = n["x-toolbar-props"] || n["x-designer-props"], G = (fe = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : fe.openMode, U = (pe = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : pe.openSize, H = (me = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : me.refreshDataBlockRequest, { modal: Y } = App.useApp(), J = useForm(), K = useACLActionParamsContext(), { run: X, element: Q, disabled: ee } = (I == null ? void 0 : I(T)) || {}, oe = J.disabled || a.disabled || ((he = a.data) == null ? void 0 : he.disabled) || F || ee, te = useMemo(() => {
     var ce;
     return P(x({}, v), {
       opacity: r && (((ce = a == null ? void 0 : a.data) == null ? void 0 : ce.hidden) || !K) && 0.1,
@@ -39123,7 +39129,7 @@ const ActionLink = withDynamicSchemaProps(
     tarComponent: u,
     designerProps: V,
     componentCls: k,
-    hashId: $,
+    hashId: M,
     className: d,
     others: L,
     getAriaLabel: N,
@@ -39236,7 +39242,7 @@ const RenderButton = ({
   confirmTitle: D,
   title: B
 }) => {
-  const { getDataBlockRequest: N } = useDataBlockRequestGetter(), { t: M } = useTranslation(), { isPopupVisibleControlledByURL: L } = usePopupSettings(), { openPopup: w } = usePopupUtils(), O = useVariables$1(), j = useLocalVariables$1(), k = useRef(null), $ = useCompile(), q = useForm();
+  const { getDataBlockRequest: N } = useDataBlockRequestGetter(), { t: $ } = useTranslation(), { isPopupVisibleControlledByURL: L } = usePopupSettings(), { openPopup: w } = usePopupUtils(), O = useVariables$1(), j = useLocalVariables$1(), k = useRef(null), M = useCompile(), q = useForm();
   k.current = w;
   const E = {
     variables: O,
@@ -39247,7 +39253,7 @@ const RenderButton = ({
       if (U && isPortalInBody(G.target))
         return;
       G.preventDefault(), G.stopPropagation();
-      const H = yield getVariableValue(M(I == null ? void 0 : I.title, { title: $(y.title) }), E), Y = yield getVariableValue(M(I == null ? void 0 : I.content, { title: $(y.title) }), E);
+      const H = yield getVariableValue($(I == null ? void 0 : I.title, { title: M(y.title) }), E), Y = yield getVariableValue($(I == null ? void 0 : I.content, { title: M(y.title) }), E);
       if (!a && o) {
         const K = () => {
           b ? b(G, () => {
@@ -39256,8 +39262,8 @@ const RenderButton = ({
           }) : isBulkEditAction(y) || !L() ? (v(!0), F == null || F()) : ["view", "update", "create", "customize:popup"].includes(y["x-action"]) && y["x-uid"] ? k.current() : (v(!0), F == null || F());
         };
         (I == null ? void 0 : I.enable) !== !1 && (I != null && I.content) ? (yield (J = q == null ? void 0 : q.submit) == null ? void 0 : J.call(q), T.confirm({
-          title: M(H, { title: D || B || (t == null ? void 0 : t.title) }),
-          content: M(Y, { title: D || B || (t == null ? void 0 : t.title) }),
+          title: $(H, { title: D || B || (t == null ? void 0 : t.title) }),
+          content: $(Y, { title: D || B || (t == null ? void 0 : t.title) }),
           onOk: K
         })) : K();
       }
@@ -39278,7 +39284,7 @@ const RenderButton = ({
       F,
       R,
       v,
-      M,
+      $,
       B,
       N
     ]
@@ -39355,8 +39361,8 @@ const RenderButtonInner = observer$1(
       "onlyIcon"
     ]), { t: I } = useTranslation(), T = useCallback(
       debounce$1(
-        ($, q = !0) => {
-          d($, q);
+        (M, q = !0) => {
+          d(M, q);
         },
         300,
         { leading: !0, trailing: !1 }
@@ -39367,11 +39373,11 @@ const RenderButtonInner = observer$1(
       T.cancel();
     }, []), !t && ((O = o == null ? void 0 : o.data) != null && O.hidden || !n))
       return null;
-    const R = S != null ? S : o == null ? void 0 : o.title, D = typeof R == "string" ? I(R, { ns: NAMESPACE_UI_SCHEMA }) : R, j = l, { opacity: B } = j, N = W(j, ["opacity"]), M = y && B ? { opacity: B } : void 0, L = React.forwardRef(
+    const R = S != null ? S : o == null ? void 0 : o.title, D = typeof R == "string" ? I(R, { ns: NAMESPACE_UI_SCHEMA }) : R, j = l, { opacity: B } = j, N = W(j, ["opacity"]), $ = y && B ? { opacity: B } : void 0, L = React.forwardRef(
       (H, U) => {
-        var Y = H, { component: $ = p || Button, icon: q, onlyIcon: E, children: V } = Y, G = W(Y, ["component", "icon", "onlyIcon", "children"]);
-        return /* @__PURE__ */ jsxs($, P(x({ ref: U }, G), { children: [
-          E ? /* @__PURE__ */ jsx(Tooltip, { title: G.title, children: /* @__PURE__ */ jsx("span", { children: q && typeof q == "string" ? /* @__PURE__ */ jsx(Icon, { type: q }) : q }) }) : /* @__PURE__ */ jsx("span", { children: q && typeof q == "string" ? /* @__PURE__ */ jsx(Icon, { type: q }) : q }),
+        var Y = H, { component: M = p || Button, icon: q, onlyIcon: E, children: V } = Y, G = W(Y, ["component", "icon", "onlyIcon", "children"]);
+        return /* @__PURE__ */ jsxs(M, P(x({ ref: U }, G), { children: [
+          E ? /* @__PURE__ */ jsx(Tooltip, { title: G.title, children: /* @__PURE__ */ jsx("span", { style: { padding: 3 }, children: q && typeof q == "string" ? /* @__PURE__ */ jsx(Icon, { type: q }) : q }) }) : /* @__PURE__ */ jsx("span", { style: { paddingRight: 3 }, children: q && typeof q == "string" ? /* @__PURE__ */ jsx(Icon, { type: q }) : q }),
           E ? V[1] : V
         ] }));
       }
@@ -39384,7 +39390,7 @@ const RenderButtonInner = observer$1(
       }, F), {
         onMouseEnter: c,
         loading: ((k = o == null ? void 0 : o.data) == null ? void 0 : k.loading) || a,
-        icon: typeof r == "string" ? /* @__PURE__ */ jsx(Icon, { type: r, style: M }) : r,
+        icon: typeof r == "string" ? /* @__PURE__ */ jsx(Icon, { type: r, style: $ }) : r,
         disabled: i,
         style: y ? N : l,
         onClick: T,
@@ -39394,7 +39400,7 @@ const RenderButtonInner = observer$1(
         title: D,
         onlyIcon: v,
         children: [
-          !v && D && /* @__PURE__ */ jsx("span", { className: r ? "nb-action-title" : null, style: M, children: D }),
+          !v && D && /* @__PURE__ */ jsx("span", { className: r ? "nb-action-title" : null, style: $, children: D }),
           /* @__PURE__ */ jsx(C, x({}, b))
         ]
       })
@@ -39850,30 +39856,30 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
         "toOptionsItem",
         "popupMatchSelectWidth",
         "onSuccess"
-      ]), b = useDataSourceKey(), S = useDataSourceHeaders(m || b), y = useRef(!1), v = useFieldSchema(), F = ((Y = v["x-component-props"]) == null ? void 0 : Y.addMode) === "quickAdd", { getField: I } = useCollection_deprecated(), T = useRef(null), { getCollectionJoinField: R, getInterface: D } = useCollectionManager_deprecated(), B = v["x-collection-field"] || v.name, N = I(B) || R(B), M = u || (N == null ? void 0 : N.target) && (t == null ? void 0 : t.label) && R(`${N.target}.${t.label}`), L = useMemo(() => {
+      ]), b = useDataSourceKey(), S = useDataSourceHeaders(m || b), y = useRef(!1), v = useFieldSchema(), F = ((Y = v["x-component-props"]) == null ? void 0 : Y.addMode) === "quickAdd", { getField: I } = useCollection_deprecated(), T = useRef(null), { getCollectionJoinField: R, getInterface: D } = useCollectionManager_deprecated(), B = v["x-collection-field"] || v.name, N = I(B) || R(B), $ = u || (N == null ? void 0 : N.target) && (t == null ? void 0 : t.label) && R(`${N.target}.${t.label}`), L = useMemo(() => {
         var K;
-        if (M != null && M.interface) {
-          const X = D(M.interface), Q = ((K = X == null ? void 0 : X.filterable) == null ? void 0 : K.operators[0].value) || "$includes";
-          return M.type === "string" ? "$includes" : Q;
+        if ($ != null && $.interface) {
+          const X = D($.interface), Q = ((K = X == null ? void 0 : X.filterable) == null ? void 0 : K.operators[0].value) || "$includes";
+          return $.type === "string" ? "$includes" : Q;
         }
         return "$includes";
-      }, [M]), w = useCompile(), O = useCallback(
+      }, [$]), w = useCompile(), O = useCallback(
         (K) => {
           try {
             return K.filter((X) => ["number", "string"].includes(typeof X[t.value]) || !X[t.value]).map((X) => {
               var ee;
               let Q = w(X[t.label]);
-              if ((ee = M == null ? void 0 : M.uiSchema) != null && ee.enum)
+              if ((ee = $ == null ? void 0 : $.uiSchema) != null && ee.enum)
                 if (Array.isArray(Q))
                   Q = Q.map((oe, te) => {
-                    const se = M.uiSchema.enum.find((ie) => ie.value === oe);
+                    const se = $.uiSchema.enum.find((ie) => ie.value === oe);
                     return se ? /* @__PURE__ */ jsx(Tag, { role: "button", color: se.color, style: { marginRight: 3 }, children: (se == null ? void 0 : se.label) || oe }, te) : /* @__PURE__ */ jsx(Tag, { role: "button", children: oe }, oe);
                   }).reverse();
                 else {
-                  const oe = M.uiSchema.enum.find((te) => te.value === Q);
+                  const oe = $.uiSchema.enum.find((te) => te.value === Q);
                   oe && (Q = /* @__PURE__ */ jsx(Tag, { role: "button", color: oe.color, children: oe.label }));
                 }
-              return (M == null ? void 0 : M.type) === "date" && (Q = dayjs(Q).format("YYYY-MM-DD")), c ? c({
+              return ($ == null ? void 0 : $.type) === "date" && (Q = dayjs(Q).format("YYYY-MM-DD")), c ? c({
                 [t.label]: Q || EMPTY$1,
                 [t.value]: X[t.value]
               }) : P(x({}, omit(X, "style")), {
@@ -39885,8 +39891,8 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
             return console.error(X), K;
           }
         },
-        [M == null ? void 0 : M.uiSchema, t]
-      ), { data: j, run: k, loading: $ } = useRequest(
+        [$ == null ? void 0 : $.uiSchema, t]
+      ), { data: j, run: k, loading: M } = useRequest(
         P(x({
           action: "list"
         }, o), {
@@ -39956,7 +39962,7 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
           value: r,
           defaultValue: a
         }, C), {
-          loading: j ? $ : !0,
+          loading: j ? M : !0,
           options: h(O(G)),
           rawOptions: G,
           dropdownRender: (K) => {
@@ -40035,9 +40041,9 @@ const useFormDataTemplates = () => {
     d(I), m(null), t == null || t.reset();
   }), []), v = useCallback((I, T, R) => z(void 0, null, function* () {
     const D = P(x({}, T), { dataId: I });
-    m(T), fetchTemplateData(h, D, R).then((B) => (t && B && (t.reset(), t.__template = !0, forEach(B, (N, M) => {
+    m(T), fetchTemplateData(h, D, R).then((B) => (t && B && (t.reset(), t.__template = !0, forEach(B, (N, $) => {
       var L;
-      N && (t.values[M] = N, (L = t == null ? void 0 : t.setInitialValuesIn) == null || L.call(t, M, N));
+      N && (t.values[$] = N, (L = t == null ? void 0 : t.setInitialValuesIn) == null || L.call(t, $, N));
     })), B)).catch((B) => {
       console.error(B);
     });
@@ -40962,10 +40968,10 @@ const insertPositionToMethod = {
     [(D = c == null ? void 0 : c["x-component-props"]) == null ? void 0 : D.onSelect]
   ), h = useMemo(() => toItems$1(c == null ? void 0 : c.properties, { t: l, compile: u }), [c == null ? void 0 : c.properties, l, u]), g = useCallback(
     (N) => {
-      onFieldChange("target", (M) => {
+      onFieldChange("target", ($) => {
         var w, O;
-        const [, L] = ((O = (w = M == null ? void 0 : M.value) == null ? void 0 : w.split) == null ? void 0 : O.call(w, "||")) || [];
-        M.query("position").take((j) => {
+        const [, L] = ((O = (w = $ == null ? void 0 : $.value) == null ? void 0 : w.split) == null ? void 0 : O.call(w, "||")) || [];
+        $.query("position").take((j) => {
           j.dataSource = L === "Menu.SubMenu" ? [
             { label: l("Before"), value: "beforeBegin" },
             { label: l("After"), value: "afterEnd" },
@@ -41013,7 +41019,7 @@ const insertPositionToMethod = {
   }), [o.componentProps.tooltip]);
   n["x-component"] === "Menu.URL" && (f.properties.href = d, f.properties.params = p, C.href = o.componentProps.href, C.params = o.componentProps.params);
   const y = useCallback(
-    ({ title: N, icon: M, href: L, params: w }) => {
+    ({ title: N, icon: $, href: L, params: w }) => {
       var j;
       const O = {
         "x-uid": n["x-uid"],
@@ -41024,11 +41030,11 @@ const insertPositionToMethod = {
           }
         ]
       };
-      N && (n.title = N, o.title = N, O.title = N, i()), o.componentProps.icon = M, o.componentProps.href = L, o.componentProps.params = w, O["x-component-props"] = { icon: M, href: L, params: w }, n["x-component-props"] = n["x-component-props"] || {}, n["x-component-props"].icon = M, n["x-component-props"].href = L, n["x-component-props"].params = w, m == null || m({ item: { props: { schema: n } } }), a.emit("patch", {
+      N && (n.title = N, o.title = N, O.title = N, i()), o.componentProps.icon = $, o.componentProps.href = L, o.componentProps.params = w, O["x-component-props"] = { icon: $, href: L, params: w }, n["x-component-props"] = n["x-component-props"] || {}, n["x-component-props"].icon = $, n["x-component-props"].href = L, n["x-component-props"].params = w, m == null || m({ item: { props: { schema: n } } }), a.emit("patch", {
         schema: O
       }), (j = n.__route__) != null && j.id && e(n.__route__.id, {
         title: N,
-        icon: M,
+        icon: $,
         options: L || w ? {
           href: L,
           params: w
@@ -41038,8 +41044,8 @@ const insertPositionToMethod = {
     [n, o, a, i, m]
   ), v = useCallback(
     ({ tooltip: N }) => {
-      var M;
-      (M = n.__route__) != null && M.id && e(n.__route__.id, {
+      var $;
+      ($ = n.__route__) != null && $.id && e(n.__route__.id, {
         tooltip: N
       });
     },
@@ -41069,7 +41075,7 @@ const insertPositionToMethod = {
       }
     }
   }), [h, l]), { moveRoute: I } = useNocoBaseRoutes(), T = useCallback(
-    (L) => z(void 0, [L], function* ({ target: N, position: M }) {
+    (L) => z(void 0, [L], function* ({ target: N, position: $ }) {
       var q;
       const [w] = ((q = N == null ? void 0 : N.split) == null ? void 0 : q.call(N, "||")) || [];
       if (!w)
@@ -41082,7 +41088,7 @@ const insertPositionToMethod = {
       }), k = {
         beforeBegin: "insertBefore",
         afterEnd: "insertAfter"
-      }, $ = M === "beforeEnd" ? {
+      }, M = $ === "beforeEnd" ? {
         targetScope: {
           parentId: O.__route__.id
         }
@@ -41092,8 +41098,8 @@ const insertPositionToMethod = {
       yield I(x({
         sourceId: n.__route__.id,
         sortField: "sort",
-        method: k[M]
-      }, $)), j.loadAPIClientEvents(), j.insertAdjacent(M, n);
+        method: k[$]
+      }, M)), j.loadAPIClientEvents(), j.insertAdjacent($, n);
     }),
     [c, l, r, i, I, n]
   ), R = useMemo(() => ({
@@ -41547,14 +41553,14 @@ const useMenuDragEnd = () => {
     theme: m
   } = useProps(e), { t: h } = useTranslation(), g = useDesigner(), f = useFieldSchema(), C = useAPIClient(), { render: b } = useSchemaInitializerRender(f["x-initializer"], f["x-initializer-props"]), S = useSideMenuRef(), [y, v] = useState(), [F, I] = useState(() => a || (r ? findKeysByUid(f, r) : [])), [T, R] = useState(() => ["inline", "mix"].includes(o) ? i || F : i), D = useMemo(() => {
     var L;
-    let M;
+    let $;
     if (n) {
       const w = findKeysByUid(f, n);
-      M = (w == null ? void 0 : w[0]) || null;
+      $ = (w == null ? void 0 : w[0]) || null;
     } else
-      M = (F == null ? void 0 : F[0]) || null;
-    if (o === "mix" && M) {
-      const w = (L = f.properties) == null ? void 0 : L[M];
+      $ = (F == null ? void 0 : F[0]) || null;
+    if (o === "mix" && $) {
+      const w = (L = f.properties) == null ? void 0 : L[$];
       if ((w == null ? void 0 : w["x-component"]) === "Menu.SubMenu")
         return w;
     }
@@ -41565,8 +41571,8 @@ const useMenuDragEnd = () => {
       v(void 0);
       return;
     }
-    const M = findKeysByUid(f, n);
-    v(M), ["inline", "mix"].includes(o) && R(i || M);
+    const $ = findKeysByUid(f, n);
+    v($), ["inline", "mix"].includes(o) && R(i || $);
   }, [n]), useEffect(() => {
     ["inline", "mix"].includes(o) && R(F);
   }, [F]);
@@ -42406,41 +42412,41 @@ const AppendsTreeSelect = (e) => {
     "filter",
     "rootOption",
     "loadData"
-  ]), d = useCompile(), { t: p } = useTranslation(), [m, h] = useState({}), g = a({ collection: r }), [f, C] = parseCollectionName(g), b = useApp(), { collectionManager: S } = b.dataSourceManager.getDataSource(f), y = (M, L) => {
-    const w = S.getCollection(M);
+  ]), d = useCompile(), { t: p } = useTranslation(), [m, h] = useState({}), g = a({ collection: r }), [f, C] = parseCollectionName(g), b = useApp(), { collectionManager: S } = b.dataSourceManager.getDataSource(f), y = ($, L) => {
+    const w = S.getCollection($);
     return w ? w.getAllFields(L) : [];
-  }, v = Object.values(m), F = useMemo(() => e.multiple ? (o || []).map((M) => m[M]).filter(Boolean) : o, [o, e.multiple, m]), I = useCallback(
-    (M) => z(void 0, null, function* () {
+  }, v = Object.values(m), F = useMemo(() => e.multiple ? (o || []).map(($) => m[$]).filter(Boolean) : o, [o, e.multiple, m]), I = useCallback(
+    ($) => z(void 0, null, function* () {
       if (c != null)
-        return c(M);
-      if (!M.isLeaf && M.loadChildren) {
-        const L = M.loadChildren(M);
+        return c($);
+      if (!$.isLeaf && $.loadChildren) {
+        const L = $.loadChildren($);
         h((w) => L.reduce((O, j) => Object.assign(O, { [j.value]: j }), x({}, w)));
       }
     }),
     [c]
   );
   useEffect(() => {
-    const M = l ? P(x({}, l), {
+    const $ = l ? P(x({}, l), {
       id: l.value,
       key: l.value,
       title: l.label,
       fullTitle: l.label,
       isLeaf: !1
-    }) : null, w = (c === null ? [] : getCollectionFieldOptions.call({ compile: d, getCollectionFields: y, filter: i }, C, M)).reduce((O, j) => Object.assign(O, { [j.value]: j }), {});
-    M && (w[M.value] = M), h(w);
+    }) : null, w = (c === null ? [] : getCollectionFieldOptions.call({ compile: d, getCollectionFields: y, filter: i }, C, $)).reduce((O, j) => Object.assign(O, { [j.value]: j }), {});
+    $ && (w[$.value] = $), h(w);
   }, [g, l, i, c]), useEffect(() => {
-    const M = e.multiple ? o : o ? [o] : [];
-    if (!(M != null && M.length) || M.every((w) => !!m[w]))
+    const $ = e.multiple ? o : o ? [o] : [];
+    if (!($ != null && $.length) || $.every((w) => !!m[w]))
       return;
     const L = [];
-    M.forEach((w) => {
+    $.forEach((w) => {
       const O = w.split(".");
       let j = m[O[0]];
       for (let k = 1; k < O.length && j; k++) {
-        const $ = O.slice(0, k + 1).join(".");
-        if (m[$]) {
-          j = m[$];
+        const M = O.slice(0, k + 1).join(".");
+        if (m[M]) {
+          j = m[M];
           break;
         }
         if (!j.isLeaf && j.loadChildren) {
@@ -42451,12 +42457,12 @@ const AppendsTreeSelect = (e) => {
     }), h((w) => L.reduce((O, j) => Object.assign(O, { [j.value]: j }), x({}, w)));
   }, [o, v.length, e.multiple]);
   const T = useCallback(
-    (M) => {
+    ($) => {
       if (!e.multiple) {
-        n(M);
+        n($);
         return;
       }
-      const L = M.map((j) => j.value).filter(Boolean), w = new Set(L), O = F.find((j) => !w.has(j.value));
+      const L = $.map((j) => j.value).filter(Boolean), w = new Set(L), O = F.find((j) => !w.has(j.value));
       if (O) {
         const j = `${O.value}.`;
         Object.keys(m).forEach((k) => {
@@ -42466,23 +42472,23 @@ const AppendsTreeSelect = (e) => {
         L.forEach((j) => {
           const k = j.split(".");
           if (k.length)
-            for (let $ = 1; $ <= k.length; $++)
-              w.add(k.slice(0, $).join("."));
+            for (let M = 1; M <= k.length; M++)
+              w.add(k.slice(0, M).join("."));
         });
       n(Array.from(w));
     },
     [e.multiple, F, n, m]
   ), R = useCallback(
-    (M) => {
-      var $;
-      const { value: L, onClose: w, disabled: O, closable: j } = M;
+    ($) => {
+      var M;
+      const { value: L, onClose: w, disabled: O, closable: j } = $;
       if (!L)
         return null;
-      const { fullTitle: k } = ($ = m[L]) != null ? $ : {};
+      const { fullTitle: k } = (M = m[L]) != null ? M : {};
       return /* @__PURE__ */ jsx(Tag, { closable: j && !O, onClose: w, children: k == null ? void 0 : k.join(" / ") });
     },
     [m]
-  ), D = Array.isArray(F) ? F.filter((M) => M.value in m) : F, B = e.multiple ? o : o != null ? [o] : [];
+  ), D = Array.isArray(F) ? F.filter(($) => $.value in m) : F, B = e.multiple ? o : o != null ? [o] : [];
   return /* @__PURE__ */ jsx(
     TreeSelect$2,
     P(x({
@@ -42531,15 +42537,15 @@ const InternalAssociationSelect$1 = observer$1(
     var B;
     const D = e, { objectValue: t = !0, addMode: o } = D, n = W(D, ["objectValue", "addMode"]), r = useField(), a = useFieldSchema(), i = useServiceOptions$1((a == null ? void 0 : a["x-component-props"]) || e), { options: l } = useAssociationFieldContext(), c = isVariable$1(e.value) ? void 0 : e.value, u = Array.isArray(c) ? c.filter(Boolean) : c, [d, p] = useState(u), m = (B = a["x-component-props"]) == null ? void 0 : B.addMode, { t: h } = useTranslation(), { multiple: g } = e, f = useForm(), b = useAPIClient().resource(l.target), S = useCollectionRecordData(), y = useContext(SchemaComponentContext), { getCollection: v } = useCollectionManager_deprecated(), F = v(l.target), { filterTargetKey: I } = F;
     useEffect(() => {
-      const N = isVariable$1(r.value) ? void 0 : r.value, M = Array.isArray(N) ? N.filter(Boolean) : N, L = removeIfKeyEmpty(M, I);
+      const N = isVariable$1(r.value) ? void 0 : r.value, $ = Array.isArray(N) ? N.filter(Boolean) : N, L = removeIfKeyEmpty($, I);
       p(L), isEqual(r.value, L) || (r.value = L);
     }, [r.value, I]), useEffect(() => {
       const N = uid();
       return f.addEffects(N, () => {
-        onFieldInputValueChange("*", (M) => {
-          var j, k, $, q, E, V;
-          const L = filterAnalyses(($ = (k = (j = r.componentProps) == null ? void 0 : j.service) == null ? void 0 : k.params) == null ? void 0 : $.filter) || [], w = getFieldPath(M.address.entire), O = getFieldPath(r.address.entire);
-          L.includes((q = M == null ? void 0 : M.props) == null ? void 0 : q.name) && r.value && isEqual(M == null ? void 0 : M.indexes, r == null ? void 0 : r.indexes) && ((E = M == null ? void 0 : M.props) == null ? void 0 : E.name) !== r.props.name && (!((V = r == null ? void 0 : r.indexes) != null && V.length) || isEqual(w, O)) && (r.setValue(null), p(null));
+        onFieldInputValueChange("*", ($) => {
+          var j, k, M, q, E, V;
+          const L = filterAnalyses((M = (k = (j = r.componentProps) == null ? void 0 : j.service) == null ? void 0 : k.params) == null ? void 0 : M.filter) || [], w = getFieldPath($.address.entire), O = getFieldPath(r.address.entire);
+          L.includes((q = $ == null ? void 0 : $.props) == null ? void 0 : q.name) && r.value && isEqual($ == null ? void 0 : $.indexes, r == null ? void 0 : r.indexes) && ((E = $ == null ? void 0 : $.props) == null ? void 0 : E.name) !== r.props.name && (!((V = r == null ? void 0 : r.indexes) != null && V.length) || isEqual(w, O)) && (r.setValue(null), p(null));
         });
       }), () => {
         f.removeEffects(N);
@@ -42547,11 +42553,11 @@ const InternalAssociationSelect$1 = observer$1(
     }, []);
     const T = (N) => z(void 0, null, function* () {
       var O, j;
-      const { search: M, callBack: L } = N, {
+      const { search: $, callBack: L } = N, {
         data: { data: w }
       } = yield b.create({
         values: {
-          [((j = (O = r == null ? void 0 : r.componentProps) == null ? void 0 : O.fieldNames) == null ? void 0 : j.label) || "id"]: M
+          [((j = (O = r == null ? void 0 : r.componentProps) == null ? void 0 : O.fieldNames) == null ? void 0 : j.label) || "id"]: $
         }
       });
       if (w) {
@@ -42585,8 +42591,8 @@ const InternalAssociationSelect$1 = observer$1(
           service: i,
           onChange: (N) => {
             var L;
-            const M = Array.isArray(N) && N.length === 0 ? null : N;
-            (L = e.onChange) == null || L.call(e, M);
+            const $ = Array.isArray(N) && N.length === 0 ? null : N;
+            (L = e.onChange) == null || L.call(e, $);
           },
           CustomDropdownRender: m === "quickAdd" && R
         })
@@ -43183,7 +43189,7 @@ function Uploader(o) {
   }, [f, p, h]);
   const S = useCallback(
     (B) => {
-      var M;
+      var $;
       const N = B.fileList.filter((L) => L.status !== "done").map(normalizeFile);
       if (m(N), a) {
         const L = B.fileList.filter((w) => w.status === "done");
@@ -43196,19 +43202,19 @@ function Uploader(o) {
         }
       } else {
         const L = B.fileList.find((w) => w.uid === B.file.uid);
-        L.status === "done" && (l == null || l(c((M = L.response) == null ? void 0 : M.data)), m([]));
+        L.status === "done" && (l == null || l(c(($ = L.response) == null ? void 0 : $.data)), m([]));
       }
     },
     [a, i, u, c, l]
   ), y = useCallback((B) => {
     m((N) => {
-      const M = N.indexOf(B);
-      return N.splice(M, 1), [...N];
+      const $ = N.indexOf(B);
+      return N.splice($, 1), [...N];
     });
   }, []), v = useCallback((B) => {
     d((N) => {
-      const M = N.indexOf(B);
-      return N.splice(M, 1), [...N];
+      const $ = N.indexOf(B);
+      return N.splice($, 1), [...N];
     });
   }, []), F = useComponent("QRCodeUploader"), { mimetype: I, size: T } = e != null ? e : {}, R = useSizeHint(T), D = !r && (a || (!i || Array.isArray(i) && !i.length) && !p.length);
   return /* @__PURE__ */ jsxs(Fragment$1, { children: [
@@ -43529,9 +43535,9 @@ const InternalFileManager = (e) => {
   };
   useEffect(() => {
     if (t && Object.keys(t).length > 0) {
-      const N = (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((M) => {
-        const L = M[p.label];
-        return P(x({}, M), {
+      const N = (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map(($) => {
+        const L = $[p.label];
+        return P(x({}, $), {
           [p.label]: getLabelFormatValue$1(y(S), y(L))
         });
       });
@@ -43552,10 +43558,10 @@ const InternalFileManager = (e) => {
     setSelectedRows: u,
     collectionField: b
   }, T = () => {
-    const { setVisible: N } = useActionContext(), { multiple: M, selectedRows: L, onChange: w, options: O, collectionField: j } = useContext(RecordPickerContext);
+    const { setVisible: N } = useActionContext(), { multiple: $, selectedRows: L, onChange: w, options: O, collectionField: j } = useContext(RecordPickerContext);
     return {
       onClick() {
-        w(M ? unionBy(L, O, (j == null ? void 0 : j.targetKey) || "id") : (L == null ? void 0 : L[0]) || null), N(!1);
+        w($ ? unionBy(L, O, (j == null ? void 0 : j.targetKey) || "id") : (L == null ? void 0 : L[0]) || null), N(!1);
       }
     };
   };
@@ -43607,10 +43613,10 @@ const InternalFileManager = (e) => {
     FormItem: FormItem$1
   }
 }), CascadeSelect = connect((e) => {
-  var M;
+  var $;
   const { data: t, mapOptions: o, onChange: n, value: r } = e, [a, i] = useState([
     { key: void 0, children: [], value: null }
-  ]), [l, c] = useState(t), [u, d] = useState(!1), p = useCompile(), m = useAPIClient(), h = useServiceOptions$1(e), { options: g, field: f } = useAssociationFieldContext(), C = m.resource(g.target), { getCollectionJoinField: b, getInterface: S } = useCollectionManager_deprecated(), y = (M = f == null ? void 0 : f.componentProps) == null ? void 0 : M.fieldNames, v = (g == null ? void 0 : g.target) && (y == null ? void 0 : y.label) && b(`${g.target}.${y.label}`), F = useMemo(() => {
+  ]), [l, c] = useState(t), [u, d] = useState(!1), p = useCompile(), m = useAPIClient(), h = useServiceOptions$1(e), { options: g, field: f } = useAssociationFieldContext(), C = m.resource(g.target), { getCollectionJoinField: b, getInterface: S } = useCollectionManager_deprecated(), y = ($ = f == null ? void 0 : f.componentProps) == null ? void 0 : $.fieldNames, v = (g == null ? void 0 : g.target) && (y == null ? void 0 : y.label) && b(`${g.target}.${y.label}`), F = useMemo(() => {
     var L, w;
     return v != null && v.interface && ((w = (L = S(v.interface)) == null ? void 0 : L.filterable) == null ? void 0 : w.operators[0].value) || "$includes";
   }, [v]), I = useField();
@@ -43629,7 +43635,7 @@ const InternalFileManager = (e) => {
     (L) => {
       try {
         return L == null ? void 0 : L.filter((w) => ["number", "string"].includes(typeof w[y.value])).map((w) => {
-          var j, k, $;
+          var j, k, M;
           let O = p(w[y.label]);
           if ((j = v == null ? void 0 : v.uiSchema) != null && j.enum)
             if (Array.isArray(O))
@@ -43639,7 +43645,7 @@ const InternalFileManager = (e) => {
                 return V ? /* @__PURE__ */ jsx(Tag, { color: V.color, style: { marginRight: 3 }, children: (V == null ? void 0 : V.label) || q }, E) : /* @__PURE__ */ jsx(Tag, { children: q }, q);
               }).reverse();
             else {
-              const q = ($ = (k = v.uiSchema.enum).find) == null ? void 0 : $.call(k, (E) => E.value === O);
+              const q = (M = (k = v.uiSchema.enum).find) == null ? void 0 : M.call(k, (E) => E.value === O);
               q && (O = /* @__PURE__ */ jsx(Tag, { color: q.color, children: q.label }));
             }
           return (v == null ? void 0 : v.type) === "date" && (O = dayjs(O).format("YYYY-MM-DD")), o ? o({
@@ -43667,19 +43673,19 @@ const InternalFileManager = (e) => {
   }), D = (L, w, O) => z(void 0, null, function* () {
     const j = yield R({ parentId: w == null ? void 0 : w.id }), k = [...a];
     if (k.splice(O + 1), k[O] = P(x({}, k[O]), { value: w }), w != null && w.id && (k[O + 1] = { key: w == null ? void 0 : w.id, children: (j == null ? void 0 : j.length) > 0 ? j : null }), i(k), ["o2m", "m2m"].includes(g.interface)) {
-      const $ = Array.isArray(f.fieldValue) ? f.fieldValue : [];
-      $[I.index] = w, f.fieldValue = $;
+      const M = Array.isArray(f.fieldValue) ? f.fieldValue : [];
+      M[I.index] = w, f.fieldValue = M;
     } else
       f.value = w;
     k.length === 1 && !k[0].value ? n == null || n(null) : n == null || n(k);
   }), B = (L, w, O) => z(void 0, null, function* () {
-    var j, k, $;
+    var j, k, M;
     if (L) {
       d(!0);
       const q = yield R({ parentId: w == null ? void 0 : w.key });
       if (d(!1), c(q), O === (a == null ? void 0 : a.length) - 1 && ((j = w == null ? void 0 : w.value) != null && j.id)) {
         const E = yield R({ parentId: (k = w == null ? void 0 : w.value) == null ? void 0 : k.id }), V = [...a];
-        V.splice(O + 1), V[O] = P(x({}, V[O]), { value: w == null ? void 0 : w.value }), V[O + 1] = { key: ($ = w == null ? void 0 : w.value) == null ? void 0 : $.id, children: (E == null ? void 0 : E.length) > 0 ? E : null }, i(V), n == null || n(V);
+        V.splice(O + 1), V[O] = P(x({}, V[O]), { value: w == null ? void 0 : w.value }), V[O + 1] = { key: (M = w == null ? void 0 : w.value) == null ? void 0 : M.id, children: (E == null ? void 0 : E.length) > 0 ? E : null }, i(V), n == null || n(V);
       }
     }
   }), N = (L, w) => z(void 0, null, function* () {
@@ -43710,12 +43716,12 @@ const InternalFileManager = (e) => {
           value: (j = L == null ? void 0 : L.value) == null ? void 0 : j[y.value]
         },
         labelInValue: !0,
-        onSearch: ($) => N($, L),
+        onSearch: (M) => N(M, L),
         fieldNames: y,
         style: { minWidth: 150 },
-        onChange: ($, q) => D($, q, w),
+        onChange: (M, q) => D(M, q, w),
         options: u ? [] : T(l),
-        onDropdownVisibleChange: ($) => B($, L, w),
+        onDropdownVisibleChange: (M) => B(M, L, w),
         notFoundContent: u ? /* @__PURE__ */ jsx(Spin, { size: "small" }) : null
       },
       `${(k = L.value) == null ? void 0 : k.id}+ ${L.key} + ${y.label}`
@@ -43956,9 +43962,9 @@ const InternalNesterCardCss = css`
 }, InternalPicker = observer$1(
   (e) => {
     var j;
-    const O = e, { value: t, multiple: o, openSize: n, onChange: r, quickUpload: a, selectFile: i, shouldMountElement: l } = O, c = W(O, ["value", "multiple", "openSize", "onChange", "quickUpload", "selectFile", "shouldMountElement"]), u = useField(), d = useFieldNames$1(e), [p, m] = useState(!1), h = useFieldSchema(), g = useInsertSchema$1("Selector"), { options: f } = useAssociationFieldContext(), { collectionName: C } = useFormBlockContext(), b = useCompile(), S = useLabelUiSchema$1(f, (d == null ? void 0 : d.label) || "label"), y = h["x-add-new"], [v, F] = useState([]), I = useCollectionRecordData(), T = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map(($) => {
-      const q = $ == null ? void 0 : $[d.label];
-      return P(x({}, $), {
+    const O = e, { value: t, multiple: o, openSize: n, onChange: r, quickUpload: a, selectFile: i, shouldMountElement: l } = O, c = W(O, ["value", "multiple", "openSize", "onChange", "quickUpload", "selectFile", "shouldMountElement"]), u = useField(), d = useFieldNames$1(e), [p, m] = useState(!1), h = useFieldSchema(), g = useInsertSchema$1("Selector"), { options: f } = useAssociationFieldContext(), { collectionName: C } = useFormBlockContext(), b = useCompile(), S = useLabelUiSchema$1(f, (d == null ? void 0 : d.label) || "label"), y = h["x-add-new"], [v, F] = useState([]), I = useCollectionRecordData(), T = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((M) => {
+      const q = M == null ? void 0 : M[d.label];
+      return P(x({}, M), {
         [d.label]: getLabelFormatValue$1(b(S), b(q))
       });
     }) : [], [t, d == null ? void 0 : d.label]), R = {
@@ -43976,23 +43982,23 @@ const InternalNesterCardCss = css`
       currentFormCollection: C
     }, { isMobileLayout: D } = useMobileLayout(), B = () => {
       var k;
-      return o == null ? null : Array.isArray(t) ? (k = t.filter(Boolean)) == null ? void 0 : k.map(($) => $ == null ? void 0 : $[d.value]) : t == null ? void 0 : t[d.value];
+      return o == null ? null : Array.isArray(t) ? (k = t.filter(Boolean)) == null ? void 0 : k.map((M) => M == null ? void 0 : M[d.value]) : t == null ? void 0 : t[d.value];
     }, N = () => {
-      const k = (f == null ? void 0 : f.targetKey) || "id", $ = T.map((E) => E[k]).filter(Boolean);
-      return $.length ? { $and: [{ [`${k}.$ne`]: $ }] } : {};
-    }, M = () => {
-      const { setVisible: k } = useActionContext(), { multiple: $, selectedRows: q, onChange: E, options: V, collectionField: G } = useContext(RecordPickerContext);
+      const k = (f == null ? void 0 : f.targetKey) || "id", M = T.map((E) => E[k]).filter(Boolean);
+      return M.length ? { $and: [{ [`${k}.$ne`]: M }] } : {};
+    }, $ = () => {
+      const { setVisible: k } = useActionContext(), { multiple: M, selectedRows: q, onChange: E, options: V, collectionField: G } = useContext(RecordPickerContext);
       return {
         onClick() {
-          E($ ? unionBy(q, V, (G == null ? void 0 : G.targetKey) || "id") : (q == null ? void 0 : q[0]) || null), k(!1);
+          E(M ? unionBy(q, V, (G == null ? void 0 : G.targetKey) || "id") : (q == null ? void 0 : q[0]) || null), k(!1);
         },
         style: {
-          display: $ === !1 ? "none" : "block"
+          display: M === !1 ? "none" : "block"
         }
       };
     }, L = useMemo(
       () => ({
-        usePickActionProps: M,
+        usePickActionProps: $,
         useTableSelectorProps: useTableSelectorProps$2
       }),
       []
@@ -44023,12 +44029,12 @@ const InternalNesterCardCss = css`
                     r([]), F([]);
                     return;
                   }
-                  const $ = T == null ? void 0 : T.filter((q) => k.includes(q[d.value]));
-                  r($), F($);
+                  const M = T == null ? void 0 : T.filter((q) => k.includes(q[d.value]));
+                  r(M), F(M);
                 }
               } else {
-                const $ = o ? [] : null;
-                r($), F($);
+                const M = o ? [] : null;
+                r(M), F(M);
               }
             },
             options: T,
@@ -44098,7 +44104,7 @@ const RenderRecord = React.memo(
     const T = useCallback(() => I.current, []);
     return useEffect(() => {
       const R = toArr$3(h).map((D, B, N) => {
-        const M = D == null ? void 0 : D[(e == null ? void 0 : e.label) || "label"], L = t ? transformNestedData(D).map((k) => k == null ? void 0 : k[(e == null ? void 0 : e.label) || "label"]).join(" / ") : isObject(M) ? JSON.stringify(M) : M, w = toValue$4(o(L), "N/A"), O = n(
+        const $ = D == null ? void 0 : D[(e == null ? void 0 : e.label) || "label"], L = t ? transformNestedData(D).map((k) => k == null ? void 0 : k[(e == null ? void 0 : e.label) || "label"]).join(" / ") : isObject($) ? JSON.stringify($) : $, w = toValue$4(o(L), "N/A"), O = n(
           (D == null ? void 0 : D.__collection) || (r == null ? void 0 : r.target),
           (e == null ? void 0 : e.label) || "label"
         ), j = getLabelFormatValue$1(o(O), w, !0);
@@ -44110,7 +44116,7 @@ const RenderRecord = React.memo(
                 g(!0);
               },
               onClick: (k) => {
-                var $;
+                var M;
                 g(!0), k.stopPropagation(), k.preventDefault(), l && !hasAddedViewer(u.properties) && (c(schema$1.Viewer), F.current = !0), F.current ? (setTimeout(() => {
                   f == null || f({ recordData: D }), d({
                     recordData: D,
@@ -44120,7 +44126,7 @@ const RenderRecord = React.memo(
                 }), F.current = !1) : u.properties && (f == null || f({ recordData: D }), d({
                   recordData: D,
                   parentRecordData: p
-                })), ($ = m == null ? void 0 : m.current) == null || $.setPopoverVisible(!1);
+                })), (M = m == null ? void 0 : m.current) == null || M.setPopoverVisible(!1);
               },
               children: j
             }
@@ -44182,8 +44188,8 @@ const getSourceData = (e, t) => {
   return o ? _.get(e, o) : e;
 }, ReadPrettyInternalViewer = (e) => {
   var B, N;
-  const { value: t, ButtonList: o = ButtonLinkList } = e, n = useFieldSchema(), { enableLink: r, openMode: a, openSize: i } = n["x-component-props"] || {}, l = useField(), [c, u] = useState(!1), { options: d } = useAssociationFieldContext(), p = useAssociationName(), { visibleWithURL: m, setVisibleWithURL: h } = usePopupUtils(), [g, f] = useState(!!m), { defaultOpenMode: C } = useOpenModeContext(), b = useCollectionRecordData(), [S, y] = useState(null), { isPopupVisibleControlledByURL: v } = usePopupSettings(), F = useCollection(), I = useCallback((M) => {
-    y(M.recordData);
+  const { value: t, ButtonList: o = ButtonLinkList } = e, n = useFieldSchema(), { enableLink: r, openMode: a, openSize: i } = n["x-component-props"] || {}, l = useField(), [c, u] = useState(!1), { options: d } = useAssociationFieldContext(), p = useAssociationName(), { visibleWithURL: m, setVisibleWithURL: h } = usePopupUtils(), [g, f] = useState(!!m), { defaultOpenMode: C } = useOpenModeContext(), b = useCollectionRecordData(), [S, y] = useState(null), { isPopupVisibleControlledByURL: v } = usePopupSettings(), F = useCollection(), I = useCallback(($) => {
+    y($.recordData);
   }, []), T = /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: (B = e.ellipsis) != null ? B : !0, children: /* @__PURE__ */ jsx(CollectionRecordProvider, { isNew: !1, record: getSourceData(b, n), children: /* @__PURE__ */ jsx(
     o,
     {
@@ -44196,8 +44202,8 @@ const getSourceData = (e, t) => {
   ) }) }), R = useMemo(
     () => ({
       visible: c || m,
-      setVisible: (M) => {
-        u == null || u(M), h == null || h(M);
+      setVisible: ($) => {
+        u == null || u($), h == null || h($);
       },
       openMode: a || C,
       snapshot: (d == null ? void 0 : d.interface) === "snapshot",
@@ -44216,7 +44222,7 @@ const getSourceData = (e, t) => {
           schema: n,
           onlyRenderProperties: !0,
           basePath: l.address,
-          filterProperties: (M) => M["x-component"] === "AssociationField.Viewer"
+          filterProperties: ($) => $["x-component"] === "AssociationField.Viewer"
         }
       ) }) })
     ) : /* @__PURE__ */ jsx(
@@ -44235,7 +44241,7 @@ const getSourceData = (e, t) => {
             schema: n,
             onlyRenderProperties: !0,
             basePath: l.address,
-            filterProperties: (M) => M["x-component"] === "AssociationField.Viewer"
+            filterProperties: ($) => $["x-component"] === "AssociationField.Viewer"
           }
         ) }) }) })
       }
@@ -44503,7 +44509,7 @@ const AssignedFieldInner = (e) => {
   ), S = useCallback(
     (v) => {
       const F = v.find((T) => T.value === "$nForm"), I = n(h);
-      return !(I != null && I.length) && F && (F.children = formatVariableScop(m)), v;
+      return !(I != null && I.length) && F && (F.children = formatVariableScop(m)), cloneDeep$1(v);
     },
     [m, h]
   ), y = useCallback(
@@ -44837,8 +44843,8 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
     });
     Array.isArray(n.value) || (n.value = []);
     const D = useCallback(({ form: w, fieldSchema: O, collectionField: j, getInterface: k }) => {
-      var $;
-      return !j || j.target && (($ = O["x-component-props"]) != null && $.mode) && !["Picker", "Select"].includes(O["x-component-props"].mode) ? !1 : !(w != null && w.readPretty) && !isPatternDisabled(O) && !interfacesOfUnsupportedDefaultValue.includes(j == null ? void 0 : j.interface) && !isSystemField(j, k);
+      var M;
+      return !j || j.target && ((M = O["x-component-props"]) != null && M.mode) && !["Picker", "Select"].includes(O["x-component-props"].mode) ? !1 : !(w != null && w.readPretty) && !isPatternDisabled(O) && !interfacesOfUnsupportedDefaultValue.includes(j == null ? void 0 : j.interface) && !isSystemField(j, k);
     }, []), B = () => {
       const { setVisible: w } = useActionContext(), { selectedRows: O, setSelectedRows: j } = useContext(RecordPickerContext);
       return {
@@ -44851,7 +44857,7 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
       return P(x({}, O), {
         [F.label]: getLabelFormatValue$1(I(T), I(j))
       });
-    }) : [], [n.value, F == null ? void 0 : F.label]), M = {
+    }) : [], [n.value, F == null ? void 0 : F.label]), $ = {
       size: "small",
       fieldNames: n.componentProps.fieldNames,
       multiple: !0,
@@ -44949,7 +44955,7 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
                 visible: b,
                 setVisible: S
               },
-              children: /* @__PURE__ */ jsx(RecordPickerProvider, P(x({}, M), { children: /* @__PURE__ */ jsx(CollectionProvider, { name: o == null ? void 0 : o.target, children: /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(TableSelectorParamsProvider, { params: { filter: L() }, children: /* @__PURE__ */ jsx(
+              children: /* @__PURE__ */ jsx(RecordPickerProvider, P(x({}, $), { children: /* @__PURE__ */ jsx(CollectionProvider, { name: o == null ? void 0 : o.target, children: /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(TableSelectorParamsProvider, { params: { filter: L() }, children: /* @__PURE__ */ jsx(
                 SchemaComponentOptions,
                 {
                   scope: {
@@ -44996,7 +45002,7 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
     S.current = t;
     const y = useCallback(() => S.current, []);
     return /* @__PURE__ */ jsx(Fragment$1, { children: toArr$3(e.value).map((F, I, T) => {
-      const R = F == null ? void 0 : F[(r == null ? void 0 : r.label) || "label"], D = g ? transformNestedData(F).map((M) => M == null ? void 0 : M[(r == null ? void 0 : r.label) || "label"]).join(" / ") : isObject(R) ? JSON.stringify(R) : R, B = toValue$3(l(D), "N/A"), N = getTabFormatValue(l(u), B, F[n]);
+      const R = F == null ? void 0 : F[(r == null ? void 0 : r.label) || "label"], D = g ? transformNestedData(F).map(($) => $ == null ? void 0 : $[(r == null ? void 0 : r.label) || "label"]).join(" / ") : isObject(R) ? JSON.stringify(R) : R, B = toValue$3(l(D), "N/A"), N = getTabFormatValue(l(u), B, F[n]);
       return /* @__PURE__ */ jsxs(Fragment, { children: [
         /* @__PURE__ */ jsx("span", { children: d ? N : o !== !1 ? /* @__PURE__ */ jsx(
           "a",
@@ -45004,9 +45010,9 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
             onMouseEnter: () => {
               e.setBtnHover(!0);
             },
-            onClick: (M) => {
+            onClick: ($) => {
               var L;
-              e.setBtnHover(!0), M.stopPropagation(), M.preventDefault(), c && !t.properties && (a(schema$1.Viewer), b.current = !0), b.current ? setTimeout(() => {
+              e.setBtnHover(!0), $.stopPropagation(), $.preventDefault(), c && !t.properties && (a(schema$1.Viewer), b.current = !0), b.current ? setTimeout(() => {
                 f({
                   recordData: F,
                   parentRecordData: C,
@@ -45097,8 +45103,8 @@ const useColumnsDeepMemoized = (e) => {
         width: F && !i ? 0 : ((D = S["x-component-props"]) == null ? void 0 : D.width) || 100,
         render: (B, N) => {
           var w;
-          const M = (w = n.value) == null ? void 0 : w.indexOf(N), L = n.address.concat(N.__index || M);
-          return /* @__PURE__ */ jsx(SubFormProvider, { value: { value: N, collection: f, fieldSchema: r.parent }, children: /* @__PURE__ */ jsx(RecordIndexProvider, { index: N.__index || M, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: isNewRecord(N), record: N, parent: u, children: /* @__PURE__ */ jsx(ColumnFieldProvider, { schema: S, basePath: L, children: /* @__PURE__ */ jsx("span", { role: "button", className: g, children: /* @__PURE__ */ jsx(RecursionField, { basePath: L, schema: S, onlyRenderProperties: !0 }) }, M) }) }) }) });
+          const $ = (w = n.value) == null ? void 0 : w.indexOf(N), L = n.address.concat(N.__index || $);
+          return /* @__PURE__ */ jsx(SubFormProvider, { value: { value: N, collection: f, fieldSchema: r.parent }, children: /* @__PURE__ */ jsx(RecordIndexProvider, { index: N.__index || $, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: isNewRecord(N), record: N, parent: u, children: /* @__PURE__ */ jsx(ColumnFieldProvider, { schema: S, basePath: L, children: /* @__PURE__ */ jsx("span", { role: "button", className: g, children: /* @__PURE__ */ jsx(RecursionField, { basePath: L, schema: S, onlyRenderProperties: !0 }) }, $) }) }) }) });
         },
         onCell: (B, N) => ({
           record: B,
@@ -45434,7 +45440,7 @@ const Table$1 = withDynamicSchemaProps(
       "onClickRow",
       "enableIndexÏColumn"
     ]), y = useArrayField(S), v = useFieldSchema(), { size: F = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, I = useCollection(), R = ((Ce = v == null ? void 0 : v.parent) == null ? void 0 : Ce["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: B } = R, N = useMemoizedFn(S.onRowDragEnd || (() => {
-    })), M = usePaginationProps$2(o, a), L = useTableColumns$1(S, M), [w, O] = useState(() => D ? B : []), [j, k] = useState(((be = y == null ? void 0 : y.data) == null ? void 0 : be.selectedRowKeys) || []), [$, q] = useState([]), E = (p == null ? void 0 : p.type) !== "none", V = useRef(/* @__PURE__ */ new Map()), G = useMemo(() => css`
+    })), $ = usePaginationProps$2(o, a), L = useTableColumns$1(S, $), [w, O] = useState(() => D ? B : []), [j, k] = useState(((be = y == null ? void 0 : y.data) == null ? void 0 : be.selectedRowKeys) || []), [M, q] = useState([]), E = (p == null ? void 0 : p.type) !== "none", V = useRef(/* @__PURE__ */ new Map()), G = useMemo(() => css`
         & > td {
           background-color: ${t.controlItemBgActive} !important;
         }
@@ -45443,10 +45449,10 @@ const Table$1 = withDynamicSchemaProps(
         }
       `, [t.controlItemBgActive, t.controlItemBgActiveHover]), U = useMemo(() => C ? G : "", [G, C]), H = useMemo(() => C ? (Z, ne) => ({
       onClick: (re) => {
-        isPortalInBody(re.target) || C(Z, q, $);
+        isPortalInBody(re.target) || C(Z, q, M);
       },
       rowIndex: ne
-    }) : null, [C, $]);
+    }) : null, [C, M]);
     useDeepCompareEffect(() => {
       const Z = D ? B : [];
       _.isEqual(Z, w) || O(Z);
@@ -45508,7 +45514,7 @@ const Table$1 = withDynamicSchemaProps(
           renderCell: (Z, ne, re, ae) => {
             if (!l && !c)
               return ae;
-            const le = M == null ? void 0 : M.current, ge = (M == null ? void 0 : M.pageSize) || 20;
+            const le = $ == null ? void 0 : $.current, ge = ($ == null ? void 0 : $.pageSize) || 20;
             return le ? re = re + (le - 1) * ge + 1 : re = re + 1, ne.__index && (re = extractIndex(ne.__index)), /* @__PURE__ */ jsxs(
               "div",
               {
@@ -45549,7 +45555,7 @@ const Table$1 = withDynamicSchemaProps(
         J,
         E,
         ee,
-        M,
+        $,
         b
       ]
     ), te = useCallback(
@@ -45570,8 +45576,8 @@ const Table$1 = withDynamicSchemaProps(
       x: "max-content",
       y: K.length > 0 ? se : void 0
     }), [se, ue, K]), fe = useCallback(
-      (Z) => $.includes(Z[m]) ? U : "",
-      [$, U, JSON.stringify(m)]
+      (Z) => M.includes(Z[m]) ? U : "",
+      [M, U, JSON.stringify(m)]
     ), pe = useCallback(
       (Z, ne) => {
         const re = Z ? [...w, ne[I.getPrimaryKey()]] : w.filter((ae) => ne[I.getPrimaryKey()] !== ae);
@@ -45593,7 +45599,7 @@ const Table$1 = withDynamicSchemaProps(
           defaultRowKey: Y,
           dataSource: K
         }, S), oe), {
-          paginationProps: M,
+          paginationProps: $,
           components: Q,
           onTableChange: d,
           onRow: H,
@@ -45659,7 +45665,7 @@ const Table$1 = withDynamicSchemaProps(
   }
 `, SubTable = observer$1(
   (e) => {
-    var k, $, q;
+    var k, M, q;
     const { openSize: t } = e, { field: o, options: n, fieldSchema: r } = useAssociationFieldContext(), { t: a } = useTranslation(), [i, l] = useState(!1), [c, u] = useState([]), d = useFieldNames$1(e), p = useFieldSchema(), m = useCompile(), h = useLabelUiSchema$1(n, (d == null ? void 0 : d.label) || "label"), g = useCollectionRecord(), f = useCollection(), { allowSelectExistingRecord: C, allowAddnew: b, allowDisassociation: S, enableIndexÏColumn: y } = o.componentProps;
     useSubTableSpecialCase({ rootField: o, rootSchema: r });
     const v = (E, V) => {
@@ -45703,11 +45709,11 @@ const Table$1 = withDynamicSchemaProps(
     }, R = () => {
       const E = (n == null ? void 0 : n.targetKey) || "id", V = (o.value || []).map((U) => U == null ? void 0 : U[E]).filter(Boolean);
       return V.length ? { $and: [{ [`${E}.$ne`]: V }] } : {};
-    }, [D, B] = useState(1), [N, M] = useState(((k = o.componentProps) == null ? void 0 : k.pageSize) || 10), { setFormValueChanged: L } = useActionContext();
+    }, [D, B] = useState(1), [N, $] = useState(((k = o.componentProps) == null ? void 0 : k.pageSize) || 10), { setFormValueChanged: L } = useActionContext();
     useEffect(() => {
       var E;
-      M((E = o.componentProps) == null ? void 0 : E.pageSize);
-    }, [($ = o.componentProps) == null ? void 0 : $.pageSize]);
+      $((E = o.componentProps) == null ? void 0 : E.pageSize);
+    }, [(M = o.componentProps) == null ? void 0 : M.pageSize]);
     const w = useMemo(() => {
       var V;
       const E = Math.ceil(((V = o.value) == null ? void 0 : V.length) / 10);
@@ -45716,7 +45722,7 @@ const Table$1 = withDynamicSchemaProps(
         pageSize: N || 10,
         total: o == null ? void 0 : o.value,
         onChange: (G, U) => {
-          B(G), M(U), o.componentProps.pageSize = U, o.onInput(o.value), L(!1);
+          B(G), $(U), o.componentProps.pageSize = U, o.onInput(o.value), L == null || L(!1);
         },
         showSizeChanger: !0,
         pageSizeOptions: ["10", "20", "50", "100"],
@@ -45913,10 +45919,10 @@ const ReadPretty$7 = observer$1(
 InternalAssociationSelect.displayName = "InternalAssociationSelect";
 const AssociationSelect = InternalAssociationSelect;
 AssociationSelect.Designer = function e() {
-  var O, j, k, $, q, E, V, G, U, H, Y;
+  var O, j, k, M, q, E, V, G, U, H, Y;
   const { getCollectionFields: t, getInterface: o, getCollectionJoinField: n, 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) || n(u["x-collection-field"]), y = useFieldComponentOptions(), v = c.address.segments.includes("__form_grid"), F = o(S == null ? void 0 : S.interface), I = (O = F == null ? void 0 : F.validateSchema) == null ? void 0 : O.call(F, u), T = (j = S == null ? void 0 : S.uiSchema) == null ? void 0 : j.title, R = S != null && S.target ? t(S == null ? void 0 : S.target) : [];
   c.title === T || c.title;
-  const D = useSortFields(S == null ? void 0 : S.target), B = ((q = ($ = (k = c.componentProps) == null ? void 0 : k.service) == null ? void 0 : $.params) == null ? void 0 : q.sort) || [];
+  const D = useSortFields(S == null ? void 0 : S.target), B = ((q = (M = (k = c.componentProps) == null ? void 0 : k.service) == null ? void 0 : M.params) == null ? void 0 : q.sort) || [];
   useEffect(() => {
     c.readPretty !== u["x-read-pretty"] && (c.readPretty = !!u["x-read-pretty"]);
   }, [u["x-read-pretty"]]);
@@ -45928,7 +45934,7 @@ AssociationSelect.Designer = function e() {
     direction: "asc"
   });
   c.readPretty || c.required;
-  const M = R.filter((J) => a(J)).map((J) => {
+  const $ = R.filter((J) => a(J)).map((J) => {
     var K;
     return {
       value: J == null ? void 0 : J.name,
@@ -46279,7 +46285,7 @@ AssociationSelect.Designer = function e() {
       SchemaSettingsSelectItem,
       {
         title: d("Title field"),
-        options: M,
+        options: $,
         value: (Y = (H = c == null ? void 0 : c.componentProps) == null ? void 0 : H.fieldNames) == null ? void 0 : Y.label,
         onChange: (J) => {
           var Q, ee;
@@ -46312,7 +46318,7 @@ AssociationSelect.Designer = function e() {
   ] });
 };
 AssociationSelect.FilterDesigner = function e() {
-  var F, I, T, R, D, B, N, M, L, w, O;
+  var F, I, T, R, D, B, N, $, L, w, O;
   const { getCollectionFields: t, getInterface: o, getCollectionJoinField: n } = useCollectionManager_deprecated(), { getField: r } = useCollection_deprecated(), { form: a } = useFormBlockContext(), i = useField(), l = useFieldSchema(), { t: c } = useTranslation(), { dn: u, refresh: d } = useDesignable(), p = useCompile(), m = r(l.name) || n(l["x-collection-field"]), h = o(m == null ? void 0 : m.interface), g = (F = h == null ? void 0 : h.validateSchema) == null ? void 0 : F.call(h, l), f = (I = m == null ? void 0 : m.uiSchema) == null ? void 0 : I.title, C = m != null && m.target ? t(m == null ? void 0 : m.target) : [];
   i.title === f || i.title;
   const b = useSortFields(m == null ? void 0 : m.target), S = ((D = (R = (T = i.componentProps) == null ? void 0 : T.service) == null ? void 0 : R.params) == null ? void 0 : D.sort) || [], y = S == null ? void 0 : S.map((j) => j.startsWith("-") ? {
@@ -46423,15 +46429,15 @@ AssociationSelect.FilterDesigner = function e() {
           const k = [];
           for (const V of j.rules)
             k.push(_.pickBy(V, _.identity));
-          const $ = {
+          const M = {
             "x-uid": l["x-uid"]
           };
           if (["percent"].includes(m == null ? void 0 : m.interface))
             for (const V of k)
               (V.maxValue || V.minValue) && (V.percentMode = !0), V.percentFormat && (V.percentFormats = !0);
           const q = _.concat([], ((E = m == null ? void 0 : m.uiSchema) == null ? void 0 : E["x-validator"]) || [], k);
-          i.validator = q, l["x-validator"] = k, $["x-validator"] = k, u.emit("patch", {
-            schema: $
+          i.validator = q, l["x-validator"] = k, M["x-validator"] = k, u.emit("patch", {
+            schema: M
           }), d();
         }
       }
@@ -46467,7 +46473,7 @@ AssociationSelect.FilterDesigner = function e() {
       SchemaSettingsDataScope,
       {
         collectionName: m == null ? void 0 : m.target,
-        defaultFilter: ((L = (M = (N = i.componentProps) == null ? void 0 : N.service) == null ? void 0 : M.params) == null ? void 0 : L.filter) || {},
+        defaultFilter: ((L = ($ = (N = i.componentProps) == null ? void 0 : N.service) == null ? void 0 : $.params) == null ? void 0 : L.filter) || {},
         form: a,
         onSubmit: ({ filter: j }) => {
           j = removeNullCondition(j), _.set(i.componentProps, "service.params.filter", j), l["x-component-props"] = i.componentProps, u.emit("patch", {
@@ -46554,7 +46560,7 @@ AssociationSelect.FilterDesigner = function e() {
           }
         },
         onSubmit: ({ sort: j }) => {
-          const k = j.map(($) => $.direction === "desc" ? `-${$.field}` : $.field);
+          const k = j.map((M) => M.direction === "desc" ? `-${M.field}` : M.field);
           _.set(i.componentProps, "service.params.sort", k), l["x-component-props"] = i.componentProps, u.emit("patch", {
             schema: {
               "x-uid": l["x-uid"],
@@ -46574,10 +46580,10 @@ AssociationSelect.FilterDesigner = function e() {
           var q, E;
           const k = {
             "x-uid": l["x-uid"]
-          }, $ = P(x(x({}, (E = (q = m == null ? void 0 : m.uiSchema) == null ? void 0 : q["x-component-props"]) == null ? void 0 : E.fieldNames), i.componentProps.fieldNames), {
+          }, M = P(x(x({}, (E = (q = m == null ? void 0 : m.uiSchema) == null ? void 0 : q["x-component-props"]) == null ? void 0 : E.fieldNames), i.componentProps.fieldNames), {
             label: j
           });
-          i.componentProps.fieldNames = $, l["x-component-props"] = l["x-component-props"] || {}, l["x-component-props"].fieldNames = $, k["x-component-props"] = l["x-component-props"], u.emit("patch", {
+          i.componentProps.fieldNames = M, l["x-component-props"] = l["x-component-props"] || {}, l["x-component-props"].fieldNames = M, k["x-component-props"] = l["x-component-props"], u.emit("patch", {
             schema: k
           }), u.refresh();
         }
@@ -48015,8 +48021,8 @@ const InternalListBlockProvider = (e) => {
           }
         },
         onSubmit: ({ sort: N }) => {
-          const M = N.map((L) => L.direction === "desc" ? `-${L.field}` : L.field);
-          _.set(i, "x-decorator-props.params.sort", M), c.decoratorProps.params = P(x({}, i["x-decorator-props"].params), { page: 1 }), u.emit("patch", {
+          const $ = N.map((L) => L.direction === "desc" ? `-${L.field}` : L.field);
+          _.set(i, "x-decorator-props.params.sort", $), c.decoratorProps.params = P(x({}, i["x-decorator-props"].params), { page: 1 }), u.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
               "x-decorator-props": i["x-decorator-props"]
@@ -48162,10 +48168,10 @@ const InternalListBlockProvider = (e) => {
       ), m.get(k)),
       [r.properties, m]
     ), y = [5, 10, 20, 50, 100, 200], v = useCallback(
-      (k, $) => {
+      (k, M) => {
         o(P(x({}, n == null ? void 0 : n[0]), {
           page: k,
-          pageSize: $
+          pageSize: M
         }));
       },
       [o, n]
@@ -48196,7 +48202,7 @@ const InternalListBlockProvider = (e) => {
               display: none !important;
             }
           `,
-        itemRender: ($, q, E) => q === "prev" ? /* @__PURE__ */ jsxs(
+        itemRender: (M, q, E) => q === "prev" ? /* @__PURE__ */ jsxs(
           "div",
           {
             style: { display: "flex" },
@@ -48213,7 +48219,7 @@ const InternalListBlockProvider = (e) => {
           }
         ) : E
       };
-    })(), { isMobileLayout: M } = useMobileLayout();
+    })(), { isMobileLayout: $ } = useMobileLayout();
     return h(
       /* @__PURE__ */ jsx(
         SchemaComponentOptions,
@@ -48253,15 +48259,15 @@ const InternalListBlockProvider = (e) => {
                       P(x({}, e), {
                         pagination: !i || !((w = p.value) != null && w.length) || c <= ((O = p.value) == null ? void 0 : O.length) ? !1 : N,
                         loading: t == null ? void 0 : t.loading,
-                        children: (j = p.value) != null && j.length ? p.value.map((k, $) => /* @__PURE__ */ jsx(
+                        children: (j = p.value) != null && j.length ? p.value.map((k, M) => /* @__PURE__ */ jsx(
                           NocoBaseRecursionField,
                           {
                             basePath: p.address,
-                            name: $,
+                            name: M,
                             onlyRenderProperties: !0,
-                            schema: M ? transformMultiColumnToSingleColumn(S($)) : S($)
+                            schema: $ ? transformMultiColumnToSingleColumn(S(M)) : S(M)
                           },
-                          $
+                          M
                         )) : null
                       })
                     )
@@ -48698,8 +48704,8 @@ const toValue$1 = (e, t) => e == null ? t : e, ReadPrettyRecordPicker = observer
           "a",
           {
             onClick: (N) => {
-              var M;
-              N.stopPropagation(), N.preventDefault(), l(!0), p(I), (M = C == null ? void 0 : C.current) == null || M.setPopoverVisible(!1);
+              var $;
+              N.stopPropagation(), N.preventDefault(), l(!0), p(I), ($ = C == null ? void 0 : C.current) == null || $.setPopoverVisible(!1);
             },
             children: B
           }
@@ -50117,7 +50123,7 @@ const TableActionColumnDesigner = (e) => {
     "sort-field"
   );
 }, TableBlockDesigner = () => {
-  var F, I, T, R, D, B, N, M, L, w, O, j;
+  var F, I, T, R, D, B, N, $, L, w, O, j;
   const { name: e, title: t } = useCollection_deprecated(), { getCollectionField: o, getCollection: n } = useCollectionManager_deprecated(), r = useField(), a = useFieldSchema(), { form: i } = useFormBlockContext(), l = useSortFields(e), { service: c } = useTableBlockContext(), { t: u } = useTranslation(), { dn: d } = useDesignable();
   useBlockTemplateContext();
   const p = ((I = (F = a == null ? void 0 : a["x-decorator-props"]) == null ? void 0 : F.params) == null ? void 0 : I.sort) || [];
@@ -50131,8 +50137,8 @@ const TableActionColumnDesigner = (e) => {
   }), h = useSchemaTemplate(), g = useCollection_deprecated(), { dragSort: f, resource: C } = r.decoratorProps, b = C && o(C), S = C != null && C.includes(".") ? (B = n(b == null ? void 0 : b.target)) == null ? void 0 : B.tree : !!(g != null && g.tree), y = useCallback(
     ({ filter: k }) => {
       k = removeNullCondition(k);
-      const $ = r.decoratorProps.params || {};
-      $.filter = k, r.decoratorProps.params = $, a["x-decorator-props"].params = $, d.emit("patch", {
+      const M = r.decoratorProps.params || {};
+      M.filter = k, r.decoratorProps.params = M, a["x-decorator-props"].params = M, d.emit("patch", {
         schema: {
           "x-uid": a["x-uid"],
           "x-decorator-props": a["x-decorator-props"]
@@ -50154,12 +50160,12 @@ const TableActionColumnDesigner = (e) => {
         onChange: (k) => {
           var q;
           r.decoratorProps.treeTable = k, a["x-decorator-props"].treeTable = k;
-          const $ = P(x({}, (q = c.params) == null ? void 0 : q[0]), {
+          const M = P(x({}, (q = c.params) == null ? void 0 : q[0]), {
             tree: k ? !0 : null
           });
           d.emit("patch", {
             schema: a
-          }), d.refresh(), c.run($);
+          }), d.refresh(), c.run(M);
         }
       }
     ),
@@ -50203,7 +50209,7 @@ const TableActionColumnDesigner = (e) => {
       SchemaSettingsDataScope,
       {
         collectionName: e,
-        defaultFilter: ((L = (M = a == null ? void 0 : a["x-decorator-props"]) == null ? void 0 : M.params) == null ? void 0 : L.filter) || {},
+        defaultFilter: ((L = ($ = a == null ? void 0 : a["x-decorator-props"]) == null ? void 0 : $.params) == null ? void 0 : L.filter) || {},
         form: i,
         onSubmit: y
       }
@@ -50285,13 +50291,13 @@ const TableActionColumnDesigner = (e) => {
         },
         onSubmit: ({ sort: k }) => {
           var E;
-          const $ = k.map((V) => V.direction === "desc" ? `-${V.field}` : V.field), q = r.decoratorProps.params || {};
-          q.sort = $, r.decoratorProps.params = q, a["x-decorator-props"].params = q, d.emit("patch", {
+          const M = k.map((V) => V.direction === "desc" ? `-${V.field}` : V.field), q = r.decoratorProps.params || {};
+          q.sort = M, r.decoratorProps.params = q, a["x-decorator-props"].params = q, d.emit("patch", {
             schema: {
               "x-uid": a["x-uid"],
               "x-decorator-props": a["x-decorator-props"]
             }
-          }), c.run(P(x({}, (E = c.params) == null ? void 0 : E[0]), { sort: $ }));
+          }), c.run(P(x({}, (E = c.params) == null ? void 0 : E[0]), { sort: M }));
         }
       }
     ),
@@ -50311,8 +50317,8 @@ const TableActionColumnDesigner = (e) => {
         ],
         onChange: (k) => {
           var q;
-          const $ = r.decoratorProps.params || {};
-          $.pageSize = k, r.decoratorProps.params = $, a["x-decorator-props"].params = $, c.run(P(x({}, (q = c.params) == null ? void 0 : q[0]), { pageSize: k, page: 1 })), d.emit("patch", {
+          const M = r.decoratorProps.params || {};
+          M.pageSize = k, r.decoratorProps.params = M, a["x-decorator-props"].params = M, c.run(P(x({}, (q = c.params) == null ? void 0 : q[0]), { pageSize: k, page: 1 })), d.emit("patch", {
             schema: {
               "x-uid": a["x-uid"],
               "x-decorator-props": a["x-decorator-props"]
@@ -50332,14 +50338,14 @@ const TableActionColumnDesigner = (e) => {
           { label: u("Small"), value: "small" }
         ],
         onChange: (k) => {
-          const $ = a.reduceProperties((q, E) => {
+          const M = a.reduceProperties((q, E) => {
             if (E["x-component"] === "TableV2")
               return E;
           }, null);
-          $["x-component-props"] = $["x-component-props"] || {}, $["x-component-props"].size = k, d.emit("patch", {
+          M["x-component-props"] = M["x-component-props"] || {}, M["x-component-props"].size = k, d.emit("patch", {
             schema: {
-              "x-uid": $["x-uid"],
-              "x-decorator-props": $["x-component-props"]
+              "x-uid": M["x-uid"],
+              "x-decorator-props": M["x-component-props"]
             }
           });
         }
@@ -50374,7 +50380,7 @@ TableField.ActionBar = observer$1(
   { displayName: "TableField.ActionBar" }
 );
 const TableSelectorDesigner = () => {
-  var T, R, D, B, N, M;
+  var T, R, D, B, N, $;
   const { name: e, title: t } = useCollection_deprecated(), { getCollectionJoinField: o, getAllCollectionsInheritChain: n } = useCollectionManager_deprecated(), r = useField(), a = useFieldSchema(), { form: i } = useFormBlockContext(), l = useSortFields(e), { service: c, extraFilter: u } = useTableSelectorContext(), { t: d } = useTranslation(), { dn: p } = useDesignable(), m = ((R = (T = a == null ? void 0 : a["x-decorator-props"]) == null ? void 0 : T.params) == null ? void 0 : R.sort) || [], h = recursiveParent(a, "CollectionField"), g = o(h == null ? void 0 : h["x-collection-field"]), f = m == null ? void 0 : m.map((L) => L.startsWith("-") ? {
     field: L.substring(1),
     direction: "desc"
@@ -50532,7 +50538,7 @@ const TableSelectorDesigner = () => {
       SchemaSettingsSelectItem,
       {
         title: d("Records per page"),
-        value: ((M = (N = r.decoratorProps) == null ? void 0 : N.params) == null ? void 0 : M.pageSize) || 20,
+        value: (($ = (N = r.decoratorProps) == null ? void 0 : N.params) == null ? void 0 : $.pageSize) || 20,
         options: [
           { label: "5", value: 5 },
           { label: "10", value: 10 },
@@ -52343,11 +52349,11 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           if (D && F) {
             const N = ((B = r(D)) == null ? void 0 : B.fields) || [];
             n(
-              N == null ? void 0 : N.filter((M) => supportTypes.includes(M.type)).map((M) => {
+              N == null ? void 0 : N.filter(($) => supportTypes.includes($.type)).map(($) => {
                 var L;
                 return {
-                  value: M.name,
-                  label: g(((L = M.uiSchema) == null ? void 0 : L.title) || M.name)
+                  value: $.name,
+                  label: g(((L = $.uiSchema) == null ? void 0 : L.title) || $.name)
                 };
               })
             );
@@ -52536,27 +52542,27 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   const t = useRecord();
   return /* @__PURE__ */ jsx(AddFieldAction, x({ item: t }, e));
 }, AddFieldAction = (e) => {
-  var M, L;
-  const { scope: t, getContainer: o, item: n, children: r, trigger: a, align: i, database: l } = e, { getInterface: c, getTemplate: u, collections: d, getCollection: p } = useCollectionManager_deprecated(), [m, h] = useState(!1), [g, f] = useState(), [C, b] = useState({}), S = useCompile(), { t: y } = useTranslation(), { isDialect: v } = useDialect(), F = useFieldInterfaceOptions(), I = ((L = (M = p(n.name)) == null ? void 0 : M.options) == null ? void 0 : L.fields) || n.fields || [], T = useMemo(() => d.map((w) => ({
+  var $, L;
+  const { scope: t, getContainer: o, item: n, children: r, trigger: a, align: i, database: l } = e, { getInterface: c, getTemplate: u, collections: d, getCollection: p } = useCollectionManager_deprecated(), [m, h] = useState(!1), [g, f] = useState(), [C, b] = useState({}), S = useCompile(), { t: y } = useTranslation(), { isDialect: v } = useDialect(), F = useFieldInterfaceOptions(), I = ((L = ($ = p(n.name)) == null ? void 0 : $.options) == null ? void 0 : L.fields) || n.fields || [], T = useMemo(() => d.map((w) => ({
     label: S(w.title),
     value: w.name
   })), []), R = useCallback(() => {
     const { availableFieldInterfaces: w } = u(n.template) || {}, { exclude: O, include: j } = w || {}, k = [];
-    return F.forEach(($) => {
+    return F.forEach((M) => {
       var q;
-      if ($.key === "systemInfo")
-        k.push(P(x({}, $), {
-          children: $.children.filter((E) => E.hidden ? !1 : E.value === "tableoid" ? j != null && j.length ? j.includes(E.value) : (l == null ? void 0 : l.dialect) === "postgres" : typeof n[E.value] == "boolean" ? n[E.value] : !0)
+      if (M.key === "systemInfo")
+        k.push(P(x({}, M), {
+          children: M.children.filter((E) => E.hidden ? !1 : E.value === "tableoid" ? j != null && j.length ? j.includes(E.value) : (l == null ? void 0 : l.dialect) === "postgres" : typeof n[E.value] == "boolean" ? n[E.value] : !0)
         }));
       else {
         let E = [];
         j != null && j.length ? j.forEach((V) => {
           var U;
-          const G = (U = $ == null ? void 0 : $.children) == null ? void 0 : U.find((H) => [V, V.interface].includes(H.name));
+          const G = (U = M == null ? void 0 : M.children) == null ? void 0 : U.find((H) => [V, V.interface].includes(H.name));
           G && E.push(P(x({}, G), {
             targetScope: V == null ? void 0 : V.targetScope
           }));
-        }) : O != null && O.length ? E = (q = $ == null ? void 0 : $.children) == null ? void 0 : q.filter((V) => !O.includes(V.name)) : E = $ == null ? void 0 : $.children, E != null && E.length && k.push(P(x({}, $), {
+        }) : O != null && O.length ? E = (q = M == null ? void 0 : M.children) == null ? void 0 : q.filter((V) => !O.includes(V.name)) : E = M == null ? void 0 : M.children, E != null && E.length && k.push(P(x({}, M), {
           children: E
         }));
       }
@@ -52735,14 +52741,14 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       "a",
       P(x({}, i), {
         onClick: () => z(void 0, null, function* () {
-          var N, M;
+          var N, $;
           const { data: T } = yield g.resource("collections.fields", n.collectionName).get({
             filterByTk: n.name,
             appends: ["reverseField"]
           });
           S(T == null ? void 0 : T.data);
           const R = l(n.interface), D = cloneDeep(T == null ? void 0 : T.data) || {};
-          D != null && D.reverseField || (D.autoCreateReverseField = !1, D.reverseField = (N = R == null ? void 0 : R.default) == null ? void 0 : N.reverseField, set$1(D.reverseField, "name", `f_${uid()}`), set$1(D.reverseField, "uiSchema.title", (M = n.__parent) == null ? void 0 : M.title));
+          D != null && D.reverseField || (D.autoCreateReverseField = !1, D.reverseField = (N = R == null ? void 0 : R.default) == null ? void 0 : N.reverseField, set$1(D.reverseField, "name", `f_${uid()}`), set$1(D.reverseField, "uiSchema.title", ($ = n.__parent) == null ? void 0 : $.title));
           const B = getSchema$7(R, D, n, C);
           h(B), p(!0);
         }),
@@ -52866,7 +52872,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
         });
       }
     };
-  }, M = useMemo(() => {
+  }, $ = useMemo(() => {
     var L;
     return (n == null ? void 0 : n.fields) || ((L = d(n.collectionName)) == null ? void 0 : L.options.fields.filter((w) => ["string", "bigInt", "integer"].includes(w.type)).map((w) => {
       var O;
@@ -52919,7 +52925,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           isOverride: !0,
           targetScope: { target: F(l), through: F(c) },
           collections: B,
-          scopeKeyOptions: M
+          scopeKeyOptions: $
         }, t)
       }
     )
@@ -53356,7 +53362,7 @@ const getSchema$4 = (e, t, o) => {
     const w = [];
     g.forEach((O) => {
       var E;
-      const j = v(O), $ = T(O).map((V) => {
+      const j = v(O), M = T(O).map((V) => {
         const G = R(V, O);
         return {
           type: "group",
@@ -53373,7 +53379,7 @@ const getSchema$4 = (e, t, o) => {
       }), q = (E = j.fields.filter((V) => !["obo", "oho", "m2m", "o2m"].includes(V == null ? void 0 : V.interface))) == null ? void 0 : E.map((V) => {
         var G;
         return { value: V.name, key: V.name, label: l(((G = V.uiSchema) == null ? void 0 : G.title) || V.name) };
-      }).concat($);
+      }).concat(M);
       w.push({
         value: O,
         label: l(j.title || j.name),
@@ -53385,31 +53391,31 @@ const getSchema$4 = (e, t, o) => {
       var O, j;
       if (w) {
         u(!1), p([]);
-        const k = (j = Object.values((O = w == null ? void 0 : w.data) == null ? void 0 : O.fields)) == null ? void 0 : j.map(($) => {
+        const k = (j = Object.values((O = w == null ? void 0 : w.data) == null ? void 0 : O.fields)) == null ? void 0 : j.map((M) => {
           var q, E;
-          if ($.source) {
-            const V = (a == null ? void 0 : a.data.find((G) => G.name === $.name)) || $;
-            return P(x({}, $), {
+          if (M.source) {
+            const V = (a == null ? void 0 : a.data.find((G) => G.name === M.name)) || M;
+            return P(x({}, M), {
               uiSchema: P(x({}, omit(V.uiSchema, "rawTitle")), { title: ((q = V.uiSchema) == null ? void 0 : q.title) || V.name })
             });
           } else {
-            const V = (a == null ? void 0 : a.data.find((G) => G.name === $.name)) || $;
+            const V = (a == null ? void 0 : a.data.find((G) => G.name === M.name)) || M;
             return P(x({}, V), {
               uiSchema: P(x({}, omit(V.uiSchema, "rawTitle")), { title: ((E = V.uiSchema) == null ? void 0 : E.title) || V.name })
             });
           }
         });
         S.value = k, setTimeout(() => {
-          var $, q, E;
-          p(k), y.setValuesIn("sources", ($ = w.data) == null ? void 0 : $.sources), f((q = w.data) == null ? void 0 : q.sources), b((E = w == null ? void 0 : w.data) == null ? void 0 : E.unsupportedFields);
+          var M, q, E;
+          p(k), y.setValuesIn("sources", (M = w.data) == null ? void 0 : M.sources), f((q = w.data) == null ? void 0 : q.sources), b((E = w == null ? void 0 : w.data) == null ? void 0 : E.unsupportedFields);
         });
       }
     }).catch);
   }, [t]);
-  const M = (w, O) => {
+  const $ = (w, O) => {
     d.splice(O, 1, w), p(d), S.value = d.map((j) => {
-      var $, q, E;
-      const k = typeof j.source == "string" ? j.source : (E = (q = ($ = j.source) == null ? void 0 : $.filter) == null ? void 0 : q.call($, Boolean)) == null ? void 0 : E.join(".");
+      var M, q, E;
+      const k = typeof j.source == "string" ? j.source : (E = (q = (M = j.source) == null ? void 0 : M.filter) == null ? void 0 : q.call(M, Boolean)) == null ? void 0 : E.join(".");
       return P(x({}, j), {
         source: k
       });
@@ -53433,10 +53439,10 @@ const getSchema$4 = (e, t, o) => {
           allowClear: !0,
           style: { width: "100%" },
           options: D(m),
-          onChange: (k, $) => {
+          onChange: (k, M) => {
             var E;
             const q = (E = I(k == null ? void 0 : k[0])) == null ? void 0 : E.find((V) => V.name === last(k));
-            M(P(x({}, O), { source: k, uiSchema: q == null ? void 0 : q.uiSchema }), j);
+            $(P(x({}, O), { source: k, uiSchema: q == null ? void 0 : q.uiSchema }), j);
           },
           placeholder: l("Select field source")
         }
@@ -53455,8 +53461,8 @@ const getSchema$4 = (e, t, o) => {
             defaultValue: w,
             popupMatchSelectWidth: !1,
             style: { width: "100%" },
-            options: (k == null ? void 0 : k.possibleTypes.map(($) => ({ label: $, value: $ }))) || [],
-            onChange: ($) => M(P(x({}, k), { type: $ }), j)
+            options: (k == null ? void 0 : k.possibleTypes.map((M) => ({ label: M, value: M }))) || [],
+            onChange: (M) => $(P(x({}, k), { type: M }), j)
           }
         );
       }
@@ -53467,7 +53473,7 @@ const getSchema$4 = (e, t, o) => {
       key: "interface",
       width: 150,
       render: (w, O, j) => {
-        const k = d[j], $ = getInterfaceOptions(N, k.type);
+        const k = d[j], M = getInterfaceOptions(N, k.type);
         return k.source ? w : /* @__PURE__ */ jsx(
           Select$1,
           {
@@ -53477,9 +53483,9 @@ const getSchema$4 = (e, t, o) => {
             onChange: (q) => {
               var V;
               const E = F(q);
-              M(P(x({}, k), { interface: q, uiSchema: (V = E == null ? void 0 : E.default) == null ? void 0 : V.uiSchema }), j);
+              $(P(x({}, k), { interface: q, uiSchema: (V = E == null ? void 0 : E.default) == null ? void 0 : V.uiSchema }), j);
             },
-            children: $.map((q) => /* @__PURE__ */ jsx(Select$1.OptGroup, { label: D(q.label), children: q.children.map((E) => /* @__PURE__ */ jsx(Select$1.Option, { value: E.name, children: D(E.label) }, E.value)) }, q.key))
+            children: M.map((q) => /* @__PURE__ */ jsx(Select$1.OptGroup, { label: D(q.label), children: q.children.map((E) => /* @__PURE__ */ jsx(Select$1.Option, { value: E.name, children: D(E.label) }, E.value)) }, q.key))
           }
         );
       }
@@ -53490,13 +53496,13 @@ const getSchema$4 = (e, t, o) => {
       key: "title",
       width: 180,
       render: (w, O, j) => {
-        var $;
+        var M;
         const k = d[j];
         return /* @__PURE__ */ jsx(
           Input$3,
           {
-            defaultValue: (($ = k == null ? void 0 : k.uiSchema) == null ? void 0 : $.title) || w,
-            onChange: (q) => M(
+            defaultValue: ((M = k == null ? void 0 : k.uiSchema) == null ? void 0 : M.title) || w,
+            onChange: (q) => $(
               P(x({}, k), { uiSchema: P(x({}, omit(k == null ? void 0 : k.uiSchema, "rawTitle")), { title: q.target.value }) }),
               j
             )
@@ -53551,14 +53557,14 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
   }, S = (y) => {
     var v;
     return (v = y.filter((F) => F.source || F.interface)) == null ? void 0 : v.map((F) => {
-      var B, N, M, L, w, O;
-      const I = typeof (F == null ? void 0 : F.source) == "string" ? (B = F == null ? void 0 : F.source) == null ? void 0 : B.split(".") : F == null ? void 0 : F.source, T = (M = (N = h(I == null ? void 0 : I[0])) == null ? void 0 : N.find((j) => j.name === (I == null ? void 0 : I[1]))) == null ? void 0 : M.uiSchema, R = ((L = F == null ? void 0 : F.uiSchema) == null ? void 0 : L.title) || (T == null ? void 0 : T.title) || F.name, D = F.source ? T : (O = (w = m(F.interface)) == null ? void 0 : w.default) == null ? void 0 : O.uiSchema;
+      var B, N, $, L, w, O;
+      const I = typeof (F == null ? void 0 : F.source) == "string" ? (B = F == null ? void 0 : F.source) == null ? void 0 : B.split(".") : F == null ? void 0 : F.source, T = ($ = (N = h(I == null ? void 0 : I[0])) == null ? void 0 : N.find((j) => j.name === (I == null ? void 0 : I[1]))) == null ? void 0 : $.uiSchema, R = ((L = F == null ? void 0 : F.uiSchema) == null ? void 0 : L.title) || (T == null ? void 0 : T.title) || F.name, D = F.source ? T : (O = (w = m(F.interface)) == null ? void 0 : w.default) == null ? void 0 : O.uiSchema;
       return {
         title: u(R),
         dataIndex: F.name,
         key: F.name,
         width: 200,
-        render: (j, k, $) => {
+        render: (j, k, M) => {
           const q = k[F.name], E = {
             type: "object",
             properties: {
@@ -53571,7 +53577,7 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
               }
             }
           };
-          return /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: /* @__PURE__ */ jsx(RecursionField, { schema: E, name: $, onlyRenderProperties: !0 }) });
+          return /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: /* @__PURE__ */ jsx(RecursionField, { schema: E, name: M, onlyRenderProperties: !0 }) });
         }
       };
     });
@@ -53802,9 +53808,9 @@ const AsyncDataProvider = (e) => {
     if (useEffect(() => {
       var B;
       const R = /* @__PURE__ */ new Map();
-      a || (i && i.length ? Object.entries((i == null ? void 0 : i[0]) || {}).forEach(([N, M]) => {
+      a || (i && i.length ? Object.entries((i == null ? void 0 : i[0]) || {}).forEach(([N, $]) => {
         var k;
-        const L = l[N], w = inferInterface(N, M), O = (k = C.current(w)) == null ? void 0 : k.default, j = (L == null ? void 0 : L.uiSchema) || (O == null ? void 0 : O.uiSchema) || {};
+        const L = l[N], w = inferInterface(N, $), O = (k = C.current(w)) == null ? void 0 : k.default, j = (L == null ? void 0 : L.uiSchema) || (O == null ? void 0 : O.uiSchema) || {};
         R.set(N, {
           name: N,
           interface: (L == null ? void 0 : L.interface) || w,
@@ -53815,13 +53821,13 @@ const AsyncDataProvider = (e) => {
           }, j)
         });
       }) : Object.entries(l || {}).forEach(
-        ([N, M]) => R.set(N, P(x({
+        ([N, $]) => R.set(N, P(x({
           name: N,
           type: "string"
-        }, M), {
+        }, $), {
           uiSchema: x({
             title: N
-          }, (M == null ? void 0 : M.uiSchema) || {})
+          }, ($ == null ? void 0 : $.uiSchema) || {})
         }))
       )), (B = c.value) != null && B.length && c.value.forEach((N) => {
         R.has(N.name) && R.set(N.name, N);
@@ -53842,9 +53848,9 @@ const AsyncDataProvider = (e) => {
       const B = [...t];
       B.splice(D, 1, R), o(B), c.setValue(
         B.map((N) => {
-          var M, L, w;
+          var $, L, w;
           return P(x({}, N), {
-            source: typeof N.source == "string" ? N.source : ((w = (L = (M = N.source) == null ? void 0 : M.filter) == null ? void 0 : L.call(M, Boolean)) == null ? void 0 : w.join(".")) || null
+            source: typeof N.source == "string" ? N.source : ((w = (L = ($ = N.source) == null ? void 0 : $.filter) == null ? void 0 : L.call($, Boolean)) == null ? void 0 : w.join(".")) || null
           });
         })
       );
@@ -53869,11 +53875,11 @@ const AsyncDataProvider = (e) => {
               allowClear: !0,
               options: d(f),
               placeholder: e("Select field source"),
-              onChange: (M) => {
-                let L = l[M == null ? void 0 : M[1]];
-                L != null && L.interface || (L = m((M == null ? void 0 : M.join(".")) || "")), S(
+              onChange: ($) => {
+                let L = l[$ == null ? void 0 : $[1]];
+                L != null && L.interface || (L = m(($ == null ? void 0 : $.join(".")) || "")), S(
                   P(x({}, N), {
-                    source: M,
+                    source: $,
                     interface: L == null ? void 0 : L.interface,
                     type: L == null ? void 0 : L.type,
                     uiSchema: L == null ? void 0 : L.uiSchema
@@ -53891,22 +53897,22 @@ const AsyncDataProvider = (e) => {
         key: "interface",
         width: 150,
         render: (R, D, B) => {
-          var M;
+          var $;
           const N = t[B];
-          return N.source ? /* @__PURE__ */ jsx(Tag, { children: d((M = p(R)) == null ? void 0 : M.title) || R }) : /* @__PURE__ */ jsx(
+          return N.source ? /* @__PURE__ */ jsx(Tag, { children: d(($ = p(R)) == null ? void 0 : $.title) || R }) : /* @__PURE__ */ jsx(
             Select$1,
             {
               defaultValue: N.interface || "input",
               style: { width: "100%" },
               popupMatchSelectWidth: !1,
               onChange: (L) => {
-                var O, j, k, $, q;
+                var O, j, k, M, q;
                 const w = p(L);
                 S(
                   P(x({}, N), {
                     interface: L || null,
                     uiSchema: P(x({}, (O = w == null ? void 0 : w.default) == null ? void 0 : O.uiSchema), {
-                      title: ((k = (j = w == null ? void 0 : w.default) == null ? void 0 : j.uiSchema) == null ? void 0 : k.title) || (($ = N.uiSchema) == null ? void 0 : $.title)
+                      title: ((k = (j = w == null ? void 0 : w.default) == null ? void 0 : j.uiSchema) == null ? void 0 : k.title) || ((M = N.uiSchema) == null ? void 0 : M.title)
                     }),
                     type: (q = w == null ? void 0 : w.default) == null ? void 0 : q.type
                   }),
@@ -53925,12 +53931,12 @@ const AsyncDataProvider = (e) => {
         key: "title",
         width: 180,
         render: (R, D, B) => {
-          var M, L;
+          var $, L;
           const N = t[B];
           return /* @__PURE__ */ jsx(
             Input$3,
             {
-              value: ((M = N.uiSchema) == null ? void 0 : M.title) || R,
+              value: (($ = N.uiSchema) == null ? void 0 : $.title) || R,
               defaultValue: ((L = N.uiSchema) == null ? void 0 : L.title) !== void 0 ? N.uiSchema.title : N == null ? void 0 : N.name,
               onChange: (w) => S(P(x({}, N), { uiSchema: P(x({}, N == null ? void 0 : N.uiSchema), { title: w.target.value }) }), B)
             }
@@ -58195,7 +58201,7 @@ class ViewCollectionTemplate extends CollectionTemplate {
           when: "{{isPG}}",
           fulfill: {
             state: {
-              value: "{{$deps[0].split('@')?.[0]}}"
+              value: "{{$deps[0] && $deps[0].split('@')?.[0]}}"
             }
           },
           otherwise: {
@@ -58213,12 +58219,12 @@ class ViewCollectionTemplate extends CollectionTemplate {
           when: "{{isPG}}",
           fulfill: {
             state: {
-              value: "{{$deps[0].split('@')?.[1]}}"
+              value: "{{$deps[0] && $deps[0].split('@')?.[1]}}"
             }
           },
           otherwise: {
             state: {
-              value: "{{$deps[0]}}"
+              value: "{{$deps[0] || null}}"
             }
           }
         }
@@ -59944,8 +59950,8 @@ const RolesResourcesActions = connect((e) => {
                       name: I.name
                     }, N = B.fields || [];
                     if (R) {
-                      const M = N.indexOf(D.name);
-                      N.splice(M, 1);
+                      const $ = N.indexOf(D.name);
+                      N.splice($, 1);
                     } else
                       N.push(D.name);
                     B.fields = N, p[I.name] = B, t(Object.values(p));
@@ -62437,16 +62443,16 @@ const ActionInitializerItem = (e) => {
     ), I = C || (a == null ? void 0 : a.targetKey) || "id", T = b || ((U = (G = i["x-component-props"]) == null ? void 0 : G.fieldNames) == null ? void 0 : U.label) || I, R = {
       title: T || I,
       key: I
-    }, [D, B] = useState([]), [N, M] = useState(i.default || []), [L, w] = useState(!0), O = useLabelUiSchema(a, (R == null ? void 0 : R.title) || "label");
+    }, [D, B] = useState([]), [N, $] = useState(i.default || []), [L, w] = useState(!0), O = useLabelUiSchema(a, (R == null ? void 0 : R.title) || "label");
     if (useEffect(() => {
-      i.default && (d(i.default), M(i.default));
+      i.default && (d(i.default), $(i.default));
     }, [i.default, d]), !a)
       return null;
     const j = (J) => {
       B(J), w(!1);
     }, k = (J) => {
-      M(J), d(J), p == null || p(J);
-    }, $ = (J) => {
+      $(J), d(J), p == null || p(J);
+    }, M = (J) => {
       var X;
       const K = (X = h == null ? void 0 : h[0]) == null ? void 0 : X.filter;
       (y || K) && g(P(x({}, h == null ? void 0 : h[0]), {
@@ -62490,7 +62496,7 @@ const ActionInitializerItem = (e) => {
                       style: {
                         flex: "0 0 auto"
                       },
-                      children: y ? /* @__PURE__ */ jsx(CloseOutlined, { className: "CloseOutlined", onClick: $ }) : /* @__PURE__ */ jsx(SearchOutlined, { className: "SearchOutlined", onClick: $ })
+                      children: y ? /* @__PURE__ */ jsx(CloseOutlined, { className: "CloseOutlined", onClick: M }) : /* @__PURE__ */ jsx(SearchOutlined, { className: "SearchOutlined", onClick: M })
                     }
                   )
                 ]
@@ -62901,7 +62907,7 @@ function useMenuSearch({
   })) : g, [e, c, u, g]);
 }
 const DataBlockInitializer = (e) => {
-  var k, $;
+  var k, M;
   const {
     templateWrap: t,
     onCreateBlockSchema: o,
@@ -62965,7 +62971,7 @@ const DataBlockInitializer = (e) => {
     onClick: D,
     currentText: b,
     otherText: S
-  }), N = useGetSchemaInitializerMenuItems(D), M = useMemo(() => N(B, a), [N, B, a]), [L, w] = useState([]), O = useMenuSearch({ data: M, openKeys: L, hideSearch: u }), j = useMemo(() => {
+  }), N = useGetSchemaInitializerMenuItems(D), $ = useMemo(() => N(B, a), [N, B, a]), [L, w] = useState([]), O = useMenuSearch({ data: $, openKeys: L, hideSearch: u }), j = useMemo(() => {
     let q = O.filter((E) => E.key !== "search" && E.key !== "empty");
     return p && q.length === 1 ? q = q[0].children : q = O, [
       {
@@ -62979,7 +62985,7 @@ const DataBlockInitializer = (e) => {
       }
     ];
   }, [O, p, a, I, i, r, D, e]);
-  return M.length > 1 || M.length === 1 && (($ = (k = M[0]) == null ? void 0 : k.children) == null ? void 0 : $.length) > 0 || y ? /* @__PURE__ */ jsx(
+  return $.length > 1 || $.length === 1 && ((M = (k = $[0]) == null ? void 0 : k.children) == null ? void 0 : M.length) > 0 || y ? /* @__PURE__ */ jsx(
     SchemaInitializerMenu,
     {
       onOpenChange: (q) => {