From 1b0aa578c5a3b252854fc8d75cb727fc5079dd42 Mon Sep 17 00:00:00 2001
From: ZiuChen <457353192@qq.com>
Date: Wed, 17 Aug 2022 20:43:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20#3=20=E6=94=B9=E5=96=84=E4=BA=86?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=A3=80=E7=B4=A2=E7=AE=97=E6=B3=95=20?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=97=B6=E4=B8=8D=E5=86=8D=E5=8C=BA=E5=88=86?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/preload.js  |  6 ------
 src/views/Main.vue | 34 ++++++++++------------------------
 2 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/public/preload.js b/public/preload.js
index bdaaf9a..d79bbde 100644
--- a/public/preload.js
+++ b/public/preload.js
@@ -88,12 +88,6 @@ class DB {
     this.updateDataBase()
     this.updateDataBaseLocal()
   }
-  filterDataBaseViaData(key) {
-    // 过滤展示数据
-    const filterValue = key.toLowerCase()
-    const textItems = this.dataBase.data.filter((item) => item.type === 'text')
-    return textItems.filter((item) => item.data.toLowerCase().indexOf(filterValue) !== -1)
-  }
   filterDataBaseViaId(id) {
     return this.dataBase.data.filter((item) => item.id === id)
   }
diff --git a/src/views/Main.vue b/src/views/Main.vue
index a0eb788..f7a6933 100644
--- a/src/views/Main.vue
+++ b/src/views/Main.vue
@@ -32,30 +32,16 @@ const showList = ref([]) // 展示的数据
 
 const updateShowList = (type) => {
   // 更新显示列表
-  if (type === 'all') {
-    if (filterText.value) {
-      // 有过滤词 则过滤掉图片
-      showList.value = list.value
-        .filter((item) => item.type !== 'image')
-        .filter((item) => item.data.indexOf(filterText.value) !== -1)
-        .slice(0, GAP)
-    } else {
-      // 无过滤词 直接更新
-      showList.value = list.value
-        .filter((item) => item.data.indexOf(filterText.value) !== -1)
-        .slice(0, GAP)
-    }
-  } else if (type === 'image') {
-    // 排除掉对图片 DataURL的筛选
-    showList.value = list.value.filter((item) => item.type === type).slice(0, GAP)
-  } else {
-    // `file`类型 在stringify的data里搜
-    // `text`类型 在data里搜
-    showList.value = list.value
-      .filter((item) => item.type === type)
-      .filter((item) => item.data.indexOf(filterText.value) !== -1)
-      .slice(0, GAP)
-  }
+  showList.value = list.value
+    .filter((item) => (type === 'all' ? item : item.type === type)) // 是 all则返回所有 否则按照 type返回
+    .filter((item) => (filterText.value ? item.type !== 'image' : item)) // 有过滤词 排除掉图片 DataURL
+    .filter(
+      (item) =>
+        filterText.value
+          ? item.data.toLowerCase().indexOf(filterText.value.toLowerCase()) !== -1 // 有过滤词 不区分大小写检索
+          : item // 无过滤词 返回全部
+    )
+    .slice(0, GAP) // 重新切分懒加载列表
   window.toTop()
 }