Commit6069662

committed

fix date input field require validation

1 parent3bccf4a commit6069662Copy full SHA for 6069662

File tree

-4

lines changed

client/packages/lowcoder/src
- comps/comps/dateComp
  - dateComp.tsx
- util
  - dateTimeUtils.ts

-4

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,7 @@ const timeValidationFields = (children: CommonChildrenType, dateType: PickerMode`
`119`	`119`	`functionvalidate(`
`120`	`120`	`props:RecordConstructorToView<typeofvalidationChildren>&{`
`121`	`121`	`value:{value:string};`
	`122`	`+showTime:boolean;`
`122`	`123`	`}`
`123`	`124`	`):{`
`124`	`125`	`validateStatus:"success"\|"warning"\|"error";`
`@@ -127,10 +128,9 @@ function validate(`
`127`	`128`	`if(props.customRule){`
`128`	`129`	`return{validateStatus:"error",help:props.customRule};`
`129`	`130`	`}`
	`131`	`+constcurrentDateTime=dayjs(props.value.value,DateParser);`
`130`	`132`
`131`		`-constcurrentDateTime=dayjs(dayjs(props.value.value),DATE_TIME_FORMAT);`
`132`		`-`
`133`		`-if(props.required&&!currentDateTime.isValid()){`
	`133`	`+if(props.required&&(props.value.value===''\|\|!currentDateTime.isValid())){`
`134`	`134`	`return{validateStatus:"error",help:trans("prop.required")};`
`135`	`135`	`}`
`136`	`136`
`@@ -169,6 +169,7 @@ export const datePickerControl = new UICompBuilder(childrenMap, (props) => {`
`169`	`169`	`if(props.value.value!==''){`
`170`	`170`	`time=dayjs(props.value.value,DateParser);`
`171`	`171`	`}`
	`172`	`+`
`172`	`173`	`returnprops.label({`
`173`	`174`	`required:props.required,`
`174`	`175`	`style:props.style,`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -71,10 +71,11 @@ export const TIME_12_FORMAT = "HH:mm:ss:a";`
`71`	`71`	`exportconstTIME_FORMAT_MINUTES="HH:mm"`
`72`	`72`	`exportconstDATE_FORMAT="YYYY-MM-DD";`
`73`	`73`	`exportconstDATE_FORMAT_EN="MM/DD/YYYY";`
	`74`	`+exportconstDATE_FORMAT_EN_2="M/D/YYYY";`
`74`	`75`	`exportconstDATE_TIME_FORMAT="YYYY-MM-DD HH:mm:ss";`
`75`	`76`	`exportconstDATE_TIME_12_FORMAT="YYYY-MM-DD HH:mm:ss:a";`
`76`	`77`	`exportconstTIMESTAMP_FORMAT="x";`
`77`		`-exportconstDateParser=[DATE_TIME_FORMAT,DATE_TIME_12_FORMAT,DATE_FORMAT,TIMESTAMP_FORMAT,DATE_FORMAT_EN];`
	`78`	`+exportconstDateParser=[DATE_TIME_FORMAT,DATE_TIME_12_FORMAT,DATE_FORMAT,TIMESTAMP_FORMAT,DATE_FORMAT_EN,DATE_FORMAT_EN_2];`
`78`	`79`	`exportconstTimeParser=[TIME_12_FORMAT,TIME_FORMAT,TIMESTAMP_FORMAT];`
`79`	`80`	`exporttypePickerMode="date"\|"week"\|"month"\|"quarter"\|"year";`
`80`	`81`

Comments

(0)