From ec32d3488b181e39b53b85f8aa4ac30cdb6e965c Mon Sep 17 00:00:00 2001
From: ZiuChen <457353192@qq.com>
Date: Sat, 17 Sep 2022 20:51:30 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=AE=80=E5=8C=96Main=E5=86=85?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/cpns/ClipSearch.vue |  1 +
 src/views/Main.vue      | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/cpns/ClipSearch.vue b/src/cpns/ClipSearch.vue
index e4684ea..c25d1a7 100644
--- a/src/cpns/ClipSearch.vue
+++ b/src/cpns/ClipSearch.vue
@@ -29,6 +29,7 @@ const emit = defineEmits(['update:modelValue', 'onPanelHide'])
 watch(filterText, (val) => emit('update:modelValue', val))
 
 const handleFocusOut = () => {
+  // 失去焦点时 如果没有输入内容 则隐藏输入框
   if (!filterText.value) {
     emit('onPanelHide')
   }
diff --git a/src/views/Main.vue b/src/views/Main.vue
index 6b61b09..ec12496 100644
--- a/src/views/Main.vue
+++ b/src/views/Main.vue
@@ -20,7 +20,7 @@
           <span class="clip-switch-btn" v-show="isMultiple" @click="handleMultiCopyBtnClick(true)"
             >📑 粘贴</span
           >
-          <span class="clip-switch-btn" @click="handleMultiBtnClick">{{
+          <span class="clip-switch-btn" @click="isMultiple = !isMultiple">{{
             isMultiple ? '❌ 退出多选' : '👆'
           }}</span>
           <span
@@ -46,7 +46,7 @@
       :showList="showList"
       :fullData="fullData"
       :isMultiple="isMultiple"
-      :currentActiveTab="outSideActiveTab"
+      :currentActiveTab="activeTab"
       @onMultiCopyExecute="handleMultiCopyBtnClick"
       @onDataChange="toggleFullData"
       @onDataRemove="handleDataRemove"
@@ -71,10 +71,6 @@ notifyShown.value = storageNotify ? storageNotify.version < notify.version : tru
 
 const isMultiple = ref(false)
 
-const handleMultiBtnClick = () => {
-  isMultiple.value = !isMultiple.value
-}
-
 const isSearchPanelExpand = ref(false)
 
 const handleSearchBtnClick = () => {
@@ -165,8 +161,7 @@ const updateShowList = (type) => {
 
 const restoreDataBase = () => {
   // 清空数据库
-  const flag = window.confirm('确定要清空剪贴板记录吗?')
-  if (flag) {
+  if (window.confirm('确定要清空剪贴板记录吗?')) {
     window.db.emptyDataBase()
     updateShowList('all')
   }
@@ -193,17 +188,22 @@ const handleDataRemove = () => {
   updateShowList(ClipSwitchRef.value.activeTab)
 }
 
-const outSideActiveTab = ref('all')
+const activeTab = ref('all')
 
 onMounted(() => {
   // 获取挂载的导航组件 Ref
-  const activeTab = computed(() => ClipSwitchRef.value.activeTab)
   const toggleNav = ClipSwitchRef.value.toggleNav
   const tabs = ClipSwitchRef.value.tabs
 
-  watch(activeTab, (val) => (outSideActiveTab.value = val))
+  watch(
+    () => ClipSwitchRef.value.activeTab,
+    (newVal) => {
+      activeTab.value = newVal
+      updateShowList(newVal)
+    }
+  )
 
-  // 已选择的条数
+  // 多选已选择的条数
   selectCount.value = computed(() => ClipItemListRef.value?.selectItemList?.length)
 
   // 初始化数据
@@ -278,7 +278,7 @@ onMounted(() => {
         e.stopPropagation()
       } else if (isMultiple.value) {
         // 退出多选状态
-        handleMultiBtnClick()
+        isMultiple.value = !isMultiple.value
       } else {
         // 无上述情况 执行默认: 隐藏uTools主窗口
       }
@@ -286,7 +286,7 @@ onMounted(() => {
       // Shift: 多选操作
       if (!isSearchPanelExpand.value) {
         if (!isMultiple.value) {
-          handleMultiBtnClick()
+          isMultiple.value = !isMultiple.value
         }
       }
     } else if (isArrow || isEnter) {