fix: converting without a format in case the conversion doesn't work

teableio · May 20, 2024 · bb699da · bb699da
1 parent 0dad34a
commit bb699da
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/packages/core/src/models/field/derivate/date.field.ts b/packages/core/src/models/field/derivate/date.field.ts
@@ -53,6 +53,15 @@ export class DateFieldCore extends FieldCore {
 
     return this.item2String(cellValue as string);
   }
+  private defaultTzFormat(value: string) {
+    try {
+      const formatValue = dayjs.tz(value, this.options.formatting.timeZone);
+      if (!formatValue.isValid()) return null;
+      return formatValue.toISOString();
+    } catch (e) {
+      return null;
+    }
+  }
 
   convertStringToCellValue(value: string): string | null {
     if (this.isLookup) {
@@ -66,12 +75,13 @@ export class DateFieldCore extends FieldCore {
     const format =
       this.options.formatting.date +
       (hasTime && this.options.formatting.time ? ' ' + this.options.formatting.time : '');
+
     try {
       const formatValue = dayjs.tz(value, format, this.options.formatting.timeZone);
       if (!formatValue.isValid()) return null;
       return formatValue.toISOString();
     } catch (e) {
-      return null;
+      return this.defaultTzFormat(value);
     }
   }