diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue index 8a91d3c95..340a9e550 100644 --- a/src/components/common/VnLog.vue +++ b/src/components/common/VnLog.vue @@ -421,12 +421,13 @@ setLogTree(); >
- + diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue index 96d097191..eb0bbbe66 100644 --- a/src/components/ui/VnFilterPanel.vue +++ b/src/components/ui/VnFilterPanel.vue @@ -79,6 +79,7 @@ watch( const isLoading = ref(false); async function search() { + store.filter.where = {}; isLoading.value = true; const params = { ...userParams.value }; store.userParamsChanged = true; diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue index 4dae312ce..c00849512 100644 --- a/src/components/ui/VnPaginate.vue +++ b/src/components/ui/VnPaginate.vue @@ -95,6 +95,8 @@ const addFilter = async (filter, params) => { }; async function fetch() { + store.filter.skip = 0; + store.skip = 0; await arrayData.fetch({ append: false }); if (!store.hasMoreData) { isLoading.value = false; diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue index fc8475ace..344267ef7 100644 --- a/src/components/ui/VnSearchbar.vue +++ b/src/components/ui/VnSearchbar.vue @@ -81,8 +81,10 @@ async function search() { const staticParams = Object.entries(store.userParams).filter( ([key, value]) => value && (props.staticParams || []).includes(key) ); + // const filter =props?.where? { where: JSON.parse(props.where) }: {} await arrayData.applyFilter({ params: { + // filter , ...Object.fromEntries(staticParams), search: searchText.value, }, @@ -106,6 +108,7 @@ async function search() { let targetUrl; if (path.endsWith('/list')) targetUrl = path.replace('/list', `/${targetId}/summary`); + if (path.endsWith('-list')) targetUrl = path.replace('-list', `/${targetId}/summary`); else if (path.includes(':id')) targetUrl = path.replace(':id', targetId); await router.push({ path: targetUrl }); diff --git a/src/components/ui/VnUserLink.vue b/src/components/ui/VnUserLink.vue index 47287c12b..33836550a 100644 --- a/src/components/ui/VnUserLink.vue +++ b/src/components/ui/VnUserLink.vue @@ -1,6 +1,5 @@