refactor(vjsf dependencies): 移除对schema dependencies 的相关逻辑，暂不支持

Author: lljj-x

packages/demo/src/index/views/Demo/schemaTypes/91.Object-Dependencies/index.js

@@ -0,0 +1,37 @@
+/**
+ * Created by Liu.Jun on 2020/5/19 15:41.
+ */
+
+export default {
+    schema: {
+        title: 'Property dependencies',
+        description: 'These samples are best viewed without live validation.',
+        type: 'object',
+        properties: {
+            unidirectional: {
+                title: 'Unidirectional',
+                src: 'https://spacetelescope.github.io/understanding-json-schema/reference/object.html#dependencies',
+                type: 'object',
+                properties: {
+                    name: {
+                        type: 'string'
+                    },
+                    credit_card: {
+                        type: 'number'
+                    },
+                    billing_address: {
+                        type: 'string'
+                    }
+                },
+                required: [
+                    'name'
+                ],
+                dependencies: {
+                    credit_card: [
+                        'billing_address'
+                    ]
+                }
+            }
+        }
+    }
+};

packages/demo/src/index/views/Demo/schemaTypes/91.Object-property-dependencies/index.js

@@ -20,10 +20,11 @@
 - [x] custom-rule 参数 支持
 - [x] 逐步开源发布
 - [x] 优化源码 不需要this的组件调整为 functional
+- [x] 数组支持配置是否显示序号
+- [x] 数组渲染样式微调优化（控制条下间距等）
+- [ ] 支持属性依赖 [属性依赖](https://json-schema.org/understanding-json-schema/reference/object.html#property-dependencies)
+- [ ] 支持Schema依赖 [Schema依赖](https://json-schema.org/understanding-json-schema/reference/object.html#schema-dependencies)
 
-- [ ] 数组 title 和 description支持配置 $index 通配符 渲染时替换为 1 2 3
-- [ ] 数组渲染样式微调优化（控制条下间距，）
 - [ ] 添加代码测试
-- [ ] Ui配置，支持函数表达式配置，hidden title description placeholder等
 - [ ] 对照react schema from适配更多规则支持
 - [ ] 解耦elementUi 重新开发form 和formItem组件，通过配置化实现适配elementUi iView 等常用ui组件

packages/docs/docs/zh/guide/todo.md

@@ -9,7 +9,7 @@ import findSchemaDefinition from './findSchemaDefinition';
 import { getMatchingOption } from './validate';
 import { fillObj } from '../arrayUtils';
 import { isFixedItems, isMultiSelect } from '../formUtils';
-import retrieveSchema, { resolveDependencies, resolveAllOf } from './retriev';
+import retrieveSchema, { /* resolveDependencies, */ resolveAllOf } from './retriev';
 
 /**
  * When merging defaults and form data, we want to merge in this specific way:
@@ -78,7 +78,7 @@ function computeDefaults(
             formData,
             includeUndefinedValues
         );
-    } else if ('dependencies' in schema) {
+    } else if /* ('dependencies' in schema) {
         const resolvedSchema = resolveDependencies(schema, rootSchema, formData);
         return computeDefaults(
             resolvedSchema,
@@ -87,7 +87,7 @@ function computeDefaults(
             formData,
             includeUndefinedValues
         );
-    } else if (isFixedItems(schema)) {
+    } else if */ (isFixedItems(schema)) {
         defaults = schema.items.map((itemSchema, idx) => computeDefaults(
             itemSchema,
             Array.isArray(parentDefaults) ? parentDefaults[idx] : undefined,

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

@@ -14,20 +14,18 @@ import findSchemaDefinition from './findSchemaDefinition';
 import { intersection } from '../arrayUtils';
 
 import {
-    isObject,
-    guessType,
-    mergeSchemas,
-    scm
+    /* guessType,  mergeSchemas, */ isObject, scm
 } from '../utils';
 
-import { isValid, getMatchingOption } from './validate';
+// import { getMatchingOption, isValid } from './validate';
 
 // 自动添加分割线
 
-export const ADDITIONAL_PROPERTY_FLAG = '__additional_property';
+// export const ADDITIONAL_PROPERTY_FLAG = '__additional_property';
 
 // resolve Schema - dependencies
 // https://json-schema.org/understanding-json-schema/reference/object.html#dependencies
+/*
 export function resolveDependencies(schema, rootSchema, formData) {
     // 从源模式中删除依赖项。
     const { dependencies = {} } = schema;
@@ -48,9 +46,12 @@ export function resolveDependencies(schema, rootSchema, formData) {
         formData
     );
 }
+*/
 
 // 处理依赖关系 dependencies
 // https://json-schema.org/understanding-json-schema/reference/object.html#dependencies
+/*
+
 function processDependencies(
     dependencies,
     resolvedSchema,
@@ -96,9 +97,12 @@ function processDependencies(
     }
     return resolvedSchema;
 }
+*/
 
 // 属性依赖
 // https://json-schema.org/understanding-json-schema/reference/object.html#property-dependencies
+
+/*
 function withDependentProperties(schema, additionallyRequired) {
     if (!additionallyRequired) {
         return schema;
@@ -108,9 +112,11 @@ function withDependentProperties(schema, additionallyRequired) {
         : additionallyRequired;
     return { ...schema, required };
 }
+*/
 
 // schema 依赖
 // https://json-schema.org/understanding-json-schema/reference/object.html#schema-dependencies
+/*
 function withDependentSchema(
     schema,
     rootSchema,
@@ -185,6 +191,7 @@ function withExactlyOneSubschema(
         retrieveSchema(dependentSchema, rootSchema, formData)
     );
 }
+*/
 
 // resolve Schema - $ref
 // https://json-schema.org/understanding-json-schema/structuring.html#using-id-with-ref
@@ -332,27 +339,43 @@ export function resolveAllOf(schema, rootSchema, formData) {
 // resolve Schema
 function resolveSchema(schema, rootSchema = {}, formData = {}) {
     // allOf 、$ref、dependencies 可能被同时配置
-    // 按优先级处理
+
+    // allOf
     if (schema.hasOwnProperty('allOf')) {
-        // 配置了 allOf属性合并数据
         schema = resolveAllOf(schema, rootSchema, formData);
     }
 
+    // $ref
     if (schema.hasOwnProperty('$ref')) {
         schema = resolveReference(schema, rootSchema, formData);
     }
 
+    // dependencies
+    /*
     if (schema.hasOwnProperty('dependencies')) {
         const resolvedSchema = resolveDependencies(schema, rootSchema, formData);
         schema = retrieveSchema(resolvedSchema, rootSchema, formData);
     }
+    */
+
+    // additionalProperties
+    /*
+    const hasAdditionalProperties = schema.hasOwnProperty('additionalProperties') && schema.additionalProperties !== false;
+    if (hasAdditionalProperties) {
+        return stubExistingAdditionalProperties(
+            schema,
+            rootSchema,
+            formData
+        );
+    }
+    */
 
     return schema;
 }
 
 // 这个函数将为formData中的每个键创建新的“属性”项
 // 查找到附加属性统一到properties[key]格式 并且打上标准
-function stubExistingAdditionalProperties(
+/* function stubExistingAdditionalProperties(
     schema,
     rootSchema = {},
     formData = {}
@@ -390,25 +413,13 @@ function stubExistingAdditionalProperties(
     });
 
     return schema;
-}
+} */
 
 // 索引当前节点
 export default function retrieveSchema(schema, rootSchema = {}, formData = {}) {
     if (!isObject(schema)) {
         return {};
     }
 
-    const resolvedSchema = resolveSchema(schema, rootSchema, formData);
-
-    // 配置了 additionalProperties 属性
-    const hasAdditionalProperties = resolvedSchema.hasOwnProperty('additionalProperties') && resolvedSchema.additionalProperties !== false;
-    if (hasAdditionalProperties) {
-        return stubExistingAdditionalProperties(
-            resolvedSchema,
-            rootSchema,
-            formData
-        );
-    }
-
-    return resolvedSchema;
+    return resolveSchema(schema, rootSchema, formData);
 }

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

@@ -5,7 +5,6 @@
 import vueProps from '../props';
 
 import { orderProperties, getUiOptions } from '../../common/formUtils';
-import { ADDITIONAL_PROPERTY_FLAG } from '../../common/schema/retriev';
 import { computedCurPath } from '../../common/vueUtils';
 
 import FieldGroupWrap from '../../fieldComponents/FieldGroupWrap';
@@ -44,24 +43,20 @@ export default {
         const properties = Object.keys(schema.properties || {});
         const orderedProperties = orderProperties(properties, order);
 
-        const propertiesVNodeList = orderedProperties.map((name) => {
-            const addedByAdditionalProperties = schema.properties[name].hasOwnProperty(ADDITIONAL_PROPERTY_FLAG);
-
-            // 递归参数
-            return h(
-                SchemaField,
-                {
-                    props: {
-                        ...props,
-                        schema: schema.properties[name],
-                        uiSchema: addedByAdditionalProperties ? uiSchema.additionalProperties : uiSchema[name],
-                        errorSchema: errorSchema[name],
-                        required: self.isRequired(name),
-                        curNodePath: computedCurPath(props.curNodePath, name)
-                    }
+        // 递归参数
+        const propertiesVNodeList = orderedProperties.map(name => h(
+            SchemaField,
+            {
+                props: {
+                    ...props,
+                    schema: schema.properties[name],
+                    uiSchema: uiSchema[name],
+                    errorSchema: errorSchema[name],
+                    required: self.isRequired(name),
+                    curNodePath: computedCurPath(props.curNodePath, name)
                 }
-            );
-        });
+            }
+        ));
 
         return h(
             FieldGroupWrap,