Browse Source
fix: bug RangePicker with componentProps valueFormat ('YYYY-MM-DD') does not return the formatted value when using form validate() method #3690 (#3691 )
close #3690
pull/3695/head
No name
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
5 additions and
6 deletions
src/components/Form/src/hooks/useFormEvents.ts
@ -135,6 +135,9 @@ export function useFormEvents({
}
const constructValue = tryConstructArray ( key , values ) || tryConstructObject ( key , values ) ;
const setDateFieldValue = ( v ) = > {
return v ? ( _props ? . valueFormat ? v : dateUtil ( v ) ) : null ;
} ;
// 0| '' is allow
if ( hasKey || ! ! constructValue ) {
@ -144,15 +147,11 @@ export function useFormEvents({
if ( Array . isArray ( fieldValue ) ) {
const arr : any [ ] = [ ] ;
for ( const ele of fieldValue ) {
arr . push ( ele ? dateUtil ( ele ) : null ) ;
arr . push ( setDateFieldValue ( ele ) ) ;
}
unref ( formModel ) [ key ] = arr ;
} else {
unref ( formModel ) [ key ] = fieldValue
? _props ? . valueFormat
? fieldValue
: dateUtil ( fieldValue )
: null ;
unref ( formModel ) [ key ] = setDateFieldValue ( fieldValue ) ;
}
} else {
unref ( formModel ) [ key ] = fieldValue ;