Skip to content

Commit b33186b

Browse files
authored
Merge pull request #1 from icebob/master
Groupped fields "tag" param fixed.
2 parents 9d9701b + c68c6bb commit b33186b

10 files changed

+45
-19
lines changed

dist/vfg-core.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vfg-core.js

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vfg.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vfg.js

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/fields/core/fieldCheckbox.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template lang="pug">
2-
input(type="checkbox", v-model="value", :autocomplete="schema.autocomplete", :disabled="disabled", :name="schema.inputName", :class="schema.fieldClasses")
2+
input(:id="getFieldID(schema)", type="checkbox", v-model="value", :autocomplete="schema.autocomplete", :disabled="disabled", :name="schema.inputName", :class="schema.fieldClasses")
33
</template>
44

55
<script>

src/fields/core/fieldChecklist.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
.listbox.form-control(v-if="schema.listBox", :disabled="disabled")
44
.list-row(v-for="item in items", :class="{'is-checked': isItemChecked(item)}")
55
label
6-
input(type="checkbox", :checked="isItemChecked(item)", :disabled="disabled", @change="onChanged($event, item)", :name="getInputName(item)")
6+
input(:id="getFieldID(schema)", type="checkbox", :checked="isItemChecked(item)", :disabled="disabled", @change="onChanged($event, item)", :name="getInputName(item)")
77
| {{ getItemName(item) }}
88

99
.combobox.form-control(v-if="!schema.listBox", :disabled="disabled")
@@ -14,7 +14,7 @@
1414
.dropList
1515
.list-row(v-if="comboExpanded", v-for="item in items", :class="{'is-checked': isItemChecked(item)}")
1616
label
17-
input(type="checkbox", :checked="isItemChecked(item)", :disabled="disabled", @change="onChanged($event, item)", :name="getInputName(item)")
17+
input(:id="getFieldID(schema)", type="checkbox", :checked="isItemChecked(item)", :disabled="disabled", @change="onChanged($event, item)", :name="getInputName(item)")
1818
| {{ getItemName(item) }}
1919
</template>
2020

src/fields/core/fieldRadios.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template lang="pug">
22
.radio-list(:disabled="disabled")
33
label(v-for="item in items", :class="{'is-checked': isItemChecked(item)}")
4-
input(type="radio", :disabled="disabled", :name="id", @click="onSelection(item)", :value="getItemValue(item)", :checked="isItemChecked(item)", :class="schema.fieldClasses")
4+
input(:id="getFieldID(schema)", type="radio", :disabled="disabled", :name="id", @click="onSelection(item)", :value="getItemValue(item)", :checked="isItemChecked(item)", :class="schema.fieldClasses")
55
| {{ getItemName(item) }}
66

77
</template>

src/fields/core/fieldSubmit.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template lang="pug">
2-
input(type="submit", :value="schema.buttonText", @click="click", :name="schema.inputName", :disabled="disabled", :class="schema.fieldClasses")
2+
input(:id="getFieldID(schema)", type="submit", :value="schema.buttonText", @click="click", :name="schema.inputName", :disabled="disabled", :class="schema.fieldClasses")
33
</template>
44

55
<script>

src/formGenerator.vue

+3-3
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
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

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)