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

fix(VnFilterPanel): emit userParams better #607

Merged
alexm merged 4 commits from warmFix_vnFilterPanel_setUserParams into dev 2024-08-09 10:38:02 +00:00
Conversation 0 Commits 4 Files Changed 2 +13 -7
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 43ca7e1667 - Show all commits

1
src/components/VnTable/VnOrder.vue
View File

@ -41,6 +41,7 @@ async function orderBy(name, direction) {
break; break;
} }
if (!direction) return await arrayData.deleteOrder(name); if (!direction) return await arrayData.deleteOrder(name);
console.log('name, direction: ', name, direction);
await arrayData.addOrder(name, direction); await arrayData.addOrder(name, direction);
} }

4
src/components/VnTable/VnTable.vue
View File

@ -154,7 +154,7 @@ watch(
const isTableMode = computed(() => mode.value == TABLE_MODE); const isTableMode = computed(() => mode.value == TABLE_MODE);
function setUserParams(watchedParams) { function setUserParams(watchedParams, watchedOrder) {
if (!watchedParams) return; if (!watchedParams) return;
if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams); if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
@ -163,7 +163,7 @@ function setUserParams(watchedParams) {
? JSON.parse(watchedParams?.filter) ? JSON.parse(watchedParams?.filter)
: watchedParams?.filter; : watchedParams?.filter;
const where = filter?.where; const where = filter?.where;
const order = filter?.order; const order = watchedOrder ?? filter?.order;
watchedParams = { ...watchedParams, ...where }; watchedParams = { ...watchedParams, ...where };
delete watchedParams.filter; delete watchedParams.filter;

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

@ -82,23 +82,28 @@ onMounted(() => {
}); });
function setUserParams(watchedParams) { function setUserParams(watchedParams) {
if (!watchedParams) return; if (!watchedParams || Object.keys(watchedParams).length == 0) return;
jorgep marked this conversation as resolved
alexm commented 2024-08-09 09:42:03 +00:00
Review
Copy Link

Hay casos que es objeto vacío y no queremos emitirlo

Hay casos que es objeto vacío y no queremos emitirlo
👍 1
if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams); if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
if (typeof watchedParams?.filter == 'string')
watchedParams.filter = JSON.parse(watchedParams.filter);
watchedParams = { ...watchedParams, ...watchedParams.filter?.where }; watchedParams = { ...watchedParams, ...watchedParams.filter?.where };
const order = watchedParams.filter?.order;
delete watchedParams.filter; delete watchedParams.filter;
userParams.value = { ...userParams.value, ...watchedParams }; userParams.value = { ...userParams.value, ...sanitizer(watchedParams) };
emit('setUserParams', userParams.value); emit('setUserParams', userParams.value, order);
jorgep marked this conversation as resolved
alexm commented 2024-08-09 09:42:36 +00:00
Review
Copy Link

Si no emite el order, cuando se actualiza la url quita los ordenes del VnTable

Si no emite el order, cuando se actualiza la url quita los ordenes del VnTable
👍 1
} }
watch( watch(
alexm marked this conversation as resolved
jorgep commented 2024-08-09 09:54:12 +00:00
Review
Copy Link

Puedes crear un watch para observar route.query[$props.searchUrl] y arrayData.store.userParams

Tipo esto:
watch( () => [route.query[$props.searchUrl], arrayData.store.userParams], ([newSearchUrl, newUserParams], [oldSearchUrl, oldUserParams]) => { if (newSearchUrl || oldSearchUrl) { setUserParams(newSearchUrl); } if (newUserParams || oldUserParams) { setUserParams(newUserParams); } } );

Puedes crear un watch para observar **route.query[$props.searchUrl]** y **arrayData.store.userParams** Tipo esto: `watch( () => [route.query[$props.searchUrl], arrayData.store.userParams], ([newSearchUrl, newUserParams], [oldSearchUrl, oldUserParams]) => { if (newSearchUrl || oldSearchUrl) { setUserParams(newSearchUrl); } if (newUserParams || oldUserParams) { setUserParams(newUserParams); } } );`
() => route.query[$props.searchUrl], () => route.query[$props.searchUrl],
(val) => setUserParams(val) (val, oldValue) => (val || oldValue) && setUserParams(val)
); );
watch( watch(
() => arrayData.store.userParams, () => arrayData.store.userParams,
(val) => setUserParams(val) (val, oldValue) => (val || oldValue) && setUserParams(val)
); );
watch( watch(