@nocobase/client 1.5.13 → 1.5.15

package/es/index.mjs

@@ -9033,7 +9033,8 @@ const genCommonStyle = (e, t) => {
       }
     },
     [`${t}-item-content`]: {
-      marginLeft: e.marginXS
+      // 相当于 Menu 的 iconMarginInlineEnd，参见：https://github.com/ant-design/ant-design/blob/6a62d9e7eaf3e683c673091e39fe65ba3204d94b/components/menu/style/index.ts#L942
+      marginLeft: e.controlHeightSM - e.fontSize
     }
   };
 }), SchemaInitializerContext = createContext({});
@@ -35211,7 +35212,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.5.13", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.5.15", 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",
@@ -35233,9 +35234,9 @@ const name = "@nocobase/client", version = "1.5.13", license = "AGPL-3.0", main
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.5.13",
-  "@nocobase/sdk": "1.5.13",
-  "@nocobase/utils": "1.5.13",
+  "@nocobase/evaluators": "1.5.15",
+  "@nocobase/sdk": "1.5.15",
+  "@nocobase/utils": "1.5.15",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -38779,7 +38780,7 @@ function Uploader(n) {
             var M;
             return c((M = B.response) == null ? void 0 : M.data);
           })];
-          z.length ? d(w) : (l == null || l([...a, ...w]), d([]));
+          z.length ? d(w) : (l == null || l([...a || [], ...w]), d([]));
         }
       } else {
         const $ = j.fileList.find((w) => w.uid === j.file.uid);
@@ -39421,32 +39422,34 @@ function transformNestedData(e) {
   }
   return e && n(e), t;
 }
-const InternalNesterCss = css`
-  & .ant-formily-item-layout-vertical {
-    margin-bottom: 10px;
-  }
-  .ant-card-body {
-    padding: 15px 20px 5px;
-  }
-  .ant-divider-horizontal {
-    margin: 10px 0;
-  }
-`, InternalNesterCardCss = css`
+const InternalNesterCardCss = css`
   .ant-card-bordered {
     border: none;
   }
   .ant-card-body {
-    padding: 0px 20px 20px 0px;
+    padding: 0px 20px 0px 0px;
   }
 `, InternalNester = observer$1(
   () => {
-    var p, m;
-    const e = useField(), t = useFieldSchema(), n = useInsertSchema$1("Nester"), { options: o } = useAssociationFieldContext(), r = (m = (p = t["x-decorator-props"]) == null ? void 0 : p.showTitle) != null ? m : !0, { actionName: i } = useACLActionParamsContext(), { token: a } = theme$1.useToken(), {
+    var m, h;
+    const e = useField(), t = useFieldSchema(), n = useInsertSchema$1("Nester"), { options: o } = useAssociationFieldContext(), r = (h = (m = t["x-decorator-props"]) == null ? void 0 : m.showTitle) != null ? h : !0, { actionName: i } = useACLActionParamsContext(), { token: a } = theme$1.useToken(), {
       layout: l = "vertical",
       labelAlign: c = "left",
       labelWidth: u = 120,
       labelWrap: d = !0
-    } = (t == null ? void 0 : t["x-component-props"]) || {};
+    } = (t == null ? void 0 : t["x-component-props"]) || {}, p = css`
+      margin-top: 0.4em;
+
+      & .ant-formily-item-layout-vertical {
+        margin-bottom: 10px;
+      }
+      .ant-card-body {
+        padding: ${a.padding}px ${a.paddingLG}px;
+      }
+      .ant-divider-horizontal {
+        margin: 10px 0;
+      }
+    `;
     return useEffect(() => {
       n(schema$1.Nester);
     }, []), /* @__PURE__ */ jsx(CollectionProvider_deprecated, { name: o.target, children: /* @__PURE__ */ jsx(ACLCollectionProvider, { actionPath: `${o.target}:${i || "view"}`, children: /* @__PURE__ */ jsx(
@@ -39460,7 +39463,7 @@ const InternalNesterCss = css`
           "div",
           {
             className: cx(
-              InternalNesterCss,
+              p,
               {
                 [InternalNesterCardCss]: r === !1
               },
@@ -39482,7 +39485,7 @@ const InternalNesterCss = css`
                 onlyRenderProperties: !0,
                 basePath: e.address,
                 schema: t,
-                filterProperties: (h) => h["x-component"] === "AssociationField.Nester"
+                filterProperties: (g) => g["x-component"] === "AssociationField.Nester"
               }
             )
           }
@@ -42817,6 +42820,14 @@ const Block = observer$1(
   const { componentCls: t } = e;
   return {
     [t]: {
+      ".nb-action-bar": {
+        borderRadius: e.borderRadiusBlock,
+        marginBottom: `${e.marginBlock / 2}px !important`
+      },
+      ".ant-list-pagination": {
+        borderRadius: e.borderRadiusBlock,
+        marginTop: `${e.marginBlock / 2}px !important`
+      },
       "& > .nb-block-item": {
         marginBottom: e.marginLG,
         "& > .nb-action-bar:has(:first-child:not(:empty))": {
@@ -42867,15 +42878,10 @@ const InternalGridCardBlockProvider = (e) => {
 `, gridCardCss = css`
   height: 100%;
   > .ant-card-body {
-    padding: 24px 24px 0px;
     height: 100%;
-    button {
-      margin-bottom: 0px !important;
-      margin-top: 5px;
-    }
   }
   .nb-action-bar {
-    padding: 5px 0;
+    padding-top: 5px;
   }
 `, GridCardItem = withDynamicSchemaProps(
   (e) => {
@@ -42895,10 +42901,6 @@ const InternalGridCardBlockProvider = (e) => {
     return;
   const u = t || r ? e.controlHeight + 2 * e.paddingLG + e.marginLG : 0, d = c ? e.controlHeight + 2 * e.paddingLG + e.marginLG : 0;
   return n - u - d;
-}, rowGutter = {
-  md: 12,
-  sm: 5,
-  xs: 5
 }, designerCss$2 = css`
   width: 100%;
   &:hover {
@@ -42963,31 +42965,31 @@ const InternalGridCardBlockProvider = (e) => {
   };
 }, InternalGridCard = withSkeletonComponent(
   (e) => {
-    var F;
-    const { columnCount: t, pagination: n } = useProps(e), { service: o, columnCount: r = defaultColumnCount } = useGridCardBlockContext(), i = t || r, { run: a, params: l } = o, c = (F = o == null ? void 0 : o.data) == null ? void 0 : F.meta, u = useFieldSchema(), d = useField(), p = useDesigner(), m = useGridCardBodyHeight(), h = useCallback(
-      (I) => new Schema({
+    var I;
+    const { columnCount: t, pagination: n } = useProps(e), { service: o, columnCount: r = defaultColumnCount } = useGridCardBlockContext(), i = t || r, { run: a, params: l } = o, c = (I = o == null ? void 0 : o.data) == null ? void 0 : I.meta, u = useFieldSchema(), d = useField(), p = useDesigner(), m = useGridCardBodyHeight(), h = useCallback(
+      (R) => new Schema({
         type: "object",
         properties: {
-          [I]: x({}, u.properties.item)
+          [R]: x({}, u.properties.item)
         }
       }),
       [u.properties]
-    ), g = useCallback(
-      (I, R) => {
+    ), { token: g } = useToken$1(), f = useCallback(
+      (R, k) => {
         a(P(x({}, l == null ? void 0 : l[0]), {
-          page: I,
-          pageSize: R
+          page: R,
+          pageSize: k
         }));
       },
       [a, l]
-    ), f = P(x(x({}, usePaginationProps$1()), n), {
-      onChange: g
-    }), C = getCardItemSchema == null ? void 0 : getCardItemSchema(u), {
-      layout: b = "vertical",
-      labelAlign: S = "left",
-      labelWidth: y = 120,
-      labelWrap: v = !0
-    } = (C == null ? void 0 : C["x-component-props"]) || {};
+    ), C = P(x(x({}, usePaginationProps$1()), n), {
+      onChange: f
+    }), b = getCardItemSchema == null ? void 0 : getCardItemSchema(u), {
+      layout: S = "vertical",
+      labelAlign: y = "left",
+      labelWidth: v = 120,
+      labelWrap: F = !0
+    } = (b == null ? void 0 : b["x-component-props"]) || {};
     return /* @__PURE__ */ jsx(
       SchemaComponentOptions,
       {
@@ -43016,29 +43018,29 @@ const InternalGridCardBlockProvider = (e) => {
               /* @__PURE__ */ jsx(
                 FormLayout,
                 {
-                  layout: b,
-                  labelAlign: S,
-                  labelWidth: b === "horizontal" ? y : null,
-                  labelWrap: v,
+                  layout: S,
+                  labelAlign: y,
+                  labelWidth: S === "horizontal" ? v : null,
+                  labelWrap: F,
                   children: /* @__PURE__ */ jsx(
                     List$1,
                     {
-                      pagination: !c || c.count <= c.pageSize ? !1 : x({}, f),
+                      pagination: !c || c.count <= c.pageSize ? !1 : x({}, C),
                       dataSource: d.value,
                       grid: P(x({}, i), {
                         sm: i.xs,
                         xl: i.lg,
-                        gutter: [rowGutter, rowGutter]
+                        gutter: [g.marginBlock / 2, g.marginBlock / 2]
                       }),
-                      renderItem: (I, R) => /* @__PURE__ */ jsx(Col, { style: { height: "100%" }, className: "nb-card-item-warper", children: /* @__PURE__ */ jsx(
+                      renderItem: (R, k) => /* @__PURE__ */ jsx(Col, { style: { height: "100%" }, className: "nb-card-item-warper", children: /* @__PURE__ */ jsx(
                         NocoBaseRecursionField,
                         {
                           basePath: d.address,
-                          name: R,
+                          name: k,
                           onlyRenderProperties: !0,
-                          schema: h(R)
+                          schema: h(k)
                         },
-                        R
+                        k
                       ) }),
                       loading: o == null ? void 0 : o.loading
                     }