根据设置选择退出应用程序或最小化到系统托盘

Author: Silwings-git

components.d.ts

@@ -12,6 +12,8 @@ declare module 'vue' {
     ElInput: typeof import('element-plus/es')['ElInput']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
+    ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
   }

src-tauri/Cargo.toml

@@ -37,4 +37,4 @@ sqlx = { version = "0.5", features = ["runtime-tokio-rustls", "sqlite"] }
 tokio = { version = "1.43.0", features = ["full"] }
 rand = "0.8.5"
 lazy_static = "1.5.0"
-itertools = "0.14.0"
+itertools = "0.14.0"

src-tauri/src/api/setting_api.rs

@@ -36,9 +36,9 @@ pub async fn save_setting(
 #[tauri::command]
 pub async fn read_setting(
     db: State<'_, DatabaseManager>,
-    key: String,
+    key: &str,
 ) -> Result<Option<Settings>, OneClickLaunchError> {
-    let setting = settings::read(&db.pool, &key).await?;
+    let setting = settings::read(&db.pool, key).await?;
     Ok(setting)
 }
 

src-tauri/src/constants.rs

@@ -5,6 +5,8 @@ lazy_static! {
 }
 
 pub static APPLICATION_NAME: &str = "一键启动";
-pub static THEME: &str = "theme";
+pub static THEME_KEY: &str = "theme";
+pub static CLOSE_MAIN_PANEL_KEY: &str = "close_main_panel";
+pub static CLOSE_MAIN_PANEL_EXIT: &str = "m2";
 pub static WINDOW_MIN_WIDTH: u32 = 800;
 pub static WINDOW_MIN_HEIGHT: u32 = 600;

src-tauri/src/db/settings.rs

@@ -46,6 +46,7 @@ where
         .bind(key)
         .fetch_optional(executor)
         .await?;
+    println!("s :{:?}", settings);
     Ok(settings)
 }
 

src-tauri/src/events/system_listeners.rs

@@ -5,7 +5,7 @@ use crate::{
     DatabaseManager,
     api::{launcher_api, window_api},
     check_launch_then_exit,
-    constants::{AUTO_START_FLAG, THEME},
+    constants::{AUTO_START_FLAG, THEME_KEY},
     db::{launcher_resource, settings},
     events::EventDispatcher,
 };
@@ -164,7 +164,7 @@ fn hide_window(app: &AppHandle, payload: &LauncherLaunchedPayload) {
 
 /// 隐藏窗口: 启动器启动隐藏窗口
 fn change_theme(app: &AppHandle, payload: &SettingUpdatedPayload) {
-    if THEME == payload.key {
+    if THEME_KEY == payload.key {
         match window_api::change_windows_theme(app, &payload.value) {
             Ok(_) => {
                 debug!("修改主题成功,新主题: {}", payload.value)

src-tauri/src/lib.rs

@@ -262,6 +262,19 @@ fn handle_window_event(window: &tauri::Window, event: &tauri::WindowEvent) {
         tauri::WindowEvent::CloseRequested { api, .. } => {
             api.prevent_close();
             let _ = window.hide();
+
+            let app_handle = window.app_handle().clone();
+            tauri::async_runtime::spawn(async move {
+                let db = app_handle.state::<DatabaseManager>();
+                let setting = setting_api::read_setting(db, constants::CLOSE_MAIN_PANEL_KEY).await;
+
+                match setting {
+                    Ok(Some(setting)) if constants::CLOSE_MAIN_PANEL_EXIT == setting.value => {
+                        app_handle.exit(0);
+                    }
+                    _ => {}
+                }
+            });
         }
         tauri::WindowEvent::ScaleFactorChanged {
             scale_factor,
@@ -298,19 +311,17 @@ fn handle_window_event(window: &tauri::Window, event: &tauri::WindowEvent) {
                 }
             }
         }
-        tauri::WindowEvent::DragDrop(drag_drop_event) => {
-            match drag_drop_event {
-                DragDropEvent::Drop { paths, .. } if !paths.is_empty() => {
-                    let _ = EventDispatcher::<DragDropResource>::send_event(
-                        window.app_handle(),
-                        DragDropResourcePaylod {
-                            paths: paths.clone(),
-                        },
-                    );
-                }
-                _ => {}
+        tauri::WindowEvent::DragDrop(drag_drop_event) => match drag_drop_event {
+            DragDropEvent::Drop { paths, .. } if !paths.is_empty() => {
+                let _ = EventDispatcher::<DragDropResource>::send_event(
+                    window.app_handle(),
+                    DragDropResourcePaylod {
+                        paths: paths.clone(),
+                    },
+                );
             }
-        }
+            _ => {}
+        },
         tauri::WindowEvent::Resized(physical_size) => {
             if physical_size.width == 0 && physical_size.height == 0 {
                 // 页面最小化时忽略

src/settings.vue

@@ -7,11 +7,14 @@
             <input type="checkbox" v-model="autoLaunch" @change="toggleAutoLaunch" />
         </div>
 
-        <div class="m-4" style="display: flex; justify-content: space-between;align-items: center;">
-            <p style="margin-right: 10px;">主题</p>
-            <el-select append-to=".home" v-model="theme" @change="changeTheme" placeholder="Select" style="width: 240px">
-                <el-option v-for="item in themes" :key="item.id" :label="item.value" :value="item.id" />
-            </el-select>
+        <div class="m-4" style="display: flex;justify-content: space-between; align-items: center;">
+            <div style="display: flex;align-items: center;">
+                <p style="margin-right: 10px;">启动编组后退出</p>
+                <el-tooltip content="在启动某个编组后退出应用程序" placement="top">
+                    <Help theme="outline" size="15" fill="#333" />
+                </el-tooltip>
+            </div>
+            <input type="checkbox" v-model="launchThenExit" @change="toggleLaunchThenExit" />
         </div>
 
         <div class="m-4" style="display: flex; justify-content: space-between;align-items: center;">
@@ -21,25 +24,35 @@
                     <Help theme="outline" size="15" fill="#333" />
                 </el-tooltip>
             </div>
-            <el-select  append-to=".home" v-model="autoStartLauncherIds" @change="saveAutoStartLauncher" style="width: 240px;" multiple
-                collapse-tags collapse-tags-tooltip placeholder="Select">
+            <el-select append-to=".home" v-model="autoStartLauncherIds" @change="saveAutoStartLauncher"
+                style="width: 240px;" multiple collapse-tags collapse-tags-tooltip placeholder="Select">
                 <el-option v-for="item in launchers" :key="item.id" :label="item.name" :value="item.id">
                 </el-option>
             </el-select>
         </div>
 
+        <div class="m-4" style="display: flex; justify-content: space-between;align-items: center;">
+            <p style="margin-right: 10px;">主题</p>
+            <el-select append-to=".home" v-model="theme" @change="changeTheme" placeholder="Select"
+                style="width: 240px">
+                <el-option v-for="item in themes" :key="item.id" :label="item.value" :value="item.id" />
+            </el-select>
+        </div>
+
         <div class="m-4" style="display: flex;justify-content: space-between; align-items: center;">
             <div style="display: flex;align-items: center;">
-                <p style="margin-right: 10px;">启动编组后退出</p>
-                <el-tooltip content="在启动某个编组后退出应用程序" placement="top">
-                    <Help theme="outline" size="15" fill="#333" />
-                </el-tooltip>
+                <p style="margin-right: 10px;">关闭主面板</p>
+            </div>
+            <div class="my-2 ml-4">
+                <el-radio-group v-model="closeMainPanel" @change="saveCloseMainPanel">
+                    <el-radio value="m1">最小化到系统托盘</el-radio>
+                    <el-radio value="m2">退出一键启动</el-radio>
+                </el-radio-group>
             </div>
-            <input type="checkbox" v-model="launchThenExit" @change="toggleLaunchThenExit" />
         </div>
 
         <!-- 按钮 -->
-        <button>刷新</button>
+        <button @click="loadCloseMainPanel">刷新</button>
 
     </div>
 </template>
@@ -62,6 +75,7 @@ export default {
         const autoStartLauncherIds = ref([]);
         const launchThenExit = ref(false);
         const themes = ref([{ "id": "light", "value": "浅色主题" }, { "id": "dark", "value": "深色主题" }]);
+        const closeMainPanel = ref();
 
         // 从后端加载主题
         const loadTheme = async () => {
@@ -130,6 +144,19 @@ export default {
             launchThenExit.value = kv == null || kv.value === "true";
         };
 
+        const loadCloseMainPanel = async () => {
+            const kv = await invoke("read_setting", { key: "close_main_panel" });
+            if (null == kv?.value) {
+                closeMainPanel.value = "m1";
+            } else {
+                closeMainPanel.value = kv.value;
+            }
+        };
+
+        const saveCloseMainPanel = async () => {
+            await invoke("save_setting", { key: "close_main_panel", value: closeMainPanel.value });
+        };
+
         const toggleLaunchThenExit = async () => {
             await invoke("save_setting", { key: "launch_then_exit", value: launchThenExit.value ? "true" : "false" });
         };
@@ -140,6 +167,7 @@ export default {
             fetchAutoLaunchStatus();
             refreshAutoStartLaunchers();
             loadLaunchThenExit();
+            loadCloseMainPanel();
         });
 
         return {
@@ -152,7 +180,10 @@ export default {
             changeTheme,
             toggleAutoLaunch,
             launchThenExit,
-            toggleLaunchThenExit
+            toggleLaunchThenExit,
+            closeMainPanel,
+            saveCloseMainPanel,
+            loadCloseMainPanel
         };
     }
 };
@@ -188,8 +219,9 @@ label {
 
 button {
     padding: 10px 20px;
-    background-color: #409eff;;
-    border-color: #409eff; 
+    background-color: #409eff;
+    ;
+    border-color: #409eff;
     color: white;
     border: none;
     border-radius: 5px;