mirror of
https://gitee.com/nocobase/nocobase.git
synced 2025-07-02 03:02:19 +08:00
Merge branch 'main' into next
This commit is contained in:
commit
e2d62ef802
@ -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';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user