From 46f8067577254844647103b81177e9ad1ba3d1d0 Mon Sep 17 00:00:00 2001
From: alger <algerkc@qq.com>
Date: Fri, 3 Jan 2025 22:24:13 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20=E5=85=B3=E9=97=AD=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E5=8F=AF=E5=AD=98=E5=82=A8=E9=85=8D=E7=BD=AE=E6=9C=80=E5=B0=8F?=
 =?UTF-8?q?=E5=8C=96=20=E8=BF=98=E6=98=AF=20=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/modules/window.ts                  |  3 +-
 src/main/set.json                           |  3 +-
 src/renderer/components.d.ts                |  1 +
 src/renderer/layout/components/TitleBar.vue | 79 +++++++++++++++++----
 src/renderer/views/set/index.vue            | 23 ++++++
 5 files changed, 92 insertions(+), 17 deletions(-)

diff --git a/src/main/modules/window.ts b/src/main/modules/window.ts
index 7d2a74d..d4fef40 100644
--- a/src/main/modules/window.ts
+++ b/src/main/modules/window.ts
@@ -1,4 +1,4 @@
-import { BrowserWindow, shell, ipcMain } from 'electron';
+import { BrowserWindow, shell, ipcMain, app } from 'electron';
 import { is } from '@electron-toolkit/utils';
 import { join } from 'path';
 
@@ -28,6 +28,7 @@ export function initializeWindowManager() {
     const win = BrowserWindow.fromWebContents(event.sender);
     if (win) {
       win.destroy();
+      app.quit();
     }
   });
 
diff --git a/src/main/set.json b/src/main/set.json
index 21ca816..0e0c6a6 100644
--- a/src/main/set.json
+++ b/src/main/set.json
@@ -4,5 +4,6 @@
   "animationSpeed": 1,
   "author": "Alger",
   "authorUrl": "https://github.com/algerkong",
-  "musicApiPort": 30488
+  "musicApiPort": 30488,
+  "closeAction": "ask"
 }
diff --git a/src/renderer/components.d.ts b/src/renderer/components.d.ts
index 30cb4cf..ed4582c 100644
--- a/src/renderer/components.d.ts
+++ b/src/renderer/components.d.ts
@@ -25,6 +25,7 @@ declare module 'vue' {
     NModal: typeof import('naive-ui')['NModal']
     NPopover: typeof import('naive-ui')['NPopover']
     NScrollbar: typeof import('naive-ui')['NScrollbar']
+    NSelect: typeof import('naive-ui')['NSelect']
     NSlider: typeof import('naive-ui')['NSlider']
     NSpin: typeof import('naive-ui')['NSpin']
     NSwitch: typeof import('naive-ui')['NSwitch']
diff --git a/src/renderer/layout/components/TitleBar.vue b/src/renderer/layout/components/TitleBar.vue
index 968b623..e2ed2a4 100644
--- a/src/renderer/layout/components/TitleBar.vue
+++ b/src/renderer/layout/components/TitleBar.vue
@@ -10,14 +10,37 @@
       </button>
     </div>
   </div>
+
+  <n-modal
+    v-model:show="showCloseModal"
+    preset="dialog"
+    title="关闭应用"
+    :style="{ width: '400px' }"
+    :mask-closable="true"
+  >
+    <div class="close-dialog-content">
+      <p>请选择关闭方式</p>
+      <div class="remember-choice">
+        <n-checkbox v-model:checked="rememberChoice">记住我的选择</n-checkbox>
+      </div>
+    </div>
+    <template #action>
+      <div class="dialog-footer">
+        <n-button type="primary" @click="handleAction('minimize')">最小化到托盘</n-button>
+        <n-button @click="handleAction('close')">退出应用</n-button>
+      </div>
+    </template>
+  </n-modal>
 </template>
 
 <script setup lang="ts">
-import { useDialog } from 'naive-ui';
-
+import { ref } from 'vue';
+import { useStore } from 'vuex';
 import { isElectron } from '@/utils';
 
-const dialog = useDialog();
+const store = useStore();
+const showCloseModal = ref(false);
+const rememberChoice = ref(false);
 
 const minimize = () => {
   if (!isElectron) {
@@ -26,22 +49,40 @@ const minimize = () => {
   window.api.minimize();
 };
 
+const handleAction = (action: 'minimize' | 'close') => {
+  if (rememberChoice.value) {
+    store.commit('setSetData', {
+      ...store.state.setData,
+      closeAction: action
+    });
+  }
+  
+  if (action === 'minimize') {
+    window.api.miniTray();
+  } else {
+    window.api.close();
+  }
+  showCloseModal.value = false;
+};
+
 const close = () => {
   if (!isElectron) {
     return;
   }
-  dialog.warning({
-    title: '提示',
-    content: '确定要退出吗？',
-    positiveText: '最小化',
-    negativeText: '关闭',
-    onPositiveClick: () => {
-      window.api.minimize();
-    },
-    onNegativeClick: () => {
-      window.api.close();
-    }
-  });
+
+  const closeAction = store.state.setData.closeAction;
+  
+  if (closeAction === 'minimize') {
+    window.api.miniTray();
+    return;
+  }
+  
+  if (closeAction === 'close') {
+    window.api.close();
+    return;
+  }
+
+  showCloseModal.value = true;
 };
 
 const drag = (event: MouseEvent) => {
@@ -68,4 +109,12 @@ const drag = (event: MouseEvent) => {
 button {
   @apply text-gray-600 dark:text-gray-400 hover:text-green-500;
 }
+
+.close-dialog-content {
+  @apply flex flex-col gap-4;
+}
+
+.dialog-footer {
+  @apply flex gap-4 justify-end;
+}
 </style>
diff --git a/src/renderer/views/set/index.vue b/src/renderer/views/set/index.vue
index aa2b341..417fe52 100644
--- a/src/renderer/views/set/index.vue
+++ b/src/renderer/views/set/index.vue
@@ -112,6 +112,23 @@
           <n-button size="small" type="primary" @click="openAuthor"><i class="ri-github-line"></i>前往github</n-button>
         </div>
       </div>
+      <div class="set-item" v-if="isElectron">
+        <div>
+          <div class="set-item-title">关闭行为</div>
+          <div class="set-item-content">
+            {{ closeActionLabels[setData.closeAction] || '每次询问' }}
+          </div>
+        </div>
+        <n-select
+          v-model:value="setData.closeAction"
+          :options="[
+            { label: '每次询问', value: 'ask' },
+            { label: '最小化到托盘', value: 'minimize' },
+            { label: '直接退出', value: 'close' }
+          ]"
+          style="width: 120px"
+        />
+      </div>
       <div class="set-item" v-if="isElectron">
         <div>
           <div class="set-item-title">重启</div>
@@ -144,6 +161,12 @@ const updateInfo = ref<UpdateResult>({
   releaseInfo: null
 });
 
+const closeActionLabels = {
+  ask: '每次询问',
+  minimize: '最小化到托盘',
+  close: '直接退出'
+} as const;
+
 const setData = computed(() => store.state.setData);
 
 watch(() => setData.value, (newVal) => {