fix date input field require validation

raheeliftikhar5 · raheeliftikhar5 · commit 606966233363 · 2024-05-20T11:46:03.000+05:00
diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/dateComp.tsx b/client/packages/lowcoder/src/comps/comps/dateComp/dateComp.tsx
@@ -119,6 +119,7 @@ const timeValidationFields = (children: CommonChildrenType, dateType: PickerMode
 function validate(
   props: RecordConstructorToView<typeof validationChildren> & {
     value: { value: string };
+    showTime: boolean;
   }
 ): {
   validateStatus: "success" | "warning" | "error";
@@ -127,10 +128,9 @@ function validate(
   if (props.customRule) {
     return { validateStatus: "error", help: props.customRule };
   }
+  const currentDateTime = dayjs(props.value.value, DateParser);
 
-  const currentDateTime = dayjs(dayjs(props.value.value), DATE_TIME_FORMAT);
-
-  if (props.required && !currentDateTime.isValid()) {
+  if (props.required && (props.value.value === '' || !currentDateTime.isValid())) {
     return { validateStatus: "error", help: trans("prop.required") };
   }
 
@@ -169,6 +169,7 @@ export const datePickerControl = new UICompBuilder(childrenMap, (props) => {
   if (props.value.value !== '') {
     time = dayjs(props.value.value, DateParser);
   }
+
   return props.label({
     required: props.required,
     style: props.style,
diff --git a/client/packages/lowcoder/src/util/dateTimeUtils.ts b/client/packages/lowcoder/src/util/dateTimeUtils.ts
@@ -71,10 +71,11 @@ export const TIME_12_FORMAT = "HH:mm:ss:a";
 export const TIME_FORMAT_MINUTES = "HH:mm"
 export const DATE_FORMAT = "YYYY-MM-DD";
 export const DATE_FORMAT_EN = "MM/DD/YYYY";
+export const DATE_FORMAT_EN_2 = "M/D/YYYY";
 export const DATE_TIME_FORMAT = "YYYY-MM-DD HH:mm:ss";
 export const DATE_TIME_12_FORMAT = "YYYY-MM-DD HH:mm:ss:a";
 export const TIMESTAMP_FORMAT = "x";
-export const DateParser = [DATE_TIME_FORMAT, DATE_TIME_12_FORMAT, DATE_FORMAT, TIMESTAMP_FORMAT, DATE_FORMAT_EN];
+export const DateParser = [DATE_TIME_FORMAT, DATE_TIME_12_FORMAT, DATE_FORMAT, TIMESTAMP_FORMAT, DATE_FORMAT_EN, DATE_FORMAT_EN_2];
 export const TimeParser = [TIME_12_FORMAT, TIME_FORMAT, TIMESTAMP_FORMAT];
 export type PickerMode = "date" | "week" | "month" | "quarter" | "year";
 
