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

package/es/field/components/Second/FieldSecondEdit.js

@@ -0,0 +1,28 @@
+import { InputNumber } from 'antd';
+import React from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
+export function FieldSecondEdit(props, ref) {
+  const {
+    text,
+    mode: type,
+    formItemRender,
+    fieldProps,
+    placeholderValue
+  } = props;
+  const dom = /*#__PURE__*/_jsx(InputNumber, {
+    ref: ref,
+    min: 0,
+    style: {
+      width: '100%'
+    },
+    placeholder: placeholderValue,
+    ...fieldProps
+  });
+  if (formItemRender) {
+    return formItemRender(text, {
+      mode: type,
+      ...fieldProps
+    }, dom);
+  }
+  return dom;
+}

package/es/field/components/Second/FieldSecondRead.d.ts

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

package/es/field/components/Second/FieldSecondRead.js

@@ -0,0 +1,23 @@
+import React from 'react';
+import { formatSecond } from "./utils";
+import { jsx as _jsx } from "react/jsx-runtime";
+export function FieldSecondRead(props, ref) {
+  const {
+    text,
+    mode: type,
+    render,
+    fieldProps
+  } = props;
+  const secondText = formatSecond(Number(text));
+  const dom = /*#__PURE__*/_jsx("span", {
+    ref: ref,
+    children: secondText
+  });
+  if (render) {
+    return render(text, {
+      mode: type,
+      ...fieldProps
+    }, dom);
+  }
+  return dom;
+}

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

@@ -1,14 +1,7 @@
 import React from 'react';
-export type FieldDigitProps = {
-    text: number;
-    placeholder?: string;
-};
-/**
- * 格式化秒
- *
- * @param result
- * @returns {string}
- */
-export declare function formatSecond(result: number): string;
+import type { FieldDigitProps, FieldSecondProps } from './types';
+import { formatSecond } from './utils';
+export { formatSecond };
+export type { FieldDigitProps, FieldSecondProps };
 declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & FieldDigitProps & React.RefAttributes<any>>;
 export default _default;

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

@@ -1,87 +1,27 @@
-import { InputNumber } from 'antd';
 import React from 'react';
 import { useIntl } from "../../../provider";
-import { jsx as _jsx } from "react/jsx-runtime";
+import { isProFieldEditOrUpdateMode, isProFieldReadMode } from "../../internal/fieldMode";
+import { FieldSecondEdit } from "./FieldSecondEdit";
+import { FieldSecondRead } from "./FieldSecondRead";
+import { formatSecond } from "./utils";
+export { formatSecond };
 /**
  * 格式化秒
- *
- * @param result
- * @returns {string}
  */
-export function formatSecond(result) {
-  let newResult = result;
-  let formatText = '';
-  let past = false;
-  if (newResult < 0) {
-    newResult = -newResult;
-    past = true;
-  }
-  const d = Math.floor(newResult / (3600 * 24));
-  const h = Math.floor(newResult / 3600 % 24);
-  const m = Math.floor(newResult / 60 % 60);
-  const s = Math.floor(newResult % 60);
-  formatText = `${s}秒`;
-  if (m > 0) {
-    formatText = `${m}分钟${formatText}`;
-  }
-  if (h > 0) {
-    formatText = `${h}小时${formatText}`;
-  }
-  if (d > 0) {
-    formatText = `${d}天${formatText}`;
-  }
-  if (past) {
-    formatText += '前';
-  }
-  return formatText;
-}
-
-/**
- * 格式化秒
- *
- * @param FieldSecond
- */
-const Second = ({
-  text,
-  mode: type,
-  render,
-  formItemRender,
-  fieldProps,
-  placeholder
-}, ref) => {
+const Second = (props, ref) => {
   const intl = useIntl();
-  const placeholderValue = placeholder || intl.getMessage('tableForm.inputPlaceholder', '请输入');
-  if (type === 'read') {
-    const secondText = formatSecond(Number(text));
-    const dom = /*#__PURE__*/_jsx("span", {
-      ref: ref,
-      children: secondText
-    });
-    if (render) {
-      return render(text, {
-        mode: type,
-        ...fieldProps
-      }, dom);
-    }
-    return dom;
+  const placeholderValue = props.placeholder || intl.getMessage('tableForm.inputPlaceholder', '请输入');
+  const {
+    mode: type
+  } = props;
+  if (isProFieldReadMode(type)) {
+    return FieldSecondRead(props, ref);
   }
-  if (type === 'edit' || type === 'update') {
-    const dom = /*#__PURE__*/_jsx(InputNumber, {
-      ref: ref,
-      min: 0,
-      style: {
-        width: '100%'
-      },
-      placeholder: placeholderValue,
-      ...fieldProps
-    });
-    if (formItemRender) {
-      return formItemRender(text, {
-        mode: type,
-        ...fieldProps
-      }, dom);
-    }
-    return dom;
+  if (isProFieldEditOrUpdateMode(type)) {
+    return FieldSecondEdit({
+      ...props,
+      placeholderValue
+    }, ref);
   }
   return null;
 };

package/es/field/components/Second/types.d.ts

@@ -0,0 +1,6 @@
+/** @deprecated use FieldSecondProps — kept for backward compatibility */
+export type FieldDigitProps = {
+    text: number;
+    placeholder?: string;
+};
+export type FieldSecondProps = FieldDigitProps;

package/es/field/components/Second/types.js

@@ -0,0 +1 @@
+export {};

package/es/field/components/Second/utils.d.ts

@@ -0,0 +1,4 @@
+/**
+ * 格式化秒
+ */
+export declare function formatSecond(result: number): string;

package/es/field/components/Second/utils.js

@@ -0,0 +1,30 @@
+/**
+ * 格式化秒
+ */
+export function formatSecond(result) {
+  let newResult = result;
+  let formatText = '';
+  let past = false;
+  if (newResult < 0) {
+    newResult = -newResult;
+    past = true;
+  }
+  const d = Math.floor(newResult / (3600 * 24));
+  const h = Math.floor(newResult / 3600 % 24);
+  const m = Math.floor(newResult / 60 % 60);
+  const s = Math.floor(newResult % 60);
+  formatText = `${s}秒`;
+  if (m > 0) {
+    formatText = `${m}分钟${formatText}`;
+  }
+  if (h > 0) {
+    formatText = `${h}小时${formatText}`;
+  }
+  if (d > 0) {
+    formatText = `${d}天${formatText}`;
+  }
+  if (past) {
+    formatText += '前';
+  }
+  return formatText;
+}

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

@@ -0,0 +1,13 @@
+import React from 'react';
+import type { ProFieldFC } from '../../types';
+import type { FieldSelectProps } from '../Select';
+type Props = Parameters<ProFieldFC<{
+    text: string;
+    emptyText?: React.ReactNode;
+} & FieldSelectProps>>[0] & {
+    options: any[];
+    loading: boolean;
+    inputRef: React.RefObject<HTMLInputElement | null>;
+};
+export declare function FieldSegmentedEdit(props: Props): React.JSX.Element;
+export {};

package/es/field/components/Segmented/FieldSegmentedEdit.js

@@ -0,0 +1,29 @@
+import { omit } from '@rc-component/util';
+import { Segmented } from 'antd';
+import React from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
+export function FieldSegmentedEdit(props) {
+  const {
+    text,
+    mode,
+    formItemRender,
+    fieldProps,
+    options,
+    loading,
+    inputRef
+  } = props;
+  const dom = /*#__PURE__*/_jsx(Segmented, {
+    ref: inputRef,
+    ...omit(fieldProps || {}, ['allowClear']),
+    options: options
+  });
+  if (formItemRender) {
+    return formItemRender(text, {
+      mode,
+      ...fieldProps,
+      options,
+      loading
+    }, dom);
+  }
+  return dom;
+}

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

@@ -0,0 +1,12 @@
+import React from 'react';
+import type { ProFieldFC } from '../../types';
+import type { FieldSelectProps } from '../Select';
+type Props = Parameters<ProFieldFC<{
+    text: string;
+    emptyText?: React.ReactNode;
+} & FieldSelectProps>>[0] & {
+    optionsValueEnum: Record<string, any> | undefined;
+    emptyText: React.ReactNode;
+};
+export declare function FieldSegmentedRead(props: Props): React.JSX.Element;
+export {};

package/es/field/components/Segmented/FieldSegmentedRead.js

@@ -0,0 +1,27 @@
+import React from 'react';
+import { objectToMap, proFieldParsingText } from "../../../utils";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
+export function FieldSegmentedRead(props) {
+  const {
+    text,
+    mode,
+    render,
+    fieldProps,
+    emptyText,
+    optionsValueEnum,
+    valueEnum
+  } = props;
+  const dom = /*#__PURE__*/_jsx(_Fragment, {
+    children: proFieldParsingText(text, objectToMap(valueEnum || optionsValueEnum))
+  });
+  if (render) {
+    return render(text, {
+      mode,
+      ...fieldProps
+    }, /*#__PURE__*/_jsx(_Fragment, {
+      children: dom
+    })) ?? emptyText;
+  }
+  return dom;
+}

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

@@ -4,13 +4,13 @@ declare const _default: React.ForwardRefExoticComponent<import("src/provider").B
     emptyText?: React.ReactNode;
 } & {
     text: string;
-    valueEnum?: import("src/utils/typing").ProFieldValueEnumType | undefined;
+    valueEnum?: import("src/utils").ProFieldValueEnumType | undefined;
     debounceTime?: number | undefined;
-    request?: import("src/utils/typing").ProFieldRequestData | undefined;
+    request?: import("src/utils").ProFieldRequestData | undefined;
     params?: any;
     fieldProps?: any;
-    variant?: "outlined" | "filled" | "borderless" | undefined;
+    variant?: "outlined" | "borderless" | "filled" | undefined;
     id?: string | undefined;
     defaultKeyWords?: string | undefined;
-} & import("../../PureProField").ProFieldLightProps & React.RefAttributes<any>>;
+} & import("../../types").ProFieldLightProps & React.RefAttributes<any>>;
 export default _default;

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

@@ -1,17 +1,14 @@
-import { omit } from '@rc-component/util';
-import { Segmented, Spin } from 'antd';
+import { Spin } from 'antd';
 import React, { useImperativeHandle, useRef } from 'react';
-import { objectToMap, proFieldParsingText } from "../../../utils";
+import { isProFieldEditOrUpdateMode, isProFieldReadMode } from "../../internal/fieldMode";
 import { useFieldFetchData } from "../Select";
+import { FieldSegmentedEdit } from "./FieldSegmentedEdit";
+import { FieldSegmentedRead } from "./FieldSegmentedRead";
 
 /**
  * Segmented https://ant.design/components/segmented-cn/
- *
- * @param props
- * @param ref
  */
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
 const FieldSegmented = (props, ref) => {
   const {
     mode,
@@ -21,7 +18,7 @@ const FieldSegmented = (props, ref) => {
     emptyText = '-',
     ...rest
   } = props;
-  const inputRef = useRef();
+  const inputRef = useRef(null);
   const [loading, options, fetchData] = useFieldFetchData(props);
   useImperativeHandle(ref, () => ({
     ...(inputRef.current || {}),
@@ -32,41 +29,26 @@ const FieldSegmented = (props, ref) => {
       size: "small"
     });
   }
-  if (mode === 'read') {
-    const optionsValueEnum = options?.length ? options?.reduce((pre, cur) => {
-      return {
-        ...pre,
-        [cur.value ?? '']: cur.label
-      };
-    }, {}) : undefined;
-    const dom = /*#__PURE__*/_jsx(_Fragment, {
-      children: proFieldParsingText(rest.text, objectToMap(rest.valueEnum || optionsValueEnum))
+  const optionsValueEnum = options?.length ? options?.reduce((pre, cur) => {
+    return {
+      ...pre,
+      [cur.value ?? '']: cur.label
+    };
+  }, {}) : undefined;
+  if (isProFieldReadMode(mode)) {
+    return /*#__PURE__*/_jsx(FieldSegmentedRead, {
+      ...props,
+      optionsValueEnum: optionsValueEnum,
+      emptyText: emptyText
     });
-    if (render) {
-      return render(rest.text, {
-        mode,
-        ...fieldProps
-      }, /*#__PURE__*/_jsx(_Fragment, {
-        children: dom
-      })) ?? emptyText;
-    }
-    return dom;
   }
-  if (mode === 'edit' || mode === 'update') {
-    const dom = /*#__PURE__*/_jsx(Segmented, {
-      ref: inputRef,
-      ...omit(fieldProps || {}, ['allowClear']),
-      options: options
+  if (isProFieldEditOrUpdateMode(mode)) {
+    return /*#__PURE__*/_jsx(FieldSegmentedEdit, {
+      ...props,
+      options: options,
+      loading: loading,
+      inputRef: inputRef
     });
-    if (formItemRender) {
-      return formItemRender(rest.text, {
-        mode,
-        ...fieldProps,
-        options,
-        loading
-      }, dom);
-    }
-    return dom;
   }
   return null;
 };

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

@@ -0,0 +1,2 @@
+export { FieldSelectSearchEdit as FieldSelectEdit } from './FieldSelectSearchEdit';
+export type { FieldSelectFullProps } from './FieldSelectSearchEdit';

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

@@ -0,0 +1 @@
+export { FieldSelectSearchEdit as FieldSelectEdit } from "./FieldSelectSearchEdit";

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

@@ -0,0 +1,17 @@
+import type { GetRef } 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 { FieldSelectFullProps } from './FieldSelectSearchEdit';
+export type FieldSelectLightEditProps = Parameters<ProFieldFC<FieldSelectFullProps>>[0] & {
+    intl: IntlType;
+    loading: boolean;
+    options: RequestOptionsType[];
+    fetchData: (keyWord?: string) => void;
+    resetData: () => void;
+    inputRef: React.RefObject<GetRef<typeof Select>>;
+    componentSize: string;
+};
+export declare function FieldSelectLightEdit(props: FieldSelectLightEditProps): React.JSX.Element;

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

@@ -0,0 +1,46 @@
+import React from 'react';
+import LightSelect from "./LightSelect";
+import { jsx as _jsx } from "react/jsx-runtime";
+export function FieldSelectLightEdit(props) {
+  const {
+    mode,
+    formItemRender,
+    fieldProps,
+    id,
+    label,
+    variant,
+    lightLabel,
+    labelTrigger,
+    intl,
+    loading,
+    options,
+    fetchData,
+    inputRef,
+    componentSize,
+    ...rest
+  } = props;
+  const dom = /*#__PURE__*/_jsx(LightSelect, {
+    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
+  });
+  if (formItemRender) {
+    return formItemRender(rest.text, {
+      mode,
+      ...fieldProps,
+      options,
+      loading
+    }, dom) ?? null;
+  }
+  return dom;
+}

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

@@ -0,0 +1,10 @@
+/// <reference types="react" />
+import type { SelectProps } from 'antd';
+import type { ProFieldFC } from '../../types';
+import type { FieldSelectProps } from './types';
+type Props = Parameters<ProFieldFC<FieldSelectProps & Pick<SelectProps, 'fieldNames' | 'style' | 'className'>>>[0] & {
+    valueEnum: FieldSelectProps['valueEnum'];
+    optionsValueEnum: Map<any, any> | undefined;
+};
+export declare function FieldSelectRead(props: Props): import("react").JSX.Element;
+export {};

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

@@ -0,0 +1,23 @@
+import { objectToMap, proFieldParsingText } from "../../../utils";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
+export function FieldSelectRead(props) {
+  const {
+    mode,
+    render,
+    fieldProps,
+    valueEnum,
+    optionsValueEnum,
+    ...rest
+  } = props;
+  const dom = /*#__PURE__*/_jsx(_Fragment, {
+    children: proFieldParsingText(rest.text, objectToMap(valueEnum || optionsValueEnum))
+  });
+  if (render) {
+    return render(dom, {
+      mode,
+      ...fieldProps
+    }, dom) ?? null;
+  }
+  return dom;
+}

package/es/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/es/field/components/Select/FieldSelectSearchEdit.js

@@ -0,0 +1,50 @@
+import { Spin } from 'antd';
+import React from 'react';
+import SearchSelect from "./SearchSelect";
+import { jsx as _jsx } from "react/jsx-runtime";
+export function FieldSelectSearchEdit(props) {
+  const {
+    mode,
+    formItemRender,
+    fieldProps,
+    id,
+    label,
+    intl,
+    loading,
+    options,
+    fetchData,
+    resetData,
+    inputRef,
+    ...rest
+  } = props;
+  const dom = /*#__PURE__*/_jsx(SearchSelect, {
+    className: rest.className,
+    style: {
+      minWidth: 100,
+      ...rest.style
+    },
+    id: id,
+    loading: loading,
+    ref: inputRef,
+    allowClear: true,
+    defaultSearchValue: props.defaultKeyWords,
+    notFoundContent: loading ? /*#__PURE__*/_jsx(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/es/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/es/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;