fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-08 06:59:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into develop

Browse Source
This commit is contained in:
nocobase[bot] 2025-01-14 09:08:21 +00:00
commit f45d1408dd
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,6 +160,7 @@ export const DatePicker: ComposedDatePicker = (props: any) => {
disabledDate, disabledDate,
disabledTime, disabledTime,
showTime: props.showTime ? { defaultValue: dayjs('00:00:00', 'HH:mm:ss') } : false, showTime: props.showTime ? { defaultValue: dayjs('00:00:00', 'HH:mm:ss') } : false,
inputReadOnly: true,
}; };
return <InternalDatePicker {...newProps} value={value} />; return <InternalDatePicker {...newProps} value={value} />;
}; };
@ -206,6 +207,7 @@ DatePicker.RangePicker = function RangePicker(props: any) {
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('23:59:59', 'HH:mm:ss')] } : false, showTime: showTime ? { defaultValue: [dayjs('00:00:00', 'HH:mm:ss'), dayjs('23:59:59', 'HH:mm:ss')] } : false,
inputReadOnly: true,
}; };
const [stateProps, setStateProps] = useState(newProps); const [stateProps, setStateProps] = useState(newProps);
if (isFilterAction) { if (isFilterAction) {
@ -277,6 +279,7 @@ DatePicker.FilterWithPicker = function FilterWithPicker(props: any) {
showTime: showTime ? { defaultValue: dayjs('00:00:00', 'HH:mm:ss') } : false, showTime: showTime ? { defaultValue: dayjs('00:00:00', 'HH:mm:ss') } : false,
format: getDateTimeFormat(targetPicker, targetDateFormat, showTime, timeFormat), format: getDateTimeFormat(targetPicker, targetDateFormat, showTime, timeFormat),
picker: targetPicker, picker: targetPicker,
inputReadOnly: true,
onChange: (val) => { onChange: (val) => {
props.onChange(undefined); props.onChange(undefined);
setTimeout(() => { setTimeout(() => {