wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation

This commit is contained in:
Alex Moreno 2024-06-14 11:35:53 +02:00
parent 98b13b23e4 cb87d2b419
commit 6f723af338
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/VnTable/VnFilter.vue
View File

@ -112,7 +112,7 @@ async function addFilter(value) {
if (columnFilter.value.alias) field = columnFilter.value.alias + '.' + field; if (columnFilter.value.alias) field = columnFilter.value.alias + '.' + field;
return await arrayData.addFilterWhere({ [field]: value }); return await arrayData.addFilterWhere({ [field]: value });
} }
await arrayData.addFilter({ [field]: value }); await arrayData.addFilter({ params: { [field]: value } });
} }
function alignRow() { function alignRow() {

5
src/composables/useArrayData.js
View File

@ -18,10 +18,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
const page = ref(1); const page = ref(1);
onUnmounted(() => {
destroy();
});
onMounted(() => { onMounted(() => {
setOptions(); setOptions();
store.skip = 0; store.skip = 0;
@ -222,7 +218,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
: path.replace(/:id.*/, ''); : path.replace(/:id.*/, '');
if (route.path != to) { if (route.path != to) {
destroy();
const pushUrl = { path: to }; const pushUrl = { path: to };
if (to.endsWith('/list') || to.endsWith('/')) if (to.endsWith('/list') || to.endsWith('/'))
pushUrl.query = newUrl.query; pushUrl.query = newUrl.query;