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

package/lib/field/components/DatePicker/FieldDatePickerLightEdit.d.ts

@@ -0,0 +1,17 @@
+import React from 'react';
+import type { IntlType } from '../../../provider';
+import type { ProFieldFC, ProFieldLightProps } from '../../types';
+type Props = Parameters<ProFieldFC<{
+    text: string | number;
+    format?: string;
+    showTime?: boolean;
+    variant?: 'outlined' | 'borderless' | 'filled' | 'underlined';
+    picker?: 'time' | 'date' | 'week' | 'month' | 'quarter' | 'year';
+} & ProFieldLightProps>>[0] & {
+    format: string;
+    open: boolean;
+    setOpen: React.Dispatch<React.SetStateAction<boolean>>;
+    intl: IntlType;
+};
+export declare function FieldDatePickerLightEdit(props: Props, ref: React.Ref<unknown>): React.JSX.Element;
+export {};

package/lib/field/components/DatePicker/FieldDatePickerLightEdit.js

@@ -0,0 +1,70 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FieldDatePickerLightEdit = FieldDatePickerLightEdit;
+var _antd = require("antd");
+var _react = _interopRequireDefault(require("react"));
+var _utils = require("../../../utils");
+var _jsxRuntime = require("react/jsx-runtime");
+function FieldDatePickerLightEdit(props, ref) {
+  const {
+    text,
+    mode,
+    format,
+    label,
+    formItemRender,
+    showTime,
+    fieldProps,
+    picker,
+    lightLabel,
+    variant,
+    open,
+    setOpen
+  } = props;
+  const {
+    disabled,
+    value
+  } = fieldProps;
+  const dayValue = (0, _utils.parseValueToDay)(value);
+  const handleLabelClick = () => {
+    if (disabled) return;
+    fieldProps?.onOpenChange?.(true);
+    setOpen(true);
+  };
+  const dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_utils.FieldLabel, {
+    label: label,
+    onClick: handleLabelClick,
+    style: dayValue ? {
+      paddingInlineEnd: 0
+    } : undefined,
+    disabled: disabled,
+    value: dayValue || open ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.DatePicker, {
+      picker: picker,
+      showTime: showTime,
+      format: format,
+      ref: ref,
+      ...fieldProps,
+      variant: variant ?? fieldProps?.variant,
+      value: dayValue,
+      onOpenChange: isOpen => {
+        setOpen(isOpen);
+        fieldProps?.onOpenChange?.(isOpen);
+      },
+      open: open
+    }) : undefined,
+    allowClear: false,
+    downIcon: dayValue || open ? false : undefined,
+    variant: variant,
+    ref: lightLabel
+  });
+  if (formItemRender) {
+    return formItemRender(text, {
+      mode,
+      ...fieldProps
+    }, dom);
+  }
+  return dom;
+}

package/lib/field/components/DatePicker/FieldDatePickerRead.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="react" />
+import type { ProFieldFC, ProFieldLightProps } from '../../types';
+type Props = Parameters<ProFieldFC<{
+    text: string | number;
+    format?: string;
+    showTime?: boolean;
+    variant?: 'outlined' | 'borderless' | 'filled' | 'underlined';
+    picker?: 'time' | 'date' | 'week' | 'month' | 'quarter' | 'year';
+} & ProFieldLightProps>>[0] & {
+    format: string;
+};
+export declare function FieldDatePickerRead(props: Props): import("react").JSX.Element;
+export {};

package/lib/field/components/DatePicker/FieldDatePickerRead.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FieldDatePickerRead = FieldDatePickerRead;
+var _datePickerUtils = require("./datePickerUtils");
+var _jsxRuntime = require("react/jsx-runtime");
+function FieldDatePickerRead(props) {
+  const {
+    text,
+    mode,
+    render,
+    fieldProps,
+    format,
+    picker
+  } = props;
+  const mergedPicker = fieldProps?.picker ?? picker;
+  const dom = (0, _datePickerUtils.formatDate)(text, fieldProps.format || format, mergedPicker);
+  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/DatePicker/datePickerUtils.d.ts

@@ -0,0 +1,3 @@
+import '../../initDayjs';
+export type DatePickerReadPicker = 'time' | 'date' | 'week' | 'month' | 'quarter' | 'year';
+export declare function formatDate(text: any, format: any, _picker?: DatePickerReadPicker): any;

package/lib/field/components/DatePicker/datePickerUtils.js

@@ -0,0 +1,39 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.formatDate = formatDate;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _quarterOfYear = _interopRequireDefault(require("dayjs/plugin/quarterOfYear"));
+var _utils = require("../../../utils");
+require("../../initDayjs");
+_dayjs.default.extend(_quarterOfYear.default);
+function pickFormatTemplate(format) {
+  if (Array.isArray(format)) {
+    const head = format[0];
+    return typeof head === 'string' && head ? head : 'YYYY-MM-DD';
+  }
+  if (typeof format === 'string' && format) {
+    return format;
+  }
+  return 'YYYY-MM-DD';
+}
+function formatDate(text, format, _picker) {
+  if (text === null || text === undefined || text === '') {
+    return '-';
+  }
+  const parsed = (0, _utils.parseValueToDay)(text);
+  if (Array.isArray(parsed) || !parsed || !parsed.isValid()) {
+    return '-';
+  }
+  if (typeof parsed.format !== 'function') {
+    return String(text);
+  }
+  if (typeof format === 'function') {
+    return format(parsed);
+  }
+  const tpl = pickFormatTemplate(format);
+  return parsed.format(tpl);
+}

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

@@ -1,10 +1,10 @@
 import React from 'react';
-import type { ProFieldLightProps } from '../../PureProField';
+import type { ProFieldLightProps } from '../../types';
 declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
     text: string | number;
     format?: string | undefined;
     showTime?: boolean | undefined;
-    variant?: "outlined" | "filled" | "borderless" | "underlined" | undefined;
-    picker?: "time" | "date" | "month" | "week" | "year" | "quarter" | undefined;
+    variant?: "outlined" | "borderless" | "filled" | "underlined" | undefined;
+    picker?: "time" | "year" | "month" | "week" | "quarter" | "date" | undefined;
 } & ProFieldLightProps & React.RefAttributes<any>>;
 export default _default;

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

@@ -6,39 +6,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _antd = require("antd");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _weekOfYear = _interopRequireDefault(require("dayjs/plugin/weekOfYear"));
 var _react = _interopRequireWildcard(require("react"));
 var _provider = require("../../../provider");
-var _utils = require("../../../utils");
+var _fieldMode = require("../../internal/fieldMode");
+var _FieldDatePickerEdit = require("./FieldDatePickerEdit");
+var _FieldDatePickerLightEdit = require("./FieldDatePickerLightEdit");
+var _FieldDatePickerRead = require("./FieldDatePickerRead");
 var _jsxRuntime = require("react/jsx-runtime");
 _dayjs.default.extend(_weekOfYear.default);
-const formatDate = (text, format) => {
-  if (!text) return '-';
-  if (typeof format === 'function') {
-    return format((0, _dayjs.default)(text));
-  } else {
-    return (0, _dayjs.default)(text).format((Array.isArray(format) ? format[0] : format) || 'YYYY-MM-DD');
-  }
-};
 
 /**
  * 日期选择组件
- *
- * @param text
- * @param mode
- * @param format
- * @param label
- * @param light
- * @param render
- * @param formItemRender
- * @param showTime
- * @param fieldProps
- * @param picker
- * @param lightLabel
- * @param variant
- * @param ref
  */
 const FieldDatePicker = ({
   text,
@@ -56,76 +36,45 @@ const FieldDatePicker = ({
 }, ref) => {
   const intl = (0, _provider.useIntl)();
   const [open, setOpen] = (0, _react.useState)(false);
-  if (mode === 'read') {
-    const dom = formatDate(text, fieldProps.format || format);
-    if (render) {
-      return render(text, {
-        mode,
-        ...fieldProps
-      }, /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-        children: dom
-      }));
-    }
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-      children: dom
+  if ((0, _fieldMode.isProFieldReadMode)(mode)) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_FieldDatePickerRead.FieldDatePickerRead, {
+      text: text,
+      mode: mode,
+      format: format,
+      label: label,
+      light: light,
+      render: render,
+      formItemRender: formItemRender,
+      showTime: showTime,
+      fieldProps: fieldProps,
+      picker: picker,
+      lightLabel: lightLabel,
+      variant: variant
     });
   }
-  if (mode === 'edit' || mode === 'update') {
-    let dom;
-    const {
-      disabled,
-      value,
-      placeholder = intl.getMessage('tableForm.selectPlaceholder', '请选择')
-    } = fieldProps;
-    const dayValue = (0, _utils.parseValueToDay)(value);
+  if ((0, _fieldMode.isProFieldEditOrUpdateMode)(mode)) {
+    const editProps = {
+      text,
+      mode,
+      format,
+      label,
+      render,
+      formItemRender,
+      showTime,
+      fieldProps,
+      picker,
+      variant,
+      intl
+    };
     if (light) {
-      dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_utils.FieldLabel, {
-        label: label,
-        onClick: () => {
-          fieldProps?.onOpenChange?.(true);
-          setOpen(true);
-        },
-        style: dayValue ? {
-          paddingInlineEnd: 0
-        } : undefined,
-        disabled: disabled,
-        value: dayValue || open ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.DatePicker, {
-          picker: picker,
-          showTime: showTime,
-          format: format,
-          ref: ref,
-          ...fieldProps,
-          value: dayValue,
-          onOpenChange: isOpen => {
-            setOpen(isOpen);
-            fieldProps?.onOpenChange?.(isOpen);
-          },
-          open: open
-        }) : undefined,
-        allowClear: false,
-        downIcon: dayValue || open ? false : undefined,
-        variant: variant,
-        ref: lightLabel
-      });
-    } else {
-      dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.DatePicker, {
-        picker: picker,
-        showTime: showTime,
-        format: format,
-        placeholder: placeholder,
-        variant: variant,
-        ref: ref,
-        ...fieldProps,
-        value: dayValue
-      });
-    }
-    if (formItemRender) {
-      return formItemRender(text, {
-        mode,
-        ...fieldProps
-      }, dom);
+      return (0, _FieldDatePickerLightEdit.FieldDatePickerLightEdit)({
+        ...editProps,
+        lightLabel,
+        open,
+        setOpen
+      }, ref);
     }
-    return dom;
+    return (0, _FieldDatePickerEdit.FieldDatePickerEdit)(editProps, ref);
   }
   return null;
 };

package/lib/field/components/Digit/FieldDigitEdit.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import type { ProFieldFC } from '../../types';
+import type { FieldDigitProps } from './types';
+type Props = Parameters<ProFieldFC<FieldDigitProps>>[0] & {
+    placeholderValue: string;
+};
+export declare function FieldDigitEdit(props: Props, ref: React.Ref<unknown>): React.JSX.Element;
+export {};

package/lib/field/components/Digit/FieldDigitEdit.js

@@ -0,0 +1,32 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FieldDigitEdit = FieldDigitEdit;
+var _antd = require("antd");
+var _react = _interopRequireDefault(require("react"));
+var _jsxRuntime = require("react/jsx-runtime");
+function FieldDigitEdit(props, ref) {
+  const {
+    text,
+    mode: type,
+    formItemRender,
+    fieldProps,
+    placeholderValue
+  } = props;
+  const dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.InputNumber, {
+    ref: ref,
+    min: 0,
+    placeholder: placeholderValue,
+    ...fieldProps
+  });
+  if (formItemRender) {
+    return formItemRender(text, {
+      mode: type,
+      ...fieldProps
+    }, dom);
+  }
+  return dom;
+}

package/lib/field/components/Digit/FieldDigitRead.d.ts

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

package/lib/field/components/Digit/FieldDigitRead.js

@@ -0,0 +1,41 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FieldDigitRead = FieldDigitRead;
+var _react = _interopRequireDefault(require("react"));
+var _jsxRuntime = require("react/jsx-runtime");
+function FieldDigitRead(props, ref) {
+  const {
+    text,
+    mode: type,
+    render,
+    fieldProps
+  } = props;
+  let fractionDigits = {};
+  if (fieldProps?.precision) {
+    fractionDigits = {
+      minimumFractionDigits: Number(fieldProps.precision),
+      maximumFractionDigits: Number(fieldProps.precision)
+    };
+  }
+  const digit = new Intl.NumberFormat(undefined, {
+    ...fractionDigits,
+    ...(fieldProps?.intlProps || {})
+  }).format(Number(text));
+  const dom = !fieldProps?.stringMode ? /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+    ref: ref,
+    children: fieldProps?.formatter?.(digit) || digit
+  }) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+    children: text
+  });
+  if (render) {
+    return render(text, {
+      mode: type,
+      ...fieldProps
+    }, dom);
+  }
+  return dom;
+}

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

@@ -1,7 +1,5 @@
 import React from 'react';
-export type FieldDigitProps = {
-    text: number;
-    placeholder?: string;
-};
+import type { FieldDigitProps } from './types';
+export type { FieldDigitProps };
 declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & FieldDigitProps & React.RefAttributes<any>>;
 export default _default;

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

@@ -1,35 +1,17 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _util = require("@rc-component/util");
-var _antd = require("antd");
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _provider = require("../../../provider");
-var _utils = require("../../../utils");
-var _jsxRuntime = require("react/jsx-runtime");
-/**
- * 判断字符串是否为空或仅包含空白字符
- * @param {string} str - 要检查的字符串
- * @returns {boolean} - 如果为空或仅包含空白字符返回 true，否则返回 false
- */
-function isEmptyOrWhitespace(str) {
-  return (0, _utils.isNil)(str) || str === '' || str?.trim() === '';
-}
-
+var _fieldMode = require("../../internal/fieldMode");
+var _FieldDigitEdit = require("./FieldDigitEdit");
+var _FieldDigitRead = require("./FieldDigitRead");
 /**
  * 数字组件
- *
- * @param text
- * @param type
- * @param render
- * @param placeholder
- * @param formItemRender
- * @param fieldProps
- * @param ref
  */
 const FieldDigit = ({
   text,
@@ -41,86 +23,26 @@ const FieldDigit = ({
 }, ref) => {
   const intl = (0, _provider.useIntl)();
   const placeholderValue = placeholder || intl.getMessage('tableForm.inputPlaceholder', '请输入');
-  const proxyChange = (0, _react.useCallback)(value => {
-    let val = value ?? undefined;
-    if (!fieldProps.stringMode && typeof val === 'string') {
-      // 处理无效输入，如 '22.22.22'
-      const numVal = Number(val);
-      if (isNaN(numVal)) {
-        // 如果转换失败，尝试提取第一个有效的数字
-        const match = val.match(/^(\d+(?:\.\d+)?)/);
-        if (match) {
-          val = Number(match[1]);
-        } else {
-          val = undefined;
-        }
-      } else {
-        val = numVal;
-      }
-    }
-    if (typeof val === 'number' && !(0, _utils.isNil)(val) && !(0, _utils.isNil)(fieldProps.precision)) {
-      val = Number(val.toFixed(fieldProps.precision));
-    }
-    return val;
-  }, [fieldProps]);
-  if (type === 'read') {
-    let fractionDigits = {};
-    if (fieldProps?.precision) {
-      fractionDigits = {
-        minimumFractionDigits: Number(fieldProps.precision),
-        maximumFractionDigits: Number(fieldProps.precision)
-      };
-    }
-    const digit = new Intl.NumberFormat(undefined, {
-      ...fractionDigits,
-      ...(fieldProps?.intlProps || {})
-    }).format(Number(text));
-
-    // 如果是 string 模式，什么都不要处理了
-    const dom = !fieldProps?.stringMode ? /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-      ref: ref,
-      children: fieldProps?.formatter?.(digit) || digit
-    }) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-      children: text
-    });
-    if (render) {
-      return render(text, {
-        mode: type,
-        ...fieldProps
-      }, dom);
-    }
-    return dom;
+  if ((0, _fieldMode.isProFieldReadMode)(type)) {
+    return (0, _FieldDigitRead.FieldDigitRead)({
+      text,
+      mode: type,
+      render,
+      placeholder,
+      formItemRender,
+      fieldProps
+    }, ref);
   }
-  if (type === 'edit' || type === 'update') {
-    const dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.InputNumber, {
-      ref: ref,
-      min: 0,
-      placeholder: placeholderValue,
-      ...(0, _util.omit)(fieldProps, ['onChange', 'onBlur']),
-      onChange: e => fieldProps?.onChange?.(proxyChange(e)),
-      onBlur: e => {
-        const value = e.target.value;
-        if (isEmptyOrWhitespace(value)) {
-          fieldProps?.onBlur?.(e);
-          return;
-        }
-        const processedValue = proxyChange(value);
-        // 更新输入框的值
-        if (e.target && typeof processedValue === 'number') {
-          e.target.value = processedValue.toString();
-          // 触发 onChange 事件以更新表单值
-          fieldProps?.onChange?.(processedValue);
-        }
-        fieldProps?.onBlur?.(e);
-      }
-    });
-    if (formItemRender) {
-      return formItemRender(text, {
-        mode: type,
-        ...fieldProps
-      }, dom);
-    }
-    return dom;
+  if ((0, _fieldMode.isProFieldEditOrUpdateMode)(type)) {
+    return (0, _FieldDigitEdit.FieldDigitEdit)({
+      text,
+      mode: type,
+      render,
+      placeholder,
+      formItemRender,
+      fieldProps,
+      placeholderValue
+    }, ref);
   }
   return null;
 };

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

@@ -0,0 +1,4 @@
+export type FieldDigitProps = {
+    text: number;
+    placeholder?: string;
+};

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

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

package/lib/field/components/DigitRange/FieldDigitRangeEdit.d.ts

@@ -0,0 +1,16 @@
+import React, { MutableRefObject } from 'react';
+import type { ProFieldFC } from '../../types';
+import type { FieldDigitRangeProps, ValuePair } from './types';
+type Props = Parameters<ProFieldFC<FieldDigitRangeProps>>[0] & {
+    valuePair: ValuePair | undefined;
+    valuePairRef: MutableRefObject<ValuePair | undefined>;
+    setValuePair: (updater: ValuePair | undefined | ((prev: ValuePair | undefined) => ValuePair | undefined)) => void;
+    token: {
+        colorBgContainer?: string;
+        colorBorder?: string;
+        colorTextSecondary?: string;
+    };
+    placeholderValue: string | string[];
+};
+export declare function FieldDigitRangeEdit(props: Props, _ref: React.Ref<unknown>): React.JSX.Element;
+export {};