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

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

@@ -1,10 +1,8 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { ColorPicker, ConfigProvider } from 'antd';
-import classNames from 'classnames';
+import { clsx } from 'clsx';
 import React, { useContext } from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
-var DEFAULT_PRESETS = {
+const DEFAULT_PRESETS = {
   label: 'Recommended',
   colors: ['#F5222D', '#FA8C16', '#FADB14', '#8BBB11', '#52C41A', '#13A8A8', '#1677FF', '#2F54EB', '#722ED1', '#EB2F96', '#F5222D4D', '#FA8C164D', '#FADB144D', '#8BBB114D', '#52C41A4D', '#13A8A84D', '#1677FF4D', '#2F54EB4D', '#722ED14D', '#EB2F964D']
 };
@@ -16,50 +14,58 @@ var DEFAULT_PRESETS = {
  *     text: number;
  *     moneySymbol?: string; }
  */
-var FieldColorPicker = function FieldColorPicker(_ref, ref) {
-  var text = _ref.text,
-    type = _ref.mode,
-    render = _ref.render,
-    formItemRender = _ref.formItemRender,
-    fieldProps = _ref.fieldProps;
-  var _useContext = useContext(ConfigProvider.ConfigContext),
-    getPrefixCls = _useContext.getPrefixCls;
-  var prefixCls = getPrefixCls('pro-field-color-picker');
+const FieldColorPicker = ({
+  text,
+  mode: type,
+  render,
+  formItemRender,
+  fieldProps
+}, ref) => {
+  const {
+    getPrefixCls
+  } = useContext(ConfigProvider.ConfigContext);
+  const prefixCls = getPrefixCls('pro-field-color-picker');
   if (type === 'read') {
-    var dom = /*#__PURE__*/_jsx(ColorPicker, {
+    const dom = /*#__PURE__*/_jsx(ColorPicker, {
       value: text,
-      className: classNames(_defineProperty({}, prefixCls, true))
+      className: clsx({
+        [prefixCls]: true
+      })
       // 设置无法 open
       ,
       open: false
     });
     if (render) {
-      return render(text, _objectSpread({
-        mode: type
-      }, fieldProps), dom);
+      return render(text, {
+        mode: type,
+        ...fieldProps
+      }, dom);
     }
     return dom;
   }
   if (type === 'edit' || type === 'update') {
     // 解决 默认的 width 100% 问题
-    var style = _objectSpread({
-      display: 'table-cell'
-    }, fieldProps.style);
-    var _dom = /*#__PURE__*/_jsx(ColorPicker, _objectSpread(_objectSpread({
+    const style = {
+      display: 'table-cell',
+      ...fieldProps.style
+    };
+    const dom = /*#__PURE__*/_jsx(ColorPicker, {
       ref: ref,
-      presets: [DEFAULT_PRESETS]
-    }, fieldProps), {}, {
+      presets: [DEFAULT_PRESETS],
+      ...fieldProps,
       style: style,
-      className: classNames(_defineProperty({}, prefixCls, true))
-    }));
+      className: clsx({
+        [prefixCls]: true
+      })
+    });
     if (formItemRender) {
-      return formItemRender(text, _objectSpread(_objectSpread({
-        mode: type
-      }, fieldProps), {}, {
-        style: style
-      }), _dom);
+      return formItemRender(text, {
+        mode: type,
+        ...fieldProps,
+        style
+      }, dom);
     }
-    return _dom;
+    return dom;
   }
   return null;
 };

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

@@ -4,7 +4,7 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
     text: string | number;
     format?: string | undefined;
     showTime?: boolean | undefined;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
-    picker?: "time" | "date" | "month" | "week" | "year" | "quarter" | undefined;
+    variant?: "outlined" | "borderless" | "filled" | "underlined" | undefined;
+    picker?: "date" | "time" | "month" | "week" | "year" | "quarter" | undefined;
 } & ProFieldLightProps & React.RefAttributes<any>>;
 export default _default;

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

@@ -1,5 +1,3 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { DatePicker } from 'antd';
 import dayjs from 'dayjs';
 import weekOfYear from 'dayjs/plugin/weekOfYear';
@@ -9,7 +7,7 @@ import { FieldLabel, parseValueToDay } from "../../../utils";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
 dayjs.extend(weekOfYear);
-var formatDate = function formatDate(text, format) {
+const formatDate = (text, format) => {
   if (!text) return '-';
   if (typeof format === 'function') {
     return format(dayjs(text));
@@ -23,32 +21,30 @@ var formatDate = function formatDate(text, format) {
  *
  * @param
  */
-var FieldDatePicker = function FieldDatePicker(_ref, ref) {
-  var text = _ref.text,
-    mode = _ref.mode,
-    _ref$format = _ref.format,
-    format = _ref$format === void 0 ? 'YYYY-MM-DD' : _ref$format,
-    label = _ref.label,
-    light = _ref.light,
-    render = _ref.render,
-    formItemRender = _ref.formItemRender,
-    plain = _ref.plain,
-    showTime = _ref.showTime,
-    fieldProps = _ref.fieldProps,
-    picker = _ref.picker,
-    variant = _ref.variant,
-    lightLabel = _ref.lightLabel;
-  var intl = useIntl();
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    open = _useState2[0],
-    setOpen = _useState2[1];
+const FieldDatePicker = ({
+  text,
+  mode,
+  format = 'YYYY-MM-DD',
+  label,
+  light,
+  render,
+  formItemRender,
+  plain,
+  showTime,
+  fieldProps,
+  picker,
+  variant,
+  lightLabel
+}, ref) => {
+  const intl = useIntl();
+  const [open, setOpen] = useState(false);
   if (mode === 'read') {
-    var dom = formatDate(text, fieldProps.format || format);
+    const dom = formatDate(text, fieldProps.format || format);
     if (render) {
-      return render(text, _objectSpread({
-        mode: mode
-      }, fieldProps), /*#__PURE__*/_jsx(_Fragment, {
+      return render(text, {
+        mode,
+        ...fieldProps
+      }, /*#__PURE__*/_jsx(_Fragment, {
         children: dom
       }));
     }
@@ -57,62 +53,62 @@ var FieldDatePicker = function FieldDatePicker(_ref, ref) {
     });
   }
   if (mode === 'edit' || mode === 'update') {
-    var _dom;
-    var disabled = fieldProps.disabled,
-      value = fieldProps.value,
-      _fieldProps$placehold = fieldProps.placeholder,
-      placeholder = _fieldProps$placehold === void 0 ? intl.getMessage('tableForm.selectPlaceholder', '请选择') : _fieldProps$placehold;
-    var dayValue = parseValueToDay(value);
+    let dom;
+    const {
+      disabled,
+      value,
+      placeholder = intl.getMessage('tableForm.selectPlaceholder', '请选择')
+    } = fieldProps;
+    const dayValue = parseValueToDay(value);
     if (light) {
-      _dom = /*#__PURE__*/_jsx(FieldLabel, {
+      dom = /*#__PURE__*/_jsx(FieldLabel, {
         label: label,
-        onClick: function onClick() {
-          var _fieldProps$onOpenCha;
-          fieldProps === null || fieldProps === void 0 || (_fieldProps$onOpenCha = fieldProps.onOpenChange) === null || _fieldProps$onOpenCha === void 0 || _fieldProps$onOpenCha.call(fieldProps, true);
+        onClick: () => {
+          fieldProps?.onOpenChange?.(true);
           setOpen(true);
         },
         style: dayValue ? {
           paddingInlineEnd: 0
         } : undefined,
         disabled: disabled,
-        value: dayValue || open ? /*#__PURE__*/_jsx(DatePicker, _objectSpread(_objectSpread({
+        value: dayValue || open ? /*#__PURE__*/_jsx(DatePicker, {
           picker: picker,
           showTime: showTime,
           format: format,
-          ref: ref
-        }, fieldProps), {}, {
+          ref: ref,
+          ...fieldProps,
           value: dayValue,
-          onOpenChange: function onOpenChange(isOpen) {
-            var _fieldProps$onOpenCha2;
+          onOpenChange: isOpen => {
             setOpen(isOpen);
-            fieldProps === null || fieldProps === void 0 || (_fieldProps$onOpenCha2 = fieldProps.onOpenChange) === null || _fieldProps$onOpenCha2 === void 0 || _fieldProps$onOpenCha2.call(fieldProps, isOpen);
+            fieldProps?.onOpenChange?.(isOpen);
           },
           variant: "borderless",
           open: open
-        })) : undefined,
+        }) : undefined,
         allowClear: false,
         downIcon: dayValue || open ? false : undefined,
         variant: variant,
         ref: lightLabel
       });
     } else {
-      _dom = /*#__PURE__*/_jsx(DatePicker, _objectSpread(_objectSpread({
+      dom = /*#__PURE__*/_jsx(DatePicker, {
         picker: picker,
         showTime: showTime,
         format: format,
         placeholder: placeholder,
-        variant: plain === undefined ? 'outlined' : plain ? 'borderless' : 'outlined',
-        ref: ref
-      }, fieldProps), {}, {
+        variant: plain === undefined ? variant : plain ? 'borderless' : 'outlined',
+        ref: ref,
+        ...fieldProps,
         value: dayValue
-      }));
+      });
     }
     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/Digit/index.js

@@ -1,4 +1,3 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { omit } from '@rc-component/util';
 import { InputNumber } from 'antd';
 import React, { useCallback } from 'react';
@@ -12,23 +11,24 @@ import { jsx as _jsx } from "react/jsx-runtime";
  *     text: number;
  *     moneySymbol?: string; }
  */
-var FieldDigit = function FieldDigit(_ref, ref) {
-  var text = _ref.text,
-    type = _ref.mode,
-    render = _ref.render,
-    placeholder = _ref.placeholder,
-    formItemRender = _ref.formItemRender,
-    fieldProps = _ref.fieldProps;
-  var intl = useIntl();
-  var placeholderValue = placeholder || intl.getMessage('tableForm.inputPlaceholder', '请输入');
-  var proxyChange = useCallback(function (value) {
-    var val = value !== null && value !== void 0 ? value : undefined;
+const FieldDigit = ({
+  text,
+  mode: type,
+  render,
+  placeholder,
+  formItemRender,
+  fieldProps
+}, ref) => {
+  const intl = useIntl();
+  const placeholderValue = placeholder || intl.getMessage('tableForm.inputPlaceholder', '请输入');
+  const proxyChange = useCallback(value => {
+    let val = value ?? undefined;
     if (!fieldProps.stringMode && typeof val === 'string') {
       // 处理无效输入，如 '22.22.22'
-      var numVal = Number(val);
+      const numVal = Number(val);
       if (isNaN(numVal)) {
         // 如果转换失败，尝试提取第一个有效的数字
-        var match = val.match(/^(\d+(?:\.\d+)?)/);
+        const match = val.match(/^(\d+(?:\.\d+)?)/);
         if (match) {
           val = Number(match[1]);
         } else {
@@ -44,60 +44,59 @@ var FieldDigit = function FieldDigit(_ref, ref) {
     return val;
   }, [fieldProps]);
   if (type === 'read') {
-    var _fieldProps$formatter;
-    var fractionDigits = {};
-    if (fieldProps !== null && fieldProps !== void 0 && fieldProps.precision) {
+    let fractionDigits = {};
+    if (fieldProps?.precision) {
       fractionDigits = {
         minimumFractionDigits: Number(fieldProps.precision),
         maximumFractionDigits: Number(fieldProps.precision)
       };
     }
-    var digit = new Intl.NumberFormat(undefined, _objectSpread(_objectSpread({}, fractionDigits), (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.intlProps) || {})).format(Number(text));
+    const digit = new Intl.NumberFormat(undefined, {
+      ...fractionDigits,
+      ...(fieldProps?.intlProps || {})
+    }).format(Number(text));
 
     // 如果是 string 模式，什么都不要处理了
-    var dom = !(fieldProps !== null && fieldProps !== void 0 && fieldProps.stringMode) ? /*#__PURE__*/_jsx("span", {
+    const dom = !fieldProps?.stringMode ? /*#__PURE__*/_jsx("span", {
       ref: ref,
-      children: (fieldProps === null || fieldProps === void 0 || (_fieldProps$formatter = fieldProps.formatter) === null || _fieldProps$formatter === void 0 ? void 0 : _fieldProps$formatter.call(fieldProps, digit)) || digit
+      children: fieldProps?.formatter?.(digit) || digit
     }) : /*#__PURE__*/_jsx("span", {
       children: text
     });
     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(InputNumber, _objectSpread(_objectSpread({
+    const dom = /*#__PURE__*/_jsx(InputNumber, {
       ref: ref,
       min: 0,
-      placeholder: placeholderValue
-    }, omit(fieldProps, ['onChange', 'onBlur'])), {}, {
-      onChange: function onChange(e) {
-        var _fieldProps$onChange;
-        return fieldProps === null || fieldProps === void 0 || (_fieldProps$onChange = fieldProps.onChange) === null || _fieldProps$onChange === void 0 ? void 0 : _fieldProps$onChange.call(fieldProps, proxyChange(e));
-      },
-      onBlur: function onBlur(e) {
-        var _fieldProps$onBlur;
-        var value = e.target.value;
-        var processedValue = proxyChange(value);
+      placeholder: placeholderValue,
+      ...omit(fieldProps, ['onChange', 'onBlur']),
+      onChange: e => fieldProps?.onChange?.(proxyChange(e)),
+      onBlur: e => {
+        const value = e.target.value;
+        const processedValue = proxyChange(value);
         // 更新输入框的值
         if (e.target && typeof processedValue === 'number') {
-          var _fieldProps$onChange2;
           e.target.value = processedValue.toString();
           // 触发 onChange 事件以更新表单值
-          fieldProps === null || fieldProps === void 0 || (_fieldProps$onChange2 = fieldProps.onChange) === null || _fieldProps$onChange2 === void 0 || _fieldProps$onChange2.call(fieldProps, processedValue);
+          fieldProps?.onChange?.(processedValue);
         }
-        fieldProps === null || fieldProps === void 0 || (_fieldProps$onBlur = fieldProps.onBlur) === null || _fieldProps$onBlur === void 0 || _fieldProps$onBlur.call(fieldProps, e);
+        fieldProps?.onBlur?.(e);
       }
-    }));
+    });
     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/DigitRange/index.js

@@ -1,9 +1,6 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { useMergedState } from '@rc-component/util';
+import { useControlledState } from '@rc-component/util';
 import { Input, InputNumber, Space } from 'antd';
-import React, { useRef } from 'react';
+import React, { useCallback, useRef } from 'react';
 import { proTheme, useIntl } from "../../../provider";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -12,60 +9,60 @@ import { jsx as _jsx } from "react/jsx-runtime";
  *
  * @param FieldDigitRangeProps
  */
-var FieldDigitRange = function FieldDigitRange(_ref, ref) {
-  var text = _ref.text,
-    type = _ref.mode,
-    render = _ref.render,
-    placeholder = _ref.placeholder,
-    formItemRender = _ref.formItemRender,
-    fieldProps = _ref.fieldProps,
-    _ref$separator = _ref.separator,
-    separator = _ref$separator === void 0 ? '~' : _ref$separator,
-    _ref$separatorWidth = _ref.separatorWidth,
-    separatorWidth = _ref$separatorWidth === void 0 ? 30 : _ref$separatorWidth;
-  var value = fieldProps.value,
-    defaultValue = fieldProps.defaultValue,
-    onChange = fieldProps.onChange,
-    id = fieldProps.id;
-  var intl = useIntl();
-  var _proTheme$useToken = proTheme.useToken(),
-    token = _proTheme$useToken.token;
-  var _useMergedState = useMergedState(function () {
-      return defaultValue;
-    }, {
-      value: value,
-      onChange: onChange
-    }),
-    _useMergedState2 = _slicedToArray(_useMergedState, 2),
-    valuePair = _useMergedState2[0],
-    setValuePair = _useMergedState2[1];
-  var valuePairRef = useRef(valuePair);
+const FieldDigitRange = ({
+  text,
+  mode: type,
+  render,
+  placeholder,
+  formItemRender,
+  fieldProps,
+  separator = '~',
+  separatorWidth = 30
+}, ref) => {
+  const {
+    value,
+    defaultValue,
+    onChange,
+    id
+  } = fieldProps;
+  const intl = useIntl();
+  const {
+    token
+  } = proTheme.useToken();
+  const [valuePair, setValuePairInner] = useControlledState(() => defaultValue, value);
+  const setValuePair = useCallback(updater => {
+    setValuePairInner(prev => {
+      const next = typeof updater === 'function' ? updater(prev) : updater;
+      onChange?.(next);
+      return next;
+    });
+  }, [onChange]);
+  const valuePairRef = useRef(valuePair);
   if (type === 'read') {
-    var getContent = function getContent(number) {
-      var _fieldProps$formatter;
-      var digit = new Intl.NumberFormat(undefined, _objectSpread({
-        minimumSignificantDigits: 2
-      }, (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.intlProps) || {})).format(Number(number));
-      return (fieldProps === null || fieldProps === void 0 || (_fieldProps$formatter = fieldProps.formatter) === null || _fieldProps$formatter === void 0 ? void 0 : _fieldProps$formatter.call(fieldProps, digit)) || digit;
+    const getContent = number => {
+      const digit = new Intl.NumberFormat(undefined, {
+        minimumSignificantDigits: 2,
+        ...(fieldProps?.intlProps || {})
+      }).format(Number(number));
+      return fieldProps?.formatter?.(digit) || digit;
     };
-    var dom = /*#__PURE__*/_jsxs("span", {
+    const dom = /*#__PURE__*/_jsxs("span", {
       ref: ref,
       children: [getContent(text[0]), " ", separator, " ", getContent(text[1])]
     });
     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 handleGroupBlur = function handleGroupBlur() {
+    const handleGroupBlur = () => {
       if (Array.isArray(valuePairRef.current)) {
         //   仅在两个值均为数字时才做比较并转换
-        var _valuePairRef$current = _slicedToArray(valuePairRef.current, 2),
-          value0 = _valuePairRef$current[0],
-          value1 = _valuePairRef$current[1];
+        const [value0, value1] = valuePairRef.current;
         if (typeof value0 === 'number' && typeof value1 === 'number' && value0 > value1) {
           setValuePair([value1, value0]);
           return;
@@ -76,60 +73,57 @@ var FieldDigitRange = function FieldDigitRange(_ref, ref) {
         }
       }
     };
-    var handleChange = function handleChange(index, changedValue) {
-      var newValuePair = _toConsumableArray(valuePair || []);
+    const handleChange = (index, changedValue) => {
+      const newValuePair = [...(valuePair || [])];
       newValuePair[index] = changedValue === null ? undefined : changedValue;
       valuePairRef.current = newValuePair;
       setValuePair(newValuePair);
     };
-    var placeholderValue = (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.placeholder) || placeholder || [intl.getMessage('tableForm.inputPlaceholder', '请输入'), intl.getMessage('tableForm.inputPlaceholder', '请输入')];
-    var getInputNumberPlaceholder = function getInputNumberPlaceholder(index) {
-      return Array.isArray(placeholderValue) ? placeholderValue[index] : placeholderValue;
-    };
-    var _dom = /*#__PURE__*/_jsxs(Space.Compact, {
+    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__*/_jsxs(Space.Compact, {
       onBlur: handleGroupBlur,
-      children: [/*#__PURE__*/_jsx(InputNumber, _objectSpread(_objectSpread({}, fieldProps), {}, {
+      children: [/*#__PURE__*/_jsx(InputNumber, {
+        ...fieldProps,
         placeholder: getInputNumberPlaceholder(0),
-        id: id !== null && id !== void 0 ? id : "".concat(id, "-0"),
+        id: id ?? `${id}-0`,
         style: {
-          width: "calc((100% - ".concat(separatorWidth, "px) / 2)")
+          width: `calc((100% - ${separatorWidth}px) / 2)`
         },
-        value: valuePair === null || valuePair === void 0 ? void 0 : valuePair[0],
-        defaultValue: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue[0],
-        onChange: function onChange(changedValue) {
-          return handleChange(0, changedValue);
-        }
-      })), /*#__PURE__*/_jsx(Input, {
+        value: valuePair?.[0],
+        defaultValue: defaultValue?.[0],
+        onChange: changedValue => handleChange(0, changedValue)
+      }), /*#__PURE__*/_jsx(Input, {
         style: {
           width: separatorWidth,
           textAlign: 'center',
           borderInlineStart: 0,
           borderInlineEnd: 0,
           pointerEvents: 'none',
-          backgroundColor: token === null || token === void 0 ? void 0 : token.colorBgContainer
+          backgroundColor: token?.colorBgContainer
         },
         placeholder: separator,
         disabled: true
-      }), /*#__PURE__*/_jsx(InputNumber, _objectSpread(_objectSpread({}, fieldProps), {}, {
+      }), /*#__PURE__*/_jsx(InputNumber, {
+        ...fieldProps,
         placeholder: getInputNumberPlaceholder(1),
-        id: id !== null && id !== void 0 ? id : "".concat(id, "-1"),
+        id: id ?? `${id}-1`,
         style: {
-          width: "calc((100% - ".concat(separatorWidth, "px) / 2)"),
+          width: `calc((100% - ${separatorWidth}px) / 2)`,
           borderInlineStart: 0
         },
-        value: valuePair === null || valuePair === void 0 ? void 0 : valuePair[1],
-        defaultValue: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue[1],
-        onChange: function onChange(changedValue) {
-          return handleChange(1, changedValue);
-        }
-      }))]
+        value: valuePair?.[1],
+        defaultValue: defaultValue?.[1],
+        onChange: changedValue => handleChange(1, changedValue)
+      })]
     });
     if (formItemRender) {
-      return formItemRender(text, _objectSpread({
-        mode: type
-      }, fieldProps), _dom);
+      return formItemRender(text, {
+        mode: type,
+        ...fieldProps
+      }, dom);
     }
-    return _dom;
+    return dom;
   }
   return null;
 };