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

package/lib/field/components/DigitRange/FieldDigitRangeEdit.js

@@ -0,0 +1,93 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FieldDigitRangeEdit = FieldDigitRangeEdit;
+var _antd = require("antd");
+var _react = _interopRequireDefault(require("react"));
+var _jsxRuntime = require("react/jsx-runtime");
+function FieldDigitRangeEdit(props, _ref) {
+  const {
+    text,
+    mode: type,
+    formItemRender,
+    fieldProps,
+    separator = '~',
+    separatorWidth = 30,
+    valuePair,
+    valuePairRef,
+    setValuePair,
+    token,
+    placeholderValue
+  } = props;
+  const {
+    defaultValue
+  } = fieldProps;
+  const handleGroupBlur = () => {
+    if (Array.isArray(valuePairRef.current)) {
+      const [value0, value1] = valuePairRef.current;
+      if (typeof value0 === 'number' && typeof value1 === 'number' && value0 > value1) {
+        setValuePair([value1, value0]);
+        return;
+      }
+      if (value0 === undefined && value1 === undefined) {
+        setValuePair(undefined);
+      }
+    }
+  };
+  const handleChange = (index, changedValue) => {
+    const newValuePair = [...(valuePair || [])];
+    newValuePair[index] = changedValue === null ? undefined : changedValue;
+    valuePairRef.current = newValuePair;
+    setValuePair(newValuePair);
+  };
+  const getInputNumberPlaceholder = index => Array.isArray(placeholderValue) ? placeholderValue[index] : placeholderValue;
+  const dom = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space.Compact, {
+    block: true,
+    onBlur: handleGroupBlur,
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.InputNumber, {
+      ...fieldProps,
+      placeholder: getInputNumberPlaceholder(0),
+      style: {
+        width: `calc((100% - ${separatorWidth}px) / 2)`
+      },
+      value: valuePair?.[0],
+      defaultValue: defaultValue?.[0],
+      onChange: changedValue => handleChange(0, changedValue)
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+      "aria-hidden": true,
+      style: {
+        display: 'inline-flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+        width: separatorWidth,
+        boxSizing: 'border-box',
+        border: `1px solid ${token?.colorBorder}`,
+        backgroundColor: token?.colorBgContainer,
+        color: token?.colorTextSecondary,
+        pointerEvents: 'none',
+        userSelect: 'none'
+      },
+      children: separator
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.InputNumber, {
+      ...fieldProps,
+      placeholder: getInputNumberPlaceholder(1),
+      style: {
+        width: `calc((100% - ${separatorWidth}px) / 2)`,
+        borderInlineStart: 0
+      },
+      value: valuePair?.[1],
+      defaultValue: defaultValue?.[1],
+      onChange: changedValue => handleChange(1, changedValue)
+    })]
+  });
+  if (formItemRender) {
+    return formItemRender(text, {
+      mode: type,
+      ...fieldProps
+    }, dom);
+  }
+  return dom;
+}

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

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

package/lib/field/components/DigitRange/FieldDigitRangeRead.js

@@ -0,0 +1,36 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FieldDigitRangeRead = FieldDigitRangeRead;
+var _react = _interopRequireDefault(require("react"));
+var _jsxRuntime = require("react/jsx-runtime");
+function FieldDigitRangeRead(props, ref) {
+  const {
+    text,
+    mode: type,
+    render,
+    fieldProps,
+    separator = '~'
+  } = props;
+  const getContent = number => {
+    const digit = new Intl.NumberFormat(undefined, {
+      minimumSignificantDigits: 2,
+      ...(fieldProps?.intlProps || {})
+    }).format(Number(number));
+    return fieldProps?.formatter?.(digit) || digit;
+  };
+  const dom = /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+    ref: ref,
+    children: [getContent(text[0]), " ", separator, " ", getContent(text[1])]
+  });
+  if (render) {
+    return render(text, {
+      mode: type,
+      ...fieldProps
+    }, dom);
+  }
+  return dom;
+}

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

@@ -1,11 +1,5 @@
 import React from 'react';
-export type Value = string | number | undefined | null;
-export type ValuePair = Value[];
-export type FieldDigitRangeProps = {
-    text: ValuePair;
-    placeholder?: string | string[];
-    separator?: string;
-    separatorWidth?: number;
-};
+import type { FieldDigitRangeProps } from './types';
+export type { FieldDigitRangeProps, Value, ValuePair } from './types';
 declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & FieldDigitRangeProps & React.RefAttributes<any>>;
 export default _default;

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

@@ -6,14 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _util = require("@rc-component/util");
-var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _provider = require("../../../provider");
-var _jsxRuntime = require("react/jsx-runtime");
+var _fieldMode = require("../../internal/fieldMode");
+var _FieldDigitRangeEdit = require("./FieldDigitRangeEdit");
+var _FieldDigitRangeRead = require("./FieldDigitRangeRead");
 /**
  * 数字范围组件
- *
- * @param FieldDigitRangeProps
  */
 const FieldDigitRange = ({
   text,
@@ -44,93 +43,35 @@ const FieldDigitRange = ({
     });
   }, [onChange]);
   const valuePairRef = (0, _react.useRef)(valuePair);
-  if (type === 'read') {
-    const getContent = number => {
-      const digit = new Intl.NumberFormat(undefined, {
-        minimumSignificantDigits: 2,
-        ...(fieldProps?.intlProps || {})
-      }).format(Number(number));
-      return fieldProps?.formatter?.(digit) || digit;
-    };
-    const dom = /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
-      ref: ref,
-      children: [getContent(text[0]), " ", separator, " ", getContent(text[1])]
-    });
-    if (render) {
-      return render(text, {
-        mode: type,
-        ...fieldProps
-      }, dom);
-    }
-    return dom;
+  if ((0, _fieldMode.isProFieldReadMode)(type)) {
+    return (0, _FieldDigitRangeRead.FieldDigitRangeRead)({
+      text,
+      mode: type,
+      render,
+      placeholder,
+      formItemRender,
+      fieldProps,
+      separator,
+      separatorWidth
+    }, ref);
   }
-  if (type === 'edit' || type === 'update') {
-    const handleGroupBlur = () => {
-      if (Array.isArray(valuePairRef.current)) {
-        //   仅在两个值均为数字时才做比较并转换
-        const [value0, value1] = valuePairRef.current;
-        if (typeof value0 === 'number' && typeof value1 === 'number' && value0 > value1) {
-          setValuePair([value1, value0]);
-          return;
-        }
-        if (value0 === undefined && value1 === undefined) {
-          // 当两个值均为undefined时将值变为undefined，方便required处理
-          setValuePair(undefined);
-        }
-      }
-    };
-    const handleChange = (index, changedValue) => {
-      const newValuePair = [...(valuePair || [])];
-      newValuePair[index] = changedValue === null ? undefined : changedValue;
-      valuePairRef.current = newValuePair;
-      setValuePair(newValuePair);
-    };
+  if ((0, _fieldMode.isProFieldEditOrUpdateMode)(type)) {
     const placeholderValue = fieldProps?.placeholder || placeholder || [intl.getMessage('tableForm.inputPlaceholder', '请输入'), intl.getMessage('tableForm.inputPlaceholder', '请输入')];
-    const getInputNumberPlaceholder = index => Array.isArray(placeholderValue) ? placeholderValue[index] : placeholderValue;
-    const dom = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space.Compact, {
-      block: true,
-      onBlur: handleGroupBlur,
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.InputNumber, {
-        ...fieldProps,
-        placeholder: getInputNumberPlaceholder(0),
-        id: id ?? `${id}-0`,
-        style: {
-          width: `calc((100% - ${separatorWidth}px) / 2)`
-        },
-        value: valuePair?.[0],
-        defaultValue: defaultValue?.[0],
-        onChange: changedValue => handleChange(0, changedValue)
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Input, {
-        style: {
-          width: separatorWidth,
-          textAlign: 'center',
-          borderInlineStart: 0,
-          borderInlineEnd: 0,
-          pointerEvents: 'none',
-          backgroundColor: token?.colorBgContainer
-        },
-        placeholder: separator,
-        disabled: true
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.InputNumber, {
-        ...fieldProps,
-        placeholder: getInputNumberPlaceholder(1),
-        id: id ?? `${id}-1`,
-        style: {
-          width: `calc((100% - ${separatorWidth}px) / 2)`,
-          borderInlineStart: 0
-        },
-        value: valuePair?.[1],
-        defaultValue: defaultValue?.[1],
-        onChange: changedValue => handleChange(1, changedValue)
-      })]
-    });
-    if (formItemRender) {
-      return formItemRender(text, {
-        mode: type,
-        ...fieldProps
-      }, dom);
-    }
-    return dom;
+    return (0, _FieldDigitRangeEdit.FieldDigitRangeEdit)({
+      text,
+      mode: type,
+      render,
+      placeholder,
+      formItemRender,
+      fieldProps,
+      separator,
+      separatorWidth,
+      valuePair,
+      valuePairRef,
+      setValuePair,
+      token,
+      placeholderValue
+    }, ref);
   }
   return null;
 };

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

@@ -0,0 +1,8 @@
+export type Value = string | number | undefined | null;
+export type ValuePair = Value[];
+export type FieldDigitRangeProps = {
+    text: ValuePair;
+    placeholder?: string | string[];
+    separator?: string;
+    separatorWidth?: number;
+};

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

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

package/lib/field/components/FromNow/FieldFromNowEdit.d.ts

@@ -0,0 +1,12 @@
+import React from 'react';
+import type { IntlType } from '../../../provider';
+import type { ProFieldFC } from '../../types';
+type Props = Parameters<ProFieldFC<{
+    text: string;
+    format?: string;
+    variant?: 'outlined' | 'borderless' | 'filled' | 'underlined';
+}>>[0] & {
+    intl: IntlType;
+};
+export declare function FieldFromNowEdit(props: Props, ref: React.Ref<unknown>): React.JSX.Element;
+export {};

package/lib/field/components/FromNow/FieldFromNowEdit.js

@@ -0,0 +1,39 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FieldFromNowEdit = FieldFromNowEdit;
+var _antd = require("antd");
+var _react = _interopRequireDefault(require("react"));
+var _utils = require("../../../utils");
+var _jsxRuntime = require("react/jsx-runtime");
+function FieldFromNowEdit(props, ref) {
+  const {
+    text,
+    mode,
+    variant,
+    formItemRender,
+    format,
+    fieldProps,
+    intl
+  } = props;
+  const placeholder = intl.getMessage('tableForm.selectPlaceholder', '请选择');
+  const momentValue = (0, _utils.parseValueToDay)(fieldProps.value);
+  const dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.DatePicker, {
+    ref: ref,
+    placeholder: placeholder,
+    showTime: true,
+    variant: variant ?? fieldProps?.variant ?? 'outlined',
+    ...fieldProps,
+    value: momentValue
+  });
+  if (formItemRender) {
+    return formItemRender(text, {
+      mode,
+      ...fieldProps
+    }, dom);
+  }
+  return dom;
+}

package/lib/field/components/FromNow/FieldFromNowRead.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="react" />
+import type { ProFieldFC } from '../../types';
+type Props = Parameters<ProFieldFC<{
+    text: string;
+    format?: string;
+    variant?: 'outlined' | 'borderless' | 'filled' | 'underlined';
+}>>[0];
+export declare function FieldFromNowRead(props: Props): import("react").JSX.Element;
+export {};

package/lib/field/components/FromNow/FieldFromNowRead.js

@@ -0,0 +1,34 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FieldFromNowRead = FieldFromNowRead;
+var _antd = require("antd");
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _jsxRuntime = require("react/jsx-runtime");
+function FieldFromNowRead(props) {
+  const {
+    text,
+    mode,
+    render,
+    format,
+    fieldProps
+  } = props;
+  const dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, {
+    title: (0, _dayjs.default)(text).format(fieldProps?.format || format || 'YYYY-MM-DD HH:mm:ss'),
+    children: (0, _dayjs.default)(text).fromNow()
+  });
+  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/FromNow/index.d.ts

@@ -2,6 +2,6 @@ import React from 'react';
 declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
     text: string;
     format?: string | undefined;
-    variant?: "outlined" | "filled" | "borderless" | "underlined" | undefined;
+    variant?: "outlined" | "borderless" | "filled" | "underlined" | undefined;
 } & React.RefAttributes<any>>;
 export default _default;

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

@@ -5,64 +5,31 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _antd = require("antd");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _relativeTime = _interopRequireDefault(require("dayjs/plugin/relativeTime"));
 var _react = _interopRequireDefault(require("react"));
 var _provider = require("../../../provider");
-var _utils = require("../../../utils");
-var _jsxRuntime = require("react/jsx-runtime");
+var _fieldMode = require("../../internal/fieldMode");
+var _FieldFromNowEdit = require("./FieldFromNowEdit");
+var _FieldFromNowRead = require("./FieldFromNowRead");
 _dayjs.default.extend(_relativeTime.default);
+
 /**
  * 与当前的时间进行比较 http://momentjs.cn/docs/displaying/fromnow.html
- *
- * @param
  */
-const FieldFromNow = ({
-  text,
-  mode,
-  variant,
-  render,
-  formItemRender,
-  format,
-  fieldProps
-}, ref) => {
+const FieldFromNow = (props, ref) => {
   const intl = (0, _provider.useIntl)();
-  if (mode === 'read') {
-    const dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, {
-      title: (0, _dayjs.default)(text).format(fieldProps?.format || format || 'YYYY-MM-DD HH:mm:ss'),
-      children: (0, _dayjs.default)(text).fromNow()
-    });
-    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 {
+    mode
+  } = props;
+  if ((0, _fieldMode.isProFieldReadMode)(mode)) {
+    return (0, _FieldFromNowRead.FieldFromNowRead)(props);
   }
-  if (mode === 'edit' || mode === 'update') {
-    const placeholder = intl.getMessage('tableForm.selectPlaceholder', '请选择');
-    const momentValue = (0, _utils.parseValueToDay)(fieldProps.value);
-    const dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.DatePicker, {
-      ref: ref,
-      placeholder: placeholder,
-      showTime: true,
-      variant: variant ?? fieldProps?.variant ?? 'outlined',
-      ...fieldProps,
-      value: momentValue
-    });
-    if (formItemRender) {
-      return formItemRender(text, {
-        mode,
-        ...fieldProps
-      }, dom);
-    }
-    return dom;
+  if ((0, _fieldMode.isProFieldEditOrUpdateMode)(mode)) {
+    return (0, _FieldFromNowEdit.FieldFromNowEdit)({
+      ...props,
+      intl
+    }, ref);
   }
   return null;
 };

package/lib/field/components/Image/FieldImageEdit.d.ts

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

package/lib/field/components/Image/FieldImageEdit.js

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

package/lib/field/components/Image/FieldImageRead.d.ts

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

package/lib/field/components/Image/FieldImageRead.js

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

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

@@ -1,8 +1,5 @@
-import type { ProFieldFC } from '../../PureProField';
-export type FieldImageProps = {
-    text: string;
-    width?: number;
-    placeholder?: string | string[];
-};
+import type { ProFieldFC } from '../../types';
+import type { FieldImageProps } from './types';
+export type { FieldImageProps };
 declare const _default: ProFieldFC<FieldImageProps>;
 export default _default;

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

@@ -5,16 +5,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _antd = require("antd");
 var _react = _interopRequireDefault(require("react"));
 var _provider = require("../../../provider");
-var _jsxRuntime = require("react/jsx-runtime");
+var _fieldMode = require("../../internal/fieldMode");
+var _FieldImageEdit = require("./FieldImageEdit");
+var _FieldImageRead = require("./FieldImageRead");
 /**
  * 数字组件
- *
- * @param FieldImageProps {
- *     text: number;
- *     moneySymbol?: string; }
  */
 const FieldImage = /*#__PURE__*/_react.default.forwardRef(({
   text,
@@ -26,35 +23,29 @@ const FieldImage = /*#__PURE__*/_react.default.forwardRef(({
   width
 }, ref) => {
   const intl = (0, _provider.useIntl)();
-  const placeholderValue = placeholder || intl.getMessage('tableForm.inputPlaceholder', '请输入');
-  if (type === 'read') {
-    const dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Image, {
-      ref: ref,
-      width: width || 32,
-      src: text,
-      ...fieldProps
-    });
-    if (render) {
-      return render(text, {
-        mode: type,
-        ...fieldProps
-      }, dom);
-    }
-    return dom;
+  const placeholderValue = (Array.isArray(placeholder) ? placeholder[0] : placeholder) || intl.getMessage('tableForm.inputPlaceholder', '请输入');
+  if ((0, _fieldMode.isProFieldReadMode)(type)) {
+    return (0, _FieldImageRead.FieldImageRead)({
+      text,
+      mode: type,
+      render,
+      formItemRender,
+      fieldProps,
+      placeholder,
+      width
+    }, ref);
   }
-  if (type === 'edit' || type === 'update') {
-    const dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Input, {
-      ref: ref,
-      placeholder: placeholderValue,
-      ...fieldProps
-    });
-    if (formItemRender) {
-      return formItemRender(text, {
-        mode: type,
-        ...fieldProps
-      }, dom);
-    }
-    return dom;
+  if ((0, _fieldMode.isProFieldEditOrUpdateMode)(type)) {
+    return (0, _FieldImageEdit.FieldImageEdit)({
+      text,
+      mode: type,
+      render,
+      formItemRender,
+      fieldProps,
+      placeholder,
+      width,
+      placeholderValue
+    }, ref);
   }
   return null;
 });