Merge pull request #319 from lljj-x/fix/github-317

Fix/GitHub 317

Author: lljj-x

packages/lib/utils/schema/validate.js

@@ -305,7 +305,7 @@ export function getMatchingIndex(formData, options, rootSchema, haveAllFields =
             if (isValid(augmentedSchema, formData)) {
                 return i;
             }
-        } else if (isValid(options[i], formData)) {
+        } else if (isValid(option, formData)) {
             return i;
         }
     }

packages/lib/vue2/vue2-core/src/components/Widget.js

@@ -255,7 +255,11 @@ export default {
                                         required: self.required,
                                         propPath: path2prop(curNodePath)
                                     });
-                                    if (errors.length > 0) return callback(errors[0].message);
+                                    if (errors.length > 0) {
+                                        const errMsg = errors[0].message;
+                                        if (callback) callback(errMsg);
+                                        return Promise.reject(errMsg);
+                                    }
 
                                     // customRule 如果存在自定义校验
                                     const curCustomRule = self.$props.customRule;
@@ -268,7 +272,8 @@ export default {
                                         });
                                     }
 
-                                    return callback();
+                                    if (callback) return callback();
+                                    return Promise.resolve();
                                 },
                                 trigger: 'change'
                             }

packages/lib/vue2/vue2-core/src/fields/combiningSchemas/SelectLinkageField/index.js

@@ -15,7 +15,7 @@ import {
 
 import retrieveSchema from '@lljj/vjsf-utils/schema/retriev';
 import getDefaultFormState from '@lljj/vjsf-utils/schema/getDefaultFormState';
-import { getMatchingOption } from '@lljj/vjsf-utils/schema/validate';
+import { getMatchingOption, isValid } from '@lljj/vjsf-utils/schema/validate';
 
 import vueProps from '../../props';
 import Widget from '../../../components/Widget';
@@ -165,7 +165,14 @@ export default {
                     }
                 });
             } else {
-                setPathVal(this.rootFormData, this.curNodePath, newOptionData === undefined ? curFormData : newOptionData);
+                setPathVal(
+                    this.rootFormData,
+                    this.curNodePath,
+                    (newOptionData === undefined && isValid(retrieveSchema(
+                        this.selectList[newVal],
+                        this.rootSchema
+                    ), curFormData)) ? curFormData : newOptionData
+                );
             }
 
             // 可添加一个配置通知外部这里变更

packages/lib/vue3/vue3-core/src/fields/combiningSchemas/SelectLinkageField/index.js

@@ -17,7 +17,7 @@ import {
 
 import retrieveSchema from '@lljj/vjsf-utils/schema/retriev';
 import getDefaultFormState from '@lljj/vjsf-utils/schema/getDefaultFormState';
-import { getMatchingOption } from '@lljj/vjsf-utils/schema/validate';
+import { getMatchingOption, isValid } from '@lljj/vjsf-utils/schema/validate';
 
 import vueProps from '../../props';
 import Widget from '../../../components/Widget';
@@ -160,7 +160,14 @@ export default {
                     }
                 });
             } else {
-                setPathVal(props.rootFormData, props.curNodePath, newOptionData === undefined ? curFormData : newOptionData);
+                setPathVal(
+                    props.rootFormData,
+                    props.curNodePath,
+                    (newOptionData === undefined && isValid(retrieveSchema(
+                        props.selectList[newVal],
+                        props.rootSchema
+                    ), curFormData)) ? curFormData : newOptionData
+                );
             }
         });