rename example & improve code

icebob · icebob · commit caa4124f7616 · 2017-05-25T22:01:07.000+02:00
diff --git a/dev/grouping/app.vue b/dev/grouping/app.vue
@@ -1,7 +1,6 @@
 <template lang="html">
 	<form>
-		<vue-form-generator :schema="section1" :model="model" :options="formOptions"></vue-form-generator>
-		<vue-form-generator :schema="section2" :model="model" :options="formOptions"></vue-form-generator>
+		<vue-form-generator :schema="schema" :model="model" :options="formOptions"></vue-form-generator>
 		<pre>{{ model }}</pre>
 	</form>
 </template>
@@ -15,12 +14,14 @@ export default {
 			model: {
 				name: 'Brian Blessed',
 				email: "brian@hawkman.mongo",
-				more: "More",
-				things: "Things",
-				pref_1: 'blah'
+				others: {
+					more: "More",
+					things: "Things"
+				},
+				single: 'blah'
 			},
 
-			section1: {
+			schema: {
 			    groups:[{
                     legend: "Contact Details",
                     fields: [
@@ -44,39 +45,28 @@ export default {
                             type: "input",
                             inputType: "text",
                             label: "More",
-                            model: "more"
+                            model: "others.more"
                         },
                         {
                             type: "input",
                             inputType: "text",
                             label: "Things",
-                            model: "things"
+                            model: "others.things"
                         }
                     ]
                 }],
 				fields: [
 					{
 						type: "input",
 						inputType: "text",
-						label: "Pref 1 (without group)",
-						model: "pref_1"
-					}
-				]
-			},
-
-			section2: {
-				fields: [
-					{
-						type: "input",
-						inputType: "text",
-						label: "Pref 1",
-						model: "pref_1"
+						label: "Single field (without group)",
+						model: "single"
 					}
 				]
 			},
 
 			formOptions: {
-				fieldIdPrefix: 'frm1_'
+				fieldIdPrefix: 'frm1-'
 			}
 		}
 	},
diff --git a/dev/grouping/index.html b/dev/grouping/index.html
@@ -7,6 +7,6 @@
   <body>
     <div class="container-fluid"></div>
     <div id="app"></div>
-  	<script src="/mforms.js"></script>
+  	<script src="/grouping.js"></script>
   </body>
 </html>
diff --git a/dev/grouping/main.js b/dev/grouping/main.js
diff --git a/src/formGenerator.vue b/src/formGenerator.vue
@@ -1,7 +1,7 @@
 <template lang="pug">
 div.vue-form-generator(v-if='schema != null')
 	template(v-for='field in fields')
-		fieldset(v-if='schema != null', :is='tag')
+		fieldset(:is='tag')
 			.form-group(v-if='fieldVisible(field)', :class='getFieldRowClasses(field)')
 				label(v-if="fieldTypeHasLabel(field)", :for="getFieldID(field)")
 					| {{ field.label }}
@@ -15,8 +15,9 @@ div.vue-form-generator(v-if='schema != null')
 				.hint(v-if='field.hint') {{ field.hint }}
 				.errors.help-block(v-if='fieldErrors(field).length > 0')
 					span(v-for='(error, index) in fieldErrors(field)', track-by='index') {{ error }}
+
 	template(v-for='group in groups')
-		fieldset(v-if='schema != null', :is='tag')
+		fieldset(:is='tag')
 			legend(v-if='group.legend') {{ group.legend }}
 			template(v-for='field in group.fields')
 				.form-group(v-if='fieldVisible(field)', :class='getFieldRowClasses(field)')
@@ -151,7 +152,14 @@ div.vue-form-generator(v-if='schema != null')
 
 		beforeMount() {
 			// Add idPrefix to fields if fieldIdPrefix is set
-			if (this.schema.fields) {
+			if ("groups" in this.schema) {
+				for (let group of this.schema.groups) {
+					for (let field of group.fields) {
+						field.idPrefix = this.options.fieldIdPrefix || "";
+					}
+				}
+			}
+			if ("fields" in this.schema) {
 				for (let field of this.schema.fields) {
 					field.idPrefix = this.options.fieldIdPrefix || "";
 				}
diff --git a/webpack.dev.config.js b/webpack.dev.config.js
@@ -34,7 +34,7 @@ module.exports = {
 	entry: {
 		full: path.resolve("dev", "full", "main.js"),
 		mselect: path.resolve("dev", "multiselect", "main.js"),
-		mforms: path.resolve("dev", "multipleforms", "main.js"),
+		grouping: path.resolve("dev", "grouping", "main.js"),
 		checklist: path.resolve("dev", "checklist", "main.js")
 	},
 
@@ -44,14 +44,14 @@ module.exports = {
 		publicPath: "/"
 	},
 
-    plugins: [
-        new webpack.DefinePlugin({
-            "process.env": {
-                NODE_ENV: JSON.stringify("development"),
-                FULL_BUNDLE: true
-            }
-        }),
-    ],
+	plugins: [
+		new webpack.DefinePlugin({
+			"process.env": {
+				NODE_ENV: JSON.stringify("development"),
+				FULL_BUNDLE: true
+			}
+		}),
+	],
 
 	module: {
 		loaders
