chore(schema generator): 优化表单生成器

lljj-x · lljj-x · commit 4b7accca498b · 2020-12-03T23:03:23.000+08:00
diff --git a/packages/demo/src/schema-generator/views/editor/common/editorData.js b/packages/demo/src/schema-generator/views/editor/common/editorData.js
@@ -83,7 +83,10 @@ export function editorItem2SchemaFieldProps(editorItem, formData) {
     // baseValue
     const {
         schemaOptions: baseSchemaOptions,
-        uiOptions: baseUiOptions
+        uiOptions: {
+            required,
+            ...baseUiOptions
+        } = {}
     } = editorItem.componentValue.baseValue;
 
     // options
@@ -95,10 +98,7 @@ export function editorItem2SchemaFieldProps(editorItem, formData) {
     // rules
     const {
         schemaOptions: ruleSchemaOptions,
-        uiOptions: {
-            required = false,
-            ruleUiOptions
-        } = {}
+        uiOptions: ruleUiOptions,
     } = editorItem.componentValue.rules || {};
 
     // schema
diff --git a/packages/demo/src/schema-generator/views/editor/common/registerExtraElementComponent.js b/packages/demo/src/schema-generator/views/editor/common/registerExtraElementComponent.js
@@ -6,7 +6,7 @@ import Vue from 'vue';
 
 const ExtraComponents = {
     // 需要额外注册的 Field，通过图片选择图片加链接
-    LinkImgField: () => import('../fieldComponents/linkImgField/LinkImgField')
+    // LinkImgField: () => import('../fieldComponents/linkImgField/LinkImgField')
 };
 
 Object.entries(ExtraComponents).forEach(([key, value]) => {
diff --git a/packages/demo/src/schema-generator/views/editor/viewComponents/Input/index.js b/packages/demo/src/schema-generator/views/editor/viewComponents/Input/index.js
@@ -72,16 +72,6 @@ export default {
                             type: 'number'
                         }
                     }
-                },
-                uiOptions: {
-                    type: 'object',
-                    properties: {
-                        required: {
-                            title: '必填',
-                            type: 'boolean',
-                            default: false
-                        }
-                    }
                 }
             }
         }
diff --git a/packages/demo/src/schema-generator/views/editor/viewComponents/InputNumber/index.js b/packages/demo/src/schema-generator/views/editor/viewComponents/InputNumber/index.js
@@ -74,16 +74,6 @@ export default {
                             type: 'number'
                         },
                     }
-                },
-                uiOptions: {
-                    type: 'object',
-                    properties: {
-                        required: {
-                            title: '必填',
-                            type: 'boolean',
-                            default: false
-                        }
-                    }
                 }
             }
         }
diff --git a/packages/demo/src/schema-generator/views/editor/viewComponents/MultiSelect/index.js b/packages/demo/src/schema-generator/views/editor/viewComponents/MultiSelect/index.js
@@ -59,5 +59,5 @@ export default {
                 }
             }
         }
-    }, 'array')
+    }, 'array', true)
 };
diff --git a/packages/demo/src/schema-generator/views/editor/viewComponents/MultiUpload/index.js b/packages/demo/src/schema-generator/views/editor/viewComponents/MultiUpload/index.js
@@ -37,23 +37,6 @@ export default {
                     }
                 }
             }
-        },
-        rules: {
-            type: 'object',
-            title: '数据校验',
-            required: [],
-            properties: {
-                uiOptions: {
-                    type: 'object',
-                    properties: {
-                        required: {
-                            title: '必填',
-                            type: 'boolean',
-                            default: false
-                        }
-                    }
-                }
-            }
         }
     })
 };
diff --git a/packages/demo/src/schema-generator/views/editor/viewComponents/Slider/index.js b/packages/demo/src/schema-generator/views/editor/viewComponents/Slider/index.js
@@ -77,16 +77,6 @@ export default {
                             type: 'number'
                         },
                     }
-                },
-                uiOptions: {
-                    type: 'object',
-                    properties: {
-                        required: {
-                            title: '必填',
-                            type: 'boolean',
-                            default: false
-                        }
-                    }
                 }
             }
         }
diff --git a/packages/demo/src/schema-generator/views/editor/viewComponents/Upload/index.js b/packages/demo/src/schema-generator/views/editor/viewComponents/Upload/index.js
@@ -34,23 +34,6 @@ export default {
                     }
                 }
             }
-        },
-        rules: {
-            type: 'object',
-            title: '数据校验',
-            required: [],
-            properties: {
-                uiOptions: {
-                    type: 'object',
-                    properties: {
-                        required: {
-                            title: '必填',
-                            type: 'boolean',
-                            default: false
-                        }
-                    }
-                }
-            }
         }
     })
 };
diff --git a/packages/demo/src/schema-generator/views/editor/viewComponents/genSchema.js b/packages/demo/src/schema-generator/views/editor/viewComponents/genSchema.js
@@ -4,7 +4,7 @@
 
 import { formatFormLabelWidth } from '../common/editorData';
 
-function genBaseVal(type = 'string') {
+function genBaseVal(type = 'string', isMultiSelect = false) {
     return {
         title: '基础配置',
         type: 'object',
@@ -56,7 +56,7 @@ function genBaseVal(type = 'string') {
             uiOptions: {
                 type: 'object',
                 properties: {
-                    ...!['array', 'object'].includes(type) ? {
+                    ...!['array', 'object'].includes(type) || isMultiSelect ? {
                         width: {
                             title: '宽度',
                             type: 'string',
@@ -73,6 +73,11 @@ function genBaseVal(type = 'string') {
                                 }
                             }
                         },
+                        required: {
+                            title: '必填',
+                            type: 'boolean',
+                            default: false
+                        },
                         disabled: {
                             title: '禁用',
                             type: 'boolean',
@@ -98,7 +103,7 @@ function genBaseVal(type = 'string') {
     };
 }
 
-export default (schema, type) => ({
+export default (schema, type, isMultiSelect) => ({
     type: 'object',
     required: ['property'],
     properties: {
@@ -108,7 +113,7 @@ export default (schema, type) => ({
             'ui:placeholder': '请输入属性名',
             'err:required': '属性名必填'
         },
-        baseValue: genBaseVal(type),
+        baseValue: genBaseVal(type, isMultiSelect),
         ...schema
     }
 });

Original file line number	Diff line number	Diff line change
`@@ -72,16 +72,6 @@ export default {`
`72`	`72`	`type: 'number'`
`73`	`73`	`}`
`74`	`74`	`}`
`75`		`- },`
`76`		`- uiOptions: {`
`77`		`- type: 'object',`
`78`		`- properties: {`
`79`		`- required: {`
`80`		`- title: '必填',`
`81`		`- type: 'boolean',`
`82`		`- default: false`
`83`		`- }`
`84`		`- }`
`85`	`75`	`}`
`86`	`76`	`}`
`87`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,16 +74,6 @@ export default {`
`74`	`74`	`type: 'number'`
`75`	`75`	`},`
`76`	`76`	`}`
`77`		`- },`
`78`		`- uiOptions: {`
`79`		`- type: 'object',`
`80`		`- properties: {`
`81`		`- required: {`
`82`		`- title: '必填',`
`83`		`- type: 'boolean',`
`84`		`- default: false`
`85`		`- }`
`86`		`- }`
`87`	`77`	`}`
`88`	`78`	`}`
`89`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,5 +59,5 @@ export default {`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`	`}`
`62`		`- }, 'array')`
	`62`	`+ }, 'array', true)`
`63`	`63`	`};`
Original file line number	Diff line number	Diff line change
`@@ -37,23 +37,6 @@ export default {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`}`
`40`		`- },`
`41`		`- rules: {`
`42`		`- type: 'object',`
`43`		`- title: '数据校验',`
`44`		`- required: [],`
`45`		`- properties: {`
`46`		`- uiOptions: {`
`47`		`- type: 'object',`
`48`		`- properties: {`
`49`		`- required: {`
`50`		`- title: '必填',`
`51`		`- type: 'boolean',`
`52`		`- default: false`
`53`		`- }`
`54`		`- }`
`55`		`- }`
`56`		`- }`
`57`	`40`	`}`
`58`	`41`	`})`
`59`	`42`	`};`
Original file line number	Diff line number	Diff line change
`@@ -77,16 +77,6 @@ export default {`
`77`	`77`	`type: 'number'`
`78`	`78`	`},`
`79`	`79`	`}`
`80`		`- },`
`81`		`- uiOptions: {`
`82`		`- type: 'object',`
`83`		`- properties: {`
`84`		`- required: {`
`85`		`- title: '必填',`
`86`		`- type: 'boolean',`
`87`		`- default: false`
`88`		`- }`
`89`		`- }`
`90`	`80`	`}`
`91`	`81`	`}`
`92`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,23 +34,6 @@ export default {`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`}`
`37`		`- },`
`38`		`- rules: {`
`39`		`- type: 'object',`
`40`		`- title: '数据校验',`
`41`		`- required: [],`
`42`		`- properties: {`
`43`		`- uiOptions: {`
`44`		`- type: 'object',`
`45`		`- properties: {`
`46`		`- required: {`
`47`		`- title: '必填',`
`48`		`- type: 'boolean',`
`49`		`- default: false`
`50`		`- }`
`51`		`- }`
`52`		`- }`
`53`		`- }`
`54`	`37`	`}`
`55`	`38`	`})`
`56`	`39`	`};`