Skip to content

Commit e98e23e

Browse files
author
Lionel Bijaoui
committed
Separation of the bundle into "core" fields and "optional" fields
1 parent 3e05e14 commit e98e23e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+75
-670
lines changed

‎package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"main": "dist/vue-form-generator.js",
77
"scripts": {
88
"prebuild": "npm run test",
9-
"build": "webpack --progress --config webpack.build.config.js",
9+
"build": "webpack --progress --config webpack.build.config.js --define process.env.FULL_BUNDLE=true",
10+
"buildcore": "webpack --progress --config webpack.build.config.js --define process.env.FULL_BUNDLE=false --output-filename=vue-form-generator-core.js",
1011
"dev": "webpack-dev-server --config webpack.dev.config.js --inline --hot --content-base dev/",
1112
"lint": "eslint --ext=.js,.vue src test/unit/specs",
1213
"coverall": "cat ./test/unit/coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
@@ -33,8 +34,7 @@
3334
},
3435
"files": [
3536
"dist/vue-form-generator.js",
36-
"dist/vue-form-generator.css",
37-
"src"
37+
"dist/vue-form-generator.css"
3838
],
3939
"author": "Icebob",
4040
"license": "MIT",
@@ -79,7 +79,6 @@
7979
"mocha": "2.5.3",
8080
"mocha-generators": "1.2.0",
8181
"mocha-loader": "0.7.1",
82-
"moment": "2.17.1",
8382
"node-sass": "3.10.1",
8483
"phantomjs-prebuilt": "2.1.14",
8584
"sass-loader": "3.2.0",

‎src/fields/fieldCheckbox.vue renamed to ‎src/fields/core/fieldCheckbox.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
</template>
44

55
<script>
6-
import abstractField from "./abstractField";
6+
import abstractField from "../abstractField";
77
88
export default {
99
mixins: [ abstractField ]

‎src/fields/fieldChecklist.vue renamed to ‎src/fields/core/fieldChecklist.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<script>
2222
import {isObject, isNil} from "lodash";
23-
import abstractField from "./abstractField";
23+
import abstractField from "../abstractField";
2424
2525
export default {
2626
mixins: [ abstractField ],

‎src/fields/fieldInput.vue renamed to ‎src/fields/core/fieldInput.vue

+6-3
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,22 @@
3636
</template>
3737

3838
<script>
39-
import abstractField from "./abstractField";
39+
import abstractField from "../abstractField";
4040
import fecha from "fecha";
4141
4242
export default {
4343
mixins: [ abstractField ],
4444
methods: {
4545
formatValueToField(value) {
46-
if (value != null) {
46+
console.info(value);
47+
if (typeof value === "undefined") {
48+
return value;
49+
}else{
4750
switch(this.schema.inputType){
4851
case "date":
4952
return fecha.format(value, "YYYY-MM-DD");
5053
case "datetime":
51-
return fecha.format(value);
54+
return fecha.format(value, "YYYY-MM-DD HH:mm:ss");
5255
case "datetime-local":
5356
return fecha.format(value, "YYYY-MM-DDTHH:mm:ss");
5457
default:

‎src/fields/fieldLabel.vue renamed to ‎src/fields/core/fieldLabel.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
</template>
44

55
<script>
6-
import abstractField from "./abstractField";
6+
import abstractField from "../abstractField";
77
88
export default {
99
mixins: [ abstractField ]

‎src/fields/fieldRadios.vue renamed to ‎src/fields/core/fieldRadios.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<script>
1010
import {isObject} from "lodash";
11-
import abstractField from "./abstractField";
11+
import abstractField from "../abstractField";
1212
1313
export default {
1414
mixins: [ abstractField ],

‎src/fields/fieldSelect.vue renamed to ‎src/fields/core/fieldSelect.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<script>
88
import {isObject} from "lodash";
9-
import abstractField from "./abstractField";
9+
import abstractField from "../abstractField";
1010
1111
export default {
1212
mixins: [ abstractField ],

‎src/fields/fieldSubmit.vue renamed to ‎src/fields/core/fieldSubmit.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
</template>
44

55
<script>
6-
import abstractField from "./abstractField";
6+
import abstractField from "../abstractField";
77
import { isFunction } from "lodash";
88
99
export default {

‎src/fields/fieldTextArea.vue renamed to ‎src/fields/core/fieldTextArea.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
</template>
44

55
<script>
6-
import abstractField from "./abstractField";
6+
import abstractField from "../abstractField";
77
88
export default {
99
mixins: [ abstractField ]

‎src/fields/fieldColor.vue

-26
This file was deleted.

‎src/fields/fieldEmail.vue

-14
This file was deleted.

‎src/fields/fieldNumber.vue

-14
This file was deleted.

‎src/fields/fieldPassword.vue

-14
This file was deleted.

‎src/fields/fieldRange.vue

-25
This file was deleted.

‎src/fields/fieldText.vue

-15
This file was deleted.

‎src/fields/fieldCleave.vue renamed to ‎src/fields/optional/fieldCleave.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
</template>
44

55
<script>
6-
import abstractField from "./abstractField";
6+
import abstractField from "../abstractField";
77
import { defaults } from "lodash";
88
99
export default {

‎src/fields/fieldDateTimePicker.vue renamed to ‎src/fields/optional/fieldDateTimePicker.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<script>
99
/* global $ */
10-
import abstractField from "./abstractField";
10+
import abstractField from "../abstractField";
1111
import fecha from "fecha";
1212
import { defaults } from "lodash";
1313

‎src/fields/fieldGoogleAddress.vue renamed to ‎src/fields/optional/fieldGoogleAddress.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* https://github.com/gocanto/google-autocomplete
99
*/
1010
11-
import abstractField from "./abstractField";
11+
import abstractField from "../abstractField";
1212
import { isFunction } from "lodash";
1313
1414
/* global google */

‎src/fields/fieldImage.vue renamed to ‎src/fields/optional/fieldImage.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</template>
88

99
<script>
10-
import abstractField from "./abstractField";
10+
import abstractField from "../abstractField";
1111
1212
export default {
1313
mixins: [ abstractField ],

‎src/fields/fieldMasked.vue renamed to ‎src/fields/optional/fieldMasked.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<script>
66
/* global $ */
7-
import abstractField from "./abstractField";
7+
import abstractField from "../abstractField";
88
99
export default {
1010
mixins: [ abstractField ],

‎src/fields/fieldNoUiSlider.vue renamed to ‎src/fields/optional/fieldNoUiSlider.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
</template>
44

55
<script>
6-
import abstractField from "./abstractField";
6+
import abstractField from "../abstractField";
77
import { isArray, defaults } from "lodash";
88
99
export default {

‎src/fields/fieldPikaday.vue renamed to ‎src/fields/optional/fieldPikaday.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
</template>
44

55
<script>
6-
import abstractField from "./abstractField";
6+
import abstractField from "../abstractField";
77
import fecha from "fecha";
88
import { defaults } from "lodash";
99

‎src/fields/fieldRangeSlider.vue renamed to ‎src/fields/optional/fieldRangeSlider.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<script>
66
/* global $ */
7-
import abstractField from "./abstractField";
7+
import abstractField from "../abstractField";
88
import { defaults, isArray } from "lodash";
99
1010
export default {

‎src/fields/fieldSelectEx.vue renamed to ‎src/fields/optional/fieldSelectEx.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<script>
88
/* global $ */
99
import {isObject} from "lodash";
10-
import abstractField from "./abstractField";
10+
import abstractField from "../abstractField";
1111
1212
export default {
1313
mixins: [ abstractField ],

‎src/fields/fieldSpectrum.vue renamed to ‎src/fields/optional/fieldSpectrum.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<script>
66
/* global $ */
7-
import abstractField from "./abstractField";
7+
import abstractField from "../abstractField";
88
import { defaults } from "lodash";
99
export default {
1010
mixins: [ abstractField ],

‎src/fields/fieldStaticMap.vue renamed to ‎src/fields/optional/fieldStaticMap.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
</template>
44

55
<script>
6-
import abstractField from "./abstractField";
6+
import abstractField from "../abstractField";
77
import { defaults } from "lodash";
88
99
export default {

‎src/fields/fieldSwitch.vue renamed to ‎src/fields/optional/fieldSwitch.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</template>
77

88
<script>
9-
import abstractField from "./abstractField";
9+
import abstractField from "../abstractField";
1010
1111
export default {
1212
mixins: [ abstractField ],

‎src/fields/fieldVueMultiSelect.vue renamed to ‎src/fields/optional/fieldVueMultiSelect.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
)
4141
</template>
4242
<script>
43-
import abstractField from "./abstractField";
43+
import abstractField from "../abstractField";
4444
4545
export default {
4646
mixins: [abstractField],

‎src/formGenerator.vue

+15-3
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,25 @@ div
2222
import {each, isFunction, isNil, isArray, isString} from "lodash";
2323
2424
// Load all fields from '../fields' folder
25-
let Fields = require.context("./fields/", false, /^\.\/field([\w-_]+)\.vue$/);
2625
let fieldComponents = {};
27-
each(Fields.keys(), (key) => {
26+
27+
let coreFields = require.context("./fields/core", false, /^\.\/field([\w-_]+)\.vue$/);
28+
29+
each(coreFields.keys(), (key) => {
2830
let compName = key.replace(/^\.\//, "").replace(/\.vue/, "");
29-
fieldComponents[compName] = Fields(key);
31+
fieldComponents[compName] = coreFields(key);
3032
});
3133
34+
if (process.env.FULL_BUNDLE) { // eslint-disable-line
35+
let Fields = require.context("./fields/optional", false, /^\.\/field([\w-_]+)\.vue$/);
36+
37+
each(Fields.keys(), (key) => {
38+
let compName = key.replace(/^\.\//, "").replace(/\.vue/, "");
39+
fieldComponents[compName] = Fields(key);
40+
});
41+
}
42+
43+
3244
3345
export default {
3446
components: fieldComponents,

‎test/unit/specs/fields/fieldCheckbox.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { expect } from "chai";
22
import { createVueField, trigger, checkAttribute } from "../util";
33

44
import Vue from "vue";
5-
import FieldCheckbox from "src/fields/fieldCheckbox.vue";
5+
import FieldCheckbox from "src/fields/core/fieldCheckbox.vue";
66

77
Vue.component("FieldCheckbox", FieldCheckbox);
88

‎test/unit/specs/fields/fieldChecklist.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { expect } from "chai";
22
import { createVueField, trigger } from "../util";
33

44
import Vue from "vue";
5-
import FieldChecklist from "src/fields/fieldChecklist.vue";
5+
import FieldChecklist from "src/fields/core/fieldChecklist.vue";
66

77
Vue.component("FieldChecklist", FieldChecklist);
88

0 commit comments

Comments
 (0)