From 446e62eecd6d8eb5e20b7809bffe879626afd5fd Mon Sep 17 00:00:00 2001
From: RichardMiao <miaochuanxing@126.com>
Date: Thu, 21 Feb 2019 10:31:49 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .editorconfig                               |  2 +-
 .prettierrc                                 | 12 +++++
 build/webpack.build.config.js               |  2 +-
 examples/post-form/main.js                  | 52 +++++++++---------
 src/{ => components/form}/formGenerator.vue |  0
 src/{ => components/form}/formGroup.vue     | 59 +++++++++++++--------
 src/{ => components/form}/formMixin.js      |  0
 src/fields/optional/fieldNoUiSlider.vue     |  6 ++-
 src/index.js                                |  2 +-
 9 files changed, 83 insertions(+), 52 deletions(-)
 create mode 100644 .prettierrc
 rename src/{ => components/form}/formGenerator.vue (100%)
 rename src/{ => components/form}/formGroup.vue (71%)
 rename src/{ => components/form}/formMixin.js (100%)

diff --git a/.editorconfig b/.editorconfig
index 4b8b3e12..d21d4f7b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,5 +5,5 @@ end_of_line = lf
 insert_final_newline = true
 charset = utf-8
 indent_style = tab
-indent_size = 4
+indent_size = 2
 trim_trailing_whitespace = true
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 00000000..60526ee6
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,12 @@
+{
+  "printWidth": 120,
+  "semi": false,
+  "singleQuote": true,
+  "trailingComma": "none",
+  "bracketSpacing": true,
+  "jsxBracketSameLine": false,
+  "arrowParens": "avoid",
+  "requirePragma": false,
+  "proseWrap": "preserve",
+  "tabWidth": 2
+}
diff --git a/build/webpack.build.config.js b/build/webpack.build.config.js
index 8b975373..841864b2 100644
--- a/build/webpack.build.config.js
+++ b/build/webpack.build.config.js
@@ -75,7 +75,7 @@ module.exports = [
 			}),
 			new LodashModuleReplacementPlugin({
 				collections: true,
-				paths: true,
+				paths: true
 			}),
 			new webpack.optimize.UglifyJsPlugin({
 				compress: {
diff --git a/examples/post-form/main.js b/examples/post-form/main.js
index fd5c4708..b7191f7b 100644
--- a/examples/post-form/main.js
+++ b/examples/post-form/main.js
@@ -7,25 +7,31 @@ var vm = new Vue({
 	},
 
 	methods: {
-		prettyJSON: function (json) {
+		prettyJSON: function(json) {
 			if (json) {
 				json = JSON.stringify(json, undefined, 4);
-				json = json.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-				return json.replace(/("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g, function (match) {
-					var cls = "number";
-					if (/^"/.test(match)) {
-						if (/:$/.test(match)) {
-							cls = "key";
-						} else {
-							cls = "string";
+				json = json
+					.replace(/&/g, "&amp;")
+					.replace(/</g, "&lt;")
+					.replace(/>/g, "&gt;");
+				return json.replace(
+					/("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g,
+					function(match) {
+						var cls = "number";
+						if (/^"/.test(match)) {
+							if (/:$/.test(match)) {
+								cls = "key";
+							} else {
+								cls = "string";
+							}
+						} else if (/true|false/.test(match)) {
+							cls = "boolean";
+						} else if (/null/.test(match)) {
+							cls = "null";
 						}
-					} else if (/true|false/.test(match)) {
-						cls = "boolean";
-					} else if (/null/.test(match)) {
-						cls = "null";
+						return '<span class="' + cls + '">' + match + "</span>";
 					}
-					return "<span class=\"" + cls + "\">" + match + "</span>";
-				});
+				);
 			}
 		}
 	},
@@ -90,17 +96,10 @@ var vm = new Vue({
 					model: "skills",
 					inputName: "skills",
 					required: true,
-					values: [
-						"HTML5",
-						"Javascript",
-						"CSS3",
-						"CoffeeScript",
-						"AngularJS",
-						"ReactJS",
-						"VueJS"
-					],
+					values: ["HTML5", "Javascript", "CSS3", "CoffeeScript", "AngularJS", "ReactJS", "VueJS"],
 					validator: VueFormGenerator.validators.string
-				}, {
+				},
+				{
 					type: "upload",
 					label: "Photo",
 					model: "photo",
@@ -126,7 +125,6 @@ var vm = new Vue({
 					buttonText: "Submit",
 					validateBeforeSubmit: true
 				}
-
 			]
 		},
 
@@ -135,4 +133,4 @@ var vm = new Vue({
 			validateAfterChanged: false
 		}
 	}
-});
\ No newline at end of file
+});
diff --git a/src/formGenerator.vue b/src/components/form/formGenerator.vue
similarity index 100%
rename from src/formGenerator.vue
rename to src/components/form/formGenerator.vue
diff --git a/src/formGroup.vue b/src/components/form/formGroup.vue
similarity index 71%
rename from src/formGroup.vue
rename to src/components/form/formGroup.vue
index 548fc526..4db603c4 100644
--- a/src/formGroup.vue
+++ b/src/components/form/formGroup.vue
@@ -1,32 +1,49 @@
 <template>
-	<div class="form-group" :class="getFieldRowClasses(field)">
-		<label v-if="fieldTypeHasLabel(field)" :for="getFieldID(field)" :class="field.labelClasses">
-			<span v-html="field.label"></span>
-			<span v-if='field.help' class="help">
-				<i class="icon"></i>
-				<div class="helpText" v-html='field.help'></div>
-			</span>
-		</label>
+  <div class="form-group" :class="getFieldRowClasses(field)">
+    <label v-if="fieldTypeHasLabel(field)" :for="getFieldID(field)" :class="field.labelClasses">
+      <span v-html="field.label"></span>
+      <span v-if="field.help" class="help">
+        <i class="icon"></i>
+        <div class="helpText" v-html="field.help"></div>
+      </span>
+    </label>
 
-		<div class="field-wrap">
-			<component ref="child" :is="getFieldType(field)" :vfg="vfg" :disabled="fieldDisabled(field)" :model="model" :schema="field" :formOptions="options" @model-updated="onModelUpdated" @validated="onFieldValidated"></component>
-			<div v-if="buttonVisibility(field)" class="buttons">
-				<button v-for="(btn, index) in field.buttons" @click="buttonClickHandler(btn, field, $event)" :class="btn.classes" :key="index" v-text="btn.label" :type="getButtonType(btn)"></button>
-			</div>
-		</div>
+    <div class="field-wrap">
+      <component
+        ref="child"
+        :is="getFieldType(field)"
+        :vfg="vfg"
+        :disabled="fieldDisabled(field)"
+        :model="model"
+        :schema="field"
+        :formOptions="options"
+        @model-updated="onModelUpdated"
+        @validated="onFieldValidated"
+      ></component>
+      <div v-if="buttonVisibility(field)" class="buttons">
+        <button
+          v-for="(btn, index) in field.buttons"
+          @click="buttonClickHandler(btn, field, $event)"
+          :class="btn.classes"
+          :key="index"
+          v-text="btn.label"
+          :type="getButtonType(btn)"
+        ></button>
+      </div>
+    </div>
 
-		<div v-if="field.hint" class="hint" v-html="fieldHint(field)"></div>
+    <div v-if="field.hint" class="hint" v-html="fieldHint(field)"></div>
 
-		<div v-if="fieldErrors(field).length > 0" class="errors help-block">
-			<span v-for="(error, index) in fieldErrors(field)" :key="index" v-html="error"></span>
-		</div>
-	</div>
+    <div v-if="fieldErrors(field).length > 0" class="errors help-block">
+      <span v-for="(error, index) in fieldErrors(field)" :key="index" v-html="error"></span>
+    </div>
+  </div>
 </template>
 <script>
 import { get as objGet, isNil, isFunction } from "lodash";
-import { slugifyFormID } from "./utils/schema";
+import { slugifyFormID } from "@/utils/schema";
 import formMixin from "./formMixin.js";
-import fieldComponents from "./utils/fieldsLoader.js";
+import fieldComponents from "@/utils/fieldsLoader.js";
 
 export default {
 	name: "form-group",
diff --git a/src/formMixin.js b/src/components/form/formMixin.js
similarity index 100%
rename from src/formMixin.js
rename to src/components/form/formMixin.js
diff --git a/src/fields/optional/fieldNoUiSlider.vue b/src/fields/optional/fieldNoUiSlider.vue
index 26fca73e..7a82ddd0 100644
--- a/src/fields/optional/fieldNoUiSlider.vue
+++ b/src/fields/optional/fieldNoUiSlider.vue
@@ -1,5 +1,9 @@
 <template>
-	<div class="slider" :disabled="disabled" :class="{ 'contain-pips': containPips, 'contain-tooltip': containTooltip }"></div>
+  <div
+    class="slider"
+    :disabled="disabled"
+    :class="{ 'contain-pips': containPips, 'contain-tooltip': containTooltip }"
+  ></div>
 </template>
 
 <script>
diff --git a/src/index.js b/src/index.js
index 8c2501c1..58aa6d14 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,4 +1,4 @@
-const component = require("./formGenerator.vue").default;
+const component = require("./components/form/formGenerator").default;
 const schema = require("./utils/schema.js");
 const validators = require("./utils/validators.js").default;
 const fieldComponents = require("./utils/fieldsLoader").default;

From 8611be4f8f11c76085b11aed95f347bbb3d0b4ad Mon Sep 17 00:00:00 2001
From: RichardMiao <miaochuanxing@126.com>
Date: Thu, 21 Feb 2019 14:15:09 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=95=B4=E7=90=86=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/{ => components}/fields/abstractField.js  | 20 ++++++++++++-------
 .../fields/core/fieldCheckbox.vue             |  0
 .../fields/core/fieldChecklist.vue            | 12 ++++++++---
 .../fields/core/fieldInput.vue                |  0
 .../fields/core/fieldLabel.vue                |  0
 .../fields/core/fieldRadios.vue               |  0
 .../fields/core/fieldSelect.vue               |  0
 .../fields/core/fieldSubmit.vue               |  0
 .../fields/core/fieldTextArea.vue             |  0
 .../fields/core/fieldUpload.vue               |  0
 .../fields/optional/fieldCleave.vue           |  0
 .../fields/optional/fieldDateTimePicker.vue   |  6 +++---
 .../fields/optional/fieldGoogleAddress.vue    |  0
 .../fields/optional/fieldImage.vue            |  0
 .../fields/optional/fieldMasked.vue           |  0
 .../fields/optional/fieldNoUiSlider.vue       |  0
 .../fields/optional/fieldPikaday.vue          | 13 ++++++------
 .../fields/optional/fieldRangeSlider.vue      |  0
 .../fields/optional/fieldSelectEx.vue         |  0
 .../fields/optional/fieldSpectrum.vue         |  0
 .../fields/optional/fieldStaticMap.vue        |  0
 .../fields/optional/fieldSwitch.vue           |  0
 .../fields/optional/fieldVueMultiSelect.vue   |  0
 src/index.js                                  | 10 +++++-----
 src/utils/fieldsLoader.js                     |  4 ++--
 25 files changed, 39 insertions(+), 26 deletions(-)
 rename src/{ => components}/fields/abstractField.js (92%)
 rename src/{ => components}/fields/core/fieldCheckbox.vue (100%)
 rename src/{ => components}/fields/core/fieldChecklist.vue (93%)
 rename src/{ => components}/fields/core/fieldInput.vue (100%)
 rename src/{ => components}/fields/core/fieldLabel.vue (100%)
 rename src/{ => components}/fields/core/fieldRadios.vue (100%)
 rename src/{ => components}/fields/core/fieldSelect.vue (100%)
 rename src/{ => components}/fields/core/fieldSubmit.vue (100%)
 rename src/{ => components}/fields/core/fieldTextArea.vue (100%)
 rename src/{ => components}/fields/core/fieldUpload.vue (100%)
 rename src/{ => components}/fields/optional/fieldCleave.vue (100%)
 rename src/{ => components}/fields/optional/fieldDateTimePicker.vue (91%)
 rename src/{ => components}/fields/optional/fieldGoogleAddress.vue (100%)
 rename src/{ => components}/fields/optional/fieldImage.vue (100%)
 rename src/{ => components}/fields/optional/fieldMasked.vue (100%)
 rename src/{ => components}/fields/optional/fieldNoUiSlider.vue (100%)
 rename src/{ => components}/fields/optional/fieldPikaday.vue (81%)
 rename src/{ => components}/fields/optional/fieldRangeSlider.vue (100%)
 rename src/{ => components}/fields/optional/fieldSelectEx.vue (100%)
 rename src/{ => components}/fields/optional/fieldSpectrum.vue (100%)
 rename src/{ => components}/fields/optional/fieldStaticMap.vue (100%)
 rename src/{ => components}/fields/optional/fieldSwitch.vue (100%)
 rename src/{ => components}/fields/optional/fieldVueMultiSelect.vue (100%)

diff --git a/src/fields/abstractField.js b/src/components/fields/abstractField.js
similarity index 92%
rename from src/fields/abstractField.js
rename to src/components/fields/abstractField.js
index e6a3858f..b7f3ff65 100644
--- a/src/fields/abstractField.js
+++ b/src/components/fields/abstractField.js
@@ -1,6 +1,6 @@
 import { get as objGet, forEach, isFunction, isString, isArray, debounce, uniqueId, uniq as arrayUniq } from "lodash";
-import validators from "../utils/validators";
-import { slugifyFormID } from "../utils/schema";
+import validators from "@/utils/validators";
+import { slugifyFormID } from "@/utils/schema";
 
 function convertValidator(validator) {
 	if (isString(validator)) {
@@ -82,18 +82,18 @@ export default {
 				if (!isArray(this.schema.validator)) {
 					validators.push(convertValidator(this.schema.validator).bind(this));
 				} else {
-					forEach(this.schema.validator, validator => {
+					forEach(this.schema.validator, (validator) => {
 						validators.push(convertValidator(validator).bind(this));
 					});
 				}
 
-				forEach(validators, validator => {
+				forEach(validators, (validator) => {
 					if (validateAsync) {
 						results.push(validator(this.value, this.schema, this.model));
 					} else {
 						let result = validator(this.value, this.schema, this.model);
 						if (result && isFunction(result.then)) {
-							result.then(err => {
+							result.then((err) => {
 								if (err) {
 									this.errors = this.errors.concat(err);
 								}
@@ -109,7 +109,7 @@ export default {
 
 			let handleErrors = (errors) => {
 				let fieldErrors = [];
-				forEach(arrayUniq(errors), err => {
+				forEach(arrayUniq(errors), (err) => {
 					if (isArray(err) && err.length > 0) {
 						fieldErrors = fieldErrors.concat(err);
 					} else if (isString(err)) {
@@ -163,7 +163,13 @@ export default {
 				}
 
 				if (objGet(this.formOptions, "validateAfterChanged", false) === true) {
-					if (objGet(this.schema, "validateDebounceTime", objGet(this.formOptions, "validateDebounceTime", 0)) > 0) {
+					if (
+						objGet(
+							this.schema,
+							"validateDebounceTime",
+							objGet(this.formOptions, "validateDebounceTime", 0)
+						) > 0
+					) {
 						this.debouncedValidate();
 					} else {
 						this.validate();
diff --git a/src/fields/core/fieldCheckbox.vue b/src/components/fields/core/fieldCheckbox.vue
similarity index 100%
rename from src/fields/core/fieldCheckbox.vue
rename to src/components/fields/core/fieldCheckbox.vue
diff --git a/src/fields/core/fieldChecklist.vue b/src/components/fields/core/fieldChecklist.vue
similarity index 93%
rename from src/fields/core/fieldChecklist.vue
rename to src/components/fields/core/fieldChecklist.vue
index 66a12785..3829b7cb 100644
--- a/src/fields/core/fieldChecklist.vue
+++ b/src/components/fields/core/fieldChecklist.vue
@@ -21,7 +21,7 @@
 <script>
 import { isObject, isNil, clone } from "lodash";
 import abstractField from "../abstractField";
-import { slugify } from "../../utils/schema";
+import { slugify } from "@/utils/schema";
 
 export default {
 	mixins: [abstractField],
@@ -57,7 +57,10 @@ export default {
 
 		getItemValue(item) {
 			if (isObject(item)) {
-				if (typeof this.schema["checklistOptions"] !== "undefined" && typeof this.schema["checklistOptions"]["value"] !== "undefined") {
+				if (
+					typeof this.schema["checklistOptions"] !== "undefined" &&
+					typeof this.schema["checklistOptions"]["value"] !== "undefined"
+				) {
 					return item[this.schema.checklistOptions.value];
 				} else {
 					if (typeof item["value"] !== "undefined") {
@@ -72,7 +75,10 @@ export default {
 		},
 		getItemName(item) {
 			if (isObject(item)) {
-				if (typeof this.schema["checklistOptions"] !== "undefined" && typeof this.schema["checklistOptions"]["name"] !== "undefined") {
+				if (
+					typeof this.schema["checklistOptions"] !== "undefined" &&
+					typeof this.schema["checklistOptions"]["name"] !== "undefined"
+				) {
 					return item[this.schema.checklistOptions.name];
 				} else {
 					if (typeof item["name"] !== "undefined") {
diff --git a/src/fields/core/fieldInput.vue b/src/components/fields/core/fieldInput.vue
similarity index 100%
rename from src/fields/core/fieldInput.vue
rename to src/components/fields/core/fieldInput.vue
diff --git a/src/fields/core/fieldLabel.vue b/src/components/fields/core/fieldLabel.vue
similarity index 100%
rename from src/fields/core/fieldLabel.vue
rename to src/components/fields/core/fieldLabel.vue
diff --git a/src/fields/core/fieldRadios.vue b/src/components/fields/core/fieldRadios.vue
similarity index 100%
rename from src/fields/core/fieldRadios.vue
rename to src/components/fields/core/fieldRadios.vue
diff --git a/src/fields/core/fieldSelect.vue b/src/components/fields/core/fieldSelect.vue
similarity index 100%
rename from src/fields/core/fieldSelect.vue
rename to src/components/fields/core/fieldSelect.vue
diff --git a/src/fields/core/fieldSubmit.vue b/src/components/fields/core/fieldSubmit.vue
similarity index 100%
rename from src/fields/core/fieldSubmit.vue
rename to src/components/fields/core/fieldSubmit.vue
diff --git a/src/fields/core/fieldTextArea.vue b/src/components/fields/core/fieldTextArea.vue
similarity index 100%
rename from src/fields/core/fieldTextArea.vue
rename to src/components/fields/core/fieldTextArea.vue
diff --git a/src/fields/core/fieldUpload.vue b/src/components/fields/core/fieldUpload.vue
similarity index 100%
rename from src/fields/core/fieldUpload.vue
rename to src/components/fields/core/fieldUpload.vue
diff --git a/src/fields/optional/fieldCleave.vue b/src/components/fields/optional/fieldCleave.vue
similarity index 100%
rename from src/fields/optional/fieldCleave.vue
rename to src/components/fields/optional/fieldCleave.vue
diff --git a/src/fields/optional/fieldDateTimePicker.vue b/src/components/fields/optional/fieldDateTimePicker.vue
similarity index 91%
rename from src/fields/optional/fieldDateTimePicker.vue
rename to src/components/fields/optional/fieldDateTimePicker.vue
index 4e62ece2..55312aae 100644
--- a/src/fields/optional/fieldDateTimePicker.vue
+++ b/src/components/fields/optional/fieldDateTimePicker.vue
@@ -9,7 +9,7 @@
 /* global $ */
 import abstractField from "../abstractField";
 import { defaults } from "lodash";
-import dateFieldHelper from "../../utils/dateFieldHelper";
+import dateFieldHelper from "@/utils/dateFieldHelper";
 
 let inputFormat = "YYYY-MM-DD HH:mm:ss";
 
@@ -18,7 +18,8 @@ export default {
 
 	methods: {
 		getDateFormat() {
-			if (this.schema.dateTimePickerOptions && this.schema.dateTimePickerOptions.format) return this.schema.dateTimePickerOptions.format;
+			if (this.schema.dateTimePickerOptions && this.schema.dateTimePickerOptions.format)
+				return this.schema.dateTimePickerOptions.format;
 			else return inputFormat;
 		},
 
@@ -58,5 +59,4 @@ export default {
 
 
 <style lang="scss">
-
 </style>
diff --git a/src/fields/optional/fieldGoogleAddress.vue b/src/components/fields/optional/fieldGoogleAddress.vue
similarity index 100%
rename from src/fields/optional/fieldGoogleAddress.vue
rename to src/components/fields/optional/fieldGoogleAddress.vue
diff --git a/src/fields/optional/fieldImage.vue b/src/components/fields/optional/fieldImage.vue
similarity index 100%
rename from src/fields/optional/fieldImage.vue
rename to src/components/fields/optional/fieldImage.vue
diff --git a/src/fields/optional/fieldMasked.vue b/src/components/fields/optional/fieldMasked.vue
similarity index 100%
rename from src/fields/optional/fieldMasked.vue
rename to src/components/fields/optional/fieldMasked.vue
diff --git a/src/fields/optional/fieldNoUiSlider.vue b/src/components/fields/optional/fieldNoUiSlider.vue
similarity index 100%
rename from src/fields/optional/fieldNoUiSlider.vue
rename to src/components/fields/optional/fieldNoUiSlider.vue
diff --git a/src/fields/optional/fieldPikaday.vue b/src/components/fields/optional/fieldPikaday.vue
similarity index 81%
rename from src/fields/optional/fieldPikaday.vue
rename to src/components/fields/optional/fieldPikaday.vue
index 63d9a729..28333cbc 100644
--- a/src/fields/optional/fieldPikaday.vue
+++ b/src/components/fields/optional/fieldPikaday.vue
@@ -5,14 +5,14 @@
 <script>
 import abstractField from "../abstractField";
 import { defaults, get as objGet } from "lodash";
-import dateFieldHelper from "../../utils/dateFieldHelper";
+import dateFieldHelper from "@/utils/dateFieldHelper";
 
 let inputFormat = "YYYY-MM-DD";
 
 export default {
-	mixins: [ abstractField ],
+	mixins: [abstractField],
 	data() {
-		return { 
+		return {
 			picker: null,
 			options: null
 		};
@@ -24,7 +24,7 @@ export default {
 		},
 		...dateFieldHelper,
 		initialize(options) {
-			if(this.picker && this.picker.destroy) {
+			if (this.picker && this.picker.destroy) {
 				// if an existing picker is already set, destroy it first
 				this.picker.destroy();
 			}
@@ -40,7 +40,9 @@ export default {
 					});
 					this.picker = new window.Pikaday(this.options);
 				} else {
-					console.warn("Pikaday is missing. Please download from https://github.com/dbushell/Pikaday/ and load the script and CSS in the HTML head section!");
+					console.warn(
+						"Pikaday is missing. Please download from https://github.com/dbushell/Pikaday/ and load the script and CSS in the HTML head section!"
+					);
 				}
 			});
 		}
@@ -60,5 +62,4 @@ export default {
 
 
 <style lang="scss">
-
 </style>
diff --git a/src/fields/optional/fieldRangeSlider.vue b/src/components/fields/optional/fieldRangeSlider.vue
similarity index 100%
rename from src/fields/optional/fieldRangeSlider.vue
rename to src/components/fields/optional/fieldRangeSlider.vue
diff --git a/src/fields/optional/fieldSelectEx.vue b/src/components/fields/optional/fieldSelectEx.vue
similarity index 100%
rename from src/fields/optional/fieldSelectEx.vue
rename to src/components/fields/optional/fieldSelectEx.vue
diff --git a/src/fields/optional/fieldSpectrum.vue b/src/components/fields/optional/fieldSpectrum.vue
similarity index 100%
rename from src/fields/optional/fieldSpectrum.vue
rename to src/components/fields/optional/fieldSpectrum.vue
diff --git a/src/fields/optional/fieldStaticMap.vue b/src/components/fields/optional/fieldStaticMap.vue
similarity index 100%
rename from src/fields/optional/fieldStaticMap.vue
rename to src/components/fields/optional/fieldStaticMap.vue
diff --git a/src/fields/optional/fieldSwitch.vue b/src/components/fields/optional/fieldSwitch.vue
similarity index 100%
rename from src/fields/optional/fieldSwitch.vue
rename to src/components/fields/optional/fieldSwitch.vue
diff --git a/src/fields/optional/fieldVueMultiSelect.vue b/src/components/fields/optional/fieldVueMultiSelect.vue
similarity index 100%
rename from src/fields/optional/fieldVueMultiSelect.vue
rename to src/components/fields/optional/fieldVueMultiSelect.vue
diff --git a/src/index.js b/src/index.js
index 58aa6d14..c81ceed7 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,8 +1,8 @@
-const component = require("./components/form/formGenerator").default;
-const schema = require("./utils/schema.js");
-const validators = require("./utils/validators.js").default;
-const fieldComponents = require("./utils/fieldsLoader").default;
-const abstractField = require("./fields/abstractField").default;
+const component = require("@/components/form/formGenerator").default;
+const schema = require("@/utils/schema.js");
+const validators = require("@/utils/validators.js").default;
+const fieldComponents = require("@/utils/fieldsLoader").default;
+const abstractField = require("@/components/fields/abstractField").default;
 const install = (Vue, options) => {
 	Vue.component("VueFormGenerator", module.exports.component);
 	if (options && options.validators) {
diff --git a/src/utils/fieldsLoader.js b/src/utils/fieldsLoader.js
index 7eddec09..66d1d853 100644
--- a/src/utils/fieldsLoader.js
+++ b/src/utils/fieldsLoader.js
@@ -2,7 +2,7 @@ const forEach = require("lodash").forEach;
 
 let fieldComponents = {};
 
-let coreFields = require.context("../fields/core", false, /^\.\/field([\w-_]+)\.vue$/);
+let coreFields = require.context("../components/fields/core", false, /^\.\/field([\w-_]+)\.vue$/);
 
 forEach(coreFields.keys(), (key) => {
 	let compName = key.replace(/^\.\//, "").replace(/\.vue/, "");
@@ -10,7 +10,7 @@ forEach(coreFields.keys(), (key) => {
 });
 
 if (process.env.FULL_BUNDLE) {
-	let optionalFields = require.context("../fields/optional", false, /^\.\/field([\w-_]+)\.vue$/);
+	let optionalFields = require.context("../components/fields/optional", false, /^\.\/field([\w-_]+)\.vue$/);
 
 	forEach(optionalFields.keys(), (key) => {
 		let compName = key.replace(/^\.\//, "").replace(/\.vue/, "");

From d191946cba32336f347e8f84040238eda08ca617 Mon Sep 17 00:00:00 2001
From: RichardMiao <miaochuanxing@126.com>
Date: Fri, 22 Feb 2019 11:29:56 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=85=AC=E5=85=B1?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=88=B0mixin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/form/formGroup.vue | 4 +---
 src/components/form/formMixin.js  | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/form/formGroup.vue b/src/components/form/formGroup.vue
index 4db603c4..bc69cfae 100644
--- a/src/components/form/formGroup.vue
+++ b/src/components/form/formGroup.vue
@@ -118,9 +118,7 @@ export default {
 
 			return field.hint;
 		},
-		fieldErrors(field) {
-			return this.errors.filter((e) => e.field === field).map((item) => item.error);
-		},
+
 		onModelUpdated(newVal, schema) {
 			this.$emit("model-updated", newVal, schema);
 		},
diff --git a/src/components/form/formMixin.js b/src/components/form/formMixin.js
index 1ef0ef5f..7be60697 100644
--- a/src/components/form/formMixin.js
+++ b/src/components/form/formMixin.js
@@ -15,7 +15,7 @@ export default {
 			};
 
 			if (isArray(field.styleClasses)) {
-				forEach(field.styleClasses, c => (baseClasses[c] = true));
+				forEach(field.styleClasses, (c) => (baseClasses[c] = true));
 			} else if (isString(field.styleClasses)) {
 				baseClasses[field.styleClasses] = true;
 			}
@@ -27,8 +27,7 @@ export default {
 			return baseClasses;
 		},
 		fieldErrors(field) {
-			let res = this.errors.filter(e => e.field === field);
-			return res.map(item => item.error);
+			return this.errors.filter((e) => e.field === field).map((item) => item.error);
 		},
 		// Get disabled attr of field
 		fieldDisabled(field) {

From bda82537bb1b724aa4e1a6844118d41cd82fb110 Mon Sep 17 00:00:00 2001
From: RichardMiao <miaochuanxing@126.com>
Date: Fri, 22 Feb 2019 17:10:13 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .prettierrc                               |  20 ++---
 dev/projects/basic/app.vue                |  49 ++++++++---
 dev/style.scss                            | 102 +++++++++++-----------
 src/components/fields/abstractField.js    |  31 ++++---
 src/components/fields/core/fieldInput.vue |  39 +++++----
 5 files changed, 138 insertions(+), 103 deletions(-)

diff --git a/.prettierrc b/.prettierrc
index 60526ee6..6ad8210c 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,12 +1,12 @@
 {
-  "printWidth": 120,
-  "semi": false,
-  "singleQuote": true,
-  "trailingComma": "none",
-  "bracketSpacing": true,
-  "jsxBracketSameLine": false,
-  "arrowParens": "avoid",
-  "requirePragma": false,
-  "proseWrap": "preserve",
-  "tabWidth": 2
+	"printWidth": 120,
+	"semi": false,
+	"singleQuote": true,
+	"trailingComma": "none",
+	"bracketSpacing": true,
+	"jsxBracketSameLine": false,
+	"arrowParens": "avoid",
+	"requirePragma": false,
+	"proseWrap": "preserve",
+	"tabWidth": 2
 }
diff --git a/dev/projects/basic/app.vue b/dev/projects/basic/app.vue
index 9eed67d8..2dd6388d 100644
--- a/dev/projects/basic/app.vue
+++ b/dev/projects/basic/app.vue
@@ -1,21 +1,30 @@
 <template>
-	<div class="container">
-		<h1>Basic</h1>
-		<div class="row">
-			<div class="col-sm-12">
-				<vue-form-generator :schema="schema" :model="model" :options="formOptions" ref="form" :is-new-model="isNewModel" @model-updated="modelUpdated" @validated="onValidated"></vue-form-generator>
-			</div>
-		</div>
-		<div class="row">
-			<div class="col-sm-12">
-				<pre v-if="model" v-html="prettyModel"></pre>
-			</div>
-		</div>
-	</div>
+  <div class="container">
+    <h1>Basic</h1>
+    <div class="row">
+      <div class="col-sm-12">
+        <vue-form-generator
+          :schema="schema"
+          :model="model"
+          :options="formOptions"
+          ref="form"
+          :is-new-model="isNewModel"
+          @model-updated="modelUpdated"
+          @validated="onValidated"
+        ></vue-form-generator>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-sm-12">
+        <pre v-if="model" v-html="prettyModel"></pre>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
 import mixinUtils from "../../mixins/utils.js";
+import VueFormGenerator from "../../../src";
 
 export default {
 	mixins: [mixinUtils],
@@ -48,6 +57,20 @@ export default {
 							}
 						}
 					},
+					{
+						type: "input",
+						inputType: "text",
+						label: "Name",
+						model: "first_name",
+						readonly: false,
+						featured: true,
+						required: true,
+						disabled: false,
+						max: 10,
+						min: 5,
+						placeholder: "User's name",
+						validator: VueFormGenerator.validators.string
+					},
 					{
 						type: "checkbox",
 						label: "Active",
diff --git a/dev/style.scss b/dev/style.scss
index 0dc91ccf..e9156394 100644
--- a/dev/style.scss
+++ b/dev/style.scss
@@ -1,70 +1,66 @@
 @import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,700|Open+Sans+Condensed:300&subset=latin,latin-ext);
 html {
-	font-family: "Open Sans";
-	font-size: 14px;
+    font-family: "Open Sans";
+    font-size: 14px;
 }
 
 * {
-	-moz-box-sizing: border-box;
-	-webkit-box-sizing: border-box;
-	box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
 }
 
 pre {
-	overflow: auto;
-
-	.string {
-		color: #885800;
-	}
-	.number {
-		color: blue;
-	}
-	.boolean {
-		color: magenta;
-	}
-	.null {
-		color: red;
-	}
-	.key {
-		color: green;
-	}
+    overflow: auto;
+    .string {
+        color: #885800;
+    }
+    .number {
+        color: blue;
+    }
+    .boolean {
+        color: magenta;
+    }
+    .null {
+        color: red;
+    }
+    .key {
+        color: green;
+    }
 }
 
 .control-buttons {
-	button {
-		margin: 0.2em 0.3em;
-		padding: 6px 20px;
-		position: relative;
-
-		i {
-			margin-right: 0.3em;
-		}
-	}
-
-	i.fa.fa-warning {
-		position: absolute;
-		top: 0px;
-		right: 0px;
-		color: Orange;
-	}
+    button {
+        margin: 0.2em 0.3em;
+        padding: 6px 20px;
+        position: relative;
+        i {
+            margin-right: 0.3em;
+        }
+    }
+    i.fa.fa-warning {
+        position: absolute;
+        top: 0px;
+        right: 0px;
+        color: Orange;
+    }
 }
 
 .errors {
-	.alert {
-		padding: 4px;
-		width: 80%;
-		margin: 5px auto;
-	}
+    .alert {
+        padding: 4px;
+        width: 80%;
+        margin: 5px auto;
+    }
 }
 
 fieldset.vue-form-generator {
-	.form-group.half-width {
-		width: 50%;
-	}
-
-	.half-width + .half-width {
-		&:not(.first) {
-			padding-left: 0.5rem;
-		}
-	}
-}
+    .form-group.half-width {
+        width: 50%;
+    }
+    .half-width+.half-width {
+        &:not(.first) {
+            padding-left: 0.5rem;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/components/fields/abstractField.js b/src/components/fields/abstractField.js
index b7f3ff65..f9b1f2a7 100644
--- a/src/components/fields/abstractField.js
+++ b/src/components/fields/abstractField.js
@@ -72,6 +72,8 @@ export default {
 
 	methods: {
 		validate(calledParent) {
+			/*eslint no-debugger: 0*/
+			debugger;
 			this.clearValidationErrors();
 			let validateAsync = objGet(this.formOptions, "validateAsync", false);
 
@@ -88,6 +90,8 @@ export default {
 				}
 
 				forEach(validators, (validator) => {
+					// /*eslint no-debugger: 0*/
+					// debugger;
 					if (validateAsync) {
 						results.push(validator(this.value, this.schema, this.model));
 					} else {
@@ -95,6 +99,8 @@ export default {
 						if (result && isFunction(result.then)) {
 							result.then((err) => {
 								if (err) {
+									// /*eslint no-debugger: 0*/
+									// debugger;
 									this.errors = this.errors.concat(err);
 								}
 								let isValid = this.errors.length === 0;
@@ -116,6 +122,7 @@ export default {
 						fieldErrors.push(err);
 					}
 				});
+
 				if (isFunction(this.schema.onValidated)) {
 					this.schema.onValidated.call(this, this.model, fieldErrors, this.schema);
 				}
@@ -124,6 +131,8 @@ export default {
 				if (!calledParent) {
 					this.$emit("validated", isValid, fieldErrors, this);
 				}
+				// /*eslint no-debugger: 0*/
+				// debugger;
 				this.errors = fieldErrors;
 				return fieldErrors;
 			};
@@ -184,29 +193,29 @@ export default {
 
 		setModelValueByPath(path, value) {
 			// convert array indexes to properties
-			let s = path.replace(/\[(\w+)\]/g, ".$1");
+			path = path.replace(/\[(\w+)\]/g, ".$1");
 
 			// strip a leading dot
-			s = s.replace(/^\./, "");
+			path = path.replace(/^\./, "");
 
-			let o = this.model;
-			const a = s.split(".");
+			let _model = this.model;
+			const pathParts = path.split(".");
+			const n = pathParts.length;
 			let i = 0;
-			const n = a.length;
 			while (i < n) {
-				let k = a[i];
+				let part = pathParts[i];
 				if (i < n - 1)
-					if (o[k] !== undefined) {
+					if (_model[part] !== undefined) {
 						// Found parent property. Step in
-						o = o[k];
+						_model = _model[part];
 					} else {
 						// Create missing property (new level)
-						this.$root.$set(o, k, {});
-						o = o[k];
+						this.$root.$set(_model, part, {});
+						_model = _model[part];
 					}
 				else {
 					// Set final property value
-					this.$root.$set(o, k, value);
+					this.$root.$set(_model, part, value);
 					return;
 				}
 
diff --git a/src/components/fields/core/fieldInput.vue b/src/components/fields/core/fieldInput.vue
index da2de56a..705b9619 100644
--- a/src/components/fields/core/fieldInput.vue
+++ b/src/components/fields/core/fieldInput.vue
@@ -37,7 +37,7 @@
 		:width="schema.width",
 		:files="schema.files"
 		v-attributes="'input'")
-	span.helper(v-if="schema.inputType.toLowerCase() === 'color' || schema.inputType.toLowerCase() === 'range'") {{ value }}
+	span.helper(v-if="inputType === 'color' || inputType === 'range'") {{ value }}
 </template>
 
 <script>
@@ -55,18 +55,18 @@ export default {
 	mixins: [abstractField],
 	computed: {
 		inputType() {
-			if(this.schema && this.schema.inputType === "datetime") {
+			if (this.schema && this.schema.inputType === "datetime") {
 				// convert "datetime" to "datetime-local" (datetime deprecated in favor of "datetime-local")
 				// ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/datetime
 				return "datetime-local";
 			}
-			return this.schema.inputType;
+			return this.schema.inputType.toLowerCase();
 		}
 	},
 	methods: {
 		formatValueToModel(value) {
 			if (value != null) {
-				switch (this.schema.inputType.toLowerCase()) {
+				switch (this.inputType) {
 					case "date":
 					case "datetime":
 					case "datetime-local":
@@ -82,7 +82,7 @@ export default {
 			return value;
 		},
 		formatValueToField(value) {
-			switch(this.schema.inputType.toLowerCase()) {
+			switch (this.inputType) {
 				case "date":
 				case "datetime":
 				case "datetime-local":
@@ -91,7 +91,7 @@ export default {
 			return value;
 		},
 		formatDatetimeToModel(newValue, oldValue) {
-			let defaultFormat = DATETIME_FORMATS[this.schema.inputType.toLowerCase()];
+			let defaultFormat = DATETIME_FORMATS[this.inputType];
 			let m = fecha.parse(newValue, defaultFormat);
 			if (m !== false) {
 				if (this.schema.format) {
@@ -103,16 +103,16 @@ export default {
 			this.updateModelValue(newValue, oldValue);
 		},
 		formatDatetimeValueToField(value) {
-			if(value === null || undefined === value) {
+			if (value === null || undefined === value) {
 				return null;
 			}
 
-			let defaultFormat = DATETIME_FORMATS[this.schema.inputType.toLowerCase()];
+			let defaultFormat = DATETIME_FORMATS[this.inputType];
 			let m = value;
-			if(!isNumber(value)) {
+			if (!isNumber(value)) {
 				m = fecha.parse(value, defaultFormat);
 			}
-			if(m !== false) {
+			if (m !== false) {
 				return fecha.format(m, defaultFormat);
 			}
 			return value;
@@ -124,18 +124,25 @@ export default {
 			this.updateModelValue(newValue, oldValue);
 		},
 		onInput($event) {
+			/*eslint no-debugger: 0*/
+			// debugger;
 			let value = $event.target.value;
-			switch (this.schema.inputType.toLowerCase()) {
+			switch (this.inputType) {
 				case "number":
-				case "range":
-					if (isNumber(parseFloat($event.target.value))) {
-						value = parseFloat($event.target.value);
+				case "range": {
+					let parseValue = parseFloat($event.target.value);
+					if (isNumber(parseValue)) {
+						value = parseValue;
 					}
 					break;
+				}
 			}
 			this.value = value;
 		},
 		onBlur() {
+			/*eslint no-debugger: 0*/
+			// debugger;
+
 			if (isFunction(this.debouncedFormatFunc)) {
 				this.debouncedFormatFunc.flush();
 			}
@@ -143,7 +150,7 @@ export default {
 	},
 
 	mounted() {
-		switch (this.schema.inputType.toLowerCase()) {
+		switch (this.inputType) {
 			case "number":
 			case "range":
 				this.debouncedFormatFunc = debounce(
@@ -176,7 +183,7 @@ export default {
 	},
 
 	created() {
-		if (this.schema.inputType.toLowerCase() === "file") {
+		if (this.inputType === "file") {
 			console.warn("The 'file' type in input field is deprecated. Use 'file' field instead.");
 		}
 	}