@ant-design/pro-components 3.1.9-0 → 3.1.11-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/descriptions/index.js

@@ -209,7 +209,7 @@ const schemaToDescriptionsItem = (items, entity, action, editableUtils, emptyTex
     const fieldMode = mode || isEditable ? 'edit' : 'read';
     const showEditIcon = editableUtils && fieldMode === 'read' && editable !== false && editable?.(text, entity, index) !== false;
     const Component = showEditIcon ? Space : React.Fragment;
-    const contentDom = fieldMode === 'edit' ? text : genCopyable(text, item, text);
+    const contentDom = fieldMode === 'edit' ? text : genCopyable(text, item, text, defaultData);
     const key = restItem.key || restItem.label?.toString() || index;
     const label = (title || restItem.label || restItem.tooltip) && /*#__PURE__*/_jsx(LabelIconTip, {
       label: title || restItem.label,

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

@@ -3,5 +3,5 @@ import React from 'react';
 declare const _default: React.ForwardRefExoticComponent<import("src/provider").BaseProFieldFC & import("src/provider").ProRenderFieldPropsType & {
     text: string;
     mode?: "update" | "read" | "edit" | undefined;
-} & Partial<Omit<ColorPickerProps, "value" | "mode">> & React.RefAttributes<any>>;
+} & Partial<Omit<ColorPickerProps, "mode" | "value">> & 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 */): "#52c41a" | "#595959" | "#ff4d4f";
+export declare function getColorByRealValue(realValue: number /** ,color: string */): "#52c41a" | "#ff4d4f" | "#595959";
 /** 获取到最后展示的数字 */
 export declare function getRealTextWithPrecision(realValue: number, precision?: number): string | number;
 /**

package/es/form/components/Digit/DigitRange.d.ts

@@ -13,7 +13,7 @@ export type ProFormDigitRangeProps = ProFormFieldItemProps<RangeInputNumberProps
     separatorWidth?: number;
 };
 declare const ForwardRefProFormDigit: React.ForwardRefExoticComponent<{
-    fieldProps?: Partial<import("../../typing").FieldProps<any> & Omit<InputNumberProps<number>, "value" | "defaultValue" | "onChange" | "placeholder"> & {
+    fieldProps?: Partial<import("../../typing").FieldProps<any> & Omit<InputNumberProps<number>, "defaultValue" | "onChange" | "value" | "placeholder"> & {
         value?: ValuePair | undefined;
         defaultValue?: ValuePair | undefined;
         onChange?: ((value?: ValuePair) => void) | 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/UploadButton/index.js

@@ -49,6 +49,11 @@ const BaseProFormUploadButton = /*#__PURE__*/React.forwardRef(({
   // 如果配置了 max ，并且 超过了文件列表的大小，就不展示按钮
   const showUploadButton = (max === undefined || !value || value?.length < max) && mode !== 'read';
   const isPictureCard = (listType ?? fieldProps?.listType) === 'picture-card';
+  // 参考 antd：不传 id 给 Upload，避免点击 label 触发 file input 打开文件选择器
+  const {
+    id: _id,
+    ...uploadFieldProps
+  } = fieldProps || {};
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(Upload, {
       action: action,
@@ -57,15 +62,15 @@ const BaseProFormUploadButton = /*#__PURE__*/React.forwardRef(({
       listType: listType || 'picture',
       fileList: value,
       onPreview: handlePreview,
-      ...fieldProps,
-      name: fieldProps?.name ?? 'file',
+      ...uploadFieldProps,
+      name: uploadFieldProps?.name ?? 'file',
       onChange: info => {
-        fieldProps?.onChange?.(info);
+        uploadFieldProps?.onChange?.(info);
       },
       children: showUploadButton && (isPictureCard ? /*#__PURE__*/_jsxs("span", {
         children: [icon, " ", title]
       }) : /*#__PURE__*/_jsxs(Button, {
-        disabled: disabled || fieldProps?.disabled,
+        disabled: disabled || uploadFieldProps?.disabled,
         ...buttonProps,
         children: [icon, title]
       }))

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/form/components/UploadDragger/index.js

@@ -29,24 +29,29 @@ const BaseProFormUploadDragger = /*#__PURE__*/React.forwardRef(({
   const baseClassName = context.getPrefixCls('upload');
   // 如果配置了 max ，并且 超过了文件列表的大小，就不展示按钮
   const showUploadButton = (max === undefined || !value || value?.length < max) && mode !== 'read' && proFieldProps?.readonly !== true;
+  // 参考 antd：不传 id 给 Upload，避免点击 label 触发 file input 打开文件选择器
+  const {
+    id: _id,
+    ...uploadFieldProps
+  } = fieldProps || {};
   return /*#__PURE__*/_jsxs(Upload.Dragger, {
     ref: ref,
     name: "files",
     action: action,
     accept: accept,
     fileList: value,
-    ...fieldProps,
+    ...uploadFieldProps,
     onChange: info => {
       onChange?.(info);
-      if (fieldProps?.onChange) {
-        fieldProps?.onChange(info);
+      if (uploadFieldProps?.onChange) {
+        uploadFieldProps?.onChange(info);
       }
     },
     style: {
       flexDirection: 'column',
       alignItems: 'center',
-      ...fieldProps?.style,
-      display: !showUploadButton ? 'none' : fieldProps?.style?.display || 'flex'
+      ...uploadFieldProps?.style,
+      display: !showUploadButton ? 'none' : uploadFieldProps?.style?.display || 'flex'
     },
     children: [/*#__PURE__*/_jsx("p", {
       className: `${baseClassName}-drag-icon`,

package/es/form/layouts/ProForm/index.d.ts

@@ -9,12 +9,12 @@ declare namespace ProForm {
     var Group: React.FC<import("src/form").GroupProps>;
     var useForm: typeof import("antd/es/form/Form").useForm;
     var Item: React.FC<import("src/form/components/FormItem").ProFormItemProps>;
-    var useWatch: typeof import("@rc-component/form").useWatch;
+    var useWatch: typeof import("antd/es/form/Form").useWatch;
     var ErrorList: React.FC<import("antd/es/form").ErrorListProps>;
     var Provider: React.FC<import("antd/es/form/context").FormProviderProps>;
     var useFormInstance: typeof import("antd/es/form/hooks/useFormInstance").default;
     var EditOrReadOnlyContext: React.Context<{
-        mode: "update" | "read" | "edit";
+        mode: "read" | "edit" | "update";
     }>;
 }
 export { ProForm };

package/es/layout/utils/getBreadcrumbProps.d.ts

@@ -1,5 +1,4 @@
 import type { BreadcrumbProps } from 'antd';
-import type H from 'history';
 import type { ProSettings } from '../defaultSettings';
 import type { ProLayoutProps } from '../ProLayout';
 import type { MenuDataItem, MessageDescriptor, WithFalse } from '../typing';
@@ -9,7 +8,7 @@ export type BreadcrumbProLayoutProps = {
         href: string;
     }[];
     home?: string;
-    location?: H.Location | {
+    location?: Location | {
         pathname?: string;
     };
     menu?: ProSettings['menu'];

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 | Iterable<React.ReactNode> | import("react/jsx-runtime").JSX.Element | null | undefined;
+export declare const renderColumnsTitle: (item: ProColumns<any>) => string | number | boolean | import("react/jsx-runtime").JSX.Element | Iterable<React.ReactNode> | null | undefined;
 /**
  * 默认的 filter 方法
  *

package/es/table/utils/columnRender.js

@@ -102,7 +102,7 @@ export function columnRender({
     prefixName,
     editableUtils
   });
-  const dom = mode === 'edit' ? textDom : genCopyable(textDom, columnProps, renderTextStr);
+  const dom = mode === 'edit' ? textDom : genCopyable(textDom, columnProps, renderTextStr, text);
 
   /** 如果是编辑模式，并且 formItemRender 存在直接走 formItemRender */
   if (mode === 'edit') {

package/es/utils/components/InlineErrorFormItem/index.js

@@ -5,8 +5,8 @@ import { clsx } from 'clsx';
 import React, { useContext, useEffect, useState } from 'react';
 import { useStyle } from "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 const FIX_INLINE_STYLE = {
   marginBlockStart: -5,
   marginBlockEnd: -5,
@@ -21,7 +21,10 @@ const InlineErrorFormItemPopover = ({
   popoverProps
 }) => {
   const [open, setOpen] = useState(false);
-  const [errorStringList, setErrorList] = useState([]);
+  const [messages, setMessages] = useState({
+    errors: [],
+    warnings: []
+  });
   const {
     getPrefixCls
   } = useContext(ConfigProvider.ConfigContext);
@@ -33,12 +36,25 @@ const InlineErrorFormItemPopover = ({
   } = useStyle(`${prefixCls}-form-item-with-help`);
   useEffect(() => {
     if (inputProps.validateStatus !== 'validating') {
-      setErrorList(inputProps.errors);
+      setMessages({
+        errors: inputProps.errors ?? [],
+        warnings: inputProps.warnings ?? []
+      });
     }
-  }, [inputProps.errors, inputProps.validateStatus]);
+  }, [inputProps.errors, inputProps.warnings, inputProps.validateStatus]);
   const loading = inputProps.validateStatus === 'validating';
+  const hasMessages = (messages.errors?.length ?? 0) + (messages.warnings?.length ?? 0) >= 1;
+  const renderMessageContent = () => /*#__PURE__*/_jsxs(_Fragment, {
+    children: [messages.errors?.map((error, index) => /*#__PURE__*/_jsx("div", {
+      className: clsx(`${prefixCls}-form-item-explain-error`, hashId),
+      children: error
+    }, `error-${index}`)), messages.warnings?.map((warning, index) => /*#__PURE__*/_jsx("div", {
+      className: clsx(`${prefixCls}-form-item-explain-warning`, hashId),
+      children: warning
+    }, `warning-${index}`))]
+  });
   return /*#__PURE__*/_jsx(Popover, {
-    open: errorStringList.length < 1 ? false : open,
+    open: !hasMessages ? false : open,
     onOpenChange: changeOpen => {
       if (changeOpen === open) return;
       setOpen(changeOpen);
@@ -55,7 +71,7 @@ const InlineErrorFormItemPopover = ({
       },
       children: /*#__PURE__*/_jsxs("div", {
         className: clsx(`${prefixCls}-form-item-with-help`, hashId, token.hashId),
-        children: [loading ? /*#__PURE__*/_jsx(LoadingOutlined, {}) : null, errorList]
+        children: [loading ? /*#__PURE__*/_jsx(LoadingOutlined, {}) : null, hasMessages ? renderMessageContent() : errorList]
       })
     })),
     ...popoverProps,

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

@@ -8,8 +8,9 @@ export type ProEllipsis = ProEllipsisTooltip | boolean;
 /**
  * 生成 Copyable 或 Ellipsis 的 dom
  *
- * @param dom
- * @param item
- * @param text
+ * @param dom 渲染后的 DOM 节点
+ * @param item 列配置
+ * @param text renderText 的返回值，可能是 string/number 或 React 元素
+ * @param copyText 用于复制的原始文本，当 renderText 返回 JSX 时避免复制 [object Object]
  */
-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;
+export declare const genCopyable: (dom: React.ReactNode, item: any, text: string | React.ReactNode, copyText?: unknown) => string | number | boolean | Iterable<React.ReactNode> | import("react/jsx-runtime").JSX.Element | null | undefined;

package/es/utils/genCopyable/index.js

@@ -23,23 +23,39 @@ const normalizeCopyText = text => {
   // (e.g. some browsers may include Typography's copy separator whitespace)
   return text === null || text === undefined ? '' : String(text).trimEnd();
 };
-const genEllipsis = (dom, item, text) => {
+const isReactElement = value => /*#__PURE__*/React.isValidElement(value);
+const genEllipsis = (dom, item, text, rawText) => {
   const ellipsis = getEllipsis(item);
-  if (!ellipsis || !text) {
+  if (!ellipsis) {
     return false;
   }
   /** 有些 valueType 需要设置copy的为string */
   const needTranText = isNeedTranText(item);
 
-  // 支持一下 tooltip 的关闭
-  if (needTranText && item?.tooltip !== false) {
+  // renderText 返回 React 元素时，使用 dom 作为 tooltip 避免 [object Object]
+  const isRenderTextReturningJsx = isReactElement(rawText);
+
+  // 支持一下 tooltip 的关闭，合并 ellipsis.tooltip 自定义属性（placement 等）
+  if ((needTranText || isRenderTextReturningJsx) && item?.tooltip !== false) {
+    const tooltipTitle = /*#__PURE__*/_jsx("div", {
+      className: "pro-table-tooltip-text",
+      children: dom
+    });
+    if (isObject(ellipsis) && isObject(ellipsis.tooltip)) {
+      return {
+        tooltip: {
+          title: tooltipTitle,
+          ...ellipsis.tooltip
+        }
+      };
+    }
     return {
-      tooltip: /*#__PURE__*/_jsx("div", {
-        className: "pro-table-tooltip-text",
-        children: dom
-      })
+      tooltip: tooltipTitle
     };
   }
+  if (!text) {
+    return false;
+  }
 
   // 如果 ellipsis 是对象且包含 tooltip 属性,合并 tooltip 的属性
   if (isObject(ellipsis) && isObject(ellipsis.tooltip)) {
@@ -58,14 +74,17 @@ const genEllipsis = (dom, item, text) => {
 /**
  * 生成 Copyable 或 Ellipsis 的 dom
  *
- * @param dom
- * @param item
- * @param text
+ * @param dom 渲染后的 DOM 节点
+ * @param item 列配置
+ * @param text renderText 的返回值，可能是 string/number 或 React 元素
+ * @param copyText 用于复制的原始文本，当 renderText 返回 JSX 时避免复制 [object Object]
  */
-export const genCopyable = (dom, item, text) => {
+export const genCopyable = (dom, item, text, copyText) => {
   if (!item.copyable && !item.ellipsis) return dom;
   const normalizedText = normalizeCopyText(text);
-  const ellipsis = genEllipsis(dom, item, normalizedText);
+  // renderText 返回 JSX 时使用原始文本避免复制 [object Object]
+  const resolvedCopyText = copyText !== undefined ? normalizeCopyText(copyText) : normalizedText;
+  const ellipsis = genEllipsis(dom, item, normalizedText, text);
 
   // `Typography.Text` with `copyable` will render an internal separator whitespace
   // between text and icon. When users "multi-click to select all" in a table cell,
@@ -88,7 +107,7 @@ export const genCopyable = (dom, item, text) => {
         title: "",
         ellipsis: ellipsis,
         children: dom
-      }), normalizedText ? /*#__PURE__*/_jsx("span", {
+      }), resolvedCopyText ? /*#__PURE__*/_jsx("span", {
         style: {
           flex: 'none',
           userSelect: 'none'
@@ -101,7 +120,7 @@ export const genCopyable = (dom, item, text) => {
           // Render icon only; no extra selectable separator text nodes.
           ,
           copyable: {
-            text: normalizedText,
+            text: resolvedCopyText,
             tooltips: ['', '']
           }
         })

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/descriptions/index.js

@@ -216,7 +216,7 @@ const schemaToDescriptionsItem = (items, entity, action, editableUtils, emptyTex
     const fieldMode = mode || isEditable ? 'edit' : 'read';
     const showEditIcon = editableUtils && fieldMode === 'read' && editable !== false && editable?.(text, entity, index) !== false;
     const Component = showEditIcon ? _antd.Space : _react.default.Fragment;
-    const contentDom = fieldMode === 'edit' ? text : (0, _utils.genCopyable)(text, item, text);
+    const contentDom = fieldMode === 'edit' ? text : (0, _utils.genCopyable)(text, item, text, defaultData);
     const key = restItem.key || restItem.label?.toString() || index;
     const label = (title || restItem.label || restItem.tooltip) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_utils.LabelIconTip, {
       label: title || restItem.label,

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

@@ -3,5 +3,5 @@ import React from 'react';
 declare const _default: React.ForwardRefExoticComponent<import("src/provider").BaseProFieldFC & import("src/provider").ProRenderFieldPropsType & {
     text: string;
     mode?: "update" | "read" | "edit" | undefined;
-} & Partial<Omit<ColorPickerProps, "value" | "mode">> & React.RefAttributes<any>>;
+} & Partial<Omit<ColorPickerProps, "mode" | "value">> & 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 */): "#52c41a" | "#595959" | "#ff4d4f";
+export declare function getColorByRealValue(realValue: number /** ,color: string */): "#52c41a" | "#ff4d4f" | "#595959";
 /** 获取到最后展示的数字 */
 export declare function getRealTextWithPrecision(realValue: number, precision?: number): string | number;
 /**

package/lib/form/components/Digit/DigitRange.d.ts

@@ -13,7 +13,7 @@ export type ProFormDigitRangeProps = ProFormFieldItemProps<RangeInputNumberProps
     separatorWidth?: number;
 };
 declare const ForwardRefProFormDigit: React.ForwardRefExoticComponent<{
-    fieldProps?: Partial<import("../../typing").FieldProps<any> & Omit<InputNumberProps<number>, "value" | "defaultValue" | "onChange" | "placeholder"> & {
+    fieldProps?: Partial<import("../../typing").FieldProps<any> & Omit<InputNumberProps<number>, "defaultValue" | "onChange" | "value" | "placeholder"> & {
         value?: ValuePair | undefined;
         defaultValue?: ValuePair | undefined;
         onChange?: ((value?: ValuePair) => void) | 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/UploadButton/index.js

@@ -55,6 +55,11 @@ const BaseProFormUploadButton = /*#__PURE__*/_react.default.forwardRef(({
   // 如果配置了 max ，并且 超过了文件列表的大小，就不展示按钮
   const showUploadButton = (max === undefined || !value || value?.length < max) && mode !== 'read';
   const isPictureCard = (listType ?? fieldProps?.listType) === 'picture-card';
+  // 参考 antd：不传 id 给 Upload，避免点击 label 触发 file input 打开文件选择器
+  const {
+    id: _id,
+    ...uploadFieldProps
+  } = fieldProps || {};
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Upload, {
       action: action,
@@ -63,15 +68,15 @@ const BaseProFormUploadButton = /*#__PURE__*/_react.default.forwardRef(({
       listType: listType || 'picture',
       fileList: value,
       onPreview: handlePreview,
-      ...fieldProps,
-      name: fieldProps?.name ?? 'file',
+      ...uploadFieldProps,
+      name: uploadFieldProps?.name ?? 'file',
       onChange: info => {
-        fieldProps?.onChange?.(info);
+        uploadFieldProps?.onChange?.(info);
       },
       children: showUploadButton && (isPictureCard ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
         children: [icon, " ", title]
       }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Button, {
-        disabled: disabled || fieldProps?.disabled,
+        disabled: disabled || uploadFieldProps?.disabled,
         ...buttonProps,
         children: [icon, title]
       }))

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/form/components/UploadDragger/index.js

@@ -36,24 +36,29 @@ const BaseProFormUploadDragger = /*#__PURE__*/_react.default.forwardRef(({
   const baseClassName = context.getPrefixCls('upload');
   // 如果配置了 max ，并且 超过了文件列表的大小，就不展示按钮
   const showUploadButton = (max === undefined || !value || value?.length < max) && mode !== 'read' && proFieldProps?.readonly !== true;
+  // 参考 antd：不传 id 给 Upload，避免点击 label 触发 file input 打开文件选择器
+  const {
+    id: _id,
+    ...uploadFieldProps
+  } = fieldProps || {};
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Upload.Dragger, {
     ref: ref,
     name: "files",
     action: action,
     accept: accept,
     fileList: value,
-    ...fieldProps,
+    ...uploadFieldProps,
     onChange: info => {
       onChange?.(info);
-      if (fieldProps?.onChange) {
-        fieldProps?.onChange(info);
+      if (uploadFieldProps?.onChange) {
+        uploadFieldProps?.onChange(info);
       }
     },
     style: {
       flexDirection: 'column',
       alignItems: 'center',
-      ...fieldProps?.style,
-      display: !showUploadButton ? 'none' : fieldProps?.style?.display || 'flex'
+      ...uploadFieldProps?.style,
+      display: !showUploadButton ? 'none' : uploadFieldProps?.style?.display || 'flex'
     },
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
       className: `${baseClassName}-drag-icon`,

package/lib/form/layouts/ProForm/index.d.ts

@@ -9,12 +9,12 @@ declare namespace ProForm {
     var Group: React.FC<import("src/form").GroupProps>;
     var useForm: typeof import("antd/es/form/Form").useForm;
     var Item: React.FC<import("src/form/components/FormItem").ProFormItemProps>;
-    var useWatch: typeof import("@rc-component/form").useWatch;
+    var useWatch: typeof import("antd/es/form/Form").useWatch;
     var ErrorList: React.FC<import("antd/es/form").ErrorListProps>;
     var Provider: React.FC<import("antd/es/form/context").FormProviderProps>;
     var useFormInstance: typeof import("antd/es/form/hooks/useFormInstance").default;
     var EditOrReadOnlyContext: React.Context<{
-        mode: "update" | "read" | "edit";
+        mode: "read" | "edit" | "update";
     }>;
 }
 export { ProForm };

package/lib/layout/utils/getBreadcrumbProps.d.ts

@@ -1,5 +1,4 @@
 import type { BreadcrumbProps } from 'antd';
-import type H from 'history';
 import type { ProSettings } from '../defaultSettings';
 import type { ProLayoutProps } from '../ProLayout';
 import type { MenuDataItem, MessageDescriptor, WithFalse } from '../typing';
@@ -9,7 +8,7 @@ export type BreadcrumbProLayoutProps = {
         href: string;
     }[];
     home?: string;
-    location?: H.Location | {
+    location?: Location | {
         pathname?: string;
     };
     menu?: ProSettings['menu'];

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

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

package/lib/table/utils/columnRender.js

@@ -112,7 +112,7 @@ function columnRender({
     prefixName,
     editableUtils
   });
-  const dom = mode === 'edit' ? textDom : (0, _utils.genCopyable)(textDom, columnProps, renderTextStr);
+  const dom = mode === 'edit' ? textDom : (0, _utils.genCopyable)(textDom, columnProps, renderTextStr, text);
 
   /** 如果是编辑模式，并且 formItemRender 存在直接走 formItemRender */
   if (mode === 'edit') {

package/lib/utils/components/InlineErrorFormItem/index.js

@@ -26,7 +26,10 @@ const InlineErrorFormItemPopover = ({
   popoverProps
 }) => {
   const [open, setOpen] = (0, _react.useState)(false);
-  const [errorStringList, setErrorList] = (0, _react.useState)([]);
+  const [messages, setMessages] = (0, _react.useState)({
+    errors: [],
+    warnings: []
+  });
   const {
     getPrefixCls
   } = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext);
@@ -38,12 +41,25 @@ const InlineErrorFormItemPopover = ({
   } = (0, _style.useStyle)(`${prefixCls}-form-item-with-help`);
   (0, _react.useEffect)(() => {
     if (inputProps.validateStatus !== 'validating') {
-      setErrorList(inputProps.errors);
+      setMessages({
+        errors: inputProps.errors ?? [],
+        warnings: inputProps.warnings ?? []
+      });
     }
-  }, [inputProps.errors, inputProps.validateStatus]);
+  }, [inputProps.errors, inputProps.warnings, inputProps.validateStatus]);
   const loading = inputProps.validateStatus === 'validating';
+  const hasMessages = (messages.errors?.length ?? 0) + (messages.warnings?.length ?? 0) >= 1;
+  const renderMessageContent = () => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+    children: [messages.errors?.map((error, index) => /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: (0, _clsx.clsx)(`${prefixCls}-form-item-explain-error`, hashId),
+      children: error
+    }, `error-${index}`)), messages.warnings?.map((warning, index) => /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: (0, _clsx.clsx)(`${prefixCls}-form-item-explain-warning`, hashId),
+      children: warning
+    }, `warning-${index}`))]
+  });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Popover, {
-    open: errorStringList.length < 1 ? false : open,
+    open: !hasMessages ? false : open,
     onOpenChange: changeOpen => {
       if (changeOpen === open) return;
       setOpen(changeOpen);
@@ -60,7 +76,7 @@ const InlineErrorFormItemPopover = ({
       },
       children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: (0, _clsx.clsx)(`${prefixCls}-form-item-with-help`, hashId, token.hashId),
-        children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.LoadingOutlined, {}) : null, errorList]
+        children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.LoadingOutlined, {}) : null, hasMessages ? renderMessageContent() : errorList]
       })
     })),
     ...popoverProps,

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

@@ -8,8 +8,9 @@ export type ProEllipsis = ProEllipsisTooltip | boolean;
 /**
  * 生成 Copyable 或 Ellipsis 的 dom
  *
- * @param dom
- * @param item
- * @param text
+ * @param dom 渲染后的 DOM 节点
+ * @param item 列配置
+ * @param text renderText 的返回值，可能是 string/number 或 React 元素
+ * @param copyText 用于复制的原始文本，当 renderText 返回 JSX 时避免复制 [object Object]
  */
-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;
+export declare const genCopyable: (dom: React.ReactNode, item: any, text: string | React.ReactNode, copyText?: unknown) => string | number | boolean | Iterable<React.ReactNode> | import("react/jsx-runtime").JSX.Element | null | undefined;