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

fix(VnSearchbar): hotFix rollback
gitea/salix-front/pipeline/head This commit looks good Details

This commit is contained in:
Alex Moreno 2024-12-11 15:01:28 +01:00
parent 36c447772f
commit 9e8c967567
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/components/ui/VnSearchbar.vue
View File

@ -98,25 +98,20 @@ onMounted(() => {
async function search() { async function search() {
const staticParams = Object.entries(store.userParams); const staticParams = Object.entries(store.userParams);
arrayData.reset(['skip', 'page']); arrayData.reset(['skip', 'page']);
let filter = {
const filter = {
params: { params: {
...Object.fromEntries(staticParams),
search: searchText.value, search: searchText.value,
}, },
...{ filter: props.filter },
}; };
if (!searchText.value) {
filter = {
params: {
...Object.fromEntries(staticParams),
},
...{ filter: props.filter },
};
if (props.whereFilter) { if (props.whereFilter) {
filter.filter = { filter.filter = {
where: props.whereFilter(searchText.value), where: props.whereFilter(searchText.value),
}; };
delete filter.params.search; delete filter.params.search;
}
} }
await arrayData.applyFilter(filter); await arrayData.applyFilter(filter);
} }