From 7893bbea4878e4efda243aa2bf32bb67cce1af8b Mon Sep 17 00:00:00 2001
From: ZiuChen <457353192@qq.com>
Date: Sat, 24 Sep 2022 17:14:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E6=9F=90=E6=9D=A1?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E6=97=B6=E4=B8=8D=E5=86=8D?=
 =?UTF-8?q?=E5=9B=9E=E5=88=B0=E9=A1=B6=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/cpns/ClipSwitch.vue |  7 +------
 src/views/Main.vue      | 13 ++++---------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/cpns/ClipSwitch.vue b/src/cpns/ClipSwitch.vue
index 9e38a94..a5882f9 100644
--- a/src/cpns/ClipSwitch.vue
+++ b/src/cpns/ClipSwitch.vue
@@ -4,7 +4,7 @@
       <template v-for="tab of tabs">
         <div
           :class="{ 'clip-switch-item': true, active: activeTab === tab.type }"
-          @click="onNavClick(tab.type)"
+          @click="toggleNav(tab.type)"
         >
           <component :is="tab.icon"></component>
           {{ tab.name }}
@@ -27,12 +27,7 @@ const tabs = [
   { name: '收藏', type: 'collect', icon: Collection }
 ]
 const activeTab = ref('all')
-const emit = defineEmits(['onNavClick'])
 const toggleNav = (type) => (activeTab.value = type)
-const onNavClick = (type) => {
-  toggleNav(type)
-  emit('onNavClick', type)
-}
 defineExpose({
   tabs,
   activeTab,
diff --git a/src/views/Main.vue b/src/views/Main.vue
index a809755..ac881e3 100644
--- a/src/views/Main.vue
+++ b/src/views/Main.vue
@@ -7,7 +7,7 @@
       @onDataRemove="handleDataRemove"
       @onOverlayClick="toggleFullData({ type: 'text', data: '' })"
     ></ClipFullData>
-    <ClipSwitch ref="ClipSwitchRef" @onNavClick="handleNavClick">
+    <ClipSwitch ref="ClipSwitchRef">
       <template #SidePanel>
         <div class="clip-switch-btn-list" v-show="!isSearchPanelExpand">
           <span class="clip-switch-btn clip-select-count" v-show="isMultiple">
@@ -153,7 +153,7 @@ const textFilterCallBack = (item) => {
   }
 }
 
-const updateShowList = (type) => {
+const updateShowList = (type, toTop = true) => {
   // 更新显示列表
   showList.value = list.value
     .filter((item) =>
@@ -162,7 +162,7 @@ const updateShowList = (type) => {
     .filter((item) => (filterText.value ? item.type !== 'image' : item)) // 有过滤词 排除掉图片 DataURL
     .filter((item) => textFilterCallBack(item))
     .slice(0, GAP) // 重新切分懒加载列表
-  window.toTop()
+  toTop && window.toTop()
 }
 
 const restoreDataBase = () => {
@@ -179,11 +179,6 @@ const restoreDataBase = () => {
     .catch(() => {})
 }
 
-const handleNavClick = (type) => {
-  updateShowList(type)
-  offset.value = 0 // 重置懒加载偏移量
-}
-
 const fullData = ref({ type: 'text', data: '' })
 const fullDataShow = ref(false)
 const toggleFullData = (item) => {
@@ -197,7 +192,7 @@ const ClipSwitchRef = ref()
 const handleDataRemove = () => {
   // 此函数须在挂载后执行
   list.value = window.db.dataBase.data
-  updateShowList(ClipSwitchRef.value.activeTab)
+  updateShowList(ClipSwitchRef.value.activeTab, false)
 }
 
 const emit = defineEmits(['showSetting'])