@nocobase/client 1.8.10 → 1.8.11

package/es/index.mjs

@@ -1,23 +1,23 @@
-var $e = Object.defineProperty, Be = Object.defineProperties;
-var Ne = Object.getOwnPropertyDescriptors;
-var ke = Object.getOwnPropertySymbols;
-var je = Object.prototype.hasOwnProperty, Me = Object.prototype.propertyIsEnumerable;
-var De = (e, t) => (t = Symbol[e]) ? t : Symbol.for("Symbol." + e);
-var we = (e, t, n) => t in e ? $e(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n, x = (e, t) => {
+var Oe = Object.defineProperty, Le = Object.defineProperties;
+var Ve = Object.getOwnPropertyDescriptors;
+var Te = Object.getOwnPropertySymbols;
+var Be = Object.prototype.hasOwnProperty, Ne = Object.prototype.propertyIsEnumerable;
+var $e = (e, t) => (t = Symbol[e]) ? t : Symbol.for("Symbol." + e);
+var we = (e, t, n) => t in e ? Oe(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n, x = (e, t) => {
   for (var n in t || (t = {}))
-    je.call(t, n) && we(e, n, t[n]);
-  if (ke)
-    for (var n of ke(t))
-      Me.call(t, n) && we(e, n, t[n]);
+    Be.call(t, n) && we(e, n, t[n]);
+  if (Te)
+    for (var n of Te(t))
+      Ne.call(t, n) && we(e, n, t[n]);
   return e;
-}, P = (e, t) => Be(e, Ne(t));
+}, P = (e, t) => Le(e, Ve(t));
 var W = (e, t) => {
   var n = {};
   for (var o in e)
-    je.call(e, o) && t.indexOf(o) < 0 && (n[o] = e[o]);
-  if (e != null && ke)
-    for (var o of ke(e))
-      t.indexOf(o) < 0 && Me.call(e, o) && (n[o] = e[o]);
+    Be.call(e, o) && t.indexOf(o) < 0 && (n[o] = e[o]);
+  if (e != null && Te)
+    for (var o of Te(e))
+      t.indexOf(o) < 0 && Ne.call(e, o) && (n[o] = e[o]);
   return n;
 };
 var A = (e, t, n) => (we(e, typeof t != "symbol" ? t + "" : t, n), n);
@@ -37,7 +37,7 @@ var q = (e, t, n) => new Promise((o, r) => {
   }, l = (c) => c.done ? o(c.value) : Promise.resolve(c.value).then(a, i);
   l((n = n.apply(e, t)).next());
 });
-var Te = (e, t, n) => (t = e[De("asyncIterator")]) ? t.call(e) : (e = e[De("iterator")](), t = {}, n = (o, r) => (r = e[o]) && (t[o] = (a) => new Promise((i, l, c) => (a = r.call(e, a), c = a.done, Promise.resolve(a.value).then((u) => i({ value: u, done: c }), l)))), n("next"), n("return"), t);
+var Re = (e, t, n) => (t = e[$e("asyncIterator")]) ? t.call(e) : (e = e[$e("iterator")](), t = {}, n = (o, r) => (r = e[o]) && (t[o] = (a) => new Promise((i, l, c) => (a = r.call(e, a), c = a.done, Promise.resolve(a.value).then((u) => i({ value: u, done: c }), l)))), n("next"), n("return"), t);
 import "./index.css";
 import "dayjs/plugin/isBetween";
 import "dayjs/plugin/isSameOrAfter";
@@ -113,7 +113,7 @@ import { loadableResource } from "react-imported-component";
 import ProLayout, { RouteContext, PageHeader } from "@ant-design/pro-layout";
 import * as antdStyle from "antd-style";
 import { createStyles, createGlobalStyle, useAntdToken } from "antd-style";
-import { createStyles as An } from "antd-style";
+import { createStyles as Rn } from "antd-style";
 import * as dndKitCore from "@dnd-kit/core";
 import { DndContext as DndContext$1, rectIntersection, DragOverlay, useDroppable, useDndContext, useDndMonitor, useDraggable } from "@dnd-kit/core";
 import * as dndKitSortable from "@dnd-kit/sortable";
@@ -7683,7 +7683,7 @@ function getPlugins(e) {
     const r = [], a = {};
     if (o) {
       try {
-        for (var l = Te(n), c, u, d; c = !(u = yield l.next()).done; c = !1) {
+        for (var l = Re(n), c, u, d; c = !(u = yield l.next()).done; c = !1) {
           const p = u.value;
           const m = yield o(p.packageName);
           m && (r.push([p.name, m.default]), a[p.packageName] = m.default);
@@ -7728,7 +7728,7 @@ let PluginManager$1 = class {
   initStaticPlugins() {
     return q(this, arguments, function* (t = []) {
       try {
-        for (var n = Te(t), o, r, a; o = !(r = yield n.next()).done; o = !1) {
+        for (var n = Re(t), o, r, a; o = !(r = yield n.next()).done; o = !1) {
           const i = r.value;
           const l = Array.isArray(i) ? i[0] : i, c = Array.isArray(i) ? i[1] : void 0;
           yield this.add(l, c);
@@ -7754,7 +7754,7 @@ let PluginManager$1 = class {
         devDynamicImport: this.app.devDynamicImport
       });
       try {
-        for (var a = Te(o), i, l, c; i = !(l = yield a.next()).done; i = !1) {
+        for (var a = Re(o), i, l, c; i = !(l = yield a.next()).done; i = !1) {
           const [u, d] = l.value;
           const p = n.find((m) => m.name === u);
           yield this.add(d, p);
@@ -8769,7 +8769,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.8.10", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.8.11", 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",
@@ -8790,9 +8790,9 @@ const name = "@nocobase/client", version = "1.8.10", license = "AGPL-3.0", main
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.8.10",
-  "@nocobase/sdk": "1.8.10",
-  "@nocobase/utils": "1.8.10",
+  "@nocobase/evaluators": "1.8.11",
+  "@nocobase/sdk": "1.8.11",
+  "@nocobase/utils": "1.8.11",
   ahooks: "^3.7.2",
   antd: "5.24.2",
   "antd-style": "3.7.1",
@@ -10055,32 +10055,32 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
     }), adjustColumnOrder$1(I);
   }, [S, c, r, u, e.showDel, l]);
 }, SortableRow$1 = (e) => {
-  var m, g, f, C, b, y;
+  var m, g, f;
   const { token: t } = useToken$1(), n = (m = e["data-row-key"]) == null ? void 0 : m.toString(), { setNodeRef: o, active: r, over: a } = useSortable({
     id: n
-  }), i = (a == null ? void 0 : a.id) == n, h = e, { rowIndex: l } = h, c = W(h, ["rowIndex"]), u = useMemo(() => {
-    const S = new TinyColor(t.colorSettings).setAlpha(0.6).toHex8String();
+  }), h = e, { rowIndex: i } = h, l = W(h, ["rowIndex"]), c = (a == null ? void 0 : a.id) == n, u = useMemo(() => {
+    const C = new TinyColor(t.colorSettings).setAlpha(0.6).toHex8String();
     return {
       topActiveClass: css`
         & > td {
-          border-top: 2px solid ${S} !important;
+          border-top: 2px solid ${C} !important;
         }
       `,
       bottomActiveClass: css`
         & > td {
-          border-bottom: 2px solid ${S} !important;
+          border-bottom: 2px solid ${C} !important;
         }
       `
     };
-  }, [t.colorSettings]), d = ((f = (g = r == null ? void 0 : r.data.current) == null ? void 0 : g.sortable.index) != null ? f : -1) > ((y = (b = (C = a == null ? void 0 : a.data.current) == null ? void 0 : C.sortable) == null ? void 0 : b.index) != null ? y : -1) ? u.topActiveClass : u.bottomActiveClass;
+  }, [t.colorSettings]), d = ((f = (g = r == null ? void 0 : r.data.current) == null ? void 0 : g.sortable.index) != null ? f : -1) > i ? u.topActiveClass : u.bottomActiveClass;
   return /* @__PURE__ */ jsx(
     "tr",
     P(x({
-      ref: (S) => {
-        (r == null ? void 0 : r.id) !== n && o(S);
+      ref: (C) => {
+        (r == null ? void 0 : r.id) !== n && o(C);
       }
-    }, c), {
-      className: cls(e.className, { [d]: r && i })
+    }, l), {
+      className: cls(e.className, { [d]: r && c })
     })
   );
 }, SortHandle$2 = (e) => {
@@ -10340,8 +10340,8 @@ InternalNocoBaseTable$1.displayName = "InternalNocoBaseTable";
 const Table$2 = withDynamicSchemaProps(
   withSkeletonComponent(
     observer$1((e) => {
-      var be, Se;
-      const { token: t } = useToken$1(), pe = omit(e, ["onBlur", "onFocus"]), { pagination: n, useProps: o } = pe, r = W(pe, ["pagination", "useProps"]), me = (o == null ? void 0 : o()) || {}, { pagination: a } = me, i = W(me, ["pagination"]), de = x(x({}, r), i), {
+      var Se, se;
+      const { token: t } = useToken$1(), he = omit(e, ["onBlur", "onFocus"]), { pagination: n, useProps: o } = he, r = W(he, ["pagination", "useProps"]), de = (o == null ? void 0 : o()) || {}, { pagination: a } = de, i = W(de, ["pagination"]), be = x(x({}, r), i), {
         dragSort: l = !1,
         showIndex: c = !0,
         onRowSelectionChange: u,
@@ -10353,7 +10353,7 @@ const Table$2 = withDynamicSchemaProps(
         loading: f,
         onClickRow: C,
         value: b
-      } = de, y = W(de, [
+      } = be, y = W(be, [
         "dragSort",
         "showIndex",
         "onRowSelectionChange",
@@ -10365,188 +10365,188 @@ const Table$2 = withDynamicSchemaProps(
         "loading",
         "onClickRow",
         "value"
-      ]), S = useArrayField$1(y), v = useFieldSchema(), { size: I = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, F = useCollection(), T = ((be = v == null ? void 0 : v.parent) == null ? void 0 : be["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: B, enableIndexColumn: N } = T, O = useMemoizedFn(y.onRowDragEnd || (() => {
-      })), j = usePaginationProps$3(n, a, e), w = useTableColumns$2(y, j), [L, $] = useState(() => D ? B : []), [k, M] = useState(((Se = S == null ? void 0 : S.data) == null ? void 0 : Se.selectedRowKeys) || []), [V, E] = useState([]), z = (p == null ? void 0 : p.type) !== "none", H = useRef(/* @__PURE__ */ new Map()), U = useMemo(() => css`
+      ]), S = useArrayField$1(y), v = useFieldSchema(), { size: I = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, F = useCollection(), T = ((Se = v == null ? void 0 : v.parent) == null ? void 0 : Se["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: B, enableIndexColumn: N } = T, O = useMemoizedFn(y.onRowDragEnd || (() => {
+      })), j = usePaginationProps$3(n, a, e), w = useTableColumns$2(y, j), [L, $] = useState(() => D ? B : []), [k, M] = useState(((se = S == null ? void 0 : S.data) == null ? void 0 : se.selectedRowKeys) || []), [V, E] = useState([]), z = (p == null ? void 0 : p.type) !== "none", H = useRef(/* @__PURE__ */ new Map()), U = useMemo(() => css`
           & > td {
             background-color: ${t.controlItemBgActive} !important;
           }
           &:hover > td {
             background-color: ${t.controlItemBgActiveHover} !important;
           }
-        `, [t.controlItemBgActive, t.controlItemBgActiveHover]), G = useTableBlockContextBasicValue();
-      useEffect(() => {
-        var Z;
-        G != null && G.field && (G.field.data = ((Z = G.field) == null ? void 0 : Z.data) || {}, G.field.data.clearSelectedRowKeys = () => {
+        `, [t.controlItemBgActive, t.controlItemBgActiveHover]), G = useTableBlockContextBasicValue(), Y = useRef(b);
+      Y.current = b, useEffect(() => {
+        var te;
+        G != null && G.field && (G.field.data = ((te = G.field) == null ? void 0 : te.data) || {}, G.field.data.clearSelectedRowKeys = () => {
           G.field.data.selectedRowKeys = [], M([]);
         }, G.field.data.setSelectedRowKeys = M);
       }, [G == null ? void 0 : G.field]);
-      const Y = useMemo(() => C ? U : "", [U, C]), J = useMemo(() => C ? (Z, oe) => ({
-        onClick: (re) => {
-          isPortalInBody(re.target) || C(Z, E, V);
+      const J = useMemo(() => C ? U : "", [U, C]), K = useMemo(() => C ? (te, oe) => ({
+        onClick: (ae) => {
+          isPortalInBody(ae.target) || C(te, E, V);
         },
         rowIndex: oe,
-        record: Z
-      }) : (Z, oe) => ({
+        record: te
+      }) : (te, oe) => ({
         rowIndex: oe,
-        record: Z
+        record: te
       }), [C, V]);
       useDeepCompareEffect(() => {
-        const Z = D ? B : [];
-        _.isEqual(Z, L) || $(Z);
+        const te = D ? B : [];
+        _.isEqual(te, L) || $(te);
       }, [D, B]);
-      const K = useCallback((Z) => {
+      const X = useCallback((te) => {
         if (m)
-          return X(Z);
-        if (Z.key)
-          return Z.key;
-        if (H.current.has(Z))
-          return H.current.get(Z);
+          return Z(te);
+        if (te.key)
+          return te.key;
+        if (H.current.has(te))
+          return H.current.get(te);
         const oe = uid();
-        return H.current.set(Z, oe), oe;
-      }, []), X = useCallback(
-        (Z) => {
+        return H.current.set(te, oe), oe;
+      }, []), Z = useCallback(
+        (te) => {
           var oe;
-          return Array.isArray(m) ? m.map((re) => {
-            var ie;
-            return ((ie = Z[re]) == null ? void 0 : ie.toString()) || "";
-          }).join("-") : typeof m == "string" ? Z[m] : (oe = (m != null ? m : K)(Z)) == null ? void 0 : oe.toString();
+          return Array.isArray(m) ? m.map((ae) => {
+            var le;
+            return ((le = te[ae]) == null ? void 0 : le.toString()) || "";
+          }).join("-") : typeof m == "string" ? te[m] : (oe = (m != null ? m : X)(te)) == null ? void 0 : oe.toString();
         },
-        [JSON.stringify(m), K]
-      ), ee = useMemo(() => (Array.isArray(b) ? b : []).filter(Boolean), [b, b == null ? void 0 : b.length]), Q = useMemo(() => (Z) => {
-        const oe = useCallback((re) => {
-          var ye, ve, Pe, Fe, Ie, Ae;
-          if (!re.active || !re.over) {
+        [JSON.stringify(m), X]
+      ), Q = useMemo(() => (Array.isArray(b) ? b : []).filter(Boolean), [b, b == null ? void 0 : b.length]), ee = useMemo(() => (te) => {
+        const oe = useCallback((ae) => {
+          var ve, Pe, Fe, Ie, Ae, De, je, Me;
+          if (!ae.active || !ae.over) {
             console.warn("move cancel");
             return;
           }
-          const ie = (Pe = (ve = (ye = re.active) == null ? void 0 : ye.data.current) == null ? void 0 : ve.sortable) == null ? void 0 : Pe.index, ce = (Ae = (Ie = (Fe = re.over) == null ? void 0 : Fe.data.current) == null ? void 0 : Ie.sortable) == null ? void 0 : Ae.index, fe = (b == null ? void 0 : b[ie]) || re.active, Re = (b == null ? void 0 : b[ce]) || re.over;
-          S.move(ie, ce), O({ from: fe, to: Re });
+          const le = (Fe = (Pe = (ve = ae.active) == null ? void 0 : ve.data.current) == null ? void 0 : Pe.sortable) == null ? void 0 : Fe.index, ue = (De = (Ae = (Ie = ae.over) == null ? void 0 : Ie.data.current) == null ? void 0 : Ae.sortable) == null ? void 0 : De.index, ye = ((je = Y.current) == null ? void 0 : je[le]) || ae.active, ke = ((Me = Y.current) == null ? void 0 : Me[ue]) || ae.over;
+          S.move(le, ue), O({ from: ye, to: ke });
         }, []);
-        return /* @__PURE__ */ jsx(DndContext, { onDragEnd: oe, children: /* @__PURE__ */ jsx("tbody", x({}, Z)) });
+        return /* @__PURE__ */ jsx(DndContext, { onDragEnd: oe, children: /* @__PURE__ */ jsx("tbody", x({}, te)) });
       }, [S, O]);
-      Q.displayName = "BodyWrapperComponent";
-      const te = useMemo(() => ({
+      ee.displayName = "BodyWrapperComponent";
+      const ne = useMemo(() => ({
         header: {
           wrapper: HeaderWrapperComponent$1,
           cell: HeaderCellComponent$1
         },
         body: {
-          wrapper: Q,
+          wrapper: ee,
           row: BodyRowComponent$1,
           cell: BodyCellComponent$1
         }
-      }), [Q]), ne = useMemo(() => p, [JSON.stringify(p)]), se = useMemo(
+      }), [ee]), re = useMemo(() => p, [JSON.stringify(p)]), ie = useMemo(
         () => ({
-          rowSelection: N !== !1 && ne ? x({
+          rowSelection: N !== !1 && re ? x({
             type: "checkbox",
             selectedRowKeys: k,
-            onChange(Z, oe) {
-              S.data = S.data || {}, S.data.selectedRowKeys = Z, S.data.selectedRowData = oe, M(Z), u == null || u(Z, oe, M);
+            onChange(te, oe) {
+              S.data = S.data || {}, S.data.selectedRowKeys = te, S.data.selectedRowData = oe, M(te), u == null || u(te, oe, M);
             },
-            onSelect: (Z, oe, re, ie) => {
-              var ce;
-              G && (G.field.data = ((ce = G.field) == null ? void 0 : ce.data) || {}, G.field.data.selectedRecord = Z, G.field.data.selected = oe);
+            onSelect: (te, oe, ae, le) => {
+              var ue;
+              G && (G.field.data = ((ue = G.field) == null ? void 0 : ue.data) || {}, G.field.data.selectedRecord = te, G.field.data.selected = oe);
             },
-            getCheckboxProps(Z) {
+            getCheckboxProps(te) {
               return {
                 "aria-label": "checkbox"
               };
             },
-            renderCell: (Z, oe, re, ie) => {
+            renderCell: (te, oe, ae, le) => {
               if (!l && !c)
-                return ie;
-              const ce = j == null ? void 0 : j.current, fe = (j == null ? void 0 : j.pageSize) || 20;
-              return ce ? re = re + (ce - 1) * fe + 1 : re = re + 1, oe.__index && (re = extractIndex(oe.__index)), /* @__PURE__ */ jsxs(
+                return le;
+              const ue = j == null ? void 0 : j.current, ye = (j == null ? void 0 : j.pageSize) || 20;
+              return ue ? ae = ae + (ue - 1) * ye + 1 : ae = ae + 1, oe.__index && (ae = extractIndex(oe.__index)), /* @__PURE__ */ jsxs(
                 "div",
                 {
                   role: "button",
-                  "aria-label": `table-index-${re}`,
-                  className: cls(Z ? "checked" : null, rowSelectCheckboxWrapperClass$1, {
+                  "aria-label": `table-index-${ae}`,
+                  className: cls(te ? "checked" : null, rowSelectCheckboxWrapperClass$1, {
                     [rowSelectCheckboxWrapperClassHover$1]: z
                   }),
                   children: [
-                    /* @__PURE__ */ jsxs("div", { className: cls(Z ? "checked" : null, rowSelectCheckboxContentClass$1), children: [
-                      l && /* @__PURE__ */ jsx(SortHandle$2, { id: X(oe) }),
-                      c && /* @__PURE__ */ jsx(TableIndex$3, { index: re })
+                    /* @__PURE__ */ jsxs("div", { className: cls(te ? "checked" : null, rowSelectCheckboxContentClass$1), children: [
+                      l && /* @__PURE__ */ jsx(SortHandle$2, { id: Z(oe) }),
+                      c && /* @__PURE__ */ jsx(TableIndex$3, { index: ae })
                     ] }),
                     z && /* @__PURE__ */ jsx(
                       "div",
                       {
                         className: cls(
                           "nb-origin-node",
-                          Z ? "checked" : null,
+                          te ? "checked" : null,
                           rowSelectCheckboxCheckedClassHover$1
                         ),
-                        children: ie
+                        children: le
                       }
                     )
                   ]
                 }
               );
             }
-          }, ne) : void 0
+          }, re) : void 0
         }),
         [
-          ne,
+          re,
           k,
           u,
           c,
           l,
           S,
-          X,
+          Z,
           z,
-          ne,
+          re,
           j,
           G,
           N
         ]
-      ), ae = useCallback(
-        ({ children: Z }) => {
-          var oe;
+      ), pe = useCallback(
+        ({ children: te }) => {
+          var oe, ae;
           return l ? React.createElement(
             SortableContext$1,
             {
-              items: ((oe = b == null ? void 0 : b.map) == null ? void 0 : oe.call(b, X)) || []
+              items: ((ae = (oe = Y.current) == null ? void 0 : oe.map) == null ? void 0 : ae.call(oe, Z)) || []
             },
-            Z
-          ) : React.createElement(React.Fragment, {}, Z);
+            te
+          ) : React.createElement(React.Fragment, {}, te);
         },
-        [l, X]
+        [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: ue, tableSizeRefCallback: le } = useTableSize(), Ce = useMemo(() => ({
+      ), { height: ce, tableSizeRefCallback: fe } = useTableSize(), ge = useMemo(() => ({
         x: "max-content",
-        y: ue
-      }), [ue, ee]), he = useCallback(
-        (Z) => V.includes(Z[m]) ? Y : "",
-        [V, Y, JSON.stringify(m)]
-      ), ge = useCallback(
-        (Z, oe) => {
-          const re = Z ? [...L, oe[F.getPrimaryKey()]] : L.filter((ie) => oe[F.getPrimaryKey()] !== ie);
-          $(re), g == null || g(Z, oe);
+        y: ce
+      }), [ce, Q]), Ce = useCallback(
+        (te) => V.includes(te[m]) ? J : "",
+        [V, J, JSON.stringify(m)]
+      ), me = useCallback(
+        (te, oe) => {
+          const ae = te ? [...L, oe[F.getPrimaryKey()]] : L.filter((le) => oe[F.getPrimaryKey()] !== le);
+          $(ae), g == null || g(te, oe);
         },
         [L, g, F]
       ), xe = useMemo(() => ({
-        onExpand: ge,
+        onExpand: me,
         expandedRowKeys: L
-      }), [L, ge]);
+      }), [L, me]);
       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: ue,
-            SortableWrapper: ae,
-            tableSizeRefCallback: le,
-            defaultRowKey: K,
-            dataSource: ee
-          }, y), se), {
+            tableHeight: ce,
+            SortableWrapper: pe,
+            tableSizeRefCallback: fe,
+            defaultRowKey: X,
+            dataSource: Q
+          }, y), ie), {
             paginationProps: j,
-            components: te,
+            components: ne,
             onTableChange: d,
-            onRow: J,
-            rowClassName: he,
-            scroll: Ce,
+            onRow: K,
+            rowClassName: Ce,
+            scroll: ge,
             columns: w,
             expandable: xe,
             field: S,
@@ -10782,7 +10782,7 @@ const InternalTableBlockProvider = (e) => {
     [t, p]
   ), F = useCallback(
     (w, L, $, k) => {
-      var ee;
+      var Z;
       const {
         association: M = !1,
         cached: V = {},
@@ -10799,21 +10799,21 @@ const InternalTableBlockProvider = (e) => {
       if (V[w])
         return _.cloneDeep(V[w]);
       L && typeof L == "string" && (L = [L]), $ && typeof $ == "string" && ($ = [$]);
-      const K = b(w, J), X = (ee = K == null ? void 0 : K.filter(
+      const K = b(w, J), X = (Z = K == null ? void 0 : K.filter(
         (Q) => Q.interface && !U.includes(Q.interface) && (H || L && L.includes(Q.type) || $ && $.includes(Q.interface) || (M && Q.target && Q.target !== w && Array.isArray(M) ? M.includes(Q.interface) : !1))
-      )) == null ? void 0 : ee.map((Q) => {
-        var ne, se;
-        const te = x({
+      )) == null ? void 0 : Z.map((Q) => {
+        var ne, re;
+        const ee = x({
           value: Y && G ? `${G}.${Q.name}` : Q.name,
           label: f((ne = Q == null ? void 0 : Q.uiSchema) == null ? void 0 : ne.title) || Q.name
         }, Q);
-        return M && Q.target && (te.children = E.includes(Q.target) ? [] : F(Q.target, L, $, P(x({}, k), {
+        return M && Q.target && (ee.children = E.includes(Q.target) ? [] : F(Q.target, L, $, P(x({}, k), {
           cached: V,
           dataSource: J,
           collectionNames: [...E, Q.target],
           prefixFieldValue: Y ? G ? `${G}.${Q.name}` : Q.name : "",
           usePrefix: Y
-        })), !((se = te.children) != null && se.length)) ? null : te;
+        })), !((re = ee.children) != null && re.length)) ? null : ee;
       }).filter(Boolean);
       return V[w] = X, X;
     },
@@ -15473,14 +15473,14 @@ const useGetFilterOptions = () => {
         options: m,
         value: p == null ? void 0 : p.label,
         onChange: (U) => {
-          var J, K, X, ee, Q;
+          var J, K, X, Z, Q;
           const G = P(x(x({}, (K = (J = o == null ? void 0 : o.uiSchema) == null ? void 0 : J["x-component-props"]) == null ? void 0 : K.fieldNames), (X = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : X.fieldNames), {
             label: U
           });
           _.set(n, "x-component-props.fieldNames", G);
-          const Y = (Q = l.path) == null ? void 0 : Q.splice(((ee = l.path) == null ? void 0 : ee.length) - 1, 1);
-          l.form.query(`${Y.concat("*." + n.name)}`).forEach((te) => {
-            te.componentProps.fieldNames = G;
+          const Y = (Q = l.path) == null ? void 0 : Q.splice(((Z = l.path) == null ? void 0 : Z.length) - 1, 1);
+          l.form.query(`${Y.concat("*." + n.name)}`).forEach((ee) => {
+            ee.componentProps.fieldNames = G;
           }), d.emit("patch", {
             schema: {
               "x-uid": n["x-uid"],
@@ -18032,19 +18032,19 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
     let X = K == null ? void 0 : K.parentElement;
     for (; X && X.clientHeight === 0; )
       X = X.parentElement;
-    const ee = g || X;
-    if (!ee)
+    const Z = g || X;
+    if (!Z)
       return;
     function Q() {
       var ne;
       K && (K.classList.remove(G), (ne = e.onVisibleChange) == null || ne.call(e, !0));
     }
-    function te() {
+    function ee() {
       var ne;
       K && (K.classList.add(G), (ne = e.onVisibleChange) == null || ne.call(e, !1));
     }
-    return ee.addEventListener("mouseenter", Q), ee.addEventListener("mouseleave", te), () => {
-      ee.removeEventListener("mouseenter", Q), ee.removeEventListener("mouseleave", te);
+    return Z.addEventListener("mouseenter", Q), Z.addEventListener("mouseleave", ee), () => {
+      Z.removeEventListener("mouseenter", Q), Z.removeEventListener("mouseleave", ee);
     };
   }, [e.onVisibleChange, g]);
   const Y = useMemo(
@@ -23317,7 +23317,7 @@ function getTypedConstantOption(e, t, n) {
   };
 }
 function Input$1(e) {
-  var K, X, ee;
+  var K, X, Z;
   const J = e, {
     value: t = "",
     onChange: n,
@@ -23362,10 +23362,10 @@ function Input$1(e) {
     label: I("Constant"),
     [k.value]: "$",
     [k.label]: I("Constant")
-  } : a ? getTypedConstantOption(L, a, k) : null : null, [L, a]), V = (K = M == null ? void 0 : M.component) != null ? K : NullComponent, E = Array.isArray(a) ? (ee = (X = a.find((Q) => Array.isArray(Q) && Q[0] === L)) == null ? void 0 : X[1]) != null ? ee : {} : {};
+  } : a ? getTypedConstantOption(L, a, k) : null : null, [L, a]), V = (K = M == null ? void 0 : M.component) != null ? K : NullComponent, E = Array.isArray(a) ? (Z = (X = a.find((Q) => Array.isArray(Q) && Q[0] === L)) == null ? void 0 : X[1]) != null ? Z : {} : {};
   let z;
   t == null ? i ? o && N ? z = ["$"] : z = [""] : o ? z = ["$"] : z = [" ", L] : z = o ? ["$"] : [" ", L], m && (z = ["$"]), useEffect(() => {
-    const se = M != null ? M : {}, { component: Q } = se, te = W(se, ["component"]), ne = [
+    const re = M != null ? M : {}, { component: Q } = re, ee = W(re, ["component"]), ne = [
       ...i ? [
         {
           value: "",
@@ -23374,30 +23374,30 @@ function Input$1(e) {
           [k.label]: I("Null")
         }
       ] : [],
-      ...M ? [v(te)] : [],
+      ...M ? [v(ee)] : [],
       ...f ? [...f] : []
-    ].filter((ae) => !ae.deprecated || ($ == null ? void 0 : $[0]) === ae[k.value]);
+    ].filter((ie) => !ie.deprecated || ($ == null ? void 0 : $[0]) === ie[k.value]);
     T(ne);
   }, [f, $, M, i]);
   const H = (Q) => q(this, null, function* () {
     var ne;
-    const te = Q[Q.length - 1];
-    if (!((ne = te.children) != null && ne.length) && !te.isLeaf && te.loadChildren) {
-      let se;
+    const ee = Q[Q.length - 1];
+    if (!((ne = ee.children) != null && ne.length) && !ee.isLeaf && ee.loadChildren) {
+      let re;
       if ($ && $.length >= 2) {
-        for (const ae of $)
-          if (ae === te[k.value]) {
-            se = ae;
+        for (const ie of $)
+          if (ie === ee[k.value]) {
+            re = ie;
             break;
           }
       }
-      yield te.loadChildren(te, se, $), T((ae) => [...ae]);
+      yield ee.loadChildren(ee, re, $), T((ie) => [...ie]);
     }
   }), U = useCallback(
-    (Q, te) => {
-      var ne, se, ae;
+    (Q, ee) => {
+      var ne, re, ie;
       if (Q[0] === "$") {
-        O(!0), $ && n(null, te);
+        O(!0), $ && n(null, ee);
         return;
       } else
         O(!1);
@@ -23406,35 +23406,35 @@ function Input$1(e) {
         return;
       }
       if (Q[0] === " ") {
-        Q[1] ? Q[1] !== L && n((ae = (se = (ne = ConstantTypes[Q[1]]) == null ? void 0 : ne.default) == null ? void 0 : se.call(ne)) != null ? ae : null, te) : $ && n(null, te);
+        Q[1] ? Q[1] !== L && n((ie = (re = (ne = ConstantTypes[Q[1]]) == null ? void 0 : ne.default) == null ? void 0 : re.call(ne)) != null ? ie : null, ee) : $ && n(null, ee);
         return;
       }
-      n(`{{${Q.join(".")}}}`, te);
+      n(`{{${Q.join(".")}}}`, ee);
     },
     [L, $, n]
   ), G = useCallback(() => {
     var Q;
     if (O(!!o), (Q = M == null ? void 0 : M.children) != null && Q.length) {
-      const te = M.children[0].default();
-      return n(te);
+      const ee = M.children[0].default();
+      return n(ee);
     }
     n(null);
   }, [M]);
   useEffect(() => {
     q(this, null, function* () {
-      var se;
+      var re;
       if (!$ || R.length <= 1)
         return;
-      let te = null;
+      let ee = null;
       const ne = [];
-      for (let ae = 0; ae < $.length; ae++) {
-        const ue = $[ae];
+      for (let ie = 0; ie < $.length; ie++) {
+        const pe = $[ie];
         try {
-          if (ae === 0 ? te = R.find((le) => le[k.value] === ue) : (te.loadChildren && !((se = te.children) != null && se.length) && (yield te.loadChildren(te, ue, $)), te = te.children.find((le) => le[k.value] === ue)), !te)
+          if (ie === 0 ? ee = R.find((ce) => ce[k.value] === pe) : (ee.loadChildren && !((re = ee.children) != null && re.length) && (yield ee.loadChildren(ee, pe, $)), ee = ee.children.find((ce) => ce[k.value] === pe)), !ee)
             return;
-          ne.push(te[k.label]);
-        } catch (le) {
-          error(le);
+          ne.push(ee[k.label]);
+        } catch (ce) {
+          error(ce);
         }
       }
       T([...R]), B([...ne]);
@@ -23482,8 +23482,8 @@ function Input$1(e) {
                   "aria-label": "variable-tag",
                   style: { overflow: "hidden" },
                   className: cx("ant-input ant-input-outlined", { "ant-input-disabled": Y }, b),
-                  children: /* @__PURE__ */ jsx(Tag, { color: "blue", children: D.map((Q, te) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
-                    te ? " / " : "",
+                  children: /* @__PURE__ */ jsx(Tag, { color: "blue", children: D.map((Q, ee) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
+                    ee ? " / " : "",
                     Q
                   ] }, Q)) })
                 }
@@ -25298,6 +25298,10 @@ const LayoutContent = () => {
       onCollapse: y,
       collapsed: l,
       onPageChange: S,
+      menu: {
+        // 1.x 暂默认禁用菜单手风琴效果，2.x 支持配置
+        autoClose: !1
+      },
       menuProps: v,
       children: /* @__PURE__ */ jsx(RouteContext.Consumer, { children: (I) => {
         const { isMobile: F } = I;
@@ -26941,21 +26945,21 @@ https://requirejs.org/docs/errors.html#` + e);
         }
     }
     function b(k, M, V) {
-      var E, z, H, U, G, Y, J, K, X, ee, Q, te, ne = M && M.split("/"), se = i.map, ae = se && se["*"];
-      if (k && (k = k.split("/"), J = k.length - 1, i.nodeIdCompat && jsSuffixRegExp.test(k[J]) && (k[J] = k[J].replace(jsSuffixRegExp, "")), k[0].charAt(0) === "." && ne && (te = ne.slice(0, ne.length - 1), k = te.concat(k)), C(k), k = k.join("/")), V && se && (ne || ae)) {
+      var E, z, H, U, G, Y, J, K, X, Z, Q, ee, ne = M && M.split("/"), re = i.map, ie = re && re["*"];
+      if (k && (k = k.split("/"), J = k.length - 1, i.nodeIdCompat && jsSuffixRegExp.test(k[J]) && (k[J] = k[J].replace(jsSuffixRegExp, "")), k[0].charAt(0) === "." && ne && (ee = ne.slice(0, ne.length - 1), k = ee.concat(k)), C(k), k = k.join("/")), V && re && (ne || ie)) {
         H = k.split("/");
         e:
           for (U = H.length; U > 0; U -= 1) {
             if (Y = H.slice(0, U).join("/"), ne) {
               for (G = ne.length; G > 0; G -= 1)
-                if (z = getOwn(se, ne.slice(0, G).join("/")), z && (z = getOwn(z, Y), z)) {
+                if (z = getOwn(re, ne.slice(0, G).join("/")), z && (z = getOwn(z, Y), z)) {
                   K = z, X = U;
                   break e;
                 }
             }
-            !ee && ae && getOwn(ae, Y) && (ee = getOwn(ae, Y), Q = U);
+            !Z && ie && getOwn(ie, Y) && (Z = getOwn(ie, Y), Q = U);
           }
-        !K && ee && (K = ee, X = Q), K && (H.splice(0, X, K), k = H.join("/"));
+        !K && Z && (K = Z, X = Q), K && (H.splice(0, X, K), k = H.join("/"));
       }
       return E = getOwn(i.pkgs, k), E || k;
     }
@@ -26977,18 +26981,18 @@ https://requirejs.org/docs/errors.html#` + e);
       return V > -1 && (M = k.substring(0, V), k = k.substring(V + 1, k.length)), [M, k];
     }
     function I(k, M, V, E) {
-      var z, H, U, G, Y = null, J = M ? M.name : null, K = k, X = !0, ee = "";
-      return k || (X = !1, k = "_@r" + (g += 1)), G = v(k), Y = G[0], k = G[1], Y && (Y = b(Y, J, E), H = getOwn(p, Y)), k && (Y ? V ? ee = k : H && H.normalize ? ee = H.normalize(k, function(Q) {
+      var z, H, U, G, Y = null, J = M ? M.name : null, K = k, X = !0, Z = "";
+      return k || (X = !1, k = "_@r" + (g += 1)), G = v(k), Y = G[0], k = G[1], Y && (Y = b(Y, J, E), H = getOwn(p, Y)), k && (Y ? V ? Z = k : H && H.normalize ? Z = H.normalize(k, function(Q) {
         return b(Q, J, E);
-      }) : ee = k.indexOf("!") === -1 ? b(k, J, E) : k : (ee = b(k, J, E), G = v(ee), Y = G[0], ee = G[1], V = !0, z = o.nameToUrl(ee))), U = Y && !H && !V ? "_unnormalized" + (f += 1) : "", {
+      }) : Z = k.indexOf("!") === -1 ? b(k, J, E) : k : (Z = b(k, J, E), G = v(Z), Y = G[0], Z = G[1], V = !0, z = o.nameToUrl(Z))), U = Y && !H && !V ? "_unnormalized" + (f += 1) : "", {
         prefix: Y,
-        name: ee,
+        name: Z,
         parentMap: M,
         unnormalized: !!U,
         url: z,
         originalName: K,
         isDefine: X,
-        id: (Y ? Y + "!" + ee : ee) + U
+        id: (Y ? Y + "!" + Z : Z) + U
       };
     }
     function F(k) {
@@ -27168,23 +27172,23 @@ https://requirejs.org/docs/errors.html#` + e);
               enabled: !0
             });
           }), z.error = bind(this, function(X) {
-            this.inited = !0, this.error = X, X.requireModules = [M], eachProp(l, function(ee) {
-              ee.map.id.indexOf(M + "_unnormalized") === 0 && B(ee.map.id);
+            this.inited = !0, this.error = X, X.requireModules = [M], eachProp(l, function(Z) {
+              Z.map.id.indexOf(M + "_unnormalized") === 0 && B(Z.map.id);
             }), T(X);
-          }), z.fromText = bind(this, function(X, ee) {
-            var Q = k.name, te = I(Q), ne = useInteractive;
-            ee && (X = ee), ne && (useInteractive = !1), F(te), hasProp(i.config, M) && (i.config[Q] = i.config[M]);
+          }), z.fromText = bind(this, function(X, Z) {
+            var Q = k.name, ee = I(Q), ne = useInteractive;
+            Z && (X = Z), ne && (useInteractive = !1), F(ee), hasProp(i.config, M) && (i.config[Q] = i.config[M]);
             try {
               req.exec(X);
-            } catch (se) {
+            } catch (re) {
               return T(makeError(
                 "fromtexteval",
-                "fromText eval for " + M + " failed: " + se,
-                se,
+                "fromText eval for " + M + " failed: " + re,
+                re,
                 [M]
               ));
             }
-            ne && (useInteractive = !0), this.depMaps.push(te), o.completeLoad(Q), K([Q], z);
+            ne && (useInteractive = !0), this.depMaps.push(ee), o.completeLoad(Q), K([Q], z);
           }), E.load(k.name, K, z, i);
         })), o.enable(V, this), this.pluginMaps[V.id] = V;
       },
@@ -31593,7 +31597,7 @@ const useParseDefaultValue = () => {
         const j = transformVariableValue(B, {
           targetCollectionField: D
         });
-        j == null || j === "" ? e.mounted && (e.setInitialValue(null), yield e.reset({ forceClear: !0 })) : p() ? h === 0 && m(j) : e.setInitialValue(j), e.loading = !1;
+        j == null || j === "" ? e.mounted && e.setInitialValue(null) : p() ? h === 0 && m(j) : e.setInitialValue(j), e.loading = !1;
       } else
         !/\{\{.+\}\}/g.test(t.default) && e.setInitialValue && e.setInitialValue(t.default);
     }), v = _.debounce(S, DEBOUNCE_WAIT);
@@ -39770,14 +39774,14 @@ const ActionLink = withDynamicSchemaProps(
       const K = uid(), X = [];
       return setTimeout(() => {
         H.addEffects(K, () => {
-          forEachLinkageRule(B, (ee, Q) => {
+          forEachLinkageRule(B, (Z, Q) => {
             X.push(
               reaction(
-                () => [getVariableValuesInCondition({ linkageRules: B, localVariables: w })].map((se) => JSON.stringify(se)).join(","),
+                () => [getVariableValuesInCondition({ linkageRules: B, localVariables: w })].map((re) => JSON.stringify(re)).join(","),
                 () => {
                   I.stateOfLinkageRules = {}, linkageAction(
                     {
-                      operator: ee.operator,
+                      operator: Z.operator,
                       field: I,
                       condition: Q.condition,
                       variables: j,
@@ -39794,8 +39798,8 @@ const ActionLink = withDynamicSchemaProps(
           });
         });
       }), () => {
-        H.removeEffects(K), X.forEach((ee) => {
-          ee();
+        H.removeEffects(K), X.forEach((Z) => {
+          Z();
         });
       };
     }, [B, T]);
@@ -39805,16 +39809,16 @@ const ActionLink = withDynamicSchemaProps(
       },
       [C]
     ), G = useMemo(() => c && ((K, X) => q(void 0, null, function* () {
-      var Q, te;
+      var Q, ee;
       yield c == null ? void 0 : c(K, X);
-      const ee = ((te = (Q = F["x-action-settings"]) == null ? void 0 : Q.onSuccess) == null ? void 0 : te.blocksToRefresh) || [];
-      ee.length > 0 && z().forEach((ne) => {
-        var se;
-        if (ee.includes(ne.uid))
+      const Z = ((ee = (Q = F["x-action-settings"]) == null ? void 0 : Q.onSuccess) == null ? void 0 : ee.blocksToRefresh) || [];
+      Z.length > 0 && z().forEach((ne) => {
+        var re;
+        if (Z.includes(ne.uid))
           try {
-            (se = ne.service) == null || se.refresh();
-          } catch (ae) {
-            console.error("Failed to refresh block:", ne.uid, ae);
+            (re = ne.service) == null || re.refresh();
+          } catch (ie) {
+            console.error("Failed to refresh block:", ne.uid, ie);
           }
       });
     })), [c, F, z]);
@@ -39853,8 +39857,8 @@ const ActionLink = withDynamicSchemaProps(
   }),
   { displayName: "Action" }
 ), InternalAction = observer$1(function e(t) {
-  var he, ge, xe, pe, me;
-  const Ce = t, {
+  var ge, Ce, me, xe, he;
+  const fe = t, {
     containerRefKey: n,
     fieldSchema: o,
     designable: r,
@@ -39882,7 +39886,7 @@ const ActionLink = withDynamicSchemaProps(
     setSubmitted: B,
     getAriaLabel: N,
     parentRecordData: O
-  } = Ce, j = W(Ce, [
+  } = fe, j = W(fe, [
     "containerRefKey",
     "fieldSchema",
     "designable",
@@ -39910,25 +39914,25 @@ const ActionLink = withDynamicSchemaProps(
     "setSubmitted",
     "getAriaLabel",
     "parentRecordData"
-  ]), [w, L] = useState(!1), { wrapSSR: $, componentCls: k, hashId: M } = useStyles$8(), [V, E] = useState(!1), z = o["x-toolbar-props"] || o["x-designer-props"], H = (he = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : he.openMode, U = (ge = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : ge.openSize, G = (xe = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : xe.refreshDataBlockRequest, { modal: Y } = App.useApp(), J = useForm(), K = useACLActionParamsContext(), {
+  ]), [w, L] = useState(!1), { wrapSSR: $, componentCls: k, hashId: M } = useStyles$8(), [V, E] = useState(!1), z = o["x-toolbar-props"] || o["x-designer-props"], H = (ge = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : ge.openMode, U = (Ce = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : Ce.openSize, G = (me = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : me.refreshDataBlockRequest, { modal: Y } = App.useApp(), J = useForm(), K = useACLActionParamsContext(), {
     run: X,
-    element: ee,
+    element: Z,
     disabled: Q,
-    loading: te
-  } = (F == null ? void 0 : F(R)) || {}, ne = J.disabled || a.disabled || ((pe = a.data) == null ? void 0 : pe.disabled) || I || Q, se = useMemo(() => {
+    loading: ee
+  } = (F == null ? void 0 : F(R)) || {}, ne = J.disabled || a.disabled || ((xe = a.data) == null ? void 0 : xe.disabled) || I || Q, re = useMemo(() => {
     var de;
     return P(x({}, v), {
       opacity: r && (((de = a == null ? void 0 : a.data) == null ? void 0 : de.hidden) || !K) && 0.1,
       color: ne ? "rgba(0, 0, 0, 0.25)" : v == null ? void 0 : v.color
     });
-  }, [K, r, (me = a == null ? void 0 : a.data) == null ? void 0 : me.hidden, v, ne]), ae = {
+  }, [K, r, (he = a == null ? void 0 : a.data) == null ? void 0 : he.hidden, v, ne]), ie = {
     designable: r,
     field: a,
     aclCtx: K,
     icon: i,
-    loading: typeof te == "boolean" ? te : l,
+    loading: typeof ee == "boolean" ? ee : l,
     disabled: ne,
-    buttonStyle: se,
+    buttonStyle: re,
     handleMouseEnter: c,
     tarComponent: u,
     designerProps: z,
@@ -39949,18 +39953,18 @@ const ActionLink = withDynamicSchemaProps(
     setSubmitted: B,
     confirmTitle: f,
     title: S
-  }, ue = useCallback(
+  }, pe = useCallback(
     (de) => {
       L == null || L(de), D == null || D(de);
     },
     [D]
   );
-  let le = /* @__PURE__ */ jsx(PopupVisibleProvider, { visible: !1, children: /* @__PURE__ */ jsxs(
+  let ce = /* @__PURE__ */ jsx(PopupVisibleProvider, { visible: !1, children: /* @__PURE__ */ jsxs(
     ActionContextProvider,
     {
-      button: RenderButton(ae),
+      button: RenderButton(ie),
       visible: w || T,
-      setVisible: ue,
+      setVisible: pe,
       formValueChanged: V,
       setFormValueChanged: E,
       openMode: H,
@@ -39970,13 +39974,13 @@ const ActionLink = withDynamicSchemaProps(
       setSubmitted: B,
       children: [
         C && /* @__PURE__ */ jsx(NocoBaseRecursionField, { basePath: a.address, onlyRenderProperties: !0, schema: o }),
-        !C && /* @__PURE__ */ jsx(RenderButton, x({}, ae)),
+        !C && /* @__PURE__ */ jsx(RenderButton, x({}, ie)),
         /* @__PURE__ */ jsx(VariablePopupRecordProvider, { children: !C && t.children }),
-        ee
+        Z
       ]
     }
   ) });
-  return isBulkEditAction(o) && (le = /* @__PURE__ */ jsx(TabsContextProvider, { children: le })), $(b ? /* @__PURE__ */ jsx(TreeRecordProvider, { parent: y, children: le }) : le);
+  return isBulkEditAction(o) && (ce = /* @__PURE__ */ jsx(TabsContextProvider, { children: ce })), $(b ? /* @__PURE__ */ jsx(TreeRecordProvider, { parent: y, children: ce }) : ce);
 });
 InternalAction.displayName = "InternalAction";
 Action.Popover = function e(t) {
@@ -40065,8 +40069,8 @@ const RenderButton = ({
       if (!a && n) {
         const K = () => {
           b ? b(H, () => {
-            var X, ee;
-            y !== !1 && (T == null || T(!0), (ee = (X = N()) == null ? void 0 : X.refresh) == null || ee.call(X));
+            var X, Z;
+            y !== !1 && (T == null || T(!0), (Z = (X = N()) == null ? void 0 : X.refresh) == null || Z.call(X));
           }) : isBulkEditAction(S) || !j() ? (v(!0), I == null || I()) : ["view", "update", "create", "customize:popup"].includes(S["x-action"]) && S["x-uid"] ? k.current() : (v(!0), I == null || I());
         };
         (F == null ? void 0 : F.enable) !== !1 && (F != null && F.content) ? (yield (J = V == null ? void 0 : V.submit) == null ? void 0 : J.call(V), R.confirm({
@@ -40683,8 +40687,8 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
       ]), b = useDataSourceKey(), y = useDataSourceHeaders(m || b), S = useRef(!1), v = useFieldSchema(), I = ((Y = v["x-component-props"]) == null ? void 0 : Y.addMode) === "quickAdd", { getField: F } = useCollection_deprecated(), R = useRef(null), { getCollectionJoinField: T, getInterface: D } = useCollectionManager_deprecated(), B = v["x-collection-field"] || v.name, N = F(B) || T(B), O = u || (N == null ? void 0 : N.target) && (t == null ? void 0 : t.label) && T(`${N.target}.${t.label}`), j = useMemo(() => {
         var K;
         if (O != null && O.interface) {
-          const X = D(O.interface), ee = ((K = X == null ? void 0 : X.filterable) == null ? void 0 : K.operators[0].value) || "$includes";
-          return O.type === "string" || O.dataType === "string" ? "$includes" : ee;
+          const X = D(O.interface), Z = ((K = X == null ? void 0 : X.filterable) == null ? void 0 : K.operators[0].value) || "$includes";
+          return O.type === "string" || O.dataType === "string" ? "$includes" : Z;
         }
         return "$includes";
       }, [O]), w = useCompile(), L = useCallback(
@@ -40692,22 +40696,22 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
           try {
             return K.filter((X) => ["number", "string"].includes(typeof X[t.value]) || !X[t.value]).map((X) => {
               var Q;
-              let ee = w(X[t.label]);
+              let Z = w(X[t.label]);
               if ((Q = O == null ? void 0 : O.uiSchema) != null && Q.enum)
-                if (Array.isArray(ee))
-                  ee = ee.map((te, ne) => {
-                    const se = O.uiSchema.enum.find((ae) => ae.value === te);
-                    return se ? /* @__PURE__ */ jsx(Tag, { role: "button", color: se.color, style: { marginRight: 3 }, children: (se == null ? void 0 : se.label) || te }, ne) : /* @__PURE__ */ jsx(Tag, { role: "button", children: te }, te);
+                if (Array.isArray(Z))
+                  Z = Z.map((ee, ne) => {
+                    const re = O.uiSchema.enum.find((ie) => ie.value === ee);
+                    return re ? /* @__PURE__ */ jsx(Tag, { role: "button", color: re.color, style: { marginRight: 3 }, children: (re == null ? void 0 : re.label) || ee }, ne) : /* @__PURE__ */ jsx(Tag, { role: "button", children: ee }, ee);
                   }).reverse();
                 else {
-                  const te = O.uiSchema.enum.find((ne) => ne.value === ee);
-                  te && (ee = /* @__PURE__ */ jsx(Tag, { role: "button", color: te.color, children: te.label }));
+                  const ee = O.uiSchema.enum.find((ne) => ne.value === Z);
+                  ee && (Z = /* @__PURE__ */ jsx(Tag, { role: "button", color: ee.color, children: ee.label }));
                 }
-              return (O == null ? void 0 : O.type) === "date" && (ee = dayjs(ee).format("YYYY-MM-DD")), c ? c({
-                [t.label]: ee || EMPTY$1,
+              return (O == null ? void 0 : O.type) === "date" && (Z = dayjs(Z).format("YYYY-MM-DD")), c ? c({
+                [t.label]: Z || EMPTY$1,
                 [t.value]: X[t.value]
               }) : P(x({}, omit(X, "style")), {
-                [t.label]: ee || EMPTY$1,
+                [t.label]: Z || EMPTY$1,
                 [t.value]: X[t.value]
               });
             }).filter(Boolean);
@@ -40767,8 +40771,8 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
         const K = r || a;
         if (!((Q = $ == null ? void 0 : $.data) != null && Q.length))
           return K != null ? Array.isArray(K) ? K : [K] : [];
-        const X = K != null && (Array.isArray(K) ? K.map((te) => P(x({}, te), { [t.value]: te[t.value] || te })) : [P(x({}, K), { [t.value]: K[t.value] || K })]) || [], ee = typeof p == "function" ? $.data.filter(p) : $.data;
-        return uniqBy(ee.concat(X != null ? X : []), t.value);
+        const X = K != null && (Array.isArray(K) ? K.map((ee) => P(x({}, ee), { [t.value]: ee[t.value] || ee })) : [P(x({}, K), { [t.value]: K[t.value] || K })]) || [], Z = typeof p == "function" ? $.data.filter(p) : $.data;
+        return uniqBy(Z.concat(X != null ? X : []), t.value);
       }, [r, a, $ == null ? void 0 : $.data, t.value, p]);
       return /* @__PURE__ */ jsx(
         Select,
@@ -40790,7 +40794,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
           options: h(L(H)),
           rawOptions: H,
           dropdownRender: (K) => {
-            const X = H.some((ee) => ee[t.label] === R.current);
+            const X = H.some((Z) => Z[t.label] === R.current);
             return /* @__PURE__ */ jsx(Fragment$1, { children: I ? /* @__PURE__ */ jsxs(Fragment$1, { children: [
               !(($ == null ? void 0 : $.data.length) === 0 && (R != null && R.current)) && K,
               ($ == null ? void 0 : $.data.length) > 0 && (R == null ? void 0 : R.current) && !X && /* @__PURE__ */ jsx(Divider$1, { style: { margin: 0 } }),
@@ -44917,7 +44921,7 @@ const InternalNesterCardCss = css`
             visible: p,
             setVisible: m
           },
-          children: /* @__PURE__ */ jsx(RecordPickerProvider, P(x({}, T), { children: /* @__PURE__ */ jsx(CollectionProvider_deprecated, { name: f == null ? void 0 : f.target, children: /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(TableSelectorParamsProvider, { params: { filter: O() }, children: /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: w, children: /* @__PURE__ */ jsx(
+          children: /* @__PURE__ */ jsx(RecordPickerProvider, P(x({}, T), { children: /* @__PURE__ */ jsx(CollectionProvider_deprecated, { name: f == null ? void 0 : f.target, children: /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(TableSelectorParamsProvider, { params: { filter: O() }, children: /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: w, components: { CollectionField: CollectionField$1 }, children: /* @__PURE__ */ jsx(
             NocoBaseRecursionField,
             {
               onlyRenderProperties: !0,
@@ -46306,7 +46310,7 @@ InternalNocoBaseTable.displayName = "InternalNocoBaseTable";
 const Table$1 = withDynamicSchemaProps(
   observer$1((e) => {
     var de, be, Se;
-    const { token: t } = useToken$1(), xe = omit(e, ["onBlur", "onFocus", "value"]), { pagination: n, useProps: o } = xe, r = W(xe, ["pagination", "useProps"]), pe = (o == null ? void 0 : o()) || {}, { pagination: a } = pe, i = W(pe, ["pagination"]), me = x(x({}, r), i), {
+    const { token: t } = useToken$1(), me = omit(e, ["onBlur", "onFocus", "value"]), { pagination: n, useProps: o } = me, r = W(me, ["pagination", "useProps"]), xe = (o == null ? void 0 : o()) || {}, { pagination: a } = xe, i = W(xe, ["pagination"]), he = x(x({}, r), i), {
       dragSort: l = !1,
       showIndex: c = !0,
       onRowSelectionChange: u,
@@ -46318,7 +46322,7 @@ const Table$1 = withDynamicSchemaProps(
       loading: f,
       onClickRow: C,
       enableIndexColumn: b
-    } = me, y = W(me, [
+    } = he, y = W(he, [
       "dragSort",
       "showIndex",
       "onRowSelectionChange",
@@ -46338,48 +46342,48 @@ const Table$1 = withDynamicSchemaProps(
         &:hover > td {
           background-color: ${t.controlItemBgActiveHover} !important;
         }
-      `, [t.controlItemBgActive, t.controlItemBgActiveHover]), U = useMemo(() => C ? H : "", [H, C]), G = useMemo(() => C ? (Z, oe) => ({
-      onClick: (re) => {
-        isPortalInBody(re.target) || C(Z, V, M);
+      `, [t.controlItemBgActive, t.controlItemBgActiveHover]), U = useMemo(() => C ? H : "", [H, C]), G = useMemo(() => C ? (se, te) => ({
+      onClick: (oe) => {
+        isPortalInBody(oe.target) || C(se, V, M);
       },
-      rowIndex: oe
+      rowIndex: te
     }) : null, [C, M]);
     useDeepCompareEffect(() => {
-      const Z = D ? B : [];
-      _.isEqual(Z, w) || L(Z);
+      const se = D ? B : [];
+      _.isEqual(se, w) || L(se);
     }, [D, B]);
-    const Y = useCallback((Z) => {
+    const Y = useCallback((se) => {
       if (m)
-        return J(Z);
-      if (Z.key)
-        return Z.key;
-      if (z.current.has(Z))
-        return z.current.get(Z);
-      const oe = uid();
-      return z.current.set(Z, oe), oe;
+        return J(se);
+      if (se.key)
+        return se.key;
+      if (z.current.has(se))
+        return z.current.get(se);
+      const te = uid();
+      return z.current.set(se, te), te;
     }, []), J = useCallback(
-      (Z) => {
-        var oe;
-        return Array.isArray(m) ? m.map((re) => {
-          var ie;
-          return ((ie = Z[re]) == null ? void 0 : ie.toString()) || "";
-        }).join("-") : typeof m == "string" ? Z[m] : (oe = (m != null ? m : Y)(Z)) == null ? void 0 : oe.toString();
+      (se) => {
+        var te;
+        return Array.isArray(m) ? m.map((oe) => {
+          var ae;
+          return ((ae = se[oe]) == null ? void 0 : ae.toString()) || "";
+        }).join("-") : typeof m == "string" ? se[m] : (te = (m != null ? m : Y)(se)) == null ? void 0 : te.toString();
       },
       [JSON.stringify(m), Y]
-    ), K = useMemo(() => (Array.isArray(S == null ? void 0 : S.value) ? S.value : []).filter(Boolean), [S == null ? void 0 : S.value, (Se = S == null ? void 0 : S.value) == null ? void 0 : Se.length]), X = useMemo(() => (Z) => {
-      const oe = useCallback((re) => {
-        var ye, ve, Pe, Fe, Ie, Ae;
-        if (!re.active || !re.over) {
+    ), K = useMemo(() => (Array.isArray(S == null ? void 0 : S.value) ? S.value : []).filter(Boolean), [S == null ? void 0 : S.value, (Se = S == null ? void 0 : S.value) == null ? void 0 : Se.length]), X = useMemo(() => (se) => {
+      const te = useCallback((oe) => {
+        var ke, ve, Pe, Fe, Ie, Ae;
+        if (!oe.active || !oe.over) {
           console.warn("move cancel");
           return;
         }
-        const ie = (Pe = (ve = (ye = re.active) == null ? void 0 : ye.data.current) == null ? void 0 : ve.sortable) == null ? void 0 : Pe.index, ce = (Ae = (Ie = (Fe = re.over) == null ? void 0 : Fe.data.current) == null ? void 0 : Ie.sortable) == null ? void 0 : Ae.index, fe = S.value[ie] || re.active, Re = S.value[ce] || re.over;
-        S.move(ie, ce), N({ from: fe, to: Re });
+        const ae = (Pe = (ve = (ke = oe.active) == null ? void 0 : ke.data.current) == null ? void 0 : ve.sortable) == null ? void 0 : Pe.index, le = (Ae = (Ie = (Fe = oe.over) == null ? void 0 : Fe.data.current) == null ? void 0 : Ie.sortable) == null ? void 0 : Ae.index, ue = S.value[ae] || oe.active, ye = S.value[le] || oe.over;
+        S.move(ae, le), N({ from: ue, to: ye });
       }, []);
-      return /* @__PURE__ */ jsx(DndContext, { onDragEnd: oe, children: /* @__PURE__ */ jsx("tbody", x({}, Z)) });
+      return /* @__PURE__ */ jsx(DndContext, { onDragEnd: te, children: /* @__PURE__ */ jsx("tbody", x({}, se)) });
     }, [S, N]);
     X.displayName = "BodyWrapperComponent";
-    const ee = useMemo(() => ({
+    const Z = useMemo(() => ({
       header: {
         wrapper: HeaderWrapperComponent,
         cell: HeaderCellComponent
@@ -46389,45 +46393,45 @@ const Table$1 = withDynamicSchemaProps(
         row: BodyRowComponent,
         cell: BodyCellComponent
       }
-    }), [X]), Q = useMemo(() => p, [JSON.stringify(p)]), te = useMemo(
+    }), [X]), Q = useMemo(() => p, [JSON.stringify(p)]), ee = useMemo(
       () => ({
         rowSelection: b && Q ? x({
           type: "checkbox",
           selectedRowKeys: $,
-          onChange(Z, oe) {
-            S.data = S.data || {}, S.data.selectedRowKeys = Z, S.data.selectedRowData = oe, k(Z), u == null || u(Z, oe);
+          onChange(se, te) {
+            S.data = S.data || {}, S.data.selectedRowKeys = se, S.data.selectedRowData = te, k(se), u == null || u(se, te);
           },
-          getCheckboxProps(Z) {
+          getCheckboxProps(se) {
             return {
               "aria-label": "checkbox"
             };
           },
-          renderCell: (Z, oe, re, ie) => {
+          renderCell: (se, te, oe, ae) => {
             if (!l && !c)
-              return ie;
-            const ce = O == null ? void 0 : O.current, fe = (O == null ? void 0 : O.pageSize) || 20;
-            return ce ? re = re + (ce - 1) * fe + 1 : re = re + 1, oe.__index && (re = extractIndex(oe.__index)), /* @__PURE__ */ jsxs(
+              return ae;
+            const le = O == null ? void 0 : O.current, ue = (O == null ? void 0 : O.pageSize) || 20;
+            return le ? oe = oe + (le - 1) * ue + 1 : oe = oe + 1, te.__index && (oe = extractIndex(te.__index)), /* @__PURE__ */ jsxs(
               "div",
               {
                 role: "button",
-                "aria-label": `table-index-${re}`,
-                className: cls(Z ? "checked" : null, rowSelectCheckboxWrapperClass, {
+                "aria-label": `table-index-${oe}`,
+                className: cls(se ? "checked" : null, rowSelectCheckboxWrapperClass, {
                   [rowSelectCheckboxWrapperClassHover]: E
                 }),
                 children: [
-                  /* @__PURE__ */ jsxs("div", { className: cls(Z ? "checked" : null, rowSelectCheckboxContentClass), children: [
-                    l && /* @__PURE__ */ jsx(SortHandle$1, { id: J(oe) }),
-                    c && /* @__PURE__ */ jsx(TableIndex$2, { index: re })
+                  /* @__PURE__ */ jsxs("div", { className: cls(se ? "checked" : null, rowSelectCheckboxContentClass), children: [
+                    l && /* @__PURE__ */ jsx(SortHandle$1, { id: J(te) }),
+                    c && /* @__PURE__ */ jsx(TableIndex$2, { index: oe })
                   ] }),
                   E && /* @__PURE__ */ jsx(
                     "div",
                     {
                       className: cls(
                         "nb-origin-node",
-                        Z ? "checked" : null,
+                        se ? "checked" : null,
                         rowSelectCheckboxCheckedClassHover
                       ),
-                      children: ie
+                      children: ae
                     }
                   )
                 ]
@@ -46450,54 +46454,54 @@ const Table$1 = withDynamicSchemaProps(
         b
       ]
     ), ne = useCallback(
-      ({ children: Z }) => {
-        var oe, re;
+      ({ children: se }) => {
+        var te, oe;
         return l ? React.createElement(
           SortableContext$1,
           {
-            items: ((re = (oe = S.value) == null ? void 0 : oe.map) == null ? void 0 : re.call(oe, J)) || []
+            items: ((oe = (te = S.value) == null ? void 0 : te.map) == null ? void 0 : oe.call(te, J)) || []
           },
-          Z
-        ) : React.createElement(React.Fragment, {}, Z);
+          se
+        ) : React.createElement(React.Fragment, {}, se);
       },
       [S, l, J]
-    ), { height: se, tableSizeRefCallback: ae } = useTableSize(), ue = useMemo(() => ({
+    ), { height: re, tableSizeRefCallback: ie } = useTableSize(), pe = useMemo(() => ({
       x: "max-content"
-    }), []), le = useMemo(() => ({
+    }), []), ce = useMemo(() => ({
       x: "max-content",
-      y: K.length > 0 ? se : void 0
-    }), [se, ue, K]), Ce = useCallback(
-      (Z) => M.includes(Z[m]) ? U : "",
+      y: K.length > 0 ? re : void 0
+    }), [re, pe, K]), fe = useCallback(
+      (se) => M.includes(se[m]) ? U : "",
       [M, U, JSON.stringify(m)]
-    ), he = useCallback(
-      (Z, oe) => {
-        const re = Z ? [...w, oe[F.getPrimaryKey()]] : w.filter((ie) => oe[F.getPrimaryKey()] !== ie);
-        L(re), g == null || g(Z, oe);
+    ), ge = useCallback(
+      (se, te) => {
+        const oe = se ? [...w, te[F.getPrimaryKey()]] : w.filter((ae) => te[F.getPrimaryKey()] !== ae);
+        L(oe), g == null || g(se, te);
       },
       [w, g, F]
-    ), ge = useMemo(() => ({
-      onExpand: he,
+    ), Ce = useMemo(() => ({
+      onExpand: ge,
       expandedRowKeys: w
-    }), [w, he]);
+    }), [w, ge]);
     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: se,
+          tableHeight: re,
           SortableWrapper: ne,
-          tableSizeRefCallback: ae,
+          tableSizeRefCallback: ie,
           defaultRowKey: Y,
           dataSource: K
-        }, y), te), {
+        }, y), ee), {
           paginationProps: O,
-          components: ee,
+          components: Z,
           onTableChange: d,
           onRow: G,
-          rowClassName: Ce,
-          scroll: le,
+          rowClassName: fe,
+          scroll: ce,
           columns: j,
-          expandable: ge,
+          expandable: Ce,
           field: S,
           size: I
         })
@@ -46925,19 +46929,19 @@ AssociationSelect.Designer = function e() {
           }
         },
         onSubmit: (J) => {
-          var te;
+          var ee;
           const K = [], X = (ne) => ne != null && !Number.isNaN(ne);
           for (const ne of J.rules)
             K.push(_.pickBy(ne, X));
-          const ee = {
+          const Z = {
             "x-uid": u["x-uid"]
           };
           if (["percent"].includes(y == null ? void 0 : y.interface))
             for (const ne of K)
               (ne.maxValue || ne.minValue) && (ne.percentMode = !0), ne.percentFormat && (ne.percentFormats = !0);
-          const Q = _.concat([], ((te = y == null ? void 0 : y.uiSchema) == null ? void 0 : te["x-validator"]) || [], K);
-          c.validator = Q, u["x-validator"] = K, ee["x-validator"] = K, m.emit("patch", {
-            schema: ee
+          const Q = _.concat([], ((ee = y == null ? void 0 : y.uiSchema) == null ? void 0 : ee["x-validator"]) || [], K);
+          c.validator = Q, u["x-validator"] = K, Z["x-validator"] = K, m.emit("patch", {
+            schema: Z
           }), h();
         }
       }
@@ -46985,7 +46989,7 @@ AssociationSelect.Designer = function e() {
         options: S,
         value: u["x-component"],
         onChange: (J) => {
-          var X, ee;
+          var X, Z;
           const K = {
             name: y == null ? void 0 : y.name,
             type: "void",
@@ -47002,7 +47006,7 @@ AssociationSelect.Designer = function e() {
             "x-decorator-props": u["x-decorator-props"],
             "x-component-props": x(x({}, (X = y == null ? void 0 : y.uiSchema) == null ? void 0 : X["x-component-props"]), u["x-component-props"])
           };
-          (ee = I == null ? void 0 : I.schemaInitialize) == null || ee.call(I, K, {
+          (Z = I == null ? void 0 : I.schemaInitialize) == null || Z.call(I, K, {
             field: y,
             block: "Form",
             readPretty: c.readPretty,
@@ -47180,10 +47184,10 @@ AssociationSelect.Designer = function e() {
         options: O,
         value: (Y = (G = c == null ? void 0 : c.componentProps) == null ? void 0 : G.fieldNames) == null ? void 0 : Y.label,
         onChange: (J) => {
-          var ee, Q;
+          var Z, Q;
           const K = {
             "x-uid": u["x-uid"]
-          }, X = P(x(x({}, (Q = (ee = y == null ? void 0 : y.uiSchema) == null ? void 0 : ee["x-component-props"]) == null ? void 0 : Q.fieldNames), c.componentProps.fieldNames), {
+          }, X = P(x(x({}, (Q = (Z = y == null ? void 0 : y.uiSchema) == null ? void 0 : Z["x-component-props"]) == null ? void 0 : Q.fieldNames), c.componentProps.fieldNames), {
             label: J
           });
           c.componentProps.fieldNames = X, u["x-component-props"] = u["x-component-props"] || {}, u["x-component-props"].fieldNames = X, K["x-component-props"] = u["x-component-props"], m.emit("patch", {
@@ -68507,7 +68511,7 @@ export {
   createReadPrettyFormBlockSchema,
   createRouterManager,
   createSelectSchemaSettingsItem,
-  An as createStyles,
+  Rn as createStyles,
   createSwitchSettingsItem,
   createTableBlockSchema,
   createTableBlockUISchema,