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

Merge pull request 'fix: refs #6943 rollback' (!1420) from 6943-fixVnCardConflicts into dev
gitea/salix-front/pipeline/head This commit looks good Details 

Reviewed-on: #1420
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Alex Moreno 2025-02-18 09:34:18 +00:00
parent a7a592505b a766ba1633
commit ee582b52b4
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/components/common/VnCardBeta.vue
View File

@ -38,23 +38,17 @@ onBeforeMount(async () => {
} }
}); });
if (props.baseUrl) { onBeforeRouteUpdate(async (to, from) => {
onBeforeRouteUpdate(async (to, from) => { const id = to.params.id;
if (hasRouteParam(to.params)) { if (id !== from.params.id) await fetch(id, true);
const { matched } = router.currentRoute.value; });
const { name } = matched.at(-3);
if (name) { async function fetch(id, append = false) {
router.push({ name, params: to.params }); const regex = /\/(\d+)/;
} if (props.idInWhere) arrayData.store.filter.where = { id };
} else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`;
if (to.params.id !== from.params.id) { else arrayData.store.url = props.url.replace(regex, `/${id}`);
arrayData.store.url = `${props.baseUrl}/${to.params.id}`; await arrayData.fetch({ append, updateRouter: false });
await arrayData.fetch({ append: false, updateRouter: false });
}
});
}
function hasRouteParam(params, valueToCheck = ':addressId') {
return Object.values(params).includes(valueToCheck);
} }
</script> </script>
<template> <template>