@nocobase/client 1.2.3-alpha → 1.2.4-alpha

package/es/index.mjs

@@ -1,13 +1,13 @@
 var $e = Object.defineProperty, Ne = Object.defineProperties;
 var ze = Object.getOwnPropertyDescriptors;
-var ye = Object.getOwnPropertySymbols;
+var ve = Object.getOwnPropertySymbols;
 var Me = Object.prototype.hasOwnProperty, Be = Object.prototype.propertyIsEnumerable;
 var je = (e, t) => (t = Symbol[e]) ? t : Symbol.for("Symbol." + e);
 var ke = (e, t, o) => t in e ? $e(e, t, { enumerable: !0, configurable: !0, writable: !0, value: o }) : e[t] = o, g = (e, t) => {
   for (var o in t || (t = {}))
     Me.call(t, o) && ke(e, o, t[o]);
-  if (ye)
-    for (var o of ye(t))
+  if (ve)
+    for (var o of ve(t))
       Be.call(t, o) && ke(e, o, t[o]);
   return e;
 }, F = (e, t) => Ne(e, ze(t));
@@ -15,8 +15,8 @@ var H = (e, t) => {
   var o = {};
   for (var n in e)
     Me.call(e, n) && t.indexOf(n) < 0 && (o[n] = e[n]);
-  if (e != null && ye)
-    for (var n of ye(e))
+  if (e != null && ve)
+    for (var n of ve(e))
       t.indexOf(n) < 0 && Be.call(e, n) && (o[n] = e[n]);
   return o;
 };
@@ -37,7 +37,7 @@ var V = (e, t, o) => new Promise((n, r) => {
   }, l = (c) => c.done ? n(c.value) : Promise.resolve(c.value).then(i, a);
   l((o = o.apply(e, t)).next());
 });
-var ve = (e, t, o) => (t = e[je("asyncIterator")]) ? t.call(e) : (e = e[je("iterator")](), t = {}, o = (n, r) => (r = e[n]) && (t[n] = (i) => new Promise((a, l, c) => (i = r.call(e, i), c = i.done, Promise.resolve(i.value).then((u) => a({ value: u, done: c }), l)))), o("next"), o("return"), t);
+var Fe = (e, t, o) => (t = e[je("asyncIterator")]) ? t.call(e) : (e = e[je("iterator")](), t = {}, o = (n, r) => (r = e[n]) && (t[n] = (i) => new Promise((a, l, c) => (i = r.call(e, i), c = i.done, Promise.resolve(i.value).then((u) => a({ value: u, done: c }), l)))), o("next"), o("return"), t);
 import "./index.css";
 import "dayjs/plugin/isBetween";
 import "dayjs/plugin/isSameOrAfter";
@@ -3902,7 +3902,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.2.3-alpha", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version$1 = "1.2.4-alpha", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
   "@ahooksjs/use-url-state": "3.5.1",
   "@ant-design/cssinjs": "^1.11.1",
   "@ant-design/icons": "^5.1.4",
@@ -3923,9 +3923,9 @@ const name = "@nocobase/client", version$1 = "1.2.3-alpha", license = "AGPL-3.0"
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.2.3-alpha",
-  "@nocobase/sdk": "1.2.3-alpha",
-  "@nocobase/utils": "1.2.3-alpha",
+  "@nocobase/evaluators": "1.2.4-alpha",
+  "@nocobase/sdk": "1.2.4-alpha",
+  "@nocobase/utils": "1.2.4-alpha",
   ahooks: "^3.7.2",
   antd: "^5.12.8",
   "antd-style": "3.4.5",
@@ -6360,7 +6360,7 @@ function getPlugins(e) {
     const r = [], i = {};
     if (n) {
       try {
-        for (var c = ve(o), u, d, p; u = !(d = yield c.next()).done; u = !1) {
+        for (var c = Fe(o), u, d, p; u = !(d = yield c.next()).done; u = !1) {
           const m = d.value;
           const h = yield n(m.packageName);
           h && (r.push([m.name, h.default]), i[m.packageName] = h.default);
@@ -6402,7 +6402,7 @@ let PluginManager$1 = class {
   initStaticPlugins() {
     return V(this, arguments, function* (t = []) {
       try {
-        for (var o = ve(t), n, r, i; n = !(r = yield o.next()).done; n = !1) {
+        for (var o = Fe(t), n, r, i; n = !(r = yield o.next()).done; n = !1) {
           const a = r.value;
           const l = Array.isArray(a) ? a[0] : a, c = Array.isArray(a) ? a[1] : void 0;
           yield this.add(l, c);
@@ -6428,7 +6428,7 @@ let PluginManager$1 = class {
         devDynamicImport: this.app.devDynamicImport
       });
       try {
-        for (var i = ve(n), a, l, c; a = !(l = yield i.next()).done; a = !1) {
+        for (var i = Fe(n), a, l, c; a = !(l = yield i.next()).done; a = !1) {
           const [u, d] = l.value;
           const p = o.find((m) => m.name === u);
           yield this.add(d, p);
@@ -7146,37 +7146,48 @@ const SchemaInitializerSubMenuContext = React.createContext({}), SchemaInitializ
   };
 }, SchemaInitializerItem = memo(
   React.forwardRef((e, t) => {
-    const { style: o, name: n = uid(), applyMenuStyle: r = !0, className: i, items: a, icon: l, title: c, onClick: u, children: d } = e, p = useCompile(), m = useSchemaInitializerMenuItems(a, n, u), { componentCls: h, hashId: x } = useSchemaInitializerStyles(), { attribute: f } = useAriaAttributeOfMenuItem(), C = useMemo(() => {
-      if (a && a.length > 0)
+    const {
+      style: o,
+      closeInitializerMenuWhenClick: n = !0,
+      name: r = uid(),
+      applyMenuStyle: i = !0,
+      className: a,
+      items: l,
+      icon: c,
+      title: u,
+      onClick: d,
+      children: p
+    } = e, m = useCompile(), h = useSchemaInitializerMenuItems(l, r, d), { componentCls: x, hashId: f } = useSchemaInitializerStyles(), { attribute: C } = useAriaAttributeOfMenuItem(), { setVisible: S } = useSchemaInitializer(), b = useMemo(() => {
+      if (l && l.length > 0)
         return [
           {
-            key: n,
+            key: r,
             style: o,
-            className: i,
-            label: d || p(c),
-            onClick: (S) => {
-              S.key === n && (u == null || u(F(g({}, S), { item: e })));
+            className: a,
+            label: p || m(u),
+            onClick: (y) => {
+              y.key === r && (n && (S == null || S(!1)), d == null || d(F(g({}, y), { item: e })));
             },
-            icon: typeof l == "string" ? /* @__PURE__ */ jsx(Icon, { type: l }) : l,
-            children: m
+            icon: typeof c == "string" ? /* @__PURE__ */ jsx(Icon, { type: c }) : c,
+            children: h
           }
         ];
-    }, [n, o, i, d, c, u, l, m]);
-    return a && a.length > 0 ? /* @__PURE__ */ jsx(SchemaInitializerMenu, { items: C }) : /* @__PURE__ */ jsx(
+    }, [r, o, a, p, u, d, c, h]);
+    return l && l.length > 0 ? /* @__PURE__ */ jsx(SchemaInitializerMenu, { items: b }) : /* @__PURE__ */ jsx(
       "div",
       {
         ref: t,
-        onClick: (S) => {
-          S.stopPropagation(), u == null || u({ event: S, item: e });
+        onClick: (y) => {
+          y.stopPropagation(), n && (S == null || S(!1)), d == null || d({ event: y, item: e });
         },
         children: /* @__PURE__ */ jsx(
           "div",
-          F(g({}, f), {
-            className: cls({ [`${h}-menu-item`]: r }, i),
+          F(g({}, C), {
+            className: cls({ [`${x}-menu-item`]: i }, a),
             style: o,
-            children: d || /* @__PURE__ */ jsxs(Fragment, { children: [
-              l && typeof l == "string" ? /* @__PURE__ */ jsx(Icon, { type: l }) : l,
-              /* @__PURE__ */ jsx("span", { className: cls({ [`${x} ${h}-item-content`]: l }), children: p(c) })
+            children: p || /* @__PURE__ */ jsxs(Fragment, { children: [
+              typeof c == "string" ? /* @__PURE__ */ jsx(Icon, { type: c }) : c,
+              /* @__PURE__ */ jsx("span", { className: cls({ [`${f} ${x}-item-content`]: !!c }), children: m(u) })
             ] })
           })
         )
@@ -7190,7 +7201,7 @@ const SchemaInitializerItemInternal = () => {
   return /* @__PURE__ */ jsx(SchemaInitializerItem, g({}, e));
 }, SchemaInitializerSwitch = (e) => {
   const i = e, { title: t, checked: o } = i, n = H(i, ["title", "checked"]), r = useCompile();
-  return /* @__PURE__ */ jsx(SchemaInitializerItem, F(g({}, n), { children: /* @__PURE__ */ jsxs("div", { style: { display: "flex", alignItems: "center", justifyContent: "space-between" }, children: [
+  return /* @__PURE__ */ jsx(SchemaInitializerItem, F(g({}, n), { closeInitializerMenuWhenClick: !1, children: /* @__PURE__ */ jsxs("div", { style: { display: "flex", alignItems: "center", justifyContent: "space-between" }, children: [
     r(t),
     " ",
     /* @__PURE__ */ jsx(Switch, { style: { marginLeft: 20 }, size: "small", checked: o })
@@ -7267,54 +7278,48 @@ const SchemaInitializerDivider = () => {
   const { items: t } = e;
   return t.length === 0 ? null : /* @__PURE__ */ jsx(SchemaInitializerChildren, { children: t });
 }, SchemaInitializerActionModalItemComponent = React.forwardRef((e, t) => {
-  const i = e, { onClick: o, title: n } = i, r = H(i, ["onClick", "title"]);
-  return /* @__PURE__ */ jsx(
-    SchemaInitializerItem,
-    F(g({
-      ref: t
-    }, r), {
-      onClick: (a) => {
-        o == null || o(a.event);
-      }
-    })
-  );
+  const r = e, { onClick: o } = r, n = H(r, ["onClick"]);
+  return /* @__PURE__ */ jsx(SchemaInitializerItem, F(g({ ref: t }, n), { onClick: (i) => o == null ? void 0 : o(i.event, !1) }));
 }), SchemaInitializerActionModal = (e) => {
-  const { title: t, schema: o, buttonText: n, isItem: r, component: i, onCancel: a, onSubmit: l } = e, c = useCallback(() => {
-    const p = useForm(), m = useActionContext();
+  const { title: t, icon: o, schema: n, buttonText: r, isItem: i, component: a, onCancel: l, onSubmit: c } = e, u = useCallback(() => {
+    const x = useForm(), f = useActionContext();
     return {
       run() {
         return V(this, null, function* () {
-          yield a == null ? void 0 : a(), m.setVisible(!1), p.reset();
+          yield l == null ? void 0 : l(), f.setVisible(!1), x.reset();
         });
       }
     };
-  }, [a]), u = useCallback(() => {
-    const p = useForm(), m = useActionContext();
+  }, [l]), d = useCallback(() => {
+    const x = useForm(), f = useActionContext();
     return {
       run() {
         return V(this, null, function* () {
-          yield p.validate(), yield l == null ? void 0 : l(p.values), m.setVisible(!1), p.reset();
+          yield x.validate(), yield c == null ? void 0 : c(x.values), f.setVisible(!1), x.reset();
         });
       }
     };
-  }, [l]), d = useMemo(() => ({
+  }, [c]), p = useMemo(
+    () => React.forwardRef(({ onClick: x }, f) => /* @__PURE__ */ jsx(SchemaInitializerActionModalItemComponent, { onClick: x, ref: f, title: r, icon: o })),
+    [r, o]
+  ), m = useMemo(() => uid(), []), h = useMemo(() => ({
     type: "void",
     properties: {
-      action1: {
+      [m]: {
         type: "void",
         "x-component": "Action",
-        "x-component-props": i ? {
-          component: i
-        } : r ? {
-          title: n,
-          component: SchemaInitializerActionModalItemComponent
+        "x-component-props": a ? {
+          component: a,
+          icon: o
+        } : i ? {
+          component: p
         } : {
-          icon: "PlusOutlined",
+          icon: o || "PlusOutlined",
           style: {
             borderColor: "var(--colorSettings)",
             color: "var(--colorSettings)"
           },
-          title: n,
+          title: r,
           type: "dashed"
         },
         properties: {
@@ -7329,7 +7334,7 @@ const SchemaInitializerDivider = () => {
             },
             type: "void",
             title: t,
-            properties: F(g({}, (o == null ? void 0 : o.properties) || o), {
+            properties: F(g({}, (n == null ? void 0 : n.properties) || n), {
               footer: {
                 "x-component": "Action.Modal.Footer",
                 type: "void",
@@ -7338,7 +7343,7 @@ const SchemaInitializerDivider = () => {
                     title: '{{t("Cancel")}}',
                     "x-component": "Action",
                     "x-component-props": {
-                      useAction: c
+                      useAction: u
                     }
                   },
                   submit: {
@@ -7346,7 +7351,7 @@ const SchemaInitializerDivider = () => {
                     "x-component": "Action",
                     "x-component-props": {
                       type: "primary",
-                      useAction: u
+                      useAction: d
                     }
                   }
                 }
@@ -7356,8 +7361,8 @@ const SchemaInitializerDivider = () => {
         }
       }
     }
-  }), [n, i, o, t, c, u]);
-  return /* @__PURE__ */ jsx(SchemaComponent, { schema: d });
+  }), [r, a, m, n, t, u, d]);
+  return /* @__PURE__ */ jsx(SchemaComponent, { schema: h });
 }, SchemaInitializerActionModalInternal = () => {
   const e = useSchemaInitializerItem();
   return /* @__PURE__ */ jsx(SchemaInitializerActionModal, g({}, e));
@@ -11475,13 +11480,13 @@ const useGetAriaLabelOfDesigner = () => {
     {
       title: e("Column width"),
       component: React.forwardRef((r, i) => {
-        const d = r, { children: a, onClick: l } = d, c = H(d, ["children", "onClick"]), { setVisible: u } = useSchemaInitializer();
+        const u = r, { children: a, onClick: l } = u, c = H(u, ["children", "onClick"]);
         return /* @__PURE__ */ jsx(
           SchemaInitializerItem,
           F(g({
             ref: i,
-            onClick: ({ event: p }) => {
-              u(!1), l(p);
+            onClick: ({ event: d }) => {
+              l(d);
             }
           }, c), {
             title: e("Column width")
@@ -11935,7 +11940,7 @@ const DataBlockInitializer = (e) => {
         o && o({ item: k, fromOthersInPopup: D });
       v(!1);
     }),
-    [A, y, o, f, v, t]
+    [A, y, v, o, f, t]
   ), w = h || // eslint-disable-next-line react-hooks/rules-of-hooks
   useCollectionDataSourceItems({
     componentName: n,
@@ -21358,8 +21363,8 @@ const ActionLink = withDynamicSchemaProps(
   };
 }, handleError = (e) => console.log(e), Action = withDynamicSchemaProps(
   observer$1((e) => {
-    var he, ge, xe, Z, te;
-    const me = useProps(e), {
+    var ge, xe, fe, Z, te;
+    const he = useProps(e), {
       popover: t,
       confirm: o,
       openMode: n,
@@ -21378,7 +21383,7 @@ const ActionLink = withDynamicSchemaProps(
       addChild: C,
       onMouseEnter: S,
       refreshDataBlockRequest: b
-    } = me, y = H(me, [
+    } = he, y = H(he, [
       "popover",
       "confirm",
       "openMode",
@@ -21398,7 +21403,7 @@ const ActionLink = withDynamicSchemaProps(
       "addChild",
       "onMouseEnter",
       "refreshDataBlockRequest"
-    ]), v = useACLActionParamsContext(), { wrapSSR: I, componentCls: A, hashId: T } = useStyles$d(), { t: w } = useTranslation(), [M, $] = useState(!1), [E, z] = useState(!1), O = useDesigner(), R = useField(), { run: j, element: B, disabled: k } = a(f), D = useFieldSchema(), N = useCompile(), q = useForm(), L = useCollectionRecordData(), G = useCollectionParentRecordData(), U = useCollection(), K = D["x-toolbar-props"] || D["x-designer-props"], Y = (he = D == null ? void 0 : D["x-component-props"]) == null ? void 0 : he.openMode, W = (ge = D == null ? void 0 : D["x-component-props"]) == null ? void 0 : ge.openSize, X = (xe = D == null ? void 0 : D["x-component-props"]) == null ? void 0 : xe.refreshDataBlockRequest, Q = q.disabled || R.disabled || ((Z = R.data) == null ? void 0 : Z.disabled) || x || k, J = useMemo(() => (D == null ? void 0 : D["x-linkage-rules"]) || [], [D == null ? void 0 : D["x-linkage-rules"]]), { designable: oe } = useDesignable(), ne = useComponent(i) || i, { modal: re } = App.useApp(), ie = useVariables(), le = useLocalVariables({ currentForm: { values: L } }), { getAriaLabel: Fe } = useGetAriaLabelOfAction(u), ce = useDataBlockRequest(), ue = useMemo(() => {
+    ]), v = useACLActionParamsContext(), { wrapSSR: I, componentCls: A, hashId: T } = useStyles$d(), { t: w } = useTranslation(), [M, $] = useState(!1), [E, z] = useState(!1), O = useDesigner(), R = useField(), { run: j, element: B, disabled: k } = a(f), D = useFieldSchema(), N = useCompile(), q = useForm(), L = useCollectionRecordData(), G = useCollectionParentRecordData(), U = useCollection(), K = D["x-toolbar-props"] || D["x-designer-props"], Y = (ge = D == null ? void 0 : D["x-component-props"]) == null ? void 0 : ge.openMode, W = (xe = D == null ? void 0 : D["x-component-props"]) == null ? void 0 : xe.openSize, X = (fe = D == null ? void 0 : D["x-component-props"]) == null ? void 0 : fe.refreshDataBlockRequest, Q = q.disabled || R.disabled || ((Z = R.data) == null ? void 0 : Z.disabled) || x || k, J = useMemo(() => (D == null ? void 0 : D["x-linkage-rules"]) || [], [D == null ? void 0 : D["x-linkage-rules"]]), { designable: oe } = useDesignable(), ne = useComponent(i) || i, { modal: re } = App.useApp(), ie = useVariables(), le = useLocalVariables({ currentForm: { values: L } }), { getAriaLabel: Pe } = useGetAriaLabelOfAction(u), ce = useDataBlockRequest(), de = useMemo(() => {
       const ee = u || N(D.title);
       return _.isString(ee) ? w(ee) : ee;
     }, [u, D.title, w]);
@@ -21416,60 +21421,60 @@ const ActionLink = withDynamicSchemaProps(
         });
       });
     }, [R, J, le, ie]);
-    const Pe = useCallback(
-      (ee) => {
-        if (!isPortalInBody(ee.target) && (ee.preventDefault(), ee.stopPropagation(), !Q && v)) {
-          const se = () => {
+    const Ie = useCallback(
+      (ee, se = !0) => {
+        if (!(se && isPortalInBody(ee.target)) && (ee.preventDefault(), ee.stopPropagation(), !Q && v)) {
+          const ae = () => {
             d ? d(ee, () => {
-              var ae;
-              X !== !1 && ((ae = ce == null ? void 0 : ce.refresh) == null || ae.call(ce));
+              var ue;
+              X !== !1 && ((ue = ce == null ? void 0 : ce.refresh) == null || ue.call(ce));
             }) : ($(!0), j());
           };
           o != null && o.content ? re.confirm({
-            title: w(o.title, { title: ue }),
-            content: w(o.content, { title: ue }),
-            onOk: se
-          }) : se();
+            title: w(o.title, { title: de }),
+            content: w(o.content, { title: de }),
+            onOk: ae
+          }) : ae();
         }
       },
       [o, Q, re, d, j]
-    ), Se = useMemo(() => {
+    ), be = useMemo(() => {
       var ee;
       return F(g({}, p), {
         opacity: oe && (((ee = R == null ? void 0 : R.data) == null ? void 0 : ee.hidden) || !v) && 0.1
       });
-    }, [oe, (te = R == null ? void 0 : R.data) == null ? void 0 : te.hidden, p]), Ie = useCallback(
+    }, [oe, (te = R == null ? void 0 : R.data) == null ? void 0 : te.hidden, p]), Ae = useCallback(
       (ee) => {
         S == null || S(ee);
       },
       [S]
-    ), de = () => {
+    ), pe = () => {
       var ee, se;
       return !oe && ((ee = R == null ? void 0 : R.data) != null && ee.hidden || !v) ? null : /* @__PURE__ */ jsxs(
         SortableItem,
         F(g({
           role: "button",
-          "aria-label": Fe()
+          "aria-label": Pe()
         }, y), {
-          onMouseEnter: Ie,
+          onMouseEnter: Ae,
           loading: ((se = R == null ? void 0 : R.data) == null ? void 0 : se.loading) || m,
-          icon: c ? /* @__PURE__ */ jsx(Icon, { type: c }) : null,
+          icon: typeof c == "string" ? /* @__PURE__ */ jsx(Icon, { type: c }) : c,
           disabled: Q,
-          style: Se,
-          onClick: Pe,
+          style: be,
+          onClick: Ie,
           component: ne || Button,
           className: cls(A, T, l, "nb-action"),
           type: e.type === "danger" ? void 0 : e.type,
           children: [
-            ue,
+            de,
             /* @__PURE__ */ jsx(O, g({}, K))
           ]
         })
       );
-    }, be = de(), pe = /* @__PURE__ */ jsxs(
+    }, ye = pe(), me = /* @__PURE__ */ jsxs(
       ActionContextProvider,
       {
-        button: be,
+        button: ye,
         visible: M,
         setVisible: $,
         formValueChanged: E,
@@ -21480,7 +21485,7 @@ const ActionLink = withDynamicSchemaProps(
         fieldSchema: D,
         children: [
           t && /* @__PURE__ */ jsx(RecursionField, { basePath: R.address, onlyRenderProperties: !0, schema: D }),
-          !t && de(),
+          !t && pe(),
           /* @__PURE__ */ jsx(
             DeclareVariable,
             {
@@ -21498,8 +21503,8 @@ const ActionLink = withDynamicSchemaProps(
     return I(
       C ? (
         // fix https://nocobase.height.app/T-3966
-        /* @__PURE__ */ jsx(RecordProvider, { record: null, parent: G, children: /* @__PURE__ */ jsx(TreeRecordProvider, { parent: L, children: pe }) })
-      ) : pe
+        /* @__PURE__ */ jsx(RecordProvider, { record: null, parent: G, children: /* @__PURE__ */ jsx(TreeRecordProvider, { parent: L, children: me }) })
+      ) : me
     );
   }),
   { displayName: "Action" }
@@ -21552,34 +21557,34 @@ const Action$1 = Action, ActionBarContext = React.createContext({
   return /* @__PURE__ */ jsx(Fragment, { children: o && n.includes(t.parent["x-component"]) ? createPortal(e.children, o) : e.children });
 }, ActionBar = withDynamicSchemaProps(
   observer$1((e) => {
-    var p;
-    const { forceProps: t = {} } = useActionBarContext(), d = g(g({}, useProps(e)), t), { layout: o = "two-columns", style: n, spaceProps: r } = d, i = H(d, ["layout", "style", "spaceProps"]), a = useFieldSchema(), { render: l } = useSchemaInitializerRender(a["x-initializer"], a["x-initializer-props"]), { designable: c } = useDesignable();
-    if (o === "one-column")
+    var m;
+    const { forceProps: t = {} } = useActionBarContext(), { token: o } = theme.useToken(), p = g(g({}, useProps(e)), t), { layout: n = "two-columns", style: r, spaceProps: i } = p, a = H(p, ["layout", "style", "spaceProps"]), l = useFieldSchema(), { render: c } = useSchemaInitializerRender(l["x-initializer"], l["x-initializer-props"]), { designable: u } = useDesignable();
+    if (n === "one-column")
       return /* @__PURE__ */ jsx(Portal, { children: /* @__PURE__ */ jsx(DndContext, { children: /* @__PURE__ */ jsxs(
         "div",
         F(g({
-          style: g({ display: "flex", alignItems: "center", gap: 8 }, n)
-        }, i), {
-          className: cx(i.className, "nb-action-bar"),
+          style: F(g({ display: "flex", alignItems: "center", gap: 8 }, r), { marginTop: o.marginLG })
+        }, a), {
+          className: cx(a.className, "nb-action-bar"),
           children: [
-            e.children && /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(Space$1, F(g({}, r), { style: { flexWrap: "wrap" }, children: a.mapProperties((m, h) => /* @__PURE__ */ jsx(RecursionField, { name: h, schema: m }, h)) })) }),
-            l({ style: { margin: "0 !important" } })
+            e.children && /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(Space$1, F(g({}, i), { style: { flexWrap: "wrap" }, children: l.mapProperties((h, x) => /* @__PURE__ */ jsx(RecursionField, { name: x, schema: h }, x)) })) }),
+            c({ style: { margin: "0 !important" } })
           ]
         })
       ) }) });
-    const u = Object.keys((p = a.properties) != null ? p : {}).length > 0;
+    const d = Object.keys((m = l.properties) != null ? m : {}).length > 0;
     return /* @__PURE__ */ jsxs(
       "div",
       F(g({
-        style: !c && !u ? void 0 : g({
+        style: !u && !d ? void 0 : g({
           display: "flex",
           justifyContent: "space-between",
           alignItems: "center",
           overflowX: "auto",
           flexShrink: 0
-        }, n)
-      }, i), {
-        className: cx(i.className, "nb-action-bar"),
+        }, r)
+      }, a), {
+        className: cx(a.className, "nb-action-bar"),
         children: [
           /* @__PURE__ */ jsx(
             "div",
@@ -21593,12 +21598,12 @@ const Action$1 = Action, ActionBarContext = React.createContext({
                 flexWrap: "wrap"
               },
               children: /* @__PURE__ */ jsxs(DndContext, { children: [
-                /* @__PURE__ */ jsx(Space$1, F(g({}, r), { children: a.mapProperties((m, h) => m["x-align"] !== "left" ? null : /* @__PURE__ */ jsx(RecursionField, { name: h, schema: m }, h)) })),
-                /* @__PURE__ */ jsx(Space$1, F(g({}, r), { style: { flexWrap: "wrap" }, children: a.mapProperties((m, h) => m["x-align"] === "left" ? null : /* @__PURE__ */ jsx(RecursionField, { name: h, schema: m }, h)) }))
+                /* @__PURE__ */ jsx(Space$1, F(g({}, i), { children: l.mapProperties((h, x) => h["x-align"] !== "left" ? null : /* @__PURE__ */ jsx(RecursionField, { name: x, schema: h }, x)) })),
+                /* @__PURE__ */ jsx(Space$1, F(g({}, i), { style: { flexWrap: "wrap" }, children: l.mapProperties((h, x) => h["x-align"] === "left" ? null : /* @__PURE__ */ jsx(RecursionField, { name: x, schema: h }, x)) }))
               ] })
             }
           ),
-          l()
+          c()
         ]
       })
     );
@@ -29615,9 +29620,9 @@ function fetchTemplateData(e, t, o) {
   });
 }
 const useFormBlockHeight = () => {
-  var y;
-  const e = useDataBlockHeight(), t = useFieldSchema(), { token: o } = theme.useToken(), { designable: n } = useDesignable(), { heightProps: r } = useBlockHeightProps() || {}, { title: i } = r || {}, { display: a, enabled: l } = useFormDataTemplates(), c = t.reduceProperties((v, I) => I["x-component"] === "ActionBar" ? I : v), u = ((y = t.parent) == null ? void 0 : y["x-decorator"]) === "FilterFormBlockProvider", p = Object.keys((c == null ? void 0 : c.properties) || {}).length > 0 || n ? o.controlHeight + (u ? o.marginLG : 2 * o.marginLG) : u ? o.marginLG : 2 * o.marginLG, m = i ? o.fontSizeLG * o.lineHeightLG + o.padding * 2 - 1 : 0, { data: h } = useDataBlockRequest() || {}, { count: x, pageSize: f } = (h == null ? void 0 : h.meta) || {}, S = x > f ? o.controlHeightSM + o.paddingLG : 0, b = a && l ? o.controlHeight + 2 * o.padding + o.margin : 0;
-  return e - p - o.paddingLG - m - S - b;
+  var I, A;
+  const e = useDataBlockHeight(), t = useFieldSchema(), { token: o } = theme.useToken(), { designable: n } = useDesignable(), { heightProps: r } = useBlockHeightProps() || {}, { title: i } = r || {}, { display: a, enabled: l } = useFormDataTemplates(), c = t.reduceProperties((T, w) => w["x-component"] === "ActionBar" ? w : T), u = ((I = t.parent) == null ? void 0 : I["x-decorator"]) === "FilterFormBlockProvider", d = ((A = t.parent) == null ? void 0 : A["x-decorator"]) === "DetailsBlockProvider", h = Object.keys((c == null ? void 0 : c.properties) || {}).length > 0 || n ? o.controlHeight + (u || !d ? (n ? 2 : 1) * o.marginLG : 2 * o.marginLG) : o.marginLG, x = i ? o.fontSizeLG * o.lineHeightLG + o.padding * 2 - 1 : 0, { data: f } = useDataBlockRequest() || {}, { count: C, pageSize: S } = (f == null ? void 0 : f.meta) || {}, y = C > S ? o.controlHeightSM + (n ? 1 : 0) * o.paddingLG : 0, v = a && l ? o.controlHeight + 2 * o.padding + o.margin : 0;
+  return e - h - o.paddingLG - x - y - v;
 }, FormComponent = (e) => {
   const u = e, { form: t, children: o } = u, n = H(u, ["form", "children"]), r = useField(), i = useFieldSchema(), a = useAttach(t.createVoidField(F(g({}, r.props), { basePath: "" }))), l = useFormBlockHeight(), { token: c } = theme.useToken();
   return /* @__PURE__ */ jsx(FieldContext.Provider, { value: void 0, children: /* @__PURE__ */ jsx(FormContext.Provider, { value: t, children: /* @__PURE__ */ jsx(FormLayout, F(g({ layout: "vertical" }, n), { children: /* @__PURE__ */ jsx(
@@ -31649,9 +31654,9 @@ function Uploader(o) {
   var n = o, { rules: e } = n, t = H(n, ["rules"]);
   const { disabled: r, multiple: i, value: a, onChange: l } = t, [c, u] = useState([]), { t: d } = useTranslation(), { componentCls: p } = useStyles$a(), m = useField(), h = useUploadProps(t), x = useBeforeUpload(e);
   useEffect(() => {
-    c.find((A) => A.status === "error") ? m.setFeedback({
+    c.length ? m.setFeedback({
       type: "error",
-      code: "UploadError",
+      code: "ValidateError",
       messages: [d("Incomplete uploading files need to be resolved")]
     }) : m.setFeedback({});
   }, [m, c]);
@@ -33326,8 +33331,8 @@ const useTableColumns$1 = (e) => {
   }
 `, HeaderWrapperComponent = (e) => /* @__PURE__ */ jsx(DndContext, { children: /* @__PURE__ */ jsx("thead", g({}, e)) }), HeaderCellComponent = (e) => /* @__PURE__ */ jsx("th", F(g({}, e), { className: cls(e.className, headerClass) })), BodyRowComponent = (e) => /* @__PURE__ */ jsx(SortableRow, g({}, e)), Table$1 = withDynamicSchemaProps(
   observer$1((e) => {
-    var me, he, ge, xe;
-    const { token: t } = useToken(), de = omit$1(e, ["onBlur", "onFocus", "value"]), { pagination: o, useProps: n } = de, r = H(de, ["pagination", "useProps"]), be = (n == null ? void 0 : n()) || {}, { pagination: i } = be, a = H(be, ["pagination"]), pe = g(g({}, r), a), {
+    var he, ge, xe, fe;
+    const { token: t } = useToken(), pe = omit$1(e, ["onBlur", "onFocus", "value"]), { pagination: o, useProps: n } = pe, r = H(pe, ["pagination", "useProps"]), ye = (n == null ? void 0 : n()) || {}, { pagination: i } = ye, a = H(ye, ["pagination"]), me = g(g({}, r), a), {
       dragSort: l = !1,
       showIndex: c = !0,
       onRowSelectionChange: u,
@@ -33338,7 +33343,7 @@ const useTableColumns$1 = (e) => {
       onExpand: x,
       loading: f,
       onClickRow: C
-    } = pe, S = H(pe, [
+    } = me, S = H(me, [
       "dragSort",
       "showIndex",
       "onRowSelectionChange",
@@ -33349,8 +33354,8 @@ const useTableColumns$1 = (e) => {
       "onExpand",
       "loading",
       "onClickRow"
-    ]), b = useArrayField(S), y = useTableColumns$1(S), v = useFieldSchema(), I = useCollection(), T = ((me = v == null ? void 0 : v.parent) == null ? void 0 : me["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: w, allIncludesChildren: M } = T, $ = useMemoizedFn(S.onRowDragEnd || (() => {
-    })), E = usePaginationProps$1(o, i), [z, O] = useState(() => w ? M : []), [R, j] = useState(((he = b == null ? void 0 : b.data) == null ? void 0 : he.selectedRowKeys) || []), [B, k] = useState([]), D = (p == null ? void 0 : p.type) !== "none", N = useRef(/* @__PURE__ */ new Map()), q = useMemo(() => css`
+    ]), b = useArrayField(S), y = useTableColumns$1(S), v = useFieldSchema(), I = useCollection(), T = ((he = v == null ? void 0 : v.parent) == null ? void 0 : he["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: w, allIncludesChildren: M } = T, $ = useMemoizedFn(S.onRowDragEnd || (() => {
+    })), E = usePaginationProps$1(o, i), [z, O] = useState(() => w ? M : []), [R, j] = useState(((ge = b == null ? void 0 : b.data) == null ? void 0 : ge.selectedRowKeys) || []), [B, k] = useState([]), D = (p == null ? void 0 : p.type) !== "none", N = useRef(/* @__PURE__ */ new Map()), q = useMemo(() => css`
         & > td {
           background-color: ${t.controlItemBgActiveHover} !important;
         }
@@ -33382,20 +33387,20 @@ const useTableColumns$1 = (e) => {
         return typeof m == "string" ? (te = Z[m]) == null ? void 0 : te.toString() : (ee = (m != null ? m : U)(Z)) == null ? void 0 : ee.toString();
       },
       [m, U]
-    ), Y = (ge = b == null ? void 0 : b.value) == null ? void 0 : ge.map(K), W = useMemo(() => Y, [JSON.stringify(Y)]), X = useMemo(
+    ), Y = (xe = b == null ? void 0 : b.value) == null ? void 0 : xe.map(K), W = useMemo(() => Y, [JSON.stringify(Y)]), X = useMemo(
       () => [...(b == null ? void 0 : b.value) || []].filter(Boolean),
-      [b == null ? void 0 : b.value, (xe = b == null ? void 0 : b.value) == null ? void 0 : xe.length, W]
+      [b == null ? void 0 : b.value, (fe = b == null ? void 0 : b.value) == null ? void 0 : fe.length, W]
     ), Q = useMemo(() => (Z) => /* @__PURE__ */ jsx(
       DndContext,
       {
         onDragEnd: (te) => {
-          var fe, Ce, Te, we, Re, De;
+          var Ce, Se, Te, we, Re, De;
           if (!te.active || !te.over) {
             console.warn("move cancel");
             return;
           }
-          const ee = (Te = (Ce = (fe = te.active) == null ? void 0 : fe.data.current) == null ? void 0 : Ce.sortable) == null ? void 0 : Te.index, se = (De = (Re = (we = te.over) == null ? void 0 : we.data.current) == null ? void 0 : Re.sortable) == null ? void 0 : De.index, ae = b.value[ee] || te.active, Ae = b.value[se] || te.over;
-          b.move(ee, se), $({ from: ae, to: Ae });
+          const ee = (Te = (Se = (Ce = te.active) == null ? void 0 : Ce.data.current) == null ? void 0 : Se.sortable) == null ? void 0 : Te.index, se = (De = (Re = (we = te.over) == null ? void 0 : we.data.current) == null ? void 0 : Re.sortable) == null ? void 0 : De.index, ae = b.value[ee] || te.active, ue = b.value[se] || te.over;
+          b.move(ee, se), $({ from: ae, to: ue });
         },
         children: /* @__PURE__ */ jsx("tbody", g({}, Z))
       }
@@ -33435,11 +33440,11 @@ const useTableColumns$1 = (e) => {
             };
           },
           renderCell: (Z, te, ee, se) => {
-            var fe, Ce;
+            var Ce, Se;
             if (!l && !c)
               return se;
-            const ae = (fe = e == null ? void 0 : e.pagination) == null ? void 0 : fe.current, Ae = ((Ce = e == null ? void 0 : e.pagination) == null ? void 0 : Ce.pageSize) || 20;
-            return ae ? ee = ee + (ae - 1) * Ae + 1 : ee = ee + 1, te.__index && (ee = extractIndex(te.__index)), /* @__PURE__ */ jsxs(
+            const ae = (Ce = e == null ? void 0 : e.pagination) == null ? void 0 : Ce.current, ue = ((Se = e == null ? void 0 : e.pagination) == null ? void 0 : Se.pageSize) || 20;
+            return ae ? ee = ee + (ae - 1) * ue + 1 : ee = ee + 1, te.__index && (ee = extractIndex(te.__index)), /* @__PURE__ */ jsxs(
               "div",
               {
                 role: "button",
@@ -33492,24 +33497,24 @@ const useTableColumns$1 = (e) => {
         ) : React.createElement(React.Fragment, {}, Z);
       },
       [b, l, K]
-    ), { height: le, tableSizeRefCallback: Fe } = useTableSize(), ce = useMemo(() => ({
+    ), { height: le, tableSizeRefCallback: Pe } = useTableSize(), ce = useMemo(() => ({
       x: "max-content"
-    }), []), ue = useMemo(() => ({
+    }), []), de = useMemo(() => ({
       x: "max-content",
       y: le
-    }), [le, ce]), Pe = useCallback(
+    }), [le, ce]), Ie = useCallback(
       (Z) => B.includes(Z[m]) ? L : "",
       [B, L, m]
-    ), Se = useCallback(
+    ), be = useCallback(
       (Z, te) => {
         const ee = Z ? [...z, te[I.getPrimaryKey()]] : z.filter((se) => te[I.getPrimaryKey()] !== se);
         O(ee), x == null || x(Z, te);
       },
       [z, x, I]
-    ), Ie = useMemo(() => ({
-      onExpand: Se,
+    ), Ae = useMemo(() => ({
+      onExpand: be,
       expandedRowKeys: z
-    }), [z, Se]);
+    }), [z, be]);
     return /* @__PURE__ */ jsxs(
       "div",
       {
@@ -33539,7 +33544,7 @@ const useTableColumns$1 = (e) => {
           /* @__PURE__ */ jsx(ie, { children: /* @__PURE__ */ jsx(
             MemoizedAntdTable,
             F(g(g({
-              ref: Fe,
+              ref: Pe,
               rowKey: m != null ? m : U,
               dataSource: X,
               tableLayout: "auto"
@@ -33549,10 +33554,10 @@ const useTableColumns$1 = (e) => {
               components: oe,
               onChange: d,
               onRow: G,
-              rowClassName: Pe,
-              scroll: ue,
+              rowClassName: Ie,
+              scroll: de,
               columns: y,
-              expandable: Ie
+              expandable: Ae
             })
           ) }),
           b.errors.length > 0 && /* @__PURE__ */ jsx("div", { className: "ant-formily-item-error-help ant-formily-item-help ant-formily-item-help-enter ant-formily-item-help-enter-active", children: b.errors.map((Z) => Z.messages.map((te) => /* @__PURE__ */ jsx("div", { children: te }, te))) })
@@ -35429,12 +35434,12 @@ const InternalGridCardBlockProvider = (e) => {
 }, useGridCardActionBarProps = () => ({
   spaceProps: spaceProps$1
 }), useGridCardBodyHeight = () => {
-  var l;
-  const { token: e } = theme.useToken(), { designable: t } = useDesignable(), o = useDataBlockHeight(), n = useFieldSchema(), r = Object.keys(((l = n.parent.properties.actionBar) == null ? void 0 : l.properties) || {}).length > 0;
+  var p;
+  const { token: e } = theme.useToken(), { designable: t } = useDesignable(), o = useDataBlockHeight(), n = useFieldSchema(), r = Object.keys(((p = n.parent.properties.actionBar) == null ? void 0 : p.properties) || {}).length > 0, { data: i } = useDataBlockRequest() || {}, { count: a, pageSize: l } = (i == null ? void 0 : i.meta) || {}, c = a > l;
   if (!o)
     return;
-  const i = t || r ? e.controlHeight + 2 * e.paddingLG + e.marginLG : 0, a = e.controlHeight + 2 * e.paddingLG + e.marginLG;
-  return o - i - a;
+  const u = t || r ? e.controlHeight + 2 * e.paddingLG + e.marginLG : 0, d = c ? e.controlHeight + 2 * e.paddingLG + e.marginLG : 0;
+  return o - u - d;
 }, rowGutter = {
   md: 12,
   sm: 5,
@@ -35514,6 +35519,9 @@ const InternalGridCardBlockProvider = (e) => {
               height: ${m ? m + "px" : "100%"};
               overflow-y: ${m ? "auto" : null};
               overflow-x: clip;
+              .nb-action-bar {
+                margin-top: 0px !important;
+              }
             }
           `
           ),
@@ -36000,7 +36008,7 @@ const InternalListBlockProvider = (e) => {
               css`
             .ant-spin-nested-loading {
               height: ${m ? m + "px" : "100%"};
-              overflow-y: auto;
+              overflow-y: ${m ? "auto" : "null"};
               .ant-spin-container {
                 width: 100%;
                 overflow-x: clip;
@@ -53475,7 +53483,10 @@ const createListBlockUISchema = (e) => {
                 "x-component": "ActionBar",
                 "x-use-component-props": "useListActionBarProps",
                 "x-component-props": {
-                  layout: "one-column"
+                  layout: "one-column",
+                  style: {
+                    marginTop: "var(--nb-spacing)"
+                  }
                 }
               }
             }
@@ -55222,7 +55233,8 @@ const commonOptions$e = {
             "x-component-props": {
               layout: "one-column",
               style: {
-                float: "right"
+                float: "right",
+                marginTop: "var(--nb-spacing)"
               }
             }
           }