From 91f06eb4a15b395be997d43053c658cce9f454e0 Mon Sep 17 00:00:00 2001
From: npmrun <1549469775@qq.com>
Date: Fri, 28 Feb 2025 19:27:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/commands/BasicCommand.ts           | 11 ++++-------
 src/renderer/src/App.vue                    |  3 +--
 src/renderer/src/components/NavBar.vue      | 28 ++++++++--------------------
 src/renderer/src/composables/usePlatform.ts |  2 ++
 src/renderer/src/platform/PlatForm.ts       |  8 ++++++++
 5 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/src/main/commands/BasicCommand.ts b/src/main/commands/BasicCommand.ts
index 4e6ee79..da28eab 100644
--- a/src/main/commands/BasicCommand.ts
+++ b/src/main/commands/BasicCommand.ts
@@ -20,13 +20,10 @@ export default class BasicCommand {
     }
     fullscreen() {
         const focusedWindow = this._WindowManager.getFocusWindow()
-        const isFullScreen = focusedWindow!.isFullScreen()
-        focusedWindow!.setFullScreen(!isFullScreen)
-        return !isFullScreen
-    }
-    isFullscreen() {
-        const focusedWindow = this._WindowManager.getFocusWindow()
-        return focusedWindow!.isFullScreen()
+        if (focusedWindow) {
+            const isFullScreen = focusedWindow!.isFullScreen()
+            focusedWindow!.setFullScreen(!isFullScreen)
+        }
     }
 
     relunch() {
diff --git a/src/renderer/src/App.vue b/src/renderer/src/App.vue
index e245019..9777f45 100644
--- a/src/renderer/src/App.vue
+++ b/src/renderer/src/App.vue
@@ -1,5 +1,4 @@
-<script setup lang="ts">
-</script>
+<script setup lang="ts"></script>
 
 <template>
     <div h-full flex flex-col overflow-hidden>
diff --git a/src/renderer/src/components/NavBar.vue b/src/renderer/src/components/NavBar.vue
index 57a8b20..7a8c246 100644
--- a/src/renderer/src/components/NavBar.vue
+++ b/src/renderer/src/components/NavBar.vue
@@ -27,10 +27,10 @@
                     hover:bg-gray-2
                     hover:cursor-pointer
                     text="hover:hover"
-                    @click="back"
                     title="返回上一页"
+                    @click="back"
                 >
-                    ⬅
+                    🏠
                 </div>
                 <div text-sm px-2 hover:rounded-md hover:bg-gray-2 hover:cursor-pointer text="hover:hover" @click="onClickAbout">关于</div>
             </div>
@@ -50,6 +50,8 @@ onBeforeMount(async () => {
     isFullScreen.value = await api.call("BasicCommand.isFullscreen")
 })
 
+const { PlatForm } = usePlatForm()
+
 const isHome = computed(() => {
     if (route?.meta?.home) {
         return true
@@ -58,7 +60,7 @@ const isHome = computed(() => {
 })
 
 function back() {
-    router.back()
+    router.push("/")
 }
 
 const onClickMenu = e => {
@@ -66,30 +68,16 @@ const onClickMenu = e => {
         {
             label: isFullScreen.value ? "取消全屏" : "全屏",
             async click() {
-                isFullScreen.value = await api.call("BasicCommand.fullscreen")
+                await PlatForm.toggleFullScreen()
+                isFullScreen.value = !isFullScreen.value
             },
         },
         {
             label: "切换开发者工具",
             async click() {
-                isFullScreen.value = await api.call("BasicCommand.toggleDevTools")
+                PlatForm.toggleDevTools()
             },
         },
-        // {
-        //     type: "separator",
-        // },
-        // {
-        //     label: "重载",
-        //     click() {
-        //         api.call("BasicCommand.reload")
-        //     },
-        // },
-        // {
-        //     label: "重启",
-        //     click() {
-        //         api.call("BasicCommand.relunch")
-        //     },
-        // },
     ])
     const obj = e.target.getBoundingClientRect()
     menu.show({ x: ~~obj.x, y: ~~(obj.y + obj.height) })
diff --git a/src/renderer/src/composables/usePlatform.ts b/src/renderer/src/composables/usePlatform.ts
index 592f410..b6268e0 100644
--- a/src/renderer/src/composables/usePlatform.ts
+++ b/src/renderer/src/composables/usePlatform.ts
@@ -1,7 +1,9 @@
+import { PlatForm } from "@/platform/PlatForm"
 import { Tabs } from "@/platform/Tabs"
 
 export function usePlatForm() {
     return {
         Tabs: Tabs.getInstance<Tabs>(),
+        PlatForm: PlatForm.getInstance<PlatForm>(),
     }
 }
diff --git a/src/renderer/src/platform/PlatForm.ts b/src/renderer/src/platform/PlatForm.ts
index 4d8c332..1c7e8c0 100644
--- a/src/renderer/src/platform/PlatForm.ts
+++ b/src/renderer/src/platform/PlatForm.ts
@@ -4,6 +4,14 @@ class PlatForm extends _Base {
     constructor() {
         super()
     }
+
+    toggleFullScreen() {
+        return api.call("BasicCommand.fullscreen")
+    }
+
+    toggleDevTools() {
+        return api.call("BasicCommand.toggleDevTools")
+    }
 }
 
 export { PlatForm }