Merge branch 'main' into next

This commit is contained in:
nocobase[bot] 2025-02-19 02:17:12 +00:00
commit e2d62ef802

View File

@ -271,7 +271,7 @@ function withParams(value: any[], params: { fieldOperator?: string; isParsingVar
return value; return value;
} }
export function inferPickerType(dateString: string, picker): 'year' | 'month' | 'quarter' | 'date' { export function inferPickerType(dateString: string, picker?): 'year' | 'month' | 'quarter' | 'date' {
if (/^\d{4}$/.test(dateString)) { if (/^\d{4}$/.test(dateString)) {
return 'year'; return 'year';
} else if (/^\d{4}-\d{2}$/.test(dateString)) { } else if (/^\d{4}-\d{2}$/.test(dateString)) {
@ -281,6 +281,6 @@ export function inferPickerType(dateString: string, picker): 'year' | 'month' |
} else if (/^\d{4}-\d{2}-\d{2}$/.test(dateString)) { } else if (/^\d{4}-\d{2}-\d{2}$/.test(dateString)) {
return 'date'; return 'date';
} else { } else {
return picker; return picker || 'date';
} }
} }