Merge pull request #1410 from alibaba/fix-moment

feat: 迭代开发

Author: lhbxs

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

@@ -34,7 +34,6 @@ export default (_values: any, flattenSchema: object) => {
   };
 
   const recursiveObj = (obj: any, prePath?: string, parentData?: any) => {
-    const result = Object.create(Object.getPrototypeOf(obj));
 
     for (let key of Object.keys(obj)) {
       const item = obj[key];
@@ -50,25 +49,26 @@ export default (_values: any, flattenSchema: object) => {
       if (schema?.hidden) {
         const hidden = transformHidden(schema.hidden, _values, parentData);
         if (hidden) {
+          obj[key] = undefined;
           continue;
         }
       }
 
       if (isObject(item)) {
-        result[key] = recursiveObj(item, path, parentData);
+        obj[key] = recursiveObj(item, path, parentData);
         continue;
       }
 
       if (isArray(item) && schema?.items) {
-        result[key] = recursiveArray(item, path) || [];
+        obj[key] = recursiveArray(item, path) || [];
         continue;
       }
 
-      result[key] = item;
+      obj[key] = item;
     }
 
-    return result;
+    return obj;
   };
 
-  return recursiveObj(_values);
+  return recursiveObj(_values) || {};
 }

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

@@ -20,34 +20,28 @@ export default (values: any, notFilter?: boolean) => {
   };
 
   const recursiveObj = (obj: any, filter = true) => {
-    let result = Object.create(Object.getPrototypeOf(obj));
-
     for (let key of Object.keys(obj)) {
       const item = obj[key];
+
       if (isObject(item)) {
-        result[key] = recursiveObj(item);
-        continue;
+        obj[key] = recursiveObj(item);
       }
+
       if (isArray(item)) {
         const data = recursiveArray(item);
         if (notFilter || !data) {
-          result[key] = data;
+          obj[key] = data;
         } else {
-          result[key] = (data || []).filter((item: any) => item !== undefined);
+          obj[key] = (data || []).filter((item: any) => item !== undefined);
         }
-        continue;
-      }
-      if (item !== undefined) {
-        result[key] = item;
       }
     }
 
-    result = omitBy(result, isUndefined);
-    if (Object.keys(result).length === 0 && filter) {
+    obj = omitBy(obj, isUndefined);
+    if (Object.keys(obj).length === 0 && filter) {
       return undefined;
     }
-
-    return result;
+    return obj;
   };
 
   return recursiveObj(values) || {};

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

@@ -1,9 +1,10 @@
 import { useRef } from 'react';
 import { Form } from 'antd';
+import { cloneDeep } from 'lodash-es';
 
 import { transformFieldsData, getSchemaFullPath } from './formCoreUtils';
 import { parseBindToValues, parseValuesToBind } from './bindValues';
-import { _isMatch, _set, _get, _has, _cloneDeep, _merge, _mergeWith, isFunction, isObject, isArray, _isUndefined, hasFuncProperty } from '../utils';
+import { _isMatch, _set, _get, _has, _merge, _mergeWith, isFunction, isObject, isArray, _isUndefined, hasFuncProperty } from '../utils';
 import filterValuesUndefined from './filterValuesUndefined';
 import filterValuesHidden from '../models/filterValuesHidden';
 import { flattenSchema as flatten } from './flattenSchema';
@@ -123,7 +124,7 @@ const useForm = () => {
       return;
     }
 
-    const schema = _cloneDeep(schemaRef.current);
+    const schema = cloneDeep(schemaRef.current);
     Object.keys(obj || {}).forEach(path => {
       updateSchemaByPath(path, obj[path], schema);
     });
@@ -138,7 +139,7 @@ const useForm = () => {
       return;
     }
 
-    const schema = _cloneDeep(schemaRef.current);
+    const schema = cloneDeep(schemaRef.current);
     updateSchemaByPath(_path, _newSchema, schema);
     handleSchemaUpdate(schema);
   }
@@ -163,7 +164,7 @@ const useForm = () => {
 
   // 获取表单数据
   xform.getValues = (nameList?: any, filterFunc?: any) => {
-    let values = form.getFieldsValue(getFieldName(nameList), filterFunc);
+    let values = cloneDeep(form.getFieldsValue(getFieldName(nameList), filterFunc));
     values = filterValuesHidden(values, flattenSchemaRef.current);
     values = filterValuesUndefined(values);
     return parseValuesToBind(values, flattenSchemaRef.current);