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

7983-testToMaster_2438 #718

Merged
alexm merged 353 commits from 7983-testToMaster_2438 into master 2024-09-17 05:39:39 +00:00
Conversation 0 Commits 353 Files Changed 153 +22 -19
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5d2df03223 - Show all commits

20
src/components/ui/VnPaginate.vue
View File

@ -94,25 +94,7 @@ watch(
);
watch(
() => route.params.id,
() => {
if (route.path === props.url) return;
//Así fuerzo al reinicio
store.data = null;
if (!arrayData.store?.filter?.where) {
//Cuando el cambio viene por VnSearchbar
if (route.params.id) store.url = store.url.replace(/(\d+)/, route.params.id);
} else {
// Cuando el usuario cambia en la URL
const keyFk = Object.keys(arrayData.store.filter.where).find((key) =>
key.endsWith('Fk')
);
if (keyFk) {
arrayData.store.filter.where[keyFk] = route.params.id;
}
}
fetch();
}
() => arrayData.reloadRoute()
);
async function fetch() {
await arrayData.fetch({ append: false });

21
src/composables/useArrayData.js
View File

@ -34,6 +34,26 @@ export function useArrayData(key, userOptions) {
setOptions();
}
function reloadRoute() {
if (route.path === store.url) return;
//Así fuerzo al reinicio
store.data = null;
if (!store?.filter?.where) {
//Cuando el cambio viene por VnSearchbar
if (route.params.id) store.url = store.url.replace(/(\d+)/, route.params.id);
} else {
// Cuando el usuario cambia en la URL
const keyFk = Object.keys(store.filter.where).find((key) =>
key.endsWith('Fk')
);
if (keyFk) {
store.filter.where[keyFk] = route.params.id;
}
}
fetch({ append: false });
}
function setOptions() {
const allowedOptions = [
'url',
@ -210,5 +230,6 @@ export function useArrayData(key, userOptions) {
totalRows,
updateStateParams,
isLoading,
reloadRoute,
};
}