@ant-design/pro-components 3.1.8-0 → 3.1.10-0

package/es/descriptions/index.d.ts

@@ -1,4 +1,6 @@
 import type { DescriptionsProps, FormProps } from 'antd';
+import type { Breakpoint } from 'antd/es/_util/responsiveObserver';
+import { CellSemanticClassNames, CellSemanticStyles } from 'antd/es/descriptions/DescriptionsContext';
 import React from 'react';
 import type { ProFieldFCMode } from '../provider';
 import type { ProCoreActionType, ProEllipsis, ProFieldValueType, ProSchema, ProSchemaComponentTypes, RowEditableConfig, UseEditableMapUtilType } from '../utils';
@@ -9,8 +11,12 @@ export interface DescriptionsItemProps {
     className?: string;
     style?: React.CSSProperties;
     label?: React.ReactNode;
+    classNames?: CellSemanticClassNames;
+    styles?: CellSemanticStyles;
     children: React.ReactNode;
-    span?: number;
+    span?: number | 'filled' | {
+        [key in Breakpoint]?: number;
+    };
 }
 /**
  * 定义列表属性的类型定义，用于定义列表的一列

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

@@ -11,7 +11,7 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
     options?: (string | number | import("antd").CheckboxOptionType<any>)[] | undefined;
     radioType?: "button" | "radio" | undefined;
     placeholder?: string | undefined;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | undefined;
 } & {
     text: string;
     valueEnum?: import("src/utils/typing").ProFieldValueEnumType | undefined;
@@ -19,7 +19,7 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
     request?: import("src/utils/typing").ProFieldRequestData | undefined;
     params?: any;
     fieldProps?: any;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | undefined;
     id?: string | undefined;
     defaultKeyWords?: string | undefined;
 } & import("../../PureProField").ProFieldLightProps & React.RefAttributes<any>>;

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

@@ -6,7 +6,7 @@ export type GroupProps = {
     options?: CheckboxGroupProps['options'];
 } & FieldSelectProps;
 declare const _default: React.ForwardRefExoticComponent<import("src/provider").BaseProFieldFC & import("src/provider").ProRenderFieldPropsType & {
-    layout?: "vertical" | "horizontal" | undefined;
+    layout?: "horizontal" | "vertical" | undefined;
     options?: (string | number | import("antd/lib/checkbox").CheckboxOptionType<any>)[] | undefined;
 } & {
     text: string;
@@ -15,7 +15,7 @@ declare const _default: React.ForwardRefExoticComponent<import("src/provider").B
     request?: import("src/utils/typing").ProFieldRequestData | undefined;
     params?: any;
     fieldProps?: any;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | undefined;
     id?: string | undefined;
     defaultKeyWords?: string | undefined;
 } & import("../../PureProField").ProFieldLightProps & React.RefAttributes<any>>;

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

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

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

@@ -2,6 +2,6 @@ import React from 'react';
 declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
     text: string;
     format?: string | undefined;
-    variant?: "filled" | "outlined" | "borderless" | "underlined" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | "underlined" | undefined;
 } & React.RefAttributes<any>>;
 export default _default;

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" | "#ff4d4f" | "#52c41a";
+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/Radio/index.d.ts

@@ -15,7 +15,7 @@ declare const _default: React.ForwardRefExoticComponent<import("src/provider").B
     request?: import("src/utils/typing").ProFieldRequestData | undefined;
     params?: any;
     fieldProps?: any;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | undefined;
     id?: string | undefined;
     defaultKeyWords?: string | undefined;
 } & import("../../PureProField").ProFieldLightProps & React.RefAttributes<any>>;

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

@@ -3,8 +3,8 @@ import type { ProFieldLightProps } from '../../PureProField';
 declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
     text: string[];
     format?: string | undefined;
-    variant?: "filled" | "outlined" | "borderless" | "underlined" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | "underlined" | undefined;
     showTime?: boolean | undefined;
-    picker?: "time" | "date" | "year" | "month" | "week" | "quarter" | undefined;
+    picker?: "time" | "date" | "month" | "week" | "year" | "quarter" | undefined;
 } & ProFieldLightProps & React.RefAttributes<any>>;
 export default _default;

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

@@ -9,7 +9,7 @@ declare const _default: React.ForwardRefExoticComponent<import("src/provider").B
     request?: import("src/utils/typing").ProFieldRequestData | undefined;
     params?: any;
     fieldProps?: any;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | undefined;
     id?: string | undefined;
     defaultKeyWords?: string | undefined;
 } & import("../../PureProField").ProFieldLightProps & React.RefAttributes<any>>;

package/es/field/components/Select/LightSelect/index.d.ts

@@ -31,7 +31,7 @@ declare const _default: React.ForwardRefExoticComponent<SelectProps<any, import(
      */
     fetchDataOnSearch?: boolean | undefined;
     /** 变体类型 */
-    variant?: "filled" | "outlined" | "borderless" | "underlined" | undefined;
-    labelVariant?: "filled" | "outlined" | "borderless" | "underlined" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | "underlined" | undefined;
+    labelVariant?: "outlined" | "filled" | "borderless" | "underlined" | undefined;
 } & ProFieldLightProps & SelectProps<any, import("antd/es/select").DefaultOptionType> & React.RefAttributes<any>>;
 export default _default;

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

@@ -43,7 +43,7 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
     params?: any;
     /** 组件的全局设置 */
     fieldProps?: any;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | undefined;
     id?: string | undefined;
     /** 默认搜素条件 */
     defaultKeyWords?: string | undefined;

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

@@ -3,6 +3,6 @@ import React from 'react';
 declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
     text: boolean;
     fieldProps?: SwitchProps | undefined;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | undefined;
 } & React.RefAttributes<any>>;
 export default _default;

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

@@ -3,12 +3,12 @@ import type { ProFieldLightProps } from '../../PureProField';
 declare const FieldTimeRangePicker: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
     text: string[] | number[];
     format?: string | undefined;
-    variant?: "filled" | "outlined" | "borderless" | "underlined" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | "underlined" | undefined;
 } & ProFieldLightProps & React.RefAttributes<any>>;
 export { FieldTimeRangePicker };
 declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
     text: string | number;
     format?: string | undefined;
-    variant?: "filled" | "outlined" | "borderless" | "underlined" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | "underlined" | undefined;
 } & ProFieldLightProps & React.RefAttributes<any>>;
 export default _default;

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

@@ -15,7 +15,7 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
     request?: import("src/utils/typing").ProFieldRequestData | undefined;
     params?: any;
     fieldProps?: any;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | undefined;
     id?: string | undefined;
     defaultKeyWords?: string | undefined;
 } & import("../../PureProField").ProFieldLightProps & React.RefAttributes<any>>;

package/es/form/BaseForm/BaseForm.js

@@ -4,7 +4,7 @@ import { ConfigProvider, Form, Spin } from 'antd';
 import { clsx } from 'clsx';
 import React, { useCallback, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { ProConfigProvider } from "../../provider";
-import { conversionMomentValue, isDeepEqualReact, nanoid, ProFormContext, runFunction, transformKeySubmitValue, useFetchData, usePrevious, useRefFunction, useStyle } from "../../utils";
+import { autoFocusToFirstChild, conversionMomentValue, isDeepEqualReact, nanoid, ProFormContext, runFunction, transformKeySubmitValue, useFetchData, usePrevious, useRefFunction, useStyle } from "../../utils";
 import { FormListContext } from "../components/List";
 import FieldContext from "../FieldContext";
 import { GridContext, useGridHelpers } from "../helpers";
@@ -182,10 +182,7 @@ function BaseFormComponents(props) {
   const items = useMemo(() => {
     return React.Children.toArray(children).map((item, index) => {
       if (index === 0 && /*#__PURE__*/React.isValidElement(item) && autoFocusFirstInput) {
-        return /*#__PURE__*/React.cloneElement(item, {
-          ...item.props,
-          autoFocus: autoFocusFirstInput
-        });
+        return autoFocusToFirstChild(item, autoFocusFirstInput);
       }
       return item;
     });

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

@@ -3,7 +3,7 @@ import { useControlledState } from '@rc-component/util';
 import { ConfigProvider, Space } from 'antd';
 import { clsx } from 'clsx';
 import React, { useCallback, useContext, useMemo } from 'react';
-import { LabelIconTip, useRefFunction } from "../../../../utils";
+import { autoFocusToFirstChild, LabelIconTip, useRefFunction } from "../../../../utils";
 import FieldContext from "../../../FieldContext";
 import { useGridHelpers } from "../../../helpers/grid";
 import { useStyle } from "./style";
@@ -102,10 +102,7 @@ const Group = /*#__PURE__*/React.forwardRef((props, ref) => {
         return null;
       }
       if (index === 0 && /*#__PURE__*/React.isValidElement(element) && autoFocus) {
-        return /*#__PURE__*/React.cloneElement(element, {
-          ...element.props,
-          autoFocus
-        });
+        return autoFocusToFirstChild(element, autoFocus);
       }
       return element;
     });

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

@@ -96,7 +96,7 @@ const WithValueFomFiledProps = formFieldProps => {
     ...(variantFromRest !== undefined && {
       variant: variantFromRest
     }),
-    onBlur: isProFormComponent && !isValidElementForFiledChildren && onBlur
+    onBlur: isProFormComponent && !isValidElementForFiledChildren && typeof onBlur === 'function' ? onBlur : undefined
   }));
 };
 /**

package/es/form/components/UploadButton/index.d.ts

@@ -1,8 +1,9 @@
 import type { ButtonProps, ImageProps, UploadProps } from 'antd';
+import type { UploadRef } from 'antd/es/upload';
 import React from 'react';
 import type { ProFormFieldItemProps } from '../../typing';
-type PickUploadProps = Pick<UploadProps<any>, 'listType' | 'action' | 'accept' | 'fileList' | 'onChange'>;
-export type ProFormUploadButtonProps = ProFormFieldItemProps<UploadProps<any>, HTMLElement> & {
+type PickUploadProps = Pick<UploadProps, 'listType' | 'action' | 'accept' | 'fileList' | 'onChange'>;
+export type ProFormUploadButtonProps = ProFormFieldItemProps<UploadProps, UploadRef> & {
     /**
      * @name  上传文件的图标
      * @default UploadOutlined

package/es/form/components/UploadDragger/index.d.ts

@@ -1,4 +1,4 @@
-import type { DraggerProps, UploadProps } from 'antd/lib/upload';
+import type { DraggerProps, UploadProps } from 'antd';
 import React from 'react';
 import type { ProFormFieldItemProps } from '../../typing';
 export type ProFormUploadDraggerProps = ProFormFieldItemProps<DraggerProps> & {

package/es/layout/ProLayout.js

@@ -406,7 +406,7 @@ const BaseProLayout = props => {
             position: 'absolute',
             ...item
           }
-        }, `bg-layout-${index}`);
+        }, item.src ? `${item.src}-${index}` : `bg-layout-${index}`);
       });
     }
     return null;

package/es/table/utils/columnRender.d.ts

@@ -22,7 +22,7 @@ type ColumnRenderInterface<T> = {
  *
  * @param item
  */
-export declare const renderColumnsTitle: (item: ProColumns<any>) => string | number | boolean | import("react/jsx-runtime").JSX.Element | Iterable<React.ReactNode> | null | undefined;
+export declare const renderColumnsTitle: (item: ProColumns<any>) => string | number | boolean | Iterable<React.ReactNode> | import("react/jsx-runtime").JSX.Element | null | undefined;
 /**
  * 默认的 filter 方法
  *

package/es/utils/autoFocusToFirstChild/index.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+/**
+ * 将 autoFocus 应用到第一个子节点；若首个子节点是 Fragment，则递归应用到其第一个子节点，
+ * 避免向 React.Fragment 传入非法 props。
+ */
+export declare function autoFocusToFirstChild(node: React.ReactNode, autoFocus: boolean): React.ReactNode;

package/es/utils/autoFocusToFirstChild/index.js

@@ -0,0 +1,18 @@
+import React from 'react';
+
+/**
+ * 将 autoFocus 应用到第一个子节点；若首个子节点是 Fragment，则递归应用到其第一个子节点，
+ * 避免向 React.Fragment 传入非法 props。
+ */
+export function autoFocusToFirstChild(node, autoFocus) {
+  if (!autoFocus || ! /*#__PURE__*/React.isValidElement(node)) return node;
+  if (node.type === React.Fragment) {
+    const children = React.Children.toArray(node.props.children);
+    const newChildren = children.map((child, index) => index === 0 ? autoFocusToFirstChild(child, autoFocus) : child);
+    return /*#__PURE__*/React.cloneElement(node, {}, ...newChildren);
+  }
+  return /*#__PURE__*/React.cloneElement(node, {
+    ...node.props,
+    autoFocus
+  });
+}

package/es/utils/components/ErrorBoundary/index.d.ts

@@ -15,6 +15,6 @@ declare class ErrorBoundary extends React.Component<{
         errorInfo: string;
     };
     componentDidCatch(error: any, errorInfo: ErrorInfo): void;
-    render(): string | number | boolean | import("react/jsx-runtime").JSX.Element | Iterable<React.ReactNode> | null | undefined;
+    render(): string | number | boolean | Iterable<React.ReactNode> | import("react/jsx-runtime").JSX.Element | null | undefined;
 }
 export { ErrorBoundary };

package/es/utils/genCopyable/index.d.ts

@@ -12,4 +12,4 @@ export type ProEllipsis = ProEllipsisTooltip | boolean;
  * @param item
  * @param text
  */
-export declare const genCopyable: (dom: React.ReactNode, item: any, text: string) => string | number | boolean | import("react/jsx-runtime").JSX.Element | Iterable<React.ReactNode> | null | undefined;
+export declare const genCopyable: (dom: React.ReactNode, item: any, text: string) => string | number | boolean | Iterable<React.ReactNode> | import("react/jsx-runtime").JSX.Element | null | undefined;

package/es/utils/index.d.ts

@@ -1,4 +1,5 @@
 import { lighten, operationUnit, resetComponent, setAlpha, useStyle } from '../provider';
+import { autoFocusToFirstChild } from './autoFocusToFirstChild';
 import { DropdownFooter } from './components/DropdownFooter';
 import { ErrorBoundary } from './components/ErrorBoundary';
 import { FieldLabel } from './components/FieldLabel';
@@ -48,5 +49,5 @@ import type { UseEditableMapType, UseEditableMapUtilType } from './useEditableMa
 import { useEditableMap } from './useEditableMap';
 import { useBreakpoint } from './useMediaQuery';
 export * from './typing';
-export { conversionMomentValue, conversionMomentValue as conversionSubmitValue, convertMoment, dateArrayFormatter, dateFormatterMap, DropdownFooter, editableRowByKey, ErrorBoundary, FieldLabel, FilterDropdown, genCopyable, getFieldPropsOrFormItemProps, InlineErrorFormItem, isBrowser, isDeepEqualReact, isDropdownValueType, isImg, isNil, isUrl, LabelIconTip, lighten, merge, nanoid, objectToMap, omitBoolean, omitUndefined, omitUndefinedAndEmptyArr, operationUnit, parseValueToDay, pickProFormItemProps, pickProProps, proFieldParsingText, ProFormContext, recordKeyToString, resetComponent, runFunction, setAlpha, stringify, transformKeySubmitValue, useBreakpoint, useDebounceFn, useDebounceValue, useDeepCompareEffect, useDeepCompareEffectDebounce, useDeepCompareMemo, useDocumentTitle, useEditableArray, useEditableMap, useFetchData, useLatest, usePrevious, useReactiveRef, useRefCallback, useRefFunction, useStyle, };
+export { autoFocusToFirstChild, conversionMomentValue, conversionMomentValue as conversionSubmitValue, convertMoment, dateArrayFormatter, dateFormatterMap, DropdownFooter, editableRowByKey, ErrorBoundary, FieldLabel, FilterDropdown, genCopyable, getFieldPropsOrFormItemProps, InlineErrorFormItem, isBrowser, isDeepEqualReact, isDropdownValueType, isImg, isNil, isUrl, LabelIconTip, lighten, merge, nanoid, objectToMap, omitBoolean, omitUndefined, omitUndefinedAndEmptyArr, operationUnit, parseValueToDay, pickProFormItemProps, pickProProps, proFieldParsingText, ProFormContext, recordKeyToString, resetComponent, runFunction, setAlpha, stringify, transformKeySubmitValue, useBreakpoint, useDebounceFn, useDebounceValue, useDeepCompareEffect, useDeepCompareEffectDebounce, useDeepCompareMemo, useDocumentTitle, useEditableArray, useEditableMap, useFetchData, useLatest, usePrevious, useReactiveRef, useRefCallback, useRefFunction, useStyle, };
 export type { ProEllipsis, ProFormInstanceType, ProRequestData, RowEditableConfig, RowEditableType, UseEditableMapType, UseEditableMapUtilType, UseEditableType, UseEditableUtilType, };

package/es/utils/index.js

@@ -1,4 +1,5 @@
 import { lighten, operationUnit, resetComponent, setAlpha, useStyle } from "../provider";
+import { autoFocusToFirstChild } from "./autoFocusToFirstChild";
 import { DropdownFooter } from "./components/DropdownFooter";
 import { ErrorBoundary } from "./components/ErrorBoundary";
 import { FieldLabel } from "./components/FieldLabel";
@@ -43,7 +44,7 @@ import { editableRowByKey, recordKeyToString, useEditableArray } from "./useEdit
 import { useEditableMap } from "./useEditableMap";
 import { useBreakpoint } from "./useMediaQuery";
 export * from "./typing";
-export { conversionMomentValue, conversionMomentValue as conversionSubmitValue, convertMoment, dateArrayFormatter, dateFormatterMap, DropdownFooter, editableRowByKey, ErrorBoundary, FieldLabel, FilterDropdown, genCopyable, getFieldPropsOrFormItemProps, InlineErrorFormItem, isBrowser, isDeepEqualReact, isDropdownValueType, isImg, isNil, isUrl, LabelIconTip, lighten, merge, nanoid, objectToMap, omitBoolean, omitUndefined, omitUndefinedAndEmptyArr, operationUnit, parseValueToDay, pickProFormItemProps, pickProProps, proFieldParsingText, ProFormContext, recordKeyToString, resetComponent, runFunction, setAlpha, stringify,
+export { autoFocusToFirstChild, conversionMomentValue, conversionMomentValue as conversionSubmitValue, convertMoment, dateArrayFormatter, dateFormatterMap, DropdownFooter, editableRowByKey, ErrorBoundary, FieldLabel, FilterDropdown, genCopyable, getFieldPropsOrFormItemProps, InlineErrorFormItem, isBrowser, isDeepEqualReact, isDropdownValueType, isImg, isNil, isUrl, LabelIconTip, lighten, merge, nanoid, objectToMap, omitBoolean, omitUndefined, omitUndefinedAndEmptyArr, operationUnit, parseValueToDay, pickProFormItemProps, pickProProps, proFieldParsingText, ProFormContext, recordKeyToString, resetComponent, runFunction, setAlpha, stringify,
 // function
 transformKeySubmitValue, useBreakpoint, useDebounceFn, useDebounceValue, useDeepCompareEffect, useDeepCompareEffectDebounce, useDeepCompareMemo, useDocumentTitle,
 // hooks

package/lib/descriptions/index.d.ts

@@ -1,4 +1,6 @@
 import type { DescriptionsProps, FormProps } from 'antd';
+import type { Breakpoint } from 'antd/es/_util/responsiveObserver';
+import { CellSemanticClassNames, CellSemanticStyles } from 'antd/es/descriptions/DescriptionsContext';
 import React from 'react';
 import type { ProFieldFCMode } from '../provider';
 import type { ProCoreActionType, ProEllipsis, ProFieldValueType, ProSchema, ProSchemaComponentTypes, RowEditableConfig, UseEditableMapUtilType } from '../utils';
@@ -9,8 +11,12 @@ export interface DescriptionsItemProps {
     className?: string;
     style?: React.CSSProperties;
     label?: React.ReactNode;
+    classNames?: CellSemanticClassNames;
+    styles?: CellSemanticStyles;
     children: React.ReactNode;
-    span?: number;
+    span?: number | 'filled' | {
+        [key in Breakpoint]?: number;
+    };
 }
 /**
  * 定义列表属性的类型定义，用于定义列表的一列

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

@@ -11,7 +11,7 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
     options?: (string | number | import("antd").CheckboxOptionType<any>)[] | undefined;
     radioType?: "button" | "radio" | undefined;
     placeholder?: string | undefined;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | undefined;
 } & {
     text: string;
     valueEnum?: import("src/utils/typing").ProFieldValueEnumType | undefined;
@@ -19,7 +19,7 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
     request?: import("src/utils/typing").ProFieldRequestData | undefined;
     params?: any;
     fieldProps?: any;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | undefined;
     id?: string | undefined;
     defaultKeyWords?: string | undefined;
 } & import("../../PureProField").ProFieldLightProps & React.RefAttributes<any>>;

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

@@ -6,7 +6,7 @@ export type GroupProps = {
     options?: CheckboxGroupProps['options'];
 } & FieldSelectProps;
 declare const _default: React.ForwardRefExoticComponent<import("src/provider").BaseProFieldFC & import("src/provider").ProRenderFieldPropsType & {
-    layout?: "vertical" | "horizontal" | undefined;
+    layout?: "horizontal" | "vertical" | undefined;
     options?: (string | number | import("antd/lib/checkbox").CheckboxOptionType<any>)[] | undefined;
 } & {
     text: string;
@@ -15,7 +15,7 @@ declare const _default: React.ForwardRefExoticComponent<import("src/provider").B
     request?: import("src/utils/typing").ProFieldRequestData | undefined;
     params?: any;
     fieldProps?: any;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | undefined;
     id?: string | undefined;
     defaultKeyWords?: string | undefined;
 } & import("../../PureProField").ProFieldLightProps & React.RefAttributes<any>>;

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

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

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

@@ -2,6 +2,6 @@ import React from 'react';
 declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
     text: string;
     format?: string | undefined;
-    variant?: "filled" | "outlined" | "borderless" | "underlined" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | "underlined" | undefined;
 } & React.RefAttributes<any>>;
 export default _default;

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" | "#ff4d4f" | "#52c41a";
+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.d.ts

@@ -15,7 +15,7 @@ declare const _default: React.ForwardRefExoticComponent<import("src/provider").B
     request?: import("src/utils/typing").ProFieldRequestData | undefined;
     params?: any;
     fieldProps?: any;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | undefined;
     id?: string | undefined;
     defaultKeyWords?: string | undefined;
 } & import("../../PureProField").ProFieldLightProps & React.RefAttributes<any>>;

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

@@ -3,8 +3,8 @@ import type { ProFieldLightProps } from '../../PureProField';
 declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
     text: string[];
     format?: string | undefined;
-    variant?: "filled" | "outlined" | "borderless" | "underlined" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | "underlined" | undefined;
     showTime?: boolean | undefined;
-    picker?: "time" | "date" | "year" | "month" | "week" | "quarter" | undefined;
+    picker?: "time" | "date" | "month" | "week" | "year" | "quarter" | undefined;
 } & ProFieldLightProps & React.RefAttributes<any>>;
 export default _default;

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

@@ -9,7 +9,7 @@ declare const _default: React.ForwardRefExoticComponent<import("src/provider").B
     request?: import("src/utils/typing").ProFieldRequestData | undefined;
     params?: any;
     fieldProps?: any;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | undefined;
     id?: string | undefined;
     defaultKeyWords?: string | undefined;
 } & import("../../PureProField").ProFieldLightProps & React.RefAttributes<any>>;

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

@@ -31,7 +31,7 @@ declare const _default: React.ForwardRefExoticComponent<SelectProps<any, import(
      */
     fetchDataOnSearch?: boolean | undefined;
     /** 变体类型 */
-    variant?: "filled" | "outlined" | "borderless" | "underlined" | undefined;
-    labelVariant?: "filled" | "outlined" | "borderless" | "underlined" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | "underlined" | undefined;
+    labelVariant?: "outlined" | "filled" | "borderless" | "underlined" | undefined;
 } & ProFieldLightProps & SelectProps<any, import("antd/es/select").DefaultOptionType> & React.RefAttributes<any>>;
 export default _default;

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

@@ -43,7 +43,7 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
     params?: any;
     /** 组件的全局设置 */
     fieldProps?: any;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | undefined;
     id?: string | undefined;
     /** 默认搜素条件 */
     defaultKeyWords?: string | undefined;

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

@@ -3,6 +3,6 @@ import React from 'react';
 declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
     text: boolean;
     fieldProps?: SwitchProps | undefined;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | undefined;
 } & React.RefAttributes<any>>;
 export default _default;

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

@@ -3,12 +3,12 @@ import type { ProFieldLightProps } from '../../PureProField';
 declare const FieldTimeRangePicker: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
     text: string[] | number[];
     format?: string | undefined;
-    variant?: "filled" | "outlined" | "borderless" | "underlined" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | "underlined" | undefined;
 } & ProFieldLightProps & React.RefAttributes<any>>;
 export { FieldTimeRangePicker };
 declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
     text: string | number;
     format?: string | undefined;
-    variant?: "filled" | "outlined" | "borderless" | "underlined" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | "underlined" | undefined;
 } & ProFieldLightProps & React.RefAttributes<any>>;
 export default _default;

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

@@ -15,7 +15,7 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
     request?: import("src/utils/typing").ProFieldRequestData | undefined;
     params?: any;
     fieldProps?: any;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | undefined;
     id?: string | undefined;
     defaultKeyWords?: string | undefined;
 } & import("../../PureProField").ProFieldLightProps & React.RefAttributes<any>>;

package/lib/form/BaseForm/BaseForm.js

@@ -189,10 +189,7 @@ function BaseFormComponents(props) {
   const items = (0, _react.useMemo)(() => {
     return _react.default.Children.toArray(children).map((item, index) => {
       if (index === 0 && /*#__PURE__*/_react.default.isValidElement(item) && autoFocusFirstInput) {
-        return /*#__PURE__*/_react.default.cloneElement(item, {
-          ...item.props,
-          autoFocus: autoFocusFirstInput
-        });
+        return (0, _utils.autoFocusToFirstChild)(item, autoFocusFirstInput);
       }
       return item;
     });

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

@@ -109,10 +109,7 @@ const Group = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
         return null;
       }
       if (index === 0 && /*#__PURE__*/_react.default.isValidElement(element) && autoFocus) {
-        return /*#__PURE__*/_react.default.cloneElement(element, {
-          ...element.props,
-          autoFocus
-        });
+        return (0, _utils.autoFocusToFirstChild)(element, autoFocus);
       }
       return element;
     });

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

@@ -101,7 +101,7 @@ const WithValueFomFiledProps = formFieldProps => {
     ...(variantFromRest !== undefined && {
       variant: variantFromRest
     }),
-    onBlur: isProFormComponent && !isValidElementForFiledChildren && onBlur
+    onBlur: isProFormComponent && !isValidElementForFiledChildren && typeof onBlur === 'function' ? onBlur : undefined
   }));
 };
 /**

package/lib/form/components/UploadButton/index.d.ts

@@ -1,8 +1,9 @@
 import type { ButtonProps, ImageProps, UploadProps } from 'antd';
+import type { UploadRef } from 'antd/es/upload';
 import React from 'react';
 import type { ProFormFieldItemProps } from '../../typing';
-type PickUploadProps = Pick<UploadProps<any>, 'listType' | 'action' | 'accept' | 'fileList' | 'onChange'>;
-export type ProFormUploadButtonProps = ProFormFieldItemProps<UploadProps<any>, HTMLElement> & {
+type PickUploadProps = Pick<UploadProps, 'listType' | 'action' | 'accept' | 'fileList' | 'onChange'>;
+export type ProFormUploadButtonProps = ProFormFieldItemProps<UploadProps, UploadRef> & {
     /**
      * @name  上传文件的图标
      * @default UploadOutlined

package/lib/form/components/UploadDragger/index.d.ts

@@ -1,4 +1,4 @@
-import type { DraggerProps, UploadProps } from 'antd/lib/upload';
+import type { DraggerProps, UploadProps } from 'antd';
 import React from 'react';
 import type { ProFormFieldItemProps } from '../../typing';
 export type ProFormUploadDraggerProps = ProFormFieldItemProps<DraggerProps> & {

package/lib/layout/ProLayout.js

@@ -411,7 +411,7 @@ const BaseProLayout = props => {
             position: 'absolute',
             ...item
           }
-        }, `bg-layout-${index}`);
+        }, item.src ? `${item.src}-${index}` : `bg-layout-${index}`);
       });
     }
     return null;