@ant-design/pro-components 3.1.3-1 → 3.1.4-0

package/es/card/components/Actions/index.js

@@ -14,10 +14,7 @@ const ProCardActions = props => {
   if (Array.isArray(actions) && actions?.length) {
     return wrapSSR( /*#__PURE__*/_jsx("ul", {
       className: clsx(`${prefixCls}-actions`, hashId),
-      children: actions.map((action, index) =>
-      /*#__PURE__*/
-      // eslint-disable-next-line react/no-array-index-key
-      _jsx("li", {
+      children: actions.map((action, index) => /*#__PURE__*/_jsx("li", {
         style: {
           width: `${100 / actions.length}%`,
           padding: 0,

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

@@ -16,8 +16,6 @@ const Card = /*#__PURE__*/React.forwardRef((props, ref) => {
   const {
     className,
     style,
-    bodyStyle,
-    headStyle,
     styles,
     title,
     subTitle,
@@ -212,23 +210,34 @@ const Card = /*#__PURE__*/React.forwardRef((props, ref) => {
     [`${prefixCls}-body-direction-column`]: split === 'horizontal' || direction === 'column',
     [`${prefixCls}-body-wrap`]: wrap && containProCard
   });
-
-  // 支持新的 styles API，同时保持向后兼容
-  const cardBodyStyle = styles?.body || bodyStyle;
-  const cardHeadStyle = styles?.header || headStyle;
+  const bodyStylePadding = styles?.body?.padding;
   const loadingDOM = /*#__PURE__*/React.isValidElement(loading) ? loading : /*#__PURE__*/_jsx(Loading, {
     prefix: prefixCls,
-    style: cardBodyStyle?.padding === 0 || cardBodyStyle?.padding === '0px' ? {
+    style: bodyStylePadding === 0 || bodyStylePadding === '0px' ? {
       padding: 24
     } : undefined
   });
+  const handleCollapsibleIconClick = useCallback(() => {
+    if (collapsible === 'icon') setCollapsed(prev => !prev);
+  }, [collapsible, setCollapsed]);
+
   // 非受控情况下展示
-  const collapsibleButton = collapsible && controlCollapsed === undefined && (collapsibleIconRender ? collapsibleIconRender({
-    collapsed
+  const collapsibleButton = collapsible && controlCollapsed === undefined && (collapsibleIconRender ? /*#__PURE__*/_jsx("span", {
+    role: "button",
+    tabIndex: collapsible === 'icon' ? 0 : undefined,
+    className: `${prefixCls}-collapsible-icon ${hashId}`.trim(),
+    onClick: collapsible === 'icon' ? handleCollapsibleIconClick : undefined,
+    onKeyDown: collapsible === 'icon' ? e => {
+      if (e.key === 'Enter' || e.key === ' ') {
+        e.preventDefault();
+        handleCollapsibleIconClick();
+      }
+    } : undefined,
+    children: collapsibleIconRender({
+      collapsed
+    })
   }) : /*#__PURE__*/_jsx(RightOutlined, {
-    onClick: () => {
-      if (collapsible === 'icon') setCollapsed(!collapsed);
-    },
+    onClick: handleCollapsibleIconClick,
     rotate: !collapsed ? 90 : undefined,
     className: `${prefixCls}-collapsible-icon ${hashId}`.trim()
   }));
@@ -246,7 +255,7 @@ const Card = /*#__PURE__*/React.forwardRef((props, ref) => {
         [`${prefixCls}-header-border`]: headerBordered || type === 'inner',
         [`${prefixCls}-header-collapsible`]: collapsibleButton
       }),
-      style: cardHeadStyle,
+      style: styles?.header,
       onClick: () => {
         if (collapsible === 'header' || collapsible === true) setCollapsed(!collapsed);
       },
@@ -267,13 +276,12 @@ const Card = /*#__PURE__*/React.forwardRef((props, ref) => {
       children: /*#__PURE__*/_jsx(Tabs, {
         onChange: tabs.onChange,
         ...omit(tabs, ['cardProps']),
-        // @ts-ignore
         items: ModifyTabItemsContent,
         children: loading ? loadingDOM : children
       })
     }) : /*#__PURE__*/_jsx("div", {
       className: bodyCls,
-      style: cardBodyStyle,
+      style: styles?.body,
       children: loading ? loadingDOM : childrenModified
     }), actions ? /*#__PURE__*/_jsx(Actions, {
       actions: actions,

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

@@ -13,6 +13,9 @@ const genProCardStyle = token => {
       display: 'flex',
       flexDirection: 'column',
       boxSizing: 'border-box',
+      '*, *::before, *::after': {
+        boxSizing: 'border-box'
+      },
       width: '100%',
       marginBlock: 0,
       marginInline: 0,
@@ -29,6 +32,29 @@ const genProCardStyle = token => {
       '&-col': {
         width: '100%'
       },
+      // 分割线样式：col 之间的分割线
+      [` ${componentCls}-col${componentCls}-split-vertical`]: {
+        borderInlineEnd: `${token.lineWidth}px ${token.lineType} ${token.colorSplit}`
+      },
+      [` ${componentCls}-col${componentCls}-split-horizontal`]: {
+        borderBlockEnd: `${token.lineWidth}px ${token.lineType} ${token.colorSplit}`
+      },
+      // Divider 分割线组件样式
+      [`${componentCls}-divider`]: {
+        flex: 'none',
+        alignSelf: 'stretch',
+        width: token.lineWidth,
+        marginInline: token.marginXS,
+        marginBlock: token.marginLG,
+        backgroundColor: token.colorSplit,
+        [`&${componentCls}-divider-horizontal`]: {
+          width: 'auto',
+          alignSelf: 'auto',
+          height: token.lineWidth,
+          marginInline: token.marginLG,
+          marginBlock: token.marginXS
+        }
+      },
       '&-border': {
         border: `${token.lineWidth}px ${token.lineType} ${token.colorSplit}`
       },
@@ -173,19 +199,19 @@ const genProCardStyle = token => {
             paddingBlock: token.paddingSM
           }
         },
+        [` ${componentCls}-divider`]: {
+          marginBlock: token.marginLG,
+          marginInline: token.marginXS,
+          [`&${componentCls}-divider-horizontal`]: {
+            marginBlock: token.marginXS,
+            marginInline: token.marginLG
+          }
+        },
         [`${componentCls}-header${componentCls}-header-collapsible`]: {
           paddingBlock: token.paddingXS
         }
       }
     },
-    [`${componentCls}-col`]: {
-      [`&${componentCls}-split-vertical`]: {
-        borderInlineEnd: `${token.lineWidth}px ${token.lineType} ${token.colorSplit}`
-      },
-      [`&${componentCls}-split-horizontal`]: {
-        borderBlockEnd: `${token.lineWidth}px ${token.lineType} ${token.colorSplit}`
-      }
-    },
     [`${componentCls}-tabs`]: {
       [`${token.antCls}-tabs-top > ${token.antCls}-tabs-nav`]: {
         marginBlockEnd: 0,

package/es/card/components/CheckCard/Group.js

@@ -160,9 +160,7 @@ const CheckCardGroup = props => {
   };
   const children = useMemo(() => {
     if (loading) {
-      return new Array(options.length || React.Children.toArray(props.children).length || 1).fill(0)
-      // eslint-disable-next-line react/no-array-index-key
-      .map((_, index) => /*#__PURE__*/_jsx(CheckCard, {
+      return new Array(options.length || React.Children.toArray(props.children).length || 1).fill(0).map((_, index) => /*#__PURE__*/_jsx(CheckCard, {
         loading: true
       }, index));
     }

package/es/card/components/CheckCard/index.js

@@ -42,7 +42,6 @@ const CheckCard = props => {
   useEffect(() => {
     checkCardGroup?.registerValue?.(props.value);
     return () => checkCardGroup?.cancelValue?.(props.value);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [props.value]);
   const {
     prefixCls: customizePrefixCls,

package/es/card/components/Divider/index.d.ts

@@ -17,7 +17,7 @@ export type ProCardDividerProps = {
      *
      * @default vertical
      */
-    type?: 'horizontal' | 'vertical';
+    orientation?: 'horizontal' | 'vertical';
 };
 declare const ProCardDivider: React.FC<ProCardDividerProps>;
 export default ProCardDivider;

package/es/card/components/Divider/index.js

@@ -16,10 +16,10 @@ const ProCardDivider = props => {
   const {
     className,
     style = {},
-    type
+    orientation = 'vertical'
   } = props;
   const classString = clsx(prefixCls, className, hashId, {
-    [`${prefixCls}-${type}`]: type
+    [`${prefixCls}-${orientation}`]: orientation
   });
   return wrapSSR( /*#__PURE__*/_jsx("div", {
     className: classString,

package/es/card/components/Divider/style.d.ts

@@ -1,5 +1,8 @@
 /// <reference types="react" />
-export default function useStyle(prefixCls: string): {
+/**
+ * Divider 样式已合并至 ProCard style.ts，此 hook 仅用于获取 hashId 和 wrapSSR
+ */
+export default function useStyle(_prefixCls: string): {
     wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

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

@@ -1,41 +1,8 @@
 import { useStyle as useAntdStyle } from "../../../provider";
-const genDividerStyle = token => {
-  const {
-    componentCls
-  } = token;
-  return {
-    [componentCls]: {
-      boxSizing: 'border-box',
-      '&-divider': {
-        flex: 'none',
-        width: token.lineWidth,
-        marginInline: token.marginXS,
-        marginBlock: token.marginLG,
-        backgroundColor: token.colorSplit,
-        '&-horizontal': {
-          width: 'initial',
-          height: token.lineWidth,
-          marginInline: token.marginLG,
-          marginBlock: token.marginXS
-        }
-      },
-      '&&-size-small &-divider': {
-        marginBlock: token.marginLG,
-        marginInline: token.marginXS,
-        '&-horizontal': {
-          marginBlock: token.marginXS,
-          marginInline: token.marginLG
-        }
-      }
-    }
-  };
-};
-export default function useStyle(prefixCls) {
-  return useAntdStyle('ProCardDivider', token => {
-    const proCardDividerToken = {
-      ...token,
-      componentCls: `.${prefixCls}`
-    };
-    return [genDividerStyle(proCardDividerToken)];
-  });
+
+/**
+ * Divider 样式已合并至 ProCard style.ts，此 hook 仅用于获取 hashId 和 wrapSSR
+ */
+export default function useStyle(_prefixCls) {
+  return useAntdStyle('ProCardDivider', () => ({}));
 }

package/es/card/components/Statistic/index.js

@@ -12,7 +12,7 @@ const Statistic = props => {
     layout = 'inline',
     style,
     description,
-    children,
+    children: _children,
     title,
     tip,
     status,

package/es/card/typing.d.ts

@@ -1,15 +1,12 @@
 import type { TabPaneProps, TabsProps } from 'antd';
-import type { LabelTooltipType } from 'antd/lib/form/FormItemLabel';
 import type { ReactNode } from 'react';
+import type { LabelTooltipType } from '../utils';
+export type { LabelTooltipType };
 export type Breakpoint = 'xxl' | 'xl' | 'lg' | 'md' | 'sm' | 'xs';
 export type Gutter = number | Partial<Record<Breakpoint, number>>;
 export type ColSpanType = number | string;
 type CollapsibleType = 'icon' | 'header' | boolean;
 type CardPropsBase = {
-    /** 标题样式 */
-    headStyle?: React.CSSProperties;
-    /** 内容样式 */
-    bodyStyle?: React.CSSProperties;
     /** 样式配置 */
     styles?: {
         header?: React.CSSProperties;
@@ -93,4 +90,3 @@ export type ProCardTabPaneProps = {
     cardProps?: CardProps;
 } & TabPaneProps;
 export type CardType = React.ForwardRefExoticComponent<CardProps>;
-export {};

package/es/descriptions/index.d.ts

@@ -1,8 +1,8 @@
 import type { DescriptionsProps, FormProps } from 'antd';
-import type { LabelTooltipType } from 'antd/lib/form/FormItemLabel';
 import React from 'react';
 import type { ProFieldFCMode } from '../provider';
-import type { ProCoreActionType, ProFieldValueType, ProSchema, ProSchemaComponentTypes, RowEditableConfig, UseEditableMapUtilType } from '../utils';
+import type { ProCoreActionType, ProEllipsis, ProFieldValueType, ProSchema, ProSchemaComponentTypes, RowEditableConfig, UseEditableMapUtilType } from '../utils';
+import { LabelTooltipType } from '../utils';
 import type { RequestData } from './useFetchData';
 export interface DescriptionsItemProps {
     prefixCls?: string;
@@ -31,9 +31,7 @@ export type ProDescriptionsItemProps<T = Record<string, any>, ValueType = 'text'
     hide?: boolean;
     plain?: boolean;
     copyable?: boolean;
-    ellipsis?: boolean | {
-        showTitle?: boolean;
-    };
+    ellipsis?: ProEllipsis;
     mode?: ProFieldFCMode;
     children?: React.ReactNode;
     /**

package/es/descriptions/index.js

@@ -187,14 +187,14 @@ const schemaToDescriptionsItem = (items, entity, action, editableUtils, emptyTex
       };
     }
     const {
-      valueEnum,
-      render,
+      valueEnum: _valueEnum,
+      render: _render,
       renderText,
       mode,
-      plain,
+      plain: _plain,
       dataIndex,
-      request,
-      params,
+      request: _request,
+      params: _params,
       editable,
       ...restItem
     } = item;
@@ -294,7 +294,7 @@ const ProDescriptions = props => {
     onLoadingChange,
     actionRef,
     onRequestError,
-    emptyText,
+    emptyText: _emptyText,
     ...rest
   } = props;
   const proContext = useContext(ProConfigContext);

package/es/descriptions/useFetchData.js

@@ -71,7 +71,6 @@ const useFetchData = (getData, options) => {
       return;
     }
     fetchList();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [...(effects || []), manual]);
   return {
     dataSource: entity,

package/es/field/AllProField.js

@@ -127,15 +127,12 @@ export const defaultRenderText = (dataValue, valueType, props, valueTypeMap) =>
       });
     }
   }
-
-  // eslint-disable-next-line no-param-reassign
   delete props.emptyText;
   if (typeof valueType === 'object') {
     return defaultRenderTextByObject(dataValue, valueType, props);
   }
   const customValueTypeConfig = valueTypeMap && valueTypeMap[valueType];
   if (customValueTypeConfig) {
-    // eslint-disable-next-line no-param-reassign
     delete props.ref;
     if (mode === 'read') {
       return customValueTypeConfig.render?.(dataValue, {
@@ -561,7 +558,6 @@ const ProFieldComponent = ({
       ...omitUndefined(restFieldProps),
       onChange: onChangeCallBack
     };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [value, restFieldProps, onChangeCallBack]);
   const renderedDom = defaultRenderText(mode === 'edit' ? fieldProps?.value ?? text ?? '' : text ?? fieldProps?.value ?? '', valueType || 'text', omitUndefined({
     ref,

package/es/field/PureProField.js

@@ -52,11 +52,8 @@ export const pureRenderText = (dataValue, valueType, props, valueTypeMap) => {
       });
     }
   }
-
-  // eslint-disable-next-line no-param-reassign
   delete props.emptyText;
   if (typeof valueType === 'object') {
-    // eslint-disable-next-line @typescript-eslint/no-use-before-define
     return pureRenderText(dataValue, valueType.type, {
       ...valueType,
       ...props
@@ -64,7 +61,6 @@ export const pureRenderText = (dataValue, valueType, props, valueTypeMap) => {
   }
   const customValueTypeConfig = valueTypeMap && valueTypeMap[valueType];
   if (customValueTypeConfig) {
-    // eslint-disable-next-line no-param-reassign
     delete props.ref;
     if (mode === 'read') {
       const readDom = customValueTypeConfig.render?.(dataValue, {
@@ -129,7 +125,6 @@ const ProFieldComponent = ({
       ...omitUndefined(restFieldProps),
       onChange: onChangeCallBack
     };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [value, restFieldProps, onChangeCallBack]);
   const renderedDom = pureRenderText(mode === 'edit' ? fieldProps?.value ?? text ?? '' : text ?? fieldProps?.value ?? '', valueType || 'text', omitUndefined({
     ref,

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

@@ -100,14 +100,11 @@ const FieldCheckbox = ({
   }
   if (mode === 'edit') {
     const {
-      fieldNames,
+      fieldNames: _fieldNames,
       variant,
       ...restFieldProps
     } = rest.fieldProps || {};
-    const dom = wrapSSR(
-    /*#__PURE__*/
-    //@ts-ignore
-    _jsx(Checkbox.Group, {
+    const dom = wrapSSR( /*#__PURE__*/_jsx(Checkbox.Group, {
       ...restFieldProps,
       variant: variant,
       className: clsx(rest.fieldProps?.className, hashId, `${layoutClassName}-${layout}`, {

package/es/field/components/DatePicker/index.d.ts

@@ -5,6 +5,6 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
     format?: string | undefined;
     showTime?: boolean | undefined;
     variant?: "outlined" | "filled" | "borderless" | "underlined" | undefined;
-    picker?: "time" | "date" | "month" | "week" | "year" | "quarter" | undefined;
+    picker?: "time" | "date" | "month" | "week" | "quarter" | "year" | undefined;
 } & ProFieldLightProps & React.RefAttributes<any>>;
 export default _default;

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

@@ -82,6 +82,7 @@ const FieldDigitRange = ({
     const placeholderValue = fieldProps?.placeholder || placeholder || [intl.getMessage('tableForm.inputPlaceholder', '请输入'), intl.getMessage('tableForm.inputPlaceholder', '请输入')];
     const getInputNumberPlaceholder = index => Array.isArray(placeholderValue) ? placeholderValue[index] : placeholderValue;
     const dom = /*#__PURE__*/_jsxs(Space.Compact, {
+      block: true,
       onBlur: handleGroupBlur,
       children: [/*#__PURE__*/_jsx(InputNumber, {
         ...fieldProps,

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

@@ -5,17 +5,14 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 const addArrayKeys = doms => doms.map((dom, index) => {
   if (! /*#__PURE__*/React.isValidElement(dom)) {
-    // eslint-disable-next-line react/no-array-index-key
     return /*#__PURE__*/_jsx(React.Fragment, {
       children: dom
     }, index);
   }
   return /*#__PURE__*/React.cloneElement(dom, {
-    // eslint-disable-next-line react/no-array-index-key
     key: index,
     ...dom?.props,
     style: {
-      // @ts-ignore
       ...dom?.props?.style
     }
   });

package/es/field/components/Percent/util.d.ts

@@ -1,7 +1,7 @@
 /** 获取展示符号 */
 export declare function getSymbolByRealValue(realValue: number): "-" | "+" | null;
 /** 获取颜色 */
-export declare function getColorByRealValue(realValue: number /** ,color: string */): "#595959" | "#52c41a" | "#ff4d4f";
+export declare function getColorByRealValue(realValue: number /** ,color: string */): "#52c41a" | "#595959" | "#ff4d4f";
 /** 获取到最后展示的数字 */
 export declare function getRealTextWithPrecision(realValue: number, precision?: number): string | number;
 /**

package/es/field/components/RangePicker/index.d.ts

@@ -5,6 +5,6 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
     format?: string | undefined;
     variant?: "outlined" | "filled" | "borderless" | "underlined" | undefined;
     showTime?: boolean | undefined;
-    picker?: "time" | "date" | "month" | "week" | "year" | "quarter" | undefined;
+    picker?: "time" | "date" | "month" | "week" | "quarter" | "year" | undefined;
 } & ProFieldLightProps & React.RefAttributes<any>>;
 export default _default;

package/es/field/components/Select/SearchSelect/index.js

@@ -33,7 +33,6 @@ const SearchSelect = (props, ref) => {
     showSearch,
     fieldNames,
     defaultSearchValue,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     preserveOriginalLabel: _preserveOriginalLabel = false,
     ...restProps
   } = props;

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

@@ -25,7 +25,6 @@ const FieldSwitch = ({
   const dom = useMemo(() => {
     if (text === undefined || text === null || `${text}`.length < 1) return '-';
     return text ? fieldProps?.checkedChildren ?? intl.getMessage('switch.open', '打开') : fieldProps?.unCheckedChildren ?? intl.getMessage('switch.close', '关闭');
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fieldProps?.checkedChildren, fieldProps?.unCheckedChildren, text]);
   if (mode === 'read') {
     if (render) {

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

@@ -27,7 +27,10 @@ const FieldText = ({
   useImperativeHandle(ref, () => inputRef.current, []);
   useEffect(() => {
     if (autoFocus) {
-      inputRef.current?.focus();
+      // 使用 queueMicrotask 延迟 focus 调用，避免在渲染期间触发 flushSync
+      queueMicrotask(() => {
+        inputRef.current?.focus();
+      });
     }
   }, [autoFocus]);
   if (mode === 'read') {

package/es/form/BaseForm/BaseForm.js

@@ -1,4 +1,3 @@
-/* eslint-disable react-hooks/exhaustive-deps */
 import { get, set as namePathSet, omit, set, useControlledState, warning } from '@rc-component/util';
 import { useUrlSearchParams } from '@umijs/use-params';
 import { ConfigProvider, Form, Spin } from 'antd';
@@ -241,7 +240,6 @@ function BaseFormComponents(props) {
     const isEqual = isDeepEqualReact(props.initialValues, preInitialValues);
     noteOnce(isEqual, `initialValues 只在 form 初始化时生效，如果你需要异步加载推荐使用 request，或者 initialValues ? <Form/> : null `);
     noteOnce(isEqual, `The initialValues only take effect when the form is initialized, if you need to load asynchronously recommended request, or the initialValues ? <Form/> : null `);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [props.initialValues]);
 
   // 初始化给一个默认的 form
@@ -488,7 +486,6 @@ export function BaseForm(props) {
   useEffect(() => {
     if (!syncToUrl) return;
     setUrlSearch(genParams(syncToUrl, getGenParams(), 'set'));
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [extraUrlParams, getGenParams, syncToUrl]);
   const getPopupContainer = useMemo(() => {
     if (typeof window === 'undefined') return undefined;

package/es/form/BaseForm/LightWrapper/index.d.ts

@@ -1,7 +1,8 @@
+import type { SizeType as AntdSizeType } from 'antd/lib/config-provider/SizeContext';
 import type { TooltipPlacement } from 'antd/lib/tooltip';
 import React from 'react';
 import type { LightFilterFooterRender } from '../../typing';
-export type SizeType = 'small' | 'middle' | 'large' | undefined;
+export type SizeType = AntdSizeType;
 export type LightWrapperProps = {
     label?: React.ReactNode;
     disabled?: boolean;

package/es/form/components/Captcha/index.js

@@ -32,7 +32,6 @@ const BaseProFormCaptcha = /*#__PURE__*/React.forwardRef((props, ref) => {
     } catch (error) {
       setTiming(false);
       setLoading(false);
-      // eslint-disable-next-line no-console
       console.log(error);
     }
   };
@@ -64,7 +63,6 @@ const BaseProFormCaptcha = /*#__PURE__*/React.forwardRef((props, ref) => {
       }, 1000);
     }
     return () => clearInterval(interval);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [timing]);
   useEffect(() => {
     if (onTiming) {
@@ -104,7 +102,6 @@ const BaseProFormCaptcha = /*#__PURE__*/React.forwardRef((props, ref) => {
             await onGetCaptcha('');
           }
         } catch (error) {
-          // eslint-disable-next-line no-console
           console.log(error);
         }
       },

package/es/form/components/Checkbox/index.js

@@ -1,3 +1,4 @@
+import { omit } from '@rc-component/util';
 import { Checkbox } from 'antd';
 import React from 'react';
 import { FieldCheckbox } from "../../../field";
@@ -66,9 +67,12 @@ const ProFormCheckboxComponents = /*#__PURE__*/React.forwardRef(({
   fieldProps,
   children
 }, ref) => {
+  const {
+    ...restFieldProps
+  } = fieldProps || {};
   return /*#__PURE__*/_jsx(Checkbox, {
     ref: ref,
-    ...fieldProps,
+    ...omit(restFieldProps, ['allowClear']),
     children: children
   });
 });

package/es/form/components/DatePicker/index.js

@@ -8,7 +8,5 @@ ExportComponent.Week = ProFormDatePickerWeek;
 ExportComponent.Month = ProFormDatePickerMonth;
 ExportComponent.Quarter = ProFormDatePickerQuarter;
 ExportComponent.Year = ProFormDatePickerYear;
-// @ts-ignore
-// eslint-disable-next-line no-param-reassign
 ExportComponent.displayName = 'ProFormComponent';
 export default ExportComponent;

package/es/form/components/FieldSet/index.js

@@ -83,12 +83,22 @@ const FieldSet = props => {
   } = useGridHelpers(rest);
   const Wrapper = useCallback(({
     children: dom
-  }) => /*#__PURE__*/_jsx(Components, {
-    ...space,
-    align: "start",
-    wrap: true,
-    children: dom
-  }), [Components, space]);
+  }) => {
+    // 从 space props 中提取 wrap，如果未定义则不传递
+    const spacePropsWithWrap = {
+      ...space,
+      align: 'start'
+    };
+
+    // 只有当 space 中明确定义了 wrap 时才传递，否则使用组件默认行为
+    if (type === 'space' && space?.wrap !== undefined) {
+      spacePropsWithWrap.wrap = space.wrap;
+    }
+    return /*#__PURE__*/_jsx(Components, {
+      ...spacePropsWithWrap,
+      children: dom
+    });
+  }, [Components, space, type]);
   return /*#__PURE__*/_jsx(RowWrapper, {
     Wrapper: Wrapper,
     children: list