fix(lib): 修复anyOf下多级对象初始值计算错误问题

fix #57

packages/lib/utils/schema/getDefaultFormState.js

@@ -96,7 +96,11 @@ function computeDefaults(
             includeUndefinedValues
         ));
     } else if ('oneOf' in schema) {
-        const matchSchema = schema.oneOf[getMatchingOption(formData, schema.oneOf, rootSchema)];
+        const matchSchema = retrieveSchema(
+            schema.oneOf[getMatchingOption(formData, schema.oneOf, rootSchema)],
+            rootSchema,
+            formData
+        );
         if (schema.properties && matchSchema.properties) {
             // 对象 oneOf 需要合并原属性和 oneOf 属性
             const mergeSchema = mergeObjects(schema, matchSchema);
@@ -106,7 +110,12 @@ function computeDefaults(
             schema = matchSchema;
         }
     } else if ('anyOf' in schema) {
-        const matchSchema = schema.anyOf[getMatchingOption(formData, schema.anyOf, rootSchema)];
+        const matchSchema = retrieveSchema(
+            schema.anyOf[getMatchingOption(formData, schema.anyOf, rootSchema)],
+            rootSchema,
+            formData
+        );
+
         if (schema.properties && matchSchema.properties) {
             // 对象 anyOf 需要合并原属性和 anyOf 属性
             const mergeSchema = mergeObjects(schema, matchSchema);
@@ -116,7 +125,6 @@ function computeDefaults(
             schema = matchSchema;
         }
     }
-
     // Not defaults defined for this node, fallback to generic typed ones.
     if (typeof defaults === 'undefined') {
         defaults = schema.default;

packages/lib/utils/schema/validate.js

@@ -1,5 +1,6 @@
 import Ajv from 'ajv';
 import i18n from '../i18n';
+import retrieveSchema from './retriev';
 
 import {
     isObject, deepEquals
@@ -245,7 +246,7 @@ export function isValid(schema, data) {
 export function getMatchingOption(formData, options, rootSchema, haveAllFields = false) {
     // eslint-disable-next-line no-plusplus
     for (let i = 0; i < options.length; i++) {
-        const option = options[i];
+        const option = retrieveSchema(options[i], rootSchema, formData);
 
         // If the schema describes an object then we need to add slightly more
         // strict matching to the schema, because unless the schema uses the

packages/lib/vue2/vue2-form-element/dist/vueJsonSchemaForm.esm.js

@@ -9070,7 +9070,7 @@ function getMatchingOption(formData, options, rootSchema) {
 
   // eslint-disable-next-line no-plusplus
   for (var i = 0; i < options.length; i++) {
-    var option = options[i]; // If the schema describes an object then we need to add slightly more
+    var option = retrieveSchema(options[i], rootSchema, formData); // If the schema describes an object then we need to add slightly more
     // strict matching to the schema, because unless the schema uses the
     // "requires" keyword, an object will match the schema as long as it
     // doesn't have matching keys with a conflicting type. To do this we use an
@@ -9213,7 +9213,7 @@ function computeDefaults(_schema, parentDefaults, rootSchema) {
       return computeDefaults(itemSchema, Array.isArray(parentDefaults) ? parentDefaults[idx] : undefined, rootSchema, formData, includeUndefinedValues);
     });
   } else if ('oneOf' in schema) {
-    var matchSchema = schema.oneOf[getMatchingOption(formData, schema.oneOf, rootSchema)];
+    var matchSchema = retrieveSchema(schema.oneOf[getMatchingOption(formData, schema.oneOf, rootSchema)], rootSchema, formData);
 
     if (schema.properties && matchSchema.properties) {
       // 对象 oneOf 需要合并原属性和 oneOf 属性
@@ -9224,7 +9224,7 @@ function computeDefaults(_schema, parentDefaults, rootSchema) {
       schema = matchSchema;
     }
   } else if ('anyOf' in schema) {
-    var _matchSchema = schema.anyOf[getMatchingOption(formData, schema.anyOf, rootSchema)];
+    var _matchSchema = retrieveSchema(schema.anyOf[getMatchingOption(formData, schema.anyOf, rootSchema)], rootSchema, formData);
 
     if (schema.properties && _matchSchema.properties) {
       // 对象 anyOf 需要合并原属性和 anyOf 属性

packages/lib/vue2/vue2-form-element/dist/vueJsonSchemaForm.umd.js

@@ -9078,7 +9078,7 @@
 
     // eslint-disable-next-line no-plusplus
     for (var i = 0; i < options.length; i++) {
-      var option = options[i]; // If the schema describes an object then we need to add slightly more
+      var option = retrieveSchema(options[i], rootSchema, formData); // If the schema describes an object then we need to add slightly more
       // strict matching to the schema, because unless the schema uses the
       // "requires" keyword, an object will match the schema as long as it
       // doesn't have matching keys with a conflicting type. To do this we use an
@@ -9221,7 +9221,7 @@
         return computeDefaults(itemSchema, Array.isArray(parentDefaults) ? parentDefaults[idx] : undefined, rootSchema, formData, includeUndefinedValues);
       });
     } else if ('oneOf' in schema) {
-      var matchSchema = schema.oneOf[getMatchingOption(formData, schema.oneOf, rootSchema)];
+      var matchSchema = retrieveSchema(schema.oneOf[getMatchingOption(formData, schema.oneOf, rootSchema)], rootSchema, formData);
 
       if (schema.properties && matchSchema.properties) {
         // 对象 oneOf 需要合并原属性和 oneOf 属性
@@ -9232,7 +9232,7 @@
         schema = matchSchema;
       }
     } else if ('anyOf' in schema) {
-      var _matchSchema = schema.anyOf[getMatchingOption(formData, schema.anyOf, rootSchema)];
+      var _matchSchema = retrieveSchema(schema.anyOf[getMatchingOption(formData, schema.anyOf, rootSchema)], rootSchema, formData);
 
       if (schema.properties && _matchSchema.properties) {
         // 对象 anyOf 需要合并原属性和 anyOf 属性

packages/lib/vue2/vue2-form-iview3/dist/vue2-form-iview3.esm.js

@@ -9070,7 +9070,7 @@ function getMatchingOption(formData, options, rootSchema) {
 
   // eslint-disable-next-line no-plusplus
   for (var i = 0; i < options.length; i++) {
-    var option = options[i]; // If the schema describes an object then we need to add slightly more
+    var option = retrieveSchema(options[i], rootSchema, formData); // If the schema describes an object then we need to add slightly more
     // strict matching to the schema, because unless the schema uses the
     // "requires" keyword, an object will match the schema as long as it
     // doesn't have matching keys with a conflicting type. To do this we use an
@@ -9213,7 +9213,7 @@ function computeDefaults(_schema, parentDefaults, rootSchema) {
       return computeDefaults(itemSchema, Array.isArray(parentDefaults) ? parentDefaults[idx] : undefined, rootSchema, formData, includeUndefinedValues);
     });
   } else if ('oneOf' in schema) {
-    var matchSchema = schema.oneOf[getMatchingOption(formData, schema.oneOf, rootSchema)];
+    var matchSchema = retrieveSchema(schema.oneOf[getMatchingOption(formData, schema.oneOf, rootSchema)], rootSchema, formData);
 
     if (schema.properties && matchSchema.properties) {
       // 对象 oneOf 需要合并原属性和 oneOf 属性
@@ -9224,7 +9224,7 @@ function computeDefaults(_schema, parentDefaults, rootSchema) {
       schema = matchSchema;
     }
   } else if ('anyOf' in schema) {
-    var _matchSchema = schema.anyOf[getMatchingOption(formData, schema.anyOf, rootSchema)];
+    var _matchSchema = retrieveSchema(schema.anyOf[getMatchingOption(formData, schema.anyOf, rootSchema)], rootSchema, formData);
 
     if (schema.properties && _matchSchema.properties) {
       // 对象 anyOf 需要合并原属性和 anyOf 属性

packages/lib/vue2/vue2-form-iview3/dist/vue2-form-iview3.umd.js

@@ -9078,7 +9078,7 @@
 
     // eslint-disable-next-line no-plusplus
     for (var i = 0; i < options.length; i++) {
-      var option = options[i]; // If the schema describes an object then we need to add slightly more
+      var option = retrieveSchema(options[i], rootSchema, formData); // If the schema describes an object then we need to add slightly more
       // strict matching to the schema, because unless the schema uses the
       // "requires" keyword, an object will match the schema as long as it
       // doesn't have matching keys with a conflicting type. To do this we use an
@@ -9221,7 +9221,7 @@
         return computeDefaults(itemSchema, Array.isArray(parentDefaults) ? parentDefaults[idx] : undefined, rootSchema, formData, includeUndefinedValues);
       });
     } else if ('oneOf' in schema) {
-      var matchSchema = schema.oneOf[getMatchingOption(formData, schema.oneOf, rootSchema)];
+      var matchSchema = retrieveSchema(schema.oneOf[getMatchingOption(formData, schema.oneOf, rootSchema)], rootSchema, formData);
 
       if (schema.properties && matchSchema.properties) {
         // 对象 oneOf 需要合并原属性和 oneOf 属性
@@ -9232,7 +9232,7 @@
         schema = matchSchema;
       }
     } else if ('anyOf' in schema) {
-      var _matchSchema = schema.anyOf[getMatchingOption(formData, schema.anyOf, rootSchema)];
+      var _matchSchema = retrieveSchema(schema.anyOf[getMatchingOption(formData, schema.anyOf, rootSchema)], rootSchema, formData);
 
       if (schema.properties && _matchSchema.properties) {
         // 对象 anyOf 需要合并原属性和 anyOf 属性

packages/lib/vue3/vue3-form-ant/dist/vue3-form-ant.esm.js

@@ -9068,7 +9068,7 @@ function getMatchingOption(formData, options, rootSchema) {
 
   // eslint-disable-next-line no-plusplus
   for (var i = 0; i < options.length; i++) {
-    var option = options[i]; // If the schema describes an object then we need to add slightly more
+    var option = retrieveSchema(options[i], rootSchema, formData); // If the schema describes an object then we need to add slightly more
     // strict matching to the schema, because unless the schema uses the
     // "requires" keyword, an object will match the schema as long as it
     // doesn't have matching keys with a conflicting type. To do this we use an
@@ -9211,7 +9211,7 @@ function computeDefaults(_schema, parentDefaults, rootSchema) {
       return computeDefaults(itemSchema, Array.isArray(parentDefaults) ? parentDefaults[idx] : undefined, rootSchema, formData, includeUndefinedValues);
     });
   } else if ('oneOf' in schema) {
-    var matchSchema = schema.oneOf[getMatchingOption(formData, schema.oneOf, rootSchema)];
+    var matchSchema = retrieveSchema(schema.oneOf[getMatchingOption(formData, schema.oneOf, rootSchema)], rootSchema, formData);
 
     if (schema.properties && matchSchema.properties) {
       // 对象 oneOf 需要合并原属性和 oneOf 属性
@@ -9222,7 +9222,7 @@ function computeDefaults(_schema, parentDefaults, rootSchema) {
       schema = matchSchema;
     }
   } else if ('anyOf' in schema) {
-    var _matchSchema = schema.anyOf[getMatchingOption(formData, schema.anyOf, rootSchema)];
+    var _matchSchema = retrieveSchema(schema.anyOf[getMatchingOption(formData, schema.anyOf, rootSchema)], rootSchema, formData);
 
     if (schema.properties && _matchSchema.properties) {
       // 对象 anyOf 需要合并原属性和 anyOf 属性

packages/lib/vue3/vue3-form-ant/dist/vue3-form-ant.umd.js

@@ -9072,7 +9072,7 @@
 
     // eslint-disable-next-line no-plusplus
     for (var i = 0; i < options.length; i++) {
-      var option = options[i]; // If the schema describes an object then we need to add slightly more
+      var option = retrieveSchema(options[i], rootSchema, formData); // If the schema describes an object then we need to add slightly more
       // strict matching to the schema, because unless the schema uses the
       // "requires" keyword, an object will match the schema as long as it
       // doesn't have matching keys with a conflicting type. To do this we use an
@@ -9215,7 +9215,7 @@
         return computeDefaults(itemSchema, Array.isArray(parentDefaults) ? parentDefaults[idx] : undefined, rootSchema, formData, includeUndefinedValues);
       });
     } else if ('oneOf' in schema) {
-      var matchSchema = schema.oneOf[getMatchingOption(formData, schema.oneOf, rootSchema)];
+      var matchSchema = retrieveSchema(schema.oneOf[getMatchingOption(formData, schema.oneOf, rootSchema)], rootSchema, formData);
 
       if (schema.properties && matchSchema.properties) {
         // 对象 oneOf 需要合并原属性和 oneOf 属性
@@ -9226,7 +9226,7 @@
         schema = matchSchema;
       }
     } else if ('anyOf' in schema) {
-      var _matchSchema = schema.anyOf[getMatchingOption(formData, schema.anyOf, rootSchema)];
+      var _matchSchema = retrieveSchema(schema.anyOf[getMatchingOption(formData, schema.anyOf, rootSchema)], rootSchema, formData);
 
       if (schema.properties && _matchSchema.properties) {
         // 对象 anyOf 需要合并原属性和 anyOf 属性

packages/lib/vue3/vue3-form-element/dist/vue3-form-element.esm.js

@@ -9114,7 +9114,7 @@ function getMatchingOption(formData, options, rootSchema) {
 
   // eslint-disable-next-line no-plusplus
   for (var i = 0; i < options.length; i++) {
-    var option = options[i]; // If the schema describes an object then we need to add slightly more
+    var option = retrieveSchema(options[i], rootSchema, formData); // If the schema describes an object then we need to add slightly more
     // strict matching to the schema, because unless the schema uses the
     // "requires" keyword, an object will match the schema as long as it
     // doesn't have matching keys with a conflicting type. To do this we use an
@@ -9257,7 +9257,7 @@ function computeDefaults(_schema, parentDefaults, rootSchema) {
       return computeDefaults(itemSchema, Array.isArray(parentDefaults) ? parentDefaults[idx] : undefined, rootSchema, formData, includeUndefinedValues);
     });
   } else if ('oneOf' in schema) {
-    var matchSchema = schema.oneOf[getMatchingOption(formData, schema.oneOf, rootSchema)];
+    var matchSchema = retrieveSchema(schema.oneOf[getMatchingOption(formData, schema.oneOf, rootSchema)], rootSchema, formData);
 
     if (schema.properties && matchSchema.properties) {
       // 对象 oneOf 需要合并原属性和 oneOf 属性
@@ -9268,7 +9268,7 @@ function computeDefaults(_schema, parentDefaults, rootSchema) {
       schema = matchSchema;
     }
   } else if ('anyOf' in schema) {
-    var _matchSchema = schema.anyOf[getMatchingOption(formData, schema.anyOf, rootSchema)];
+    var _matchSchema = retrieveSchema(schema.anyOf[getMatchingOption(formData, schema.anyOf, rootSchema)], rootSchema, formData);
 
     if (schema.properties && _matchSchema.properties) {
       // 对象 anyOf 需要合并原属性和 anyOf 属性