From 36d9a037d4b17ef31287c7ff76a4ee9cded1fff0 Mon Sep 17 00:00:00 2001
From: Dawn <2439646234@qq.com>
Date: Mon, 6 Jan 2025 21:57:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(view):=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=89=98=E7=9B=98=E6=97=A0=E6=B3=95=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96=E6=88=90=E5=A4=9A=E5=88=97=E8=A1=A8=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Notify.vue |  2 +-
 src/views/Tray.vue   | 40 +++++++++++++++++++---------------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/views/Notify.vue b/src/views/Notify.vue
index 7169be1..737edac 100644
--- 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
index e348bca..072cc78 100644
--- 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)