Skip to content

Commit 73921d4

Browse files
authored
Merge pull request #446 from zoul0813/feature/429-validation-error-success-class
resolves #429 - validationErrorClass and validationSuccessClass work independently of each other
2 parents 73a08c1 + 43dcd34 commit 73921d4

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

src/formGenerator.vue

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -168,28 +168,17 @@ div.vue-form-generator(v-if='schema != null')
168168
getFieldRowClasses(field) {
169169
const hasErrors = this.fieldErrors(field).length > 0;
170170
let baseClasses = {
171-
error: hasErrors,
171+
[objGet(this.options, "validationErrorClass", "error")]: hasErrors,
172+
[objGet(this.options, "validationSuccessClass", "valid")]: !hasErrors,
172173
disabled: this.fieldDisabled(field),
173174
readonly: this.fieldReadonly(field),
174175
featured: this.fieldFeatured(field),
175176
required: this.fieldRequired(field)
176177
};
177178
178-
let {validationErrorClass, validationSuccessClass} = this.options;
179-
if (validationErrorClass && validationSuccessClass) {
180-
if (hasErrors) {
181-
baseClasses[validationErrorClass] = true;
182-
baseClasses.error = false;
183-
}
184-
else {
185-
baseClasses[validationSuccessClass] = true;
186-
}
187-
}
188-
189179
if (isArray(field.styleClasses)) {
190180
forEach(field.styleClasses, (c) => baseClasses[c] = true);
191-
}
192-
else if (isString(field.styleClasses)) {
181+
} else if (isString(field.styleClasses)) {
193182
baseClasses[field.styleClasses] = true;
194183
}
195184

0 commit comments

Comments
 (0)