@ant-design/pro-components 3.0.1-0 → 3.1.0-0

package/es/card/ProCard.js

@@ -4,8 +4,10 @@ import Divider from "./components/Divider";
 import { jsx as _jsx } from "react/jsx-runtime";
 var Group = function Group(props) {
   return /*#__PURE__*/_jsx(Card, _objectSpread({
-    bodyStyle: {
-      padding: 0
+    styles: {
+      body: {
+        padding: 0
+      }
     }
   }, props));
 };

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
 export default function useStyle(prefixCls?: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

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

@@ -3,7 +3,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["className", "style", "bodyStyle", "headStyle", "title", "subTitle", "extra", "wrap", "layout", "loading", "gutter", "tooltip", "split", "headerBordered", "variant", "boxShadow", "children", "size", "actions", "ghost", "hoverable", "direction", "collapsed", "collapsible", "collapsibleIconRender", "colStyle", "defaultCollapsed", "onCollapse", "checked", "onChecked", "tabs", "type"];
+var _excluded = ["className", "style", "bodyStyle", "headStyle", "styles", "title", "subTitle", "extra", "wrap", "layout", "loading", "gutter", "tooltip", "split", "headerBordered", "variant", "boxShadow", "children", "size", "actions", "ghost", "hoverable", "direction", "collapsed", "collapsible", "collapsibleIconRender", "colStyle", "defaultCollapsed", "onCollapse", "checked", "onChecked", "tabs", "type"];
 import { RightOutlined } from '@ant-design/icons';
 import { omit, useMergedState } from '@rc-component/util';
 import { ConfigProvider, Tabs } from 'antd';
@@ -22,6 +22,7 @@ var Card = /*#__PURE__*/React.forwardRef(function (props, ref) {
     style = props.style,
     bodyStyle = props.bodyStyle,
     headStyle = props.headStyle,
+    styles = props.styles,
     title = props.title,
     subTitle = props.subTitle,
     extra = props.extra,
@@ -182,10 +183,13 @@ var Card = /*#__PURE__*/React.forwardRef(function (props, ref) {
   });
   var cardCls = classNames("".concat(prefixCls), className, hashId, (_classNames2 = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_classNames2, "".concat(prefixCls, "-border"), variant === 'outlined'), "".concat(prefixCls, "-box-shadow"), boxShadow), "".concat(prefixCls, "-contain-card"), containProCard), "".concat(prefixCls, "-loading"), loading), "".concat(prefixCls, "-split"), split === 'vertical' || split === 'horizontal'), "".concat(prefixCls, "-ghost"), ghost), "".concat(prefixCls, "-hoverable"), hoverable), "".concat(prefixCls, "-size-").concat(size), size), "".concat(prefixCls, "-type-").concat(type), type), "".concat(prefixCls, "-collapse"), collapsed), _defineProperty(_classNames2, "".concat(prefixCls, "-checked"), checked)));
   var bodyCls = classNames("".concat(prefixCls, "-body"), hashId, _defineProperty(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-body-center"), layout === 'center'), "".concat(prefixCls, "-body-direction-column"), split === 'horizontal' || direction === 'column'), "".concat(prefixCls, "-body-wrap"), wrap && containProCard));
-  var cardBodyStyle = bodyStyle;
+
+  // 支持新的 styles API，同时保持向后兼容
+  var cardBodyStyle = (styles === null || styles === void 0 ? void 0 : styles.body) || bodyStyle;
+  var cardHeadStyle = (styles === null || styles === void 0 ? void 0 : styles.header) || headStyle;
   var loadingDOM = /*#__PURE__*/React.isValidElement(loading) ? loading : /*#__PURE__*/_jsx(Loading, {
     prefix: prefixCls,
-    style: (bodyStyle === null || bodyStyle === void 0 ? void 0 : bodyStyle.padding) === 0 || (bodyStyle === null || bodyStyle === void 0 ? void 0 : bodyStyle.padding) === '0px' ? {
+    style: (cardBodyStyle === null || cardBodyStyle === void 0 ? void 0 : cardBodyStyle.padding) === 0 || (cardBodyStyle === null || cardBodyStyle === void 0 ? void 0 : cardBodyStyle.padding) === '0px' ? {
       padding: 24
     } : undefined
   });
@@ -211,7 +215,7 @@ var Card = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }, omit(rest, ['prefixCls', 'colSpan'])), {}, {
     children: [(title || extra || collapsibleButton) && /*#__PURE__*/_jsxs("div", {
       className: classNames("".concat(prefixCls, "-header"), hashId, _defineProperty(_defineProperty({}, "".concat(prefixCls, "-header-border"), headerBordered || type === 'inner'), "".concat(prefixCls, "-header-collapsible"), collapsibleButton)),
-      style: headStyle,
+      style: cardHeadStyle,
       onClick: function onClick() {
         if (collapsible === 'header' || collapsible === true) setCollapsed(!collapsed);
       },

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
 export default function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

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

@@ -140,6 +140,12 @@ interface CheckCardProps {
      * Custom style for the content area.
      */
     bodyStyle?: React.CSSProperties;
+    /**
+     * Styles configuration.
+     */
+    styles?: {
+        body?: React.CSSProperties;
+    };
     /**
      * The action area in the bottom right corner.
      */

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

@@ -17,6 +17,7 @@ import { useStyle } from "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var CheckCard = function CheckCard(props) {
+  var _props$styles;
   var _useMountMergeState = useMountMergeState(props.defaultChecked || false, {
       value: props.checked,
       onChange: props.onChange
@@ -166,7 +167,7 @@ var CheckCard = function CheckCard(props) {
     onMouseEnter: props.onMouseEnter,
     children: [metaDom, props.children ? /*#__PURE__*/_jsx("div", {
       className: classNames("".concat(prefixCls, "-body"), hashId),
-      style: props.bodyStyle,
+      style: ((_props$styles = props.styles) === null || _props$styles === void 0 ? void 0 : _props$styles.body) || props.bodyStyle,
       children: props.children
     }) : null, props.actions ? /*#__PURE__*/_jsx(ProCardActions, {
       actions: props.actions,

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

@@ -6,6 +6,6 @@ export interface ProListToken extends ProAliasToken {
 }
 export declare const cardLoading: Keyframes;
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
 export default function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

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

@@ -6,6 +6,6 @@ export interface ProToken extends ProAliasToken {
 }
 export declare const cardLoading: Keyframes;
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

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

@@ -4,6 +4,6 @@ export interface ProToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

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

@@ -4,6 +4,6 @@ export interface ProListToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

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

@@ -33,13 +33,9 @@ var genProStyle = function genProStyle(token) {
         transform: 'rotate(180deg)'
       }
     },
-    '&-content': _defineProperty({
+    '&-content': {
       width: '100%'
-    }, "".concat(token.antCls, "-statistic-content"), {
-      '&-value-int': {
-        fontSize: token.fontSizeHeading3
-      }
-    }),
+    },
     '&-description': {
       width: '100%'
     }

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

@@ -59,8 +59,10 @@ var StatisticCard = function StatisticCard(props) {
 };
 var Group = function Group(props) {
   return /*#__PURE__*/_jsx(StatisticCard, _objectSpread({
-    bodyStyle: {
-      padding: 0
+    styles: {
+      body: {
+        padding: 0
+      }
     }
   }, props));
 };

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

@@ -4,6 +4,6 @@ export interface ProListToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/es/card/typing.d.ts

@@ -10,6 +10,11 @@ type CardPropsBase = {
     headStyle?: React.CSSProperties;
     /** 内容样式 */
     bodyStyle?: React.CSSProperties;
+    /** 样式配置 */
+    styles?: {
+        header?: React.CSSProperties;
+        body?: React.CSSProperties;
+    };
     /** 页头是否有分割线 */
     headerBordered?: boolean;
     /** 卡片标题 */

package/es/descriptions/index.js

@@ -171,7 +171,8 @@ export var FieldRender = function FieldRender(props) {
       marginTop: -5,
       marginBottom: -5,
       marginLeft: 0,
-      marginRight: 0
+      marginRight: 0,
+      width: '100%'
     },
     children: renderDom()
   });

package/es/field/ValueTypeToComponent.js

@@ -754,22 +754,22 @@ var ValueTypeToComponentMap = {
     render: function render(text, props) {
       var fieldProps = pickProProps(props.fieldProps);
       var placeholder = typeof props.placeholder === 'string' ? props.placeholder : undefined;
-      return /*#__PURE__*/_jsx(FieldCascader, {
+      return /*#__PURE__*/_jsx(FieldCascader, _objectSpread(_objectSpread({}, props), {}, {
         mode: props.mode,
         text: text,
         placeholder: placeholder,
         fieldProps: fieldProps
-      });
+      }));
     },
     formItemRender: function formItemRender(text, props) {
       var fieldProps = pickProProps(props.fieldProps);
       var placeholder = typeof props.placeholder === 'string' ? props.placeholder : undefined;
-      return /*#__PURE__*/_jsx(FieldCascader, {
+      return /*#__PURE__*/_jsx(FieldCascader, _objectSpread(_objectSpread({}, props), {}, {
         mode: props.mode,
         text: text,
         placeholder: placeholder,
         fieldProps: fieldProps
-      });
+      }));
     }
   },
   treeSelect: {

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

@@ -21,7 +21,6 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
     fieldProps?: any;
     variant?: "filled" | "outlined" | "borderless" | undefined;
     id?: string | undefined;
-    children?: React.ReactNode;
     defaultKeyWords?: string | undefined;
 } & import("../../PureProField").ProFieldLightProps & React.RefAttributes<any>>;
 export default _default;

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

@@ -17,7 +17,6 @@ declare const _default: React.ForwardRefExoticComponent<import("src/provider").B
     fieldProps?: any;
     variant?: "filled" | "outlined" | "borderless" | undefined;
     id?: string | undefined;
-    children?: React.ReactNode;
     defaultKeyWords?: string | undefined;
 } & import("../../PureProField").ProFieldLightProps & React.RefAttributes<any>>;
 export default _default;

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 */): "#595959" | "#52c41a" | "#ff4d4f";
 /** 获取到最后展示的数字 */
 export declare function getRealTextWithPrecision(realValue: number, precision?: number): string | number;
 /**

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

@@ -17,7 +17,6 @@ declare const _default: React.ForwardRefExoticComponent<import("src/provider").B
     fieldProps?: any;
     variant?: "filled" | "outlined" | "borderless" | undefined;
     id?: string | undefined;
-    children?: React.ReactNode;
     defaultKeyWords?: string | undefined;
 } & import("../../PureProField").ProFieldLightProps & React.RefAttributes<any>>;
 export default _default;

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

@@ -11,7 +11,6 @@ declare const _default: React.ForwardRefExoticComponent<import("src/provider").B
     fieldProps?: any;
     variant?: "filled" | "outlined" | "borderless" | undefined;
     id?: string | undefined;
-    children?: React.ReactNode;
     defaultKeyWords?: string | undefined;
 } & import("../../PureProField").ProFieldLightProps & React.RefAttributes<any>>;
 export default _default;

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

@@ -3,7 +3,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
-var _excluded = ["label", "prefixCls", "onChange", "value", "mode", "children", "defaultValue", "size", "showSearch", "disabled", "style", "className", "options", "onSearch", "allowClear", "labelInValue", "fieldNames", "lightLabel", "labelTrigger", "optionFilterProp", "optionLabelProp", "valueMaxLength", "fetchDataOnSearch", "fetchData", "variant"];
+var _excluded = ["label", "prefixCls", "onChange", "value", "mode", "defaultValue", "size", "showSearch", "disabled", "style", "className", "options", "onSearch", "allowClear", "labelInValue", "fieldNames", "lightLabel", "labelTrigger", "optionFilterProp", "optionLabelProp", "valueMaxLength", "fetchDataOnSearch", "fetchData", "variant"];
 import { SearchOutlined } from '@ant-design/icons';
 import { toArray } from '@rc-component/util';
 import { ConfigProvider, Input, Select } from 'antd';
@@ -30,7 +30,6 @@ export var LightSelect = function LightSelect(props, ref) {
     _onChange = props.onChange,
     value = props.value,
     mode = props.mode,
-    children = props.children,
     defaultValue = props.defaultValue,
     size = props.size,
     showSearch = props.showSearch,

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

@@ -1,7 +1,12 @@
 import type { SelectProps } from 'antd';
-import type { LabeledValue } from 'antd/lib/select';
 import React from 'react';
 import type { RequestOptionsType } from '../../../../utils';
+export type LabeledValue = {
+    key?: string;
+    label: React.ReactNode;
+    value: string | number;
+};
+export type DefaultOptionType = NonNullable<SelectProps['options']>[number];
 export type KeyLabel = Partial<LabeledValue> & RequestOptionsType;
 /** 用户扩展数据后的值类型 */
 export type DataValueType<T> = KeyLabel & T;

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

@@ -1,4 +1,6 @@
+import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
@@ -45,7 +47,7 @@ var SearchSelect = function SearchSelect(props, ref) {
     fieldNames = props.fieldNames,
     defaultSearchValue = props.defaultSearchValue,
     _props$preserveOrigin = props.preserveOriginalLabel,
-    preserveOriginalLabel = _props$preserveOrigin === void 0 ? false : _props$preserveOrigin,
+    _preserveOriginalLabel = _props$preserveOrigin === void 0 ? false : _props$preserveOrigin,
     restProps = _objectWithoutProperties(props, _excluded);
   var _ref = fieldNames || {},
     _ref$label = _ref.label,
@@ -78,6 +80,40 @@ var SearchSelect = function SearchSelect(props, ref) {
   // 兼容 renderXXX API。
 
   var classString = classNames(prefixCls, className, _defineProperty({}, "".concat(prefixCls, "-disabled"), disabled));
+
+  // 获取原始 label 的辅助函数
+  var getOriginalLabel = function getOriginalLabel(item, fallbackValue) {
+    // 优先使用 dataItem.label（原始字符串），避免使用 value.label（可能是 optionItemRender 渲染的组件）
+    if (item && typeof item.label === 'string' && item.label) {
+      return item.label;
+    }
+    if (item && item.text && typeof item.text === 'string') {
+      return item.text;
+    }
+    if (item && item.label) {
+      return String(item.label);
+    }
+    if (item && item.text) {
+      return String(item.text);
+    }
+    // 如果 dataItem 不存在，尝试从 value 中提取原始 label
+    // 但 value.label 可能是组件，需要从组件中提取原始 label
+    if (fallbackValue && fallbackValue.label) {
+      // 如果是 React 元素（Highlight 组件），尝试提取其 props.label
+      // 检查多种可能的 React 元素格式
+      var labelValue = fallbackValue.label;
+      if (( /*#__PURE__*/React.isValidElement(labelValue) || labelValue && _typeof(labelValue) === 'object' && 'props' in labelValue) && labelValue.props && labelValue.props.label) {
+        return String(labelValue.props.label);
+      }
+      // 如果是字符串，直接返回
+      if (typeof labelValue === 'string') {
+        return labelValue;
+      }
+      // 最后尝试转换为字符串
+      return String(labelValue);
+    }
+    return '';
+  };
   var getMergeValue = function getMergeValue(value, option) {
     if (Array.isArray(value) && Array.isArray(option) && value.length > 0) {
       // 多选情况且用户有选择
@@ -85,8 +121,9 @@ var SearchSelect = function SearchSelect(props, ref) {
       return value.map(function (item, index) {
         var optionItem = option === null || option === void 0 ? void 0 : option[index];
         var dataItem = optionItem === null || optionItem === void 0 ? void 0 : optionItem['data-item'];
+        var originalLabel = getOriginalLabel(dataItem, item);
         return _objectSpread(_objectSpread(_objectSpread({}, dataItem || {}), item), {}, {
-          label: preserveOriginalLabel && dataItem ? dataItem.label : item.label
+          label: originalLabel || item.label
         });
       });
     }
@@ -94,12 +131,14 @@ var SearchSelect = function SearchSelect(props, ref) {
   };
   var genOptions = function genOptions(mapOptions) {
     return mapOptions.map(function (item, index) {
-      var _item$optionsPropsNam;
+      var _item$labelPropsName, _item$optionsPropsNam;
       var _ref2 = item,
         itemClassName = _ref2.className,
         optionType = _ref2.optionType,
         resetItem = _objectWithoutProperties(_ref2, _excluded2);
-      var label = item[labelPropsName];
+
+      // 获取 label，优先使用 labelPropsName，如果没有则使用 text（valueEnum 的情况）
+      var label = (_item$labelPropsName = item[labelPropsName]) !== null && _item$labelPropsName !== void 0 ? _item$labelPropsName : item.text;
       var value = item[valuePropsName];
       var itemOptions = (_item$optionsPropsNam = item[optionsPropsName]) !== null && _item$optionsPropsNam !== void 0 ? _item$optionsPropsNam : [];
       if (optionType === 'optGroup' || item.options) {
@@ -140,18 +179,25 @@ var SearchSelect = function SearchSelect(props, ref) {
       _onClear === null || _onClear === void 0 || _onClear();
       fetchData(undefined);
       if (showSearch) {
-        setSearchValue(undefined);
+        onSearch === null || onSearch === void 0 || onSearch('');
+        setSearchValue('');
       }
     }
   }, restProps), {}, {
     filterOption: restProps.filterOption == false ? false : function (inputValue, option) {
-      var _option$data_title, _option$optionFilterP;
+      var _option$data_title, _option;
+      // 当 inputValue 为空或 searchValue 为空时，显示所有选项
+      // 这样可以确保 searchOnFocus 时能够显示所有选项
+      var effectiveSearchValue = searchValue === '' ? '' : inputValue || searchValue;
+      if (!effectiveSearchValue) {
+        return true;
+      }
       if (restProps.filterOption && typeof restProps.filterOption === 'function') {
-        return restProps.filterOption(inputValue, _objectSpread(_objectSpread({}, option), {}, {
+        return restProps.filterOption(effectiveSearchValue, _objectSpread(_objectSpread({}, option), {}, {
           label: option === null || option === void 0 ? void 0 : option.data_title
         }));
       }
-      return !!(option !== null && option !== void 0 && (_option$data_title = option.data_title) !== null && _option$data_title !== void 0 && _option$data_title.toString().toLowerCase().includes(inputValue.toLowerCase()) || option !== null && option !== void 0 && (_option$optionFilterP = option[optionFilterProp]) !== null && _option$optionFilterP !== void 0 && _option$optionFilterP.toString().toLowerCase().includes(inputValue.toLowerCase()));
+      return !!(option !== null && option !== void 0 && (_option$data_title = option.data_title) !== null && _option$data_title !== void 0 && _option$data_title.toString().toLowerCase().includes(effectiveSearchValue.toLowerCase()) || option !== null && option !== void 0 && (_option = option[optionFilterProp]) !== null && _option !== void 0 && _option.toString().toLowerCase().includes(effectiveSearchValue.toLowerCase()));
     } // 这里使用pro-components的过滤逻辑
     ,
     onSearch: showSearch ? function (value) {
@@ -166,7 +212,7 @@ var SearchSelect = function SearchSelect(props, ref) {
       if (showSearch && autoClearSearchValue) {
         fetchData(undefined);
         onSearch === null || onSearch === void 0 || onSearch('');
-        setSearchValue(undefined);
+        setSearchValue('');
       } else if (showSearch && !autoClearSearchValue) {
         // 当 autoClearSearchValue 为 false 时，保持搜索值不变
         // 但是需要确保我们的状态与 Ant Design 的内部状态同步
@@ -187,16 +233,50 @@ var SearchSelect = function SearchSelect(props, ref) {
       if (mode !== 'multiple' && !Array.isArray(optionList)) {
         // 单选情况且用户选择了选项
         var dataItem = optionList && optionList['data-item'];
+
+        // 如果 dataItem 不存在，尝试从 options 中查找对应的原始数据
+        var foundDataItem = dataItem;
+        if (!foundDataItem && value && options) {
+          var _value$valuePropsName;
+          var optionValue = (_value$valuePropsName = value[valuePropsName]) !== null && _value$valuePropsName !== void 0 ? _value$valuePropsName : value.value;
+          var findDataItem = function findDataItem(opts) {
+            var _iterator = _createForOfIteratorHelper(opts),
+              _step;
+            try {
+              for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                var _opt$valuePropsName;
+                var opt = _step.value;
+                var optValue = (_opt$valuePropsName = opt[valuePropsName]) !== null && _opt$valuePropsName !== void 0 ? _opt$valuePropsName : opt.value;
+                if (optValue === optionValue) {
+                  return opt;
+                }
+                if (opt[optionsPropsName] || opt.options) {
+                  var found = findDataItem(opt[optionsPropsName] || opt.options || []);
+                  if (found) return found;
+                }
+              }
+            } catch (err) {
+              _iterator.e(err);
+            } finally {
+              _iterator.f();
+            }
+            return null;
+          };
+          foundDataItem = findDataItem(options);
+        }
+
         // 如果value值为空则是清空时产生的回调,直接传值就可以了
-        if (!value || !dataItem) {
+        if (!value || !foundDataItem) {
+          var originalLabel = getOriginalLabel(foundDataItem, value);
           var changedValue = value ? _objectSpread(_objectSpread({}, value), {}, {
-            // 这里有一种情况，如果用户使用了 request和labelInValue，保存之后，刷新页面，正常回显，但是再次添加会出现 label 丢失的情况。所以需要兼容
-            label: preserveOriginalLabel && dataItem ? (dataItem === null || dataItem === void 0 ? void 0 : dataItem.label) || value.label : value.label
+            label: originalLabel
           }) : value;
           _onChange === null || _onChange === void 0 || _onChange.apply(void 0, [changedValue, optionList].concat(rest));
         } else {
-          _onChange === null || _onChange === void 0 || _onChange.apply(void 0, [_objectSpread(_objectSpread(_objectSpread({}, value), dataItem), {}, {
-            label: preserveOriginalLabel && dataItem ? dataItem.label : value.label
+          // 确保使用 dataItem.label（原始字符串），避免使用 value.label（可能是 optionItemRender 渲染的组件）
+          var _originalLabel = getOriginalLabel(foundDataItem, value);
+          _onChange === null || _onChange === void 0 || _onChange.apply(void 0, [_objectSpread(_objectSpread(_objectSpread({}, value), foundDataItem), {}, {
+            label: _originalLabel
           }), optionList].concat(rest));
         }
         return;
@@ -210,7 +290,13 @@ var SearchSelect = function SearchSelect(props, ref) {
     },
     onFocus: function onFocus(e) {
       if (searchOnFocus) {
-        fetchData(searchValue);
+        // 当 searchOnFocus 为 true 时，应该清空搜索关键词以显示所有选项
+        fetchData(undefined);
+        // 同时清空搜索值
+        if (showSearch) {
+          onSearch === null || onSearch === void 0 || onSearch('');
+          setSearchValue('');
+        }
       }
       _onFocus === null || _onFocus === void 0 || _onFocus(e);
     },

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

@@ -1,5 +1,4 @@
 import type { SelectProps } from 'antd';
-import type { ReactNode } from 'react';
 import React from 'react';
 import { ProFieldRequestData, ProFieldValueEnumType, RequestOptionsType } from '../../../utils';
 import type { ProFieldLightProps } from '../../PureProField';
@@ -18,7 +17,6 @@ export type FieldSelectProps<FieldProps = any> = {
     fieldProps?: FieldProps;
     variant?: 'outlined' | 'filled' | 'borderless';
     id?: string;
-    children?: ReactNode;
     /** 默认搜素条件 */
     defaultKeyWords?: string;
 } & ProFieldLightProps;
@@ -47,7 +45,6 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
     fieldProps?: any;
     variant?: "filled" | "outlined" | "borderless" | undefined;
     id?: string | undefined;
-    children?: ReactNode;
     /** 默认搜素条件 */
     defaultKeyWords?: string | undefined;
 } & ProFieldLightProps & Pick<SelectProps<any, import("antd/es/select").DefaultOptionType>, "style" | "className" | "fieldNames"> & React.RefAttributes<any>>;

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

@@ -5,7 +5,7 @@ import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 var _excluded = ["value", "text"],
-  _excluded2 = ["mode", "valueEnum", "render", "formItemRender", "request", "fieldProps", "plain", "children", "light", "proFieldKey", "params", "label", "variant", "id", "lightLabel", "labelTrigger"];
+  _excluded2 = ["mode", "valueEnum", "render", "formItemRender", "request", "fieldProps", "light", "proFieldKey", "params", "label", "variant", "id", "lightLabel", "labelTrigger"];
 import { ConfigProvider, Spin } from 'antd';
 import React, { useContext, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import useSWR from 'swr';
@@ -261,8 +261,6 @@ var FieldSelect = function FieldSelect(props, ref) {
     formItemRender = props.formItemRender,
     request = props.request,
     fieldProps = props.fieldProps,
-    plain = props.plain,
-    children = props.children,
     light = props.light,
     proFieldKey = props.proFieldKey,
     params = props.params,
@@ -368,6 +366,10 @@ var FieldSelect = function FieldSelect(props, ref) {
         fetchData: function fetchData(keyWord) {
           keyWordsRef.current = keyWord !== null && keyWord !== void 0 ? keyWord : '';
           _fetchData(keyWord);
+          // 当 keyWord 为 undefined 时，清空 keyWordsRef 以确保 filterOption 不进行过滤
+          if (keyWord === undefined) {
+            keyWordsRef.current = '';
+          }
         },
         resetData: resetData,
         optionItemRender: function optionItemRender(item) {

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

@@ -27,7 +27,6 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
     fieldProps?: any;
     variant?: "filled" | "outlined" | "borderless" | undefined;
     id?: string | undefined;
-    children?: React.ReactNode;
     defaultKeyWords?: string | undefined;
 } & import("../../PureProField").ProFieldLightProps & React.RefAttributes<any>>;
 export default _default;

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

@@ -6,7 +6,10 @@ import type { FieldProps, ProFormGridConfig, ProFormGroupProps } from '../typing
 import type { SubmitterProps } from './Submitter';
 export type ProFormInstance<T = any> = FormInstance<T> & ProFormInstanceType<T>;
 type ProFormRef<T> = ProFormInstance<T> & {
+    /** 原生 DOM 元素引用 */
     nativeElement?: HTMLElement;
+    /** 聚焦方法 */
+    focus?: () => void;
 };
 export type CommonFormProps<T = Record<string, any>, U = Record<string, any>> = {
     /**