diff --git a/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx b/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx index 6f213b508e..d097dfc4ad 100644 --- a/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx +++ b/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx @@ -101,7 +101,7 @@ DatePicker.RangePicker = function RangePicker(props: any) { ...props, format: getDateTimeFormat(targetPicker, targetDateFormat, showTime, timeFormat), picker: targetPicker, - showTime: showTime ? { defaultValue: [dayjs('00:00:00', 'HH:mm:ss'), dayjs('00:00:00', 'HH:mm:ss')] } : false, + showTime: showTime ? { defaultValue: [dayjs('00:00:00', 'HH:mm:ss'), dayjs('23:59:59', 'HH:mm:ss')] } : false, }; const [stateProps, setStateProps] = useState(newProps); if (isFilterAction) { diff --git a/packages/core/utils/src/date.ts b/packages/core/utils/src/date.ts index f6d9a80cbc..c68cdf8154 100644 --- a/packages/core/utils/src/date.ts +++ b/packages/core/utils/src/date.ts @@ -229,7 +229,7 @@ export const getPickerFormat = (picker) => { export const getDateTimeFormat = (picker, format, showTime, timeFormat) => { if (picker === 'date') { if (showTime) { - return format + timeFormat || 'HH:mm:ss'; + return `${format} ${timeFormat || 'HH:mm:ss'}`; } return format; }