test_dev_resolveConflicts #647

Merged
jsegarra merged 40 commits from test_dev_resolveConflicts into dev 2024-08-27 07:10:20 +00:00
1 changed files with 9 additions and 6 deletions
Showing only changes of commit ecfdf0b6b9 - Show all commits
src/components/ui

View File

@ -117,14 +117,17 @@ async function search(evt) {
isLoading.value = true;
const filter = { ...userParams.value, ...$props.modelValue };
store.userParamsChanged = true;
const { params: newParams } = await arrayData.addFilter({
params: filter,
});
userParams.value = newParams;
try {
const { params: newParams } = await arrayData.addFilter({
params: filter,
});
userParams.value = newParams;
if (!$props.showAll && !Object.values(filter).length) store.data = [];
if (!$props.showAll && !Object.values(filter).length) store.data = [];
} finally {
isLoading.value = false;
}
isLoading.value = false;
emit('search');
}