@zat-design/sisyphus-react 3.13.13-beta.6 → 4.0.0-beta.2

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

@@ -5,15 +5,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/checkbox/style");
-var _checkbox = _interopRequireDefault(require("antd/es/checkbox"));
-require("antd/es/input/style");
-var _input = _interopRequireDefault(require("antd/es/input"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 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 _isObject2 = _interopRequireDefault(require("lodash/isObject"));
 var _uniq2 = _interopRequireDefault(require("lodash/uniq"));
@@ -21,14 +15,15 @@ var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 var _omit2 = _interopRequireDefault(require("lodash/omit"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
+var _antd = require("antd");
 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 _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 = function useControlled(props) {
   var _useState = (0, _react.useState)(),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -36,7 +31,7 @@ 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]) && (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 = function handleChange(value, other) {
       if (!value) {
         props === null || props === void 0 ? void 0 : props.onChange(value, other);
@@ -55,7 +50,7 @@ var useControlled = function useControlled(props) {
   // @ts-ignore
   return [value, setValue];
 };
-var RangePicker = _datePicker.default.RangePicker;
+var RangePicker = _antd.DatePicker.RangePicker;
 var ProRangeLimit = function ProRangeLimit(props) {
   var disabled = props.disabled,
     _props$foreverText = props.foreverText,
@@ -103,7 +98,6 @@ var ProRangeLimit = function ProRangeLimit(props) {
       _rest.showTime = false;
     }
   }
-  var _viewFormat = Array.isArray(format) ? format[0] : format;
   var tempFormat = Array.isArray(format) ? format : [format];
   if ((0, _isFunction2.default)(format)) {
     tempFormat = [];
@@ -115,10 +109,31 @@ var ProRangeLimit = function ProRangeLimit(props) {
     format: 'HH:mm:ss'
   };
   var _isForever = (0, _react.useMemo)(function () {
-    return (0, _moment.default)(_foreverDate, format).isSame(endDate);
-  }, [value]);
-  var foreverMoment = (0, _react.useMemo)(function () {
-    return (0, _moment.default)(_foreverDate, format);
+    var foreverDayjs = function () {
+      // 使用健壮的日期解析方式
+      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)(function () {
+    // 使用健壮的日期解析方式
+    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;
@@ -138,7 +153,7 @@ var ProRangeLimit = function ProRangeLimit(props) {
   // 时间范围change
   var handleRangeChange = function handleRangeChange(date, dateStr) {
     if (!date) {
-      onChange(date, dateStr);
+      onChange(null, null);
       return;
     }
     var _ref4 = date || [],
@@ -153,20 +168,22 @@ var ProRangeLimit = function ProRangeLimit(props) {
   };
   // 长期选择框change
   var handleForeverChange = function handleForeverChange(e) {
-    var foreverStr = e.target.checked ? 'Y' : 'N';
     var _ref8 = value || [],
       _ref9 = (0, _slicedToArray2.default)(_ref8, 1),
       start = _ref9[0];
-    var _ref10 = value || [],
-      _ref11 = (0, _slicedToArray2.default)(_ref10, 2),
-      end = _ref11[1];
+    var _ref0 = value || [],
+      _ref1 = (0, _slicedToArray2.default)(_ref0, 2),
+      end = _ref1[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 +192,7 @@ var ProRangeLimit = function ProRangeLimit(props) {
   if ((0, _isObject2.default)(_rest.showTime)) {
     _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
   }
-  return (0, _jsxRuntime.jsxs)(_input.default.Group, {
-    compact: true,
+  return (0, _jsxRuntime.jsxs)(_antd.Space.Compact, {
     className: "pro-range-limit",
     children: [(0, _jsxRuntime.jsx)(RangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
       allowClear: true,
@@ -188,7 +204,7 @@ var ProRangeLimit = function ProRangeLimit(props) {
       onChange: handleRangeChange
     })), limit && (0, _jsxRuntime.jsx)("div", {
       className: className,
-      children: (0, _jsxRuntime.jsx)(_checkbox.default, {
+      children: (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 = function useControlled(props) {
   var value = props.value,
@@ -25,7 +25,19 @@ var useControlled = function 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

@@ -5,12 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ProTimeLimit = void 0;
-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"));
-require("antd/es/input/style");
-var _input = _interopRequireDefault(require("antd/es/input"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -20,8 +14,9 @@ var _uniq2 = _interopRequireDefault(require("lodash/uniq"));
 var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
 var _omit2 = _interopRequireDefault(require("lodash/omit"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _moment = _interopRequireDefault(require("moment"));
+var _dayjs = _interopRequireDefault(require("dayjs"));
 var _react = require("react");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
@@ -75,13 +70,21 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
     format: 'HH:mm:ss'
   };
   var _useMemo = (0, _react.useMemo)(function () {
-      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)({
       format: format
@@ -91,16 +94,21 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
     onChange = _useControlled2[1];
   var isForever = (0, _react.useMemo)(function () {
     if ((0, _isObject2.default)(value)) {
-      return foreverMoment.format(format) === value.format(format);
+      return foreverDayjs.format(format) === value.format(format);
     }
     return false;
-  }, [foreverMoment, value]);
+  }, [foreverDayjs, value]);
   var foreverChange = function foreverChange(e) {
     var checkedForever = e.target.checked;
     if (checkedForever) {
-      onChange((0, _moment.default)(foreverString, format));
+      // 直接使用计算好的 foreverDayjs，避免重新解析
+      onChange(foreverDayjs);
     } else {
-      onChange(null);
+      // 防止长期选择后，时间面板还是9999-01-01
+      onChange((0, _dayjs.default)());
+      setTimeout(function () {
+        onChange(null);
+      }, 0);
     }
   };
   if (isView) {
@@ -132,10 +140,10 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
     'ant-input-disabled': disabled,
     'forever-checkbox': true
   });
-  return (0, _jsxRuntime.jsxs)(_input.default.Group, {
-    compact: true,
+  return (0, _jsxRuntime.jsxs)(_antd.Space.Compact, {
     className: "pro-time-limit",
-    children: [(0, _jsxRuntime.jsx)(_datePicker.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+    children: [(0, _jsxRuntime.jsx)(_antd.DatePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+      defaultPickerValue: (0, _dayjs.default)(),
       disabled: disabled || isForever
     }, initialConfig), (0, _omit2.default)(_rest, ['placeholder'])), {}, {
       format: _format,
@@ -143,7 +151,7 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
       onChange: onChange
     })), limit && (0, _jsxRuntime.jsx)("div", {
       className: className,
-      children: (0, _jsxRuntime.jsx)(_checkbox.default, {
+      children: (0, _jsxRuntime.jsx)(_antd.Checkbox, {
         checked: isForever,
         disabled: disabled,
         onChange: foreverChange,

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

@@ -1,5 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @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 +7,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;
     }
   }
 }

package/lib/ProForm/components/index.d.ts

@@ -12,8 +12,6 @@ export { default as TimePicker } from './base/TimePicker';
 export { default as FormList } from './combination/FormList';
 export { default as ProEditTable } from '../../ProEditTable';
 export { default as ProCascader } from './combination/ProCascader';
-export { default as ProAddressBar } from './combination/ProCascader';
-export { default as ProCombination } from './combination/ProCombination';
 export { default as ProNumberRange } from './combination/ProNumberRange';
 export { default as ProModalSelect } from './combination/ProModalSelect';
 export { default as ProTimeLimit } from './combination/ProTimeLimit';
@@ -27,9 +25,3 @@ export { default as ProUpload } from '../../ProUpload';
 export { default as ProTreeModal } from '../../ProTreeModal';
 export { default as ProTree } from '../../ProTree';
 export { default as FormFooter } from './FormFooter';
-export { default as ProAddress, transferAddressInfoToRegion } from './old/ProAddress';
-export { default as EnumSelect } from './old/EnumSelect';
-export { default as InputRange } from './old/InputRange';
-export { default as ProRangeBox } from './old/ProRangeBox';
-export { default as ProCertValidity } from './old/ProCertValidity';
-export { default as ProCertNo } from './old/ProCertNo';