@zat-design/sisyphus-react 3.14.0-beta.2 → 4.0.0-beta.10

package/lib/ProForm/components/combination/ProModalSelect/style/index.less

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .pro-modal-select,
 .pro-tree-modal {
@@ -59,9 +57,9 @@
     border-bottom-right-radius: 0;
     &.@{ant-prefix}-input-affix-wrapper-status-error{
        & + .@{ant-prefix}-btn{
-        border: 1px solid var(--ant-error-color);
+        border: 1px solid #ff4d4f;
         >.viewSvg{
-          color: var(--ant-error-color);
+          color: #ff4d4f;
         }
       }
     }
@@ -81,7 +79,9 @@
   .@{ant-prefix}-btn-compact-item.@{ant-prefix}-btn.@{ant-prefix}-btn-compact-last-item:not(.@{ant-prefix}-btn-compact-first-item):not(.@{ant-prefix}-btn-compact-item-rtl){
     &:hover{
       position: relative;
+      z-index: 1;
       transition: none;
+      border-color: var(--ant-primary-color-hover, #1677ff) !important;
       &::before{
         opacity: 1;
       }
@@ -93,17 +93,13 @@
       left: -1px;
       width: 1px;
       height: calc(100% + 2px);
-      background:var(--ant-primary-color-hover);
+      background: var(--ant-primary-color-hover, #1677ff);
       opacity: 0;
       display: block;
+      z-index: 2;
     }
   }
 
-  .@{ant-prefix}-input-affix-wrapper-status-error{
-
-  }
-
-
   .@{ant-prefix}-input-group-wrapper-status-error {
     &:hover {
       .@{ant-prefix}-input,
@@ -132,7 +128,7 @@
   }
 
   .viewSvg {
-    height: 20px;
+    height: 16px;
     cursor: pointer;
     fill: #c5c7cd;
   }
@@ -140,11 +136,11 @@
   .@{ant-prefix}-space-compact {
     .@{ant-prefix}-select-compact-item-div:has(.@{ant-prefix}-select-status-error) {
       & + .@{ant-prefix}-btn-compact-last-item {
-        border-top: 1px solid var(--ant-error-color);
-        border-right: 1px solid var(--ant-error-color);
-        border-bottom: 1px solid var(--ant-error-color);
+        border-top: 1px solid #ff4d4f;
+        border-right: 1px solid #ff4d4f;
+        border-bottom: 1px solid #ff4d4f;
         >.viewSvg{
-          color: var(--ant-error-color);
+          color: #ff4d4f;
         }
       }
     }

package/lib/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/lib/ProForm/components/combination/ProNumberRange/index.js

@@ -5,18 +5,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/input/style");
-var _input = _interopRequireDefault(require("antd/es/input"));
-require("antd/es/button/style");
-var _button = _interopRequireDefault(require("antd/es/button"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/input-number/style");
-var _inputNumber = _interopRequireDefault(require("antd/es/input-number"));
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _ahooks = require("ahooks");
+var _antd = require("antd");
 var _lodash = require("lodash");
+var _react = require("react");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _utils = require("@zat-design/utils");
 var _Container = _interopRequireDefault(require("../../Container"));
@@ -107,7 +101,7 @@ var ProNumberRange = props => {
       case 'percentage':
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
           viewEmpty: viewEmpty,
-          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
             split: split,
             children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
               children: formatAmount(value[0], precision || decimal)
@@ -120,7 +114,7 @@ var ProNumberRange = props => {
       case 'permillage':
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
           viewEmpty: viewEmpty,
-          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
             split: split,
             children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
               children: formatAmount(value[0], precision || decimal)
@@ -134,7 +128,7 @@ var ProNumberRange = props => {
       case 'thousandth':
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
           viewEmpty: viewEmpty,
-          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
             split: split,
             children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
               children: formatAmount(value[0], precision || decimal)
@@ -146,7 +140,7 @@ var ProNumberRange = props => {
       default:
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
           viewEmpty: viewEmpty,
-          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
             split: split,
             children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
               children: value[0] || '-'
@@ -208,10 +202,10 @@ var ProNumberRange = props => {
     }
     return result;
   };
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space, {
     className: cls,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default.Compact, {
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_inputNumber.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space.Compact, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         id: id,
         className: "range-left",
         value: (value === null || value === void 0 ? void 0 : value[0]) || range[0],
@@ -224,18 +218,18 @@ var 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 ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, {
+      }, childProps === null || childProps === void 0 ? void 0 : childProps[0])), addonBefore ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
         disabled: true,
         className: "range-addon-before",
         children: addonBefore
-      }) : null, /*#__PURE__*/(0, _jsxRuntime.jsx)(_input.default, {
+      }) : null, /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Input, {
         className: (0, _classnames.default)({
           'range-split': true,
           'range-split-disabled': !!disabled
         }),
         placeholder: split,
         disabled: true
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_inputNumber.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         className: "range-right",
         value: (value === null || value === void 0 ? void 0 : value[1]) || range[1],
         placeholder: `${_locale.default.ProForm.inputPlaceholder}`,
@@ -247,7 +241,7 @@ var 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 ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, {
+      }, childProps === null || childProps === void 0 ? void 0 : childProps[1])), addonAfter ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
         disabled: true,
         className: "range-addon-after",
         children: addonAfter
@@ -255,4 +249,10 @@ var ProNumberRange = props => {
     })
   });
 };
-var _default = exports.default = ProNumberRange;
+var _default = exports.default = /*#__PURE__*/(0, _react.memo)(ProNumberRange, (prevProps, nextProps) => {
+  // 基本props比较 只比较关键的
+  if (!(0, _lodash.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) || !(0, _lodash.isEqual)(prevProps === null || prevProps === void 0 ? void 0 : prevProps.childProps, nextProps === null || nextProps === void 0 ? void 0 : nextProps.childProps)) {
+    return false;
+  }
+  return true;
+});

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

@@ -1,15 +1,12 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
-
 .pro-number-range {
   display: block;
   .@{ant-prefix}-space-compact {
     display: flex;
   }
-
   .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] {
@@ -28,7 +25,6 @@
     .range-split,
     .range-addon-before,
     .range-addon-after {
-      // color: @zaui-danger !important;
       border-color: @zaui-danger;
     }
   }
@@ -37,56 +33,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/lib/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/lib/ProForm/components/combination/ProRangeLimit/index.js

@@ -6,26 +6,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/input/style");
-var _input = _interopRequireDefault(require("antd/es/input"));
-require("antd/es/checkbox/style");
-var _checkbox = _interopRequireDefault(require("antd/es/checkbox"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-require("antd/es/date-picker/style");
-var _datePicker = _interopRequireDefault(require("antd/es/date-picker"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
+var _antd = require("antd");
 var _lodash = require("lodash");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _moment = _interopRequireDefault(require("moment"));
+var _dayjs = _interopRequireDefault(require("dayjs"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["disabled", "foreverText", "foreverDate", "format", "otherProps", "separator", "limit"];
-var defaultPickerValue = [(0, _moment.default)(), (0, _moment.default)()];
+var defaultPickerValue = [(0, _dayjs.default)(), (0, _dayjs.default)()];
 var useControlled = props => {
   var _useState = (0, _react.useState)(),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -33,7 +28,7 @@ var 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]) && (0, _moment.default)(props.value[0], props.format), ((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2[1]) && (0, _moment.default)(props.value[1], props.format)];
+    var internalValue = [((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value[0]) && (0, _dayjs.default)(props.value[0], props.format), ((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2[1]) && (0, _dayjs.default)(props.value[1], props.format)];
     var handleChange = (value, other) => {
       if (!value) {
         props === null || props === void 0 || props.onChange(value, other);
@@ -53,7 +48,7 @@ var useControlled = props => {
   // @ts-ignore
   return [value, setValue];
 };
-var RangePicker = _datePicker.default.RangePicker;
+var RangePicker = _antd.DatePicker.RangePicker;
 var ProRangeLimit = props => {
   var disabled = props.disabled,
     _props$foreverText = props.foreverText,
@@ -103,7 +98,6 @@ var ProRangeLimit = props => {
       _rest.showTime = false;
     }
   }
-  var _viewFormat = Array.isArray(format) ? format[0] : format;
   var tempFormat = Array.isArray(format) ? format : [format];
   if ((0, _lodash.isFunction)(format)) {
     tempFormat = [];
@@ -113,10 +107,31 @@ var ProRangeLimit = props => {
     format: 'HH:mm:ss'
   };
   var _isForever = (0, _react.useMemo)(() => {
-    return (0, _moment.default)(_foreverDate, format).isSame(endDate);
-  }, [value]);
-  var foreverMoment = (0, _react.useMemo)(() => {
-    return (0, _moment.default)(_foreverDate, format);
+    var foreverDayjs = (() => {
+      // 使用健壮的日期解析方式
+      var result = (0, _dayjs.default)(_foreverDate);
+      if (!result.isValid()) {
+        result = (0, _dayjs.default)(_foreverDate, format);
+      }
+      if (!result.isValid()) {
+        // 如果还是无效，使用默认的长期日期
+        result = (0, _dayjs.default)('9999-01-01');
+      }
+      return result;
+    })();
+    return foreverDayjs.isSame(endDate);
+  }, [value, _foreverDate, format]);
+  var foreverDayjs = (0, _react.useMemo)(() => {
+    // 使用健壮的日期解析方式
+    var foreverDayjs = (0, _dayjs.default)(_foreverDate);
+    if (!foreverDayjs.isValid()) {
+      foreverDayjs = (0, _dayjs.default)(_foreverDate, format);
+    }
+    if (!foreverDayjs.isValid()) {
+      // 如果还是无效，使用默认的长期日期
+      foreverDayjs = (0, _dayjs.default)('9999-01-01');
+    }
+    return foreverDayjs;
   }, [_foreverDate, format]);
   if (isView) {
     var _props$value3, _props$value4;
@@ -137,7 +152,7 @@ var ProRangeLimit = props => {
   // 时间范围change
   var handleRangeChange = (date, dateStr) => {
     if (!date) {
-      onChange(date, dateStr);
+      onChange(null, null);
       return;
     }
     var _ref4 = date || [],
@@ -153,7 +168,6 @@ var ProRangeLimit = props => {
 
   // 长期选择框change
   var handleForeverChange = e => {
-    var foreverStr = e.target.checked ? 'Y' : 'N';
     var _ref8 = value || [],
       _ref9 = (0, _slicedToArray2.default)(_ref8, 1),
       start = _ref9[0];
@@ -161,12 +175,16 @@ var ProRangeLimit = props => {
       _ref11 = (0, _slicedToArray2.default)(_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.default.isDayjs(start) ? start.format(format) : undefined;
+      var endStr = end && _dayjs.default.isDayjs(end) ? end.format(format) : undefined;
+      onChange([start, end], [startStr, endStr]);
     } else {
-      // 不清除起期时间
-      onChange([start, null]);
+      // 不清除起期时间，只清除结束时间
+      var _startStr = start && _dayjs.default.isDayjs(start) ? start.format(format) : undefined;
+      onChange([start, null], [_startStr, undefined]);
     }
   };
   if (_rest.showTime === true) {
@@ -175,8 +193,7 @@ var ProRangeLimit = props => {
   if ((0, _lodash.isObject)(_rest.showTime)) {
     _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
   }
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_input.default.Group, {
-    compact: true,
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space.Compact, {
     className: "pro-range-limit",
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(RangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
       allowClear: true,
@@ -188,7 +205,7 @@ var ProRangeLimit = props => {
       onChange: handleRangeChange
     })), limit && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: className,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.default, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Checkbox, {
         checked: _isForever,
         disabled: _disabled === null || _disabled === void 0 ? void 0 : _disabled[1],
         onChange: handleForeverChange,

package/lib/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/lib/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/lib/ProForm/components/combination/ProTimeLimit/hooks/useControlled.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _moment = _interopRequireDefault(require("moment"));
+var _dayjs = _interopRequireDefault(require("dayjs"));
 var _react = require("react");
 var useControlled = props => {
   var value = props.value,
@@ -25,7 +25,19 @@ var useControlled = props => {
     onChange(_value, value);
   };
   if ('value' in props) {
-    return [value && (0, _moment.default)(value, format).startOf('day'), handleChange];
+    var parsedValue = null;
+    if (value) {
+      parsedValue = (0, _dayjs.default)(value, format);
+      if (!parsedValue.isValid()) {
+        parsedValue = (0, _dayjs.default)(value);
+      }
+      if (!parsedValue.isValid()) {
+        parsedValue = null;
+      } else {
+        parsedValue = parsedValue.startOf('day');
+      }
+    }
+    return [parsedValue, handleChange];
   }
   return [valueState, handleChange];
 };

package/lib/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>;

package/lib/ProForm/components/combination/ProTimeLimit/index.js

@@ -6,18 +6,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ProTimeLimit = void 0;
-require("antd/es/input/style");
-var _input = _interopRequireDefault(require("antd/es/input"));
-require("antd/es/checkbox/style");
-var _checkbox = _interopRequireDefault(require("antd/es/checkbox"));
-require("antd/es/date-picker/style");
-var _datePicker = _interopRequireDefault(require("antd/es/date-picker"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
-var _moment = _interopRequireDefault(require("moment"));
+var _dayjs = _interopRequireDefault(require("dayjs"));
 var _react = _interopRequireWildcard(require("react"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
@@ -73,13 +68,21 @@ var ProTimeLimit = props => {
     format: 'HH:mm:ss'
   };
   var _useMemo = (0, _react.useMemo)(() => {
-      var foreverMoment = (0, _moment.default)(_foreverDate, format);
-      var foreverString = _foreverDate || foreverMoment.format(format);
-      return [foreverString, foreverMoment];
+      // 使用健壮的日期解析方式
+      var foreverDayjs = (0, _dayjs.default)(_foreverDate);
+      if (!foreverDayjs.isValid()) {
+        foreverDayjs = (0, _dayjs.default)(_foreverDate, format);
+      }
+      if (!foreverDayjs.isValid()) {
+        // 如果还是无效，使用默认的长期日期
+        foreverDayjs = (0, _dayjs.default)('9999-01-01');
+      }
+      var foreverString = foreverDayjs.format(format);
+      return [foreverString, foreverDayjs];
     }, [format, _foreverDate]),
     _useMemo2 = (0, _slicedToArray2.default)(_useMemo, 2),
     foreverString = _useMemo2[0],
-    foreverMoment = _useMemo2[1];
+    foreverDayjs = _useMemo2[1];
 
   // 管理value的受控状态
   var _useControlled = (0, _useControlled3.default)((0, _objectSpread2.default)({
@@ -90,17 +93,18 @@ var ProTimeLimit = props => {
     onChange = _useControlled2[1];
   var isForever = (0, _react.useMemo)(() => {
     if ((0, _lodash.isObject)(value)) {
-      return foreverMoment.format(format) === value.format(format);
+      return foreverDayjs.format(format) === value.format(format);
     }
     return false;
-  }, [foreverMoment, value]);
+  }, [foreverDayjs, value]);
   var foreverChange = e => {
     var checkedForever = e.target.checked;
     if (checkedForever) {
-      onChange((0, _moment.default)(foreverString, format));
+      // 直接使用计算好的 foreverDayjs，避免重新解析
+      onChange(foreverDayjs);
     } else {
       // 防止长期选择后，时间面板还是9999-01-01
-      onChange((0, _moment.default)());
+      onChange((0, _dayjs.default)());
       setTimeout(() => {
         onChange(null);
       }, 0);
@@ -135,11 +139,10 @@ var ProTimeLimit = props => {
     'ant-input-disabled': disabled,
     'forever-checkbox': true
   });
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_input.default.Group, {
-    compact: true,
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space.Compact, {
     className: "pro-time-limit",
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_datePicker.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
-      defaultPickerValue: (0, _moment.default)(),
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.DatePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+      defaultPickerValue: (0, _dayjs.default)(),
       disabled: disabled || isForever
     }, initialConfig), (0, _lodash.omit)(_rest, ['placeholder'])), {}, {
       format: _format,
@@ -147,7 +150,7 @@ var ProTimeLimit = props => {
       onChange: onChange
     })), limit && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: className,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.default, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Checkbox, {
         checked: isForever,
         disabled: disabled,
         onChange: foreverChange,