chore(lib): 优化anyOf + const 通过const配置反选

re #80

Author: lljj-x

packages/lib/utils/formUtils.js

@@ -172,12 +172,11 @@ export function getUiOptions({
         }
     }
 
+    if (schema.title) spec.title = schema.title;
+    if (schema.description) spec.description = schema.description;
+
     // 计算ui配置
     return {
-        title: schema.title /* || curNodePath.split('.').pop() */, // 默认使用 schema 的配置
-        description: schema.description,
-
-        // 特殊处理部分
         ...spec,
 
         // 用户配置最高优先级

packages/lib/utils/schema/validate.js

@@ -247,8 +247,9 @@ export function ajvValid(schema, data) {
     return ajv.validate(schema, data);
 }
 
-// oneOf anyOf 通过formData的值来找到当前匹配项索引
-export function getMatchingOption(formData, options, rootSchema, haveAllFields = false) {
+// 如果查找不到
+// return -1
+export function getMatchingIndex(formData, options, rootSchema, haveAllFields = false) {
     // eslint-disable-next-line no-plusplus
     for (let i = 0; i < options.length; i++) {
         const option = retrieveSchema(options[i], rootSchema, formData);
@@ -308,5 +309,27 @@ export function getMatchingOption(formData, options, rootSchema, haveAllFields =
             return i;
         }
     }
-    return 0;
+
+    // 尝试查找const 配置
+    if (options[0] && options[0].properties) {
+        const constProperty = Object.keys(options[0].properties).find(k => options[0].properties[k].const);
+        if (constProperty) {
+            // eslint-disable-next-line no-plusplus
+            for (let i = 0; i < options.length; i++) {
+                if (
+                    options[i].properties
+                    && options[i].properties[constProperty]
+                    && options[i].properties[constProperty].const === formData[constProperty]) {
+                    return i;
+                }
+            }
+        }
+    }
+    return -1;
+}
+
+// oneOf anyOf 通过formData的值来找到当前匹配项索引
+export function getMatchingOption(formData, options, rootSchema, haveAllFields = false) {
+    const index = getMatchingIndex(formData, options, rootSchema, haveAllFields);
+    return index === -1 ? 0 : index;
 }

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

@@ -42,9 +42,7 @@ export default {
     },
     methods: {
         computedCurSelectIndexByFormData(formData) {
-            const index = getMatchingOption(formData, this.selectList, this.rootSchema, true);
-
-            return index || 0;
+            return getMatchingOption(formData, this.selectList, this.rootSchema, true);
         },
 
         // 下拉选项 VNode
@@ -213,15 +211,15 @@ export default {
             // 当前节点的ui err配置，用来支持所有选项的统一配置
             // 取出 oneOf anyOf 同级配置，然后再合并到 当前选中的schema中
             const userUiOptions = filterObject(getUiOptions({
-                schema: this.schema,
+                schema: {},
                 uiSchema: this.uiSchema,
                 containsSpec: false,
                 curNodePath,
                 rootFormData: this.rootFormData,
             }), key => (key === this.combiningType ? undefined : `ui:${key}`));
 
             const userErrOptions = filterObject(getUserErrOptions({
-                schema: this.schema,
+                schema: {},
                 uiSchema: this.uiSchema,
                 errorSchema: this.errorSchema
             }), key => (key === this.combiningType ? undefined : `err:${key}`));