@zat-design/sisyphus-react 3.13.14-deta.2 → 4.0.0-beta.3

package/es/ProForm/components/combination/ProNumberRange/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { ProNumberRangeType } from './propsType';
-declare const ProNumberRange: (props: ProNumberRangeType) => any;
-export default ProNumberRange;
+declare const _default: import("react").MemoExoticComponent<(props: ProNumberRangeType) => any>;
+export default _default;

package/es/ProForm/components/combination/ProNumberRange/index.js

@@ -1,22 +1,17 @@
-import "antd/es/input/style";
-import _Input from "antd/es/input";
-import "antd/es/button/style";
-import _Button from "antd/es/button";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/input-number/style";
-import _InputNumber from "antd/es/input-number";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _isEmpty from "lodash/isEmpty";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useSetState, useDeepCompareEffect } from 'ahooks';
+import { Button, Input, InputNumber, Space } from 'antd';
+import { isEqual, isEmpty } from 'lodash';
+import { memo } from 'react';
 import classnames from 'classnames';
 import { tools } from '@zat-design/utils';
-import Container from '../../Container';
-import locale from '../../../../locale';
-import ProForm from '../../../../ProForm';
+import Container from "../../Container";
+import locale from "../../../../locale";
+import ProForm from "../../../../ProForm";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var formatAmount = tools.formatAmount;
 var ProNumberRange = function ProNumberRange(props) {
   var _document$querySelect, _valueProps, _ref2, _ref3, _value$, _valueProps2, _ref4, _ref5, _value$2, _valueProps3, _valueProps4;
@@ -93,41 +88,43 @@ var ProNumberRange = function ProNumberRange(props) {
     'pro-number-range-disabled': disabled,
     className: className
   });
+
   // 查看模式
   if (isView || props.isView) {
-    if (_isEmpty(value) || (value === null || value === void 0 ? void 0 : value.every(function (item) {
+    if (isEmpty(value) || value !== null && value !== void 0 && value.every(function (item) {
       return typeof item !== 'number';
-    }))) {
+    })) {
       return viewEmpty;
     }
     switch (valueType) {
       // 百分比
       case 'percent':
       case 'percentage':
-        return _jsx(Container, {
+        return /*#__PURE__*/_jsx(Container, {
           viewEmpty: viewEmpty,
           children: "".concat(formatAmount(value[0], precision || decimal), " ").concat(separator, " ").concat(formatAmount(value[1], precision || decimal))
         });
       // 千分比
       case 'permillage':
-        return _jsx(Container, {
+        return /*#__PURE__*/_jsx(Container, {
           viewEmpty: viewEmpty,
           children: "".concat(formatAmount(value[0], precision || decimal), " ").concat(separator, " ").concat(formatAmount(value[1], precision || decimal))
         });
       // 千分位
       case 'amount':
       case 'thousandth':
-        return _jsx(Container, {
+        return /*#__PURE__*/_jsx(Container, {
           viewEmpty: viewEmpty,
           children: "".concat(formatAmount(value[0], precision || decimal), " ").concat(separator, " ").concat(formatAmount(value[1], precision || decimal))
         });
       default:
-        return _jsx(Container, {
+        return /*#__PURE__*/_jsx(Container, {
           viewEmpty: viewEmpty,
           children: "".concat(value[0] || '-', " ").concat(separator, " ").concat(value[1] || '-')
         });
     }
   }
+
   // 值类型模式
   if (valueType || inValueType) {
     switch (valueType || inValueType) {
@@ -167,6 +164,7 @@ var ProNumberRange = function ProNumberRange(props) {
         };
     }
   }
+
   /**
    * 计算范围禁用值
    * @param disabled 禁用值
@@ -179,10 +177,10 @@ var ProNumberRange = function ProNumberRange(props) {
     }
     return result;
   };
-  return _jsx(_Space, {
+  return /*#__PURE__*/_jsx(Space, {
     className: cls,
-    children: _jsxs(_Space.Compact, {
-      children: [_jsx(_InputNumber, _objectSpread(_objectSpread({
+    children: /*#__PURE__*/_jsxs(Space.Compact, {
+      children: [/*#__PURE__*/_jsx(InputNumber, _objectSpread(_objectSpread({
         id: id,
         className: "range-left",
         value: (value === null || value === void 0 ? void 0 : value[0]) || range[0],
@@ -195,18 +193,18 @@ var ProNumberRange = function ProNumberRange(props) {
       }, valueProps), {}, {
         min: min !== null && min !== void 0 ? min : (_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.min,
         max: (_ref2 = (_ref3 = (_value$ = value === null || value === void 0 ? void 0 : value[1]) !== null && _value$ !== void 0 ? _value$ : range[1]) !== null && _ref3 !== void 0 ? _ref3 : max) !== null && _ref2 !== void 0 ? _ref2 : (_valueProps2 = valueProps) === null || _valueProps2 === void 0 ? void 0 : _valueProps2.max
-      }, childProps === null || childProps === void 0 ? void 0 : childProps[0])), addonBefore ? _jsx(_Button, {
+      }, childProps === null || childProps === void 0 ? void 0 : childProps[0])), addonBefore ? /*#__PURE__*/_jsx(Button, {
         disabled: true,
         className: "range-addon-before",
         children: addonBefore
-      }) : null, _jsx(_Input, {
+      }) : null, /*#__PURE__*/_jsx(Input, {
         className: classnames({
           'range-split': true,
           'range-split-disabled': !!disabled
         }),
         placeholder: "~",
         disabled: true
-      }), _jsx(_InputNumber, _objectSpread(_objectSpread({
+      }), /*#__PURE__*/_jsx(InputNumber, _objectSpread(_objectSpread({
         className: "range-right",
         value: (value === null || value === void 0 ? void 0 : value[1]) || range[1],
         placeholder: "".concat(locale.ProForm.inputPlaceholder),
@@ -218,7 +216,7 @@ var ProNumberRange = function ProNumberRange(props) {
       }, valueProps), {}, {
         min: (_ref4 = (_ref5 = (_value$2 = value === null || value === void 0 ? void 0 : value[0]) !== null && _value$2 !== void 0 ? _value$2 : range[0]) !== null && _ref5 !== void 0 ? _ref5 : min) !== null && _ref4 !== void 0 ? _ref4 : (_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.min,
         max: max !== null && max !== void 0 ? max : (_valueProps4 = valueProps) === null || _valueProps4 === void 0 ? void 0 : _valueProps4.max
-      }, childProps === null || childProps === void 0 ? void 0 : childProps[1])), addonAfter ? _jsx(_Button, {
+      }, childProps === null || childProps === void 0 ? void 0 : childProps[1])), addonAfter ? /*#__PURE__*/_jsx(Button, {
         disabled: true,
         className: "range-addon-after",
         children: addonAfter
@@ -226,4 +224,10 @@ var ProNumberRange = function ProNumberRange(props) {
     })
   });
 };
-export default ProNumberRange;
+export default /*#__PURE__*/memo(ProNumberRange, function (prevProps, nextProps) {
+  // 基本props比较 只比较关键的
+  if (!isEqual(prevProps === null || prevProps === void 0 ? void 0 : prevProps.value, nextProps === null || nextProps === void 0 ? void 0 : nextProps.value) || (prevProps === null || prevProps === void 0 ? void 0 : prevProps.disabled) !== (nextProps === null || nextProps === void 0 ? void 0 : nextProps.disabled) || !isEqual(prevProps === null || prevProps === void 0 ? void 0 : prevProps.childProps, nextProps === null || nextProps === void 0 ? void 0 : nextProps.childProps)) {
+    return false;
+  }
+  return true;
+});

package/es/ProForm/components/combination/ProNumberRange/style/index.less

@@ -1,10 +1,11 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-number-range {
   .range-split {
-    width: 32px !important;
-    text-align: center !important;
+    min-width: 32px;
+    max-width: 32px;
+    text-align: center;
 
     pointer-events: none;
     &.@{ant-prefix}-input[disabled] {
@@ -23,7 +24,6 @@
     .range-split,
     .range-addon-before,
     .range-addon-after {
-      // color: @zaui-danger !important;
       border-color: @zaui-danger;
     }
   }
@@ -32,56 +32,9 @@
     margin-bottom: 0;
   }
 
-  // .range-left,
-  // .range-right {
-  //   text-align: center;
-  // }
-
-  // .range-left {
-  //   .@{ant-prefix}-input-number {
-  //     border-right: none;
-  //   }
-  // }
-
-  // .range-right {
-  //   .@{ant-prefix}-input-number {
-  //     border-left: none;
-  //   }
-
-  //   .range-right {
-  //     width: 100%;
-  //     border-top-left-radius: 0;
-  //     border-bottom-left-radius: 0;
-  //   }
-  // }
-
   .range-addon-before,
   .range-addon-after {
     color: var(--zaui-disabled-text);
     pointer-events: none;
   }
-
-  // &.@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact > *:not(:last-child) {
-  //   margin-right: 0;
-  // }
-
-  // > *:first-child {
-  //   border-top-right-radius: 0 !important;
-  //   border-bottom-right-radius: 0 !important;
-
-  //   > .@{ant-prefix}-select-selector {
-  //     border-top-right-radius: 0 !important;
-  //     border-bottom-right-radius: 0 !important;
-  //   }
-  // }
-
-  // > *:last-child {
-  //   border-top-left-radius: 0 !important;
-  //   border-bottom-left-radius: 0 !important;
-
-  //   > .@{ant-prefix}-select-selector {
-  //     border-top-left-radius: 0 !important;
-  //     border-bottom-left-radius: 0 !important;
-  //   }
-  // }
 }

package/es/ProForm/components/combination/ProRangeLimit/index.d.ts

@@ -1,25 +1,4 @@
 import React from 'react';
-import { RangePickerProps } from 'antd/es/date-picker';
-import { Moment } from 'moment';
-export type Props = Omit<RangePickerProps, 'value' | 'onChange' | 'format' | 'separator' | 'mode'> & {
-    disabled?: boolean | [boolean, boolean];
-    foreverText?: string;
-    foreverDate?: string;
-    otherProps?: any;
-    onChange?: HandleChange;
-    value?: ValueStr;
-    format?: string;
-    separator?: any;
-    isView?: boolean;
-    showTime?: any;
-    valueType?: any;
-    /**
-     * 是否限制时间范围
-     */
-    limit?: boolean;
-};
-type Value = [Moment?, Moment?, boolean?] | null;
-type ValueStr = [string?, string?, string?] | null;
-type HandleChange = (value: ValueStr | null, valueStr: Value | null) => void;
-declare const ProRangeLimit: React.FC<Props>;
+import type { ProRangeLimitType } from './propsType';
+declare const ProRangeLimit: React.FC<ProRangeLimitType>;
 export default ProRangeLimit;

package/es/ProForm/components/combination/ProRangeLimit/index.js

@@ -1,27 +1,20 @@
-import "antd/es/checkbox/style";
-import _Checkbox from "antd/es/checkbox";
-import "antd/es/input/style";
-import _Input from "antd/es/input";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import "antd/es/date-picker/style";
-import _DatePicker from "antd/es/date-picker";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _isObject from "lodash/isObject";
-import _uniq from "lodash/uniq";
-import _isFunction from "lodash/isFunction";
-import _omit from "lodash/omit";
 var _excluded = ["disabled", "foreverText", "foreverDate", "format", "otherProps", "separator", "limit"];
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import { useMemo, useState } from 'react';
+import React, { useMemo, useState } from 'react';
+import { DatePicker, Checkbox, Space } from 'antd';
+import { omit, isFunction, uniq, isObject } from 'lodash';
 import classNames from 'classnames';
-import moment from 'moment';
-import { useProConfig } from '../../../../ProConfigProvider';
-import Container from '../../Container';
-import locale from '../../../../locale';
-import ProForm from '../../../../ProForm';
-var defaultPickerValue = [moment(), moment()];
+import dayjs from 'dayjs';
+import { useProConfig } from "../../../../ProConfigProvider";
+import Container from "../../Container";
+import locale from "../../../../locale";
+import ProForm from "../../../../ProForm";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
+var defaultPickerValue = [dayjs(), dayjs()];
 var useControlled = function useControlled(props) {
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
@@ -29,26 +22,27 @@ var useControlled = function useControlled(props) {
     setValue = _useState2[1];
   if ('value' in props) {
     var _props$value, _props$value2;
-    var internalValue = [((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value[0]) && moment(props.value[0], props.format), ((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2[1]) && moment(props.value[1], props.format)];
+    var internalValue = [((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value[0]) && dayjs(props.value[0], props.format), ((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2[1]) && dayjs(props.value[1], props.format)];
     var handleChange = function handleChange(value, other) {
       if (!value) {
-        props === null || props === void 0 ? void 0 : props.onChange(value, other);
+        props === null || props === void 0 || props.onChange(value, other);
       } else {
         var _value = _slicedToArray(value, 2),
           start = _value[0],
           end = _value[1];
-        if (props === null || props === void 0 ? void 0 : props.onChange) {
-          var valueStr = [start === null || start === void 0 ? void 0 : start.format(props.format), end === null || end === void 0 ? void 0 : end.format(props.format)];
-          props === null || props === void 0 ? void 0 : props.onChange(valueStr, value);
+        if (props !== null && props !== void 0 && props.onChange) {
+          var _valueStr = [start === null || start === void 0 ? void 0 : start.format(props.format), end === null || end === void 0 ? void 0 : end.format(props.format)];
+          props === null || props === void 0 || props.onChange(_valueStr, value);
         }
       }
     };
     return [internalValue, handleChange];
   }
+
   // @ts-ignore
   return [value, setValue];
 };
-var RangePicker = _DatePicker.RangePicker;
+var RangePicker = DatePicker.RangePicker;
 var ProRangeLimit = function ProRangeLimit(props) {
   var disabled = props.disabled,
     _props$foreverText = props.foreverText,
@@ -67,6 +61,7 @@ var ProRangeLimit = function ProRangeLimit(props) {
     isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
+
   var _useControlled = useControlled(_objectSpread(_objectSpread({}, props), {}, {
       format: format
     })),
@@ -86,6 +81,7 @@ var ProRangeLimit = function ProRangeLimit(props) {
   });
   var _foreverDate = foreverDate || (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.foreverDate);
   var _rest = _objectSpread({}, rest);
+
   // showTime默认值受valueType属性影响
   if (rest.showTime === undefined) {
     var valueType = props.valueType;
@@ -96,42 +92,63 @@ var ProRangeLimit = function ProRangeLimit(props) {
       _rest.showTime = false;
     }
   }
-  var _viewFormat = Array.isArray(format) ? format[0] : format;
   var tempFormat = Array.isArray(format) ? format : [format];
-  if (_isFunction(format)) {
+  if (isFunction(format)) {
     tempFormat = [];
   }
-  var _format = _uniq([].concat(_toConsumableArray(tempFormat), ['YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD'])).filter(function (formatKey) {
+  var _format = uniq([].concat(_toConsumableArray(tempFormat), ['YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD'])).filter(function (formatKey) {
     return !!formatKey;
   });
   var _defaultShowTime = {
     format: 'HH:mm:ss'
   };
   var _isForever = useMemo(function () {
-    return moment(_foreverDate, format).isSame(endDate);
-  }, [value]);
-  var foreverMoment = useMemo(function () {
-    return moment(_foreverDate, format);
+    var foreverDayjs = function () {
+      // 使用健壮的日期解析方式
+      var result = dayjs(_foreverDate);
+      if (!result.isValid()) {
+        result = dayjs(_foreverDate, format);
+      }
+      if (!result.isValid()) {
+        // 如果还是无效，使用默认的长期日期
+        result = dayjs('9999-01-01');
+      }
+      return result;
+    }();
+    return foreverDayjs.isSame(endDate);
+  }, [value, _foreverDate, format]);
+  var foreverDayjs = useMemo(function () {
+    // 使用健壮的日期解析方式
+    var foreverDayjs = dayjs(_foreverDate);
+    if (!foreverDayjs.isValid()) {
+      foreverDayjs = dayjs(_foreverDate, format);
+    }
+    if (!foreverDayjs.isValid()) {
+      // 如果还是无效，使用默认的长期日期
+      foreverDayjs = dayjs('9999-01-01');
+    }
+    return foreverDayjs;
   }, [_foreverDate, format]);
   if (isView) {
     var _props$value3, _props$value4;
-    var _separator = (value === null || value === void 0 ? void 0 : value[0]) && (value === null || value === void 0 ? void 0 : value[1]) ? separator : '';
+    var _separator = value !== null && value !== void 0 && value[0] && value !== null && value !== void 0 && value[1] ? separator : '';
     if (_isForever) {
       var _value$;
-      return _jsxs(Container, {
+      return /*#__PURE__*/_jsxs(Container, {
         viewEmpty: viewEmpty,
-        children: [value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.format(format), " ", _separator, " ", foreverText]
+        children: [value === null || value === void 0 || (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.format(format), " ", _separator, " ", foreverText]
       });
     }
-    return _jsxs(Container, {
+    return /*#__PURE__*/_jsxs(Container, {
       viewEmpty: viewEmpty,
       children: [(_props$value3 = props.value) === null || _props$value3 === void 0 ? void 0 : _props$value3[0], " ", _separator, " ", (_props$value4 = props.value) === null || _props$value4 === void 0 ? void 0 : _props$value4[1]]
     });
   }
+
   // 时间范围change
   var handleRangeChange = function handleRangeChange(date, dateStr) {
     if (!date) {
-      onChange(date, dateStr);
+      onChange(null, null);
       return;
     }
     var _ref4 = date || [],
@@ -144,9 +161,9 @@ var ProRangeLimit = function ProRangeLimit(props) {
       endStr = _ref7[1];
     onChange([start, end], [startStr, endStr]);
   };
+
   // 长期选择框change
   var handleForeverChange = function handleForeverChange(e) {
-    var foreverStr = e.target.checked ? 'Y' : 'N';
     var _ref8 = value || [],
       _ref9 = _slicedToArray(_ref8, 1),
       start = _ref9[0];
@@ -154,34 +171,37 @@ var ProRangeLimit = function ProRangeLimit(props) {
       _ref11 = _slicedToArray(_ref10, 2),
       end = _ref11[1];
     if (e.target.checked) {
-      var _end;
-      end = foreverMoment;
-      onChange([start, end, e.target.checked], [start === null || start === void 0 ? void 0 : start.format(format), (_end = end) === null || _end === void 0 ? void 0 : _end.format(format), foreverStr]);
+      end = foreverDayjs;
+
+      // 确保 start 和 end 是有效的 dayjs 实例再调用 format
+      var startStr = start && dayjs.isDayjs(start) ? start.format(format) : undefined;
+      var endStr = end && dayjs.isDayjs(end) ? end.format(format) : undefined;
+      onChange([start, end], [startStr, endStr]);
     } else {
-      // 不清除起期时间
-      onChange([start, null]);
+      // 不清除起期时间，只清除结束时间
+      var _startStr = start && dayjs.isDayjs(start) ? start.format(format) : undefined;
+      onChange([start, null], [_startStr, undefined]);
     }
   };
   if (_rest.showTime === true) {
     _rest.showTime = _objectSpread({}, _defaultShowTime);
   }
-  if (_isObject(_rest.showTime)) {
+  if (isObject(_rest.showTime)) {
     _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
   }
-  return _jsxs(_Input.Group, {
-    compact: true,
+  return /*#__PURE__*/_jsxs(Space.Compact, {
     className: "pro-range-limit",
-    children: [_jsx(RangePicker, _objectSpread(_objectSpread(_objectSpread({
+    children: [/*#__PURE__*/_jsx(RangePicker, _objectSpread(_objectSpread(_objectSpread({
       allowClear: true,
       disabled: [_disabled === null || _disabled === void 0 ? void 0 : _disabled[0], (_disabled === null || _disabled === void 0 ? void 0 : _disabled[1]) || _isForever],
       defaultPickerValue: defaultPickerValue
-    }, initialConfig), _omit(_rest, ['placeholder', 'separator'])), {}, {
+    }, initialConfig), omit(_rest, ['placeholder', 'separator'])), {}, {
       format: _format,
       value: value,
       onChange: handleRangeChange
-    })), limit && _jsx("div", {
+    })), limit && /*#__PURE__*/_jsx("div", {
       className: className,
-      children: _jsx(_Checkbox, {
+      children: /*#__PURE__*/_jsx(Checkbox, {
         checked: _isForever,
         disabled: _disabled === null || _disabled === void 0 ? void 0 : _disabled[1],
         onChange: handleForeverChange,

package/es/ProForm/components/combination/ProRangeLimit/propsType.d.ts

@@ -0,0 +1,23 @@
+import { RangePickerProps } from 'antd/es/date-picker';
+import { Dayjs } from 'dayjs';
+type Value = [Dayjs?, Dayjs?] | null;
+type ValueStr = [string?, string?] | null;
+type HandleChange = (valueStr: ValueStr | null, value: Value | null) => void;
+export type ProRangeLimitType = Omit<RangePickerProps, 'value' | 'onChange' | 'format' | 'separator' | 'mode'> & {
+    disabled?: boolean | [boolean, boolean];
+    foreverText?: string;
+    foreverDate?: string;
+    otherProps?: any;
+    onChange?: HandleChange;
+    value?: ValueStr;
+    format?: string;
+    separator?: any;
+    isView?: boolean;
+    showTime?: any;
+    valueType?: any;
+    /**
+     * 是否限制时间范围
+     */
+    limit?: boolean;
+};
+export {};

package/es/ProForm/components/combination/ProTimeLimit/hooks/useControlled.d.ts

@@ -1,8 +1,9 @@
-import moment, { Moment } from 'moment';
+import dayjs from 'dayjs';
+import type { Dayjs } from 'dayjs';
 interface Props<T = any> {
     value?: T;
     onChange?: (value: T, ...rest: any[]) => void;
     format?: string;
 }
-declare const useControlled: (props: Props) => [moment.Moment, (value: Moment | undefined) => void];
+declare const useControlled: (props: Props) => [dayjs.Dayjs, (value: Dayjs | undefined) => void];
 export default useControlled;

package/es/ProForm/components/combination/ProTimeLimit/hooks/useControlled.js

@@ -1,5 +1,5 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { useState } from 'react';
 var useControlled = function useControlled(props) {
   var value = props.value,
@@ -18,7 +18,19 @@ var useControlled = function useControlled(props) {
     onChange(_value, value);
   };
   if ('value' in props) {
-    return [value && moment(value, format).startOf('day'), handleChange];
+    var parsedValue = null;
+    if (value) {
+      parsedValue = dayjs(value, format);
+      if (!parsedValue.isValid()) {
+        parsedValue = dayjs(value);
+      }
+      if (!parsedValue.isValid()) {
+        parsedValue = null;
+      } else {
+        parsedValue = parsedValue.startOf('day');
+      }
+    }
+    return [parsedValue, handleChange];
   }
   return [valueState, handleChange];
 };

package/es/ProForm/components/combination/ProTimeLimit/index.d.ts

@@ -1,20 +1,19 @@
 import { DatePickerProps, TimePickerProps } from 'antd';
-import { PickerPanelDateProps } from 'antd/lib/calendar/generateCalendar';
-import { Moment } from 'moment';
+import type { Dayjs } from 'dayjs';
 import React from 'react';
 import type { ProFormOtherType } from '../../../propsType';
-import { Props as ProRangeLimitType } from '../ProRangeLimit';
+import type { ProRangeLimitType } from '../ProRangeLimit/propsType';
 import type { DistributiveOmit } from '../../../../ProForm/propsType';
 export type DateType = DatePickerProps['value'];
 export type ProTimeLimitType = DistributiveOmit<DatePickerProps, 'value' | 'onChange' | 'mode'> & {
     value?: string;
-    onChange?: (value: ProTimeLimitType['value'] | null, valueData: Moment) => void;
+    onChange?: (value: ProTimeLimitType['value'] | null, valueData: Dayjs) => void;
     disabled?: boolean;
     foreverDate?: string;
     foreverText?: string;
     viewEmpty?: React.ReactNode;
     format?: string;
-    valueType?: 'moment' | 'format' | 'ISO' | 'dateTime' | 'dateStartEndTime';
+    valueType?: 'dayjs' | 'format' | 'ISO' | 'dateTime' | 'dateStartEndTime';
     otherProps?: ProFormOtherType;
     mode?: 'DatePicker';
     isView?: boolean;
@@ -23,7 +22,7 @@ export type ProTimeLimitType = DistributiveOmit<DatePickerProps, 'value' | 'onCh
      */
     limit?: boolean;
 } & TimePickerProps & {
-    showTime?: PickerPanelDateProps<Moment>['showTime'];
+    showTime?: DatePickerProps['showTime'];
     showNow?: boolean;
 };
 export declare const ProTimeLimit: React.FC<ProTimeLimitType>;