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

package/lib/form/components/DatePicker/TimePicker.js

@@ -6,9 +6,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _field = require("../../../field");
 var _provider = require("../../../provider");
@@ -16,45 +13,47 @@ var _FieldContext = _interopRequireDefault(require("../../FieldContext"));
 var _TimeRangePicker = require("../DateRangePicker/TimeRangePicker");
 var _Field = _interopRequireDefault(require("../Field"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["fieldProps", "proFieldProps"];
-var valueType = 'time';
+const valueType = 'time';
 
 /**
  * 时间选择组件
  *
  * @param
  */
-var ProFormTimePicker = function ProFormTimePicker(_ref) {
-  var fieldProps = _ref.fieldProps,
-    proFieldProps = _ref.proFieldProps,
-    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var context = (0, _react.useContext)(_FieldContext.default);
+const ProFormTimePicker = ({
+  fieldProps,
+  proFieldProps,
+  ...rest
+}) => {
+  const context = (0, _react.useContext)(_FieldContext.default);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_provider.ProConfigProvider, {
-    valueTypeMap: (0, _defineProperty2.default)({}, valueType, {
-      render: function render(text, props) {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldTimePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
+    valueTypeMap: {
+      [valueType]: {
+        render: (text, props) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldTimePicker, {
+          ...props,
           text: text
-        }));
-      },
-      formItemRender: function formItemRender(text, props) {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldTimePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
+        }),
+        formItemRender: (text, props) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldTimePicker, {
+          ...props,
           text: text
-        }));
+        })
       }
-    }),
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Field.default, (0, _objectSpread2.default)({
-      fieldProps: (0, _objectSpread2.default)({
-        getPopupContainer: context.getPopupContainer
-      }, fieldProps),
+    },
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Field.default, {
+      fieldProps: {
+        getPopupContainer: context.getPopupContainer,
+        ...fieldProps
+      },
       valueType: valueType,
       proFieldProps: proFieldProps,
       fieldConfig: {
         customLightMode: true,
-        valueType: valueType
-      }
-    }, rest))
+        valueType
+      },
+      ...rest
+    })
   });
 };
-var WrappedProFormTimePicker = ProFormTimePicker;
+const WrappedProFormTimePicker = ProFormTimePicker;
 WrappedProFormTimePicker.RangePicker = _TimeRangePicker.ProFormTimeRangePicker;
 var _default = exports.default = WrappedProFormTimePicker;

package/lib/form/components/DatePicker/WeekPicker.js

@@ -5,31 +5,32 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
 var _BaseDatePicker = require("./BaseDatePicker");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["proFieldProps", "fieldProps"];
-var valueType = 'dateWeek';
+const valueType = 'dateWeek';
 /**
  * 周选择组件
  *
  * @param
  */
-var ProFormDatePickerWeek = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
-  var proFieldProps = _ref.proFieldProps,
-    fieldProps = _ref.fieldProps,
-    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_BaseDatePicker.BaseDatePicker, (0, _objectSpread2.default)({
+const ProFormDatePickerWeek = /*#__PURE__*/_react.default.forwardRef(({
+  proFieldProps,
+  fieldProps,
+  ...rest
+}, ref) => {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_BaseDatePicker.BaseDatePicker, {
     valueType: valueType,
     ref: ref,
-    fieldProps: (0, _objectSpread2.default)({}, fieldProps),
+    fieldProps: {
+      ...fieldProps
+    },
     proFieldProps: proFieldProps,
     fieldConfig: {
-      valueType: valueType,
+      valueType,
       customLightMode: true
-    }
-  }, rest));
+    },
+    ...rest
+  });
 });
 var _default = exports.default = ProFormDatePickerWeek;

package/lib/form/components/DatePicker/YearPicker.js

@@ -5,31 +5,32 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
 var _BaseDatePicker = require("./BaseDatePicker");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["proFieldProps", "fieldProps"];
-var valueType = 'dateYear';
+const valueType = 'dateYear';
 /**
  * 周选择组件
  *
  * @param
  */
-var ProFormDatePickerYear = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
-  var proFieldProps = _ref.proFieldProps,
-    fieldProps = _ref.fieldProps,
-    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_BaseDatePicker.BaseDatePicker, (0, _objectSpread2.default)({
+const ProFormDatePickerYear = /*#__PURE__*/_react.default.forwardRef(({
+  proFieldProps,
+  fieldProps,
+  ...rest
+}, ref) => {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_BaseDatePicker.BaseDatePicker, {
     valueType: valueType,
     ref: ref,
-    fieldProps: (0, _objectSpread2.default)({}, fieldProps),
+    fieldProps: {
+      ...fieldProps
+    },
     proFieldProps: proFieldProps,
     fieldConfig: {
-      valueType: valueType,
+      valueType,
       customLightMode: true
-    }
-  }, rest));
+    },
+    ...rest
+  });
 });
 var _default = exports.default = ProFormDatePickerYear;

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

@@ -10,7 +10,7 @@ var _MonthPicker = _interopRequireDefault(require("./MonthPicker"));
 var _QuarterPicker = _interopRequireDefault(require("./QuarterPicker"));
 var _WeekPicker = _interopRequireDefault(require("./WeekPicker"));
 var _YearPicker = _interopRequireDefault(require("./YearPicker"));
-var ExportComponent = _DatePicker.default;
+const ExportComponent = _DatePicker.default;
 ExportComponent.Week = _WeekPicker.default;
 ExportComponent.Month = _MonthPicker.default;
 ExportComponent.Quarter = _QuarterPicker.default;

package/lib/form/components/DateRangePicker/BaseDateRanger.js

@@ -6,9 +6,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.BaseDateRanger = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _field = require("../../../field");
 var _provider = require("../../../provider");
@@ -16,21 +13,23 @@ var _utils = require("../../../utils");
 var _FieldContext = _interopRequireDefault(require("../../FieldContext"));
 var _Field = _interopRequireDefault(require("../Field"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["fieldProps", "proFieldProps", "valueType"];
-var BaseDateRanger = exports.BaseDateRanger = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
-  var fieldProps = _ref.fieldProps,
-    proFieldProps = _ref.proFieldProps,
-    valueType = _ref.valueType,
-    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var context = (0, _react.useContext)(_FieldContext.default);
-  var mergedFieldProps = (0, _react.useMemo)(function () {
-    var nextFieldProps = fieldProps ? (0, _objectSpread2.default)({}, fieldProps) : {};
+const BaseDateRanger = exports.BaseDateRanger = /*#__PURE__*/_react.default.forwardRef(({
+  fieldProps,
+  proFieldProps,
+  valueType,
+  ...rest
+}, ref) => {
+  const context = (0, _react.useContext)(_FieldContext.default);
+  const mergedFieldProps = (0, _react.useMemo)(() => {
+    const nextFieldProps = fieldProps ? {
+      ...fieldProps
+    } : {};
     if (valueType === 'dateTimeRange' && nextFieldProps.showTime === undefined) {
       nextFieldProps.showTime = true;
     }
     return nextFieldProps;
   }, [fieldProps, valueType]);
-  var lightFilterFormat = (0, _react.useMemo)(function () {
+  const lightFilterFormat = (0, _react.useMemo)(() => {
     if (mergedFieldProps.format) return mergedFieldProps.format;
     switch (valueType) {
       case 'dateTimeRange':
@@ -47,35 +46,36 @@ var BaseDateRanger = exports.BaseDateRanger = /*#__PURE__*/_react.default.forwar
         return 'YYYY-MM-DD';
     }
   }, [mergedFieldProps.format, valueType]);
-  var renderFieldRangePicker = (0, _react.useCallback)(function (text, props) {
-    var _ref2, _fieldPropsFromContex;
-    var fieldPropsFromContext = (_ref2 = props.fieldProps) !== null && _ref2 !== void 0 ? _ref2 : mergedFieldProps;
-    var format = valueType === 'dateTimeRange' ? (_fieldPropsFromContex = fieldPropsFromContext === null || fieldPropsFromContext === void 0 ? void 0 : fieldPropsFromContext.format) !== null && _fieldPropsFromContex !== void 0 ? _fieldPropsFromContex : 'YYYY-MM-DD HH:mm:ss' : fieldPropsFromContext === null || fieldPropsFromContext === void 0 ? void 0 : fieldPropsFromContext.format;
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldRangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
+  const renderFieldRangePicker = (0, _react.useCallback)((text, props) => {
+    const fieldPropsFromContext = props.fieldProps ?? mergedFieldProps;
+    const format = valueType === 'dateTimeRange' ? fieldPropsFromContext?.format ?? 'YYYY-MM-DD HH:mm:ss' : fieldPropsFromContext?.format;
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldRangePicker, {
+      ...props,
       format: format,
       text: text
-    }));
+    });
   }, [mergedFieldProps, valueType]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_provider.ProConfigProvider, {
-    valueTypeMap: (0, _defineProperty2.default)({}, valueType, {
-      render: renderFieldRangePicker,
-      formItemRender: renderFieldRangePicker
-    }),
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Field.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      fieldProps: (0, _objectSpread2.default)({
-        getPopupContainer: context.getPopupContainer
-      }, mergedFieldProps),
+    valueTypeMap: {
+      [valueType]: {
+        render: renderFieldRangePicker,
+        formItemRender: renderFieldRangePicker
+      }
+    },
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Field.default, {
+      fieldProps: {
+        getPopupContainer: context.getPopupContainer,
+        ...mergedFieldProps
+      },
       valueType: valueType,
       proFieldProps: proFieldProps,
       fieldConfig: {
-        valueType: valueType,
+        valueType,
         customLightMode: true,
-        lightFilterLabelFormatter: function lightFilterLabelFormatter(value) {
-          return (0, _utils.dateArrayFormatter)(value, lightFilterFormat);
-        }
-      }
-    }, rest), {}, {
+        lightFilterLabelFormatter: value => (0, _utils.dateArrayFormatter)(value, lightFilterFormat)
+      },
+      ...rest,
       ref: ref
-    }))
+    })
   });
 });

package/lib/form/components/DateRangePicker/DateMonthRangePicker.js

@@ -5,35 +5,34 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ProFormDateMonthRangePicker = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
 var _utils = require("../../../utils");
 var _BaseDateRanger = require("./BaseDateRanger");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["fieldProps", "proFieldProps"];
-var valueType = 'dateMonthRange';
+const valueType = 'dateMonthRange';
 
 /**
  * 月份区间选择组件
  *
  * @param
  */
-var ProFormDateMonthRangePicker = exports.ProFormDateMonthRangePicker = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
-  var fieldProps = _ref.fieldProps,
-    proFieldProps = _ref.proFieldProps,
-    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_BaseDateRanger.BaseDateRanger, (0, _objectSpread2.default)({
+const ProFormDateMonthRangePicker = exports.ProFormDateMonthRangePicker = /*#__PURE__*/_react.default.forwardRef(({
+  fieldProps,
+  proFieldProps,
+  ...rest
+}, ref) => {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_BaseDateRanger.BaseDateRanger, {
     ref: ref,
-    fieldProps: (0, _objectSpread2.default)({}, fieldProps),
+    fieldProps: {
+      ...fieldProps
+    },
     valueType: valueType,
     proFieldProps: proFieldProps,
     fieldConfig: {
-      valueType: valueType,
+      valueType,
       customLightMode: true,
-      lightFilterLabelFormatter: function lightFilterLabelFormatter(value) {
-        return (0, _utils.dateArrayFormatter)(value, (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.format) || 'YYYY-MM-DD');
-      }
-    }
-  }, rest));
+      lightFilterLabelFormatter: value => (0, _utils.dateArrayFormatter)(value, fieldProps?.format || 'YYYY-MM-DD')
+    },
+    ...rest
+  });
 });

package/lib/form/components/DateRangePicker/DateQuarterRangePicker.js

@@ -5,35 +5,34 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ProFormDateQuarterRangePicker = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
 var _utils = require("../../../utils");
 var _BaseDateRanger = require("./BaseDateRanger");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["fieldProps", "proFieldProps"];
-var valueType = 'dateQuarterRange';
+const valueType = 'dateQuarterRange';
 
 /**
  * 季度份区间选择组件
  *
  * @param
  */
-var ProFormDateQuarterRangePicker = exports.ProFormDateQuarterRangePicker = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
-  var fieldProps = _ref.fieldProps,
-    proFieldProps = _ref.proFieldProps,
-    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_BaseDateRanger.BaseDateRanger, (0, _objectSpread2.default)({
+const ProFormDateQuarterRangePicker = exports.ProFormDateQuarterRangePicker = /*#__PURE__*/_react.default.forwardRef(({
+  fieldProps,
+  proFieldProps,
+  ...rest
+}, ref) => {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_BaseDateRanger.BaseDateRanger, {
     ref: ref,
-    fieldProps: (0, _objectSpread2.default)({}, fieldProps),
+    fieldProps: {
+      ...fieldProps
+    },
     valueType: valueType,
     proFieldProps: proFieldProps,
     fieldConfig: {
-      valueType: valueType,
+      valueType,
       customLightMode: true,
-      lightFilterLabelFormatter: function lightFilterLabelFormatter(value) {
-        return (0, _utils.dateArrayFormatter)(value, (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.format) || 'YYYY-MM-DD');
-      }
-    }
-  }, rest));
+      lightFilterLabelFormatter: value => (0, _utils.dateArrayFormatter)(value, fieldProps?.format || 'YYYY-MM-DD')
+    },
+    ...rest
+  });
 });

package/lib/form/components/DateRangePicker/DateTimeRangePicker.js

@@ -5,35 +5,34 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ProFormDateTimeRangePicker = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
 var _utils = require("../../../utils");
 var _BaseDateRanger = require("./BaseDateRanger");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["fieldProps", "proFieldProps"];
-var valueType = 'dateTimeRange';
+const valueType = 'dateTimeRange';
 
 /**
  * 日期时间区间选择组件
  *
  * @param
  */
-var ProFormDateTimeRangePicker = exports.ProFormDateTimeRangePicker = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
-  var fieldProps = _ref.fieldProps,
-    proFieldProps = _ref.proFieldProps,
-    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_BaseDateRanger.BaseDateRanger, (0, _objectSpread2.default)({
+const ProFormDateTimeRangePicker = exports.ProFormDateTimeRangePicker = /*#__PURE__*/_react.default.forwardRef(({
+  fieldProps,
+  proFieldProps,
+  ...rest
+}, ref) => {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_BaseDateRanger.BaseDateRanger, {
     ref: ref,
-    fieldProps: (0, _objectSpread2.default)({}, fieldProps),
+    fieldProps: {
+      ...fieldProps
+    },
     valueType: valueType,
     proFieldProps: proFieldProps,
     fieldConfig: {
-      valueType: valueType,
+      valueType,
       customLightMode: true,
-      lightFilterLabelFormatter: function lightFilterLabelFormatter(value) {
-        return (0, _utils.dateArrayFormatter)(value, (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.format) || 'YYYY-MM-DD');
-      }
-    }
-  }, rest));
+      lightFilterLabelFormatter: value => (0, _utils.dateArrayFormatter)(value, fieldProps?.format || 'YYYY-MM-DD')
+    },
+    ...rest
+  });
 });

package/lib/form/components/DateRangePicker/DateWeekRangePicker.js

@@ -5,35 +5,34 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ProFormDateWeekRangePicker = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
 var _utils = require("../../../utils");
 var _BaseDateRanger = require("./BaseDateRanger");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["fieldProps", "proFieldProps"];
-var valueType = 'dateWeekRange';
+const valueType = 'dateWeekRange';
 
 /**
  * 周区间选择组件
  *
  * @param
  */
-var ProFormDateWeekRangePicker = exports.ProFormDateWeekRangePicker = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
-  var fieldProps = _ref.fieldProps,
-    proFieldProps = _ref.proFieldProps,
-    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_BaseDateRanger.BaseDateRanger, (0, _objectSpread2.default)({
+const ProFormDateWeekRangePicker = exports.ProFormDateWeekRangePicker = /*#__PURE__*/_react.default.forwardRef(({
+  fieldProps,
+  proFieldProps,
+  ...rest
+}, ref) => {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_BaseDateRanger.BaseDateRanger, {
     ref: ref,
-    fieldProps: (0, _objectSpread2.default)({}, fieldProps),
+    fieldProps: {
+      ...fieldProps
+    },
     valueType: valueType,
     proFieldProps: proFieldProps,
     fieldConfig: {
-      valueType: valueType,
+      valueType,
       customLightMode: true,
-      lightFilterLabelFormatter: function lightFilterLabelFormatter(value) {
-        return (0, _utils.dateArrayFormatter)(value, (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.format) || 'YYYY-MM-DD');
-      }
-    }
-  }, rest));
+      lightFilterLabelFormatter: value => (0, _utils.dateArrayFormatter)(value, fieldProps?.format || 'YYYY-MM-DD')
+    },
+    ...rest
+  });
 });

package/lib/form/components/DateRangePicker/DateYearRangePicker.js

@@ -5,35 +5,34 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ProFormDateYearRangePicker = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
 var _utils = require("../../../utils");
 var _BaseDateRanger = require("./BaseDateRanger");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["fieldProps", "proFieldProps"];
-var valueType = 'dateYearRange';
+const valueType = 'dateYearRange';
 
 /**
  * 季度份区间选择组件
  *
  * @param
  */
-var ProFormDateYearRangePicker = exports.ProFormDateYearRangePicker = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
-  var fieldProps = _ref.fieldProps,
-    proFieldProps = _ref.proFieldProps,
-    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_BaseDateRanger.BaseDateRanger, (0, _objectSpread2.default)({
+const ProFormDateYearRangePicker = exports.ProFormDateYearRangePicker = /*#__PURE__*/_react.default.forwardRef(({
+  fieldProps,
+  proFieldProps,
+  ...rest
+}, ref) => {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_BaseDateRanger.BaseDateRanger, {
     ref: ref,
-    fieldProps: (0, _objectSpread2.default)({}, fieldProps),
+    fieldProps: {
+      ...fieldProps
+    },
     valueType: valueType,
     proFieldProps: proFieldProps,
     fieldConfig: {
-      valueType: valueType,
+      valueType,
       customLightMode: true,
-      lightFilterLabelFormatter: function lightFilterLabelFormatter(value) {
-        return (0, _utils.dateArrayFormatter)(value, (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.format) || 'YYYY-MM-DD');
-      }
-    }
-  }, rest));
+      lightFilterLabelFormatter: value => (0, _utils.dateArrayFormatter)(value, fieldProps?.format || 'YYYY-MM-DD')
+    },
+    ...rest
+  });
 });

package/lib/form/components/DateRangePicker/TimeRangePicker.js

@@ -6,9 +6,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ProFormTimeRangePicker = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _field = require("../../../field");
 var _provider = require("../../../provider");
@@ -16,42 +13,42 @@ var _utils = require("../../../utils");
 var _FieldContext = _interopRequireDefault(require("../../FieldContext"));
 var _Field = _interopRequireDefault(require("../Field"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["fieldProps", "proFieldProps"];
-var valueType = 'timeRange';
+const valueType = 'timeRange';
 
 /** 时间区间选择器 */
-var ProFormTimeRangePicker = exports.ProFormTimeRangePicker = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
-  var fieldProps = _ref.fieldProps,
-    proFieldProps = _ref.proFieldProps,
-    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var context = (0, _react.useContext)(_FieldContext.default);
+const ProFormTimeRangePicker = exports.ProFormTimeRangePicker = /*#__PURE__*/_react.default.forwardRef(({
+  fieldProps,
+  proFieldProps,
+  ...rest
+}, ref) => {
+  const context = (0, _react.useContext)(_FieldContext.default);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_provider.ProConfigProvider, {
-    valueTypeMap: (0, _defineProperty2.default)({}, valueType, {
-      render: function render(text, props) {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldTimeRangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
+    valueTypeMap: {
+      [valueType]: {
+        render: (text, props) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldTimeRangePicker, {
+          ...props,
           text: text
-        }));
-      },
-      formItemRender: function formItemRender(text, props) {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldTimeRangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
+        }),
+        formItemRender: (text, props) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldTimeRangePicker, {
+          ...props,
           text: text
-        }));
+        })
       }
-    }),
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Field.default, (0, _objectSpread2.default)({
+    },
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Field.default, {
       ref: ref,
-      fieldProps: (0, _objectSpread2.default)({
-        getPopupContainer: context.getPopupContainer
-      }, fieldProps),
+      fieldProps: {
+        getPopupContainer: context.getPopupContainer,
+        ...fieldProps
+      },
       valueType: valueType,
       proFieldProps: proFieldProps,
       fieldConfig: {
-        valueType: valueType,
+        valueType,
         customLightMode: true,
-        lightFilterLabelFormatter: function lightFilterLabelFormatter(value) {
-          return (0, _utils.dateArrayFormatter)(value, 'HH:mm:ss');
-        }
-      }
-    }, rest))
+        lightFilterLabelFormatter: value => (0, _utils.dateArrayFormatter)(value, 'HH:mm:ss')
+      },
+      ...rest
+    })
   });
 });