Skip to content

Improve field loading method #505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion dev/projects/basic/main.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import Vue from "vue";

import VueFormGenerator from "@";
Vue.use(VueFormGenerator);
import { fieldCheckbox, fieldInput, fieldSubmit } from "@/utils/fieldsLoader.js";
Vue.use(VueFormGenerator, {
fields: [fieldCheckbox, fieldInput, fieldSubmit]
});

import VueHighlightJS from "vue-highlightjs";
Vue.use(VueHighlightJS);
Expand Down
3 changes: 2 additions & 1 deletion dev/projects/checklist/app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@

<script>
/* eslint no-console: 0 */
import { validators } from "../../../src";
import VueFormGenerator from "../../../src/index.js";
const validators = VueFormGenerator.validators;
import mixinUtils from "../../mixins/utils.js";

export default {
Expand Down
5 changes: 4 additions & 1 deletion dev/projects/checklist/main.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import Vue from "vue";

import VueFormGenerator from "@";
Vue.use(VueFormGenerator);
import { fieldChecklist } from "@/utils/fieldsLoader.js";
Vue.use(VueFormGenerator, {
fields: [fieldChecklist]
});

import VueHighlightJS from "vue-highlightjs";
Vue.use(VueHighlightJS);
Expand Down
5 changes: 4 additions & 1 deletion dev/projects/custom/main.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import Vue from "vue";

import VueFormGenerator from "@";
Vue.use(VueFormGenerator);
import { fieldInput } from "@/utils/fieldsLoader.js";
Vue.use(VueFormGenerator, {
fields: [fieldInput]
});

import VueHighlightJS from "vue-highlightjs";
Vue.use(VueHighlightJS);
Expand Down
8 changes: 1 addition & 7 deletions dev/projects/full/app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<script>
/* eslint no-console: 0 */
import Vue from "vue";
import VueFormGenerator from "../../../src";
import VueFormGenerator from "@";
import DataTable from "./dataTable.vue";
import Fakerator from "fakerator";

Expand All @@ -47,14 +47,8 @@ import mixinUtils from "../../mixins/utils.js";
import Multiselect from "vue-multiselect";
Vue.component("multiselect", Multiselect);

// Test custom field
import FieldAwesome from "./fieldAwesome.vue";
Vue.component("fieldAwesome", FieldAwesome);

import { each, cloneDeep, merge } from "lodash";

Vue.use(VueFormGenerator);

let fakerator = new Fakerator();

export default {
Expand Down
3 changes: 2 additions & 1 deletion dev/projects/full/fieldAwesome.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
</template>

<script>
import VueFormGenerator from "../../../src";
import VueFormGenerator from "@";

export default {
name: "field-awesome",
mixins: [VueFormGenerator.abstractField]
};
</script>
Expand Down
55 changes: 54 additions & 1 deletion dev/projects/full/main.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,60 @@
import Vue from "vue";

import VueFormGenerator from "@";
Vue.use(VueFormGenerator);
import {
fieldCheckbox,
fieldChecklist,
fieldInput,
fieldLabel,
fieldRadios,
fieldSelect,
fieldSubmit,
fieldTextArea,
fieldUpload,
fieldCleave,
fieldDateTimePicker,
fieldGoogleAddress,
fieldImage,
fieldMasked,
fieldNoUiSlider,
fieldPikaday,
fieldRangeSlider,
fieldSelectEx,
fieldSpectrum,
fieldStaticMap,
fieldSwitch,
fieldVueMultiSelect
} from "@/utils/fieldsLoader.js";
// Test custom field
import fieldAwesome from "./fieldAwesome.vue";

Vue.use(VueFormGenerator, {
fields: [
fieldAwesome,
fieldCheckbox,
fieldChecklist,
fieldInput,
fieldLabel,
fieldRadios,
fieldSelect,
fieldSubmit,
fieldTextArea,
fieldUpload,
fieldCleave,
fieldDateTimePicker,
fieldGoogleAddress,
fieldImage,
fieldMasked,
fieldNoUiSlider,
fieldPikaday,
fieldRangeSlider,
fieldSelectEx,
fieldSpectrum,
fieldStaticMap,
fieldSwitch,
fieldVueMultiSelect
]
});

import VueHighlightJS from "vue-highlightjs";
Vue.use(VueHighlightJS);
Expand Down
3 changes: 2 additions & 1 deletion dev/projects/full/schema.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/* eslint no-console: 0 */
import fecha from "fecha";

import { validators } from "../../../src";
import VueFormGenerator from "@";
const validators = VueFormGenerator.validators;

let customAsyncValidator = function(value) {
return new Promise((resolve, reject) => {
Expand Down
5 changes: 4 additions & 1 deletion dev/projects/grouping/main.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import Vue from "vue";

import VueFormGenerator from "@";
Vue.use(VueFormGenerator);
import { fieldInput } from "@/utils/fieldsLoader.js";
Vue.use(VueFormGenerator, {
fields: [fieldInput]
});

import VueHighlightJS from "vue-highlightjs";
Vue.use(VueHighlightJS);
Expand Down
5 changes: 4 additions & 1 deletion dev/projects/multi/main.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import Vue from "vue";

import VueFormGenerator from "@";
Vue.use(VueFormGenerator);
import { fieldCheckbox, fieldInput, fieldSubmit } from "@/utils/fieldsLoader.js";
Vue.use(VueFormGenerator, {
fields: [fieldCheckbox, fieldInput, fieldSubmit]
});

import VueHighlightJS from "vue-highlightjs";
Vue.use(VueHighlightJS);
Expand Down
5 changes: 4 additions & 1 deletion dev/projects/multiselect/main.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import Vue from "vue";

import VueFormGenerator from "@";
Vue.use(VueFormGenerator);
import { fieldVueMultiSelect } from "@/utils/fieldsLoader.js";
Vue.use(VueFormGenerator, {
fields: [fieldVueMultiSelect]
});

import VueHighlightJS from "vue-highlightjs";
Vue.use(VueHighlightJS);
Expand Down
5 changes: 4 additions & 1 deletion dev/projects/picker/main.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import Vue from "vue";

import VueFormGenerator from "@";
Vue.use(VueFormGenerator);
import { fieldDateTimePicker } from "@/utils/fieldsLoader.js";
Vue.use(VueFormGenerator, {
fields: [fieldDateTimePicker]
});

import VueHighlightJS from "vue-highlightjs";
Vue.use(VueHighlightJS);
Expand Down
1 change: 1 addition & 0 deletions src/fields/core/fieldCheckbox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import abstractField from "../abstractField";

export default {
name: "field-checkbox",
mixins: [abstractField]
};
</script>
Expand Down
1 change: 1 addition & 0 deletions src/fields/core/fieldChecklist.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import abstractField from "../abstractField";
import { slugify } from "../../utils/schema";

export default {
name: "field-checklist",
mixins: [abstractField],

data() {
Expand Down
1 change: 1 addition & 0 deletions src/fields/core/fieldInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ const DATETIME_FORMATS = {
};

export default {
name: "field-input",
mixins: [abstractField],
computed: {
inputType() {
Expand Down
1 change: 1 addition & 0 deletions src/fields/core/fieldLabel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import abstractField from "../abstractField";

export default {
name: "field-label",
mixins: [abstractField]
};
</script>
Expand Down
1 change: 1 addition & 0 deletions src/fields/core/fieldRadios.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { isObject } from "lodash";
import abstractField from "../abstractField";

export default {
name: "field-radios",
mixins: [abstractField],

computed: {
Expand Down
1 change: 1 addition & 0 deletions src/fields/core/fieldSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { isObject, isNil, find } from "lodash";
import abstractField from "../abstractField";

export default {
name: "field-select",
mixins: [abstractField],

computed: {
Expand Down
1 change: 1 addition & 0 deletions src/fields/core/fieldSubmit.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import abstractField from "../abstractField";
import { isFunction, isEmpty } from "lodash";

export default {
name: "field-submit",
mixins: [abstractField],

methods: {
Expand Down
1 change: 1 addition & 0 deletions src/fields/core/fieldTextArea.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import abstractField from "../abstractField";

export default {
name: "field-textArea",
mixins: [abstractField]
};
</script>
1 change: 1 addition & 0 deletions src/fields/core/fieldUpload.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import abstractField from "../abstractField";
import { isFunction } from "lodash";

export default {
name: "field-upload",
mixins: [abstractField],
methods: {
onChange($event) {
Expand Down
1 change: 1 addition & 0 deletions src/fields/optional/fieldCleave.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import abstractField from "../abstractField";
import { defaults } from "lodash";

export default {
name: "field-cleave",
mixins: [abstractField],

data() {
Expand Down
1 change: 1 addition & 0 deletions src/fields/optional/fieldDateTimePicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { defaults } from "lodash";
import dateFieldHelper from "../../utils/dateFieldHelper";

export default {
name: "field-dateTimePicker",
mixins: [abstractField],

methods: {
Expand Down
1 change: 1 addition & 0 deletions src/fields/optional/fieldGoogleAddress.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { isFunction } from "lodash";

/* global google */
export default {
name: "field-googleAddress",
mixins: [abstractField],

data() {
Expand Down
1 change: 1 addition & 0 deletions src/fields/optional/fieldImage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import abstractField from "../abstractField";

export default {
name: "field-image",
mixins: [abstractField],

computed: {
Expand Down
1 change: 1 addition & 0 deletions src/fields/optional/fieldMasked.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import abstractField from "../abstractField";

export default {
name: "field-masked",
mixins: [abstractField],

mounted() {
Expand Down
1 change: 1 addition & 0 deletions src/fields/optional/fieldNoUiSlider.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import abstractField from "../abstractField";
import { isArray, defaults } from "lodash";

export default {
name: "field-noUiSlider",
mixins: [abstractField],

data() {
Expand Down
1 change: 1 addition & 0 deletions src/fields/optional/fieldPikaday.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { defaults } from "lodash";
import dateFieldHelper from "../../utils/dateFieldHelper";

export default {
name: "field-pikaday",
mixins: [abstractField],
data() {
return { picker: null };
Expand Down
1 change: 1 addition & 0 deletions src/fields/optional/fieldRangeSlider.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import abstractField from "../abstractField";
import { defaults, isArray } from "lodash";

export default {
name: "field-rangeSlider",
mixins: [abstractField],

data() {
Expand Down
1 change: 1 addition & 0 deletions src/fields/optional/fieldSelectEx.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { isObject } from "lodash";
import abstractField from "../abstractField";

export default {
name: "field-selectex",
mixins: [abstractField],

computed: {
Expand Down
1 change: 1 addition & 0 deletions src/fields/optional/fieldSpectrum.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import abstractField from "../abstractField";
import { defaults } from "lodash";
export default {
name: "field-spectrum",
mixins: [abstractField],

data() {
Expand Down
1 change: 1 addition & 0 deletions src/fields/optional/fieldStaticMap.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import abstractField from "../abstractField";
import { defaults } from "lodash";

export default {
name: "field-staticmap",
mixins: [abstractField],

computed: {
Expand Down
1 change: 1 addition & 0 deletions src/fields/optional/fieldSwitch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import abstractField from "../abstractField";

export default {
name: "field-switch",
mixins: [abstractField],

methods: {
Expand Down
1 change: 1 addition & 0 deletions src/fields/optional/fieldVueMultiSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import abstractField from "../abstractField";

export default {
name: "field-vueMultiSelect",
mixins: [abstractField],
computed: {
options() {
Expand Down
2 changes: 0 additions & 2 deletions src/formElement.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,9 @@
import { get as objGet, isArray, isFunction, isNil } from "lodash";
import { slugifyFormID } from "./utils/schema";
import formMixin from "./formMixin.js";
import fieldComponents from "./utils/fieldsLoader.js";

export default {
name: "form-element",
components: fieldComponents,
mixins: [formMixin],
props: {
model: {
Expand Down
2 changes: 1 addition & 1 deletion src/formGenerator.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ import formGroup from "./formGroup.vue";
import formElement from "./formElement.vue";

export default {
name: "formGenerator",
name: "form-generator",
components: { formGroup, formElement },
props: {
schema: {
Expand Down
Loading