From 13e0eb281376e105216cdfe41704949f0a542169 Mon Sep 17 00:00:00 2001
From: GuoLiBin6 <glbin533@163.com>
Date: Sat, 25 Jan 2025 20:27:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=97=E8=A1=A8pin=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BF=9D=E7=95=99=E5=8E=9F=E5=88=97=E8=A1=A8=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/list.js | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/utils/list.js b/src/utils/list.js
index 21df367ad..e963522ce 100644
--- a/src/utils/list.js
+++ b/src/utils/list.js
@@ -20,6 +20,15 @@ const TAG_FILGER_KEYS = [
   'instance_tags',
 ]
 
+const mergeFilter = (params1, params2) => {
+  const filter1 = params1.filter ? (R.is(Array, params1.filter) ? params1.filter : [params1.filter]) : []
+  const filter2 = params2.filter ? (R.is(Array, params2.filter) ? params2.filter : [params2.filter]) : []
+  return {
+    ...params1,
+    filter: [...filter1, filter2],
+  }
+}
+
 const FULL_TAG_FILTER_KEYS = []
 TAG_FILGER_KEYS.map(key => FULL_TAG_FILTER_KEYS.push(`with_${key}`, `without_${key}`))
 
@@ -654,10 +663,7 @@ class CreateList {
       const p = this.genParamsCb(params)
       if (R.is(Object, p)) params = p
     }
-    params = {
-      ...params,
-      ...this.pinFilter,
-    }
+    params = mergeFilter({ ...params }, { ...this.pinFilter })
     return params
   }
 
@@ -923,18 +929,6 @@ class CreateList {
    *
    */
   savePinFilter () {
-    this.pinSavedFilters = {
-      filter: R.clone(this.filter),
-      tagFilter: R.clone(this.tagFilter),
-      tagFilter2: R.clone(this.tagFilter2),
-      tagFilter3: R.clone(this.tagFilter3),
-      projectTagFilter: R.clone(this.projectTagFilter),
-    }
-    this.filter = {}
-    this.tagFilter = {}
-    this.tagFilter2 = {}
-    this.tagFilter3 = {}
-    this.projectTagFilter = {}
     this.pinFilter = {
       filter: `${this.idKey}.in(${this.selected.map(id => `"${id}"`)})`,
     }
@@ -946,11 +940,6 @@ class CreateList {
    *
    */
   restorePinFilter () {
-    this.filter = this.pinSavedFilters.filter || {}
-    this.tagFilter = this.pinSavedFilters.tagFilter || {}
-    this.tagFilter2 = this.pinSavedFilters.tagFilter2 || {}
-    this.tagFilter3 = this.pinSavedFilters.tagFilter3 || {}
-    this.projectTagFilter = this.pinSavedFilters.projectTagFilter || {}
     this.pinFilter = {}
     this.reset(false)
     this.fetchData(0, 0)