@nocobase/client 1.9.14 → 1.9.16

package/es/index.mjs

@@ -6658,14 +6658,15 @@ const InternalFormBlockProvider = (e) => {
   const e = useFormBlockContext(), { fieldSchema: t } = useActionContext();
   return e.type !== "create" && (t == null ? void 0 : t["x-acl-action"]) !== "create" && (t == null ? void 0 : t["x-action"]) !== "create";
 }, FormBlockProvider = withDynamicSchemaProps((e) => {
-  const t = useCollectionParentRecordData(), { parentRecord: n, action: o } = e, r = useCollectionRecordData(), { association: a } = e, i = useCollectionManager(), { __collection: l } = r || {}, { designable: c } = useDesignable(), u = e.collection || i.getCollection(a).name, d = useUpdate();
-  return !c && l && o && l !== u ? null : /* @__PURE__ */ jsx(TemplateBlockProvider, { onTemplateLoaded: d, children: /* @__PURE__ */ jsx(
+  var h;
+  const t = useCollectionParentRecordData(), { parentRecord: n, action: o } = e, r = useCollectionRecordData(), { association: a } = e, i = useCollectionManager(), { __collection: l } = r || {}, { designable: c } = useDesignable(), u = e.collection || i.getCollection(a).name, { fieldSchema: d } = useActionContext(), p = (h = d == null ? void 0 : d["x-component-props"]) == null ? void 0 : h.addChild, m = useUpdate();
+  return !c && l && o && l !== u ? null : /* @__PURE__ */ jsx(TemplateBlockProvider, { onTemplateLoaded: m, children: /* @__PURE__ */ jsx(
     BlockProvider,
     P(x({
       name: e.name || "form"
     }, e), {
       block: "form",
-      parentRecord: n || t,
+      parentRecord: p ? t : n || t,
       children: /* @__PURE__ */ jsx(FormActiveFieldsProvider, { name: "form", children: /* @__PURE__ */ jsx(InternalFormBlockProvider, x({}, e)) })
     })
   ) });
@@ -7212,8 +7213,8 @@ const collectFieldStateOfLinkageRules = ({
             });
             try {
               return f(E, x({ now: () => (/* @__PURE__ */ new Date()).toString() }, z));
-            } catch (L) {
-              console.error(L);
+            } catch (V) {
+              console.error(V);
             }
           } else
             return (t == null ? void 0 : t.mode) === "constant" ? (A = t == null ? void 0 : t.value) != null ? A : t : null;
@@ -8856,7 +8857,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.9.14", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.9.16", 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",
@@ -8877,9 +8878,9 @@ const name = "@nocobase/client", version = "1.9.14", license = "AGPL-3.0", main
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.9.14",
-  "@nocobase/sdk": "1.9.14",
-  "@nocobase/utils": "1.9.14",
+  "@nocobase/evaluators": "1.9.16",
+  "@nocobase/sdk": "1.9.16",
+  "@nocobase/utils": "1.9.16",
   ahooks: "^3.7.2",
   antd: "5.24.2",
   "antd-mobile": "^5.41.1",
@@ -10137,11 +10138,11 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
           ${o.paddingSM}px;
       }
     `, [o.paddingContentVerticalLG, o.marginSM, o.margin]), b = useCollection(), S = useMemo(() => withTooltipComponent(NocoBaseRecursionField), []), y = useMemo(() => (d == null ? void 0 : d.map((D) => {
-    var z, L, V, G, H;
+    var z, V, L, G, H;
     const B = D.reduceProperties((U, K) => {
       if (isCollectionFieldComponent(K))
         return U.concat([K]);
-    }, []), N = (B == null ? void 0 : B.length) > 0 ? B[0].name : D.name, M = D["x-uid"] || D.name, j = !!((z = D["x-component-props"]) != null && z.columnHidden), R = ((L = D["x-component-props"]) == null ? void 0 : L.width) || 100, O = (V = D["x-component-props"]) == null ? void 0 : V.fixed, { uiSchema: $, defaultValue: A, interface: E } = (b == null ? void 0 : b.getField(N)) || {};
+    }, []), N = (B == null ? void 0 : B.length) > 0 ? B[0].name : D.name, M = D["x-uid"] || D.name, j = !!((z = D["x-component-props"]) != null && z.columnHidden), R = ((V = D["x-component-props"]) == null ? void 0 : V.width) || 100, O = (L = D["x-component-props"]) == null ? void 0 : L.fixed, { uiSchema: $, defaultValue: A, interface: E } = (b == null ? void 0 : b.getField(N)) || {};
     return D.title = n(D == null ? void 0 : D.title, { ns: NAMESPACE_UI_SCHEMA }), $ && ($.default = A), P(x({
       title: /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: g, children: /* @__PURE__ */ jsx(
         S,
@@ -10539,7 +10540,7 @@ const Table$2 = withDynamicSchemaProps(
   withSkeletonComponent(
     observer$1((e) => {
       var ye, ae;
-      const { token: t } = useToken$1(), ge = omit(e, ["onBlur", "onFocus"]), { pagination: n, useProps: o } = ge, r = W(ge, ["pagination", "useProps"]), pe = (o == null ? void 0 : o()) || {}, { pagination: a } = pe, i = W(pe, ["pagination"]), be = x(x({}, r), i), {
+      const { token: t } = useToken$1(), Ce = omit(e, ["onBlur", "onFocus"]), { pagination: n, useProps: o } = Ce, r = W(Ce, ["pagination", "useProps"]), fe = (o == null ? void 0 : o()) || {}, { pagination: a } = fe, i = W(fe, ["pagination"]), be = x(x({}, r), i), {
         dragSort: l = !1,
         showIndex: c = !0,
         onRowSelectionChange: u,
@@ -10564,7 +10565,7 @@ const Table$2 = withDynamicSchemaProps(
         "onClickRow",
         "value"
       ]), y = useArrayField$1(S), v = useFieldSchema(), { size: I = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, F = useCollection(), T = ((ye = v == null ? void 0 : v.parent) == null ? void 0 : ye["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: B, enableIndexColumn: N } = T, M = useMemoizedFn(S.onRowDragEnd || (() => {
-      })), j = usePaginationProps$3(n, a, e), R = useTableColumns$3(S, j), [O, $] = useState(() => D ? B : []), [A, E] = useState(((ae = y == null ? void 0 : y.data) == null ? void 0 : ae.selectedRowKeys) || []), [z, L] = useState([]), V = (p == null ? void 0 : p.type) !== "none", G = useRef(/* @__PURE__ */ new Map()), H = useMemo(() => css`
+      })), j = usePaginationProps$3(n, a, e), R = useTableColumns$3(S, j), [O, $] = useState(() => D ? B : []), [A, E] = useState(((ae = y == null ? void 0 : y.data) == null ? void 0 : ae.selectedRowKeys) || []), [z, V] = useState([]), L = (p == null ? void 0 : p.type) !== "none", G = useRef(/* @__PURE__ */ new Map()), H = useMemo(() => css`
           & > td {
             background-color: ${t.controlItemBgActive} !important;
           }
@@ -10573,180 +10574,180 @@ const Table$2 = withDynamicSchemaProps(
           }
         `, [t.controlItemBgActive, t.controlItemBgActiveHover]), U = useTableBlockContextBasicValue(), K = useRef(b);
       K.current = b, useEffect(() => {
-        var ne;
-        U != null && U.field && (U.field.data = ((ne = U.field) == null ? void 0 : ne.data) || {}, U.field.data.clearSelectedRowKeys = () => {
+        var ee;
+        U != null && U.field && (U.field.data = ((ee = U.field) == null ? void 0 : ee.data) || {}, U.field.data.clearSelectedRowKeys = () => {
           U.field.data.selectedRowKeys = [], E([]);
         }, U.field.data.setSelectedRowKeys = E);
       }, [U == null ? void 0 : U.field]);
-      const Y = useMemo(() => C ? H : "", [H, C]), X = useMemo(() => C ? (ne, oe) => ({
-        onClick: (ie) => {
-          isPortalInBody(ie.target) || C(ne, L, z);
+      const Y = useMemo(() => C ? H : "", [H, C]), X = useMemo(() => C ? (ee, oe) => ({
+        onClick: (le) => {
+          isPortalInBody(le.target) || C(ee, V, z);
         },
         rowIndex: oe,
-        record: ne
-      }) : (ne, oe) => ({
+        record: ee
+      }) : (ee, oe) => ({
         rowIndex: oe,
-        record: ne
+        record: ee
       }), [C, z]);
       useDeepCompareEffect(() => {
-        const ne = D ? B : [];
-        _.isEqual(ne, O) || $(ne);
+        const ee = D ? B : [];
+        _.isEqual(ee, O) || $(ee);
       }, [D, B]);
-      const Q = useCallback((ne) => {
+      const J = useCallback((ee) => {
         if (m)
-          return ee(ne);
-        if (ne.key)
-          return ne.key;
-        if (G.current.has(ne))
-          return G.current.get(ne);
+          return Z(ee);
+        if (ee.key)
+          return ee.key;
+        if (G.current.has(ee))
+          return G.current.get(ee);
         const oe = uid();
-        return G.current.set(ne, oe), oe;
-      }, []), ee = useCallback(
-        (ne) => {
+        return G.current.set(ee, oe), oe;
+      }, []), Z = useCallback(
+        (ee) => {
           var oe;
-          return Array.isArray(m) ? m.map((ie) => {
-            var ce;
-            return ((ce = ne[ie]) == null ? void 0 : ce.toString()) || "";
-          }).join("-") : typeof m == "string" ? ne[m] : (oe = (m != null ? m : Q)(ne)) == null ? void 0 : oe.toString();
+          return Array.isArray(m) ? m.map((le) => {
+            var me;
+            return ((me = ee[le]) == null ? void 0 : me.toString()) || "";
+          }).join("-") : typeof m == "string" ? ee[m] : (oe = (m != null ? m : J)(ee)) == null ? void 0 : oe.toString();
         },
-        [JSON.stringify(m), Q]
-      ), J = useMemo(() => (Array.isArray(b) ? b : []).filter(Boolean), [b, b == null ? void 0 : b.length]), Z = useMemo(() => (ne) => {
-        const oe = useCallback((ie) => {
+        [JSON.stringify(m), J]
+      ), Q = useMemo(() => (Array.isArray(b) ? b : []).filter(Boolean), [b, b == null ? void 0 : b.length]), ne = useMemo(() => (ee) => {
+        const oe = useCallback((le) => {
           var ve, Pe, Fe, Ie, ke, De, je, Me;
-          if (!ie.active || !ie.over) {
+          if (!le.active || !le.over) {
             console.warn("move cancel");
             return;
           }
-          const ce = (Fe = (Pe = (ve = ie.active) == null ? void 0 : ve.data.current) == null ? void 0 : Pe.sortable) == null ? void 0 : Fe.index, de = (De = (ke = (Ie = ie.over) == null ? void 0 : Ie.data.current) == null ? void 0 : ke.sortable) == null ? void 0 : De.index, Se = ((je = K.current) == null ? void 0 : je[ce]) || ie.active, Ae = ((Me = K.current) == null ? void 0 : Me[de]) || ie.over;
-          y.move(ce, de), M({ from: Se, to: Ae });
+          const me = (Fe = (Pe = (ve = le.active) == null ? void 0 : ve.data.current) == null ? void 0 : Pe.sortable) == null ? void 0 : Fe.index, xe = (De = (ke = (Ie = le.over) == null ? void 0 : Ie.data.current) == null ? void 0 : ke.sortable) == null ? void 0 : De.index, Se = ((je = K.current) == null ? void 0 : je[me]) || le.active, Ae = ((Me = K.current) == null ? void 0 : Me[xe]) || le.over;
+          y.move(me, xe), M({ from: Se, to: Ae });
         }, []);
-        return /* @__PURE__ */ jsx(DndContext, { onDragEnd: oe, children: /* @__PURE__ */ jsx("tbody", x({}, ne)) });
+        return /* @__PURE__ */ jsx(DndContext, { onDragEnd: oe, children: /* @__PURE__ */ jsx("tbody", x({}, ee)) });
       }, [y, M]);
-      Z.displayName = "BodyWrapperComponent";
+      ne.displayName = "BodyWrapperComponent";
       const te = useMemo(() => ({
         header: {
           wrapper: HeaderWrapperComponent$1,
           cell: HeaderCellComponent$1
         },
         body: {
-          wrapper: Z,
+          wrapper: ne,
           row: BodyRowComponent$1,
           cell: BodyCellComponent$1
         }
-      }), [Z]), re = useMemo(() => p, [JSON.stringify(p)]), se = useMemo(
+      }), [ne]), se = useMemo(() => p, [JSON.stringify(p)]), ce = useMemo(
         () => ({
-          rowSelection: N !== !1 && re ? x({
+          rowSelection: N !== !1 && se ? x({
             type: "checkbox",
             selectedRowKeys: A,
-            onChange(ne, oe) {
-              y.data = y.data || {}, y.data.selectedRowKeys = ne, y.data.selectedRowData = oe, E(ne), u == null || u(ne, oe, E);
+            onChange(ee, oe) {
+              y.data = y.data || {}, y.data.selectedRowKeys = ee, y.data.selectedRowData = oe, E(ee), u == null || u(ee, oe, E);
             },
-            onSelect: (ne, oe, ie, ce) => {
-              var de;
-              U && (U.field.data = ((de = U.field) == null ? void 0 : de.data) || {}, U.field.data.selectedRecord = ne, U.field.data.selected = oe);
+            onSelect: (ee, oe, le, me) => {
+              var xe;
+              U && (U.field.data = ((xe = U.field) == null ? void 0 : xe.data) || {}, U.field.data.selectedRecord = ee, U.field.data.selected = oe);
             },
-            getCheckboxProps(ne) {
+            getCheckboxProps(ee) {
               return {
                 "aria-label": "checkbox"
               };
             },
-            renderCell: (ne, oe, ie, ce) => {
+            renderCell: (ee, oe, le, me) => {
               if (!l && !c)
-                return ce;
-              const de = j == null ? void 0 : j.current, Se = (j == null ? void 0 : j.pageSize) || 20;
-              return de ? ie = ie + (de - 1) * Se + 1 : ie = ie + 1, oe.__index && (ie = extractIndex(oe.__index)), /* @__PURE__ */ jsxs(
+                return me;
+              const xe = j == null ? void 0 : j.current, Se = (j == null ? void 0 : j.pageSize) || 20;
+              return xe ? le = le + (xe - 1) * Se + 1 : le = le + 1, oe.__index && (le = extractIndex(oe.__index)), /* @__PURE__ */ jsxs(
                 "div",
                 {
                   role: "button",
-                  "aria-label": `table-index-${ie}`,
-                  className: cls(ne ? "checked" : null, rowSelectCheckboxWrapperClass$1, {
-                    [rowSelectCheckboxWrapperClassHover$1]: V
+                  "aria-label": `table-index-${le}`,
+                  className: cls(ee ? "checked" : null, rowSelectCheckboxWrapperClass$1, {
+                    [rowSelectCheckboxWrapperClassHover$1]: L
                   }),
                   children: [
-                    /* @__PURE__ */ jsxs("div", { className: cls(ne ? "checked" : null, rowSelectCheckboxContentClass$1), children: [
-                      l && /* @__PURE__ */ jsx(SortHandle$2, { id: ee(oe) }),
-                      c && /* @__PURE__ */ jsx(TableIndex$3, { index: ie })
+                    /* @__PURE__ */ jsxs("div", { className: cls(ee ? "checked" : null, rowSelectCheckboxContentClass$1), children: [
+                      l && /* @__PURE__ */ jsx(SortHandle$2, { id: Z(oe) }),
+                      c && /* @__PURE__ */ jsx(TableIndex$3, { index: le })
                     ] }),
-                    V && /* @__PURE__ */ jsx(
+                    L && /* @__PURE__ */ jsx(
                       "div",
                       {
                         className: cls(
                           "nb-origin-node",
-                          ne ? "checked" : null,
+                          ee ? "checked" : null,
                           rowSelectCheckboxCheckedClassHover$1
                         ),
-                        children: ce
+                        children: me
                       }
                     )
                   ]
                 }
               );
             }
-          }, re) : void 0
+          }, se) : void 0
         }),
         [
-          re,
+          se,
           A,
           u,
           c,
           l,
           y,
-          ee,
-          V,
-          re,
+          Z,
+          L,
+          se,
           j,
           U,
           N
         ]
-      ), ue = useCallback(
-        ({ children: ne }) => {
-          var oe, ie;
+      ), ie = useCallback(
+        ({ children: ee }) => {
+          var oe, le;
           return l ? React.createElement(
             SortableContext$1,
             {
-              items: ((ie = (oe = K.current) == null ? void 0 : oe.map) == null ? void 0 : ie.call(oe, ee)) || []
+              items: ((le = (oe = K.current) == null ? void 0 : oe.map) == null ? void 0 : le.call(oe, Z)) || []
             },
-            ne
-          ) : React.createElement(React.Fragment, {}, ne);
+            ee
+          ) : React.createElement(React.Fragment, {}, ee);
         },
-        [l, ee]
+        [l, Z]
         // Don't put 'value' in dependencies, otherwise it will cause the dropdown component to disappear immediately when adding association fields to the table
-      ), { height: le, tableSizeRefCallback: me } = useTableSize(), xe = useMemo(() => ({
+      ), { height: re, tableSizeRefCallback: de } = useTableSize(), pe = useMemo(() => ({
         x: "max-content",
-        y: le
-      }), [le, J]), Ce = useCallback(
-        (ne) => z.includes(ne[m]) ? Y : "",
+        y: re
+      }), [re, Q]), ue = useCallback(
+        (ee) => z.includes(ee[m]) ? Y : "",
         [z, Y, JSON.stringify(m)]
-      ), he = useCallback(
-        (ne, oe) => {
-          const ie = ne ? [...O, oe[F.getPrimaryKey()]] : O.filter((ce) => oe[F.getPrimaryKey()] !== ce);
-          $(ie), g == null || g(ne, oe);
+      ), ge = useCallback(
+        (ee, oe) => {
+          const le = ee ? [...O, oe[F.getPrimaryKey()]] : O.filter((me) => oe[F.getPrimaryKey()] !== me);
+          $(le), g == null || g(ee, oe);
         },
         [O, g, F]
-      ), fe = useMemo(() => ({
-        onExpand: he,
+      ), he = useMemo(() => ({
+        onExpand: ge,
         expandedRowKeys: O
-      }), [O, he]);
+      }), [O, ge]);
       return (
         // If spinning is set to undefined, it will cause the subtable to always display loading, so we need to convert it here.
         // We use Spin here instead of Table's loading prop because using Spin here reduces unnecessary re-renders.
         /* @__PURE__ */ jsx(HighPerformanceSpin, { spinning: !!f, children: /* @__PURE__ */ jsx(BlockRequestLoadingContext.Provider, { value: !1, children: /* @__PURE__ */ jsx(
           InternalNocoBaseTable$1,
           P(x(x({
-            tableHeight: le,
-            SortableWrapper: ue,
-            tableSizeRefCallback: me,
-            defaultRowKey: Q,
-            dataSource: J
-          }, S), se), {
+            tableHeight: re,
+            SortableWrapper: ie,
+            tableSizeRefCallback: de,
+            defaultRowKey: J,
+            dataSource: Q
+          }, S), ce), {
             paginationProps: j,
             components: te,
             onTableChange: d,
             onRow: X,
-            rowClassName: Ce,
-            scroll: xe,
+            rowClassName: ue,
+            scroll: pe,
             columns: R,
-            expandable: fe,
+            expandable: he,
             field: y,
             size: I
           })
@@ -10980,40 +10981,40 @@ const InternalTableBlockProvider = (e) => {
     [t, p]
   ), F = useCallback(
     (R, O, $, A) => {
-      var ee;
+      var Z;
       const {
         association: E = !1,
         cached: z = {},
-        collectionNames: L = [R],
-        maxDepth: V = 1,
+        collectionNames: V = [R],
+        maxDepth: L = 1,
         allowAllTypes: G = !1,
         exceptInterfaces: H = [],
         prefixFieldValue: U = "",
         usePrefix: K = !1,
         dataSource: Y
       } = A || {};
-      if (L.length - 1 > V)
+      if (V.length - 1 > L)
         return;
       if (z[R])
         return _.cloneDeep(z[R]);
       O && typeof O == "string" && (O = [O]), $ && typeof $ == "string" && ($ = [$]);
-      const X = b(R, Y), Q = (ee = X == null ? void 0 : X.filter(
-        (J) => J.interface && !H.includes(J.interface) && (G || O && O.includes(J.type) || $ && $.includes(J.interface) || (E && J.target && J.target !== R && Array.isArray(E) ? E.includes(J.interface) : !1))
-      )) == null ? void 0 : ee.map((J) => {
-        var te, re;
-        const Z = x({
-          value: K && U ? `${U}.${J.name}` : J.name,
-          label: f((te = J == null ? void 0 : J.uiSchema) == null ? void 0 : te.title) || J.name
-        }, J);
-        return E && J.target && (Z.children = L.includes(J.target) ? [] : F(J.target, O, $, P(x({}, A), {
+      const X = b(R, Y), J = (Z = X == null ? void 0 : X.filter(
+        (Q) => Q.interface && !H.includes(Q.interface) && (G || O && O.includes(Q.type) || $ && $.includes(Q.interface) || (E && Q.target && Q.target !== R && Array.isArray(E) ? E.includes(Q.interface) : !1))
+      )) == null ? void 0 : Z.map((Q) => {
+        var te, se;
+        const ne = x({
+          value: K && U ? `${U}.${Q.name}` : Q.name,
+          label: f((te = Q == null ? void 0 : Q.uiSchema) == null ? void 0 : te.title) || Q.name
+        }, Q);
+        return E && Q.target && (ne.children = V.includes(Q.target) ? [] : F(Q.target, O, $, P(x({}, A), {
           cached: z,
           dataSource: Y,
-          collectionNames: [...L, J.target],
-          prefixFieldValue: K ? U ? `${U}.${J.name}` : J.name : "",
+          collectionNames: [...V, Q.target],
+          prefixFieldValue: K ? U ? `${U}.${Q.name}` : Q.name : "",
           usePrefix: K
-        })), !((re = Z.children) != null && re.length)) ? null : Z;
+        })), !((se = ne.children) != null && se.length)) ? null : ne;
       }).filter(Boolean);
-      return z[R] = Q, Q;
+      return z[R] = J, J;
     },
     [b]
   ), w = useCallback(
@@ -11289,12 +11290,12 @@ const popupsContextStorage = {}, defaultPopupsContextStorage = {}, getStoredPopu
       collection: E,
       puid: z
     }) => {
-      const L = c.getFilterByTK(u || l, $);
+      const V = c.getFilterByTK(u || l, $);
       return getPopupPathFromParams({
         popupuid: O,
         puid: z,
         collection: E,
-        filterbytk: L,
+        filterbytk: V,
         sourceid: A,
         tab: R
       });
@@ -11317,17 +11318,17 @@ const popupsContextStorage = {}, defaultPopupsContextStorage = {}, getStoredPopu
     } = {}) => {
       if (!f())
         return F == null ? void 0 : F(!0);
-      const z = E || o, L = z == null ? void 0 : z["x-uid"], V = y(O);
+      const z = E || o, V = z == null ? void 0 : z["x-uid"], L = y(O);
       R = R || (a == null ? void 0 : a.data);
       const G = w({
-        popupUid: L,
+        popupUid: V,
         recordData: R,
-        sourceId: V,
+        sourceId: L,
         collection: $,
         puid: A
       });
       let H = n.pathname;
-      if (_.last(H) === "/" && (H = H.slice(0, -1)), storePopupContext(L, {
+      if (_.last(H) === "/" && (H = H.slice(0, -1)), storePopupContext(V, {
         schema: z,
         record: new CollectionRecord({ isNew: !1, data: R }),
         parentRecord: O ? new CollectionRecord({ isNew: !1, data: O }) : i,
@@ -11335,7 +11336,7 @@ const popupsContextStorage = {}, defaultPopupsContextStorage = {}, getStoredPopu
         dataSource: r,
         collection: l == null ? void 0 : l.name,
         association: u,
-        sourceId: V,
+        sourceId: L,
         tableBlockContext: P(x({}, I), { collection: l == null ? void 0 : l.name, blockData: v })
       }), b(T(), E), z.properties) {
         const U = h + 1;
@@ -14088,13 +14089,13 @@ const ParentCollectionProvider = (e) => {
   record: i
 }) => {
   var E, z;
-  const l = useApp(), c = ((E = l == null ? void 0 : l.getVariables) == null ? void 0 : E.call(l).map((L) => {
-    const { visible: V = !0, option: G } = L.useOption();
+  const l = useApp(), c = ((E = l == null ? void 0 : l.getVariables) == null ? void 0 : E.call(l).map((V) => {
+    const { visible: L = !0, option: G } = V.useOption();
     return {
-      visible: V,
+      visible: L,
       option: G
     };
-  }).filter(({ visible: L }) => L)) || [], { filterVariables: u = () => !0 } = useVariables$1() || {}, d = (z = i == null ? void 0 : i.__parent) == null ? void 0 : z.__collectionName, { currentUserSettings: p } = useCurrentUserVariable({
+  }).filter(({ visible: V }) => V)) || [], { filterVariables: u = () => !0 } = useVariables$1() || {}, d = (z = i == null ? void 0 : i.__parent) == null ? void 0 : z.__collectionName, { currentUserSettings: p } = useCurrentUserVariable({
     maxDepth: 3,
     uiSchema: n,
     collectionField: e,
@@ -14181,7 +14182,7 @@ const ParentCollectionProvider = (e) => {
     D,
     $,
     O
-  ]), ...c.map(({ option: L }) => L)];
+  ]), ...c.map(({ option: V }) => V)];
 }, VariableInput = (e) => {
   const {
     value: t,
@@ -14565,7 +14566,7 @@ const getActionContext = (e) => {
   var n;
   return ((n = e.fieldSchema) == null ? void 0 : n["x-action-context"]) || {};
 }, SchemaSettingsDefaultValue = function(t) {
-  var E, z, L;
+  var E, z, V;
   const n = useFieldSchema(), o = (E = t == null ? void 0 : t.fieldSchema) != null ? E : n, r = useField(), { dn: a } = useDesignable(), { t: i } = useTranslation(), l = useActionContext(), c = getActionContext(l).collection;
   let u;
   const { getField: d } = useCollection_deprecated(), { getCollectionJoinField: p, getCollectionFields: m, getAllCollectionsInheritChain: h } = useCollectionManager_deprecated(), g = useVariables$1(), f = useLocalVariables$1(), C = useCollection_deprecated(), b = useRecord(), { form: S, type: y } = useFormBlockContext(), { getFields: v } = useCollectionFilterOptionsV2(C), { isInSubForm: I, isInSubTable: F } = useFlag() || {}, { name: w } = C, T = useMemo(
@@ -14573,21 +14574,21 @@ const getActionContext = (e) => {
     [o, p, d]
   ), D = _.omit(o, "required");
   T != null && T.target && (u = p(
-    `${T.target}.${((L = (z = o["x-component-props"]) == null ? void 0 : z.fieldNames) == null ? void 0 : L.label) || "id"}`
+    `${T.target}.${((V = (z = o["x-component-props"]) == null ? void 0 : z.fieldNames) == null ? void 0 : V.label) || "id"}`
   ));
   const B = (T == null ? void 0 : T.interface) === "m2o" && findParentFieldSchema(o), N = B && p(B == null ? void 0 : B["x-collection-field"]), M = useTableBlockContext(), j = (T == null ? void 0 : T.interface) === "m2m" || (T == null ? void 0 : T.interface) === "mbm" || (N == null ? void 0 : N.type) === "hasMany" && (T == null ? void 0 : T.interface) === "m2o", R = useCallback(
-    (V) => {
-      const G = V.find((U) => U.value === "$nForm"), H = m(w);
-      return !(H != null && H.length) && G && (G.children = formatVariableScop(v())), V;
+    (L) => {
+      const G = L.find((U) => U.value === "$nForm"), H = m(w);
+      return !(H != null && H.length) && G && (G.children = formatVariableScop(v())), L;
     },
     [v, w]
   ), O = useMemo(() => ({
     ArrayCollapse: ArrayCollapse$2,
     FormLayout,
-    VariableInput: (V) => /* @__PURE__ */ jsx(SchemaComponentContext.Provider, { value: { designable: !1 }, children: /* @__PURE__ */ jsx(
+    VariableInput: (L) => /* @__PURE__ */ jsx(SchemaComponentContext.Provider, { value: { designable: !1 }, children: /* @__PURE__ */ jsx(
       VariableInput,
-      P(x({}, V), {
-        value: V.value || void 0,
+      P(x({}, L), {
+        value: L.value || void 0,
         hideVariableButton: t == null ? void 0 : t.hideVariableButton
       })
     ) })
@@ -14614,7 +14615,10 @@ const getActionContext = (e) => {
             getAllCollectionsInheritChain: h
           }),
           renderSchemaComponent: function(G) {
-            const H = useMemo(() => _.cloneDeep(D) || {}, []);
+            const H = useMemo(
+              () => _.cloneDeep(D.toJSON()) || {},
+              []
+            );
             H["x-read-pretty"] = !1, H["x-disabled"] = !1, _.set(H, "x-decorator-props.showTitle", !1);
             const U = getFieldDefaultValue(H, T);
             T.target && H["x-component-props"] && (H["x-component-props"].mode = "Select"), T != null && T.uiSchema.type && (H.type = T.uiSchema.type), (T == null ? void 0 : T.uiSchema["x-component"]) === "Checkbox" && (_.set(H, "x-component-props.defaultChecked", U), H.type = "void");
@@ -14657,12 +14661,12 @@ const getActionContext = (e) => {
     u,
     g
   ]), A = useCallback(
-    (V) => {
+    (L) => {
       var H, U, K;
       const G = {
         "x-uid": o["x-uid"]
       };
-      o.default = (H = V.default) != null ? H : null, isVariable$1(V.default) || (b.__isNewRecord__ || y === "create") && ((U = r.setInitialValue) == null || U.call(r, V.default)), G.default = (K = V.default) != null ? K : null, a.emit("patch", {
+      o.default = (H = L.default) != null ? H : null, isVariable$1(L.default) || (b.__isNewRecord__ || y === "create") && ((U = r.setInitialValue) == null || U.call(r, L.default)), G.default = (K = L.default) != null ? K : null, a.emit("patch", {
         schema: G,
         currentSchema: n
       });
@@ -14677,14 +14681,14 @@ const getActionContext = (e) => {
       width: 800,
       schema: $,
       onSubmit: A,
-      ModalContextProvider: (V) => /* @__PURE__ */ jsx(
+      ModalContextProvider: (L) => /* @__PURE__ */ jsx(
         FlagProvider,
         {
           isInSubForm: I,
           isInSubTable: F,
           isInSetDefaultValueDialog: !0,
           collectionField: T,
-          children: V.children
+          children: L.children
         }
       )
     }
@@ -15546,7 +15550,7 @@ const useGetFilterOptions = () => {
     };
   });
 }, TableColumnDesigner$1 = (e) => {
-  var N, M, j, R, O, $, A, E, z, L, V, G;
+  var N, M, j, R, O, $, A, E, z, V, L, G;
   const { uiSchema: t, fieldSchema: n, collectionField: o } = e, { form: r } = useFormBlockContext(), { getInterface: a, getCollection: i } = useCollectionManager_deprecated(), l = useField(), { t: c } = useTranslation(), u = useFieldSchema(), { dn: d } = useDesignable(), p = ((N = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : N.fieldNames) || ((M = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : M.fieldNames), m = useLabelFields$1((j = o == null ? void 0 : o.target) != null ? j : o == null ? void 0 : o.targetCollection), h = useColorFields((R = o == null ? void 0 : o.target) != null ? R : o == null ? void 0 : o.targetCollection), g = a(o == null ? void 0 : o.interface), f = i(o == null ? void 0 : o.target), C = isFileCollection$2(f), b = ["QuickEdit", "FormItem"].includes(n["x-decorator"]), { currentMode: S } = useAssociationFieldContext(), { isAllowToSetDefaultValue: y } = useIsAllowToSetDefaultValue({ collectionField: o, fieldSchema: n }), v = ["datetime", "createdAt", "updatedAt"].includes(o == null ? void 0 : o.interface), I = ["obo", "oho", "o2o", "o2m", "m2m", "m2o", "snapshot"].includes(
     o == null ? void 0 : o.interface
   ), F = useFieldModeOptions({ fieldSchema: n }), w = ((O = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : O.mode) || "Select";
@@ -15615,7 +15619,7 @@ const useGetFilterOptions = () => {
           title: c("Column width"),
           properties: {
             width: {
-              default: ((L = u == null ? void 0 : u["x-component-props"]) == null ? void 0 : L.width) || 100,
+              default: ((V = u == null ? void 0 : u["x-component-props"]) == null ? void 0 : V.width) || 100,
               "x-decorator": "FormItem",
               "x-component": "InputNumber",
               "x-component-props": {}
@@ -15658,7 +15662,7 @@ const useGetFilterOptions = () => {
       SchemaSettingsSwitchItem,
       {
         title: c("Enable link"),
-        checked: ((V = n["x-component-props"]) == null ? void 0 : V.enableLink) !== !1,
+        checked: ((L = n["x-component-props"]) == null ? void 0 : L.enableLink) !== !1,
         onChange: (H) => {
           n["x-component-props"] = P(x({}, n == null ? void 0 : n["x-component-props"]), {
             enableLink: H
@@ -15680,14 +15684,14 @@ const useGetFilterOptions = () => {
         options: m,
         value: p == null ? void 0 : p.label,
         onChange: (H) => {
-          var Y, X, Q, ee, J;
-          const U = P(x(x({}, (X = (Y = o == null ? void 0 : o.uiSchema) == null ? void 0 : Y["x-component-props"]) == null ? void 0 : X.fieldNames), (Q = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : Q.fieldNames), {
+          var Y, X, J, Z, Q;
+          const U = P(x(x({}, (X = (Y = o == null ? void 0 : o.uiSchema) == null ? void 0 : Y["x-component-props"]) == null ? void 0 : X.fieldNames), (J = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : J.fieldNames), {
             label: H
           });
           _.set(n, "x-component-props.fieldNames", U);
-          const K = (J = l.path) == null ? void 0 : J.splice(((ee = l.path) == null ? void 0 : ee.length) - 1, 1);
-          l.form.query(`${K.concat("*." + n.name)}`).forEach((Z) => {
-            Z.componentProps.fieldNames = U;
+          const K = (Q = l.path) == null ? void 0 : Q.splice(((Z = l.path) == null ? void 0 : Z.length) - 1, 1);
+          l.form.query(`${K.concat("*." + n.name)}`).forEach((ne) => {
+            ne.componentProps.fieldNames = U;
           }), d.emit("patch", {
             schema: {
               "x-uid": n["x-uid"],
@@ -15747,8 +15751,8 @@ const useGetFilterOptions = () => {
           };
           n.required = H, U.required = H;
           const K = (X = l.path) == null ? void 0 : X.splice(((Y = l.path) == null ? void 0 : Y.length) - 1, 1);
-          l.form.query(`${K.concat("*." + n.name)}`).forEach((Q) => {
-            Q.required = H;
+          l.form.query(`${K.concat("*." + n.name)}`).forEach((J) => {
+            J.required = H;
           }), d.emit("patch", {
             schema: U
           }), d.refresh();
@@ -15773,20 +15777,20 @@ const useGetFilterOptions = () => {
           }, K = (X = l.path) == null ? void 0 : X.splice(((Y = l.path) == null ? void 0 : Y.length) - 1, 1);
           switch (H) {
             case "readonly": {
-              n["x-read-pretty"] = !1, n["x-disabled"] = !0, U["x-read-pretty"] = !1, U["x-disabled"] = !0, l.form.query(`${K.concat("*." + n.name)}`).forEach((Q) => {
-                Q.readonly = !0, Q.disabled = !0;
+              n["x-read-pretty"] = !1, n["x-disabled"] = !0, U["x-read-pretty"] = !1, U["x-disabled"] = !0, l.form.query(`${K.concat("*." + n.name)}`).forEach((J) => {
+                J.readonly = !0, J.disabled = !0;
               });
               break;
             }
             case "read-pretty": {
-              n["x-read-pretty"] = !0, n["x-disabled"] = !1, U["x-read-pretty"] = !0, U["x-disabled"] = !1, l.form.query(`${K.concat("*." + n.name)}`).forEach((Q) => {
-                Q.readPretty = !0;
+              n["x-read-pretty"] = !0, n["x-disabled"] = !1, U["x-read-pretty"] = !0, U["x-disabled"] = !1, l.form.query(`${K.concat("*." + n.name)}`).forEach((J) => {
+                J.readPretty = !0;
               });
               break;
             }
             default: {
-              n["x-read-pretty"] = !1, n["x-disabled"] = !1, U["x-read-pretty"] = !1, U["x-disabled"] = !1, l.form.query(`${K.concat("*." + n.name)}`).forEach((Q) => {
-                Q.readPretty = !1, Q.disabled + !1;
+              n["x-read-pretty"] = !1, n["x-disabled"] = !1, U["x-read-pretty"] = !1, U["x-disabled"] = !1, l.form.query(`${K.concat("*." + n.name)}`).forEach((J) => {
+                J.readPretty = !1, J.disabled + !1;
               });
               break;
             }
@@ -18216,16 +18220,16 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
     return {
       insertPosition: "afterEnd",
       wrap: ((X = A == null ? void 0 : A.cols) == null ? void 0 : X.length) === 1 ? gridRowColWrap : void 0,
-      Component: (Q) => /* @__PURE__ */ jsx(
+      Component: (J) => /* @__PURE__ */ jsx(
         PlusOutlined,
-        P(x({}, Q), {
+        P(x({}, J), {
           role: "button",
           "aria-label": v("schema-initializer"),
           style: { cursor: "pointer", fontSize: 14 }
         })
       )
     };
-  }, [v, (Y = A == null ? void 0 : A.cols) == null ? void 0 : Y.length]), L = useMemo(() => u === !1 || C === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": v("drag-handler") }) }), [u, v, C]), V = useMemo(() => {
+  }, [v, (Y = A == null ? void 0 : A.cols) == null ? void 0 : Y.length]), V = useMemo(() => u === !1 || C === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": v("drag-handler") }) }), [u, v, C]), L = useMemo(() => {
     var X;
     if (o === !1)
       return null;
@@ -18236,22 +18240,22 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
   }, [E, o, z, $, O]), G = useMemo(() => r !== !1 && R ? j() : null, [R, j, r]), H = useRef(null), U = "hidden";
   useEffect(() => {
     const X = H.current;
-    let Q = X == null ? void 0 : X.parentElement;
-    for (; Q && Q.clientHeight === 0; )
-      Q = Q.parentElement;
-    const ee = g || Q;
-    if (!ee)
+    let J = X == null ? void 0 : X.parentElement;
+    for (; J && J.clientHeight === 0; )
+      J = J.parentElement;
+    const Z = g || J;
+    if (!Z)
       return;
-    function J() {
+    function Q() {
       var te;
       X && (X.classList.remove(U), (te = e.onVisibleChange) == null || te.call(e, !0));
     }
-    function Z() {
+    function ne() {
       var te;
       X && (X.classList.add(U), (te = e.onVisibleChange) == null || te.call(e, !1));
     }
-    return ee.addEventListener("mouseenter", J), ee.addEventListener("mouseleave", Z), () => {
-      ee.removeEventListener("mouseenter", J), ee.removeEventListener("mouseleave", Z);
+    return Z.addEventListener("mouseenter", Q), Z.addEventListener("mouseleave", ne), () => {
+      Z.removeEventListener("mouseenter", Q), Z.removeEventListener("mouseleave", ne);
     };
   }, [e.onVisibleChange, g]);
   const K = useMemo(
@@ -18273,8 +18277,8 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
           M[1] && /* @__PURE__ */ jsx("span", { className: "toolbar-title-tag", children: `${B.current}: ${`${M[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: [
-          L,
-          /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: N, children: V }),
+          V,
+          /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: N, children: L }),
           G
         ] }) })
       ]
@@ -19006,7 +19010,7 @@ const useTableBlockProps = () => {
         const T = w.find((D) => D.uid === t.parent["x-uid"]);
         w.forEach((D) => {
           var $, A, E, z;
-          const B = I.find((L) => L.uid === D.uid);
+          const B = I.find((V) => V.uid === D.uid);
           if (!B)
             return;
           const N = getSourceKey(T, B.field) || a.rowKey || "id", M = [S[N]], j = (($ = D.service.params) == null ? void 0 : $[0]) || {}, R = ((E = (A = D.service.params) == null ? void 0 : A[1]) == null ? void 0 : E.filters) || {};
@@ -19025,7 +19029,7 @@ const useTableBlockProps = () => {
               ]
             };
           const O = mergeFilter([
-            ...Object.values(R).map((L) => removeNullCondition(L)),
+            ...Object.values(R).map((V) => removeNullCondition(V)),
             D.defaultFilter
           ]);
           return D.doFilter(
@@ -19390,8 +19394,8 @@ const useTableSelectorParams = () => useContext(TableSelectorParamsContext), Tab
   return useEffect(() => {
     var w, T, D, B, N, M, j, R, O, $, A, E, z;
     if (!((w = t == null ? void 0 : t.service) != null && w.loading)) {
-      const L = (D = (T = t == null ? void 0 : t.service) == null ? void 0 : T.data) == null ? void 0 : D.data.map((V) => V);
-      e.value = L, (B = e == null ? void 0 : e.setInitialValue) == null || B.call(e, L), e.data = e.data || {}, e.data.selectedRowKeys = [], e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (j = (M = (N = t == null ? void 0 : t.service) == null ? void 0 : N.data) == null ? void 0 : M.meta) == null ? void 0 : j.pageSize, e.componentProps.pagination.total = ($ = (O = (R = t == null ? void 0 : t.service) == null ? void 0 : R.data) == null ? void 0 : O.meta) == null ? void 0 : $.count, e.componentProps.pagination.current = (z = (E = (A = t == null ? void 0 : t.service) == null ? void 0 : A.data) == null ? void 0 : E.meta) == null ? void 0 : z.page;
+      const V = (D = (T = t == null ? void 0 : t.service) == null ? void 0 : T.data) == null ? void 0 : D.data.map((L) => L);
+      e.value = V, (B = e == null ? void 0 : e.setInitialValue) == null || B.call(e, V), e.data = e.data || {}, e.data.selectedRowKeys = [], e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (j = (M = (N = t == null ? void 0 : t.service) == null ? void 0 : N.data) == null ? void 0 : M.meta) == null ? void 0 : j.pageSize, e.componentProps.pagination.total = ($ = (O = (R = t == null ? void 0 : t.service) == null ? void 0 : R.data) == null ? void 0 : O.meta) == null ? void 0 : $.count, e.componentProps.pagination.current = (z = (E = (A = t == null ? void 0 : t.service) == null ? void 0 : A.data) == null ? void 0 : E.meta) == null ? void 0 : z.page;
     }
   }, [
     a == null ? void 0 : a.foreignKey,
@@ -22184,7 +22188,7 @@ const SchemaSettingsModalItem = (e) => {
     "noRecord",
     "ModalContextProvider",
     "dialogRootClassName"
-  ]), g = useContext(SchemaOptionsContext), f = useCollection(), C = useAPIClient(), b = useApp(), { theme: S } = useGlobalTheme(), y = useBlockRequestContext(), v = useFormActiveFields(), { locale: I } = useContext(ConfigProvider.ConfigContext), F = useDataSourceManager(), w = useDataSourceKey(), T = useCollectionRecord(), { association: D } = useDataBlockProps() || {}, B = useCurrentRecord(), N = useFormBlockContext(), M = useBlockContext(), { getOperators: j } = useOperators(), R = useLocationSearch(), O = useVariables$1(), $ = useContext(AllDataBlocksContext), A = useContext(SchemaComponentContext), E = useContext(VariableScopeContext$1), { formValue: z, collection: L, parent: V } = useSubFormValue(), G = useCurrentPopupRecord(), H = useParentPopupRecord();
+  ]), g = useContext(SchemaOptionsContext), f = useCollection(), C = useAPIClient(), b = useApp(), { theme: S } = useGlobalTheme(), y = useBlockRequestContext(), v = useFormActiveFields(), { locale: I } = useContext(ConfigProvider.ConfigContext), F = useDataSourceManager(), w = useDataSourceKey(), T = useCollectionRecord(), { association: D } = useDataBlockProps() || {}, B = useCurrentRecord(), N = useFormBlockContext(), M = useBlockContext(), { getOperators: j } = useOperators(), R = useLocationSearch(), O = useVariables$1(), $ = useContext(AllDataBlocksContext), A = useContext(SchemaComponentContext), E = useContext(VariableScopeContext$1), { formValue: z, collection: V, parent: L } = useSubFormValue(), G = useCurrentPopupRecord(), H = useParentPopupRecord();
   return t ? null : /* @__PURE__ */ jsx(
     SchemaSettingsItem,
     P(x({
@@ -22206,7 +22210,7 @@ const SchemaSettingsModalItem = (e) => {
               children: /* @__PURE__ */ jsx(CollectionRecordProvider, { record: d ? null : T, children: /* @__PURE__ */ jsx(CurrentRecordContextProvider, P(x({}, B), { children: /* @__PURE__ */ jsx(FormBlockContext$1.Provider, { value: N, children: /* @__PURE__ */ jsx(
                 SubFormProvider,
                 {
-                  value: { value: z, collection: L, parent: V },
+                  value: { value: z, collection: V, parent: L },
                   children: /* @__PURE__ */ jsx(
                     FormActiveFieldsProvider,
                     {
@@ -22406,11 +22410,11 @@ const SchemaSettingsModalItem = (e) => {
     [n, c, u, y, g, f, p, h, T, r]
   ), M = useMemo(() => ({ ArrayCollapse: ArrayCollapse$2, FormLayout }), []), j = useCallback(
     (O) => {
-      var L;
+      var V;
       const $ = [];
-      for (const V of O.fieldReaction.rules)
-        $.push(_.omit(_.pickBy(V, _.identity), ["conditionBasic", "conditionAdvanced"]));
-      const A = y["x-component"] === "BlockTemplate" && ((L = y["x-component-props"]) == null ? void 0 : L.templateId), z = {
+      for (const L of O.fieldReaction.rules)
+        $.push(_.omit(_.pickBy(L, _.identity), ["conditionBasic", "conditionAdvanced"]));
+      const A = y["x-component"] === "BlockTemplate" && ((V = y["x-component-props"]) == null ? void 0 : V.templateId), z = {
         "x-uid": b !== LinkageRuleCategory.block ? A && m(A).uid || y["x-uid"] : c["x-uid"]
       };
       y[w] = $, z[w] = $, c[w] = $, d.emit("patch", {
@@ -22887,7 +22891,7 @@ const getContentWidth = (e) => {
       onOpenChange: (g) => {
         i(o && g);
       },
-      content: /* @__PURE__ */ jsx("div", { style: popoverStyle$1, children: e.popoverContent || e.children }),
+      content: /* @__PURE__ */ jsx("div", { style: x(x({}, popoverStyle$1), (e == null ? void 0 : e.style) || {}), children: e.popoverContent || e.children }),
       children: d
     }
   );
@@ -23527,8 +23531,8 @@ function getTypedConstantOption(e, t, n) {
   };
 }
 function Input$1(e) {
-  var X, Q, ee;
-  const Y = e, {
+  var ne, te, se, ce;
+  const Q = e, {
     value: t = "",
     onChange: n,
     children: o,
@@ -23542,7 +23546,7 @@ function Input$1(e) {
     parseOptions: p,
     hideVariableButton: m,
     constantAbel: h = !0
-  } = Y, g = W(Y, [
+  } = Q, g = W(Q, [
     "value",
     "onChange",
     "children",
@@ -23560,101 +23564,104 @@ function Input$1(e) {
   useAntdInputStyle(`${y}-input`);
   const v = useCompile(), { t: I } = useTranslation(), F = useForm(), [w, T] = React.useState([]), [D, B] = React.useState([]), [N, M] = React.useState(
     m || !!(o && t != null)
-  ), j = useMemo(() => parseValue(t, p), [p, t]), R = typeof j == "string", O = R ? j : "", $ = R ? null : j, A = Object.assign(
+  ), [j, R] = React.useState(null), O = useMemo(() => parseValue(t, p), [p, t]), $ = typeof O == "string", A = $ ? O : "", E = $ ? null : O, z = Object.assign(
     {
       label: "label",
       value: "value",
       children: "children"
     },
     d != null ? d : {}
-  ), E = useMemo(() => h ? o ? {
+  ), V = useMemo(() => h ? o ? {
     value: "$",
     label: I("Constant"),
-    [A.value]: "$",
-    [A.label]: I("Constant")
-  } : a ? getTypedConstantOption(O, a, A) : null : null, [O, a]), z = (X = E == null ? void 0 : E.component) != null ? X : NullComponent, L = Array.isArray(a) ? (ee = (Q = a.find((J) => Array.isArray(J) && J[0] === O)) == null ? void 0 : Q[1]) != null ? ee : {} : {};
-  let V;
-  t == null ? i ? o && N ? V = ["$"] : V = [""] : o ? V = ["$"] : V = [" ", O] : V = o ? ["$"] : [" ", O], m && (V = ["$"]), useEffect(() => {
-    const re = E != null ? E : {}, { component: J } = re, Z = W(re, ["component"]), te = [
+    [z.value]: "$",
+    [z.label]: I("Constant")
+  } : a ? getTypedConstantOption(A, a, z) : null : null, [A, a]), L = (ne = V == null ? void 0 : V.component) != null ? ne : NullComponent, G = Array.isArray(a) ? (se = (te = a.find((ie) => Array.isArray(ie) && ie[0] === A)) == null ? void 0 : te[1]) != null ? se : {} : {};
+  let H;
+  t == null ? i ? o && N ? H = ["$"] : H = [""] : o ? H = ["$"] : H = [" ", A] : H = o ? ["$"] : [" ", A], m && (H = ["$"]), useEffect(() => {
+    const pe = V != null ? V : {}, { component: ie } = pe, re = W(pe, ["component"]), de = [
       ...i ? [
         {
           value: "",
           label: I("Null"),
-          [A.value]: "",
-          [A.label]: I("Null")
+          [z.value]: "",
+          [z.label]: I("Null")
         }
       ] : [],
-      ...E ? [v(Z)] : [],
+      ...V ? [v(re)] : [],
       ...f ? [...f] : []
-    ].filter((se) => !se.deprecated || ($ == null ? void 0 : $[0]) === se[A.value]);
-    T(te);
-  }, [f, $, E, i]);
-  const G = (J) => q(this, null, function* () {
-    var te;
-    const Z = J[J.length - 1];
-    if (!((te = Z.children) != null && te.length) && !Z.isLeaf && Z.loadChildren) {
-      let re;
-      if ($ && $.length >= 2) {
-        for (const se of $)
-          if (se === Z[A.value]) {
-            re = se;
+    ].filter((ue) => !ue.deprecated || (E == null ? void 0 : E[0]) === ue[z.value]);
+    T(de);
+  }, [f, E, V, i]);
+  const U = (ie) => q(this, null, function* () {
+    var de;
+    const re = ie[ie.length - 1];
+    if (!((de = re.children) != null && de.length) && !re.isLeaf && re.loadChildren) {
+      ie.length && R(ie.map((ue) => ue == null ? void 0 : ue[z.value]));
+      let pe;
+      if (E && E.length >= 2) {
+        for (const ue of E)
+          if (ue === re[z.value]) {
+            pe = ue;
             break;
           }
       }
-      yield Z.loadChildren(Z, re, $), T((se) => [...se]);
+      yield re.loadChildren(re, pe, E), T((ue) => [...ue]);
     }
-  }), H = useCallback(
-    (J, Z) => {
-      var te, re, se;
-      if (J[0] === "$") {
-        M(!0), $ && n(null, Z);
+  }), K = useCallback(
+    (ie, re) => {
+      var de, pe, ue;
+      if (R(null), ie[0] === "$") {
+        M(!0), E && n(null, re);
         return;
       } else
         M(!1);
-      if (J[0] === "") {
+      if (ie[0] === "") {
         n(null);
         return;
       }
-      if (J[0] === " ") {
-        J[1] ? J[1] !== O && n((se = (re = (te = ConstantTypes[J[1]]) == null ? void 0 : te.default) == null ? void 0 : re.call(te)) != null ? se : null, Z) : $ && n(null, Z);
+      if (ie[0] === " ") {
+        ie[1] ? ie[1] !== A && n((ue = (pe = (de = ConstantTypes[ie[1]]) == null ? void 0 : de.default) == null ? void 0 : pe.call(de)) != null ? ue : null, re) : E && n(null, re);
         return;
       }
-      n(`{{${J.join(".")}}}`, Z);
+      n(`{{${ie.join(".")}}}`, re);
     },
-    [O, $, n]
-  ), U = useCallback(() => {
-    var J;
-    if (M(!!o), (J = E == null ? void 0 : E.children) != null && J.length) {
-      const Z = E.children[0].default();
-      return n(Z);
+    [A, E, n]
+  ), Y = useCallback(() => {
+    var ie;
+    if (M(!!o), (ie = V == null ? void 0 : V.children) != null && ie.length) {
+      const re = V.children[0].default();
+      return n(re);
     }
-    n(null);
-  }, [E]);
+    n(null), R(null);
+  }, [V]), X = useCallback((ie) => {
+    ie || R(null);
+  }, []);
   useEffect(() => {
     q(this, null, function* () {
-      var re;
-      if (!$ || w.length <= 1)
+      var pe;
+      if (!E || w.length <= 1)
         return;
-      let Z = null;
-      const te = [];
-      for (let se = 0; se < $.length; se++) {
-        const ue = $[se];
+      let re = null;
+      const de = [];
+      for (let ue = 0; ue < E.length; ue++) {
+        const ge = E[ue];
         try {
-          if (se === 0 ? Z = w.find((le) => le[A.value] === ue) : (Z.loadChildren && !((re = Z.children) != null && re.length) && (yield Z.loadChildren(Z, ue, $)), Z = Z.children.find((le) => le[A.value] === ue)), !Z)
+          if (ue === 0 ? re = w.find((he) => he[z.value] === ge) : (re.loadChildren && !((pe = re.children) != null && pe.length) && (yield re.loadChildren(re, ge, E)), re = re.children.find((he) => he[z.value] === ge)), !re)
             return;
-          te.push(Z[A.label]);
-        } catch (le) {
-          error(le);
+          de.push(re[z.label]);
+        } catch (he) {
+          error(he);
         }
       }
-      T([...w]), B([...te]);
+      T([...w]), B([...de]);
     });
-  }, [$, w.length]);
-  const K = e.disabled || F.disabled;
+  }, [E, w.length]);
+  const J = e.disabled || F.disabled, Z = (ce = E != null ? E : j) != null ? ce : H;
   return C(
     /* @__PURE__ */ jsxs(Fragment$1, { children: [
       /* @__PURE__ */ jsxs(Space$1.Compact, { style: l, className: cls(S, b, c), children: [
-        $ ? /* @__PURE__ */ jsxs(
+        E ? /* @__PURE__ */ jsxs(
           "div",
           {
             className: cx(
@@ -23672,7 +23679,7 @@ function Input$1(e) {
                 .ant-input {
                   overflow: auto;
                   white-space: nowrap;
-                  ${K ? "" : "padding-right: 28px;"}
+                  ${J ? "" : "padding-right: 28px;"}
 
                   .ant-tag {
                     display: inline;
@@ -23691,32 +23698,32 @@ function Input$1(e) {
                   role: "button",
                   "aria-label": "variable-tag",
                   style: { overflow: "hidden" },
-                  className: cx("ant-input ant-input-outlined", { "ant-input-disabled": K }, b),
-                  children: /* @__PURE__ */ jsx(Tag, { color: "blue", children: D.map((J, Z) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
-                    Z ? " / " : "",
-                    J
-                  ] }, J)) })
+                  className: cx("ant-input ant-input-outlined", { "ant-input-disabled": J }, b),
+                  children: /* @__PURE__ */ jsx(Tag, { color: "blue", children: D.map((ie, re) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
+                    re ? " / " : "",
+                    ie
+                  ] }, ie)) })
                 }
               ),
-              K ? null : /* @__PURE__ */ jsx(
+              J ? null : /* @__PURE__ */ jsx(
                 "span",
                 {
                   role: "button",
                   "aria-label": "icon-close",
                   className: cx("clear-button"),
                   unselectable: "on",
-                  onClick: U,
+                  onClick: Y,
                   children: /* @__PURE__ */ jsx(CloseCircleFilled, {})
                 }
               )
             ]
           }
-        ) : /* @__PURE__ */ jsx("div", { style: { flex: 1 }, children: o && (N || !i) ? o : z ? /* @__PURE__ */ jsx(
-          z,
+        ) : /* @__PURE__ */ jsx("div", { style: { flex: 1 }, children: o && (N || !i) ? o : L ? /* @__PURE__ */ jsx(
+          L,
           P(x({
             role: "button",
             "aria-label": "variable-constant"
-          }, L), {
+          }, G), {
             value: t,
             onChange: n
           })
@@ -23725,20 +23732,21 @@ function Input$1(e) {
           Cascader$1,
           {
             options: w,
-            value: $ != null ? $ : V,
-            onChange: H,
-            loadData: G,
+            value: Z,
+            onChange: K,
+            loadData: U,
             changeOnSelect: u != null ? u : !0,
             fieldNames: d,
-            disabled: K,
+            disabled: J,
+            onDropdownVisibleChange: X,
             children: r != null ? r : /* @__PURE__ */ jsx(
               XButton,
               {
                 className: css(`
               margin-left: -1px;
             `),
-                type: $ ? "primary" : "default",
-                disabled: K
+                type: E ? "primary" : "default",
+                disabled: J
               }
             )
           }
@@ -24023,23 +24031,23 @@ function TextArea(e) {
   ), [S, y] = useState(!1), [v, I] = useState(!1), [F, w] = useState(() => renderHTML(p != null ? p : "", b, c)), [T, D] = useState([-1, 0, -1, 0]);
   useAntdInputStyle("ant-input");
   const { token: B } = theme.useToken(), N = c.join(" "), M = useCallback(
-    (V) => {
+    (L) => {
       var H;
-      const G = getValue(V, c);
+      const G = getValue(L, c);
       (H = e.onChange) == null || H.call(e, d ? G.trim() : G);
     },
     [N, e.onChange, d]
   );
   useEffect(() => {
-    preloadOptions(r, m).then((V) => {
-      f(V);
+    preloadOptions(r, m).then((L) => {
+      f(L);
     }).catch(console.error);
   }, [r, JSON.stringify(m)]), useEffect(() => {
     w(renderHTML(p != null ? p : "", b, c)), v || D([-1, 0, -1, 0]);
   }, [p, b, N]), useEffect(() => {
     var H;
-    const { current: V } = h;
-    if (!V)
+    const { current: L } = h;
+    if (!L)
       return;
     const G = new Range();
     if (v) {
@@ -24048,22 +24056,22 @@ function TextArea(e) {
       const U = (H = window.getSelection) == null ? void 0 : H.call(window);
       if (U)
         try {
-          const K = Array.from(V.childNodes);
+          const K = Array.from(L.childNodes);
           K.length && (T[0] === -1 ? T[1] && G.setStartAfter(K[T[1] - 1]) : G.setStart(K[T[0]], T[1]), T[2] === -1 ? T[3] && G.setEndAfter(K[T[3] - 1]) : G.setEnd(K[T[2]], T[3])), G.collapse(!0), U.removeAllRanges(), U.addRange(G);
         } catch (K) {
         }
     } else {
-      const { lastChild: U } = V;
+      const { lastChild: U } = L;
       if (U) {
         G.setStartAfter(U), G.setEndAfter(U);
-        const K = Array.from(V.childNodes), Y = G.startContainer === V ? -1 : K.indexOf(U), X = G.startContainer === V ? -1 : K.indexOf(U);
+        const K = Array.from(L.childNodes), Y = G.startContainer === L ? -1 : K.indexOf(U), X = G.startContainer === L ? -1 : K.indexOf(U);
         D([Y, G.startOffset, X, G.endOffset]);
       }
     }
   }, [F]);
   const j = useCallback(
-    function(V) {
-      const G = V.filter((K) => !!K.trim()), { current: H } = h;
+    function(L) {
+      const G = L.filter((K) => !!K.trim()), { current: H } = h;
       if (!H || !G)
         return;
       H.focus();
@@ -24074,25 +24082,25 @@ function TextArea(e) {
     },
     [b, M, T]
   ), R = useCallback(
-    function({ currentTarget: V }) {
-      S || (I(!0), D(getCurrentRange(V)), M(V));
+    function({ currentTarget: L }) {
+      S || (I(!0), D(getCurrentRange(L)), M(L));
     },
     [S, M]
-  ), O = useCallback(function({ currentTarget: V }) {
-    D(getCurrentRange(V));
-  }, []), $ = useCallback(function(V) {
-    V.key === "Enter" && V.preventDefault();
+  ), O = useCallback(function({ currentTarget: L }) {
+    D(getCurrentRange(L));
+  }, []), $ = useCallback(function(L) {
+    L.key === "Enter" && L.preventDefault();
   }, []), A = useCallback(function() {
     y(!0);
   }, []), E = useCallback(
-    ({ currentTarget: V }) => {
-      y(!1), I(!0), D(getCurrentRange(V)), M(V);
+    ({ currentTarget: L }) => {
+      y(!1), I(!0), D(getCurrentRange(L)), M(L);
     },
     [M]
   ), z = useCallback(
-    function(V) {
-      V.preventDefault();
-      const G = V.clipboardData.getData("text/html") || V.clipboardData.getData("text"), H = sanitizeHTML(G, {
+    function(L) {
+      L.preventDefault();
+      const G = L.clipboardData.getData("text/html") || L.clipboardData.getData("text"), H = sanitizeHTML(G, {
         allowedTags: ["span"],
         allowedAttributes: {
           span: ["data-variable", "contenteditable"]
@@ -24109,10 +24117,10 @@ function TextArea(e) {
           }
         }
       }).replace(/\n/g, " ");
-      I(!0), pasteHTML(V.currentTarget, H), D(getCurrentRange(V.currentTarget)), M(V.currentTarget);
+      I(!0), pasteHTML(L.currentTarget, H), D(getCurrentRange(L.currentTarget)), M(L.currentTarget);
     },
     [M]
-  ), L = e.disabled || C.disabled;
+  ), V = e.disabled || C.disabled;
   return t(
     /* @__PURE__ */ jsxs(Fragment$1, { children: [
       /* @__PURE__ */ jsxs(
@@ -24172,7 +24180,7 @@ function TextArea(e) {
                 className: cx(
                   n,
                   "ant-input ant-input-outlined",
-                  { "ant-input-disabled": L },
+                  { "ant-input-disabled": V },
                   // NOTE: `pre-wrap` here for avoid the `&nbsp;` (\x160) issue when paste content, we need normal space (\x32).
                   css`
               min-height: ${B.controlHeight}px;
@@ -24194,7 +24202,7 @@ function TextArea(e) {
             `
                 ),
                 ref: h,
-                contentEditable: !L,
+                contentEditable: !V,
                 dangerouslySetInnerHTML: { __html: F }
               }
             ),
@@ -24206,7 +24214,7 @@ function TextArea(e) {
                 onInsert: j,
                 changeOnSelect: a,
                 fieldNames: l || defaultFieldNames$2,
-                disabled: L
+                disabled: V
               }
             )
           ]
@@ -27173,23 +27181,23 @@ https://requirejs.org/docs/errors.html#` + e);
         }
     }
     function b(A, E, z) {
-      var L, V, G, H, U, K, Y, X, Q, ee, J, Z, te = E && E.split("/"), re = i.map, se = re && re["*"];
-      if (A && (A = A.split("/"), Y = A.length - 1, i.nodeIdCompat && jsSuffixRegExp.test(A[Y]) && (A[Y] = A[Y].replace(jsSuffixRegExp, "")), A[0].charAt(0) === "." && te && (Z = te.slice(0, te.length - 1), A = Z.concat(A)), C(A), A = A.join("/")), z && re && (te || se)) {
+      var V, L, G, H, U, K, Y, X, J, Z, Q, ne, te = E && E.split("/"), se = i.map, ce = se && se["*"];
+      if (A && (A = A.split("/"), Y = A.length - 1, i.nodeIdCompat && jsSuffixRegExp.test(A[Y]) && (A[Y] = A[Y].replace(jsSuffixRegExp, "")), A[0].charAt(0) === "." && te && (ne = te.slice(0, te.length - 1), A = ne.concat(A)), C(A), A = A.join("/")), z && se && (te || ce)) {
         G = A.split("/");
         e:
           for (H = G.length; H > 0; H -= 1) {
             if (K = G.slice(0, H).join("/"), te) {
               for (U = te.length; U > 0; U -= 1)
-                if (V = getOwn(re, te.slice(0, U).join("/")), V && (V = getOwn(V, K), V)) {
-                  X = V, Q = H;
+                if (L = getOwn(se, te.slice(0, U).join("/")), L && (L = getOwn(L, K), L)) {
+                  X = L, J = H;
                   break e;
                 }
             }
-            !ee && se && getOwn(se, K) && (ee = getOwn(se, K), J = H);
+            !Z && ce && getOwn(ce, K) && (Z = getOwn(ce, K), Q = H);
           }
-        !X && ee && (X = ee, Q = J), X && (G.splice(0, Q, X), A = G.join("/"));
+        !X && Z && (X = Z, J = Q), X && (G.splice(0, J, X), A = G.join("/"));
       }
-      return L = getOwn(i.pkgs, A), L || A;
+      return V = getOwn(i.pkgs, A), V || A;
     }
     function S(A) {
       isBrowser && each(scripts(), function(E) {
@@ -27208,19 +27216,19 @@ https://requirejs.org/docs/errors.html#` + e);
       var E, z = A ? A.indexOf("!") : -1;
       return z > -1 && (E = A.substring(0, z), A = A.substring(z + 1, A.length)), [E, A];
     }
-    function I(A, E, z, L) {
-      var V, G, H, U, K = null, Y = E ? E.name : null, X = A, Q = !0, ee = "";
-      return A || (Q = !1, A = "_@r" + (g += 1)), U = v(A), K = U[0], A = U[1], K && (K = b(K, Y, L), G = getOwn(p, K)), A && (K ? z ? ee = A : G && G.normalize ? ee = G.normalize(A, function(J) {
-        return b(J, Y, L);
-      }) : ee = A.indexOf("!") === -1 ? b(A, Y, L) : A : (ee = b(A, Y, L), U = v(ee), K = U[0], ee = U[1], z = !0, V = o.nameToUrl(ee))), H = K && !G && !z ? "_unnormalized" + (f += 1) : "", {
+    function I(A, E, z, V) {
+      var L, G, H, U, K = null, Y = E ? E.name : null, X = A, J = !0, Z = "";
+      return A || (J = !1, A = "_@r" + (g += 1)), U = v(A), K = U[0], A = U[1], K && (K = b(K, Y, V), G = getOwn(p, K)), A && (K ? z ? Z = A : G && G.normalize ? Z = G.normalize(A, function(Q) {
+        return b(Q, Y, V);
+      }) : Z = A.indexOf("!") === -1 ? b(A, Y, V) : A : (Z = b(A, Y, V), U = v(Z), K = U[0], Z = U[1], z = !0, L = o.nameToUrl(Z))), H = K && !G && !z ? "_unnormalized" + (f += 1) : "", {
         prefix: K,
-        name: ee,
+        name: Z,
         parentMap: E,
         unnormalized: !!H,
-        url: V,
+        url: L,
         originalName: X,
-        isDefine: Q,
-        id: (K ? K + "!" + ee : ee) + H
+        isDefine: J,
+        id: (K ? K + "!" + Z : Z) + H
       };
     }
     function F(A) {
@@ -27228,15 +27236,15 @@ https://requirejs.org/docs/errors.html#` + e);
       return z || (z = l[E] = new o.Module(A)), z;
     }
     function w(A, E, z) {
-      var L = A.id, V = getOwn(l, L);
-      hasProp(p, L) && (!V || V.defineEmitComplete) ? E === "defined" && z(p[L]) : (V = F(A), V.error && E === "error" ? z(V.error) : V.on(E, z));
+      var V = A.id, L = getOwn(l, V);
+      hasProp(p, V) && (!L || L.defineEmitComplete) ? E === "defined" && z(p[V]) : (L = F(A), L.error && E === "error" ? z(L.error) : L.on(E, z));
     }
     function T(A, E) {
-      var z = A.requireModules, L = !1;
-      E ? E(A) : (each(z, function(V) {
-        var G = getOwn(l, V);
-        G && (G.error = A, G.events.error && (L = !0, G.emit("error", A)));
-      }), L || req.onError(A));
+      var z = A.requireModules, V = !1;
+      E ? E(A) : (each(z, function(L) {
+        var G = getOwn(l, L);
+        G && (G.error = A, G.events.error && (V = !0, G.emit("error", A)));
+      }), V || req.onError(A));
     }
     function D() {
       globalDefQueue.length && (each(globalDefQueue, function(A) {
@@ -27267,28 +27275,28 @@ https://requirejs.org/docs/errors.html#` + e);
       delete l[A], delete c[A];
     }
     function N(A, E, z) {
-      var L = A.map.id;
-      A.error ? A.emit("error", A.error) : (E[L] = !0, each(A.depMaps, function(V, G) {
-        var H = V.id, U = getOwn(l, H);
+      var V = A.map.id;
+      A.error ? A.emit("error", A.error) : (E[V] = !0, each(A.depMaps, function(L, G) {
+        var H = L.id, U = getOwn(l, H);
         U && !A.depMatched[G] && !z[H] && (getOwn(E, H) ? (A.defineDep(G, p[H]), A.check()) : N(U, E, z));
-      }), z[L] = !0);
+      }), z[V] = !0);
     }
     function M() {
-      var A, E, z = i.waitSeconds * 1e3, L = z && o.startTime + z < (/* @__PURE__ */ new Date()).getTime(), V = [], G = [], H = !1, U = !0;
+      var A, E, z = i.waitSeconds * 1e3, V = z && o.startTime + z < (/* @__PURE__ */ new Date()).getTime(), L = [], G = [], H = !1, U = !0;
       if (!t) {
         if (t = !0, eachProp(c, function(K) {
           var Y = K.map, X = Y.id;
           if (K.enabled && (Y.isDefine || G.push(K), !K.error)) {
-            if (!K.inited && L)
-              y(X) ? (E = !0, H = !0) : (V.push(X), S(X));
+            if (!K.inited && V)
+              y(X) ? (E = !0, H = !0) : (L.push(X), S(X));
             else if (!K.inited && K.fetched && Y.isDefine && (H = !0, !Y.prefix))
               return U = !1;
           }
-        }), L && V.length)
-          return A = makeError("timeout", "Load timeout for modules: " + V, null, V), A.contextName = o.contextName, T(A);
+        }), V && L.length)
+          return A = makeError("timeout", "Load timeout for modules: " + L, null, L), A.contextName = o.contextName, T(A);
         U && each(G, function(K) {
           N(K, {}, {});
-        }), (!L || E) && H && (isBrowser || isWebWorker) && !a && (a = setTimeout(function() {
+        }), (!V || E) && H && (isBrowser || isWebWorker) && !a && (a = setTimeout(function() {
           a = 0, M();
         }, 50)), t = !1;
       }
@@ -27296,10 +27304,10 @@ https://requirejs.org/docs/errors.html#` + e);
     n = function(A) {
       this.events = getOwn(u, A.id) || {}, this.map = A, this.shim = getOwn(i.shim, A.id), this.depExports = [], this.depMaps = [], this.depMatched = [], this.pluginMaps = {}, this.depCount = 0;
     }, n.prototype = {
-      init: function(A, E, z, L) {
-        L = L || {}, !this.inited && (this.factory = E, z ? this.on("error", z) : this.events.error && (z = bind(this, function(V) {
-          this.emit("error", V);
-        })), this.depMaps = A && A.slice(0), this.errback = z, this.inited = !0, this.ignore = L.ignore, L.enabled || this.enabled ? this.enable() : this.check());
+      init: function(A, E, z, V) {
+        V = V || {}, !this.inited && (this.factory = E, z ? this.on("error", z) : this.events.error && (z = bind(this, function(L) {
+          this.emit("error", L);
+        })), this.depMaps = A && A.slice(0), this.errback = z, this.inited = !0, this.ignore = V.ignore, V.enabled || this.enabled ? this.enable() : this.check());
       },
       defineDep: function(A, E) {
         this.depMatched[A] || (this.depMatched[A] = !0, this.depCount -= 1, this.depExports[A] = E);
@@ -27328,7 +27336,7 @@ https://requirejs.org/docs/errors.html#` + e);
        */
       check: function() {
         if (!(!this.enabled || this.enabling)) {
-          var A, E, z = this.map.id, L = this.depExports, V = this.exports, G = this.factory;
+          var A, E, z = this.map.id, V = this.depExports, L = this.exports, G = this.factory;
           if (!this.inited)
             hasProp(o.defQueueMap, z) || this.fetch();
           else if (this.error)
@@ -27338,17 +27346,17 @@ https://requirejs.org/docs/errors.html#` + e);
               if (isFunction(G)) {
                 if (this.events.error && this.map.isDefine || req.onError !== defaultOnError)
                   try {
-                    V = o.execCb(z, G, L, V);
+                    L = o.execCb(z, G, V, L);
                   } catch (U) {
                     A = U;
                   }
                 else
-                  V = o.execCb(z, G, L, V);
-                if (this.map.isDefine && V === void 0 && (E = this.module, E ? V = E.exports : this.usingExports && (V = this.exports)), A)
+                  L = o.execCb(z, G, V, L);
+                if (this.map.isDefine && L === void 0 && (E = this.module, E ? L = E.exports : this.usingExports && (L = this.exports)), A)
                   return A.requireMap = this.map, A.requireModules = this.map.isDefine ? [this.map.id] : null, A.requireType = this.map.isDefine ? "define" : "require", T(this.error = A);
               } else
-                V = G;
-              if (this.exports = V, this.map.isDefine && !this.ignore && (p[z] = V, req.onResourceLoad)) {
+                L = G;
+              if (this.exports = L, this.map.isDefine && !this.ignore && (p[z] = L, req.onResourceLoad)) {
                 var H = [];
                 each(this.depMaps, function(U) {
                   H.push(U.normalizedMap || U);
@@ -27362,13 +27370,13 @@ https://requirejs.org/docs/errors.html#` + e);
       },
       callPlugin: function() {
         var A = this.map, E = A.id, z = I(A.prefix);
-        this.depMaps.push(z), w(z, "defined", bind(this, function(L) {
-          var V, G, H, U = getOwn(h, this.map.id), K = this.map.name, Y = this.map.parentMap ? this.map.parentMap.name : null, X = o.makeRequire(A.parentMap, {
+        this.depMaps.push(z), w(z, "defined", bind(this, function(V) {
+          var L, G, H, U = getOwn(h, this.map.id), K = this.map.name, Y = this.map.parentMap ? this.map.parentMap.name : null, X = o.makeRequire(A.parentMap, {
             enableBuildCallback: !0
           });
           if (this.map.unnormalized) {
-            L.normalize && (K = L.normalize(K, function(Q) {
-              return b(Q, Y, !0);
+            V.normalize && (K = V.normalize(K, function(J) {
+              return b(J, Y, !0);
             }) || ""), G = I(
               A.prefix + "!" + K,
               this.map.parentMap,
@@ -27376,16 +27384,16 @@ https://requirejs.org/docs/errors.html#` + e);
             ), w(
               G,
               "defined",
-              bind(this, function(Q) {
+              bind(this, function(J) {
                 this.map.normalizedMap = G, this.init([], function() {
-                  return Q;
+                  return J;
                 }, null, {
                   enabled: !0,
                   ignore: !0
                 });
               })
-            ), H = getOwn(l, G.id), H && (this.depMaps.push(G), this.events.error && H.on("error", bind(this, function(Q) {
-              this.emit("error", Q);
+            ), H = getOwn(l, G.id), H && (this.depMaps.push(G), this.events.error && H.on("error", bind(this, function(J) {
+              this.emit("error", J);
             })), H.enable());
             return;
           }
@@ -27393,44 +27401,44 @@ https://requirejs.org/docs/errors.html#` + e);
             this.map.url = o.nameToUrl(U), this.load();
             return;
           }
-          V = bind(this, function(Q) {
+          L = bind(this, function(J) {
             this.init([], function() {
-              return Q;
+              return J;
             }, null, {
               enabled: !0
             });
-          }), V.error = bind(this, function(Q) {
-            this.inited = !0, this.error = Q, Q.requireModules = [E], eachProp(l, function(ee) {
-              ee.map.id.indexOf(E + "_unnormalized") === 0 && B(ee.map.id);
-            }), T(Q);
-          }), V.fromText = bind(this, function(Q, ee) {
-            var J = A.name, Z = I(J), te = useInteractive;
-            ee && (Q = ee), te && (useInteractive = !1), F(Z), hasProp(i.config, E) && (i.config[J] = i.config[E]);
+          }), L.error = bind(this, function(J) {
+            this.inited = !0, this.error = J, J.requireModules = [E], eachProp(l, function(Z) {
+              Z.map.id.indexOf(E + "_unnormalized") === 0 && B(Z.map.id);
+            }), T(J);
+          }), L.fromText = bind(this, function(J, Z) {
+            var Q = A.name, ne = I(Q), te = useInteractive;
+            Z && (J = Z), te && (useInteractive = !1), F(ne), hasProp(i.config, E) && (i.config[Q] = i.config[E]);
             try {
-              req.exec(Q);
-            } catch (re) {
+              req.exec(J);
+            } catch (se) {
               return T(makeError(
                 "fromtexteval",
-                "fromText eval for " + E + " failed: " + re,
-                re,
+                "fromText eval for " + E + " failed: " + se,
+                se,
                 [E]
               ));
             }
-            te && (useInteractive = !0), this.depMaps.push(Z), o.completeLoad(J), X([J], V);
-          }), L.load(A.name, X, V, i);
+            te && (useInteractive = !0), this.depMaps.push(ne), o.completeLoad(Q), X([Q], L);
+          }), V.load(A.name, X, L, i);
         })), o.enable(z, this), this.pluginMaps[z.id] = z;
       },
       enable: function() {
         c[this.map.id] = this, this.enabled = !0, this.enabling = !0, each(this.depMaps, bind(this, function(A, E) {
-          var z, L, V;
+          var z, V, L;
           if (typeof A == "string") {
             if (A = I(
               A,
               this.map.isDefine ? this.map : this.map.parentMap,
               !1,
               !this.skipMap
-            ), this.depMaps[E] = A, V = getOwn(r, A.id), V) {
-              this.depExports[E] = V(this);
+            ), this.depMaps[E] = A, L = getOwn(r, A.id), L) {
+              this.depExports[E] = L(this);
               return;
             }
             this.depCount += 1, w(A, "defined", bind(this, function(G) {
@@ -27439,7 +27447,7 @@ https://requirejs.org/docs/errors.html#` + e);
               this.emit("error", G);
             }));
           }
-          z = A.id, L = l[z], !hasProp(r, z) && L && !L.enabled && o.enable(A, this);
+          z = A.id, V = l[z], !hasProp(r, z) && V && !V.enabled && o.enable(A, this);
         })), eachProp(this.pluginMaps, bind(this, function(A) {
           var E = getOwn(l, A.id);
           E && !E.enabled && o.enable(A, this);
@@ -27458,8 +27466,8 @@ https://requirejs.org/docs/errors.html#` + e);
     function j(A) {
       hasProp(p, A[0]) || F(I(A[0], null, !0)).init(A[1], A[2]);
     }
-    function R(A, E, z, L) {
-      A.detachEvent && !isOpera ? L && A.detachEvent(L, E) : A.removeEventListener(z, E, !1);
+    function R(A, E, z, V) {
+      A.detachEvent && !isOpera ? V && A.detachEvent(V, E) : A.removeEventListener(z, E, !1);
     }
     function O(A) {
       var E = A.currentTarget || A.srcElement;
@@ -27496,31 +27504,31 @@ https://requirejs.org/docs/errors.html#` + e);
       configure: function(A) {
         if (A.baseUrl && A.baseUrl.charAt(A.baseUrl.length - 1) !== "/" && (A.baseUrl += "/"), typeof A.urlArgs == "string") {
           var E = A.urlArgs;
-          A.urlArgs = function(V, G) {
+          A.urlArgs = function(L, G) {
             return (G.indexOf("?") === -1 ? "?" : "&") + E;
           };
         }
-        var z = i.shim, L = {
+        var z = i.shim, V = {
           paths: !0,
           bundles: !0,
           config: !0,
           map: !0
         };
-        eachProp(A, function(V, G) {
-          L[G] ? (i[G] || (i[G] = {}), mixin(i[G], V, !0, !0)) : i[G] = V;
-        }), A.bundles && eachProp(A.bundles, function(V, G) {
-          each(V, function(H) {
+        eachProp(A, function(L, G) {
+          V[G] ? (i[G] || (i[G] = {}), mixin(i[G], L, !0, !0)) : i[G] = L;
+        }), A.bundles && eachProp(A.bundles, function(L, G) {
+          each(L, function(H) {
             H !== G && (h[H] = G);
           });
-        }), A.shim && (eachProp(A.shim, function(V, G) {
-          isArray(V) && (V = {
-            deps: V
-          }), (V.exports || V.init) && !V.exportsFn && (V.exportsFn = o.makeShimExports(V)), z[G] = V;
-        }), i.shim = z), A.packages && each(A.packages, function(V) {
+        }), A.shim && (eachProp(A.shim, function(L, G) {
+          isArray(L) && (L = {
+            deps: L
+          }), (L.exports || L.init) && !L.exportsFn && (L.exportsFn = o.makeShimExports(L)), z[G] = L;
+        }), i.shim = z), A.packages && each(A.packages, function(L) {
           var G, H;
-          V = typeof V == "string" ? { name: V } : V, H = V.name, G = V.location, G && (i.paths[H] = V.location), i.pkgs[H] = V.name + "/" + (V.main || "main").replace(currDirRegExp, "").replace(jsSuffixRegExp, "");
-        }), eachProp(l, function(V, G) {
-          !V.inited && !V.map.unnormalized && (V.map = I(G, null, !0));
+          L = typeof L == "string" ? { name: L } : L, H = L.name, G = L.location, G && (i.paths[H] = L.location), i.pkgs[H] = L.name + "/" + (L.main || "main").replace(currDirRegExp, "").replace(jsSuffixRegExp, "");
+        }), eachProp(l, function(L, G) {
+          !L.inited && !L.map.unnormalized && (L.map = I(G, null, !0));
         }), (A.deps || A.callback) && o.require(A.deps || [], A.callback);
       },
       makeShimExports: function(A) {
@@ -27532,10 +27540,10 @@ https://requirejs.org/docs/errors.html#` + e);
       },
       makeRequire: function(A, E) {
         E = E || {};
-        function z(L, V, G) {
+        function z(V, L, G) {
           var H, U, K;
-          return E.enableBuildCallback && V && isFunction(V) && (V.__requireJsBuild = !0), typeof L == "string" ? isFunction(V) ? T(makeError("requireargs", "Invalid require call"), G) : A && hasProp(r, L) ? r[L](l[A.id]) : req.get ? req.get(o, L, A, z) : (U = I(L, A, !1, !0), H = U.id, hasProp(p, H) ? p[H] : T(makeError("notloaded", 'Module name "' + H + '" has not been loaded yet for context: ' + e + (A ? "" : ". Use require([])")))) : ($(), o.nextTick(function() {
-            $(), K = F(I(null, A)), K.skipMap = E.skipMap, K.init(L, V, G, {
+          return E.enableBuildCallback && L && isFunction(L) && (L.__requireJsBuild = !0), typeof V == "string" ? isFunction(L) ? T(makeError("requireargs", "Invalid require call"), G) : A && hasProp(r, V) ? r[V](l[A.id]) : req.get ? req.get(o, V, A, z) : (U = I(V, A, !1, !0), H = U.id, hasProp(p, H) ? p[H] : T(makeError("notloaded", 'Module name "' + H + '" has not been loaded yet for context: ' + e + (A ? "" : ". Use require([])")))) : ($(), o.nextTick(function() {
+            $(), K = F(I(null, A)), K.skipMap = E.skipMap, K.init(V, L, G, {
               enabled: !0
             }), M();
           }), z);
@@ -27547,26 +27555,26 @@ https://requirejs.org/docs/errors.html#` + e);
            * *Requires* the use of a module name. It does not support using
            * plain URLs like nameToUrl.
            */
-          toUrl: function(L) {
-            var V, G = L.lastIndexOf("."), H = L.split("/")[0], U = H === "." || H === "..";
-            return G !== -1 && (!U || G > 1) && (V = L.substring(G, L.length), L = L.substring(0, G)), o.nameToUrl(b(
-              L,
+          toUrl: function(V) {
+            var L, G = V.lastIndexOf("."), H = V.split("/")[0], U = H === "." || H === "..";
+            return G !== -1 && (!U || G > 1) && (L = V.substring(G, V.length), V = V.substring(0, G)), o.nameToUrl(b(
+              V,
               A && A.id,
               !0
-            ), V, !0);
+            ), L, !0);
           },
-          defined: function(L) {
-            return hasProp(p, I(L, A, !1, !0).id);
+          defined: function(V) {
+            return hasProp(p, I(V, A, !1, !0).id);
           },
-          specified: function(L) {
-            return L = I(L, A, !1, !0).id, hasProp(p, L) || hasProp(l, L);
+          specified: function(V) {
+            return V = I(V, A, !1, !0).id, hasProp(p, V) || hasProp(l, V);
           }
-        }), A || (z.undef = function(L) {
+        }), A || (z.undef = function(V) {
           D();
-          var V = I(L, A, !0), G = getOwn(l, L);
-          G.undefed = !0, S(L), delete p[L], delete m[V.url], delete u[L], eachReverse(d, function(H, U) {
-            H[0] === L && d.splice(U, 1);
-          }), delete o.defQueueMap[L], G && (G.events.defined && (u[L] = G.events), B(L));
+          var L = I(V, A, !0), G = getOwn(l, V);
+          G.undefed = !0, S(V), delete p[V], delete m[L.url], delete u[V], eachReverse(d, function(H, U) {
+            H[0] === V && d.splice(U, 1);
+          }), delete o.defQueueMap[V], G && (G.events.defined && (u[V] = G.events), B(V));
         }), z;
       },
       /**
@@ -27586,7 +27594,7 @@ https://requirejs.org/docs/errors.html#` + e);
        * @param {String} moduleName the name of the module to potentially complete.
        */
       completeLoad: function(A) {
-        var E, z, L, V = getOwn(i.shim, A) || {}, G = V.exports;
+        var E, z, V, L = getOwn(i.shim, A) || {}, G = L.exports;
         for (D(); d.length; ) {
           if (z = d.shift(), z[0] === null) {
             if (z[0] = A, E)
@@ -27596,7 +27604,7 @@ https://requirejs.org/docs/errors.html#` + e);
             z[0] === A && (E = !0);
           j(z);
         }
-        if (o.defQueueMap = {}, L = getOwn(l, A), !E && !hasProp(p, A) && L && !L.inited) {
+        if (o.defQueueMap = {}, V = getOwn(l, A), !E && !hasProp(p, A) && V && !V.inited) {
           if (i.enforceDefine && (!G || !getGlobal(G)))
             return y(A) ? void 0 : T(makeError(
               "nodefine",
@@ -27604,7 +27612,7 @@ https://requirejs.org/docs/errors.html#` + e);
               null,
               [A]
             ));
-          j([A, V.deps || [], V.exportsFn]);
+          j([A, L.deps || [], L.exportsFn]);
         }
         M();
       },
@@ -27616,18 +27624,18 @@ https://requirejs.org/docs/errors.html#` + e);
        * internal API, not a public one. Use toUrl for the public API.
        */
       nameToUrl: function(A, E, z) {
-        var L, V, G, H, U, K, Y, X = getOwn(i.pkgs, A);
+        var V, L, G, H, U, K, Y, X = getOwn(i.pkgs, A);
         if (X && (A = X), Y = getOwn(h, A), Y)
           return o.nameToUrl(Y, E, z);
         if (req.jsExtRegExp.test(A))
           U = A + (E || "");
         else {
-          for (L = i.paths, V = A.split("/"), G = V.length; G > 0; G -= 1)
-            if (H = V.slice(0, G).join("/"), K = getOwn(L, H), K) {
-              isArray(K) && (K = K[0]), V.splice(0, G, K);
+          for (V = i.paths, L = A.split("/"), G = L.length; G > 0; G -= 1)
+            if (H = L.slice(0, G).join("/"), K = getOwn(V, H), K) {
+              isArray(K) && (K = K[0]), L.splice(0, G, K);
               break;
             }
-          U = V.join("/"), U += E || (/^data\:|^blob\:|\?/.test(U) || z ? "" : ".js"), U = (U.charAt(0) === "/" || U.match(/^[\w\+\.\-]+:/) ? "" : i.baseUrl) + U;
+          U = L.join("/"), U += E || (/^data\:|^blob\:|\?/.test(U) || z ? "" : ".js"), U = (U.charAt(0) === "/" || U.match(/^[\w\+\.\-]+:/) ? "" : i.baseUrl) + U;
         }
         return i.urlArgs && !/^blob\:/.test(U) ? U + i.urlArgs(A, U) : U;
       },
@@ -27643,8 +27651,8 @@ https://requirejs.org/docs/errors.html#` + e);
        *
        * @private
        */
-      execCb: function(A, E, z, L) {
-        return E.apply(L, z);
+      execCb: function(A, E, z, V) {
+        return E.apply(V, z);
       },
       /**
        * callback for script loads, used to check status of loading.
@@ -27666,10 +27674,10 @@ https://requirejs.org/docs/errors.html#` + e);
         var E = O(A);
         if (!y(E.id)) {
           var z = [];
-          return eachProp(l, function(L, V) {
-            V.indexOf("_@r") !== 0 && each(L.depMaps, function(G) {
+          return eachProp(l, function(V, L) {
+            L.indexOf("_@r") !== 0 && each(V.depMaps, function(G) {
               if (G.id === E.id)
-                return z.push(V), !0;
+                return z.push(L), !0;
             });
           }), T(makeError("scripterror", 'Script error for "' + E.id + (z.length ? '", needed by: ' + z.join(", ") : '"'), A, [E.id]));
         }
@@ -29572,7 +29580,7 @@ const useCreateActionProps = () => {
   return {
     onClick() {
       return q(this, null, function* () {
-        var E, z, L, V, G, H;
+        var E, z, V, L, G, H;
         const w = u.map((U) => U.name), {
           assignedValues: T = {},
           onSuccess: D,
@@ -29599,7 +29607,7 @@ const useCreateActionProps = () => {
         });
         if (j) {
           const U = p();
-          A[(L = U == null ? void 0 : U.name) != null ? L : "parent"] = f, A[(V = U == null ? void 0 : U.foreignKey) != null ? V : "parentId"] = f.id;
+          A[(V = U == null ? void 0 : U.name) != null ? V : "parent"] = f, A[(L = U == null ? void 0 : U.foreignKey) != null ? L : "parentId"] = f.id;
         }
         c.data = t.data || {}, c.data.loading = !0;
         try {
@@ -29729,10 +29737,10 @@ const useCreateActionProps = () => {
           successMessage: B,
           actionAfterSuccess: N
         } = v || {}, M = {}, j = Object.keys(y).map((E) => q(this, null, function* () {
-          const z = y[E], L = g(E);
+          const z = y[E], V = g(E);
           if (isVariable$1(z)) {
-            const { value: V } = (yield p == null ? void 0 : p.parseVariable(z, m)) || {};
-            M[E] = transformVariableValue(V, { targetCollectionField: L });
+            const { value: L } = (yield p == null ? void 0 : p.parseVariable(z, m)) || {};
+            M[E] = transformVariableValue(L, { targetCollectionField: V });
           } else
             z !== "" && (M[E] = z);
         }));
@@ -29743,7 +29751,7 @@ const useCreateActionProps = () => {
               filterByTk: r,
               values: x({}, M),
               // TODO(refactor): should change to inject by plugin
-              triggerWorkflows: F != null && F.length ? F.map((L) => [L.workflowKey, L.context].filter(Boolean).join("!")).join(",") : void 0
+              triggerWorkflows: F != null && F.length ? F.map((V) => [V.workflowKey, V.context].filter(Boolean).join("!")).join(",") : void 0
             });
             let z = D;
             if (D && (z = yield getVariableValue(D, {
@@ -29781,13 +29789,13 @@ const useCreateActionProps = () => {
           updateMode: B
         } = (E = a == null ? void 0 : a["x-action-settings"]) != null ? E : {}, { manualClose: N, redirecting: M, redirectTo: j, successMessage: R, actionAfterSuccess: O } = D || {};
         m.data = e.data || {}, m.data.loading = !0;
-        const $ = {}, A = Object.keys(T).map((L) => q(this, null, function* () {
-          const V = T[L], G = C(L);
-          if (isVariable$1(V)) {
-            const { value: H } = (yield g == null ? void 0 : g.parseVariable(V, b)) || {};
-            $[L] = transformVariableValue(H, { targetCollectionField: G });
+        const $ = {}, A = Object.keys(T).map((V) => q(this, null, function* () {
+          const L = T[V], G = C(V);
+          if (isVariable$1(L)) {
+            const { value: H } = (yield g == null ? void 0 : g.parseVariable(L, b)) || {};
+            $[V] = transformVariableValue(H, { targetCollectionField: G });
           } else
-            V !== "" && ($[L] = V);
+            L !== "" && ($[V] = L);
         }));
         yield Promise.all(A), (O === "previous" || !O && M !== !0) && (S == null || S(!1)), h.confirm({
           title: p("Bulk update"),
@@ -29795,9 +29803,9 @@ const useCreateActionProps = () => {
           onOk() {
             return q(this, null, function* () {
               var G, H, U, K;
-              const { filter: L } = (H = (G = o.params) == null ? void 0 : G[0]) != null ? H : {}, V = {
+              const { filter: V } = (H = (G = o.params) == null ? void 0 : G[0]) != null ? H : {}, L = {
                 values: x({}, $),
-                filter: L,
+                filter: V,
                 forceUpdate: !1
               };
               if (B === "selected") {
@@ -29805,11 +29813,11 @@ const useCreateActionProps = () => {
                   message.error(p("Please select the records to be updated")), m.data.loading = !1;
                   return;
                 }
-                V.filter = { $and: [{ [l || "id"]: { $in: c } }] };
+                L.filter = { $and: [{ [l || "id"]: { $in: c } }] };
               }
-              V.filter || (V.forceUpdate = !0);
+              L.filter || (L.forceUpdate = !0);
               try {
-                yield t.update(V);
+                yield t.update(L);
               } catch (Y) {
               } finally {
                 m.data.loading = !1;
@@ -29837,8 +29845,8 @@ const useCreateActionProps = () => {
   return {
     onClick() {
       return q(this, null, function* () {
-        var L, V, G, H;
-        const { skipValidator: F, onSuccess: w, requestSettings: T } = (L = o == null ? void 0 : o["x-action-settings"]) != null ? L : {}, { manualClose: D, redirecting: B, redirectTo: N, successMessage: M, actionAfterSuccess: j } = w || {}, R = o == null ? void 0 : o["x-action"];
+        var V, L, G, H;
+        const { skipValidator: F, onSuccess: w, requestSettings: T } = (V = o == null ? void 0 : o["x-action-settings"]) != null ? V : {}, { manualClose: D, redirecting: B, redirectTo: N, successMessage: M, actionAfterSuccess: j } = w || {}, R = o == null ? void 0 : o["x-action"];
         if (!T.url)
           return;
         F !== !0 && R === "customize:form:request" && (yield a.submit());
@@ -29864,7 +29872,7 @@ const useCreateActionProps = () => {
         };
         f.data = c.data || {}, f.data.loading = !0;
         try {
-          yield e.request(x({}, z)), f.data.loading = !1, u instanceof TableFieldResource || (G = (V = d == null ? void 0 : d.service) == null ? void 0 : V.refresh) == null || G.call(V), (H = p == null ? void 0 : p.refresh) == null || H.call(p), R === "customize:form:request" && (j === "previous" || !j && B !== !0) && (b == null || b(!1)), M || (message.success(C("Saved successfully")), yield resetFormCorrectly(a), (B && !j || j === "redirect") && N && (isURL(N) ? window.location.href = N : t(N))), D ? S.success({
+          yield e.request(x({}, z)), f.data.loading = !1, u instanceof TableFieldResource || (G = (L = d == null ? void 0 : d.service) == null ? void 0 : L.refresh) == null || G.call(L), (H = p == null ? void 0 : p.refresh) == null || H.call(p), R === "customize:form:request" && (j === "previous" || !j && B !== !0) && (b == null || b(!1)), M || (message.success(C("Saved successfully")), yield resetFormCorrectly(a), (B && !j || j === "redirect") && N && (isURL(N) ? window.location.href = N : t(N))), D ? S.success({
             title: r(M),
             onOk: () => q(this, null, function* () {
               (B && !j || j === "redirect") && N && (isURL(N) ? window.location.href = N : t(N));
@@ -29881,14 +29889,14 @@ const useCreateActionProps = () => {
   return {
     onClick(I, F) {
       return q(this, null, function* () {
-        var V, G;
+        var L, G;
         const {
           assignedValues: w = {},
           onSuccess: T,
           overwriteValues: D,
           skipValidator: B,
           triggerWorkflows: N
-        } = (V = l == null ? void 0 : l["x-action-settings"]) != null ? V : {}, {
+        } = (L = l == null ? void 0 : l["x-action-settings"]) != null ? L : {}, {
           manualClose: M,
           redirecting: j,
           redirectTo: R,
@@ -29903,7 +29911,7 @@ const useCreateActionProps = () => {
             U !== "" && (A[H] = U);
         }));
         yield Promise.all(E), B || (yield e.submit());
-        const z = u.map((H) => H.name), L = getFormValues({
+        const z = u.map((H) => H.name), V = getFormValues({
           filterByTk: t,
           field: n,
           form: e,
@@ -29916,7 +29924,7 @@ const useCreateActionProps = () => {
         try {
           const H = yield o.update(P(x({
             filterByTk: t,
-            values: x(x(x({}, L), D), A)
+            values: x(x(x({}, V), D), A)
           }, C), {
             updateAssociationValues: g,
             // TODO(refactor): should change to inject by plugin
@@ -30276,25 +30284,25 @@ const useCreateActionProps = () => {
         var H, U, K, Y;
         if (!O.find((X) => X.uid === A.uid))
           return;
-        const z = `${$}${t.name}`, L = ((H = A.service.params) == null ? void 0 : H[0]) || {};
+        const z = `${$}${t.name}`, V = ((H = A.service.params) == null ? void 0 : H[0]) || {};
         (K = (U = A.service.params) == null ? void 0 : U[1]) != null && K.filters || _.set(A.service.params, "[1].filters", {});
-        const V = A.service.params[1].filters;
+        const L = A.service.params[1].filters;
         if (R.length)
-          V[z] = {
+          L[z] = {
             [S]: R
           };
         else {
           if ((Y = A.clearSelection) == null || Y.call(A), A.dataLoadingMode === "manual")
             return A.clearData();
-          delete V[z];
+          delete L[z];
         }
-        const G = mergeFilter([...Object.values(V), A.defaultFilter]);
+        const G = mergeFilter([...Object.values(L), A.defaultFilter]);
         return A.doFilter(
-          P(x({}, L), {
+          P(x({}, V), {
             page: 1,
             filter: G
           }),
-          { filters: V }
+          { filters: L }
         );
       });
     },
@@ -32007,13 +32015,15 @@ const formItemWrapCss = css`
   }
 `, FormItem = withDynamicSchemaProps(
   observer$1((e) => {
-    var u, d, p;
+    var d, p, m, h;
     useEnsureOperatorsValid();
     const t = useField(), n = useFieldSchema(), { addActiveFieldName: o } = useFormActiveFields() || {}, { wrapperStyle: r } = useDataFormItemProps(), { t: a } = useTranslation();
-    useParseDefaultValue(), useLazyLoadDisplayAssociationFieldsOfForm(), useLinkageRulesForSubTableOrSubForm(), useEffect(() => {
+    useParseDefaultValue(), useLazyLoadDisplayAssociationFieldsOfForm(), useLinkageRulesForSubTableOrSubForm();
+    const { isInSubTable: i } = useFlag();
+    useEffect(() => {
       o == null || o(n.name);
     }, [o, n.name]), t.title = t.title && a(t.title, { ns: NAMESPACE_UI_SCHEMA });
-    const i = (d = (u = n["x-decorator-props"]) == null ? void 0 : u.showTitle) != null ? d : !0, l = useMemo(() => {
+    const l = (p = (d = n["x-decorator-props"]) == null ? void 0 : d.showTitle) != null ? p : !0, c = useMemo(() => {
       if (t.description && t.description !== "")
         return typeof t.description == "string" ? /* @__PURE__ */ jsx(
           "div",
@@ -32024,27 +32034,41 @@ const formItemWrapCss = css`
             }
           }
         ) : t.description;
-    }, [t.description]), c = useMemo(() => cx(formItemWrapCss, {
-      [formItemLabelCss]: i === !1
-    }), [i]);
-    return (p = t.data) != null && p.hidden ? null : /* @__PURE__ */ jsx(VariableScope, { scopeId: n == null ? void 0 : n["x-uid"], type: "formItem", children: /* @__PURE__ */ jsx(CollectionFieldProvider, { allowNull: !0, children: /* @__PURE__ */ jsx(
+    }, [t.description]), u = useMemo(() => cx(formItemWrapCss, {
+      [formItemLabelCss]: l === !1
+    }), [l]);
+    return (m = t.data) != null && m.hidden ? null : /* @__PURE__ */ jsx(VariableScope, { scopeId: n == null ? void 0 : n["x-uid"], type: "formItem", children: /* @__PURE__ */ jsx(CollectionFieldProvider, { allowNull: !0, children: /* @__PURE__ */ jsx(
       BlockItem,
       {
         className: cx(
           "nb-form-item",
           css`
                 .ant-formily-item-layout-horizontal .ant-formily-item-control {
-                  max-width: ${i === !1 || n["x-component"] !== "CollectionField" ? "100% !important" : null};
+                  max-width: ${l === !1 || n["x-component"] !== "CollectionField" ? "100% !important" : null};
                 }
               `
         ),
         children: /* @__PURE__ */ jsx(ACLCollectionFieldProvider, { children: /* @__PURE__ */ jsx(
           FormItem$1,
           P(x({
-            className: c
+            className: u
           }, e), {
-            extra: l,
-            wrapperStyle: x(x({}, r.backgroundColor ? { paddingLeft: "5px", paddingRight: "5px" } : {}), r)
+            extra: c,
+            wrapperStyle: x(x({}, r.backgroundColor ? { paddingLeft: "5px", paddingRight: "5px" } : {}), r),
+            feedbackText: i && ((h = t.errors) != null && h.length) ? /* @__PURE__ */ jsx(
+              EllipsisWithTooltip,
+              {
+                ellipsis: !0,
+                style: {
+                  color: "red",
+                  maxWidth: 300,
+                  whiteSpace: "normal",
+                  wordBreak: "break-word",
+                  width: "100%"
+                },
+                children: /* @__PURE__ */ jsx("div", { style: { cursor: "pointer" }, children: t.errors.map((g) => g.messages).join(", ") })
+              }
+            ) : null
           })
         ) })
       }
@@ -38049,10 +38073,10 @@ const enabledIndexColumn$1 = {
   name: "fieldSettings:component:CascadeSelect",
   items: [fieldComponent$6, titleField$1, ellipsisSettingsItem, setTheDataScope]
 }), SchemaSettingsDateRange = function e(t) {
-  var w, T, D, B, N, M, j, R, O, $, A, E, z, L, V, G;
+  var w, T, D, B, N, M, j, R, O, $, A, E, z, V, L, G;
   const { fieldSchema: n } = t, o = useField(), { dn: r } = useDesignable(), { t: a } = useTranslation(), { getCollectionJoinField: i } = useCollectionManager_deprecated(), { isInSubForm: l, isInSubTable: c } = useFlag() || {}, u = i(n == null ? void 0 : n["x-collection-field"]) || {}, d = ((w = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : w.showTime) || ((D = (T = u == null ? void 0 : u.uiSchema) == null ? void 0 : T["x-component-props"]) == null ? void 0 : D.showTime) || !1, p = ((B = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : B.dateFormat) || ((M = (N = u == null ? void 0 : u.uiSchema) == null ? void 0 : N["x-component-props"]) == null ? void 0 : M.dateFormat) || "YYYY-MM-DD", m = ((j = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : j.timeFormat) || ((O = (R = u == null ? void 0 : u.uiSchema) == null ? void 0 : R["x-component-props"]) == null ? void 0 : O.timeFormat) || "HH:mm:ss", h = (($ = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : $.picker) || ((E = (A = u == null ? void 0 : u.uiSchema) == null ? void 0 : A["x-component-props"]) == null ? void 0 : E.picker) || "date";
   n["x-read-pretty"] || o.readOnly || o.readPretty;
-  const g = (z = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : z._minDate, f = (L = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : L._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(
+  const g = (z = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : z._minDate, f = (V = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : V._maxDate, C = ((L = u == null ? void 0 : u.uiSchema) == null ? void 0 : L["x-component-props"].gmt) || !1, b = ((G = u == null ? void 0 : u.uiSchema) == null ? void 0 : G["x-component-props"].utc) || !1, S = useRecord(), { form: y } = useFormBlockContext(), v = useCallback(
     (H) => /* @__PURE__ */ jsx(
       SchemaComponent,
       {
@@ -39549,11 +39573,11 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
           };
         if (_.isFunction(F))
           break;
-        const A = y[$], E = y.slice(0, $ + 1).join("."), { fieldPath: z } = getFieldPath$1(E, I), L = r(z, T), V = (O = a(B, T)) == null ? void 0 : O.getPrimaryKey();
+        const A = y[$], E = y.slice(0, $ + 1).join("."), { fieldPath: z } = getFieldPath$1(E, I), V = r(z, T), L = (O = a(B, T)) == null ? void 0 : O.getPrimaryKey();
         if (Array.isArray(F)) {
           const G = F.map((H) => {
-            if (!(S != null && S.doNotRequest) && shouldToRequest(H == null ? void 0 : H[A], H, E) && (H == null ? void 0 : H[V]) != null && L != null && L.target) {
-              const U = `/${B}/${H[L.sourceKey || V]}/${A}:${getAction(L.type)}`;
+            if (!(S != null && S.doNotRequest) && shouldToRequest(H == null ? void 0 : H[A], H, E) && (H == null ? void 0 : H[L]) != null && V != null && V.target) {
+              const U = `/${B}/${H[V.sourceKey || L]}/${A}:${getAction(V.type)}`;
               if (hasRequested(U))
                 return getRequested(U);
               const K = o.request({
@@ -39567,9 +39591,9 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
             }
             return H == null ? void 0 : H[A];
           });
-          F = removeThroughCollectionFields(_.flatten(yield Promise.all(G)), L);
-        } else if (!(S != null && S.doNotRequest) && shouldToRequest(F[A], F, E) && F[V] != null && (L != null && L.target)) {
-          const G = `/${B}/${F[L.sourceKey || V]}/${A}:${getAction(L.type)}`;
+          F = removeThroughCollectionFields(_.flatten(yield Promise.all(G)), V);
+        } else if (!(S != null && S.doNotRequest) && shouldToRequest(F[A], F, E) && F[L] != null && (V != null && V.target)) {
+          const G = `/${B}/${F[V.sourceKey || L]}/${A}:${getAction(V.type)}`;
           let H = null;
           if (hasRequested(G))
             H = yield getRequested(G);
@@ -39584,10 +39608,10 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
             stashRequested(G, K), H = yield K, clearRequested(G);
           }
           const U = H.data.data;
-          F = removeThroughCollectionFields(U, L);
+          F = removeThroughCollectionFields(U, V);
         } else
-          F = removeThroughCollectionFields(getValuesByPath(F, A), L);
-        L != null && L.target && (B = L.target);
+          F = removeThroughCollectionFields(getValuesByPath(F, A), V);
+        V != null && V.target && (B = V.target);
       }
       const j = i(
         _.isFunction(F) ? yield F({
@@ -40179,31 +40203,31 @@ const ActionLink = withDynamicSchemaProps(
     ]), v = useDesigner(), I = useField(), F = useFieldSchema(), w = useCompile(), T = useCollectionRecordData(), D = w((Y = F["x-component-props"]) == null ? void 0 : Y.confirm) || g, B = useMemo(
       () => {
         var X;
-        return ((X = F == null ? void 0 : F["x-linkage-rules"]) == null ? void 0 : X.filter((Q) => !Q.disabled)) || [];
+        return ((X = F == null ? void 0 : F["x-linkage-rules"]) == null ? void 0 : X.filter((J) => !J.disabled)) || [];
       },
       [F == null ? void 0 : F["x-linkage-rules"]]
-    ), { designable: N } = useDesignable(), M = useComponent(o) || o, j = useVariables$1(), R = useLocalVariables$1(), { visibleWithURL: O, setVisibleWithURL: $ } = usePopupUtils(), { setSubmitted: A } = useActionContext(), { getAriaLabel: E } = useGetAriaLabelOfAction(l), z = useCollectionParentRecordData(), L = useApp(), { getAllDataBlocks: V } = useAllDataBlocks(), G = useForm();
+    ), { designable: N } = useDesignable(), M = useComponent(o) || o, j = useVariables$1(), R = useLocalVariables$1(), { visibleWithURL: O, setVisibleWithURL: $ } = usePopupUtils(), { setSubmitted: A } = useActionContext(), { getAriaLabel: E } = useGetAriaLabelOfAction(l), z = useCollectionParentRecordData(), V = useApp(), { getAllDataBlocks: L } = useAllDataBlocks(), G = useForm();
     useEffect(() => {
       I.stateOfLinkageRules && setInitialActionState(I);
-      const X = uid(), Q = [];
+      const X = uid(), J = [];
       return setTimeout(() => {
         G.addEffects(X, () => {
-          forEachLinkageRule(B, (ee, J) => {
-            Q.push(
+          forEachLinkageRule(B, (Z, Q) => {
+            J.push(
               reaction(
-                () => [getVariableValuesInCondition({ linkageRules: B, localVariables: R })].map((re) => JSON.stringify(re)).join(","),
+                () => [getVariableValuesInCondition({ linkageRules: B, localVariables: R })].map((se) => JSON.stringify(se)).join(","),
                 () => {
                   I.stateOfLinkageRules = {}, linkageAction(
                     {
-                      operator: ee.operator,
+                      operator: Z.operator,
                       field: I,
-                      condition: J.condition,
+                      condition: Q.condition,
                       variables: j,
                       localVariables: R,
-                      conditionType: J.conditionType,
+                      conditionType: Q.conditionType,
                       variableNameOfLeftCondition: "$nRecord"
                     },
-                    L.jsonLogic
+                    V.jsonLogic
                   );
                 },
                 { fireImmediately: !0, equals: isEqual }
@@ -40212,8 +40236,8 @@ const ActionLink = withDynamicSchemaProps(
           });
         });
       }), () => {
-        G.removeEffects(X), Q.forEach((ee) => {
-          ee();
+        G.removeEffects(X), J.forEach((Z) => {
+          Z();
         });
       };
     }, [B, T]);
@@ -40222,20 +40246,20 @@ const ActionLink = withDynamicSchemaProps(
         C == null || C(X);
       },
       [C]
-    ), U = useMemo(() => c && ((X, Q) => q(void 0, null, function* () {
-      var J, Z;
-      yield c == null ? void 0 : c(X, Q);
-      const ee = ((Z = (J = F["x-action-settings"]) == null ? void 0 : J.onSuccess) == null ? void 0 : Z.blocksToRefresh) || [];
-      ee.length > 0 && V().forEach((te) => {
-        var re;
-        if (ee.includes(te.uid))
+    ), U = useMemo(() => c && ((X, J) => q(void 0, null, function* () {
+      var Q, ne;
+      yield c == null ? void 0 : c(X, J);
+      const Z = ((ne = (Q = F["x-action-settings"]) == null ? void 0 : Q.onSuccess) == null ? void 0 : ne.blocksToRefresh) || [];
+      Z.length > 0 && L().forEach((te) => {
+        var se;
+        if (Z.includes(te.uid))
           try {
-            (re = te.service) == null || re.refresh();
-          } catch (se) {
-            console.error("Failed to refresh block:", te.uid, se);
+            (se = te.service) == null || se.refresh();
+          } catch (ce) {
+            console.error("Failed to refresh block:", te.uid, ce);
           }
       });
-    })), [c, F, V]);
+    })), [c, F, L]);
     return /* @__PURE__ */ jsx(VariableScope, { scopeId: F == null ? void 0 : F["x-uid"], type: "action", children: /* @__PURE__ */ jsx(
       InternalAction,
       x({
@@ -40271,8 +40295,8 @@ const ActionLink = withDynamicSchemaProps(
   }),
   { displayName: "Action" }
 ), InternalAction = observer$1(function e(t) {
-  var xe, Ce, he, fe, ge;
-  const me = t, {
+  var pe, ue, ge, he, Ce;
+  const de = t, {
     containerRefKey: n,
     fieldSchema: o,
     designable: r,
@@ -40300,7 +40324,7 @@ const ActionLink = withDynamicSchemaProps(
     setSubmitted: B,
     getAriaLabel: N,
     parentRecordData: M
-  } = me, j = W(me, [
+  } = de, j = W(de, [
     "containerRefKey",
     "fieldSchema",
     "designable",
@@ -40328,28 +40352,28 @@ const ActionLink = withDynamicSchemaProps(
     "setSubmitted",
     "getAriaLabel",
     "parentRecordData"
-  ]), [R, O] = useState(!1), { wrapSSR: $, componentCls: A, hashId: E } = useStyles$8(), [z, L] = useState(!1), V = o["x-toolbar-props"] || o["x-designer-props"], G = (xe = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : xe.openMode, H = (Ce = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : Ce.openSize, U = (he = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : he.refreshDataBlockRequest, { modal: K } = App.useApp(), Y = useForm(), X = useACLActionParamsContext(), {
-    run: Q,
-    element: ee,
-    disabled: J,
-    loading: Z
-  } = (F == null ? void 0 : F(w)) || {}, te = Y.disabled || a.disabled || ((fe = a.data) == null ? void 0 : fe.disabled) || I || J, re = useMemo(() => {
-    var pe;
+  ]), [R, O] = useState(!1), { wrapSSR: $, componentCls: A, hashId: E } = useStyles$8(), [z, V] = useState(!1), L = o["x-toolbar-props"] || o["x-designer-props"], G = (pe = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : pe.openMode, H = (ue = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : ue.openSize, U = (ge = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : ge.refreshDataBlockRequest, { modal: K } = App.useApp(), Y = useForm(), X = useACLActionParamsContext(), {
+    run: J,
+    element: Z,
+    disabled: Q,
+    loading: ne
+  } = (F == null ? void 0 : F(w)) || {}, te = Y.disabled || a.disabled || ((he = a.data) == null ? void 0 : he.disabled) || I || Q, se = useMemo(() => {
+    var fe;
     return P(x({}, v), {
-      opacity: r && (((pe = a == null ? void 0 : a.data) == null ? void 0 : pe.hidden) || !X) && 0.1,
+      opacity: r && (((fe = a == null ? void 0 : a.data) == null ? void 0 : fe.hidden) || !X) && 0.1,
       color: te ? "rgba(0, 0, 0, 0.25)" : v == null ? void 0 : v.color
     });
-  }, [X, r, (ge = a == null ? void 0 : a.data) == null ? void 0 : ge.hidden, v, te]), se = {
+  }, [X, r, (Ce = a == null ? void 0 : a.data) == null ? void 0 : Ce.hidden, v, te]), ce = {
     designable: r,
     field: a,
     aclCtx: X,
     icon: i,
-    loading: typeof Z == "boolean" ? Z : l,
+    loading: typeof ne == "boolean" ? ne : l,
     disabled: te,
-    buttonStyle: re,
+    buttonStyle: se,
     handleMouseEnter: c,
     tarComponent: u,
-    designerProps: V,
+    designerProps: L,
     componentCls: A,
     hashId: E,
     className: d,
@@ -40361,26 +40385,26 @@ const ActionLink = withDynamicSchemaProps(
     refreshDataBlockRequest: U,
     fieldSchema: o,
     setVisible: O,
-    run: Q,
+    run: J,
     confirm: g,
     modal: K,
     setSubmitted: B,
     confirmTitle: f,
     title: y
-  }, ue = useCallback(
-    (pe) => {
-      O == null || O(pe), D == null || D(pe);
+  }, ie = useCallback(
+    (fe) => {
+      O == null || O(fe), D == null || D(fe);
     },
     [D]
   );
-  let le = /* @__PURE__ */ jsx(PopupVisibleProvider, { visible: !1, children: /* @__PURE__ */ jsxs(
+  let re = /* @__PURE__ */ jsx(PopupVisibleProvider, { visible: !1, children: /* @__PURE__ */ jsxs(
     ActionContextProvider,
     {
-      button: RenderButton(se),
+      button: RenderButton(ce),
       visible: R || T,
-      setVisible: ue,
+      setVisible: ie,
       formValueChanged: z,
-      setFormValueChanged: L,
+      setFormValueChanged: V,
       openMode: G,
       openSize: H,
       containerRefKey: n,
@@ -40388,13 +40412,13 @@ const ActionLink = withDynamicSchemaProps(
       setSubmitted: B,
       children: [
         C && /* @__PURE__ */ jsx(NocoBaseRecursionField, { basePath: a.address, onlyRenderProperties: !0, schema: o }),
-        !C && /* @__PURE__ */ jsx(RenderButton, x({}, se)),
+        !C && /* @__PURE__ */ jsx(RenderButton, x({}, ce)),
         /* @__PURE__ */ jsx(VariablePopupRecordProvider, { children: !C && t.children }),
-        ee
+        Z
       ]
     }
   ) });
-  return isBulkEditAction(o) && (le = /* @__PURE__ */ jsx(TabsContextProvider, { children: le })), $(b ? /* @__PURE__ */ jsx(TreeRecordProvider, { parent: S, children: le }) : le);
+  return isBulkEditAction(o) && (re = /* @__PURE__ */ jsx(TabsContextProvider, { children: re })), $(b ? /* @__PURE__ */ jsx(TreeRecordProvider, { parent: S, children: re }) : re);
 });
 InternalAction.displayName = "InternalAction";
 Action.Popover = function e(t) {
@@ -40470,21 +40494,21 @@ const RenderButton = ({
 }) => {
   const { getDataBlockRequest: N } = useDataBlockRequestGetter(), { t: M } = useTranslation(), { isPopupVisibleControlledByURL: j } = usePopupSettings(), { openPopup: R } = usePopupUtils(), O = useVariables$1(), $ = useLocalVariables$1(), A = useRef(null), E = useCompile(), z = useForm();
   A.current = R;
-  const L = {
+  const V = {
     variables: O,
     localVariables: $
-  }, V = useCallback(
+  }, L = useCallback(
     (G, H = !0) => q(void 0, null, function* () {
       var Y;
       if (H && isPortalInBody(G.target))
         return;
       G.preventDefault(), G.stopPropagation();
-      const U = yield getVariableValue(M(F == null ? void 0 : F.title, { title: E(y.title) }), L), K = yield getVariableValue(M(F == null ? void 0 : F.content, { title: E(y.title) }), L);
+      const U = yield getVariableValue(M(F == null ? void 0 : F.title, { title: E(y.title) }), V), K = yield getVariableValue(M(F == null ? void 0 : F.content, { title: E(y.title) }), V);
       if (!a && n) {
         const X = () => {
           b ? b(G, () => {
-            var Q, ee;
-            S !== !1 && (T == null || T(!0), (ee = (Q = N()) == null ? void 0 : Q.refresh) == null || ee.call(Q));
+            var J, Z;
+            S !== !1 && (T == null || T(!0), (Z = (J = N()) == null ? void 0 : J.refresh) == null || Z.call(J));
           }) : isBulkEditAction(y) || !j() ? (v(!0), I == null || I()) : ["view", "update", "create", "customize:popup"].includes(y["x-action"]) && y["x-uid"] ? A.current() : (v(!0), I == null || I());
         };
         (F == null ? void 0 : F.enable) !== !1 && (F != null && F.content) ? (yield (Y = z == null ? void 0 : z.submit) == null ? void 0 : Y.call(z), w.confirm({
@@ -40527,7 +40551,7 @@ const RenderButton = ({
       buttonStyle: i,
       handleMouseEnter: l,
       getAriaLabel: g,
-      handleButtonClick: V,
+      handleButtonClick: L,
       tarComponent: c,
       componentCls: d,
       hashId: p,
@@ -40587,8 +40611,8 @@ const RenderButtonInner = observer$1(
       "onlyIcon"
     ]), { t: F } = useTranslation(), w = useCallback(
       debounce$1(
-        (z, L = !0) => {
-          d(z, L);
+        (z, V = !0) => {
+          d(z, V);
         },
         300,
         { leading: !0, trailing: !1 }
@@ -40601,9 +40625,9 @@ const RenderButtonInner = observer$1(
     const T = useMemo(
       () => React.forwardRef(
         (K, U) => {
-          var Y = K, { component: z = p || Button, icon: L, onlyIcon: V, children: G } = Y, H = W(Y, ["component", "icon", "onlyIcon", "children"]);
+          var Y = K, { component: z = p || Button, icon: V, onlyIcon: L, children: G } = Y, H = W(Y, ["component", "icon", "onlyIcon", "children"]);
           return /* @__PURE__ */ jsxs(z, P(x({ ref: U }, H), { children: [
-            v ? /* @__PURE__ */ jsx(Tooltip, { title: H.title, children: /* @__PURE__ */ jsx("span", { style: { padding: 3 }, children: L && typeof L == "string" ? /* @__PURE__ */ jsx(Icon, { type: L }) : L }) }) : /* @__PURE__ */ jsx("span", { style: { paddingRight: 3 }, children: L && typeof L == "string" ? /* @__PURE__ */ jsx(Icon, { type: L }) : L }),
+            v ? /* @__PURE__ */ jsx(Tooltip, { title: H.title, children: /* @__PURE__ */ jsx("span", { style: { padding: 3 }, children: V && typeof V == "string" ? /* @__PURE__ */ jsx(Icon, { type: V }) : V }) }) : /* @__PURE__ */ jsx("span", { style: { paddingRight: 3 }, children: V && typeof V == "string" ? /* @__PURE__ */ jsx(Icon, { type: V }) : V }),
             v ? G[1] : G
           ] }));
         }
@@ -40957,7 +40981,54 @@ const ReadPrettyInternal = observer$1(
           })
         )
       ),
-      maxTagCount: "responsive"
+      maxTagCount: "responsive",
+      maxTagPlaceholder: (g) => /* @__PURE__ */ jsxs(
+        Tooltip,
+        {
+          title: /* @__PURE__ */ jsx(
+            "div",
+            {
+              style: {
+                display: "flex",
+                flexWrap: "wrap",
+                gap: 6,
+                maxWidth: "100%"
+              },
+              children: g.map((f) => /* @__PURE__ */ jsx(
+                Tag,
+                {
+                  style: {
+                    margin: 0,
+                    background: "#fafafa",
+                    border: "1px solid #d9d9d9",
+                    whiteSpace: "normal",
+                    wordBreak: "break-word",
+                    maxWidth: "100%"
+                  },
+                  children: f.label
+                },
+                f.value
+              ))
+            }
+          ),
+          overlayInnerStyle: {
+            background: "#fff",
+            color: "#000",
+            padding: 8,
+            maxWidth: "100%"
+          },
+          color: "#fff",
+          overlayStyle: {
+            pointerEvents: "auto",
+            maxWidth: 300
+          },
+          children: [
+            "+",
+            g.length,
+            "..."
+          ]
+        }
+      )
     }, u)
   );
 }, filterOption = (e, t) => {
@@ -41022,7 +41093,54 @@ const ReadPrettyInternal = observer$1(
           (g = e.onChange) == null || g.call(e, h === void 0 ? null : h);
         },
         mode: d,
-        maxTagCount: "responsive"
+        maxTagCount: "responsive",
+        maxTagPlaceholder: (h) => /* @__PURE__ */ jsxs(
+          Tooltip,
+          {
+            title: /* @__PURE__ */ jsx(
+              "div",
+              {
+                style: {
+                  display: "flex",
+                  flexWrap: "wrap",
+                  gap: 6,
+                  maxWidth: "100%"
+                },
+                children: h.map((g) => /* @__PURE__ */ jsx(
+                  Tag,
+                  {
+                    style: {
+                      margin: 0,
+                      background: "#fafafa",
+                      border: "1px solid #d9d9d9",
+                      whiteSpace: "normal",
+                      wordBreak: "break-word",
+                      maxWidth: "100%"
+                    },
+                    children: g.label
+                  },
+                  g.value
+                ))
+              }
+            ),
+            overlayInnerStyle: {
+              background: "#fff",
+              color: "#000",
+              padding: 8,
+              maxWidth: "100%"
+            },
+            color: "#fff",
+            overlayStyle: {
+              pointerEvents: "auto",
+              maxWidth: 300
+            },
+            children: [
+              "+",
+              h.length,
+              "..."
+            ]
+          }
+        )
       })
     );
   },
@@ -41072,7 +41190,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
 ), EMPTY$1 = "N/A", InternalRemoteSelect = withDynamicSchemaProps(
   connect(
     (e) => {
-      var Q, ee;
+      var J, Z;
       const X = e, {
         fieldNames: t = {},
         service: n = {},
@@ -41086,7 +41204,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
         CustomDropdownRender: d,
         optionFilter: p,
         dataSource: m,
-        toOptionsItem: h = (J) => J,
+        toOptionsItem: h = (Q) => Q,
         popupMatchSelectWidth: g = !1,
         onSuccess: f
       } = X, C = W(X, [
@@ -41105,39 +41223,39 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
         "toOptionsItem",
         "popupMatchSelectWidth",
         "onSuccess"
-      ]), b = useDataSourceKey(), S = useDataSourceHeaders(m || b), y = useRef(!1), v = useFieldSchema(), I = ((Q = v["x-component-props"]) == null ? void 0 : Q.addMode) === "quickAdd", { getField: F } = useCollection_deprecated(), w = useRef(null), { getCollectionJoinField: T, getInterface: D } = useCollectionManager_deprecated(), B = v["x-collection-field"] || v.name, N = F(B) || T(B), M = u || (N == null ? void 0 : N.target) && (t == null ? void 0 : t.label) && T(`${N.target}.${t.label}`), j = useMemo(() => {
-        var J;
+      ]), b = useDataSourceKey(), S = useDataSourceHeaders(m || b), y = useRef(!1), v = useFieldSchema(), I = ((J = v["x-component-props"]) == null ? void 0 : J.addMode) === "quickAdd", { getField: F } = useCollection_deprecated(), w = useRef(null), { getCollectionJoinField: T, getInterface: D } = useCollectionManager_deprecated(), B = v["x-collection-field"] || v.name, N = F(B) || T(B), M = u || (N == null ? void 0 : N.target) && (t == null ? void 0 : t.label) && T(`${N.target}.${t.label}`), j = useMemo(() => {
+        var Q;
         if (M != null && M.interface) {
-          const Z = D(M.interface), te = ((J = Z == null ? void 0 : Z.filterable) == null ? void 0 : J.operators[0].value) || "$includes";
+          const ne = D(M.interface), te = ((Q = ne == null ? void 0 : ne.filterable) == null ? void 0 : Q.operators[0].value) || "$includes";
           return M.type === "string" || M.dataType === "string" ? "$includes" : te;
         }
         return "$includes";
       }, [M]), R = useCompile(), O = useCallback(
-        (J) => {
+        (Q) => {
           try {
-            return J.filter((Z) => ["number", "string"].includes(typeof Z[t.value]) || !Z[t.value]).map((Z) => {
-              var re;
-              let te = R(Z[t.label]);
-              if ((re = M == null ? void 0 : M.uiSchema) != null && re.enum)
+            return Q.filter((ne) => ["number", "string"].includes(typeof ne[t.value]) || !ne[t.value]).map((ne) => {
+              var se;
+              let te = R(ne[t.label]);
+              if ((se = M == null ? void 0 : M.uiSchema) != null && se.enum)
                 if (Array.isArray(te))
-                  te = te.map((se, ue) => {
-                    const le = M.uiSchema.enum.find((me) => me.value === se);
-                    return le ? /* @__PURE__ */ jsx(Tag, { role: "button", color: le.color, style: { marginRight: 3 }, children: (le == null ? void 0 : le.label) || se }, ue) : /* @__PURE__ */ jsx(Tag, { role: "button", children: se }, se);
+                  te = te.map((ce, ie) => {
+                    const re = M.uiSchema.enum.find((de) => de.value === ce);
+                    return re ? /* @__PURE__ */ jsx(Tag, { role: "button", color: re.color, style: { marginRight: 3 }, children: (re == null ? void 0 : re.label) || ce }, ie) : /* @__PURE__ */ jsx(Tag, { role: "button", children: ce }, ce);
                   }).reverse();
                 else {
-                  const se = M.uiSchema.enum.find((ue) => ue.value === te);
-                  se && (te = /* @__PURE__ */ jsx(Tag, { role: "button", color: se.color, children: se.label }));
+                  const ce = M.uiSchema.enum.find((ie) => ie.value === te);
+                  ce && (te = /* @__PURE__ */ jsx(Tag, { role: "button", color: ce.color, children: ce.label }));
                 }
               return (M == null ? void 0 : M.type) === "date" && (te = dayjs(te).format("YYYY-MM-DD")), c ? c({
                 [t.label]: te || EMPTY$1,
-                [t.value]: Z[t.value]
-              }) : P(x({}, omit(Z, "style")), {
+                [t.value]: ne[t.value]
+              }) : P(x({}, omit(ne, "style")), {
                 [t.label]: te || EMPTY$1,
-                [t.value]: Z[t.value]
+                [t.value]: ne[t.value]
               });
             }).filter(Boolean);
-          } catch (Z) {
-            return console.error(Z), J;
+          } catch (ne) {
+            return console.error(ne), Q;
           }
         },
         [M == null ? void 0 : M.uiSchema, t]
@@ -41149,7 +41267,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
           params: P(x({
             pageSize: 200
           }, n == null ? void 0 : n.params), {
-            filter: (ee = n == null ? void 0 : n.params) == null ? void 0 : ee.filter
+            filter: (Z = n == null ? void 0 : n.params) == null ? void 0 : Z.filter
           })
         }),
         x({
@@ -41159,8 +41277,8 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
         }, n.defaultParams ? { defaultParams: [n.defaultParams] } : {})
       ), {
         data: z,
-        run: L,
-        loading: V
+        run: V,
+        loading: L
       } = useRequest(
         P(x({
           action: "get"
@@ -41189,29 +41307,29 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
       useEffect(() => {
         y.current && A();
       }, [G]), useEffect(() => {
-        !i && ($ != null && $.data) && ($ != null && $.data.some((J) => J[t.value] === r) || L({
+        !i && ($ != null && $.data) && ($ != null && $.data.some((Q) => Q[t.value] === r) || V({
           filterByTk: r
         }));
       }, [r, $ == null ? void 0 : $.data]);
-      const U = (J) => q(void 0, null, function* () {
-        var Z;
+      const U = (Q) => q(void 0, null, function* () {
+        var ne;
         A({
           filter: mergeFilter([
-            J ? {
+            Q ? {
               [t.label]: {
-                [j]: J
+                [j]: Q
               }
             } : {},
-            (Z = n == null ? void 0 : n.params) == null ? void 0 : Z.filter
+            (ne = n == null ? void 0 : n.params) == null ? void 0 : ne.filter
           ])
-        }), w.current = J;
+        }), w.current = Q;
       }), K = useMemo(() => {
-        var re;
-        const J = i ? r || a : z == null ? void 0 : z.data;
-        if (!((re = $ == null ? void 0 : $.data) != null && re.length))
-          return J != null ? Array.isArray(J) ? J : [J] : [];
-        const Z = J != null && (Array.isArray(J) ? J.map((se) => P(x({}, se), { [t.value]: se[t.value] || se })) : [P(x({}, J), { [t.value]: J[t.value] || J })]) || [], te = typeof p == "function" ? $.data.filter(p) : $.data;
-        return uniqBy(te.concat(Z != null ? Z : []), t.value);
+        var se;
+        const Q = i ? r || a : z == null ? void 0 : z.data;
+        if (!((se = $ == null ? void 0 : $.data) != null && se.length))
+          return Q != null ? Array.isArray(Q) ? Q : [Q] : [];
+        const ne = Q != null && (Array.isArray(Q) ? Q.map((ce) => P(x({}, ce), { [t.value]: ce[t.value] || ce })) : [P(x({}, Q), { [t.value]: Q[t.value] || Q })]) || [], te = typeof p == "function" ? $.data.filter(p) : $.data;
+        return uniqBy(te.concat(ne != null ? ne : []), t.value);
       }, [r, a, $ == null ? void 0 : $.data, t.value, p, z == null ? void 0 : z.data]);
       return /* @__PURE__ */ jsx(
         Select,
@@ -41222,8 +41340,8 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
           filterSort: null,
           fieldNames: t,
           onSearch: U,
-          onDropdownVisibleChange: (J) => {
-            w.current = null, J && A(), y.current = !0;
+          onDropdownVisibleChange: (Q) => {
+            w.current = null, Q && A(), y.current = !0;
           },
           objectValue: i,
           value: r,
@@ -41232,13 +41350,13 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
           loading: $ ? E : !0,
           options: h(O(K)),
           rawOptions: K,
-          dropdownRender: (J) => {
-            const Z = K.some((te) => te[t.label] === w.current);
+          dropdownRender: (Q) => {
+            const ne = K.some((te) => te[t.label] === w.current);
             return /* @__PURE__ */ jsx(Fragment$1, { children: I ? /* @__PURE__ */ jsxs(Fragment$1, { children: [
-              !(($ == null ? void 0 : $.data.length) === 0 && (w != null && w.current)) && J,
-              ($ == null ? void 0 : $.data.length) > 0 && (w == null ? void 0 : w.current) && !Z && /* @__PURE__ */ jsx(Divider$1, { style: { margin: 0 } }),
-              !Z && /* @__PURE__ */ jsx(H, {})
-            ] }) : J });
+              !(($ == null ? void 0 : $.data.length) === 0 && (w != null && w.current)) && Q,
+              ($ == null ? void 0 : $.data.length) > 0 && (w == null ? void 0 : w.current) && !ne && /* @__PURE__ */ jsx(Divider$1, { style: { margin: 0 } }),
+              !ne && /* @__PURE__ */ jsx(H, {})
+            ] }) : Q });
           }
         })
       );
@@ -43233,7 +43351,15 @@ const className1 = css`
 }, PageContent = memo((e) => /* @__PURE__ */ jsx(PopupRouteContextResetter, { children: /* @__PURE__ */ jsx(InternalPageContent, x({}, e)) })), TabBadge = (e) => {
   var n, o, r;
   const t = useEvaluatedExpression((o = (n = e.tabRoute.options) == null ? void 0 : n.badge) == null ? void 0 : o.count);
-  return t == null ? null : /* @__PURE__ */ jsx(Badge, P(x({}, (r = e.tabRoute.options) == null ? void 0 : r.badge), { count: t, style: x({ maxWidth: "10em" }, e.style), dot: !1, children: e.children }));
+  return t == null ? null : /* @__PURE__ */ jsx(
+    Badge,
+    P(x({}, (r = e.tabRoute.options) == null ? void 0 : r.badge), {
+      count: t,
+      style: x({ maxWidth: "10em" }, e.style),
+      dot: !1,
+      children: e.children
+    })
+  );
 }, NocoBasePageHeaderTabs = ({ className: e, activeKey: t }) => {
   const n = useFieldSchema(), { t: o } = useTranslation(), { t: r } = useRouteTranslation(), { token: a } = useToken$1(), i = useRouterBasename(), l = useNavigateNoUpdate(), c = useCallback(
     (I) => {
@@ -43734,8 +43860,8 @@ const FieldsTreeSelect = (e) => {
           break;
         }
         if (!A.isLeaf && A.loadChildren) {
-          const L = A.loadChildren(A);
-          L != null && L.length && (R.push(...L), A = L.find((V) => V.value === $.slice(0, E + 1).join(".")));
+          const V = A.loadChildren(A);
+          V != null && V.length && (R.push(...V), A = V.find((L) => L.value === $.slice(0, E + 1).join(".")));
         }
       }
     }), g((O) => R.reduce(($, A) => Object.assign($, { [A.value]: A }), x({}, O)));
@@ -43827,9 +43953,9 @@ const InternalAssociationSelect$1 = observer$1(
       const N = uid();
       return f.addEffects(N, () => {
         onFieldInputValueChange("*", (M) => {
-          var $, A, E, z, L, V;
+          var $, A, E, z, V, L;
           const j = filterAnalyses((E = (A = ($ = r.componentProps) == null ? void 0 : $.service) == null ? void 0 : A.params) == null ? void 0 : E.filter) || [], R = getFieldPath(M.address.entire), O = getFieldPath(r.address.entire);
-          j.includes((z = M == null ? void 0 : M.props) == null ? void 0 : z.name) && r.value && isEqual(M == null ? void 0 : M.indexes, r == null ? void 0 : r.indexes) && ((L = M == null ? void 0 : M.props) == null ? void 0 : L.name) !== r.props.name && (!((V = r == null ? void 0 : r.indexes) != null && V.length) || isEqual(R, O)) && (r.setValue(null), p(null));
+          j.includes((z = M == null ? void 0 : M.props) == null ? void 0 : z.name) && r.value && isEqual(M == null ? void 0 : M.indexes, r == null ? void 0 : r.indexes) && ((V = M == null ? void 0 : M.props) == null ? void 0 : V.name) !== r.props.name && (!((L = r == null ? void 0 : r.indexes) != null && L.length) || isEqual(R, O)) && (r.setValue(null), p(null));
         });
       }), () => {
         f.removeEffects(N);
@@ -44994,13 +45120,13 @@ const InternalFileManager = (e) => {
           let O = p(R[y.label]);
           if (($ = v == null ? void 0 : v.uiSchema) != null && $.enum)
             if (Array.isArray(O))
-              O = O.map((z, L) => {
+              O = O.map((z, V) => {
                 var G, H;
-                const V = (H = (G = v.uiSchema.enum).find) == null ? void 0 : H.call(G, (U) => U.value === z);
-                return V ? /* @__PURE__ */ jsx(Tag, { color: V.color, style: { marginRight: 3 }, children: (V == null ? void 0 : V.label) || z }, L) : /* @__PURE__ */ jsx(Tag, { children: z }, z);
+                const L = (H = (G = v.uiSchema.enum).find) == null ? void 0 : H.call(G, (U) => U.value === z);
+                return L ? /* @__PURE__ */ jsx(Tag, { color: L.color, style: { marginRight: 3 }, children: (L == null ? void 0 : L.label) || z }, V) : /* @__PURE__ */ jsx(Tag, { children: z }, z);
               }).reverse();
             else {
-              const z = (E = (A = v.uiSchema.enum).find) == null ? void 0 : E.call(A, (L) => L.value === O);
+              const z = (E = (A = v.uiSchema.enum).find) == null ? void 0 : E.call(A, (V) => V.value === O);
               z && (O = /* @__PURE__ */ jsx(Tag, { color: z.color, children: z.label }));
             }
           return (v == null ? void 0 : v.type) === "date" && (O = dayjs(O).format("YYYY-MM-DD")), n ? n({
@@ -45039,8 +45165,8 @@ const InternalFileManager = (e) => {
       d(!0);
       const z = yield T({ parentId: R == null ? void 0 : R.key });
       if (d(!1), c(z), O === (a == null ? void 0 : a.length) - 1 && (($ = R == null ? void 0 : R.value) != null && $.id)) {
-        const L = yield T({ parentId: (A = R == null ? void 0 : R.value) == null ? void 0 : A.id }), V = [...a];
-        V.splice(O + 1), V[O] = P(x({}, V[O]), { value: R == null ? void 0 : R.value }), V[O + 1] = { key: (E = R == null ? void 0 : R.value) == null ? void 0 : E.id, children: (L == null ? void 0 : L.length) > 0 ? L : null }, i(V), o == null || o(V);
+        const V = yield T({ parentId: (A = R == null ? void 0 : R.value) == null ? void 0 : A.id }), L = [...a];
+        L.splice(O + 1), L[O] = P(x({}, L[O]), { value: R == null ? void 0 : R.value }), L[O + 1] = { key: (E = R == null ? void 0 : R.value) == null ? void 0 : E.id, children: (V == null ? void 0 : V.length) > 0 ? V : null }, i(L), o == null || o(L);
       }
     }
   }), N = (j, R) => q(void 0, null, function* () {
@@ -45377,9 +45503,9 @@ const useTableSelectorProps$2 = () => {
 }, InternalPicker = observer$1(
   (e) => {
     var z;
-    const E = e, { value: t, multiple: n, openSize: o, onChange: r, quickUpload: a, selectFile: i, shouldMountElement: l } = E, c = W(E, ["value", "multiple", "openSize", "onChange", "quickUpload", "selectFile", "shouldMountElement"]), u = useField(), d = useFieldNames$1(e), [p, m] = useState(!1), h = useFieldSchema(), g = useInsertSchema$1("Selector"), { options: f } = useAssociationFieldContext(), { collectionName: C } = useFormBlockContext(), b = useCompile(), S = useLabelUiSchema$1(f, (d == null ? void 0 : d.label) || "label"), y = h["x-add-new"], [v, I] = useState([]), F = useCollectionRecordData(), w = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((V) => {
-      const G = V == null ? void 0 : V[d.label];
-      return P(x({}, V), {
+    const E = e, { value: t, multiple: n, openSize: o, onChange: r, quickUpload: a, selectFile: i, shouldMountElement: l } = E, c = W(E, ["value", "multiple", "openSize", "onChange", "quickUpload", "selectFile", "shouldMountElement"]), u = useField(), d = useFieldNames$1(e), [p, m] = useState(!1), h = useFieldSchema(), g = useInsertSchema$1("Selector"), { options: f } = useAssociationFieldContext(), { collectionName: C } = useFormBlockContext(), b = useCompile(), S = useLabelUiSchema$1(f, (d == null ? void 0 : d.label) || "label"), y = h["x-add-new"], [v, I] = useState([]), F = useCollectionRecordData(), w = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((L) => {
+      const G = L == null ? void 0 : L[d.label];
+      return P(x({}, L), {
         [d.label]: getLabelFormatValue$1(b(S), b(G))
       });
     }) : [], [t == null ? void 0 : t.length, d.label]), T = {
@@ -45396,29 +45522,29 @@ const useTableSelectorProps$2 = () => {
       collectionField: f,
       currentFormCollection: C
     }, { isMobileLayout: D } = useMobileLayout(), B = () => {
-      var L;
-      return n == null ? null : Array.isArray(t) ? (L = t.filter(Boolean)) == null ? void 0 : L.map((V) => V == null ? void 0 : V[d.value]) : t == null ? void 0 : t[d.value];
+      var V;
+      return n == null ? null : Array.isArray(t) ? (V = t.filter(Boolean)) == null ? void 0 : V.map((L) => L == null ? void 0 : L[d.value]) : t == null ? void 0 : t[d.value];
     }, N = () => {
-      var L;
-      return n == null ? null : Array.isArray(t) ? (L = t.filter(Boolean)) == null ? void 0 : L.map((V) => ({
-        [d.label]: b(V == null ? void 0 : V[d.label]),
-        [d.value]: V == null ? void 0 : V[d.value]
+      var V;
+      return n == null ? null : Array.isArray(t) ? (V = t.filter(Boolean)) == null ? void 0 : V.map((L) => ({
+        [d.label]: b(L == null ? void 0 : L[d.label]),
+        [d.value]: L == null ? void 0 : L[d.value]
       })) : [{ [d.label]: b(t == null ? void 0 : t[d.label]), [d.value]: t == null ? void 0 : t[d.value] }];
     }, M = () => {
-      const L = (f == null ? void 0 : f.targetKey) || "id", V = w.map((H) => H[L]).filter(Boolean);
-      return V.length ? { $and: [{ [`${L}.$ne`]: V }] } : {};
+      const V = (f == null ? void 0 : f.targetKey) || "id", L = w.map((H) => H[V]).filter(Boolean);
+      return L.length ? { $and: [{ [`${V}.$ne`]: L }] } : {};
     };
     useEffect(() => {
       t || I([]);
     }, [t]);
     const j = () => {
-      const { setVisible: L } = useActionContext(), { multiple: V, selectedRows: G, onChange: H, options: U, collectionField: K } = useContext(RecordPickerContext);
+      const { setVisible: V } = useActionContext(), { multiple: L, selectedRows: G, onChange: H, options: U, collectionField: K } = useContext(RecordPickerContext);
       return {
         onClick() {
-          H(V ? unionBy(G, U, (K == null ? void 0 : K.targetKey) || "id") : (G == null ? void 0 : G[0]) || null), L(!1);
+          H(L ? unionBy(G, U, (K == null ? void 0 : K.targetKey) || "id") : (G == null ? void 0 : G[0]) || null), V(!1);
         },
         style: {
-          display: V === !1 ? "none" : "block"
+          display: L === !1 ? "none" : "block"
         }
       };
     }, R = useMemo(
@@ -45447,23 +45573,23 @@ const useTableSelectorProps$2 = () => {
           }, c), {
             mode: n ? "multiple" : e.mode,
             fieldNames: d,
-            onDropdownVisibleChange: (L) => {
+            onDropdownVisibleChange: (V) => {
               g(schema$1.Selector), m(!0);
             },
             allowClear: !0,
-            onChange: (L) => {
-              if (L) {
-                if (Array.isArray(L)) {
-                  if (!L.length) {
+            onChange: (V) => {
+              if (V) {
+                if (Array.isArray(V)) {
+                  if (!V.length) {
                     r([]), I([]);
                     return;
                   }
-                  const V = w == null ? void 0 : w.filter((G) => L.includes(G[d.value]));
-                  r(V), I(V);
+                  const L = w == null ? void 0 : w.filter((G) => V.includes(G[d.value]));
+                  r(L), I(L);
                 }
               } else {
-                const V = n ? [] : null;
-                r(V), I(V);
+                const L = n ? [] : null;
+                r(L), I(L);
               }
             },
             options: N(),
@@ -45477,7 +45603,7 @@ const useTableSelectorProps$2 = () => {
             onlyRenderProperties: !0,
             basePath: u.address,
             schema: h,
-            filterProperties: (L) => L["x-component"] === "Action"
+            filterProperties: (V) => V["x-component"] === "Action"
           }
         ) }) })
       ] }),
@@ -45496,7 +45622,7 @@ const useTableSelectorProps$2 = () => {
               onlyRenderProperties: !0,
               basePath: u.address,
               schema: O,
-              filterProperties: (L) => L["x-component"] === "AssociationField.Selector"
+              filterProperties: (V) => V["x-component"] === "AssociationField.Selector"
             }
           ) }) }) }) }) }))
         }
@@ -45787,10 +45913,21 @@ const getSourceData = (e, t) => {
               .ant-table-tbody .nb-column-initializer {
                 min-width: 40px !important;
               }
+              .ant-formily-item-feedback-layout-terse {
+                margin-bottom: 0px;
+              }
+              .ant-formily-item-error-help {
+                box-shadow: none !important;
+                background: none !important;
+                overflow-x: hidden;
+              }
+              .ant-formily-item-control:has(.ant-formily-item-error-help) .ant-formily-item-control-content-component {
+                margin-bottom: 13px !important;
+              }
             `,
         layout: "vertical",
         bordered: !1,
-        feedbackLayout: "popover",
+        feedbackLayout: "terse",
         children: /* @__PURE__ */ jsx(
           SchemaOptionsContext.Provider,
           {
@@ -46873,8 +47010,8 @@ const useColumnsDeepMemoized = (e) => {
 InternalNocoBaseTable.displayName = "InternalNocoBaseTable";
 const Table$1 = withDynamicSchemaProps(
   observer$1((e) => {
-    var pe, be, ye;
-    const { token: t } = useToken$1(), he = omit(e, ["onBlur", "onFocus", "value"]), { pagination: n, useProps: o } = he, r = W(he, ["pagination", "useProps"]), fe = (o == null ? void 0 : o()) || {}, { pagination: a } = fe, i = W(fe, ["pagination"]), ge = x(x({}, r), i), {
+    var fe, be, ye;
+    const { token: t } = useToken$1(), ge = omit(e, ["onBlur", "onFocus", "value"]), { pagination: n, useProps: o } = ge, r = W(ge, ["pagination", "useProps"]), he = (o == null ? void 0 : o()) || {}, { pagination: a } = he, i = W(he, ["pagination"]), Ce = x(x({}, r), i), {
       dragSort: l = !1,
       showIndex: c = !0,
       onRowSelectionChange: u,
@@ -46886,7 +47023,7 @@ const Table$1 = withDynamicSchemaProps(
       loading: f,
       onClickRow: C,
       enableIndexColumn: b
-    } = ge, S = W(ge, [
+    } = Ce, S = W(Ce, [
       "dragSort",
       "showIndex",
       "onRowSelectionChange",
@@ -46898,19 +47035,19 @@ const Table$1 = withDynamicSchemaProps(
       "loading",
       "onClickRow",
       "enableIndexColumn"
-    ]), y = useArrayField(S), v = useFieldSchema(), { size: I = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, F = useCollection(), T = ((pe = v == null ? void 0 : v.parent) == null ? void 0 : pe["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: B } = T, N = useMemoizedFn(S.onRowDragEnd || (() => {
-    })), M = usePaginationProps$2(n, a), j = useTableColumns$1(S, M), [R, O] = useState(() => D ? B : []), [$, A] = useState(((be = y == null ? void 0 : y.data) == null ? void 0 : be.selectedRowKeys) || []), [E, z] = useState([]), L = (p == null ? void 0 : p.type) !== "none", V = useRef(/* @__PURE__ */ new Map()), G = useMemo(() => css`
+    ]), y = useArrayField(S), v = useFieldSchema(), { size: I = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, F = useCollection(), T = ((fe = v == null ? void 0 : v.parent) == null ? void 0 : fe["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: B } = T, N = useMemoizedFn(S.onRowDragEnd || (() => {
+    })), M = usePaginationProps$2(n, a), j = useTableColumns$1(S, M), [R, O] = useState(() => D ? B : []), [$, A] = useState(((be = y == null ? void 0 : y.data) == null ? void 0 : be.selectedRowKeys) || []), [E, z] = useState([]), V = (p == null ? void 0 : p.type) !== "none", L = useRef(/* @__PURE__ */ new Map()), G = useMemo(() => css`
         & > td {
           background-color: ${t.controlItemBgActive} !important;
         }
         &:hover > td {
           background-color: ${t.controlItemBgActiveHover} !important;
         }
-      `, [t.controlItemBgActive, t.controlItemBgActiveHover]), H = useMemo(() => C ? G : "", [G, C]), U = useMemo(() => C ? (ae, ne) => ({
+      `, [t.controlItemBgActive, t.controlItemBgActiveHover]), H = useMemo(() => C ? G : "", [G, C]), U = useMemo(() => C ? (ae, ee) => ({
       onClick: (oe) => {
         isPortalInBody(oe.target) || C(ae, z, E);
       },
-      rowIndex: ne
+      rowIndex: ee
     }) : null, [C, E]);
     useDeepCompareEffect(() => {
       const ae = D ? B : [];
@@ -46921,73 +47058,73 @@ const Table$1 = withDynamicSchemaProps(
         return Y(ae);
       if (ae.key)
         return ae.key;
-      if (V.current.has(ae))
-        return V.current.get(ae);
-      const ne = uid();
-      return V.current.set(ae, ne), ne;
+      if (L.current.has(ae))
+        return L.current.get(ae);
+      const ee = uid();
+      return L.current.set(ae, ee), ee;
     }, []), Y = useCallback(
       (ae) => {
-        var ne;
+        var ee;
         return Array.isArray(m) ? m.map((oe) => {
-          var ie;
-          return ((ie = ae[oe]) == null ? void 0 : ie.toString()) || "";
-        }).join("-") : typeof m == "string" ? ae[m] : (ne = (m != null ? m : K)(ae)) == null ? void 0 : ne.toString();
+          var le;
+          return ((le = ae[oe]) == null ? void 0 : le.toString()) || "";
+        }).join("-") : typeof m == "string" ? ae[m] : (ee = (m != null ? m : K)(ae)) == null ? void 0 : ee.toString();
       },
       [JSON.stringify(m), K]
-    ), X = useMemo(() => (Array.isArray(y == null ? void 0 : y.value) ? y.value : []).filter(Boolean), [y == null ? void 0 : y.value, (ye = y == null ? void 0 : y.value) == null ? void 0 : ye.length]), Q = useMemo(() => (ae) => {
-      const ne = useCallback((oe) => {
+    ), X = useMemo(() => (Array.isArray(y == null ? void 0 : y.value) ? y.value : []).filter(Boolean), [y == null ? void 0 : y.value, (ye = y == null ? void 0 : y.value) == null ? void 0 : ye.length]), J = useMemo(() => (ae) => {
+      const ee = useCallback((oe) => {
         var Ae, ve, Pe, Fe, Ie, ke;
         if (!oe.active || !oe.over) {
           console.warn("move cancel");
           return;
         }
-        const ie = (Pe = (ve = (Ae = oe.active) == null ? void 0 : Ae.data.current) == null ? void 0 : ve.sortable) == null ? void 0 : Pe.index, ce = (ke = (Ie = (Fe = oe.over) == null ? void 0 : Fe.data.current) == null ? void 0 : Ie.sortable) == null ? void 0 : ke.index, de = y.value[ie] || oe.active, Se = y.value[ce] || oe.over;
-        y.move(ie, ce), N({ from: de, to: Se });
+        const le = (Pe = (ve = (Ae = oe.active) == null ? void 0 : Ae.data.current) == null ? void 0 : ve.sortable) == null ? void 0 : Pe.index, me = (ke = (Ie = (Fe = oe.over) == null ? void 0 : Fe.data.current) == null ? void 0 : Ie.sortable) == null ? void 0 : ke.index, xe = y.value[le] || oe.active, Se = y.value[me] || oe.over;
+        y.move(le, me), N({ from: xe, to: Se });
       }, []);
-      return /* @__PURE__ */ jsx(DndContext, { onDragEnd: ne, children: /* @__PURE__ */ jsx("tbody", x({}, ae)) });
+      return /* @__PURE__ */ jsx(DndContext, { onDragEnd: ee, children: /* @__PURE__ */ jsx("tbody", x({}, ae)) });
     }, [y, N]);
-    Q.displayName = "BodyWrapperComponent";
-    const ee = useMemo(() => ({
+    J.displayName = "BodyWrapperComponent";
+    const Z = useMemo(() => ({
       header: {
         wrapper: HeaderWrapperComponent,
         cell: HeaderCellComponent
       },
       body: {
-        wrapper: Q,
+        wrapper: J,
         row: BodyRowComponent,
         cell: BodyCellComponent
       }
-    }), [Q]), J = useMemo(() => p, [JSON.stringify(p)]), Z = useMemo(
+    }), [J]), Q = useMemo(() => p, [JSON.stringify(p)]), ne = useMemo(
       () => ({
-        rowSelection: b && J ? x({
+        rowSelection: b && Q ? x({
           type: "checkbox",
           selectedRowKeys: $,
-          onChange(ae, ne) {
-            y.data = y.data || {}, y.data.selectedRowKeys = ae, y.data.selectedRowData = ne, A(ae), u == null || u(ae, ne);
+          onChange(ae, ee) {
+            y.data = y.data || {}, y.data.selectedRowKeys = ae, y.data.selectedRowData = ee, A(ae), u == null || u(ae, ee);
           },
           getCheckboxProps(ae) {
             return {
               "aria-label": "checkbox"
             };
           },
-          renderCell: (ae, ne, oe, ie) => {
+          renderCell: (ae, ee, oe, le) => {
             if (!l && !c)
-              return ie;
-            const ce = M == null ? void 0 : M.current, de = (M == null ? void 0 : M.pageSize) || 20;
-            return ce ? oe = oe + (ce - 1) * de + 1 : oe = oe + 1, ne.__index && (oe = extractIndex(ne.__index)), /* @__PURE__ */ jsxs(
+              return le;
+            const me = M == null ? void 0 : M.current, xe = (M == null ? void 0 : M.pageSize) || 20;
+            return me ? oe = oe + (me - 1) * xe + 1 : oe = oe + 1, ee.__index && (oe = extractIndex(ee.__index)), /* @__PURE__ */ jsxs(
               "div",
               {
                 role: "button",
                 "aria-label": `table-index-${oe}`,
                 className: cls(ae ? "checked" : null, rowSelectCheckboxWrapperClass, {
-                  [rowSelectCheckboxWrapperClassHover]: L
+                  [rowSelectCheckboxWrapperClassHover]: V
                 }),
                 children: [
                   /* @__PURE__ */ jsxs("div", { className: cls(ae ? "checked" : null, rowSelectCheckboxContentClass), children: [
-                    l && /* @__PURE__ */ jsx(SortHandle$1, { id: Y(ne) }),
+                    l && /* @__PURE__ */ jsx(SortHandle$1, { id: Y(ee) }),
                     c && /* @__PURE__ */ jsx(TableIndex$2, { index: oe })
                   ] }),
-                  L && /* @__PURE__ */ jsx(
+                  V && /* @__PURE__ */ jsx(
                     "div",
                     {
                       className: cls(
@@ -46995,77 +47132,77 @@ const Table$1 = withDynamicSchemaProps(
                         ae ? "checked" : null,
                         rowSelectCheckboxCheckedClassHover
                       ),
-                      children: ie
+                      children: le
                     }
                   )
                 ]
               }
             );
           }
-        }, J) : void 0
+        }, Q) : void 0
       }),
       [
-        J,
+        Q,
         $,
         u,
         c,
         l,
         y,
         Y,
-        L,
-        J,
+        V,
+        Q,
         M,
         b
       ]
     ), te = useCallback(
       ({ children: ae }) => {
-        var ne, oe;
+        var ee, oe;
         return l ? React.createElement(
           SortableContext$1,
           {
-            items: ((oe = (ne = y.value) == null ? void 0 : ne.map) == null ? void 0 : oe.call(ne, Y)) || []
+            items: ((oe = (ee = y.value) == null ? void 0 : ee.map) == null ? void 0 : oe.call(ee, Y)) || []
           },
           ae
         ) : React.createElement(React.Fragment, {}, ae);
       },
       [y, l, Y]
-    ), { height: re, tableSizeRefCallback: se } = useTableSize(), ue = useMemo(() => ({
+    ), { height: se, tableSizeRefCallback: ce } = useTableSize(), ie = useMemo(() => ({
       x: "max-content"
-    }), []), le = useMemo(() => ({
+    }), []), re = useMemo(() => ({
       x: "max-content",
-      y: X.length > 0 ? re : void 0
-    }), [re, ue, X]), me = useCallback(
+      y: X.length > 0 ? se : void 0
+    }), [se, ie, X]), de = useCallback(
       (ae) => E.includes(ae[m]) ? H : "",
       [E, H, JSON.stringify(m)]
-    ), xe = useCallback(
-      (ae, ne) => {
-        const oe = ae ? [...R, ne[F.getPrimaryKey()]] : R.filter((ie) => ne[F.getPrimaryKey()] !== ie);
-        O(oe), g == null || g(ae, ne);
+    ), pe = useCallback(
+      (ae, ee) => {
+        const oe = ae ? [...R, ee[F.getPrimaryKey()]] : R.filter((le) => ee[F.getPrimaryKey()] !== le);
+        O(oe), g == null || g(ae, ee);
       },
       [R, g, F]
-    ), Ce = useMemo(() => ({
-      onExpand: xe,
+    ), ue = useMemo(() => ({
+      onExpand: pe,
       expandedRowKeys: R
-    }), [R, xe]);
+    }), [R, pe]);
     return (
       // If spinning is set to undefined, it will cause the subtable to always display loading, so we need to convert it here
       /* @__PURE__ */ jsx(Spin, { spinning: !!f, children: /* @__PURE__ */ jsx(
         InternalNocoBaseTable,
         P(x(x({
-          tableHeight: re,
+          tableHeight: se,
           SortableWrapper: te,
-          tableSizeRefCallback: se,
+          tableSizeRefCallback: ce,
           defaultRowKey: K,
           dataSource: X
-        }, S), Z), {
+        }, S), ne), {
           paginationProps: M,
-          components: ee,
+          components: Z,
           onTableChange: d,
           onRow: U,
-          rowClassName: me,
-          scroll: le,
+          rowClassName: de,
+          scroll: re,
           columns: j,
-          expandable: Ce,
+          expandable: ue,
           field: y,
           size: I
         })
@@ -47128,20 +47265,20 @@ const Table$1 = withDynamicSchemaProps(
     var A, E, z;
     const { openSize: t } = e, { field: n, options: o, fieldSchema: r } = useAssociationFieldContext(), { t: a } = useTranslation(), [i, l] = useState(!1), [c, u] = useState([]), d = useFieldNames$1(e), p = useFieldSchema(), m = useCompile(), h = useLabelUiSchema$1(o, (d == null ? void 0 : d.label) || "label"), g = useCollectionRecord(), f = useCollection(), { allowSelectExistingRecord: C, allowAddnew: b, allowDisassociation: S, enableIndexColumn: y } = n.componentProps;
     useSubTableSpecialCase({ rootField: n, rootSchema: r });
-    const v = (L, V) => {
-      if (V !== void 0 && isArr(n.value) && L !== V)
+    const v = (V, L) => {
+      if (L !== void 0 && isArr(n.value) && V !== L)
         return action(() => {
-          const G = n.value[L];
-          return n.value.splice(L, 1), n.value.splice(V, 0, G), exchangeArrayState(n, {
-            fromIndex: L,
-            toIndex: V
+          const G = n.value[V];
+          return n.value.splice(V, 1), n.value.splice(L, 0, G), exchangeArrayState(n, {
+            fromIndex: V,
+            toIndex: L
           }), n.onInput(n.value);
         });
     };
     n.move = v;
-    const I = useMemo(() => n.value && Object.keys(n.value).length > 0 ? (Array.isArray(n.value) ? n.value : n.value ? [n.value] : []).filter(Boolean).map((V) => {
-      const G = V == null ? void 0 : V[d.label];
-      return P(x({}, V), {
+    const I = useMemo(() => n.value && Object.keys(n.value).length > 0 ? (Array.isArray(n.value) ? n.value : n.value ? [n.value] : []).filter(Boolean).map((L) => {
+      const G = L == null ? void 0 : L[d.label];
+      return P(x({}, L), {
         [d.label]: getLabelFormatValue$1(m(h), m(G))
       });
     }) : [], [n.value, d == null ? void 0 : d.label]), F = {
@@ -47157,28 +47294,28 @@ const Table$1 = withDynamicSchemaProps(
       setSelectedRows: u,
       collectionField: o
     }, w = () => {
-      const { setVisible: L } = useActionContext(), { selectedRows: V, setSelectedRows: G } = useContext(RecordPickerContext);
+      const { setVisible: V } = useActionContext(), { selectedRows: L, setSelectedRows: G } = useContext(RecordPickerContext);
       return {
         onClick() {
           var U;
-          Array.isArray(n.value) || (n.value = []), V.forEach((K) => n.value.push(markRecordAsNew(K))), n.onInput(n.value), n.initialValue = n.value, G([]), L(!1);
+          Array.isArray(n.value) || (n.value = []), L.forEach((K) => n.value.push(markRecordAsNew(K))), n.onInput(n.value), n.initialValue = n.value, G([]), V(!1);
           const H = Math.ceil(n.value.length / (((U = n.componentProps) == null ? void 0 : U.pageSize) || 10));
           B(H);
         }
       };
     }, T = () => {
-      const L = (o == null ? void 0 : o.targetKey) || "id", V = (n.value || []).map((H) => H == null ? void 0 : H[L]).filter(Boolean);
-      return V.length ? { $and: [{ [`${L}.$ne`]: V }] } : {};
+      const V = (o == null ? void 0 : o.targetKey) || "id", L = (n.value || []).map((H) => H == null ? void 0 : H[V]).filter(Boolean);
+      return L.length ? { $and: [{ [`${V}.$ne`]: L }] } : {};
     }, [D, B] = useState(1), [N, M] = useState(((A = n.componentProps) == null ? void 0 : A.pageSize) || 10), { setFormValueChanged: j } = useActionContext();
     useEffect(() => {
-      var L;
-      M((L = n.componentProps) == null ? void 0 : L.pageSize);
+      var V;
+      M((V = n.componentProps) == null ? void 0 : V.pageSize);
     }, [(E = n.componentProps) == null ? void 0 : E.pageSize]);
     const R = useMemo(() => {
-      var V;
-      const L = Math.ceil(((V = n.value) == null ? void 0 : V.length) / 10);
+      var L;
+      const V = Math.ceil(((L = n.value) == null ? void 0 : L.length) / 10);
       return {
-        current: D > L ? L : D,
+        current: D > V ? V : D,
         pageSize: N || 10,
         total: n == null ? void 0 : n.value,
         onChange: (G, H) => {
@@ -47189,13 +47326,13 @@ const Table$1 = withDynamicSchemaProps(
         hideOnSinglePage: !1
       };
     }, [(z = n.value) == null ? void 0 : z.length, N, D]), O = () => {
-      const { field: L } = useAssociationFieldContext();
+      const { field: V } = useAssociationFieldContext();
       return {
         run() {
           var G;
-          L.value = L.value || [], L.value.push(markRecordAsNew({}));
-          const V = Math.ceil(L.value.length / (((G = L.componentProps) == null ? void 0 : G.pageSize) || 10));
-          return B(V), L.onInput(L.value);
+          V.value = V.value || [], V.value.push(markRecordAsNew({}));
+          const L = Math.ceil(V.value.length / (((G = V.componentProps) == null ? void 0 : G.pageSize) || 10));
+          return B(L), V.onInput(V.value);
         }
       };
     }, $ = () => ({
@@ -47212,7 +47349,7 @@ const Table$1 = withDynamicSchemaProps(
           field: n,
           showIndex: !0,
           dragSort: !1,
-          showDel: n.editable && (b !== !1 || C !== !1 || S !== !1) ? (L) => n.editable ? S !== !1 ? !0 : L == null ? void 0 : L.__isNewRecord__ : !1 : !1,
+          showDel: n.editable && (b !== !1 || C !== !1 || S !== !1) ? (V) => n.editable ? S !== !1 ? !0 : V == null ? void 0 : V.__isNewRecord__ : !1 : !1,
           pagination: R,
           rowSelection: { type: "none", hideSelectAll: !0 },
           isSubTable: !0,
@@ -47280,7 +47417,7 @@ const Table$1 = withDynamicSchemaProps(
                   onlyRenderProperties: !0,
                   basePath: n.address,
                   schema: p.parent,
-                  filterProperties: (L) => L["x-component"] === "AssociationField.Selector"
+                  filterProperties: (V) => V["x-component"] === "AssociationField.Selector"
                 }
               )
             }
@@ -47379,7 +47516,7 @@ const ReadPretty$6 = observer$1(
 InternalAssociationSelect.displayName = "InternalAssociationSelect";
 const AssociationSelect = InternalAssociationSelect;
 AssociationSelect.Designer = function e() {
-  var O, $, A, E, z, L, V, G, H, U, K;
+  var O, $, A, E, z, V, L, G, H, U, K;
   const { getCollectionFields: t, getInterface: n, getCollectionJoinField: o, getCollection: r, isTitleField: a } = useCollectionManager_deprecated(), { getField: i } = useCollection_deprecated(), { form: l } = useFormBlockContext(), c = useField(), u = useFieldSchema(), { t: d } = useTranslation(), p = useFilterByTk(), { dn: m, refresh: h, insertAdjacent: g } = useDesignable(), f = useCompile(), C = useIsShowMultipleSwitch(), { isAllowToSetDefaultValue: b } = useIsAllowToSetDefaultValue(), S = i(u.name) || o(u["x-collection-field"]), y = useFieldComponentOptions(), v = c.address.segments.includes("__form_grid"), I = n(S == null ? void 0 : S.interface), F = (O = I == null ? void 0 : I.validateSchema) == null ? void 0 : O.call(I, u), w = ($ = S == null ? void 0 : S.uiSchema) == null ? void 0 : $.title, T = S != null && S.target ? t(S == null ? void 0 : S.target) : [];
   c.title === w || c.title;
   const D = useSortFields(S == null ? void 0 : S.target), B = ((z = (E = (A = c.componentProps) == null ? void 0 : A.service) == null ? void 0 : E.params) == null ? void 0 : z.sort) || [];
@@ -47493,19 +47630,19 @@ AssociationSelect.Designer = function e() {
           }
         },
         onSubmit: (Y) => {
-          var Z;
-          const X = [], Q = (te) => te != null && !Number.isNaN(te);
+          var ne;
+          const X = [], J = (te) => te != null && !Number.isNaN(te);
           for (const te of Y.rules)
-            X.push(_.pickBy(te, Q));
-          const ee = {
+            X.push(_.pickBy(te, J));
+          const Z = {
             "x-uid": u["x-uid"]
           };
           if (["percent"].includes(S == null ? void 0 : S.interface))
             for (const te of X)
               (te.maxValue || te.minValue) && (te.percentMode = !0), te.percentFormat && (te.percentFormats = !0);
-          const J = _.concat([], ((Z = S == null ? void 0 : S.uiSchema) == null ? void 0 : Z["x-validator"]) || [], X);
-          c.validator = J, u["x-validator"] = X, ee["x-validator"] = X, m.emit("patch", {
-            schema: ee
+          const Q = _.concat([], ((ne = S == null ? void 0 : S.uiSchema) == null ? void 0 : ne["x-validator"]) || [], X);
+          c.validator = Q, u["x-validator"] = X, Z["x-validator"] = X, m.emit("patch", {
+            schema: Z
           }), h();
         }
       }
@@ -47553,7 +47690,7 @@ AssociationSelect.Designer = function e() {
         options: y,
         value: u["x-component"],
         onChange: (Y) => {
-          var Q, ee;
+          var J, Z;
           const X = {
             name: S == null ? void 0 : S.name,
             type: "void",
@@ -47568,9 +47705,9 @@ AssociationSelect.Designer = function e() {
             "x-validator": u["x-validator"],
             "x-collection-field": u["x-collection-field"],
             "x-decorator-props": u["x-decorator-props"],
-            "x-component-props": x(x({}, (Q = S == null ? void 0 : S.uiSchema) == null ? void 0 : Q["x-component-props"]), u["x-component-props"])
+            "x-component-props": x(x({}, (J = S == null ? void 0 : S.uiSchema) == null ? void 0 : J["x-component-props"]), u["x-component-props"])
           };
-          (ee = I == null ? void 0 : I.schemaInitialize) == null || ee.call(I, X, {
+          (Z = I == null ? void 0 : I.schemaInitialize) == null || Z.call(I, X, {
             field: S,
             block: "Form",
             readPretty: c.readPretty,
@@ -47593,7 +47730,7 @@ AssociationSelect.Designer = function e() {
       SchemaSettingsSwitchItem,
       {
         title: d("Allow multiple"),
-        checked: ((L = u["x-component-props"]) == null ? void 0 : L.multiple) === void 0 ? !0 : u["x-component-props"].multiple,
+        checked: ((V = u["x-component-props"]) == null ? void 0 : V.multiple) === void 0 ? !0 : u["x-component-props"].multiple,
         onChange: (Y) => {
           const X = {
             "x-uid": u["x-uid"]
@@ -47609,7 +47746,7 @@ AssociationSelect.Designer = function e() {
       SchemaSettingsDataScope,
       {
         collectionName: S == null ? void 0 : S.target,
-        defaultFilter: ((H = (G = (V = c.componentProps) == null ? void 0 : V.service) == null ? void 0 : G.params) == null ? void 0 : H.filter) || {},
+        defaultFilter: ((H = (G = (L = c.componentProps) == null ? void 0 : L.service) == null ? void 0 : G.params) == null ? void 0 : H.filter) || {},
         form: l,
         onSubmit: ({ filter: Y }) => {
           Y = removeNullCondition(Y), _.set(c.componentProps, "service.params.filter", Y), u["x-component-props"] = c.componentProps, m.emit("patch", {
@@ -47696,7 +47833,7 @@ AssociationSelect.Designer = function e() {
           }
         },
         onSubmit: ({ sort: Y }) => {
-          const X = Y.map((Q) => Q.direction === "desc" ? `-${Q.field}` : Q.field);
+          const X = Y.map((J) => J.direction === "desc" ? `-${J.field}` : J.field);
           _.set(c.componentProps, "service.params.sort", X), u["x-component-props"] = c.componentProps, m.emit("patch", {
             schema: {
               "x-uid": u["x-uid"],
@@ -47748,13 +47885,13 @@ AssociationSelect.Designer = function e() {
         options: M,
         value: (K = (U = c == null ? void 0 : c.componentProps) == null ? void 0 : U.fieldNames) == null ? void 0 : K.label,
         onChange: (Y) => {
-          var ee, J;
+          var Z, Q;
           const X = {
             "x-uid": u["x-uid"]
-          }, Q = P(x(x({}, (J = (ee = S == null ? void 0 : S.uiSchema) == null ? void 0 : ee["x-component-props"]) == null ? void 0 : J.fieldNames), c.componentProps.fieldNames), {
+          }, J = P(x(x({}, (Q = (Z = S == null ? void 0 : S.uiSchema) == null ? void 0 : Z["x-component-props"]) == null ? void 0 : Q.fieldNames), c.componentProps.fieldNames), {
             label: Y
           });
-          c.componentProps.fieldNames = Q, u["x-component-props"] = u["x-component-props"] || {}, u["x-component-props"].fieldNames = Q, X["x-component-props"] = u["x-component-props"], m.emit("patch", {
+          c.componentProps.fieldNames = J, u["x-component-props"] = u["x-component-props"] || {}, u["x-component-props"].fieldNames = J, X["x-component-props"] = u["x-component-props"], m.emit("patch", {
             schema: X
           }), m.refresh();
         }
@@ -47885,17 +48022,17 @@ AssociationSelect.FilterDesigner = function e() {
           }
         },
         onSubmit: ($) => {
-          var L;
+          var V;
           const A = [];
-          for (const V of $.rules)
-            A.push(_.pickBy(V, _.identity));
+          for (const L of $.rules)
+            A.push(_.pickBy(L, _.identity));
           const E = {
             "x-uid": l["x-uid"]
           };
           if (["percent"].includes(m == null ? void 0 : m.interface))
-            for (const V of A)
-              (V.maxValue || V.minValue) && (V.percentMode = !0), V.percentFormat && (V.percentFormats = !0);
-          const z = _.concat([], ((L = m == null ? void 0 : m.uiSchema) == null ? void 0 : L["x-validator"]) || [], A);
+            for (const L of A)
+              (L.maxValue || L.minValue) && (L.percentMode = !0), L.percentFormat && (L.percentFormats = !0);
+          const z = _.concat([], ((V = m == null ? void 0 : m.uiSchema) == null ? void 0 : V["x-validator"]) || [], A);
           i.validator = z, l["x-validator"] = A, E["x-validator"] = A, u.emit("patch", {
             schema: E
           }), d();
@@ -48037,10 +48174,10 @@ AssociationSelect.FilterDesigner = function e() {
         options: v,
         value: (O = (R = i == null ? void 0 : i.componentProps) == null ? void 0 : R.fieldNames) == null ? void 0 : O.label,
         onChange: ($) => {
-          var z, L;
+          var z, V;
           const A = {
             "x-uid": l["x-uid"]
-          }, E = P(x(x({}, (L = (z = m == null ? void 0 : m.uiSchema) == null ? void 0 : z["x-component-props"]) == null ? void 0 : L.fieldNames), i.componentProps.fieldNames), {
+          }, E = P(x(x({}, (V = (z = m == null ? void 0 : m.uiSchema) == null ? void 0 : z["x-component-props"]) == null ? void 0 : V.fieldNames), i.componentProps.fieldNames), {
             label: $
           });
           i.componentProps.fieldNames = E, l["x-component-props"] = l["x-component-props"] || {}, l["x-component-props"].fieldNames = E, A["x-component-props"] = l["x-component-props"], u.emit("patch", {
@@ -52225,14 +52362,14 @@ const TableActionColumnDesigner = (e) => {
           }
         },
         onSubmit: ({ sort: A }) => {
-          var L;
-          const E = A.map((V) => V.direction === "desc" ? `-${V.field}` : V.field), z = r.decoratorProps.params || {};
+          var V;
+          const E = A.map((L) => L.direction === "desc" ? `-${L.field}` : L.field), z = r.decoratorProps.params || {};
           z.sort = E, r.decoratorProps.params = z, a["x-decorator-props"].params = z, d.emit("patch", {
             schema: {
               "x-uid": a["x-uid"],
               "x-decorator-props": a["x-decorator-props"]
             }
-          }), c.run(P(x({}, (L = c.params) == null ? void 0 : L[0]), { sort: E }));
+          }), c.run(P(x({}, (V = c.params) == null ? void 0 : V[0]), { sort: E }));
         }
       }
     ),
@@ -52273,9 +52410,9 @@ const TableActionColumnDesigner = (e) => {
           { label: u("Small"), value: "small" }
         ],
         onChange: (A) => {
-          const E = a.reduceProperties((z, L) => {
-            if (L["x-component"] === "TableV2")
-              return L;
+          const E = a.reduceProperties((z, V) => {
+            if (V["x-component"] === "TableV2")
+              return V;
           }, null);
           E["x-component-props"] = E["x-component-props"] || {}, E["x-component-props"].size = A, d.emit("patch", {
             schema: {
@@ -54406,7 +54543,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       if (Array.isArray(E))
         return E.filter(Boolean);
       const z = String(E != null ? E : "").trim();
-      return z ? z.split(/[\s,]+/).map((L) => L.trim()).filter(Boolean) : [];
+      return z ? z.split(/[\s,]+/).map((V) => V.trim()).filter(Boolean) : [];
     }, $ = R.tlds;
     let A = "iana";
     if ($ === "iana" || $ === !0 || $ === "true" ? A = "iana" : $ === "disable" || $ === !1 || $ === "false" ? A = "disable" : $ === "allow" ? A = "allow" : $ === "deny" ? A = "deny" : $ && typeof $ == "object" && ($.allow === !0 ? A = "iana" : Array.isArray($.allow) ? A = "allow" : Array.isArray($.deny) ? A = "deny" : A = "iana"), A === "iana")
@@ -54473,11 +54610,11 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           return;
         let E = !1;
         A.params.forEach((z) => {
-          var V, G;
+          var L, G;
           if (!z.required)
             return;
-          const L = (G = (V = $.args) == null ? void 0 : V[z.key]) != null ? G : z.defaultValue;
-          b(z.componentType, L) && (M = !0, E = !0);
+          const V = (G = (L = $.args) == null ? void 0 : L[z.key]) != null ? G : z.defaultValue;
+          b(z.componentType, V) && (M = !0, E = !0);
         }), E && j.push($.key);
       });
     } catch ($) {
@@ -54516,10 +54653,10 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       if (A.key === M) {
         let z = P(x({}, A.args), { [j]: R });
         z = f(A.name, z);
-        const L = S.find((V) => V.key === A.name);
+        const V = S.find((L) => L.key === A.name);
         return P(x({}, A), {
           args: z,
-          paramsType: (E = L == null ? void 0 : L.paramsType) != null ? E : A.paramsType
+          paramsType: (E = V == null ? void 0 : V.paramsType) != null ? E : A.paramsType
         });
       }
       return A;
@@ -54534,7 +54671,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   }, T = (M) => {
     const j = S.find((R) => R.key === M.name);
     return j ? !j.hasValue || j.params.length === 0 ? /* @__PURE__ */ jsx("div", { style: { color: c.colorTextSecondary }, children: l("This validation rule has no additional parameters") }) : /* @__PURE__ */ jsx(Form$2, { size: "small", children: j.params.map((R) => {
-      var A, E, z, L, V, G, H;
+      var A, E, z, V, L, G, H;
       let O = (E = (A = M.args) == null ? void 0 : A[R.key]) != null ? E : R.defaultValue;
       R.componentType === "radio" && R.key === "tlds" && (j.key === "email" || j.key === "domain") && (O = C(M.args));
       const $ = !!R.required && b(R.componentType, O);
@@ -54568,11 +54705,11 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
                     else if (X === "disable")
                       F(M.key, "tlds", !1);
                     else if (X === "allow") {
-                      const Q = (K = M.args) == null ? void 0 : K.tlds, ee = Array.isArray(Q == null ? void 0 : Q.allow) ? Q.allow : [];
-                      F(M.key, "tlds", { allow: ee });
+                      const J = (K = M.args) == null ? void 0 : K.tlds, Z = Array.isArray(J == null ? void 0 : J.allow) ? J.allow : [];
+                      F(M.key, "tlds", { allow: Z });
                     } else if (X === "deny") {
-                      const Q = (Y = M.args) == null ? void 0 : Y.tlds, ee = Array.isArray(Q == null ? void 0 : Q.deny) ? Q.deny : [];
-                      F(M.key, "tlds", { deny: ee });
+                      const J = (Y = M.args) == null ? void 0 : Y.tlds, Z = Array.isArray(J == null ? void 0 : J.deny) ? J.deny : [];
+                      F(M.key, "tlds", { deny: Z });
                     }
                   } else
                     F(M.key, R.key, U.target.value);
@@ -54580,24 +54717,24 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
                 children: (z = R.options) == null ? void 0 : z.map((U) => /* @__PURE__ */ jsx(Radio$1, { value: U.value, children: l(U.label) }, U.value))
               }
             ),
-            (L = R.options) == null ? void 0 : L.map((U) => {
+            (V = R.options) == null ? void 0 : V.map((U) => {
               var K, Y, X;
               return U.value === O && U.componentType ? /* @__PURE__ */ jsx("div", { style: { marginTop: c.marginXS }, children: U.componentType === "text" ? (() => {
-                var ee;
+                var Z;
                 if (R.key === "tlds" && (U.value === "allow" || U.value === "deny")) {
-                  const J = (ee = M.args) == null ? void 0 : ee.tlds, Z = Array.isArray(
-                    U.value === "allow" ? J == null ? void 0 : J.allow : J == null ? void 0 : J.deny
-                  ) ? U.value === "allow" ? J.allow : J.deny : [];
+                  const Q = (Z = M.args) == null ? void 0 : Z.tlds, ne = Array.isArray(
+                    U.value === "allow" ? Q == null ? void 0 : Q.allow : Q == null ? void 0 : Q.deny
+                  ) ? U.value === "allow" ? Q.allow : Q.deny : [];
                   return /* @__PURE__ */ jsx(
                     Select$1,
                     {
                       mode: "tags",
-                      value: Z,
+                      value: ne,
                       onChange: (te) => {
-                        const re = Array.from(
-                          new Set(te.map((se) => String(se).trim()).filter(Boolean))
+                        const se = Array.from(
+                          new Set(te.map((ce) => String(ce).trim()).filter(Boolean))
                         );
-                        U.value === "allow" ? F(M.key, "tlds", { allow: re }) : F(M.key, "tlds", { deny: re });
+                        U.value === "allow" ? F(M.key, "tlds", { allow: se }) : F(M.key, "tlds", { deny: se });
                       },
                       tokenSeparators: [",", " ", `
 `, "	"],
@@ -54610,7 +54747,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
                   Input$3,
                   {
                     value: "",
-                    onChange: (J) => F(M.key, `${R.key}_${U.value}`, J.target.value),
+                    onChange: (Q) => F(M.key, `${R.key}_${U.value}`, Q.target.value),
                     style: { width: "100%" }
                   }
                 );
@@ -54620,21 +54757,21 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
                   precision: y ? void 0 : 0,
                   step: y ? 0.1 : 1,
                   value: ((K = M.args) == null ? void 0 : K[`${R.key}_${U.value}`]) || "",
-                  onChange: (Q) => F(M.key, `${R.key}_${U.value}`, Q),
+                  onChange: (J) => F(M.key, `${R.key}_${U.value}`, J),
                   style: { width: "100%" }
                 }
               ) : U.componentType === "checkbox" ? /* @__PURE__ */ jsx(
                 Checkbox$1,
                 {
                   checked: ((Y = M.args) == null ? void 0 : Y[`${R.key}_${U.value}`]) || !1,
-                  onChange: (Q) => F(M.key, `${R.key}_${U.value}`, Q.target.checked),
+                  onChange: (J) => F(M.key, `${R.key}_${U.value}`, J.target.checked),
                   children: l(U.label)
                 }
               ) : U.componentType === "datePicker" ? /* @__PURE__ */ jsx(
                 DatePicker$1,
                 {
                   value: (X = M.args) != null && X[`${R.key}_${U.value}`] ? dayjs(M.args[`${R.key}_${U.value}`]) : null,
-                  onChange: (Q) => F(M.key, `${R.key}_${U.value}`, Q == null ? void 0 : Q.toISOString()),
+                  onChange: (J) => F(M.key, `${R.key}_${U.value}`, J == null ? void 0 : J.toISOString()),
                   placeholder: l("Select date"),
                   style: { width: "100%" }
                 }
@@ -54649,7 +54786,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
                 placeholder: l("Please select"),
                 style: { width: "100%", height: "100%" },
                 allowClear: !0,
-                children: (V = R.options) == null ? void 0 : V.map((U) => /* @__PURE__ */ jsx(Select$1.Option, { value: U.value, children: l(U.label) }, U.value))
+                children: (L = R.options) == null ? void 0 : L.map((U) => /* @__PURE__ */ jsx(Select$1.Option, { value: U.value, children: l(U.label) }, U.value))
               }
             ),
             (G = R.options) == null ? void 0 : G.map((U) => U.value === O && U.componentType ? /* @__PURE__ */ jsx(Fragment$1, {}) : null)
@@ -55218,18 +55355,18 @@ const supportTypes = ["string", "bigInt", "integer", "uuid", "uid", "nanoid"], S
       var z;
       if (E.key === "systemInfo")
         A.push(P(x({}, E), {
-          children: E.children.filter((L) => L.hidden ? !1 : L.value === "tableoid" ? $ != null && $.length ? $.includes(L.value) : (l == null ? void 0 : l.dialect) === "postgres" : typeof o[L.value] == "boolean" ? o[L.value] : !0)
+          children: E.children.filter((V) => V.hidden ? !1 : V.value === "tableoid" ? $ != null && $.length ? $.includes(V.value) : (l == null ? void 0 : l.dialect) === "postgres" : typeof o[V.value] == "boolean" ? o[V.value] : !0)
         }));
       else {
-        let L = [];
-        $ != null && $.length ? $.forEach((V) => {
+        let V = [];
+        $ != null && $.length ? $.forEach((L) => {
           var H;
-          const G = (H = E == null ? void 0 : E.children) == null ? void 0 : H.find((U) => [V, V.interface].includes(U.name));
-          G && L.push(P(x({}, G), {
-            targetScope: V == null ? void 0 : V.targetScope
+          const G = (H = E == null ? void 0 : E.children) == null ? void 0 : H.find((U) => [L, L.interface].includes(U.name));
+          G && V.push(P(x({}, G), {
+            targetScope: L == null ? void 0 : L.targetScope
           }));
-        }) : O != null && O.length ? L = (z = E == null ? void 0 : E.children) == null ? void 0 : z.filter((V) => !O.includes(V.name)) : L = E == null ? void 0 : E.children, L != null && L.length && A.push(P(x({}, E), {
-          children: L
+        }) : O != null && O.length ? V = (z = E == null ? void 0 : E.children) == null ? void 0 : z.filter((L) => !O.includes(L.name)) : V = E == null ? void 0 : E.children, V != null && V.length && A.push(P(x({}, E), {
+          children: V
         }));
       }
     }), A;
@@ -55520,7 +55657,7 @@ const supportTypes = ["string", "bigInt", "integer", "uuid", "uid", "nanoid"], S
       run() {
         return q(this, null, function* () {
           yield j.submit();
-          const z = cloneDeep(j.values), L = omit(z, [
+          const z = cloneDeep(j.values), V = omit(z, [
             "key",
             "uiSchemaUid",
             "collectionName",
@@ -55533,7 +55670,7 @@ const supportTypes = ["string", "bigInt", "integer", "uuid", "uid", "nanoid"], S
             // 'reverseField.uiSchemaUid',
           ]);
           yield A.create({
-            values: L
+            values: V
           }), yield j.reset(), yield O(), yield R(), $.setVisible(!1);
         });
       }
@@ -56027,13 +56164,13 @@ const getSchema$4 = (e, t, n) => {
   useEffect(() => {
     const R = [];
     g.forEach((O) => {
-      var L;
-      const $ = v(O), E = w(O).map((V) => {
-        const G = T(V, O);
+      var V;
+      const $ = v(O), E = w(O).map((L) => {
+        const G = T(L, O);
         return {
           type: "group",
-          key: V,
-          label: l("Parent collection fields") + l(`(${v(V).title})`),
+          key: L,
+          label: l("Parent collection fields") + l(`(${v(L).title})`),
           children: G.filter((H) => !["hasOne", "hasMany", "belongsToMany"].includes(H == null ? void 0 : H.type)).map((H) => {
             var U;
             return {
@@ -56042,9 +56179,9 @@ const getSchema$4 = (e, t, n) => {
             };
           })
         };
-      }), z = (L = $.fields.filter((V) => !["obo", "oho", "m2m", "o2m"].includes(V == null ? void 0 : V.interface))) == null ? void 0 : L.map((V) => {
+      }), z = (V = $.fields.filter((L) => !["obo", "oho", "m2m", "o2m"].includes(L == null ? void 0 : L.interface))) == null ? void 0 : V.map((L) => {
         var G;
-        return { value: V.name, key: V.name, label: l(((G = V.uiSchema) == null ? void 0 : G.title) || V.name) };
+        return { value: L.name, key: L.name, label: l(((G = L.uiSchema) == null ? void 0 : G.title) || L.name) };
       }).concat(E);
       R.push({
         value: O,
@@ -56058,21 +56195,21 @@ const getSchema$4 = (e, t, n) => {
       if (R) {
         u(!1), p([]);
         const A = ($ = Object.values((O = R == null ? void 0 : R.data) == null ? void 0 : O.fields)) == null ? void 0 : $.map((E) => {
-          var L, V;
+          var V, L;
           const z = (a == null ? void 0 : a.data.find((G) => G.name === E.name)) || E;
           if (!(z != null && z.uiSchema)) {
             const G = I(E.interface);
             z.uiSchema = (G == null ? void 0 : G.default.uiSchema) || {};
           }
           return E.source ? P(x({}, E), {
-            uiSchema: P(x({}, omit(z.uiSchema, "rawTitle")), { title: ((L = z.uiSchema) == null ? void 0 : L.title) || z.name })
-          }) : P(x({}, z), {
             uiSchema: P(x({}, omit(z.uiSchema, "rawTitle")), { title: ((V = z.uiSchema) == null ? void 0 : V.title) || z.name })
+          }) : P(x({}, z), {
+            uiSchema: P(x({}, omit(z.uiSchema, "rawTitle")), { title: ((L = z.uiSchema) == null ? void 0 : L.title) || z.name })
           });
         });
         S.value = A, setTimeout(() => {
-          var E, z, L;
-          p(A), y.setValuesIn("sources", (E = R.data) == null ? void 0 : E.sources), f((z = R.data) == null ? void 0 : z.sources), b((L = R == null ? void 0 : R.data) == null ? void 0 : L.unsupportedFields);
+          var E, z, V;
+          p(A), y.setValuesIn("sources", (E = R.data) == null ? void 0 : E.sources), f((z = R.data) == null ? void 0 : z.sources), b((V = R == null ? void 0 : R.data) == null ? void 0 : V.unsupportedFields);
         });
       }
     }).catch);
@@ -56080,8 +56217,8 @@ const getSchema$4 = (e, t, n) => {
   const M = (R, O) => {
     const $ = _.cloneDeep(d);
     $[O] = R, p($), S.value = $.map((A) => {
-      var z, L, V;
-      const E = typeof A.source == "string" ? A.source : (V = (L = (z = A.source) == null ? void 0 : z.filter) == null ? void 0 : L.call(z, Boolean)) == null ? void 0 : V.join(".");
+      var z, V, L;
+      const E = typeof A.source == "string" ? A.source : (L = (V = (z = A.source) == null ? void 0 : z.filter) == null ? void 0 : V.call(z, Boolean)) == null ? void 0 : L.join(".");
       return P(x({}, A), {
         source: E
       });
@@ -56106,8 +56243,8 @@ const getSchema$4 = (e, t, n) => {
           style: { width: "100%" },
           options: D(m),
           onChange: (A, E) => {
-            var L;
-            const z = (L = F(A == null ? void 0 : A[0])) == null ? void 0 : L.find((V) => V.name === last(A));
+            var V;
+            const z = (V = F(A == null ? void 0 : A[0])) == null ? void 0 : V.find((L) => L.name === last(A));
             M(P(x({}, O), { source: A, uiSchema: z == null ? void 0 : z.uiSchema }), $);
           },
           placeholder: l("Select field source")
@@ -56149,7 +56286,7 @@ const getSchema$4 = (e, t, n) => {
             onChange: (z) => {
               M(P(x({}, A), { interface: z }), $);
             },
-            children: E.map((z) => /* @__PURE__ */ jsx(Select$1.OptGroup, { label: D(z.label), children: z.children.map((L) => /* @__PURE__ */ jsx(Select$1.Option, { value: L.name, children: D(L.label) }, L.value)) }, z.key))
+            children: E.map((z) => /* @__PURE__ */ jsx(Select$1.OptGroup, { label: D(z.label), children: z.children.map((V) => /* @__PURE__ */ jsx(Select$1.Option, { value: V.name, children: D(V.label) }, V.value)) }, z.key))
           }
         );
       }
@@ -56229,7 +56366,7 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
         key: I.name,
         width: 200,
         render: ($, A, E) => {
-          const z = A[I.name], L = {
+          const z = A[I.name], V = {
             type: "object",
             properties: {
               [I.name]: {
@@ -56241,7 +56378,7 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
               }
             }
           };
-          return /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: /* @__PURE__ */ jsx(RecursionField, { schema: L, name: E, onlyRenderProperties: !0 }) });
+          return /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: /* @__PURE__ */ jsx(RecursionField, { schema: V, name: E, onlyRenderProperties: !0 }) });
         }
       };
     });
@@ -65151,16 +65288,16 @@ const ActionInitializerItem = (e) => {
     }, A = (Y) => {
       M(Y), d(Y), p == null || p(Y);
     }, E = (Y) => {
-      var Q;
-      const X = (Q = h == null ? void 0 : h[0]) == null ? void 0 : Q.filter;
+      var J;
+      const X = (J = h == null ? void 0 : h[0]) == null ? void 0 : J.filter;
       (y || X) && g(P(x({}, h == null ? void 0 : h[0]), {
         filter: f
       })), v(!y), Y.stopPropagation();
     }, z = (Y) => {
       Y.stopPropagation();
-    }, L = (Y) => {
+    }, V = (Y) => {
       m(Y);
-    }, V = (K = i.title) != null ? K : (U = a == null ? void 0 : a.uiSchema) == null ? void 0 : U.title;
+    }, L = (K = i.title) != null ? K : (U = a == null ? void 0 : a.uiSchema) == null ? void 0 : U.title;
     return t(
       /* @__PURE__ */ jsxs(SortableItem, { className: cls(n, o, "nb-block-item", e.className, "SortableItem"), children: [
         /* @__PURE__ */ jsx(l, {}),
@@ -65177,7 +65314,7 @@ const ActionInitializerItem = (e) => {
                 },
                 gutter: 5,
                 children: [
-                  /* @__PURE__ */ jsx(Col, { title: c(V), className: "headerCol", children: y ? /* @__PURE__ */ jsx(
+                  /* @__PURE__ */ jsx(Col, { title: c(L), className: "headerCol", children: y ? /* @__PURE__ */ jsx(
                     Input$3,
                     {
                       bordered: !1,
@@ -65185,9 +65322,9 @@ const ActionInitializerItem = (e) => {
                       placeholder: "Search...",
                       className: "search",
                       onClick: z,
-                      onChange: L
+                      onChange: V
                     }
-                  ) : c(V) }),
+                  ) : c(L) }),
                   /* @__PURE__ */ jsx(
                     Col,
                     {
@@ -65634,14 +65771,14 @@ const DataBlockInitializer = (e) => {
         componentType: o,
         menuName: a
       });
-      const { item: L, fromOthersInPopup: V } = z;
+      const { item: V, fromOthersInPopup: L } = z;
       if (f)
         return f(z);
-      if (L.template) {
-        const G = yield w(L);
-        v(t ? t(G, { item: L, fromOthersInPopup: V }) : G);
+      if (V.template) {
+        const G = yield w(V);
+        v(t ? t(G, { item: V, fromOthersInPopup: L }) : G);
       } else
-        L.schemaInsertor ? yield L.schemaInsertor(v, { item: L, name: a, fromOthersInPopup: V }) : n && n({ item: L, fromOthersInPopup: V });
+        V.schemaInsertor ? yield V.schemaInsertor(v, { item: V, name: a, fromOthersInPopup: L }) : n && n({ item: V, fromOthersInPopup: L });
       I(!1);
     }),
     [
@@ -65670,14 +65807,14 @@ const DataBlockInitializer = (e) => {
     currentText: b,
     otherText: S
   }), N = useGetSchemaInitializerMenuItems(D), M = useMemo(() => N(B, a), [N, B, a]), [j, R] = useState([]), O = useMenuSearch({ data: M, openKeys: j, hideSearch: u }), $ = useMemo(() => {
-    let z = O.filter((L) => L.key !== "search" && L.key !== "empty");
+    let z = O.filter((V) => V.key !== "search" && V.key !== "empty");
     return p && z.length === 1 ? z = z[0].children : z = O, [
       {
         key: a,
         label: F(i),
         icon: typeof r == "string" ? /* @__PURE__ */ jsx(antIcons__default, { type: r }) : r,
-        onClick: (L) => {
-          L.key === a && D(P(x({}, L), { item: e }));
+        onClick: (V) => {
+          V.key === a && D(P(x({}, V), { item: e }));
         },
         children: z
       }