@ant-design/pro-components 3.1.0-0 → 3.1.1-1

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

@@ -1,4 +1,3 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { DatePicker, Tooltip } from 'antd';
 import dayjs from 'dayjs';
 import relativeTime from 'dayjs/plugin/relativeTime';
@@ -13,24 +12,26 @@ dayjs.extend(relativeTime);
  *
  * @param
  */
-var FieldFromNow = function FieldFromNow(_ref, ref) {
-  var text = _ref.text,
-    mode = _ref.mode,
-    plain = _ref.plain,
-    render = _ref.render,
-    formItemRender = _ref.formItemRender,
-    format = _ref.format,
-    fieldProps = _ref.fieldProps;
-  var intl = useIntl();
+const FieldFromNow = ({
+  text,
+  mode,
+  plain,
+  render,
+  formItemRender,
+  format,
+  fieldProps
+}, ref) => {
+  const intl = useIntl();
   if (mode === 'read') {
-    var dom = /*#__PURE__*/_jsx(Tooltip, {
-      title: dayjs(text).format((fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.format) || format || 'YYYY-MM-DD HH:mm:ss'),
+    const dom = /*#__PURE__*/_jsx(Tooltip, {
+      title: dayjs(text).format(fieldProps?.format || format || 'YYYY-MM-DD HH:mm:ss'),
       children: dayjs(text).fromNow()
     });
     if (render) {
-      return render(text, _objectSpread({
-        mode: mode
-      }, fieldProps), /*#__PURE__*/_jsx(_Fragment, {
+      return render(text, {
+        mode,
+        ...fieldProps
+      }, /*#__PURE__*/_jsx(_Fragment, {
         children: dom
       }));
     }
@@ -39,22 +40,23 @@ var FieldFromNow = function FieldFromNow(_ref, ref) {
     });
   }
   if (mode === 'edit' || mode === 'update') {
-    var placeholder = intl.getMessage('tableForm.selectPlaceholder', '请选择');
-    var momentValue = parseValueToDay(fieldProps.value);
-    var _dom = /*#__PURE__*/_jsx(DatePicker, _objectSpread(_objectSpread({
+    const placeholder = intl.getMessage('tableForm.selectPlaceholder', '请选择');
+    const momentValue = parseValueToDay(fieldProps.value);
+    const dom = /*#__PURE__*/_jsx(DatePicker, {
       ref: ref,
       placeholder: placeholder,
       showTime: true,
-      variant: plain === undefined ? 'outlined' : plain ? 'borderless' : 'outlined'
-    }, fieldProps), {}, {
+      variant: plain === undefined ? 'outlined' : plain ? 'borderless' : 'outlined',
+      ...fieldProps,
       value: momentValue
-    }));
+    });
     if (formItemRender) {
-      return formItemRender(text, _objectSpread({
-        mode: mode
-      }, fieldProps), _dom);
+      return formItemRender(text, {
+        mode,
+        ...fieldProps
+      }, dom);
     }
-    return _dom;
+    return dom;
   }
   return null;
 };

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

@@ -1,4 +1,3 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { Image, Input } from 'antd';
 import React from 'react';
 import { useIntl } from "../../../provider";
@@ -10,40 +9,45 @@ import { jsx as _jsx } from "react/jsx-runtime";
  *     text: number;
  *     moneySymbol?: string; }
  */
-var FieldImage = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
-  var text = _ref.text,
-    type = _ref.mode,
-    render = _ref.render,
-    formItemRender = _ref.formItemRender,
-    fieldProps = _ref.fieldProps,
-    placeholder = _ref.placeholder,
-    width = _ref.width;
-  var intl = useIntl();
-  var placeholderValue = placeholder || intl.getMessage('tableForm.inputPlaceholder', '请输入');
+const FieldImage = /*#__PURE__*/React.forwardRef(({
+  text,
+  mode: type,
+  render,
+  formItemRender,
+  fieldProps,
+  placeholder,
+  width
+}, ref) => {
+  const intl = useIntl();
+  const placeholderValue = placeholder || intl.getMessage('tableForm.inputPlaceholder', '请输入');
   if (type === 'read') {
-    var dom = /*#__PURE__*/_jsx(Image, _objectSpread({
+    const dom = /*#__PURE__*/_jsx(Image, {
       ref: ref,
       width: width || 32,
-      src: text
-    }, fieldProps));
+      src: text,
+      ...fieldProps
+    });
     if (render) {
-      return render(text, _objectSpread({
-        mode: type
-      }, fieldProps), dom);
+      return render(text, {
+        mode: type,
+        ...fieldProps
+      }, dom);
     }
     return dom;
   }
   if (type === 'edit' || type === 'update') {
-    var _dom = /*#__PURE__*/_jsx(Input, _objectSpread({
+    const dom = /*#__PURE__*/_jsx(Input, {
       ref: ref,
-      placeholder: placeholderValue
-    }, fieldProps));
+      placeholder: placeholderValue,
+      ...fieldProps
+    });
     if (formItemRender) {
-      return formItemRender(text, _objectSpread({
-        mode: type
-      }, fieldProps), _dom);
+      return formItemRender(text, {
+        mode: type,
+        ...fieldProps
+      }, dom);
     }
-    return _dom;
+    return dom;
   }
   return null;
 });

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

@@ -1,6 +1,5 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { ConfigProvider } from 'antd';
-import classnames from 'classnames';
+import { clsx } from 'clsx';
 import React, { useContext } from 'react';
 import { useStyle } from "../../../utils";
 
@@ -10,17 +9,22 @@ import { useStyle } from "../../../utils";
  * @param param0
  */
 import { jsx as _jsx } from "react/jsx-runtime";
-var IndexColumn = function IndexColumn(_ref, ref) {
-  var _ref$border = _ref.border,
-    border = _ref$border === void 0 ? false : _ref$border,
-    children = _ref.children;
-  var _useContext = useContext(ConfigProvider.ConfigContext),
-    getPrefixCls = _useContext.getPrefixCls;
-  var className = getPrefixCls('pro-field-index-column');
+const IndexColumn = ({
+  border = false,
+  children
+}, ref) => {
+  const {
+    getPrefixCls
+  } = useContext(ConfigProvider.ConfigContext);
+  const className = getPrefixCls('pro-field-index-column');
 
   // css
-  var _useStyle = useStyle('IndexColumn', function () {
-      return _defineProperty({}, ".".concat(className), {
+  const {
+    wrapSSR,
+    hashId
+  } = useStyle('IndexColumn', () => {
+    return {
+      [`.${className}`]: {
         display: 'inline-flex',
         alignItems: 'center',
         justifyContent: 'center',
@@ -36,13 +40,15 @@ var IndexColumn = function IndexColumn(_ref, ref) {
             backgroundColor: '#979797'
           }
         }
-      });
-    }),
-    wrapSSR = _useStyle.wrapSSR,
-    hashId = _useStyle.hashId;
+      }
+    };
+  });
   return wrapSSR( /*#__PURE__*/_jsx("div", {
     ref: ref,
-    className: classnames(className, hashId, _defineProperty(_defineProperty({}, "".concat(className, "-border"), border), 'top-three', children > 3)),
+    className: clsx(className, hashId, {
+      [`${className}-border`]: border,
+      'top-three': children > 3
+    }),
     children: children
   }));
 };

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

@@ -1,38 +1,33 @@
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-var _excluded = ["contentRender", "numberFormatOptions", "numberPopoverRender", "open"],
-  _excluded2 = ["text", "mode", "render", "formItemRender", "fieldProps", "proFieldKey", "plain", "valueEnum", "placeholder", "locale", "customSymbol", "numberFormatOptions", "numberPopoverRender"];
-import { omit, useMergedState } from '@rc-component/util';
+import { omit, useControlledState } from '@rc-component/util';
 import { InputNumber, Popover } from 'antd';
 import React, { useCallback, useMemo } from 'react';
 import { intlMap as allIntlMap, useIntl } from "../../../provider";
 import { jsx as _jsx } from "react/jsx-runtime";
-var defaultMoneyIntl = new Intl.NumberFormat('zh-Hans-CN', {
+const defaultMoneyIntl = new Intl.NumberFormat('zh-Hans-CN', {
   currency: 'CNY',
   style: 'currency'
 });
-var enMoneyIntl = {
+const enMoneyIntl = {
   style: 'currency',
   currency: 'USD'
 };
-var ruMoneyIntl = {
+const ruMoneyIntl = {
   style: 'currency',
   currency: 'RUB'
 };
-var rsMoneyIntl = {
+const rsMoneyIntl = {
   style: 'currency',
   currency: 'RSD'
 };
-var msMoneyIntl = {
+const msMoneyIntl = {
   style: 'currency',
   currency: 'MYR'
 };
-var ptMoneyIntl = {
+const ptMoneyIntl = {
   style: 'currency',
   currency: 'BRL'
 };
-var intlMap = {
+const intlMap = {
   default: defaultMoneyIntl,
   'zh-Hans-CN': {
     currency: 'CNY',
@@ -55,17 +50,16 @@ var intlMap = {
  * configuration of the number format in the Intl.NumberFormat method.
  * @returns A function that takes in 4 parameters and returns a string.
  */
-var getTextByLocale = function getTextByLocale(locale, paramsText, precision, config) {
-  var moneySymbol = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : '';
-  var moneyText = paramsText === null || paramsText === void 0 ? void 0 : paramsText.toString().replaceAll(',', '');
+const getTextByLocale = (locale, paramsText, precision, config, moneySymbol = '') => {
+  let moneyText = paramsText?.toString().replaceAll(',', '');
   if (typeof moneyText === 'string') {
-    var parsedNum = Number(moneyText);
+    const parsedNum = Number(moneyText);
     // 转换数字为NaN时，返回原始值展示
     if (Number.isNaN(parsedNum)) return moneyText;
     moneyText = parsedNum;
   }
   if (!moneyText && moneyText !== 0) return '';
-  var supportFormat = false;
+  let supportFormat = false;
   try {
     supportFormat = locale !== false && Intl.NumberFormat.supportedLocalesOf([locale.replace('_', '-')], {
       localeMatcher: 'lookup'
@@ -73,43 +67,43 @@ var getTextByLocale = function getTextByLocale(locale, paramsText, precision, co
   } catch (error) {}
   try {
     // Formatting the number, when readonly moneySymbol = false, unused currency.
-    var initNumberFormatter = new Intl.NumberFormat(supportFormat && locale !== false ? (locale === null || locale === void 0 ? void 0 : locale.replace('_', '-')) || 'zh-Hans-CN' : 'zh-Hans-CN', _objectSpread(_objectSpread({}, intlMap[locale || 'zh-Hans-CN'] || defaultMoneyIntl), {}, {
-      maximumFractionDigits: precision
-    }, config));
-    var finalMoneyText = initNumberFormatter.format(moneyText);
+    const initNumberFormatter = new Intl.NumberFormat(supportFormat && locale !== false ? locale?.replace('_', '-') || 'zh-Hans-CN' : 'zh-Hans-CN', {
+      ...(intlMap[locale || 'zh-Hans-CN'] || defaultMoneyIntl),
+      maximumFractionDigits: precision,
+      ...config
+    });
+    const finalMoneyText = initNumberFormatter.format(moneyText);
 
     // 同时出现两个符号的情况需要处理
-    var doubleSymbolFormat = function doubleSymbolFormat(Text) {
-      var match = Text.match(/\d+/);
+    const doubleSymbolFormat = Text => {
+      const match = Text.match(/\d+/);
       if (match) {
-        var number = match[0];
+        const number = match[0];
         return Text.slice(Text.indexOf(number));
       } else {
         return Text;
       }
     };
     // 过滤一下，只留下数字
-    var pureMoneyText = doubleSymbolFormat(finalMoneyText);
+    const pureMoneyText = doubleSymbolFormat(finalMoneyText);
 
     /**
      * 首字母判断是否是正负符号
      */
-    var _ref = finalMoneyText || '',
-      _ref2 = _slicedToArray(_ref, 1),
-      operatorSymbol = _ref2[0];
+    const [operatorSymbol] = finalMoneyText || '';
 
     // 兼容正负号
     if (['+', '-'].includes(operatorSymbol)) {
-      return "".concat(moneySymbol || '').concat(operatorSymbol).concat(pureMoneyText);
+      return `${moneySymbol || ''}${operatorSymbol}${pureMoneyText}`;
     }
-    return "".concat(moneySymbol || '').concat(pureMoneyText);
+    return `${moneySymbol || ''}${pureMoneyText}`;
   } catch (error) {
     return moneyText;
   }
 };
 
 // 默认的代码类型
-var DefaultPrecisionCont = 2;
+const DefaultPrecisionCont = 2;
 
 /**
  * input 的弹框，用于显示格式化之后的内容
@@ -117,42 +111,43 @@ var DefaultPrecisionCont = 2;
  * @result 10,000 -> 一万
  * @result 10, 00, 000, 000 -> 一亿
  */
-var InputNumberPopover = /*#__PURE__*/React.forwardRef(function (_ref3, ref) {
-  var content = _ref3.contentRender,
-    numberFormatOptions = _ref3.numberFormatOptions,
-    numberPopoverRender = _ref3.numberPopoverRender,
-    open = _ref3.open,
-    rest = _objectWithoutProperties(_ref3, _excluded);
-  var _useMergedState = useMergedState(function () {
-      return rest.defaultValue;
-    }, {
-      value: rest.value,
-      onChange: rest.onChange
-    }),
-    _useMergedState2 = _slicedToArray(_useMergedState, 2),
-    value = _useMergedState2[0],
-    onChange = _useMergedState2[1];
+const InputNumberPopover = /*#__PURE__*/React.forwardRef(({
+  contentRender: content,
+  numberFormatOptions,
+  numberPopoverRender,
+  open,
+  ...rest
+}, ref) => {
+  const [value, setValueInner] = useControlledState(() => rest.defaultValue, rest.value);
+  const onChange = useCallback(updater => {
+    setValueInner(prev => {
+      const next = typeof updater === 'function' ? updater(prev) : updater;
+      rest.onChange?.(next);
+      return next;
+    });
+  }, [rest.onChange]);
 
   /**
    * 如果content 存在要根据 content 渲染一下
    */
-  var dom = content === null || content === void 0 ? void 0 : content(_objectSpread(_objectSpread({}, rest), {}, {
-    value: value
-  }));
+  const dom = content?.({
+    ...rest,
+    value
+  });
   return /*#__PURE__*/_jsx(Popover, {
     placement: "topLeft",
     open: dom ? open : false,
     trigger: ['focus', 'click'],
     content: dom,
-    getPopupContainer: function getPopupContainer(triggerNode) {
-      return (triggerNode === null || triggerNode === void 0 ? void 0 : triggerNode.parentElement) || document.body;
+    getPopupContainer: triggerNode => {
+      return triggerNode?.parentElement || document.body;
     },
-    children: /*#__PURE__*/_jsx(InputNumber, _objectSpread(_objectSpread({
-      ref: ref
-    }, rest), {}, {
+    children: /*#__PURE__*/_jsx(InputNumber, {
+      ref: ref,
+      ...rest,
       value: value,
       onChange: onChange
-    }))
+    })
   });
 });
 
@@ -163,32 +158,29 @@ var InputNumberPopover = /*#__PURE__*/React.forwardRef(function (_ref3, ref) {
  *     text: number;
  *     moneySymbol?: string; }
  */
-var FieldMoney = function FieldMoney(_ref4, ref) {
-  var _fieldProps$precision;
-  var text = _ref4.text,
-    type = _ref4.mode,
-    render = _ref4.render,
-    formItemRender = _ref4.formItemRender,
-    fieldProps = _ref4.fieldProps,
-    proFieldKey = _ref4.proFieldKey,
-    plain = _ref4.plain,
-    valueEnum = _ref4.valueEnum,
-    placeholder = _ref4.placeholder,
-    locale = _ref4.locale,
-    _ref4$customSymbol = _ref4.customSymbol,
-    customSymbol = _ref4$customSymbol === void 0 ? fieldProps.customSymbol : _ref4$customSymbol,
-    _ref4$numberFormatOpt = _ref4.numberFormatOptions,
-    numberFormatOptions = _ref4$numberFormatOpt === void 0 ? fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.numberFormatOptions : _ref4$numberFormatOpt,
-    _ref4$numberPopoverRe = _ref4.numberPopoverRender,
-    numberPopoverRender = _ref4$numberPopoverRe === void 0 ? (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.numberPopoverRender) || false : _ref4$numberPopoverRe,
-    rest = _objectWithoutProperties(_ref4, _excluded2);
-  var precision = (_fieldProps$precision = fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.precision) !== null && _fieldProps$precision !== void 0 ? _fieldProps$precision : DefaultPrecisionCont;
-  var intl = useIntl();
+const FieldMoney = ({
+  text,
+  mode: type,
+  render,
+  formItemRender,
+  fieldProps,
+  proFieldKey,
+  plain,
+  valueEnum,
+  placeholder,
+  locale,
+  customSymbol = fieldProps.customSymbol,
+  numberFormatOptions = fieldProps?.numberFormatOptions,
+  numberPopoverRender = fieldProps?.numberPopoverRender || false,
+  ...rest
+}, ref) => {
+  const precision = fieldProps?.precision ?? DefaultPrecisionCont;
+  let intl = useIntl();
   // 当手动传入locale时，应该以传入的locale为准，未传入时则根据全局的locale进行国际化
   if (locale && allIntlMap[locale]) {
     intl = allIntlMap[locale];
   }
-  var placeholderValue = placeholder || intl.getMessage('tableForm.inputPlaceholder', '请输入');
+  const placeholderValue = placeholder || intl.getMessage('tableForm.inputPlaceholder', '请输入');
 
   /**
    * 获取货币的符号
@@ -196,7 +188,7 @@ var FieldMoney = function FieldMoney(_ref4, ref) {
    * 如果 moneySymbol 为 false，返回空
    * 如果没有配置使用默认的
    */
-  var moneySymbol = useMemo(function () {
+  const moneySymbol = useMemo(() => {
     if (customSymbol) {
       return customSymbol;
     }
@@ -210,51 +202,50 @@ var FieldMoney = function FieldMoney(_ref4, ref) {
    * A function that formats the number.
    * 1000 -> 1,000
    */
-  var getFormateValue = useCallback(function (value) {
+  const getFormateValue = useCallback(value => {
     // 新建数字正则，需要配置小数点
-    var reg = new RegExp("\\B(?=(\\d{".concat(3 + Math.max(precision - DefaultPrecisionCont, 0), "})+(?!\\d))"), 'g');
+    const reg = new RegExp(`\\B(?=(\\d{${3 + Math.max(precision - DefaultPrecisionCont, 0)}})+(?!\\d))`, 'g');
     // 切分为 整数 和 小数 不同
-    var _String$split = String(value).split('.'),
-      _String$split2 = _slicedToArray(_String$split, 2),
-      intStr = _String$split2[0],
-      floatStr = _String$split2[1];
+    const [intStr, floatStr] = String(value).split('.');
 
     // 最终的数据string，需要去掉 , 号。
-    var resultInt = intStr.replace(reg, ',');
+    const resultInt = intStr.replace(reg, ',');
 
     // 计算最终的小数点
-    var resultFloat = '';
+    let resultFloat = '';
 
     /* Taking the floatStr and slicing it to the precision. */
     if (floatStr && precision > 0) {
-      resultFloat = ".".concat(floatStr.slice(0, precision === undefined ? DefaultPrecisionCont : precision));
+      resultFloat = `.${floatStr.slice(0, precision === undefined ? DefaultPrecisionCont : precision)}`;
     }
-    return "".concat(resultInt).concat(resultFloat);
+    return `${resultInt}${resultFloat}`;
   }, [precision]);
 
   // 如果是阅读模式，直接返回字符串
   if (type === 'read') {
-    var dom = /*#__PURE__*/_jsx("span", {
+    const dom = /*#__PURE__*/_jsx("span", {
       ref: ref,
-      children: getTextByLocale(locale || false, text, precision, numberFormatOptions !== null && numberFormatOptions !== void 0 ? numberFormatOptions : fieldProps.numberFormatOptions, moneySymbol)
+      children: getTextByLocale(locale || false, text, precision, numberFormatOptions ?? fieldProps.numberFormatOptions, moneySymbol)
     });
     if (render) {
-      return render(text, _objectSpread({
-        mode: type
-      }, fieldProps), dom);
+      return render(text, {
+        mode: type,
+        ...fieldProps
+      }, dom);
     }
     return dom;
   }
   if (type === 'edit' || type === 'update') {
-    var _dom = /*#__PURE__*/_jsx(InputNumberPopover, _objectSpread(_objectSpread({
-      contentRender: function contentRender(props) {
+    const dom = /*#__PURE__*/_jsx(InputNumberPopover, {
+      contentRender: props => {
         if (numberPopoverRender === false) return null;
         if (!props.value) return null;
-        var localeText = getTextByLocale(moneySymbol || locale || false, "".concat(getFormateValue(props.value)), precision, _objectSpread(_objectSpread({}, numberFormatOptions), {}, {
+        const localeText = getTextByLocale(moneySymbol || locale || false, `${getFormateValue(props.value)}`, precision, {
+          ...numberFormatOptions,
           notation: 'compact'
-        }), moneySymbol);
+        }, moneySymbol);
         if (typeof numberPopoverRender === 'function') {
-          return numberPopoverRender === null || numberPopoverRender === void 0 ? void 0 : numberPopoverRender(props, localeText);
+          return numberPopoverRender?.(props, localeText);
         }
         return localeText;
       },
@@ -262,35 +253,35 @@ var FieldMoney = function FieldMoney(_ref4, ref) {
       precision: precision
       // 删除默认min={0}，允许输入一个负数的金额，用户可自行配置min来限制是否允许小于0的金额
       ,
-      formatter: function formatter(value) {
+      formatter: value => {
         if (value && moneySymbol) {
-          return "".concat(moneySymbol, " ").concat(getFormateValue(value));
+          return `${moneySymbol} ${getFormateValue(value)}`;
         }
-        return (value === null || value === void 0 ? void 0 : value.toString()) || value;
+        return value?.toString() || value;
       },
-      parser: function parser(value) {
+      parser: value => {
         if (moneySymbol && value) {
-          return value.replace(new RegExp("\\".concat(moneySymbol, "\\s?|(,*)"), 'g'), '');
+          return value.replace(new RegExp(`\\${moneySymbol}\\s?|(,*)`, 'g'), '');
         }
         return value;
       },
-      placeholder: placeholderValue
-    }, omit(fieldProps, ['numberFormatOptions', 'precision', 'numberPopoverRender', 'customSymbol', 'moneySymbol', 'visible', 'open'])), {}, {
-      onBlur: fieldProps.onBlur ? function (e) {
-        var _fieldProps$onBlur;
-        var value = e.target.value;
+      placeholder: placeholderValue,
+      ...omit(fieldProps, ['numberFormatOptions', 'precision', 'numberPopoverRender', 'customSymbol', 'moneySymbol', 'visible', 'open']),
+      onBlur: fieldProps.onBlur ? e => {
+        let value = e.target.value;
         if (moneySymbol && value) {
-          value = value.replace(new RegExp("\\".concat(moneySymbol, "\\s?|(,*)"), 'g'), '');
+          value = value.replace(new RegExp(`\\${moneySymbol}\\s?|(,*)`, 'g'), '');
         }
-        (_fieldProps$onBlur = fieldProps.onBlur) === null || _fieldProps$onBlur === void 0 || _fieldProps$onBlur.call(fieldProps, value);
+        fieldProps.onBlur?.(value);
       } : undefined
-    }));
+    });
     if (formItemRender) {
-      return formItemRender(text, _objectSpread({
-        mode: type
-      }, fieldProps), _dom);
+      return formItemRender(text, {
+        mode: type,
+        ...fieldProps
+      }, dom);
     }
-    return _dom;
+    return dom;
   }
   return null;
 };