@ant-design/pro-components 3.1.12-0 → 3.1.13-0

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

@@ -0,0 +1,17 @@
+import type { GetRef, SelectProps } from 'antd';
+import { Select } from 'antd';
+import React from 'react';
+import type { IntlType } from '../../../provider';
+import type { RequestOptionsType } from '../../../utils';
+import type { ProFieldFC } from '../../types';
+import type { FieldSelectProps } from './types';
+export type FieldSelectFullProps = FieldSelectProps & Pick<SelectProps, 'fieldNames' | 'style' | 'className'>;
+export type FieldSelectSearchEditProps = Parameters<ProFieldFC<FieldSelectFullProps>>[0] & {
+    intl: IntlType;
+    loading: boolean;
+    options: RequestOptionsType[];
+    fetchData: (keyWord?: string) => void;
+    resetData: () => void;
+    inputRef: React.RefObject<GetRef<typeof Select>>;
+};
+export declare function FieldSelectSearchEdit(props: FieldSelectSearchEditProps): React.JSX.Element;

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

@@ -0,0 +1,57 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FieldSelectSearchEdit = FieldSelectSearchEdit;
+var _antd = require("antd");
+var _react = _interopRequireDefault(require("react"));
+var _SearchSelect = _interopRequireDefault(require("./SearchSelect"));
+var _jsxRuntime = require("react/jsx-runtime");
+function FieldSelectSearchEdit(props) {
+  const {
+    mode,
+    formItemRender,
+    fieldProps,
+    id,
+    label,
+    intl,
+    loading,
+    options,
+    fetchData,
+    resetData,
+    inputRef,
+    ...rest
+  } = props;
+  const dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_SearchSelect.default, {
+    className: rest.className,
+    style: {
+      minWidth: 100,
+      ...rest.style
+    },
+    id: id,
+    loading: loading,
+    ref: inputRef,
+    allowClear: true,
+    defaultSearchValue: props.defaultKeyWords,
+    notFoundContent: loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Spin, {
+      size: "small"
+    }) : fieldProps?.notFoundContent,
+    fetchData: fetchData,
+    resetData: resetData,
+    placeholder: intl.getMessage('tableForm.selectPlaceholder', '请选择'),
+    label: label,
+    ...fieldProps,
+    options: options
+  }, "SearchSelect");
+  if (formItemRender) {
+    return formItemRender(rest.text, {
+      mode,
+      ...fieldProps,
+      options,
+      loading
+    }, dom) ?? null;
+  }
+  return dom;
+}

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

@@ -1,6 +1,6 @@
 import type { SelectProps } from 'antd';
 import React from 'react';
-import type { ProFieldLightProps } from '../../../PureProField';
+import type { ProFieldLightProps } from '../../../types';
 export type LightSelectProps = {
     label?: string;
     placeholder?: any;
@@ -31,7 +31,7 @@ declare const _default: React.ForwardRefExoticComponent<SelectProps<any, import(
      */
     fetchDataOnSearch?: boolean | undefined;
     /** 变体类型 */
-    variant?: "outlined" | "filled" | "borderless" | "underlined" | undefined;
-    labelVariant?: "outlined" | "filled" | "borderless" | "underlined" | undefined;
+    variant?: "outlined" | "borderless" | "filled" | "underlined" | undefined;
+    labelVariant?: "outlined" | "borderless" | "filled" | "underlined" | undefined;
 } & ProFieldLightProps & SelectProps<any, import("antd/es/select").DefaultOptionType> & React.RefAttributes<any>>;
 export default _default;

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

@@ -19,8 +19,6 @@ export interface SearchSelectProps<T = Record<string, any>> extends Omit<SelectP
     request?: (params: {
         query: string;
     }) => Promise<DataValueType<T>[]>;
-    /** 自定义选项渲染 */
-    optionItemRender?: (item: DataValueType<T>) => React.ReactNode;
     /** 指定组件中的值 */
     value?: KeyLabel | KeyLabel[];
     /** 指定默认选中的条目 */
@@ -74,12 +72,6 @@ export interface SearchSelectProps<T = Record<string, any>> extends Omit<SelectP
     fetchDataOnSearch?: boolean;
     /** 默认搜索关键词 */
     defaultSearchValue?: string;
-    /**
-     * 在选择时保留选项的原始标签文本
-     * 当设置为 true 时，选中后回填的内容将使用选项的原始 label，而不是经过 optionItemRender 处理后的内容
-     * @default false
-     */
-    preserveOriginalLabel?: boolean;
 }
 declare const _default: React.ForwardRefExoticComponent<SearchSelectProps<unknown[]> & React.RefAttributes<unknown>>;
 export default _default;

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

@@ -19,7 +19,6 @@ var _jsxRuntime = require("react/jsx-runtime");
 
 const SearchSelect = (props, ref) => {
   const {
-    optionItemRender,
     mode,
     onSearch,
     onFocus,
@@ -41,7 +40,6 @@ const SearchSelect = (props, ref) => {
     showSearch,
     fieldNames,
     defaultSearchValue,
-    preserveOriginalLabel: _preserveOriginalLabel = false,
     ...restProps
   } = props;
   const {
@@ -71,33 +69,21 @@ const SearchSelect = (props, ref) => {
   // 获取原始 label 的辅助函数
   const getOriginalLabel = (item, fallbackValue) => {
     // 优先使用 dataItem.label（原始字符串），避免使用 value.label（可能是 optionItemRender 渲染的组件）
-    if (item && typeof item.label === 'string' && item.label) {
+    if (item?.label && typeof item.label === 'string') {
       return item.label;
     }
-    if (item && item.text && typeof item.text === 'string') {
+    if (item?.text && typeof item.text === 'string') {
       return item.text;
     }
-    if (item && item.label) {
+    if (item?.label) {
       return String(item.label);
     }
-    if (item && item.text) {
+    if (item?.text) {
       return String(item.text);
     }
     // 如果 dataItem 不存在，尝试从 value 中提取原始 label
-    // 但 value.label 可能是组件，需要从组件中提取原始 label
-    if (fallbackValue && fallbackValue.label) {
-      // 如果是 React 元素（Highlight 组件），尝试提取其 props.label
-      // 检查多种可能的 React 元素格式
-      const labelValue = fallbackValue.label;
-      if (( /*#__PURE__*/_react.default.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);
+    if (fallbackValue?.label) {
+      return fallbackValue.label;
     }
     return '';
   };
@@ -132,7 +118,7 @@ const SearchSelect = (props, ref) => {
       const itemOptions = item[optionsPropsName] ?? [];
       if (optionType === 'optGroup' || item.options) {
         return {
-          label: label,
+          label,
           ...resetItem,
           data_title: label,
           title: label,
@@ -149,7 +135,7 @@ const SearchSelect = (props, ref) => {
         key: value ?? `${label?.toString()}-${index}-${(0, _utils.nanoid)()}`,
         'data-item': item,
         className: `${prefixCls}-option ${itemClassName || ''}`.trim(),
-        label: optionItemRender?.(item) || label
+        label
       };
     });
   };

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

@@ -1,25 +1,9 @@
 import type { SelectProps } from 'antd';
 import React from 'react';
-import { ProFieldRequestData, ProFieldValueEnumType, RequestOptionsType } from '../../../utils';
-import type { ProFieldLightProps } from '../../PureProField';
+import { ProFieldValueEnumType, RequestOptionsType } from '../../../utils';
+import type { FieldSelectProps } from './types';
+export type { FieldSelectProps };
 type SelectOptionType = Partial<RequestOptionsType>[];
-export type FieldSelectProps<FieldProps = any> = {
-    text: string;
-    /** 值的枚举，如果存在枚举，Search 中会生成 select */
-    valueEnum?: ProFieldValueEnumType;
-    /** 防抖动时间 默认10 单位ms */
-    debounceTime?: number;
-    /** 从服务器读取选项 */
-    request?: ProFieldRequestData;
-    /** 重新触发的时机 */
-    params?: any;
-    /** 组件的全局设置 */
-    fieldProps?: FieldProps;
-    variant?: 'outlined' | 'filled' | 'borderless';
-    id?: string;
-    /** 默认搜素条件 */
-    defaultKeyWords?: string;
-} & ProFieldLightProps;
 /**
  * 把 value 的枚举转化为数组
  *
@@ -33,19 +17,13 @@ export declare const useFieldFetchData: (props: FieldSelectProps & {
 }) => [boolean, SelectOptionType, (keyWord?: string) => void, () => void];
 declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
     text: string;
-    /** 值的枚举，如果存在枚举，Search 中会生成 select */
     valueEnum?: ProFieldValueEnumType | undefined;
-    /** 防抖动时间 默认10 单位ms */
     debounceTime?: number | undefined;
-    /** 从服务器读取选项 */
-    request?: ProFieldRequestData | undefined;
-    /** 重新触发的时机 */
+    request?: import("src/utils/typing").ProFieldRequestData | undefined;
     params?: any;
-    /** 组件的全局设置 */
     fieldProps?: any;
-    variant?: "outlined" | "filled" | "borderless" | undefined;
+    variant?: "outlined" | "borderless" | "filled" | undefined;
     id?: string | undefined;
-    /** 默认搜素条件 */
     defaultKeyWords?: string | undefined;
-} & ProFieldLightProps & Pick<SelectProps<any, import("antd/es/select").DefaultOptionType>, "style" | "className" | "fieldNames"> & React.RefAttributes<any>>;
+} & import("../../types").ProFieldLightProps & Pick<SelectProps<any, import("antd/es/select").DefaultOptionType>, "style" | "className" | "fieldNames"> & React.RefAttributes<any>>;
 export default _default;

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

@@ -12,57 +12,11 @@ var _react = _interopRequireWildcard(require("react"));
 var _swr = _interopRequireDefault(require("swr"));
 var _provider = require("../../../provider");
 var _utils = require("../../../utils");
-var _LightSelect = _interopRequireDefault(require("./LightSelect"));
-var _SearchSelect = _interopRequireDefault(require("./SearchSelect"));
+var _fieldMode = require("../../internal/fieldMode");
+var _FieldSelectLightEdit = require("./FieldSelectLightEdit");
+var _FieldSelectRead = require("./FieldSelectRead");
+var _FieldSelectSearchEdit = require("./FieldSelectSearchEdit");
 var _jsxRuntime = require("react/jsx-runtime");
-const Highlight = ({
-  label,
-  words
-}) => {
-  const {
-    getPrefixCls
-  } = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext);
-  const lightCls = getPrefixCls('pro-select-item-option-content-light');
-  const optionCls = getPrefixCls('pro-select-item-option-content');
-
-  // css
-  const {
-    wrapSSR
-  } = (0, _utils.useStyle)('Highlight', token => {
-    return {
-      [`.${lightCls}`]: {
-        color: token.colorPrimary
-      },
-      [`.${optionCls}`]: {
-        flex: 'auto',
-        overflow: 'hidden',
-        whiteSpace: 'nowrap',
-        textOverflow: 'ellipsis'
-      }
-    };
-  });
-  const matchKeywordsRE = new RegExp(words.map(word => word.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&')).join('|'), 'gi');
-  let matchText = label;
-  const elements = [];
-  while (matchText.length) {
-    const match = matchKeywordsRE.exec(matchText);
-    if (!match) {
-      elements.push(matchText);
-      break;
-    }
-    const start = match.index;
-    const matchLength = match[0].length + start;
-    elements.push(matchText.slice(0, start), /*#__PURE__*/_react.default.createElement('span', {
-      className: lightCls
-    }, matchText.slice(start, matchLength)));
-    matchText = matchText.slice(matchLength);
-  }
-  return wrapSSR( /*#__PURE__*/_react.default.createElement('div', {
-    title: label,
-    className: optionCls
-  }, ...elements));
-};
-
 /**
  * 递归筛选 item
  *
@@ -245,39 +199,35 @@ const FieldSelect = (props, ref) => {
     valueEnum,
     render,
     formItemRender,
-    request,
+    request: _request,
     fieldProps,
     light,
-    proFieldKey,
-    params,
+    proFieldKey: _proFieldKey,
+    params: _params,
     label,
     variant,
     id,
     lightLabel,
-    labelTrigger,
-    ...rest
+    labelTrigger
   } = props;
-  const inputRef = (0, _react.useRef)();
+  const inputRef = (0, _react.useRef)(null);
   const intl = (0, _provider.useIntl)();
-  const keyWordsRef = (0, _react.useRef)('');
   const {
     fieldNames
   } = fieldProps;
-  (0, _react.useEffect)(() => {
-    keyWordsRef.current = fieldProps?.searchValue;
-  }, [fieldProps?.searchValue]);
   const [loading, options, fetchData, resetData] = useFieldFetchData(props);
   const {
-    componentSize
+    componentSize: componentSizeFromConfig
   } = _antd.ConfigProvider?.useConfig?.() || {
-    componentSize: 'middle'
+    componentSize: undefined
   };
+  const componentSize = componentSizeFromConfig ?? 'middle';
   (0, _react.useImperativeHandle)(ref, () => ({
     ...(inputRef.current || {}),
     fetchData: keyWord => fetchData(keyWord)
   }), [fetchData]);
   const optionsValueEnum = (0, _react.useMemo)(() => {
-    if (mode !== 'read') return;
+    if (!(0, _fieldMode.isProFieldReadMode)(mode)) return;
     const {
       label: labelPropsName = 'label',
       value: valuePropsName = 'value',
@@ -299,85 +249,43 @@ const FieldSelect = (props, ref) => {
     };
     return traverseOptions(options);
   }, [fieldNames, mode, options]);
-  if (mode === 'read') {
-    const dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-      children: (0, _utils.proFieldParsingText)(rest.text, (0, _utils.objectToMap)(valueEnum || optionsValueEnum))
+  if ((0, _fieldMode.isProFieldReadMode)(mode)) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_FieldSelectRead.FieldSelectRead, {
+      mode: mode,
+      valueEnum: valueEnum,
+      render: render,
+      fieldProps: fieldProps,
+      optionsValueEnum: optionsValueEnum,
+      ...props
     });
-    if (render) {
-      return render(dom, {
-        mode,
-        ...fieldProps
-      }, dom) ?? null;
-    }
-    return dom;
   }
-  if (mode === 'edit' || mode === 'update') {
-    const renderDom = () => {
-      if (light) {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_LightSelect.default, {
-          id: id,
-          loading: loading,
-          ref: inputRef,
-          allowClear: true,
-          size: componentSize,
-          options: options,
-          label: label,
-          labelVariant: variant,
-          placeholder: intl.getMessage('tableForm.selectPlaceholder', '请选择'),
-          lightLabel: lightLabel,
-          labelTrigger: labelTrigger,
-          fetchData: fetchData,
-          ...fieldProps
-        });
-      }
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_SearchSelect.default, {
-        className: rest.className,
-        style: {
-          minWidth: 100,
-          ...rest.style
-        },
-        id: id,
-        loading: loading,
-        ref: inputRef,
-        allowClear: true,
-        defaultSearchValue: props.defaultKeyWords,
-        notFoundContent: loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Spin, {
-          size: "small"
-        }) : fieldProps?.notFoundContent,
-        fetchData: keyWord => {
-          keyWordsRef.current = keyWord ?? '';
-          fetchData(keyWord);
-          // 当 keyWord 为 undefined 时，清空 keyWordsRef 以确保 filterOption 不进行过滤
-          if (keyWord === undefined) {
-            keyWordsRef.current = '';
-          }
-        },
-        resetData: resetData,
-        optionItemRender: item => {
-          if (typeof item.label === 'string' && keyWordsRef.current) {
-            return /*#__PURE__*/(0, _jsxRuntime.jsx)(Highlight, {
-              label: item.label,
-              words: [keyWordsRef.current]
-            });
-          }
-          return item.label;
-        },
-        placeholder: intl.getMessage('tableForm.selectPlaceholder', '请选择'),
-        label: label,
-        ...fieldProps,
-        options: options
-      }, "SearchSelect");
+  if ((0, _fieldMode.isProFieldEditOrUpdateMode)(mode)) {
+    const sharedEditProps = {
+      mode,
+      formItemRender,
+      fieldProps,
+      id,
+      label,
+      variant,
+      intl,
+      loading,
+      options,
+      fetchData,
+      resetData,
+      inputRef,
+      ...props
     };
-    const dom = renderDom();
-    if (formItemRender) {
-      return formItemRender(rest.text, {
-        mode,
-        ...fieldProps,
-        options,
-        loading
-      }, dom) ?? null;
+    if (light) {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_FieldSelectLightEdit.FieldSelectLightEdit, {
+        lightLabel: lightLabel,
+        labelTrigger: labelTrigger,
+        ...sharedEditProps,
+        componentSize: componentSize
+      });
     }
-    return dom;
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_FieldSelectSearchEdit.FieldSelectSearchEdit, {
+      ...sharedEditProps
+    });
   }
   return null;
 };

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

@@ -0,0 +1,19 @@
+import type { ProFieldRequestData, ProFieldValueEnumType } from '../../../utils';
+import type { ProFieldLightProps } from '../../types';
+export type FieldSelectProps<FieldProps = any> = {
+    text: string;
+    /** 值的枚举，如果存在枚举，Search 中会生成 select */
+    valueEnum?: ProFieldValueEnumType;
+    /** 防抖动时间 默认10 单位ms */
+    debounceTime?: number;
+    /** 从服务器读取选项 */
+    request?: ProFieldRequestData;
+    /** 重新触发的时机 */
+    params?: any;
+    /** 组件的全局设置 */
+    fieldProps?: FieldProps;
+    variant?: 'outlined' | 'filled' | 'borderless';
+    id?: string;
+    /** 默认搜素条件 */
+    defaultKeyWords?: string;
+} & ProFieldLightProps;

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

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/field/components/Slider/FieldSliderEdit.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import type { ProFieldFC } from '../../types';
+export declare function FieldSliderEdit(props: Parameters<ProFieldFC<{
+    text: string;
+}>>[0], ref: React.Ref<unknown>): React.JSX.Element;

package/lib/field/components/Slider/FieldSliderEdit.js

@@ -0,0 +1,33 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FieldSliderEdit = FieldSliderEdit;
+var _antd = require("antd");
+var _react = _interopRequireDefault(require("react"));
+var _jsxRuntime = require("react/jsx-runtime");
+function FieldSliderEdit(props, ref) {
+  const {
+    text,
+    mode,
+    formItemRender,
+    fieldProps
+  } = props;
+  const dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Slider, {
+    ref: ref,
+    ...fieldProps,
+    style: {
+      minWidth: 120,
+      ...fieldProps?.style
+    }
+  });
+  if (formItemRender) {
+    return formItemRender(text, {
+      mode,
+      ...fieldProps
+    }, dom);
+  }
+  return dom;
+}

package/lib/field/components/Slider/FieldSliderRead.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+import type { ProFieldFC } from '../../types';
+export declare function FieldSliderRead(props: Parameters<ProFieldFC<{
+    text: string;
+}>>[0]): import("react").JSX.Element;

package/lib/field/components/Slider/FieldSliderRead.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FieldSliderRead = FieldSliderRead;
+var _jsxRuntime = require("react/jsx-runtime");
+function FieldSliderRead(props) {
+  const {
+    text,
+    mode,
+    render,
+    fieldProps
+  } = props;
+  const dom = text;
+  if (render) {
+    return render(text, {
+      mode,
+      ...fieldProps
+    }, /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+      children: dom
+    }));
+  }
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+    children: dom
+  });
+}

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

@@ -5,51 +5,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _antd = require("antd");
 var _react = _interopRequireDefault(require("react"));
-var _jsxRuntime = require("react/jsx-runtime");
+var _fieldMode = require("../../internal/fieldMode");
+var _FieldSliderEdit = require("./FieldSliderEdit");
+var _FieldSliderRead = require("./FieldSliderRead");
 /**
  * 评分组件
- *
- * @param
  */
-const FieldSlider = ({
-  text,
-  mode,
-  render,
-  formItemRender,
-  fieldProps
-}, ref) => {
-  if (mode === 'read') {
-    const dom = text;
-    if (render) {
-      return render(text, {
-        mode,
-        ...fieldProps
-      }, /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-        children: dom
-      }));
-    }
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-      children: dom
-    });
+const FieldSlider = (props, ref) => {
+  const {
+    mode
+  } = props;
+  if ((0, _fieldMode.isProFieldReadMode)(mode)) {
+    return (0, _FieldSliderRead.FieldSliderRead)(props);
   }
-  if (mode === 'edit' || mode === 'update') {
-    const dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Slider, {
-      ref: ref,
-      ...fieldProps,
-      style: {
-        minWidth: 120,
-        ...fieldProps?.style
-      }
-    });
-    if (formItemRender) {
-      return formItemRender(text, {
-        mode,
-        ...fieldProps
-      }, dom);
-    }
-    return dom;
+  if ((0, _fieldMode.isProFieldEditOrUpdateMode)(mode)) {
+    return (0, _FieldSliderEdit.FieldSliderEdit)(props, ref);
   }
   return null;
 };

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

@@ -0,0 +1,12 @@
+import type { SwitchProps } from 'antd';
+import React from 'react';
+import type { ProFieldFC } from '../../types';
+type Props = Parameters<ProFieldFC<{
+    text: boolean;
+    fieldProps?: SwitchProps;
+    variant?: 'outlined' | 'borderless' | 'filled';
+}>>[0] & {
+    variant: 'outlined' | 'borderless' | 'filled' | undefined;
+};
+export declare function FieldSwitchEdit(props: Props, ref: React.Ref<unknown>): React.JSX.Element;
+export {};