verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 107 Releases Wiki Activity

test_dev_resolveConflicts #647

Merged
jsegarra merged 40 commits from test_dev_resolveConflicts into dev 2024-08-27 07:10:20 +00:00
Conversation 0 Commits 40 Files Changed 20 +9 -6
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ecfdf0b6b9 - Show all commits

15
src/components/ui/VnFilterPanel.vue
View File

@ -117,14 +117,17 @@ async function search(evt) {
isLoading.value = true; isLoading.value = true;
const filter = { ...userParams.value, ...$props.modelValue }; const filter = { ...userParams.value, ...$props.modelValue };
store.userParamsChanged = true; store.userParamsChanged = true;
const { params: newParams } = await arrayData.addFilter({ try {
params: filter, const { params: newParams } = await arrayData.addFilter({
}); params: filter,
userParams.value = newParams; });
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'); emit('search');
} }