fix(lib): 修复anyof 默认值计算可能丢失属性

fix #108

Author: lljj-x

packages/lib/utils/schema/getDefaultFormState.js

@@ -101,29 +101,36 @@ function computeDefaults(
             rootSchema,
             formData
         );
-        if (schema.properties && matchSchema.properties) {
-            // 对象 oneOf 需要合并原属性和 oneOf 属性
-            const mergeSchema = mergeObjects(schema, matchSchema);
-            delete mergeSchema.oneOf;
-            schema = mergeSchema;
-        } else {
-            schema = matchSchema;
-        }
+
+        schema = mergeObjects(schema, matchSchema);
+        delete schema.oneOf;
+
+        // if (schema.properties && matchSchema.properties) {
+        //     // 对象 oneOf 需要合并原属性和 oneOf 属性
+        //     const mergeSchema = mergeObjects(schema, matchSchema);
+        //     delete mergeSchema.oneOf;
+        //     schema = mergeSchema;
+        // } else {
+        //     schema = matchSchema;
+        // }
     } else if ('anyOf' in schema) {
         const matchSchema = retrieveSchema(
             schema.anyOf[getMatchingOption(formData, schema.anyOf, rootSchema)],
             rootSchema,
             formData
         );
 
-        if (schema.properties && matchSchema.properties) {
-            // 对象 anyOf 需要合并原属性和 anyOf 属性
-            const mergeSchema = mergeObjects(schema, matchSchema);
-            delete mergeSchema.anyOf;
-            schema = mergeSchema;
-        } else {
-            schema = matchSchema;
-        }
+        schema = mergeObjects(schema, matchSchema);
+        delete schema.anyOf;
+
+        // if (schema.properties && matchSchema.properties) {
+        //     // 对象 anyOf 需要合并原属性和 anyOf 属性
+        //     const mergeSchema = mergeObjects(schema, matchSchema);
+        //     delete mergeSchema.anyOf;
+        //     schema = mergeSchema;
+        // } else {
+        //     schema = matchSchema;
+        // }
     }
     // Not defaults defined for this node, fallback to generic typed ones.
     if (typeof defaults === 'undefined') {

packages/lib/utils/utils.js

@@ -71,6 +71,8 @@ export function mergeSchemas(obj1, obj2) {
 export function mergeObjects(obj1, obj2, concatArrays = false) {
     // Recursively merge deeply nested objects.
     const preAcc = Object.assign({}, obj1); // Prevent mutation of source object.
+    if (!isObject(obj2)) return preAcc;
+
     return Object.keys(obj2).reduce((acc, key) => {
         const left = obj1 ? obj1[key] : {};
         const right = obj2[key];