Skip to content

Commit 63b2174

Browse files
Merge pull request #476 from lionel-bijaoui/lb_fix_field_exposition
Fix fields exposition (temporary solution)
2 parents f5f5807 + 320a4b5 commit 63b2174

File tree

4 files changed

+29
-22
lines changed

4 files changed

+29
-22
lines changed

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@
133133
"trailingComma": "none",
134134
"bracketSpacing": true,
135135
"semi": true,
136-
"useTabs": true
136+
"useTabs": true,
137+
"arrowParens": "always"
137138
},
138139
"nyc": {
139140
"include": [

src/formGroup.vue

+3-20
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,10 @@
2323
</div>
2424
</template>
2525
<script>
26-
import { get as objGet, forEach, isNil, isFunction } from "lodash";
26+
import { get as objGet, isNil, isFunction } from "lodash";
2727
import { slugifyFormID } from "./utils/schema";
2828
import formMixin from "./formMixin.js";
29-
30-
let fieldComponents = {};
31-
32-
let coreFields = require.context("./fields/core", false, /^\.\/field([\w-_]+)\.vue$/);
33-
34-
forEach(coreFields.keys(), key => {
35-
let compName = key.replace(/^\.\//, "").replace(/\.vue/, "");
36-
fieldComponents[compName] = coreFields(key).default;
37-
});
38-
39-
if (process.env.FULL_BUNDLE) {
40-
let Fields = require.context("./fields/optional", false, /^\.\/field([\w-_]+)\.vue$/);
41-
42-
forEach(Fields.keys(), key => {
43-
let compName = key.replace(/^\.\//, "").replace(/\.vue/, "");
44-
fieldComponents[compName] = Fields(key).default;
45-
});
46-
}
29+
import fieldComponents from "./utils/fieldsLoader.js";
4730
4831
export default {
4932
name: "form-group",
@@ -111,7 +94,7 @@ export default {
11194
return field.hint;
11295
},
11396
fieldErrors(field) {
114-
return this.errors.filter(e => e.field === field).map(item => item.error);
97+
return this.errors.filter((e) => e.field === field).map((item) => item.error);
11598
},
11699
modelUpdated(newVal, schema) {
117100
this.$emit("model-updated", newVal, schema);

src/index.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
const component = require("./formGenerator.vue").default;
22
const schema = require("./utils/schema.js");
33
const validators = require("./utils/validators.js").default;
4+
const fieldComponents = require("./utils/fieldsLoader").default;
45
const abstractField = require("./fields/abstractField").default;
5-
const install = Vue => {
6+
const install = (Vue) => {
67
Vue.component("VueFormGenerator", module.exports.component);
78
};
89

@@ -11,5 +12,6 @@ module.exports = {
1112
schema,
1213
validators,
1314
abstractField,
15+
fieldComponents,
1416
install
1517
};

src/utils/fieldsLoader.js

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
const forEach = require("lodash").forEach;
2+
3+
let fieldComponents = {};
4+
5+
let coreFields = require.context("../fields/core", false, /^\.\/field([\w-_]+)\.vue$/);
6+
7+
forEach(coreFields.keys(), (key) => {
8+
let compName = key.replace(/^\.\//, "").replace(/\.vue/, "");
9+
fieldComponents[compName] = coreFields(key).default;
10+
});
11+
12+
if (process.env.FULL_BUNDLE) {
13+
let optionalFields = require.context("../fields/optional", false, /^\.\/field([\w-_]+)\.vue$/);
14+
15+
forEach(optionalFields.keys(), (key) => {
16+
let compName = key.replace(/^\.\//, "").replace(/\.vue/, "");
17+
fieldComponents[compName] = optionalFields(key).default;
18+
});
19+
}
20+
21+
module.exports = fieldComponents;

0 commit comments

Comments
 (0)