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

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

@@ -11,17 +11,14 @@ var _provider = require("../../../provider");
 var _jsxRuntime = require("react/jsx-runtime");
 const addArrayKeys = doms => doms.map((dom, index) => {
   if (! /*#__PURE__*/_react.default.isValidElement(dom)) {
-    // eslint-disable-next-line react/no-array-index-key
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.default.Fragment, {
       children: dom
     }, index);
   }
   return /*#__PURE__*/_react.default.cloneElement(dom, {
-    // eslint-disable-next-line react/no-array-index-key
     key: index,
     ...dom?.props,
     style: {
-      // @ts-ignore
       ...dom?.props?.style
     }
   });

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

@@ -14,18 +14,19 @@ var _jsxRuntime = require("react/jsx-runtime");
 /**
  * 最基本的组件，就是个普通的 Input.Password
  *
- * @param
+ * @param props
+ * @param ref
  */
-const FieldPassword = ({
-  text,
-  mode,
-  render,
-  formItemRender,
-  fieldProps,
-  proFieldKey,
-  ...rest
-}, ref) => {
+const FieldPassword = (props, ref) => {
   const intl = (0, _provider.useIntl)();
+  const {
+    text,
+    mode,
+    render,
+    formItemRender,
+    fieldProps,
+    ...rest
+  } = (0, _util.omit)(props, ['proFieldKey']);
   const [open, setOpenInner] = (0, _util.useControlledState)(() => rest.open || false, rest.open);
   const setOpen = (0, _react.useCallback)(updater => {
     setOpenInner(prev => {

package/lib/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/lib/field/components/Radio/index.js

@@ -14,7 +14,11 @@ var _jsxRuntime = require("react/jsx-runtime");
 /**
  * 单选组件
  *
- * @param param0
+ * @param radioType
+ * @param formItemRender
+ * @param mode
+ * @param render
+ * @param rest
  * @param ref
  */
 const FieldRadio = ({

package/lib/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/lib/field/components/Segmented/index.js

@@ -14,7 +14,8 @@ var _jsxRuntime = require("react/jsx-runtime");
 /**
  * Segmented https://ant.design/components/segmented-cn/
  *
- * @param
+ * @param props
+ * @param ref
  */const FieldSegmented = (props, ref) => {
   const {
     mode,

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

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

package/lib/field/components/Select/index.d.ts

@@ -23,7 +23,7 @@ export type FieldSelectProps<FieldProps = any> = {
 /**
  * 把 value 的枚举转化为数组
  *
- * @param valueEnum
+ * @param valueEnumParams
  */
 export declare const proFieldParsingValueEnumToArray: (valueEnumParams: ProFieldValueEnumType) => SelectOptionType;
 export declare const useFieldFetchData: (props: FieldSelectProps & {

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

@@ -87,7 +87,7 @@ function filerByItem(item, keyWords) {
 /**
  * 把 value 的枚举转化为数组
  *
- * @param valueEnum
+ * @param valueEnumParams
  */
 const proFieldParsingValueEnumToArray = valueEnumParams => {
   const enumArray = [];

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

@@ -12,9 +12,17 @@ var _provider = require("../../../provider");
 var _utils = require("../../../utils");
 var _jsxRuntime = require("react/jsx-runtime");
 /**
- * 评分组件
+ * 开关组件
  *
- * @param
+ * @param text
+ * @param mode
+ * @param render
+ * @param light
+ * @param label
+ * @param formItemRender
+ * @param fieldProps
+ * @param propsVariant
+ * @param ref
  */
 const FieldSwitch = ({
   text,
@@ -31,7 +39,6 @@ const FieldSwitch = ({
   const dom = (0, _react.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/lib/field/components/Text/index.js

@@ -12,7 +12,13 @@ var _jsxRuntime = require("react/jsx-runtime");
 /**
  * 最基本的组件，就是个普通的 Input
  *
- * @param
+ * @param text
+ * @param mode
+ * @param render
+ * @param formItemRender
+ * @param fieldProps
+ * @param emptyText
+ * @param ref
  */
 const FieldText = ({
   text,
@@ -32,7 +38,10 @@ const FieldText = ({
   (0, _react.useImperativeHandle)(ref, () => inputRef.current, []);
   (0, _react.useEffect)(() => {
     if (autoFocus) {
-      inputRef.current?.focus();
+      // 使用 queueMicrotask 延迟 focus 调用，避免在渲染期间触发 flushSync
+      queueMicrotask(() => {
+        inputRef.current?.focus();
+      });
     }
   }, [autoFocus]);
   if (mode === 'read') {

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

@@ -14,7 +14,8 @@ var _jsxRuntime = require("react/jsx-runtime");
 /**
  * 最基本的组件，就是个普通的 Input.TextArea
  *
- * @param
+ * @param props
+ * @param ref
  */const FieldTextArea = (props, ref) => {
   const {
     text,
@@ -41,8 +42,10 @@ var _jsxRuntime = require("react/jsx-runtime");
     const dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Input.TextArea, {
       ref: ref,
       rows: 3,
-      onKeyPress: e => {
-        if (e.key === 'Enter') e.stopPropagation();
+      onKeyDown: e => {
+        if (e.key === 'Enter') {
+          e.stopPropagation();
+        }
       },
       placeholder: intl.getMessage('tableForm.inputPlaceholder', '请输入'),
       ...fieldProps

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

@@ -106,7 +106,16 @@ const FieldTimePicker = ({
 /**
  * 时间区间选择
  *
- * @param param0
+ * @param text
+ * @param light
+ * @param label
+ * @param mode
+ * @param lightLabel
+ * @param format
+ * @param render
+ * @param formItemRender
+ * @param fieldProps
+ * @param variant
  * @param ref
  */
 const FieldTimeRangePickerComponents = ({

package/lib/field/components/TreeSelect/index.d.ts

@@ -1,12 +1,6 @@
-import type { RadioGroupProps, TreeSelectProps } from 'antd';
+import type { TreeSelectProps } from 'antd';
 import React from 'react';
-import type { FieldSelectProps } from '../Select';
-export type GroupProps = {
-    options?: RadioGroupProps['options'];
-    radioType?: 'button' | 'radio';
-    variant?: 'outlined' | 'borderless' | 'filled';
-} & FieldSelectProps;
-export type TreeSelectFieldProps = TreeSelectProps<any> & {
+export type TreeSelectFieldProps = TreeSelectProps & {
     /**
      * 当搜索关键词发生变化时是否请求远程数据
      *
@@ -15,10 +9,6 @@ export type TreeSelectFieldProps = TreeSelectProps<any> & {
     fetchDataOnSearch?: boolean;
 };
 declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
-    options?: (string | number | import("antd").CheckboxOptionType<any>)[] | undefined;
-    radioType?: "button" | "radio" | undefined;
-    variant?: "outlined" | "filled" | "borderless" | undefined;
-} & {
     text: string;
     valueEnum?: import("src/utils/typing").ProFieldValueEnumType | undefined;
     debounceTime?: number | undefined;

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

@@ -16,10 +16,17 @@ var _jsxRuntime = require("react/jsx-runtime");
 /**
  * Tree select
  * A function that returns a React component.
+
+ * @param formItemRender
+ * @param mode
+ * @param light
+ * @param label
+ * @param render
+ * @param propsVariant
+ * @param rest
  * @param ref
  */
 const FieldTreeSelect = ({
-  radioType,
   formItemRender,
   mode,
   light,
@@ -35,17 +42,22 @@ const FieldTreeSelect = ({
   const treeSelectRef = (0, _react.useRef)(null);
   const [open, setOpen] = (0, _react.useState)(false);
   const {
-    onSearch,
     onClear,
     onChange: propsOnChange,
     onBlur,
     showSearch,
-    autoClearSearchValue,
-    treeData,
     fetchDataOnSearch,
-    searchValue: propsSearchValue,
+    onSearch: propsOnSearch,
+    autoClearSearchValue: propsAutoClearSearchValue,
+    searchValue: propsSearchValueProp,
     ...fieldProps
-  } = rest.fieldProps;
+  } = (0, _util.omit)(rest.fieldProps, ['treeData']);
+  const showSearchConfig = typeof showSearch === 'object' ? showSearch : {};
+  const onSearch = showSearchConfig?.onSearch !== undefined ? showSearchConfig.onSearch : propsOnSearch;
+  //兼容过时API autoClearSearchValue
+  const autoClearSearchValue = showSearchConfig?.autoClearSearchValue !== undefined ? showSearchConfig.autoClearSearchValue : propsAutoClearSearchValue;
+  //兼容过时API searchValue
+  const propsSearchValue = showSearchConfig?.searchValue !== undefined ? showSearchConfig.searchValue : propsSearchValueProp;
   const variant = propsVariant ?? fieldProps?.variant;
   const intl = (0, _provider.useIntl)();
   const [loading, options, fetchData] = (0, _Select.useFieldFetchData)({
@@ -139,14 +151,23 @@ const FieldTreeSelect = ({
         } : undefined,
         ...fieldProps,
         treeData: options,
-        showSearch: showSearch,
+        showSearch: showSearch ? {
+          ...showSearchConfig,
+          searchValue: searchValue,
+          autoClearSearchValue: autoClearSearchValue,
+          onSearch: value => {
+            // fix 不支持请求的情况下不刷新options
+            if (fetchDataOnSearch && rest?.request) {
+              fetchData(value);
+            }
+            setSearchValue(value);
+          }
+        } : showSearch,
         style: {
           minWidth: 60,
           ...fieldProps.style
         },
         allowClear: fieldProps.allowClear !== false,
-        searchValue: searchValue,
-        autoClearSearchValue: autoClearSearchValue,
         onClear: () => {
           onClear?.();
           fetchData(undefined);
@@ -155,13 +176,6 @@ const FieldTreeSelect = ({
           }
         },
         onChange: onChange,
-        onSearch: value => {
-          // fix 不支持请求的情况下不刷新options
-          if (fetchDataOnSearch && rest?.request) {
-            fetchData(value);
-          }
-          setSearchValue(value);
-        },
         onBlur: event => {
           setSearchValue(undefined);
           fetchData(undefined);

package/lib/form/BaseForm/BaseForm.js

@@ -19,8 +19,6 @@ var _helpers = require("../helpers");
 var _EditOrReadOnlyContext = require("./EditOrReadOnlyContext");
 var _Submitter = _interopRequireDefault(require("./Submitter"));
 var _jsxRuntime = require("react/jsx-runtime");
-/* eslint-disable react-hooks/exhaustive-deps */
-
 const {
   noteOnce
 } = _util.warning;
@@ -249,7 +247,6 @@ function BaseFormComponents(props) {
     const isEqual = (0, _utils.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
@@ -496,7 +493,6 @@ function BaseForm(props) {
   (0, _react.useEffect)(() => {
     if (!syncToUrl) return;
     setUrlSearch(genParams(syncToUrl, getGenParams(), 'set'));
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [extraUrlParams, getGenParams, syncToUrl]);
   const getPopupContainer = (0, _react.useMemo)(() => {
     if (typeof window === 'undefined') return undefined;
@@ -601,7 +597,7 @@ function BaseForm(props) {
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_List.FormListContext.Provider, {
           value: {},
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form, {
-            onKeyPress: event => {
+            onKeyDown: event => {
               if (!isKeyPressSubmit) return;
               if (event.key === 'Enter') {
                 formRef.current?.submit();
@@ -609,7 +605,7 @@ function BaseForm(props) {
             },
             autoComplete: "off",
             form: form,
-            ...(0, _util.omit)(propRest, ['ref', 'labelWidth', 'autoFocusFirstInput']),
+            ...(0, _util.omit)(propRest, ['ref', 'labelWidth', 'autoFocusFirstInput', 'rootClassName']),
             ref: instance => {
               if (!formRef.current) return;
               formRef.current.nativeElement = instance?.nativeElement;
@@ -633,7 +629,8 @@ function BaseForm(props) {
             onValuesChange: (changedValues, values) => {
               propRest?.onValuesChange?.(transformKey(changedValues, !!omitNil), transformKey(values, !!omitNil));
             },
-            className: (0, _clsx.clsx)(props.className, prefixCls, hashId),
+            className: props.className,
+            rootClassName: (0, _clsx.clsx)(prefixCls, hashId, props.rootClassName),
             onFinish: onFinish,
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(BaseFormComponents, {
               transformKey: transformKey,

package/lib/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/lib/form/BaseForm/Submitter/index.d.ts

@@ -26,7 +26,7 @@ export type SubmitterProps<T = Record<string, any>> = {
     render?: ((props: SubmitterProps & T & {
         submit: () => void;
         reset: () => void;
-    }, dom: JSX.Element[]) => React.ReactNode[] | React.ReactNode | false) | false;
+    }, dom: React.JSX.Element[]) => React.ReactNode[] | React.ReactNode | false) | false;
 };
 /**
  * FormFooter 的组件，可以自动进行一些配置

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

@@ -38,7 +38,6 @@ const BaseProFormCaptcha = /*#__PURE__*/_react.default.forwardRef((props, ref) =
     } catch (error) {
       setTiming(false);
       setLoading(false);
-      // eslint-disable-next-line no-console
       console.log(error);
     }
   };
@@ -70,7 +69,6 @@ const BaseProFormCaptcha = /*#__PURE__*/_react.default.forwardRef((props, ref) =
       }, 1000);
     }
     return () => clearInterval(interval);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [timing]);
   (0, _react.useEffect)(() => {
     if (onTiming) {
@@ -110,7 +108,6 @@ const BaseProFormCaptcha = /*#__PURE__*/_react.default.forwardRef((props, ref) =
             await onGetCaptcha('');
           }
         } catch (error) {
-          // eslint-disable-next-line no-console
           console.log(error);
         }
       },

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _util = require("@rc-component/util");
 var _antd = require("antd");
 var _react = _interopRequireDefault(require("react"));
 var _field = require("../../../field");
@@ -73,9 +74,12 @@ const ProFormCheckboxComponents = /*#__PURE__*/_react.default.forwardRef(({
   fieldProps,
   children
 }, ref) => {
+  const {
+    ...restFieldProps
+  } = fieldProps || {};
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Checkbox, {
     ref: ref,
-    ...fieldProps,
+    ...(0, _util.omit)(restFieldProps, ['allowClear']),
     children: children
   });
 });

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

@@ -15,7 +15,5 @@ ExportComponent.Week = _WeekPicker.default;
 ExportComponent.Month = _MonthPicker.default;
 ExportComponent.Quarter = _QuarterPicker.default;
 ExportComponent.Year = _YearPicker.default;
-// @ts-ignore
-// eslint-disable-next-line no-param-reassign
 ExportComponent.displayName = 'ProFormComponent';
 var _default = exports.default = ExportComponent;

package/lib/form/components/Digit/DigitRange.js

@@ -11,9 +11,12 @@ var _provider = require("../../../provider");
 var _Field = _interopRequireDefault(require("../Field"));
 var _jsxRuntime = require("react/jsx-runtime");
 /**
- * 数组选择组件
+ * 数字范围输入组件
  *
- * @param
+ * @param fieldProps
+ * @param proFieldProps
+ * @param rest
+ * @param ref
  */
 const ProFormDigit = ({
   fieldProps,

package/lib/form/components/Digit/index.js

@@ -11,9 +11,14 @@ var _provider = require("../../../provider");
 var _Field = _interopRequireDefault(require("../Field"));
 var _jsxRuntime = require("react/jsx-runtime");
 /**
- * 数组选择组件
+ * 数字输入组件
  *
- * @param
+ * @param fieldProps
+ * @param min
+ * @param proFieldProps
+ * @param max
+ * @param rest
+ * @param ref
  */
 const ProFormDigit = ({
   fieldProps,

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

@@ -92,12 +92,22 @@ const FieldSet = props => {
   } = (0, _helpers.useGridHelpers)(rest);
   const Wrapper = (0, _react.useCallback)(({
     children: dom
-  }) => /*#__PURE__*/(0, _jsxRuntime.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__*/(0, _jsxRuntime.jsx)(Components, {
+      ...spacePropsWithWrap,
+      children: dom
+    });
+  }, [Components, space, type]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(RowWrapper, {
     Wrapper: Wrapper,
     children: list

package/lib/form/components/FormItem/FormItemRender/index.d.ts

@@ -62,7 +62,7 @@ export declare function pickControlProps(props: FormControlInjectProps): {
     onChange: (value: any) => void;
 };
 /**
- * 提取props中的 value、onChange 和 id 属性
+ * 提取 props 中的 value、onChange、id 及无障碍属性（aria-describedby、aria-invalid、aria-required）
  */
 export declare function pickControlPropsWithId(props: FormControlInjectProps): {
     id: string;

package/lib/form/components/FormItem/FormItemRender/index.js

@@ -96,14 +96,22 @@ function pickControlProps(props) {
     onChange: value => props.onChange(value?.target ? value.target.value : value)
   };
 }
+const ARIA_CONTROL_ATTRS = ['aria-describedby', 'aria-invalid', 'aria-required'];
 
 /**
- * 提取props中的 value、onChange 和 id 属性
+ * 提取 props 中的 value、onChange、id 及无障碍属性（aria-describedby、aria-invalid、aria-required）
  */
 function pickControlPropsWithId(props) {
+  const ariaAttrs = ARIA_CONTROL_ATTRS.reduce((acc, key) => {
+    if (props[key] !== undefined) {
+      acc[key] = props[key];
+    }
+    return acc;
+  }, {});
   return {
     ...pickControlProps(props),
-    id: props.id
+    id: props.id,
+    ...ariaAttrs
   };
 }
 

package/lib/form/components/FormItem/Group/index.js

@@ -134,7 +134,7 @@ const Group = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
       style: style,
       ref: ref,
       children: [hiddenDoms, (title || tooltip || extra) && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: `${className}-title ${hashId}`.trim(),
+        className: (0, _clsx.clsx)(`${className}-title`, hashId),
         style: titleStyle,
         onClick: () => {
           setCollapsed(!collapsed);

package/lib/form/components/FormItem/index.js

@@ -19,8 +19,8 @@ const FormItemProvide = exports.FormItemProvide = /*#__PURE__*/_react.default.cr
 /**
  * 把value扔给 fieldProps，方便给自定义用
  *
- * @param param0
  * @returns
+ * @param formFieldProps
  */
 const WithValueFomFiledProps = formFieldProps => {
   const {
@@ -90,11 +90,14 @@ const WithValueFomFiledProps = formFieldProps => {
     [valuePropName]: formFieldProps[valuePropName],
     ...filedChildren.props,
     onChange: finalChange,
-    fieldProps: {
-      ...filedChildren.props?.fieldProps,
-      ...fieldPropsFromRest,
-      ...fieldProps
-    },
+    // 只有当子组件是 ProFormComponent 时才传递 fieldProps，避免传递给原生 DOM 元素
+    ...(!isProFormComponent && fieldProps ? {
+      fieldProps: {
+        ...filedChildren.props?.fieldProps,
+        ...fieldPropsFromRest,
+        ...fieldProps
+      }
+    } : {}),
     ...(variantFromRest !== undefined && {
       variant: variantFromRest
     }),
@@ -173,7 +176,6 @@ const WarpFormItem = ({
       getValueProps: getValuePropsFunc,
       children: children
     });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [addonAfter, addonBefore, children, convertValue?.toString(), props]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(FormItemProvide.Provider, {
     value: {