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

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

@@ -1,15 +1,9 @@
-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 _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useSetState, useDeepCompareEffect } from 'ahooks';
-import { isEmpty } from 'lodash';
+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";
@@ -101,7 +95,7 @@ var ProNumberRange = props => {
       case 'percentage':
         return /*#__PURE__*/_jsx(Container, {
           viewEmpty: viewEmpty,
-          children: /*#__PURE__*/_jsxs(_Space, {
+          children: /*#__PURE__*/_jsxs(Space, {
             split: split,
             children: [/*#__PURE__*/_jsx("span", {
               children: formatAmount(value[0], precision || decimal)
@@ -114,7 +108,7 @@ var ProNumberRange = props => {
       case 'permillage':
         return /*#__PURE__*/_jsx(Container, {
           viewEmpty: viewEmpty,
-          children: /*#__PURE__*/_jsxs(_Space, {
+          children: /*#__PURE__*/_jsxs(Space, {
             split: split,
             children: [/*#__PURE__*/_jsx("span", {
               children: formatAmount(value[0], precision || decimal)
@@ -128,7 +122,7 @@ var ProNumberRange = props => {
       case 'thousandth':
         return /*#__PURE__*/_jsx(Container, {
           viewEmpty: viewEmpty,
-          children: /*#__PURE__*/_jsxs(_Space, {
+          children: /*#__PURE__*/_jsxs(Space, {
             split: split,
             children: [/*#__PURE__*/_jsx("span", {
               children: formatAmount(value[0], precision || decimal)
@@ -140,7 +134,7 @@ var ProNumberRange = props => {
       default:
         return /*#__PURE__*/_jsx(Container, {
           viewEmpty: viewEmpty,
-          children: /*#__PURE__*/_jsxs(_Space, {
+          children: /*#__PURE__*/_jsxs(Space, {
             split: split,
             children: [/*#__PURE__*/_jsx("span", {
               children: value[0] || '-'
@@ -202,10 +196,10 @@ var ProNumberRange = props => {
     }
     return result;
   };
-  return /*#__PURE__*/_jsx(_Space, {
+  return /*#__PURE__*/_jsx(Space, {
     className: cls,
-    children: /*#__PURE__*/_jsxs(_Space.Compact, {
-      children: [/*#__PURE__*/_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],
@@ -218,18 +212,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__*/_jsx(_Button, {
+      }, childProps === null || childProps === void 0 ? void 0 : childProps[0])), addonBefore ? /*#__PURE__*/_jsx(Button, {
         disabled: true,
         className: "range-addon-before",
         children: addonBefore
-      }) : null, /*#__PURE__*/_jsx(_Input, {
+      }) : null, /*#__PURE__*/_jsx(Input, {
         className: classnames({
           'range-split': true,
           'range-split-disabled': !!disabled
         }),
         placeholder: split,
         disabled: true
-      }), /*#__PURE__*/_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: `${locale.ProForm.inputPlaceholder}`,
@@ -241,7 +235,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__*/_jsx(_Button, {
+      }, childProps === null || childProps === void 0 ? void 0 : childProps[1])), addonAfter ? /*#__PURE__*/_jsx(Button, {
         disabled: true,
         className: "range-addon-after",
         children: addonAfter
@@ -249,4 +243,10 @@ var ProNumberRange = props => {
     })
   });
 };
-export default ProNumberRange;
+export default /*#__PURE__*/memo(ProNumberRange, (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,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/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,24 +1,19 @@
-import "antd/es/input/style";
-import _Input from "antd/es/input";
-import "antd/es/checkbox/style";
-import _Checkbox from "antd/es/checkbox";
 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";
 var _excluded = ["disabled", "foreverText", "foreverDate", "format", "otherProps", "separator", "limit"];
 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 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 = [moment(), moment()];
+var defaultPickerValue = [dayjs(), dayjs()];
 var useControlled = props => {
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
@@ -26,7 +21,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]) && 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 = (value, other) => {
       if (!value) {
         props === null || props === void 0 || props.onChange(value, other);
@@ -46,7 +41,7 @@ var useControlled = props => {
   // @ts-ignore
   return [value, setValue];
 };
-var RangePicker = _DatePicker.RangePicker;
+var RangePicker = DatePicker.RangePicker;
 var ProRangeLimit = props => {
   var disabled = props.disabled,
     _props$foreverText = props.foreverText,
@@ -96,7 +91,6 @@ var ProRangeLimit = props => {
       _rest.showTime = false;
     }
   }
-  var _viewFormat = Array.isArray(format) ? format[0] : format;
   var tempFormat = Array.isArray(format) ? format : [format];
   if (isFunction(format)) {
     tempFormat = [];
@@ -106,10 +100,31 @@ var ProRangeLimit = props => {
     format: 'HH:mm:ss'
   };
   var _isForever = useMemo(() => {
-    return moment(_foreverDate, format).isSame(endDate);
-  }, [value]);
-  var foreverMoment = useMemo(() => {
-    return moment(_foreverDate, format);
+    var foreverDayjs = (() => {
+      // 使用健壮的日期解析方式
+      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(() => {
+    // 使用健壮的日期解析方式
+    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;
@@ -130,7 +145,7 @@ var ProRangeLimit = props => {
   // 时间范围change
   var handleRangeChange = (date, dateStr) => {
     if (!date) {
-      onChange(date, dateStr);
+      onChange(null, null);
       return;
     }
     var _ref4 = date || [],
@@ -146,7 +161,6 @@ var ProRangeLimit = props => {
 
   // 长期选择框change
   var handleForeverChange = e => {
-    var foreverStr = e.target.checked ? 'Y' : 'N';
     var _ref8 = value || [],
       _ref9 = _slicedToArray(_ref8, 1),
       start = _ref9[0];
@@ -154,12 +168,16 @@ var 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) {
@@ -168,8 +186,7 @@ var ProRangeLimit = props => {
   if (isObject(_rest.showTime)) {
     _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
   }
-  return /*#__PURE__*/_jsxs(_Input.Group, {
-    compact: true,
+  return /*#__PURE__*/_jsxs(Space.Compact, {
     className: "pro-range-limit",
     children: [/*#__PURE__*/_jsx(RangePicker, _objectSpread(_objectSpread(_objectSpread({
       allowClear: true,
@@ -181,7 +198,7 @@ var ProRangeLimit = props => {
       onChange: handleRangeChange
     })), limit && /*#__PURE__*/_jsx("div", {
       className: className,
-      children: /*#__PURE__*/_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 = props => {
   var value = props.value,
@@ -18,7 +18,19 @@ var 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>;

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

@@ -1,17 +1,12 @@
-import "antd/es/input/style";
-import _Input from "antd/es/input";
-import "antd/es/checkbox/style";
-import _Checkbox from "antd/es/checkbox";
-import "antd/es/date-picker/style";
-import _DatePicker from "antd/es/date-picker";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["format", "disabled", "foreverDate", "foreverText", "valueType", "otherProps", "limit"],
   _excluded2 = ["mode"];
+import { Checkbox, DatePicker, Space } from 'antd';
 import classNames from 'classnames';
 import { omit, isObject, uniq, isFunction } from 'lodash';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import React, { useMemo } from 'react';
 import { useProConfig } from "../../../../ProConfigProvider";
 import Container from "../../Container";
@@ -66,13 +61,21 @@ export var ProTimeLimit = props => {
     format: 'HH:mm:ss'
   };
   var _useMemo = useMemo(() => {
-      var foreverMoment = moment(_foreverDate, format);
-      var foreverString = _foreverDate || foreverMoment.format(format);
-      return [foreverString, foreverMoment];
+      // 使用健壮的日期解析方式
+      var foreverDayjs = dayjs(_foreverDate);
+      if (!foreverDayjs.isValid()) {
+        foreverDayjs = dayjs(_foreverDate, format);
+      }
+      if (!foreverDayjs.isValid()) {
+        // 如果还是无效，使用默认的长期日期
+        foreverDayjs = dayjs('9999-01-01');
+      }
+      var foreverString = foreverDayjs.format(format);
+      return [foreverString, foreverDayjs];
     }, [format, _foreverDate]),
     _useMemo2 = _slicedToArray(_useMemo, 2),
     foreverString = _useMemo2[0],
-    foreverMoment = _useMemo2[1];
+    foreverDayjs = _useMemo2[1];
 
   // 管理value的受控状态
   var _useControlled = useControlled(_objectSpread({
@@ -83,17 +86,18 @@ export var ProTimeLimit = props => {
     onChange = _useControlled2[1];
   var isForever = useMemo(() => {
     if (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(moment(foreverString, format));
+      // 直接使用计算好的 foreverDayjs，避免重新解析
+      onChange(foreverDayjs);
     } else {
       // 防止长期选择后，时间面板还是9999-01-01
-      onChange(moment());
+      onChange(dayjs());
       setTimeout(() => {
         onChange(null);
       }, 0);
@@ -128,11 +132,10 @@ export var ProTimeLimit = props => {
     'ant-input-disabled': disabled,
     'forever-checkbox': true
   });
-  return /*#__PURE__*/_jsxs(_Input.Group, {
-    compact: true,
+  return /*#__PURE__*/_jsxs(Space.Compact, {
     className: "pro-time-limit",
-    children: [/*#__PURE__*/_jsx(_DatePicker, _objectSpread(_objectSpread(_objectSpread({
-      defaultPickerValue: moment(),
+    children: [/*#__PURE__*/_jsx(DatePicker, _objectSpread(_objectSpread(_objectSpread({
+      defaultPickerValue: dayjs(),
       disabled: disabled || isForever
     }, initialConfig), omit(_rest, ['placeholder'])), {}, {
       format: _format,
@@ -140,7 +143,7 @@ export var ProTimeLimit = props => {
       onChange: onChange
     })), limit && /*#__PURE__*/_jsx("div", {
       className: className,
-      children: /*#__PURE__*/_jsx(_Checkbox, {
+      children: /*#__PURE__*/_jsx(Checkbox, {
         checked: isForever,
         disabled: disabled,
         onChange: foreverChange,

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

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .@{ant-prefix}-form-item-has-error {
   .@{ant-prefix}-picker-status-error
@@ -7,34 +5,94 @@
       .@{ant-prefix}-input-borderless
     ).@{ant-prefix}-input {
     // background: @zaui-base-bg;
-    border-color: var(--ant-error-color);
+    border-color: #ff4d4f;
   }
   .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(
       .@{ant-prefix}-input-borderless
     ).@{ant-prefix}-input:focus {
-    border-color: var(--ant-error-color-hover);
+    border-color: var(--ant-error-color-hover, #ff7875);
     border-right-width: 1px;
     outline: 0;
-    box-shadow: 0 0 0 2px var(--ant-error-color-outline);
+    box-shadow: 0 0 0 2px var(--ant-error-color-outline, rgba(255,77,79,0.2));
   }
 }
 
-span.@{ant-prefix}-input-group-compact {
+span.@{ant-prefix}-input-group-compact,
+.@{ant-prefix}-space-compact {
   &.pro-time-limit,
   &.pro-range-limit {
     display: flex;
 
     .@{ant-prefix}-picker {
       flex: 1;
+      border-right: 0;
+      border-top-right-radius: 0 !important;
+      border-bottom-right-radius: 0 !important;
     }
 
     .@{ant-prefix}-picker-focused {
       z-index: 1;
     }
+
     .forever-checkbox {
       flex: 0;
       min-width: unset;
       white-space: nowrap;
+      border-left: 0;
+      border-top-left-radius: 0 !important;
+      border-bottom-left-radius: 0 !important;
+
+      &.@{ant-prefix}-input {
+        display: flex;
+        align-items: center;
+        min-height: 32px;
+        padding: 4px 11px;
+        background-color: #ffffff;
+        border: 1px solid #d9d9d9;
+        margin-left: 1px;
+        border-top-right-radius: 6px !important;
+        border-bottom-right-radius: 6px !important;
+        transition: all 0.2s;
+
+        &:hover {
+          border-color: #40a9ff;
+        }
+
+        &.@{ant-prefix}-input-disabled {
+          color: rgba(0, 0, 0, 0.25);
+          background-color: #f5f5f5;
+          border-color: #d9d9d9;
+          cursor: not-allowed;
+        }
+
+        .@{ant-prefix}-checkbox-wrapper {
+          display: flex;
+          align-items: center;
+
+          &.@{ant-prefix}-checkbox-wrapper-disabled {
+            color: rgba(0, 0, 0, 0.25);
+          }
+        }
+      }
+    }
+
+    // 确保焦点状态下的边框连接正确
+    .@{ant-prefix}-picker:focus {
+      z-index: 1;
+      border-right: 0;
+    }
+
+    .forever-checkbox.@{ant-prefix}-input:focus {
+      z-index: 1;
+      border-color: #40a9ff;
+      border-left: 0;
+      box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
+    }
+
+    // 当日期选择器聚焦时，复选框也要有相应的样式
+    .@{ant-prefix}-picker-focused + .forever-checkbox.@{ant-prefix}-input {
+      border-color: #40a9ff;
+      border-left: 0;
     }
   }
 }