diff --git a/src/views/final/aside/Aside.vue b/src/views/final/aside/Aside.vue index 9e3ed29..3d3778c 100644 --- a/src/views/final/aside/Aside.vue +++ b/src/views/final/aside/Aside.vue @@ -134,16 +134,8 @@ function scrollHandler(key: string) { element?.scrollIntoView(true) } -// 设置过滤配置的值(匹配的设置,不匹配的重置为默认值) -function filterHandler(filterList: Filter[]) { - const filerMap: Record = {} - - for (const filter of filterList) { - const { key, value } = filter - filerMap[key] = value - } - - emitter.emit('filter-final', filerMap) +function filterHandler(searchId: string) { + emitter.emit('filter-final', searchId) } function editFilter(filter: any) { diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue index c6326fd..77efc19 100644 --- a/src/views/final/content/Content.vue +++ b/src/views/final/content/Content.vue @@ -130,15 +130,14 @@ const pagination = reactive({ }) const tableData = ref>([]) const selectionIds = ref([]) -const userStore = useUser() const dialog = useDialog() const message = useMessage() const finalStore = useFinal() -async function query(page: number, pageSize: number, filterValues?: any) { +async function query(page: number, pageSize: number, filterId?: any) { const asideParmas = unref(finalStore.getAsideValue) // 有过滤配置的时候优先使用过滤配置,不要使用左侧参数 - const params = filterValues || asideParmas + const params = filterId ? { userSearchId: filterId } : asideParmas const result = await getFinalList({ sortorder: 'asc', pageSize, currPage: page, sortname: '', ...params }) const { data, pageCount } = result tableData.value = data @@ -404,9 +403,9 @@ function reset() { pagination.pageSize = 1 } -async function refreshHandler(filterValues?: any) { +async function refreshHandler(searchId?: any) { reset() - query(pagination.page, pagination.pageSize, filterValues) + query(pagination.page, pagination.pageSize, searchId) } diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue index 1a008f2..7445876 100644 --- a/src/views/home/aside/Aside.vue +++ b/src/views/home/aside/Aside.vue @@ -133,15 +133,8 @@ function scrollHandler(key: string) { } // 选择某个过滤配置,刷新图片墙 -function filterHandler(filterList: Filter[]) { - const filerMap: Record = {} - - for (const filter of filterList) { - const { key, value } = filter - filerMap[key] = value - } - - emitter.emit('filter', filerMap) +function filterHandler(searchId: string) { + emitter.emit('filter', searchId) } function editFilter(filter: any) { diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue index df6193c..9388c82 100644 --- a/src/views/home/aside/comp/AdvanceFilter.vue +++ b/src/views/home/aside/comp/AdvanceFilter.vue @@ -46,6 +46,7 @@ function generateDefaultConfig(): FilterEntity[] { if (isDefaultFilter === true) { const config = { + id: '', name: label, favorite: false, isDefaultFilter,