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

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

@@ -3,7 +3,7 @@ import { omit, useControlledState } from '@rc-component/util';
 import { ConfigProvider, Grid, Tabs } from 'antd';
 import { clsx } from 'clsx';
 import React, { useCallback, useContext } from 'react';
-import { LabelIconTip } from "../../../utils";
+import { LabelIconTip, useRefFunction } from "../../../utils";
 import Actions from "../Actions";
 import Loading from "../Loading";
 import useStyle from "./style";
@@ -61,13 +61,27 @@ const Card = /*#__PURE__*/React.forwardRef((props, ref) => {
     xxl: false
   };
   const [collapsed, setCollapsedInner] = useControlledState(defaultCollapsed, controlCollapsed);
+
+  /**
+   * 使用 useRefFunction 包装回调，确保引用稳定
+   */
+  const onCollapseCallback = useRefFunction(c => {
+    onCollapse?.(c);
+  });
+
+  /**
+   * 使用 queueMicrotask 延迟回调调用，避免在渲染阶段调用外部回调导致的 React 警告
+   * "Cannot update a component while rendering a different component"
+   */
   const setCollapsed = useCallback(updater => {
     setCollapsedInner(prev => {
       const next = typeof updater === 'function' ? updater(prev) : updater;
-      onCollapse?.(next);
+      queueMicrotask(() => {
+        onCollapseCallback(next);
+      });
       return next;
     });
-  }, [onCollapse]);
+  }, [onCollapseCallback]);
 
   // 顺序决定如何进行响应式取值，按最大响应值依次取值，请勿修改。
   const responsiveArray = ['xxl', 'xl', 'lg', 'md', 'sm', 'xs'];

package/es/descriptions/index.d.ts

@@ -9,8 +9,6 @@ export interface DescriptionsItemProps {
     className?: string;
     style?: React.CSSProperties;
     label?: React.ReactNode;
-    labelStyle?: React.CSSProperties;
-    contentStyle?: React.CSSProperties;
     children: React.ReactNode;
     span?: number;
 }

package/es/descriptions/index.js

@@ -9,8 +9,6 @@ import ProSkeleton from "../skeleton";
 import { ErrorBoundary, InlineErrorFormItem, LabelIconTip, genCopyable, getFieldPropsOrFormItemProps, stringify, useEditableMap } from "../utils";
 import useFetchData from "./useFetchData";
 
-// todo remove it
-
 /**
  * 定义列表属性的类型定义，用于定义列表的一列
  * @typedef {Object} ProDescriptionsItemProps
@@ -297,7 +295,6 @@ const ProDescriptions = props => {
     actionRef,
     onRequestError,
     emptyText,
-    contentStyle,
     ...rest
   } = props;
   const proContext = useContext(ProConfigContext);
@@ -415,8 +412,7 @@ const ProDescriptions = props => {
           ...rest,
           styles: {
             content: {
-              minWidth: 0,
-              ...(contentStyle || {})
+              minWidth: 0
             }
           },
           extra: rest.extra ? /*#__PURE__*/_jsxs(Space, {

package/es/descriptions/useFetchData.js

@@ -1,5 +1,6 @@
 import { useControlledState } from '@rc-component/util';
 import { useCallback, useEffect } from 'react';
+import { useRefFunction } from "../utils";
 const useFetchData = (getData, options) => {
   const {
     onRequestError,
@@ -18,13 +19,27 @@ const useFetchData = (getData, options) => {
     });
   }, [onDataSourceChange]);
   const [loading, setLoadingInner] = useControlledState(options?.loading, options?.loading);
+
+  /**
+   * 使用 useRefFunction 包装回调，确保引用稳定
+   */
+  const onLoadingChange = useRefFunction(l => {
+    options?.onLoadingChange?.(l);
+  });
+
+  /**
+   * 包装 setLoading，使用 queueMicrotask 延迟回调调用
+   * 避免在渲染阶段调用外部回调导致的 React 警告
+   */
   const setLoading = useCallback(updater => {
     setLoadingInner(prev => {
       const next = typeof updater === 'function' ? updater(prev) : updater;
-      options?.onLoadingChange?.(next);
+      queueMicrotask(() => {
+        onLoadingChange(next);
+      });
       return next;
     });
-  }, [options?.onLoadingChange]);
+  }, [onLoadingChange]);
   const updateDataAndLoading = data => {
     setEntity(data);
     setLoading(false);

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

@@ -9,9 +9,9 @@ export type GroupProps = {
 } & FieldSelectProps;
 declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
     options?: (string | number | import("antd").CheckboxOptionType<any>)[] | undefined;
-    radioType?: "radio" | "button" | undefined;
+    radioType?: "button" | "radio" | undefined;
     placeholder?: string | undefined;
-    variant?: "outlined" | "borderless" | "filled" | 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?: "outlined" | "borderless" | "filled" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | undefined;
     id?: string | undefined;
     defaultKeyWords?: string | undefined;
 } & import("../../PureProField").ProFieldLightProps & React.RefAttributes<any>>;

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

@@ -14,7 +14,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * @param ref
  */
 const FieldCascader = ({
-  radioType,
   placeholder,
   formItemRender,
   mode,
@@ -79,7 +78,6 @@ const FieldCascader = ({
   if (mode === 'edit') {
     const fieldProps = rest.fieldProps || {};
     let dom = /*#__PURE__*/_jsx(Cascader, {
-      variant: !light ? variant : 'borderless',
       ref: cascaderRef,
       open: open,
       suffixIcon: loading ? /*#__PURE__*/_jsx(LoadingOutlined, {}) : undefined,

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?: "outlined" | "borderless" | "filled" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | undefined;
     id?: string | undefined;
     defaultKeyWords?: string | undefined;
 } & import("../../PureProField").ProFieldLightProps & React.RefAttributes<any>>;

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

@@ -101,6 +101,7 @@ const FieldCheckbox = ({
   if (mode === 'edit') {
     const {
       fieldNames,
+      variant,
       ...restFieldProps
     } = rest.fieldProps || {};
     const dom = wrapSSR(
@@ -108,6 +109,7 @@ const FieldCheckbox = ({
     //@ts-ignore
     _jsx(Checkbox.Group, {
       ...restFieldProps,
+      variant: variant,
       className: clsx(rest.fieldProps?.className, hashId, `${layoutClassName}-${layout}`, {
         [`${layoutClassName}-error`]: status?.status === 'error',
         [`${layoutClassName}-warning`]: status?.status === 'warning'

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

@@ -27,7 +27,6 @@ const FieldCode = ({
   render,
   language = 'text',
   formItemRender,
-  plain,
   fieldProps
 }, ref) => {
   const code = languageFormat(text, language);
@@ -65,17 +64,11 @@ const FieldCode = ({
   }
   if (mode === 'edit' || mode === 'update') {
     fieldProps.value = code;
-    let dom = /*#__PURE__*/_jsx(Input.TextArea, {
+    const dom = /*#__PURE__*/_jsx(Input.TextArea, {
       rows: 5,
       ...fieldProps,
       ref: ref
     });
-    if (plain) {
-      dom = /*#__PURE__*/_jsx(Input, {
-        ...fieldProps,
-        ref: ref
-      });
-    }
     if (formItemRender) {
       return formItemRender(code, {
         mode,

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

@@ -2,6 +2,6 @@ import type { ColorPickerProps } from 'antd';
 import React from 'react';
 declare const _default: React.ForwardRefExoticComponent<import("src/provider").BaseProFieldFC & import("src/provider").ProRenderFieldPropsType & {
     text: string;
-    mode?: "update" | "edit" | "read" | undefined;
-} & Partial<Omit<ColorPickerProps, "value" | "mode">> & React.RefAttributes<any>>;
+    mode?: "update" | "read" | "edit" | undefined;
+} & Partial<Omit<ColorPickerProps, "mode" | "value">> & React.RefAttributes<any>>;
 export default _default;

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?: "outlined" | "borderless" | "filled" | "underlined" | undefined;
-    picker?: "date" | "time" | "month" | "week" | "year" | "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/DatePicker/index.js

@@ -29,12 +29,11 @@ const FieldDatePicker = ({
   light,
   render,
   formItemRender,
-  plain,
   showTime,
   fieldProps,
   picker,
-  variant,
-  lightLabel
+  lightLabel,
+  variant
 }, ref) => {
   const intl = useIntl();
   const [open, setOpen] = useState(false);
@@ -82,7 +81,6 @@ const FieldDatePicker = ({
             setOpen(isOpen);
             fieldProps?.onOpenChange?.(isOpen);
           },
-          variant: "borderless",
           open: open
         }) : undefined,
         allowClear: false,
@@ -96,7 +94,7 @@ const FieldDatePicker = ({
         showTime: showTime,
         format: format,
         placeholder: placeholder,
-        variant: plain === undefined ? variant : plain ? 'borderless' : 'outlined',
+        variant: variant,
         ref: ref,
         ...fieldProps,
         value: dayValue

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

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

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

@@ -15,7 +15,7 @@ dayjs.extend(relativeTime);
 const FieldFromNow = ({
   text,
   mode,
-  plain,
+  variant,
   render,
   formItemRender,
   format,
@@ -46,7 +46,7 @@ const FieldFromNow = ({
       ref: ref,
       placeholder: placeholder,
       showTime: true,
-      variant: plain === undefined ? 'outlined' : plain ? 'borderless' : 'outlined',
+      variant: variant ?? fieldProps?.variant ?? 'outlined',
       ...fieldProps,
       value: momentValue
     });

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

@@ -165,7 +165,6 @@ const FieldMoney = ({
   formItemRender,
   fieldProps,
   proFieldKey,
-  plain,
   valueEnum,
   placeholder,
   locale,

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

@@ -25,7 +25,6 @@ const FieldProgress = ({
   text,
   mode,
   render,
-  plain,
   formItemRender,
   fieldProps,
   placeholder
@@ -42,7 +41,7 @@ const FieldProgress = ({
         maxWidth: 320
       },
       percent: realValue,
-      steps: plain ? 10 : undefined,
+      steps: fieldProps?.steps,
       status: getProgressStatus(realValue),
       ...fieldProps
     });

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?: "outlined" | "borderless" | "filled" | 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?: "outlined" | "borderless" | "filled" | "underlined" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | "underlined" | undefined;
     showTime?: boolean | undefined;
-    picker?: "date" | "time" | "month" | "week" | "year" | "quarter" | undefined;
+    picker?: "time" | "date" | "month" | "week" | "year" | "quarter" | undefined;
 } & ProFieldLightProps & React.RefAttributes<any>>;
 export default _default;

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

@@ -19,10 +19,9 @@ const FieldRangePicker = ({
   render,
   picker,
   formItemRender,
-  plain,
   showTime,
   lightLabel,
-  variant,
+  variant: propsVariant,
   fieldProps
 }, ref) => {
   const intl = useIntl();
@@ -87,14 +86,8 @@ const FieldRangePicker = ({
           picker: picker,
           showTime: showTime,
           format: format,
-          variant: "borderless",
           ...fieldProps,
-          placeholder: fieldProps.placeholder ?? [intl.getMessage('tableForm.selectPlaceholder', '请选择'), intl.getMessage('tableForm.selectPlaceholder', '请选择')]
-          // onClear={() => {
-          //   setOpen(false);
-          //   fieldProps?.onClear?.();
-          // }}
-          ,
+          placeholder: fieldProps.placeholder ?? [intl.getMessage('tableForm.selectPlaceholder', '请选择'), intl.getMessage('tableForm.selectPlaceholder', '请选择')],
           value: dayValue,
           onOpenChange: isOpen => {
             if (dayValue) setOpen(isOpen);
@@ -102,8 +95,8 @@ const FieldRangePicker = ({
           },
           onChange: handleRangeChange
         }) : null,
+        variant: propsVariant,
         allowClear: false,
-        variant: variant,
         ref: lightLabel,
         downIcon: dayValue || open ? false : undefined
       });
@@ -113,7 +106,6 @@ const FieldRangePicker = ({
         format: format,
         showTime: showTime,
         placeholder: [intl.getMessage('tableForm.selectPlaceholder', '请选择'), intl.getMessage('tableForm.selectPlaceholder', '请选择')],
-        variant: plain === undefined ? variant : plain ? 'borderless' : 'outlined',
         ...fieldProps,
         value: dayValue
       });

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?: "outlined" | "borderless" | "filled" | 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

@@ -15,6 +15,7 @@ export type LightSelectProps = {
     fetchDataOnSearch?: boolean;
     /** 变体类型 */
     variant?: 'outlined' | 'borderless' | 'filled' | 'underlined';
+    labelVariant?: 'outlined' | 'borderless' | 'filled' | 'underlined';
 } & ProFieldLightProps & SelectProps;
 export declare const LightSelect: React.ForwardRefRenderFunction<any, SelectProps<any> & LightSelectProps>;
 declare const _default: React.ForwardRefExoticComponent<SelectProps<any, import("antd/es/select").DefaultOptionType> & {
@@ -30,6 +31,7 @@ declare const _default: React.ForwardRefExoticComponent<SelectProps<any, import(
      */
     fetchDataOnSearch?: boolean | undefined;
     /** 变体类型 */
-    variant?: "outlined" | "borderless" | "filled" | "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/LightSelect/index.js

@@ -26,6 +26,7 @@ export const LightSelect = (props, ref) => {
     value,
     mode,
     defaultValue,
+    labelVariant,
     size,
     showSearch,
     disabled,
@@ -72,6 +73,7 @@ export const LightSelect = (props, ref) => {
           width: '153px',
           height: '28px',
           visibility: 'hidden',
+          opacity: 0,
           '&-selector': {
             height: 28
           }
@@ -200,7 +202,7 @@ export const LightSelect = (props, ref) => {
       label: label,
       placeholder: placeholder,
       disabled: disabled,
-      variant: variant,
+      variant: labelVariant,
       allowClear: !!allowClear,
       value: filterValue || value?.label || value,
       onClear: () => {

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

@@ -43,9 +43,9 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
     params?: any;
     /** 组件的全局设置 */
     fieldProps?: any;
-    variant?: "outlined" | "borderless" | "filled" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | undefined;
     id?: string | undefined;
     /** 默认搜素条件 */
     defaultKeyWords?: string | undefined;
-} & ProFieldLightProps & Pick<SelectProps<any, import("antd/es/select").DefaultOptionType>, "className" | "style" | "fieldNames"> & React.RefAttributes<any>>;
+} & ProFieldLightProps & Pick<SelectProps<any, import("antd/es/select").DefaultOptionType>, "style" | "className" | "fieldNames"> & React.RefAttributes<any>>;
 export default _default;

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

@@ -182,10 +182,8 @@ export const useFieldFetchData = props => {
     keyWords: kw
   }, props), {
     revalidateIfStale: !cacheForSwr,
-    // 打开 cacheForSwr 的时候才应该支持两个功能
     revalidateOnReconnect: cacheForSwr,
     shouldRetryOnError: false,
-    // @todo 这个功能感觉应该搞个API出来
     revalidateOnFocus: false
   });
   const resOptions = useMemo(() => {
@@ -308,7 +306,6 @@ const FieldSelect = (props, ref) => {
     const renderDom = () => {
       if (light) {
         return /*#__PURE__*/_jsx(LightSelect, {
-          variant: variant,
           id: id,
           loading: loading,
           ref: inputRef,
@@ -316,6 +313,7 @@ const FieldSelect = (props, ref) => {
           size: componentSize,
           options: options,
           label: label,
+          labelVariant: variant,
           placeholder: intl.getMessage('tableForm.selectPlaceholder', '请选择'),
           lightLabel: lightLabel,
           labelTrigger: labelTrigger,
@@ -329,7 +327,6 @@ const FieldSelect = (props, ref) => {
           minWidth: 100,
           ...rest.style
         },
-        variant: variant,
         id: id,
         loading: loading,
         ref: inputRef,

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?: "outlined" | "borderless" | "filled" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | undefined;
 } & React.RefAttributes<any>>;
 export default _default;

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

@@ -18,9 +18,10 @@ const FieldSwitch = ({
   label,
   formItemRender,
   fieldProps,
-  variant
+  variant: propsVariant
 }, ref) => {
   const intl = useIntl();
+  const variant = propsVariant ?? fieldProps?.variant;
   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', '关闭');

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

@@ -3,10 +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?: "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?: "outlined" | "filled" | "borderless" | "underlined" | undefined;
 } & ProFieldLightProps & React.RefAttributes<any>>;
 export default _default;

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

@@ -18,9 +18,9 @@ const FieldTimePicker = ({
   format = 'HH:mm:ss',
   render,
   formItemRender,
-  plain,
   fieldProps,
-  lightLabel
+  lightLabel,
+  variant
 }, ref) => {
   const [open, setOpen] = useState(false);
   const intl = useIntl();
@@ -59,8 +59,9 @@ const FieldTimePicker = ({
         } : undefined,
         label: label,
         disabled: disabled,
+        variant: variant ?? fieldProps?.variant,
         value: dayValue || open ? /*#__PURE__*/_jsx(TimePicker, {
-          variant: "borderless",
+          variant: variant ?? fieldProps?.variant,
           format: format,
           ref: ref,
           ...fieldProps,
@@ -80,7 +81,6 @@ const FieldTimePicker = ({
       dom = /*#__PURE__*/_jsx(DatePicker.TimePicker, {
         ref: ref,
         format: format,
-        variant: plain === undefined ? 'outlined' : plain ? 'borderless' : 'outlined',
         ...fieldProps,
         value: dayValue
       });
@@ -111,8 +111,8 @@ const FieldTimeRangePickerComponents = ({
   format = 'HH:mm:ss',
   render,
   formItemRender,
-  plain,
-  fieldProps
+  fieldProps,
+  variant
 }, ref) => {
   const intl = useIntl();
   const [open, setOpen] = useState(false);
@@ -159,9 +159,10 @@ const FieldTimeRangePickerComponents = ({
         } : undefined,
         label: label,
         disabled: disabled,
+        variant: variant,
         placeholder: placeholder,
         value: dayValue || open ? /*#__PURE__*/_jsx(TimePicker.RangePicker, {
-          variant: "borderless",
+          variant: variant ?? fieldProps?.variant,
           format: format,
           ref: ref,
           ...fieldProps,
@@ -181,7 +182,7 @@ const FieldTimeRangePickerComponents = ({
       dom = /*#__PURE__*/_jsx(TimePicker.RangePicker, {
         ref: ref,
         format: format,
-        variant: plain === undefined ? 'outlined' : plain ? 'borderless' : 'outlined',
+        variant: variant,
         ...fieldProps,
         value: dayValue
       });

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

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

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

@@ -20,7 +20,7 @@ const FieldTreeSelect = ({
   light,
   label,
   render,
-  variant,
+  variant: propsVariant,
   ...rest
 }, ref) => {
   const {
@@ -41,6 +41,7 @@ const FieldTreeSelect = ({
     searchValue: propsSearchValue,
     ...fieldProps
   } = rest.fieldProps;
+  const variant = propsVariant ?? fieldProps?.variant;
   const intl = useIntl();
   const [loading, options, fetchData] = useFieldFetchData({
     ...rest,
@@ -131,7 +132,6 @@ const FieldTreeSelect = ({
             children: [item.label, " ", itemIndex < valuesLength - 1 ? ',' : '']
           });
         } : undefined,
-        variant: !light ? variant : 'borderless',
         ...fieldProps,
         treeData: options,
         showSearch: showSearch,