reorganize dev codes

icebob · icebob · commit 386fa3ff2b58 · 2017-01-30T12:19:00.000+01:00
diff --git a/dev/full/app.vue b/dev/full/app.vue
@@ -27,7 +27,7 @@
 
 <script>
 	import Vue from "vue";
-	import VueFormGenerator from "../src";
+	import VueFormGenerator from "../../src";
 	import DataTable from "./dataTable.vue";
 	import Fakerator from "fakerator";
 
diff --git a/dev/full/data.js b/dev/full/data.js
diff --git a/dev/full/dataTable.vue b/dev/full/dataTable.vue
@@ -25,7 +25,7 @@
 
 <script>
 	import Vue from "vue";
-	import VueFormGenerator from "../src";
+	import VueFormGenerator from "../../src";
 	import Schema from "./schema";
 	import { find } from "lodash";
 	import { users, roles } from "./data";
diff --git a/dev/full/fieldAwesome.vue b/dev/full/fieldAwesome.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-	import VueFormGenerator from "../src";
+	import VueFormGenerator from "../../src";
 
 	export default {
 		mixins: [ VueFormGenerator.abstractField ]
diff --git a/dev/full/index.html b/dev/full/index.html
@@ -36,6 +36,6 @@
   <body>
     <div class="container-fluid"></div>
     <div id="app"></div>
-  	<script src="/app.js"></script>
+  	<script src="/full.js"></script>
   </body>
 </html>
diff --git a/dev/full/main.js b/dev/full/main.js
diff --git a/dev/full/schema.js b/dev/full/schema.js
@@ -2,7 +2,7 @@ import moment from "moment";
 
 import {
 	validators
-} from "../src";
+} from "../../src";
 
 module.exports = {
 	fields: [
diff --git a/dev/full/utils.js b/dev/full/utils.js
diff --git a/dev/multiselect/app.vue b/dev/multiselect/app.vue
@@ -0,0 +1,42 @@
+<template lang="html">
+	<div>
+		<vue-form-generator :schema="schema" :model="model" :options="formOptions"></vue-form-generator>
+	</div>
+</template>
+
+<script>
+import Multiselect from "vue-multiselect"
+window.VueMultiselect = Multiselect
+
+export default {
+	components: { 
+		Multiselect 
+	},
+
+	data () {
+		return {
+			model: {
+				skills: ["Javascript", "VueJS"]
+			},
+
+			schema: {
+				fields: [
+					{
+						type: "vueMultiSelect",
+						multiSelect: true,
+						label: "Skills",
+						model: "skills",
+						values: ["Javascript", "VueJS", "CSS3", "HTML5"]
+					}
+				]
+			},
+
+			formOptions: {}
+		}
+	},
+
+	created() {
+		window.app = this;
+	}
+}
+</script>
diff --git a/dev/multiselect/index.html b/dev/multiselect/index.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>vue-form-generator multiselect demo</title>
+  </head>
+  <body>
+    <div class="container-fluid"></div>
+    <div id="app"></div>
+  	<script src="/mselect.js"></script>
+  </body>
+</html>
diff --git a/dev/multiselect/main.js b/dev/multiselect/main.js
@@ -0,0 +1,9 @@
+import Vue from "vue";
+import VueFormGenerator from "../../src";
+Vue.use(VueFormGenerator);
+
+import App from './app.vue';
+
+new Vue({
+    ...App
+}).$mount('#app');
diff --git a/src/fields/fieldVueMultiSelect.vue b/src/fields/fieldVueMultiSelect.vue
@@ -98,7 +98,7 @@
 		created() {
 			// Check if the component is loaded
 			if (window.VueMultiselect) {
-				Vue.component("multiselect", window.VueMultiselect.default);
+				Vue.component("multiselect", window.VueMultiselect.default ? window.VueMultiselect.default : window.VueMultiselect);
 			} else {
 				console.error("'vue-multiselect' is missing. Please download from https://github.com/monterail/vue-multiselect and load the script in the HTML head section!");
 			}
diff --git a/webpack.dev.config.js b/webpack.dev.config.js
@@ -29,10 +29,11 @@ var loaders = [
 ];
 
 module.exports = {
-	devtool: "eval-source-map",
+	devtool: "source-map",
 	
 	entry: {
-		app: path.resolve("dev", "main.js")
+		full: path.resolve("dev", "full", "main.js"),
+		mselect: path.resolve("dev", "multiselect", "main.js")
 	},
 
 	output: {

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@`
`98`	`98`	`created() {`
`99`	`99`	`// Check if the component is loaded`
`100`	`100`	`if (window.VueMultiselect) {`
`101`		`- Vue.component("multiselect", window.VueMultiselect.default);`
	`101`	`+ Vue.component("multiselect", window.VueMultiselect.default ? window.VueMultiselect.default : window.VueMultiselect);`
`102`	`102`	`} else {`
`103`	`103`	`console.error("'vue-multiselect' is missing. Please download from https://github.com/monterail/vue-multiselect and load the script in the HTML head section!");`
`104`	`104`	`}`