diff --git a/src/_common b/src/_common index a2e0367a0..89338c6ca 160000 --- a/src/_common +++ b/src/_common @@ -1 +1 @@ -Subproject commit a2e0367a0fb796e02776fb55593d9e67fe5bfd6b +Subproject commit 89338c6ca0914e0b5436bf0dc53ba0918e848abb diff --git a/src/date-picker/DatePicker.tsx b/src/date-picker/DatePicker.tsx index c334f6e82..536f15f65 100644 --- a/src/date-picker/DatePicker.tsx +++ b/src/date-picker/DatePicker.tsx @@ -8,7 +8,7 @@ import SelectInput from '../select-input'; import SinglePanel from './panel/SinglePanel'; import useSingle from './hooks/useSingle'; import { parseToDayjs, getDefaultFormat, formatTime, formatDate } from '../_common/js/date-picker/format'; -import { subtractMonth, addMonth, extractTimeObj } from '../_common/js/date-picker/utils'; +import { subtractMonth, addMonth, extractTimeObj, covertToDate } from '../_common/js/date-picker/utils'; import { datePickerDefaultProps } from './defaultProps'; import useDefaultProps from '../hooks/useDefaultProps'; @@ -64,8 +64,9 @@ const DatePicker = forwardRef((originalProps, r useEffect(() => { // 面板展开重置数据 - setCacheValue(formatDate(value, { format })); - setInputValue(formatDate(value, { format })); + const dateValue = value ? covertToDate(value as string, valueType) : value; + setCacheValue(formatDate(dateValue, { format })); + setInputValue(formatDate(dateValue, { format })); if (popupVisible) { setYear(parseToDayjs(value, format).year());