#7864 - 7864_testToMaster_2434 #629

Merged
jsegarra merged 159 commits from 7864_testToMaster_2434 into master 2024-08-20 06:33:17 +00:00
1 changed files with 5 additions and 7 deletions
Showing only changes of commit 02cfa54a40 - Show all commits

View File

@ -97,13 +97,11 @@ function setUserParams(watchedParams) {
}
watch(
() => route.query[$props.searchUrl],
(val, oldValue) => (val || oldValue) && setUserParams(val)
);
watch(
() => arrayData.store.userParams,
(val, oldValue) => (val || oldValue) && setUserParams(val)
() => [route.query[$props.searchUrl], arrayData.store.userParams],
([newSearchUrl, newUserParams], [oldSearchUrl, oldUserParams]) => {
if (newSearchUrl || oldSearchUrl) setUserParams(newSearchUrl);
if (newUserParams || oldUserParams) setUserParams(newUserParams);
}
);
watch(