From eec99c21e7513b210c61077e375b46bc59173f63 Mon Sep 17 00:00:00 2001
From: elseif <else.switch@gmail.com>
Date: Mon, 18 Mar 2024 14:08:40 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/aside/Aside.vue             | 12 ++----------
 src/views/final/content/Content.vue         |  9 ++++-----
 src/views/home/aside/Aside.vue              | 11 ++---------
 src/views/home/aside/comp/AdvanceFilter.vue |  1 +
 4 files changed, 9 insertions(+), 24 deletions(-)

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<string, any> = {}
-
-  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<Array<RowData>>([])
 const selectionIds = ref<DataTableRowKey[]>([])
-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)
 }
 </script>
 
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<string, any> = {}
-
-  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,