0.7.0

yourtion · yourtion · commit 1a08bb5458a2 · 2018-04-04T10:39:15.000+08:00
diff --git a/example/components/Subscription.vue b/example/components/Subscription.vue
@@ -102,9 +102,9 @@
     data: () => ({
       schema: require('@/schema/newsletter'),
       model: {
-        name: 'ad',
+        name: 'Yourtion',
         sub: {
-          sName: 'as',
+          sEmail: 'yourtion@gmail.com',
         },
       },
     }),
diff --git a/lib/json-editor.min.js b/lib/json-editor.min.js
@@ -1936,17 +1936,6 @@ const parseBoolean = (vm, schema, schemaName) => {
 const parseString = (vm, schema, schemaName) => {
   const field = schema.attrs || {};
 
-  if (!field.type) {
-    switch (schema.type) {
-    case 'number':
-    case 'integer':
-      field.type = 'number';
-      break;
-    default:
-      field.type = 'text';
-    }
-  }
-
   if (schema.format) {
     switch (schema.format) {
     case 'email':
@@ -1964,11 +1953,22 @@ const parseString = (vm, schema, schemaName) => {
         field.type = 'text';
       }
 
-      field.pattern = schema.format;
+      field.pattern = schema.pattern;
       break;
     }
   }
 
+  if (!field.type) {
+    switch (schema.type) {
+    case 'number':
+    case 'integer':
+      field.type = 'number';
+      break;
+    default:
+      field.type = 'text';
+    }
+  }
+
   setCommonFields(schema, field, schemaName);
 
   if (schema.name) {
@@ -2033,13 +2033,14 @@ const parseArray = (vm, schema, schemaName) => {
         field.items = parseItems(schema[keyword]);
         break;
 
-      default:
-        field.type = schema.type;
-        field.value = field.value || [];
-        field.items = parseItems(schema[keyword]);
       }
     }
   }
+  if(!field.type) {
+    field.type = schema.type;
+    field.value = field.value || [];
+    field.items = [];
+  }
 
   if (schema.name) {
     field.name = schemaName;
@@ -2073,7 +2074,6 @@ const loadFields = (vm, schema, fields = vm.fields, sub) => {
         fields[schemaName] = {
           $sub: true,
           $title: schema.title,
-          $type: schema.type,
           $description: schema.description,
         };
       }
@@ -2104,7 +2104,10 @@ const loadFields = (vm, schema, fields = vm.fields, sub) => {
     }
     fields[schemaName] = parseString(vm, schema, schemaName);
     break;
+  default:
+    fields[schemaName] = parseString(vm, schema, schemaName);
   }
+
 };
 /* harmony export (immutable) */ __webpack_exports__["a"] = loadFields;
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-json-ui-editor",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Edit JSON in UI form with JSON Schema and Vue.js",
   "author": "YourtionGuo <yourtion@gmail.com>",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vue-json-ui-editor",`
`3`		`- "version": "0.6.0",`
	`3`	`+ "version": "0.7.0",`
`4`	`4`	`"description": "Edit JSON in UI form with JSON Schema and Vue.js",`
`5`	`5`	`"author": "YourtionGuo <yourtion@gmail.com>",`
`6`	`6`	`"scripts": {`