Commit 846d49b

authored

Merge pull request #559 from zoul0813/feature/468-unique-ids

added an optional "unique" flag to "getFieldID" that appends lodash "...

2 parents b15112b + 3b012cd commit 846d49bCopy full SHA for 846d49b

File tree

-6

lines changed

-6

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { get as objGet, forEach, isFunction, isString, isArray, debounce } from "lodash";`
	`1`	`+import { get as objGet, forEach, isFunction, isString, isArray, debounce,uniqueId } from "lodash";`
`2`	`2`	`import validators from "../utils/validators";`
`3`	`3`	`import { slugifyFormID } from "../utils/schema";`
`4`	`4`
`@@ -208,9 +208,9 @@ export default {`
`208`	`208`	`}`
`209`	`209`	`},`
`210`	`210`
`211`		`- getFieldID(schema) {`
	`211`	`+ getFieldID(schema,unique=false) {`
`212`	`212`	`const idPrefix = objGet(this.formOptions, "fieldIdPrefix", "");`
`213`		`- return slugifyFormID(schema, idPrefix);`
	`213`	`+ return slugifyFormID(schema, idPrefix)+(unique ? "-"+uniqueId() : "");`
`214`	`214`	`},`
`215`	`215`
`216`	`216`	`getFieldClasses() {`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`.listbox.form-control(v-if="schema.listBox", :disabled="disabled")`
`4`	`4`	`.list-row(v-for="item in items", :class="{'is-checked': isItemChecked(item)}")`
`5`	`5`	`label`
`6`		`- input(:id="getFieldID(schema)", type="checkbox", :checked="isItemChecked(item)", :disabled="disabled", @change="onChanged($event, item)", :name="getInputName(item)", v-attributes="'input'")`
	`6`	`+ input(:id="getFieldID(schema, true)", type="checkbox", :checked="isItemChecked(item)", :disabled="disabled", @change="onChanged($event, item)", :name="getInputName(item)", v-attributes="'input'")`
`7`	`7`	`\| {{ getItemName(item) }}`
`8`	`8`
`9`	`9`	`.combobox.form-control(v-if="!schema.listBox", :disabled="disabled")`
`@@ -14,7 +14,7 @@`
`14`	`14`	`.dropList`
`15`	`15`	`.list-row(v-if="comboExpanded", v-for="item in items", :class="{'is-checked': isItemChecked(item)}")`
`16`	`16`	`label`
`17`		`- input(:id="getFieldID(schema)", type="checkbox", :checked="isItemChecked(item)", :disabled="disabled", @change="onChanged($event, item)", :name="getInputName(item)", v-attributes="'input'")`
	`17`	`+ input(:id="getFieldID(schema, true)", type="checkbox", :checked="isItemChecked(item)", :disabled="disabled", @change="onChanged($event, item)", :name="getInputName(item)", v-attributes="'input'")`
`18`	`18`	`\| {{ getItemName(item) }}`
`19`	`19`	`</template>`
`20`	`20`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<template lang="pug">`
`2`	`2`	`.radio-list(:disabled="disabled", v-attributes="'wrapper'")`
`3`	`3`	`label(v-for="item in items", :class="{'is-checked': isItemChecked(item)}", v-attributes="'label'")`
`4`		`- input(:id="getFieldID(schema)", type="radio", :disabled="isItemDisabled(item)", :name="id", @click="onSelection(item)", :value="getItemValue(item)", :checked="isItemChecked(item)", :class="schema.fieldClasses", :required="schema.required", v-attributes="'input'")`
	`4`	`+ input(:id="getFieldID(schema, true)", type="radio", :disabled="isItemDisabled(item)", :name="id", @click="onSelection(item)", :value="getItemValue(item)", :checked="isItemChecked(item)", :class="schema.fieldClasses", :required="schema.required", v-attributes="'input'")`
`5`	`5`	`\| {{ getItemName(item) }}`
`6`	`6`
`7`	`7`	`</template>`

Comments

(0)