feat(lib): 支持errorSchema 配置在schema中

Author: lljj-x

packages/demo/src/index/views/Demo/schemaTypes/7.OneOf/index.js

@@ -177,17 +177,5 @@ export default {
         ]
     },
     errorSchema: {
-        age: {
-            'err:options': {
-                oneOf: 'oneOf (oneOf配置)',
-                multipleOf: 'multipleOf (上层options配置)',
-                required: 'multipleOf (上层options配置)',
-            },
-            oneOf: [{
-                'err:multipleOf': 'multipleOf (errorSchema配置)'
-            }, {
-                'err:required': 'required (errorSchema配置)',
-            }]
-        },
     }
 };

packages/lib/src/JsonSchemaForm/common/formUtils.js

@@ -180,17 +180,20 @@ export function getWidgetConfig({
 }
 
 // 解析用户配置的 errorSchema options
-export function getUserErrOptions(errorSchema) {
-    return Object.keys(errorSchema)
+export function getUserErrOptions({
+    schema = {},
+    errorSchema = {}
+}) {
+    return Object.assign({}, ...[schema, errorSchema].map(itemSchema => Object.keys(itemSchema)
         .filter(key => key.indexOf('err:') === 0)
         .reduce((options, key) => {
-            const value = errorSchema[key];
+            const value = itemSchema[key];
             // options 内外合并
             if (key === 'err:options' && isObject(value)) {
                 return { ...options, ...value };
             }
             return { ...options, [key.substring(4)]: value };
-        }, {});
+        }, {})));
 }
 
 // ui:order object-> properties 排序

packages/lib/src/JsonSchemaForm/common/schema/validate.js

@@ -175,7 +175,10 @@ export function validateFormDataAndTransformMsg({
             };
 
             // 用户设置校验信息
-            const errSchemaMsg = getUserErrOptions(errorSchema).required;
+            const errSchemaMsg = getUserErrOptions({
+                schema,
+                errorSchema
+            }).required;
             if (errSchemaMsg) {
                 requireErrObj.message = errSchemaMsg;
             } else {
@@ -207,7 +210,10 @@ export function validateFormDataAndTransformMsg({
         );
     }
 
-    const userErrOptions = getUserErrOptions(errorSchema);
+    const userErrOptions = getUserErrOptions({
+        schema,
+        errorSchema
+    });
 
     return (isOnlyFirstError && ajvErrors.length > 0 ? [ajvErrors[0]] : ajvErrors).reduce((preErrors, errorItem) => {
         // 优先获取 errorSchema 配置

packages/lib/src/JsonSchemaForm/fields/combiningSchemas/SelectLinkageField/index.js

@@ -169,7 +169,10 @@ export default {
                 uiSchema: this.uiSchema
             }), key => (key === this.combiningType ? undefined : `ui:${key}`));
 
-            const userErrOptions = filterObject(getUserErrOptions(this.errorSchema), key => (key === this.combiningType ? undefined : `err:${key}`));
+            const userErrOptions = filterObject(getUserErrOptions({
+                schema: this.schema,
+                errorSchema: this.errorSchema
+            }), key => (key === this.combiningType ? undefined : `err:${key}`));
 
             childrenVnode.push(
                 h(