From 9a21b8b6a4a33d69c4e1b439fc01c4038c150ff9 Mon Sep 17 00:00:00 2001
From: Liu Ya <liuya54892@gmail.com>
Date: Mon, 12 Apr 2021 20:50:45 +0800
Subject: [PATCH] fix(form): Improve form error handling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 自定义组件 Array 的元素可能为 null

* 自定义组件时没有抛出错误
---
 src/components/Form/src/hooks/useFormEvents.ts | 4 +++-
 src/components/Form/src/hooks/useFormValues.ts | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/Form/src/hooks/useFormEvents.ts b/src/components/Form/src/hooks/useFormEvents.ts
index a4609cb5c15..db4035b7b7b 100644
--- a/src/components/Form/src/hooks/useFormEvents.ts
+++ b/src/components/Form/src/hooks/useFormEvents.ts
@@ -212,7 +212,9 @@ export function useFormEvents({
       const values = await validate();
       const res = handleFormValues(values);
       emit('submit', res);
-    } catch (error) {}
+    } catch (error) {
+      throw new Error(error);
+    }
   }
 
   return {
diff --git a/src/components/Form/src/hooks/useFormValues.ts b/src/components/Form/src/hooks/useFormValues.ts
index 015b12d8269..af3f82efa60 100644
--- a/src/components/Form/src/hooks/useFormValues.ts
+++ b/src/components/Form/src/hooks/useFormValues.ts
@@ -35,7 +35,7 @@ export function useFormValues({
       if (isObject(value)) {
         value = transformDateFunc(value);
       }
-      if (isArray(value) && value[0]._isAMomentObject && value[1]._isAMomentObject) {
+      if (isArray(value) && value[0]?._isAMomentObject && value[1]?._isAMomentObject) {
         value = value.map((item) => transformDateFunc(item));
       }
       // Remove spaces