fix wpcfto select and repeater related visibility and validation
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
|
||||
window.validationMixin = {
|
||||
methods: {
|
||||
// --- Helpers
|
||||
@@ -24,6 +23,12 @@ window.validationMixin = {
|
||||
if (Array.isArray(a) || Array.isArray(b)) return JSON.stringify(a) === JSON.stringify(b);
|
||||
return String(a) == String(b);
|
||||
},
|
||||
_coalesceValue() {
|
||||
// Prefer prop field_value if present; otherwise fall back to instance `value`
|
||||
if (typeof this.field_value !== 'undefined') return this.field_value;
|
||||
if (typeof this.value !== 'undefined') return this.value;
|
||||
return undefined;
|
||||
},
|
||||
|
||||
// --- Visibility according to dependencies
|
||||
isVisible() {
|
||||
@@ -56,7 +61,7 @@ window.validationMixin = {
|
||||
const visible = this.isVisible();
|
||||
const required = 'required' in this.fields && this.fields.required === true;
|
||||
const type = this.fields.type || '';
|
||||
const value = this.field_value;
|
||||
const value = this._coalesceValue();
|
||||
|
||||
let filled;
|
||||
if (!required) {
|
||||
@@ -66,8 +71,18 @@ window.validationMixin = {
|
||||
filled = true;
|
||||
} else if (type === 'checkbox') {
|
||||
filled = value === 1 || value === true || value === '1' || value === 'true';
|
||||
} else if (type === 'repeater' && required) {
|
||||
filled = this.fields.value && this.fields.value.length > 0;
|
||||
} else if (type === 'repeater') {
|
||||
if (!required) {
|
||||
filled = true; // optional repeater: always valid
|
||||
} else {
|
||||
// Prefer the component's live repeater array; fallback to value/field_value
|
||||
const list = Array.isArray(this.repeater)
|
||||
? this.repeater
|
||||
: (Array.isArray(value)
|
||||
? value
|
||||
: (this.fields && Array.isArray(this.fields.value) ? this.fields.value : []));
|
||||
filled = list.length > 0;
|
||||
}
|
||||
} else if (Array.isArray(value)) {
|
||||
filled = value.length > 0;
|
||||
} else if (typeof value === 'number') {
|
||||
@@ -95,6 +110,11 @@ window.validationMixin = {
|
||||
if (typeof this.validateField === 'function') {
|
||||
this.validateField();
|
||||
}
|
||||
},
|
||||
value() {
|
||||
if (typeof this.validateField === 'function') {
|
||||
this.validateField();
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
Reference in New Issue
Block a user