Merge pull request #1416 from alibaba/fix-moment

feat: 修复 moment 数据解析错误

packages/form-render/package.json

@@ -1,6 +1,6 @@
 {
   "name": "form-render",
-  "version": "2.2.19",
+  "version": "2.2.21",
   "description": "通过 JSON Schema 生成标准 Form，常用于自定义搭建配置界面生成",
   "keywords": [
     "Form",

packages/form-render/src/models/filterValuesUndefined.ts

@@ -3,7 +3,7 @@ import { isObject, isArray } from '../utils';
 
 export default (values: any, notFilter?: boolean) => {
   const recursiveArray = (list: any[]) => {
-    const result = (list || []).map(item => {
+    let result = list.map(item => {
       if (isObject(item)) {
         return recursiveObj(item, false);
       }
@@ -12,15 +12,19 @@ export default (values: any, notFilter?: boolean) => {
       }
       return item;
     });
-
     if (Object.keys(result).length === 0) {
       return undefined;
     }
     return result;
   };
-
-  const recursiveObj = (obj: any, filter = true) => {
-    for (let key of Object.keys(obj)) {
+
+  const recursiveObj = (_obj: any, filter = true) => {
+    if (_obj._isAMomentObject) {
+      return _obj;
+    }
+
+    let obj =  omitBy(_obj, isUndefined);
+    Object.keys(obj).forEach(key => {
       const item = obj[key];
 
       if (isObject(item)) {
@@ -29,13 +33,12 @@ export default (values: any, notFilter?: boolean) => {
 
       if (isArray(item)) {
         const data = recursiveArray(item);
-        if (notFilter || !data) {
-          obj[key] = data;
-        } else {
-          obj[key] = (data || []).filter((item: any) => item !== undefined);
+        obj[key] = data;
+        if (!notFilter && data) {
+          obj[key] = data.filter((item: any) => item !== undefined);
         }
       }
-    }
+    });
 
     obj = omitBy(obj, isUndefined);
     if (Object.keys(obj).length === 0 && filter) {