@ant-design/pro-components 3.1.14-0 → 3.1.14-1

package/es/card/components/Card/style.js

@@ -25,10 +25,6 @@ const genProCardStyle = token => {
       borderRadius: token.borderRadiusLG,
       transition: 'all 0.3s',
       ...resetComponent?.(token),
-      // 对齐 antd v6 Card：variant='borderless' 默认就有 boxShadowTertiary 浅阴影。
-      '&&:not(&-border):not(&-box-shadow)': {
-        boxShadow: token.boxShadowTertiary
-      },
       '&-box-shadow': {
         boxShadow: token.boxShadowTertiary,
         borderColor: 'transparent'

package/es/descriptions/ProDescriptions.js

@@ -125,9 +125,9 @@ const ProDescriptions = props => {
               minWidth: 0
             }
           },
-          extra: rest.extra ? /*#__PURE__*/_jsxs(Space, {
+          extra: options || rest.extra ? /*#__PURE__*/_jsxs(Space, {
             children: [options, rest.extra]
-          }) : options,
+          }) : undefined,
           title: title,
           items: children
         })

package/es/field/PureProField.js

@@ -45,7 +45,7 @@ export const pureRenderRead = (dataValue, valueType, props, valueTypeMap) => {
     }, /*#__PURE__*/_jsx(_Fragment, {
       children: dataValue
     }));
-    if (props?.render) {
+    if (props?.render && valueType !== 'option') {
       return props.render?.(dataValue, {
         text: dataValue,
         ...props

package/es/field/components/Options/index.js

@@ -42,9 +42,9 @@ const FieldOptions = ({
       mode: type,
       ...fieldProps
     }, /*#__PURE__*/_jsx(_Fragment, {}));
-    if (!doms || doms?.length < 1 || !Array.isArray(doms)) {
-      return null;
-    }
+    if (!doms) return null;
+    if (!Array.isArray(doms)) return doms;
+    if (doms.length < 1) return null;
     return /*#__PURE__*/_jsx("div", {
       style: {
         display: 'flex',

package/es/layout/components/PageHeader/index.js

@@ -1,6 +1,6 @@
 import { ArrowLeftOutlined, ArrowRightOutlined } from '@ant-design/icons';
 import ResizeObserver from '@rc-component/resize-observer';
-import { Avatar, Breadcrumb, ConfigProvider, Space } from 'antd';
+import { Avatar, Breadcrumb, Button, ConfigProvider, Space } from 'antd';
 import { clsx } from 'clsx';
 import React from 'react';
 import useStyle from "./style";
@@ -12,14 +12,13 @@ const renderBack = (prefixCls, hashId, backIcon, onBack) => {
   }
   return /*#__PURE__*/_jsx("div", {
     className: clsx(`${prefixCls}-back`, hashId),
-    children: /*#__PURE__*/_jsx("div", {
-      role: "button",
-      onClick: e => {
-        onBack?.(e);
-      },
+    children: /*#__PURE__*/_jsx(Button, {
+      type: "text",
+      size: "small",
+      onClick: onBack,
       className: clsx(`${prefixCls}-back-button`, hashId),
       "aria-label": "back",
-      children: backIcon
+      icon: backIcon
     })
   });
 };

package/es/layout/components/PageHeader/style/index.js

@@ -1,4 +1,4 @@
-import { operationUnit, resetComponent, useStyle as useAntdStyle } from "../../../../utils";
+import { resetComponent, useStyle as useAntdStyle } from "../../../../utils";
 const textOverflowEllipsis = () => ({
   overflow: 'hidden',
   whiteSpace: 'nowrap',
@@ -30,9 +30,7 @@ const genPageHeaderStyle = token => {
         lineHeight: 1,
         '&-button': {
           fontSize: 16,
-          ...operationUnit?.(token),
-          color: token.pageHeaderColorBack,
-          cursor: 'pointer'
+          color: token.pageHeaderColorBack
         },
         [`${token.componentCls}-rlt &`]: {
           float: 'right',

package/lib/card/components/Card/style.js

@@ -31,10 +31,6 @@ const genProCardStyle = token => {
       borderRadius: token.borderRadiusLG,
       transition: 'all 0.3s',
       ...(0, _utils.resetComponent)?.(token),
-      // 对齐 antd v6 Card：variant='borderless' 默认就有 boxShadowTertiary 浅阴影。
-      '&&:not(&-border):not(&-box-shadow)': {
-        boxShadow: token.boxShadowTertiary
-      },
       '&-box-shadow': {
         boxShadow: token.boxShadowTertiary,
         borderColor: 'transparent'

package/lib/descriptions/ProDescriptions.js

@@ -132,9 +132,9 @@ const ProDescriptions = props => {
               minWidth: 0
             }
           },
-          extra: rest.extra ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
+          extra: options || rest.extra ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
             children: [options, rest.extra]
-          }) : options,
+          }) : undefined,
           title: title,
           items: children
         })

package/lib/field/PureProField.js

@@ -51,7 +51,7 @@ const pureRenderRead = (dataValue, valueType, props, valueTypeMap) => {
     }, /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
       children: dataValue
     }));
-    if (props?.render) {
+    if (props?.render && valueType !== 'option') {
       return props.render?.(dataValue, {
         text: dataValue,
         ...props

package/lib/field/components/Options/index.js

@@ -48,9 +48,9 @@ const FieldOptions = ({
       mode: type,
       ...fieldProps
     }, /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {}));
-    if (!doms || doms?.length < 1 || !Array.isArray(doms)) {
-      return null;
-    }
+    if (!doms) return null;
+    if (!Array.isArray(doms)) return doms;
+    if (doms.length < 1) return null;
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       style: {
         display: 'flex',

package/lib/layout/components/PageHeader/index.js

@@ -18,14 +18,13 @@ const renderBack = (prefixCls, hashId, backIcon, onBack) => {
   }
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: (0, _clsx.clsx)(`${prefixCls}-back`, hashId),
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      role: "button",
-      onClick: e => {
-        onBack?.(e);
-      },
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
+      type: "text",
+      size: "small",
+      onClick: onBack,
       className: (0, _clsx.clsx)(`${prefixCls}-back-button`, hashId),
       "aria-label": "back",
-      children: backIcon
+      icon: backIcon
     })
   });
 };

package/lib/layout/components/PageHeader/style/index.js

@@ -36,9 +36,7 @@ const genPageHeaderStyle = token => {
         lineHeight: 1,
         '&-button': {
           fontSize: 16,
-          ...(0, _utils.operationUnit)?.(token),
-          color: token.pageHeaderColorBack,
-          cursor: 'pointer'
+          color: token.pageHeaderColorBack
         },
         [`${token.componentCls}-rlt &`]: {
           float: 'right',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ant-design/pro-components",
-  "version": "3.1.14-0",
+  "version": "3.1.14-1",
   "description": "All-in-one package of @ant-design/pro-components",
   "keywords": [
     "antd",