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

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

@@ -1,4 +1,3 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { InputNumber } from 'antd';
 import React, { Fragment, useMemo } from 'react';
 import { useIntl } from "../../../provider";
@@ -10,37 +9,34 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
  *
  * @param PercentPropInt
  */
-var FieldPercent = function FieldPercent(_ref, ref) {
-  var text = _ref.text,
-    prefix = _ref.prefix,
-    precision = _ref.precision,
-    _ref$suffix = _ref.suffix,
-    suffix = _ref$suffix === void 0 ? '%' : _ref$suffix,
-    mode = _ref.mode,
-    _ref$showColor = _ref.showColor,
-    showColor = _ref$showColor === void 0 ? false : _ref$showColor,
-    render = _ref.render,
-    formItemRender = _ref.formItemRender,
-    fieldProps = _ref.fieldProps,
-    placeholder = _ref.placeholder,
-    propsShowSymbol = _ref.showSymbol;
-  var intl = useIntl();
-  var placeholderValue = placeholder || intl.getMessage('tableForm.inputPlaceholder', '请输入');
-  var realValue = useMemo(function () {
-    return typeof text === 'string' && text.includes('%') ? toNumber(text.replace('%', '')) : toNumber(text);
-  }, [text]);
-  var showSymbol = useMemo(function () {
+const FieldPercent = ({
+  text,
+  prefix,
+  precision,
+  suffix = '%',
+  mode,
+  showColor = false,
+  render,
+  formItemRender,
+  fieldProps,
+  placeholder,
+  showSymbol: propsShowSymbol
+}, ref) => {
+  const intl = useIntl();
+  const placeholderValue = placeholder || intl.getMessage('tableForm.inputPlaceholder', '请输入');
+  const realValue = useMemo(() => typeof text === 'string' && text.includes('%') ? toNumber(text.replace('%', '')) : toNumber(text), [text]);
+  const showSymbol = useMemo(() => {
     if (typeof propsShowSymbol === 'function') {
-      return propsShowSymbol === null || propsShowSymbol === void 0 ? void 0 : propsShowSymbol(text);
+      return propsShowSymbol?.(text);
     }
     return propsShowSymbol;
   }, [propsShowSymbol, text]);
   if (mode === 'read') {
     /** 颜色有待确定, 根据提供 colors: ['正', '负'] | boolean */
-    var style = showColor ? {
+    const style = showColor ? {
       color: getColorByRealValue(realValue)
     } : {};
-    var dom = /*#__PURE__*/_jsxs("span", {
+    const dom = /*#__PURE__*/_jsxs("span", {
       style: style,
       ref: ref,
       children: [prefix && /*#__PURE__*/_jsx("span", {
@@ -50,37 +46,37 @@ var FieldPercent = function FieldPercent(_ref, ref) {
       }), getRealTextWithPrecision(Math.abs(realValue), precision), suffix && suffix]
     });
     if (render) {
-      return render(text, _objectSpread(_objectSpread({
-        mode: mode
-      }, fieldProps), {}, {
-        prefix: prefix,
-        precision: precision,
-        showSymbol: showSymbol,
-        suffix: suffix
-      }), dom);
+      return render(text, {
+        mode,
+        ...fieldProps,
+        prefix,
+        precision,
+        showSymbol,
+        suffix
+      }, dom);
     }
     return dom;
   }
   if (mode === 'edit' || mode === 'update') {
-    var _dom = /*#__PURE__*/_jsx(InputNumber, _objectSpread({
+    const dom = /*#__PURE__*/_jsx(InputNumber, {
       ref: ref,
-      formatter: function formatter(value) {
+      formatter: value => {
         if (value && prefix) {
-          return "".concat(prefix, " ").concat(value).replace(/\B(?=(\d{3})+(?!\d)$)/g, ',');
+          return `${prefix} ${value}`.replace(/\B(?=(\d{3})+(?!\d)$)/g, ',');
         }
         return value;
       },
-      parser: function parser(value) {
-        return value ? value.replace(/.*\s|,/g, '') : '';
-      },
-      placeholder: placeholderValue
-    }, fieldProps));
+      parser: value => value ? value.replace(/.*\s|,/g, '') : '',
+      placeholder: placeholderValue,
+      ...fieldProps
+    });
     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/Percent/util.d.ts

@@ -1,7 +1,7 @@
 /** 获取展示符号 */
 export declare function getSymbolByRealValue(realValue: number): "-" | "+" | null;
 /** 获取颜色 */
-export declare function getColorByRealValue(realValue: number /** ,color: string */): "#595959" | "#52c41a" | "#ff4d4f";
+export declare function getColorByRealValue(realValue: number /** ,color: string */): "#52c41a" | "#595959" | "#ff4d4f";
 /** 获取到最后展示的数字 */
 export declare function getRealTextWithPrecision(realValue: number, precision?: number): string | number;
 /**

package/es/field/components/Percent/util.js

@@ -1,4 +1,3 @@
-import _typeof from "@babel/runtime/helpers/esm/typeof";
 /** 获取展示符号 */
 export function getSymbolByRealValue(realValue) {
   if (realValue === 0) {
@@ -19,9 +18,8 @@ export function getColorByRealValue(realValue) {
 }
 
 /** 获取到最后展示的数字 */
-export function getRealTextWithPrecision(realValue) {
-  var precision = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
-  return precision >= 0 ? realValue === null || realValue === void 0 ? void 0 : realValue.toFixed(precision) : realValue;
+export function getRealTextWithPrecision(realValue, precision = 2) {
+  return precision >= 0 ? realValue?.toFixed(precision) : realValue;
 }
 
 /**
@@ -29,7 +27,7 @@ export function getRealTextWithPrecision(realValue) {
  * @copy from https://github.com/toss/es-toolkit/blob/32a183828c244d675f46810935e45dfefec81a54/src/compat/util/toNumber.ts#L19
  */
 export function toNumber(value) {
-  if (_typeof(value) === 'symbol' || value instanceof Symbol) {
+  if (typeof value === 'symbol' || value instanceof Symbol) {
     return NaN;
   }
   return Number(value);

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

@@ -1,4 +1,3 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { InputNumber, Progress } from 'antd';
 import React, { useMemo } from 'react';
 import { useIntl } from "../../../provider";
@@ -22,21 +21,20 @@ export function getProgressStatus(text) {
  *
  * @param
  */
-var FieldProgress = function FieldProgress(_ref, ref) {
-  var text = _ref.text,
-    mode = _ref.mode,
-    render = _ref.render,
-    plain = _ref.plain,
-    formItemRender = _ref.formItemRender,
-    fieldProps = _ref.fieldProps,
-    placeholder = _ref.placeholder;
-  var intl = useIntl();
-  var placeholderValue = placeholder || intl.getMessage('tableForm.inputPlaceholder', '请输入');
-  var realValue = useMemo(function () {
-    return typeof text === 'string' && text.includes('%') ? toNumber(text.replace('%', '')) : toNumber(text);
-  }, [text]);
+const FieldProgress = ({
+  text,
+  mode,
+  render,
+  plain,
+  formItemRender,
+  fieldProps,
+  placeholder
+}, ref) => {
+  const intl = useIntl();
+  const placeholderValue = placeholder || intl.getMessage('tableForm.inputPlaceholder', '请输入');
+  const realValue = useMemo(() => typeof text === 'string' && text.includes('%') ? toNumber(text.replace('%', '')) : toNumber(text), [text]);
   if (mode === 'read') {
-    var dom = /*#__PURE__*/_jsx(Progress, _objectSpread({
+    const dom = /*#__PURE__*/_jsx(Progress, {
       ref: ref,
       size: "small",
       style: {
@@ -45,26 +43,30 @@ var FieldProgress = function FieldProgress(_ref, ref) {
       },
       percent: realValue,
       steps: plain ? 10 : undefined,
-      status: getProgressStatus(realValue)
-    }, fieldProps));
+      status: getProgressStatus(realValue),
+      ...fieldProps
+    });
     if (render) {
-      return render(realValue, _objectSpread({
-        mode: mode
-      }, fieldProps), dom);
+      return render(realValue, {
+        mode,
+        ...fieldProps
+      }, dom);
     }
     return dom;
   }
   if (mode === 'edit' || mode === 'update') {
-    var _dom = /*#__PURE__*/_jsx(InputNumber, _objectSpread({
+    const dom = /*#__PURE__*/_jsx(InputNumber, {
       ref: ref,
-      placeholder: placeholderValue
-    }, fieldProps));
+      placeholder: placeholderValue,
+      ...fieldProps
+    });
     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/Radio/index.d.ts

@@ -15,7 +15,7 @@ declare const _default: React.ForwardRefExoticComponent<import("src/provider").B
     request?: import("src/utils/typing").ProFieldRequestData | undefined;
     params?: any;
     fieldProps?: any;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "borderless" | "filled" | undefined;
     id?: string | undefined;
     defaultKeyWords?: string | undefined;
 } & import("../../PureProField").ProFieldLightProps & React.RefAttributes<any>>;

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

@@ -1,10 +1,5 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["radioType", "formItemRender", "mode", "render"];
 import { ConfigProvider, Form, Radio, Spin } from 'antd';
-import classNames from 'classnames';
+import { clsx } from 'clsx';
 import React, { useContext, useImperativeHandle, useRef } from 'react';
 import { objectToMap, proFieldParsingText, useStyle } from "../../../utils";
 import { useFieldFetchData } from "../Select";
@@ -16,88 +11,92 @@ import { Fragment as _Fragment } from "react/jsx-runtime";
  * @param param0
  * @param ref
  */
-var FieldRadio = function FieldRadio(_ref, ref) {
-  var _Form$Item, _Form$Item$useStatus;
-  var radioType = _ref.radioType,
-    formItemRender = _ref.formItemRender,
-    mode = _ref.mode,
-    render = _ref.render,
-    rest = _objectWithoutProperties(_ref, _excluded);
-  var _useContext = useContext(ConfigProvider.ConfigContext),
-    getPrefixCls = _useContext.getPrefixCls;
-  var layoutClassName = getPrefixCls('pro-field-radio');
-  var _useFieldFetchData = useFieldFetchData(rest),
-    _useFieldFetchData2 = _slicedToArray(_useFieldFetchData, 3),
-    loading = _useFieldFetchData2[0],
-    options = _useFieldFetchData2[1],
-    _fetchData = _useFieldFetchData2[2];
-  var radioRef = useRef();
-  var status = (_Form$Item = Form.Item) === null || _Form$Item === void 0 || (_Form$Item$useStatus = _Form$Item.useStatus) === null || _Form$Item$useStatus === void 0 ? void 0 : _Form$Item$useStatus.call(_Form$Item);
-  useImperativeHandle(ref, function () {
-    return _objectSpread(_objectSpread({}, radioRef.current || {}), {}, {
-      fetchData: function fetchData(keyWord) {
-        return _fetchData(keyWord);
-      }
-    });
-  }, [_fetchData]);
+const FieldRadio = ({
+  radioType,
+  formItemRender,
+  mode,
+  render,
+  ...rest
+}, ref) => {
+  const {
+    getPrefixCls
+  } = useContext(ConfigProvider.ConfigContext);
+  const layoutClassName = getPrefixCls('pro-field-radio');
+  const [loading, options, fetchData] = useFieldFetchData(rest);
+  const radioRef = useRef();
+  const status = Form.Item?.useStatus?.();
+  useImperativeHandle(ref, () => ({
+    ...(radioRef.current || {}),
+    fetchData: keyWord => fetchData(keyWord)
+  }), [fetchData]);
 
   // css
-  var _useStyle = useStyle('FieldRadioRadio', function (token) {
-      return _defineProperty(_defineProperty(_defineProperty({}, ".".concat(layoutClassName, "-error"), {
+  const {
+    wrapSSR,
+    hashId
+  } = useStyle('FieldRadioRadio', token => {
+    return {
+      [`.${layoutClassName}-error`]: {
         span: {
           color: token.colorError
         }
-      }), ".".concat(layoutClassName, "-warning"), {
+      },
+      [`.${layoutClassName}-warning`]: {
         span: {
           color: token.colorWarning
         }
-      }), ".".concat(layoutClassName, "-vertical"), _defineProperty({}, "".concat(token.antCls, "-radio-wrapper"), {
-        display: 'flex',
-        marginInlineEnd: 0
-      }));
-    }),
-    wrapSSR = _useStyle.wrapSSR,
-    hashId = _useStyle.hashId;
+      },
+      [`.${layoutClassName}-vertical`]: {
+        [`${token.antCls}-radio-wrapper`]: {
+          display: 'flex',
+          marginInlineEnd: 0
+        }
+      }
+    };
+  });
   if (loading) {
     return /*#__PURE__*/_jsx(Spin, {
       size: "small"
     });
   }
   if (mode === 'read') {
-    var optionsValueEnum = options !== null && options !== void 0 && options.length ? options === null || options === void 0 ? void 0 : options.reduce(function (pre, cur) {
-      var _ref3;
-      return _objectSpread(_objectSpread({}, pre), {}, _defineProperty({}, (_ref3 = cur.value) !== null && _ref3 !== void 0 ? _ref3 : '', cur.label));
+    const optionsValueEnum = options?.length ? options?.reduce((pre, cur) => {
+      return {
+        ...pre,
+        [cur.value ?? '']: cur.label
+      };
     }, {}) : undefined;
-    var dom = /*#__PURE__*/_jsx(_Fragment, {
+    const dom = /*#__PURE__*/_jsx(_Fragment, {
       children: proFieldParsingText(rest.text, objectToMap(rest.valueEnum || optionsValueEnum))
     });
     if (render) {
-      var _render;
-      return (_render = render(rest.text, _objectSpread({
-        mode: mode
-      }, rest.fieldProps), dom)) !== null && _render !== void 0 ? _render : null;
+      return render(rest.text, {
+        mode,
+        ...rest.fieldProps
+      }, dom) ?? null;
     }
     return dom;
   }
   if (mode === 'edit') {
-    var _rest$fieldProps;
-    var _dom = wrapSSR( /*#__PURE__*/_jsx(Radio.Group, _objectSpread(_objectSpread({
+    const dom = wrapSSR( /*#__PURE__*/_jsx(Radio.Group, {
       ref: radioRef,
-      optionType: radioType
-    }, rest.fieldProps), {}, {
-      className: classNames((_rest$fieldProps = rest.fieldProps) === null || _rest$fieldProps === void 0 ? void 0 : _rest$fieldProps.className, _defineProperty(_defineProperty({}, "".concat(layoutClassName, "-error"), (status === null || status === void 0 ? void 0 : status.status) === 'error'), "".concat(layoutClassName, "-warning"), (status === null || status === void 0 ? void 0 : status.status) === 'warning'), hashId, "".concat(layoutClassName, "-").concat(rest.fieldProps.layout || 'horizontal')),
+      optionType: radioType,
+      ...rest.fieldProps,
+      className: clsx(rest.fieldProps?.className, {
+        [`${layoutClassName}-error`]: status?.status === 'error',
+        [`${layoutClassName}-warning`]: status?.status === 'warning'
+      }, hashId, `${layoutClassName}-${rest.fieldProps.layout || 'horizontal'}`),
       options: options
-    })));
+    }));
     if (formItemRender) {
-      var _formItemRender;
-      return (_formItemRender = formItemRender(rest.text, _objectSpread(_objectSpread({
-        mode: mode
-      }, rest.fieldProps), {}, {
-        options: options,
-        loading: loading
-      }), _dom)) !== null && _formItemRender !== void 0 ? _formItemRender : null;
+      return formItemRender(rest.text, {
+        mode,
+        ...rest.fieldProps,
+        options,
+        loading
+      }, dom) ?? null;
     }
-    return _dom;
+    return dom;
   }
   return null;
 };

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

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

package/es/field/components/RangePicker/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 React, { useCallback } from 'react';
@@ -12,43 +10,36 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
  *
  * @param
  */
-var FieldRangePicker = function FieldRangePicker(_ref, ref) {
-  var text = _ref.text,
-    mode = _ref.mode,
-    light = _ref.light,
-    label = _ref.label,
-    _ref$format = _ref.format,
-    format = _ref$format === void 0 ? 'YYYY-MM-DD' : _ref$format,
-    render = _ref.render,
-    picker = _ref.picker,
-    formItemRender = _ref.formItemRender,
-    plain = _ref.plain,
-    showTime = _ref.showTime,
-    lightLabel = _ref.lightLabel,
-    variant = _ref.variant,
-    fieldProps = _ref.fieldProps;
-  var intl = useIntl();
-  var _ref2 = Array.isArray(text) ? text : [],
-    _ref3 = _slicedToArray(_ref2, 2),
-    startText = _ref3[0],
-    endText = _ref3[1];
-  var _React$useState = React.useState(false),
-    _React$useState2 = _slicedToArray(_React$useState, 2),
-    open = _React$useState2[0],
-    setOpen = _React$useState2[1];
+const FieldRangePicker = ({
+  text,
+  mode,
+  light,
+  label,
+  format = 'YYYY-MM-DD',
+  render,
+  picker,
+  formItemRender,
+  plain,
+  showTime,
+  lightLabel,
+  variant,
+  fieldProps
+}, ref) => {
+  const intl = useIntl();
+  const [startText, endText] = Array.isArray(text) ? text : [];
+  const [open, setOpen] = React.useState(false);
   // antd 改了一下 交互，这里要兼容一下，不然会导致无法选中第二个数据
-  var genFormatText = useCallback(function (formatValue) {
-    if (typeof (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.format) === 'function') {
-      var _fieldProps$format;
-      return fieldProps === null || fieldProps === void 0 || (_fieldProps$format = fieldProps.format) === null || _fieldProps$format === void 0 ? void 0 : _fieldProps$format.call(fieldProps, formatValue);
+  const genFormatText = useCallback(formatValue => {
+    if (typeof fieldProps?.format === 'function') {
+      return fieldProps?.format?.(formatValue);
     }
-    return (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.format) || format || 'YYYY-MM-DD';
+    return fieldProps?.format || format || 'YYYY-MM-DD';
   }, [fieldProps, format]);
   // activePickerIndex for https://github.com/ant-design/ant-design/issues/22158
-  var parsedStartText = startText ? dayjs(startText).format(genFormatText(dayjs(startText))) : '';
-  var parsedEndText = endText ? dayjs(endText).format(genFormatText(dayjs(endText))) : '';
+  const parsedStartText = startText ? dayjs(startText).format(genFormatText(dayjs(startText))) : '';
+  const parsedEndText = endText ? dayjs(endText).format(genFormatText(dayjs(endText))) : '';
   if (mode === 'read') {
-    var dom = /*#__PURE__*/_jsxs("div", {
+    const dom = /*#__PURE__*/_jsxs("div", {
       ref: ref,
       style: {
         display: 'flex',
@@ -63,79 +54,77 @@ var FieldRangePicker = function FieldRangePicker(_ref, ref) {
       })]
     });
     if (render) {
-      return render(text, _objectSpread({
-        mode: mode
-      }, fieldProps), /*#__PURE__*/_jsx("span", {
+      return render(text, {
+        mode,
+        ...fieldProps
+      }, /*#__PURE__*/_jsx("span", {
         children: dom
       }));
     }
     return dom;
   }
   if (mode === 'edit' || mode === 'update') {
-    var dayValue = parseValueToDay(fieldProps.value);
-    var _dom;
-    var handleRangeChange = function handleRangeChange(value) {
-      var _fieldProps$onChange;
-      fieldProps === null || fieldProps === void 0 || (_fieldProps$onChange = fieldProps.onChange) === null || _fieldProps$onChange === void 0 || _fieldProps$onChange.call(fieldProps, value);
+    const dayValue = parseValueToDay(fieldProps.value);
+    let dom;
+    const handleRangeChange = value => {
+      fieldProps?.onChange?.(value);
       if (!value) {
         setOpen(false);
       }
     };
     if (light) {
-      var _fieldProps$placehold;
-      _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: fieldProps.disabled,
-        value: dayValue || open ? /*#__PURE__*/_jsx(DatePicker.RangePicker, _objectSpread(_objectSpread({
+        value: dayValue || open ? /*#__PURE__*/_jsx(DatePicker.RangePicker, {
           picker: picker,
           showTime: showTime,
           format: format,
-          variant: "borderless"
-        }, fieldProps), {}, {
-          placeholder: (_fieldProps$placehold = fieldProps.placeholder) !== null && _fieldProps$placehold !== void 0 ? _fieldProps$placehold : [intl.getMessage('tableForm.selectPlaceholder', '请选择'), intl.getMessage('tableForm.selectPlaceholder', '请选择')]
+          variant: "borderless",
+          ...fieldProps,
+          placeholder: fieldProps.placeholder ?? [intl.getMessage('tableForm.selectPlaceholder', '请选择'), intl.getMessage('tableForm.selectPlaceholder', '请选择')]
           // onClear={() => {
           //   setOpen(false);
           //   fieldProps?.onClear?.();
           // }}
           ,
           value: dayValue,
-          onOpenChange: function onOpenChange(isOpen) {
-            var _fieldProps$onOpenCha2;
+          onOpenChange: isOpen => {
             if (dayValue) setOpen(isOpen);
-            fieldProps === null || fieldProps === void 0 || (_fieldProps$onOpenCha2 = fieldProps.onOpenChange) === null || _fieldProps$onOpenCha2 === void 0 || _fieldProps$onOpenCha2.call(fieldProps, isOpen);
+            fieldProps?.onOpenChange?.(isOpen);
           },
           onChange: handleRangeChange
-        })) : null,
+        }) : null,
         allowClear: false,
         variant: variant,
         ref: lightLabel,
         downIcon: dayValue || open ? false : undefined
       });
     } else {
-      _dom = /*#__PURE__*/_jsx(DatePicker.RangePicker, _objectSpread(_objectSpread({
+      dom = /*#__PURE__*/_jsx(DatePicker.RangePicker, {
         ref: ref,
         format: format,
         showTime: showTime,
         placeholder: [intl.getMessage('tableForm.selectPlaceholder', '请选择'), intl.getMessage('tableForm.selectPlaceholder', '请选择')],
-        variant: plain === undefined ? 'outlined' : plain ? 'borderless' : 'outlined'
-      }, fieldProps), {}, {
+        variant: plain === undefined ? variant : plain ? 'borderless' : 'outlined',
+        ...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;
 };