From a91b75199550b0bf446cde5d6a6d76e798aeecf0 Mon Sep 17 00:00:00 2001
From: Bobby Wang <bofei@mail.com>
Date: Sat, 1 Apr 2023 02:37:14 +1300
Subject: [PATCH 1/2] fix export crash due to toDate issue

---
 src/components/fields/Date/index.tsx     | 9 +++++++--
 src/components/fields/DateTime/index.tsx | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/components/fields/Date/index.tsx b/src/components/fields/Date/index.tsx
index a8989d48..8a126c22 100644
--- a/src/components/fields/Date/index.tsx
+++ b/src/components/fields/Date/index.tsx
@@ -35,8 +35,13 @@ export const config: IFieldConfig = {
   filter: { operators: filterOperators, valueFormatter },
   settings: Settings,
   csvImportParser: (value, config) => parse(value, DATE_FORMAT, new Date()),
-  csvExportFormatter: (value: any, config?: any) =>
-    format(value.toDate(), DATE_FORMAT),
+  csvExportFormatter: (value: any, config?: any) => {
+    if (typeof value === "number") {
+      return format(new Date(value), DATE_FORMAT);
+    } else {
+      return format(value.toDate(), DATE_FORMAT);
+    }
+  },
 };
 export default config;
 
diff --git a/src/components/fields/DateTime/index.tsx b/src/components/fields/DateTime/index.tsx
index 38e0e412..65c77ff5 100644
--- a/src/components/fields/DateTime/index.tsx
+++ b/src/components/fields/DateTime/index.tsx
@@ -47,8 +47,13 @@ export const config: IFieldConfig = {
   },
   settings: Settings,
   csvImportParser: (value) => new Date(value),
-  csvExportFormatter: (value: any, config?: any) =>
-    format(value.toDate(), DATE_TIME_FORMAT),
+  csvExportFormatter: (value: any, config?: any) => {
+    if (typeof value === "number") {
+      return format(new Date(value), config?.format || DATE_TIME_FORMAT);
+    } else {
+      return format(value.toDate(), config?.format || DATE_TIME_FORMAT);
+    }
+  },
 };
 export default config;
 

From f66e8b988072c139b52ce9300fc2307a7ba4033f Mon Sep 17 00:00:00 2001
From: Bobby Wang <bofei@mail.com>
Date: Sat, 1 Apr 2023 02:52:00 +1300
Subject: [PATCH 2/2] fix commit history

---
 src/components/fields/DateTime/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/fields/DateTime/index.tsx b/src/components/fields/DateTime/index.tsx
index 65c77ff5..ea0305c8 100644
--- a/src/components/fields/DateTime/index.tsx
+++ b/src/components/fields/DateTime/index.tsx
@@ -49,9 +49,9 @@ export const config: IFieldConfig = {
   csvImportParser: (value) => new Date(value),
   csvExportFormatter: (value: any, config?: any) => {
     if (typeof value === "number") {
-      return format(new Date(value), config?.format || DATE_TIME_FORMAT);
+      return format(new Date(value), DATE_TIME_FORMAT);
     } else {
-      return format(value.toDate(), config?.format || DATE_TIME_FORMAT);
+      return format(value.toDate(), DATE_TIME_FORMAT);
     }
   },
 };