fix(schema generator): 多选类型强制 uniqueItems

lljj-x · Nov 25, 2020 · cd3349e · cd3349e
1 parent ff0d2da
commit cd3349e
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
         "packages:list": "lerna ls -l",
         "packages:changed": "lerna changed",
         "packages:build": "lerna run --stream --sort build",
-        "publish": "yarn run lib:build && lerna publish",
+        "publish1": "yarn run lib:build && lerna publish",
         "autoPublish": "lerna publish --conventional-commits --yes",
         "autoVersion": "lerna version --conventional-commits --yes"
     },

diff --git a/packages/demo/src/index/views/Demo/index.vue b/packages/demo/src/index/views/Demo/index.vue
@@ -280,7 +280,7 @@
             },
             handleCancel() {},
             handlePreview() {
-                const formatStr = jsonCode => encodeURIComponent(JSON.stringify(JSON.parse(jsonCode)));
+                const formatStr = jsonCode => JSON.stringify(JSON.parse(jsonCode));
 
                 const genRoute = this.$router.resolve({
                     query: {

diff --git a/packages/demo/src/schema-generator/views/editor/Editor.vue b/packages/demo/src/schema-generator/views/editor/Editor.vue
@@ -207,7 +207,7 @@
             },
             handlePreview() {
                 const props = this.getExportCode();
-                componentWithDialog({
+                const instance = componentWithDialog({
                     VueComponent: VueJsonFrom,
                     dialogProps: {
                         title: '预览展示',
@@ -216,6 +216,18 @@
                     componentProps: {
                         value: {},
                         ...props
+                    },
+                    componentListeners: {
+                        toDemo: () => {
+                            this.handleToDemo();
+                        },
+                        'on-cancel': () => {
+                            instance.close();
+                        },
+                        'on-submit': (data) => {
+                            // eslint-disable-next-line no-alert
+                            alert(JSON.stringify(data, null, 2));
+                        }
                     }
                 });
             },

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
@@ -39,6 +39,11 @@ export default {
                 schemaOptions: {
                     type: 'object',
                     properties: {
+                        uniqueItems: {
+                            type: 'boolean',
+                            'ui:widget': 'hidden',
+                            default: true
+                        },
                         items: {
                             type: 'object',
                             properties: {

diff --git a/packages/demo/src/schema-generator/views/editor/viewComponents/genSchema.js b/packages/demo/src/schema-generator/views/editor/viewComponents/genSchema.js
@@ -45,7 +45,8 @@ function genBaseVal(type = 'string') {
                         },
                         uniqueItems: {
                             type: 'boolean',
-                            title: '不允许重复项',
+                            title: '不重复',
+                            description: '多选框强制默认为 true，且配置无效',
                             'ui:widget': 'el-switch',
                             default: false
                         }