Skip to content

Commit c68c6bb

Browse files
authored
Merge pull request #342 from zoul0813/feature/333-label-classes
added labelClasses support
2 parents 1a07563 + 17eeae5 commit c68c6bb

File tree

2 files changed

+30
-6
lines changed

2 files changed

+30
-6
lines changed

src/formGenerator.vue

+4-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ div.vue-form-generator(v-if='schema != null')
33
fieldset(v-if="schema.fields", :is='tag')
44
template(v-for='field in fields')
55
.form-group(v-if='fieldVisible(field)', :class='getFieldRowClasses(field)')
6-
label(v-if="fieldTypeHasLabel(field)", :for="getFieldID(field)")
6+
label(v-if="fieldTypeHasLabel(field)", :for="getFieldID(field)", :class="field.labelClasses")
77
| {{ field.label }}
88
span.help(v-if='field.help')
99
i.icon
@@ -17,11 +17,11 @@ div.vue-form-generator(v-if='schema != null')
1717
span(v-for='(error, index) in fieldErrors(field)', track-by='index') {{ error }}
1818

1919
template(v-for='group in groups')
20-
fieldset(:is='tag', :class='getFieldRowClasses(group)')
20+
fieldset(:is='tag')
2121
legend(v-if='group.legend') {{ group.legend }}
2222
template(v-for='field in group.fields')
2323
.form-group(v-if='fieldVisible(field)', :class='getFieldRowClasses(field)')
24-
label(v-if="fieldTypeHasLabel(field)", :for="getFieldID(field)")
24+
label(v-if="fieldTypeHasLabel(field)", :for="getFieldID(field)", :class="field.labelClasses")
2525
| {{ field.label }}
2626
span.help(v-if='field.help')
2727
i.icon
@@ -191,9 +191,7 @@ div.vue-form-generator(v-if='schema != null')
191191
baseClasses[field.styleClasses] = true;
192192
}
193193
194-
if (!isNil(field.type)) {
195-
baseClasses["field-" + field.type] = true;
196-
}
194+
baseClasses["field-" + field.type] = true;
197195
198196
return baseClasses;
199197
},

test/unit/specs/VueFormGenerator.spec.js

+26
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,32 @@ describe("VueFormGenerator.vue", () => {
191191

192192
});
193193

194+
describe("check label classes", () => {
195+
let schema = {
196+
fields: [
197+
{
198+
type: "input",
199+
inputType: "text",
200+
label: "Name",
201+
model: "name",
202+
labelClasses: ["applied-class", "another-class"]
203+
}
204+
]
205+
};
206+
let label;
207+
208+
before( () => {
209+
createFormGenerator(schema);
210+
label = el.querySelector("label");
211+
});
212+
213+
it("should be 2 classes", () => {
214+
expect(label.classList.contains("applied-class")).to.be.true;
215+
expect(label.classList.contains("another-class")).to.be.true;
216+
});
217+
218+
});
219+
194220
describe("check form row caption cell", () => {
195221
let group, label;
196222
let schema = {

0 commit comments

Comments
 (0)