fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-07-01 18:52:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source
This commit is contained in:
nocobase[bot] 2025-01-08 06:47:29 +00:00
commit fe7a5547a7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx
View File

@ -205,7 +205,7 @@ DatePicker.RangePicker = function RangePicker(props: any) {
...props, ...props,
format: getDateTimeFormat(targetPicker, targetDateFormat, showTime, timeFormat), format: getDateTimeFormat(targetPicker, targetDateFormat, showTime, timeFormat),
picker: targetPicker, 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); const [stateProps, setStateProps] = useState(newProps);
if (isFilterAction) { if (isFilterAction) {

2
packages/core/utils/src/date.ts
View File

@ -229,7 +229,7 @@ export const getPickerFormat = (picker) => {
export const getDateTimeFormat = (picker, format, showTime, timeFormat) => { export const getDateTimeFormat = (picker, format, showTime, timeFormat) => {
if (picker === 'date') { if (picker === 'date') {
if (showTime) { if (showTime) {
return format + timeFormat || 'HH:mm:ss'; return `${format} ${timeFormat || 'HH:mm:ss'}`;
} }
return format; return format;
} }