feat(schema-generator): 优化导出代码

lljj-x · Nov 23, 2020 · 20d429c · 20d429c
1 parent f13a159
commit 20d429c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/packages/demo/src/schema-generator/views/editor/common/editorData.js b/packages/demo/src/schema-generator/views/editor/common/editorData.js
@@ -180,7 +180,8 @@ function genBaseObj() {
     return {
         type: 'object',
         required: [],
-        properties: {}
+        properties: {},
+        'ui:order': []
     };
 }
 
@@ -215,6 +216,9 @@ export function componentList2JsonSchema(componentList) {
             // 连接数据
             (parentObj.properties || parentObj.items.properties)[item.componentValue.property] = curSchema;
 
+            // 设置 ui:order
+            (parentObj['ui:order'] || parentObj.items['ui:order']).push(item.componentValue.property);
+
             // 设置 required
             if (required) {
                 (parentObj.required || parentObj.items.required).push(item.componentValue.property);

diff --git a/packages/demo/src/schema-generator/views/editor/viewComponents/Array/index.js b/packages/demo/src/schema-generator/views/editor/viewComponents/Array/index.js
@@ -10,7 +10,8 @@ const viewSchema = {
     items: {
         type: 'object',
         required: [],
-        properties: {}
+        properties: {},
+        'ui:order': []
     }
 };
 

diff --git a/packages/demo/src/schema-generator/views/editor/viewComponents/Object/index.js b/packages/demo/src/schema-generator/views/editor/viewComponents/Object/index.js
@@ -8,7 +8,8 @@ const viewSchema = {
     title: 'Object',
     type: 'object',
     required: [],
-    properties: {}
+    properties: {},
+    'ui:order': []
 };
 
 export default {

diff --git a/packages/lib/src/JsonSchemaForm/index.js b/packages/lib/src/JsonSchemaForm/index.js
@@ -121,7 +121,11 @@ export default {
             rootSchema: this.schema,
             rootFormData: this.formData, // 根节点的数据
             curNodePath: '', // 当前节点路径
-            formProps
+            formProps: {
+                labelPosition: 'top',
+                labelSuffix: '：',
+                ...formProps,
+            }
         };
 
         return h(
@@ -137,10 +141,7 @@ export default {
                 ref: 'genEditForm',
                 props: {
                     model: self.formData,
-                    labelPosition: 'top',
-                    labelSuffix: '：',
-                    ...formProps
-                    // size: 'small'
+                    ...props.formProps
                 }
             },
             [