fix(view): 🐛 修复系统托盘无法变化成多列表操作

HuLaSpark · Jan 6, 2025 · 36d9a03 · 36d9a03
1 parent 7aaabb2
commit 36d9a03
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/src/views/Notify.vue b/src/views/Notify.vue
@@ -33,7 +33,7 @@
       </n-flex>
     </n-scrollbar>
     <component :is="division" />
-    <p @click="handleTip" class="pt-4px pl-6px text-(12px #909090) cursor-pointer">忽略全部</p>
+    <p @click="handleTip" class="pt-4px pl-6px text-(12px #13987f) cursor-pointer">忽略全部</p>
   </n-flex>
 </template>
 <script setup lang="tsx">

diff --git a/src/views/Tray.vue b/src/views/Tray.vue
@@ -119,28 +119,31 @@ watchEffect(async () => {
   }
 })
 
+// 可以使用 watch 来观察焦点状态的变化
+watch([isFocused, () => tipVisible.value], ([newFocused, newTipVisible]) => {
+  console.log('Focus or tip state changed:', { focused: newFocused, tipVisible: newTipVisible })
+})
+
 onMounted(async () => {
   home = await WebviewWindow.getByLabel('home')
   isFocused.value = (await home?.isFocused()) || false
-  await pushListeners([
-    appWindow.listen('login_success', () => {
-      isLoginWin.value = false
-      resizeWindow('tray', 130, 356)
-    }),
-    appWindow.listen('logout_success', () => {
-      isLoginWin.value = true
-      resizeWindow('tray', 130, 44)
-    })
-  ])
+
   if (home) {
+    // 监听窗口焦点变化
+    home.listen('tauri://focus', () => {
+      isFocused.value = true
+    })
+    home.listen('tauri://blur', () => {
+      isFocused.value = false
+    })
     await pushListeners([
-      // 监听窗口焦点变化
-      home.listen('tauri://focus', () => {
-        isFocused.value = true
+      appWindow.listen('login_success', () => {
+        isLoginWin.value = false
+        resizeWindow('tray', 130, 356)
       }),
-
-      home.listen('tauri://blur', () => {
-        isFocused.value = false
+      appWindow.listen('logout_success', () => {
+        isLoginWin.value = true
+        resizeWindow('tray', 130, 44)
       }),
       appWindow.listen('show_tip', async () => {
         console.log('Received show_tip event')
@@ -150,11 +153,6 @@ onMounted(async () => {
   }
 })
 
-// 可以使用 watch 来观察焦点状态的变化
-watch([isFocused, () => tipVisible.value], ([newFocused, newTipVisible]) => {
-  console.log('Focus or tip state changed:', { focused: newFocused, tipVisible: newTipVisible })
-})
-
 onUnmounted(async () => {
   if (interval) {
     clearInterval(interval)