adminforth 1.7.0-next.17 → 1.7.0-next.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -129,11 +129,11 @@
|
|
|
129
129
|
arrayItemRefs.value[arrayItemRefs.value.length - 1].focus();
|
|
130
130
|
}
|
|
131
131
|
|
|
132
|
-
watch(customComponentsInValidity, (newVal) => {
|
|
132
|
+
watch(customComponentsInValidity.value, (newVal) => {
|
|
133
133
|
emit('update:customComponentsInValidity', newVal);
|
|
134
134
|
});
|
|
135
135
|
|
|
136
|
-
watch(customComponentsEmptiness, (newVal) => {
|
|
136
|
+
watch(customComponentsEmptiness.value, (newVal) => {
|
|
137
137
|
emit('update:customComponentsEmptiness', newVal);
|
|
138
138
|
});
|
|
139
139
|
|
|
@@ -95,16 +95,16 @@ const columnError = (column) => {
|
|
|
95
95
|
if (!currentValues.value) {
|
|
96
96
|
return null;
|
|
97
97
|
}
|
|
98
|
-
if (customComponentsInValidity.value[column.name]) {
|
|
99
|
-
return customComponentsInValidity.value[column.name];
|
|
98
|
+
if (customComponentsInValidity.value?.value?.[column.name]) {
|
|
99
|
+
return customComponentsInValidity.value?.value?.[column.name];
|
|
100
100
|
}
|
|
101
|
-
|
|
101
|
+
|
|
102
102
|
if (
|
|
103
103
|
column.required[mode.value] &&
|
|
104
104
|
(currentValues.value[column.name] === undefined || currentValues.value[column.name] === null || currentValues.value[column.name] === '' || (column.isArray?.enabled && !currentValues.value[column.name].length)) &&
|
|
105
105
|
// if component is custum it might tell other criteria for emptiness by emitting 'update:emptiness'
|
|
106
106
|
// components which do not emit 'update:emptiness' will have undefined value in customComponentsEmptiness
|
|
107
|
-
(customComponentsEmptiness.value[column.name] !== false)
|
|
107
|
+
(customComponentsEmptiness.value?.value?.[column.name] !== false)
|
|
108
108
|
|
|
109
109
|
) {
|
|
110
110
|
return t('This field is required');
|
|
@@ -130,6 +130,7 @@ const columnError = (column) => {
|
|
|
130
130
|
return validateValue(column.type, currentValues.value[column.name], column);
|
|
131
131
|
}
|
|
132
132
|
|
|
133
|
+
return null;
|
|
133
134
|
});
|
|
134
135
|
return val.value;
|
|
135
136
|
};
|