支持开机启动后最小化

Silwings-git · Silwings-git · commit 21775bc5498f · 2025-03-09T15:14:23.000+08:00
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "one-click-launch",
   "private": true,
-  "version": "1.0.1",
+  "version": "1.0.3",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "one-click-launch"
-version = "1.0.2"
+version = "1.0.3"
 description = "One Click Launch"
 authors = ["Silwings"]
 edition = "2024"
diff --git a/src-tauri/src/api/setting_api.rs b/src-tauri/src/api/setting_api.rs
@@ -62,6 +62,6 @@ where
     }
 }
 
-fn string_to_bool(s: &str) -> bool {
+pub fn string_to_bool(s: &str) -> bool {
     matches!(s.trim().to_lowercase().as_str(), "true")
 }
diff --git a/src-tauri/src/api/window_api.rs b/src-tauri/src/api/window_api.rs
@@ -22,7 +22,9 @@ use crate::{
 use super::{launcher_api, setting_api};
 
 pub fn hide_window(app: &AppHandle) -> Result<(), OneClickLaunchError> {
-    let window = app.get_webview_window("main").unwrap();
+    let window = app
+        .get_webview_window(constants::MAIN_WINDOW_LABEL)
+        .unwrap();
     window.hide()?;
     Ok(())
 }
@@ -57,7 +59,7 @@ pub async fn refresh_tray(app: AppHandle) -> Result<(), OneClickLaunchError> {
 }
 
 pub fn change_windows_theme(app: &AppHandle, theme: &str) -> Result<(), OneClickLaunchError> {
-    if let Some(window) = app.get_webview_window("main") {
+    if let Some(window) = app.get_webview_window(constants::MAIN_WINDOW_LABEL) {
         window.set_theme(match theme {
             "dark" => Some(Theme::Dark),
             "light" => Some(Theme::Light),
@@ -133,20 +135,6 @@ pub fn handle_window_event(window: &tauri::Window, event: &tauri::WindowEvent) {
             }
             _ => {}
         },
-        tauri::WindowEvent::Resized(physical_size) => {
-            if physical_size.width == 0 && physical_size.height == 0 {
-                // 页面最小化时忽略
-                return;
-            }
-            // 如果窗口大小过小，强制调整到正常大小
-            if physical_size.width < WINDOW_MIN_WIDTH || physical_size.height < WINDOW_MIN_HEIGHT {
-                let _ = window.set_size(tauri::Size::Logical(tauri::LogicalSize {
-                    width: WINDOW_MIN_WIDTH as f64,
-                    height: WINDOW_MIN_HEIGHT as f64,
-                }));
-                debug!("窗口大小过小，触发窗口大小重置: ps: {:?}", physical_size);
-            }
-        }
         _ => {}
     }
 }
@@ -169,7 +157,7 @@ pub fn setup_tray(app: &AppHandle) -> Result<()> {
             } => {
                 // 当用户点击系统托盘时使应用程序取消最小化,显示并聚焦
                 let app = tray.app_handle();
-                if let Some(window) = app.get_webview_window("main") {
+                if let Some(window) = app.get_webview_window(constants::MAIN_WINDOW_LABEL) {
                     let _ = window.unminimize();
                     let _ = window.show();
                     let _ = window.set_focus();
diff --git a/src-tauri/src/constants.rs b/src-tauri/src/constants.rs
@@ -5,8 +5,11 @@ lazy_static! {
 }
 
 pub static APPLICATION_NAME: &str = "一键启动";
+pub static MAIN_WINDOW_LABEL: &str = "main";
 pub static THEME_KEY: &str = "theme";
 pub static CLOSE_MAIN_PANEL_KEY: &str = "close_main_panel";
+pub static AUTO_START_LAUNCHER_IDS_KEY: &str = "auto_start_launcher_ids";
+pub static HIDE_AFTER_AUTO_START_KEY: &str = "hide_after_auto_start";
 pub static CLOSE_MAIN_PANEL_EXIT: &str = "m2";
 pub static WINDOW_MIN_WIDTH: u32 = 800;
 pub static WINDOW_MIN_HEIGHT: u32 = 600;
diff --git a/src-tauri/src/db/settings.rs b/src-tauri/src/db/settings.rs
@@ -46,7 +46,6 @@ where
         .bind(key)
         .fetch_optional(executor)
         .await?;
-    println!("s :{:?}", settings);
     Ok(settings)
 }
 
diff --git a/src-tauri/src/events/system_listeners.rs b/src-tauri/src/events/system_listeners.rs
@@ -3,8 +3,14 @@ use tracing::{debug, error};
 
 use crate::{
     DatabaseManager,
-    api::{launcher_api, setting_api::check_launch_then_exit, window_api},
-    constants::{AUTO_START_FLAG, THEME_KEY},
+    api::{
+        launcher_api,
+        setting_api::{self, check_launch_then_exit},
+        window_api,
+    },
+    constants::{
+        self, AUTO_START_FLAG, AUTO_START_LAUNCHER_IDS_KEY, HIDE_AFTER_AUTO_START_KEY, THEME_KEY,
+    },
     db::{launcher_resource, settings},
     events::EventDispatcher,
 };
@@ -50,6 +56,7 @@ fn register_application_startup_complete_listeners(app: &AppHandle) {
     let app_cloned = app.clone();
     EventSystem::register_listener(app, ApplicationStartupComplete, move |payload| {
         debug!("application_startup_complete_listeners 处理中");
+        hide_after_auto_start(&app_cloned, &payload);
         refresh_tray(&app_cloned);
         launch_auto_start_launchers(&app_cloned, &payload);
         debug!("application_startup_complete_listeners 处理完成");
@@ -78,7 +85,46 @@ fn refresh_tray(app: &AppHandle) {
     });
 }
 
-/// 注册应用程序启动完成监听器: 启动自启动启动器
+/// 应用程序自动启动后隐藏
+fn hide_after_auto_start(app: &AppHandle, payload: &ApplicationStartupCompletePayload) {
+    if payload.args.contains(&AUTO_START_FLAG) {
+        debug!(
+            "hide_after_auto_start 判断为自动启动, 命令行参数: {:?}",
+            payload.args
+        );
+
+        let inner_app = app.clone();
+
+        tauri::async_runtime::spawn(async move {
+            let app_cloned = inner_app.clone();
+
+            let db_manager = app_cloned.state::<DatabaseManager>();
+
+            let window = app_cloned
+                .get_webview_window(constants::MAIN_WINDOW_LABEL)
+                .unwrap();
+
+            match settings::read(&db_manager.pool, HIDE_AFTER_AUTO_START_KEY)
+                .await
+                .ok()
+                .flatten()
+            {
+                Some(settings) if setting_api::string_to_bool(&settings.value) => {
+                    let _ = window.hide();
+                }
+                _ => {
+                    let _ = window.show();
+                }
+            }
+        });
+    } else {
+        let window = app
+            .get_webview_window(constants::MAIN_WINDOW_LABEL)
+            .unwrap();
+        let _ = window.show();
+    }
+}
+
 fn launch_auto_start_launchers(app: &AppHandle, payload: &ApplicationStartupCompletePayload) {
     // 检查启动参数, 当命令包含`--auto`时表示是操作系统触发的自动启动
     if payload.args.contains(&AUTO_START_FLAG) {
@@ -95,7 +141,7 @@ fn launch_auto_start_launchers(app: &AppHandle, payload: &ApplicationStartupComp
             let db_manager = app_cloned.state::<DatabaseManager>();
 
             if let Ok(Some(settings)) =
-                settings::read(&db_manager.pool, "auto_start_launcher_ids").await
+                settings::read(&db_manager.pool, AUTO_START_LAUNCHER_IDS_KEY).await
             {
                 if let Ok(auto_start_launcher_ids) =
                     serde_json::from_str::<Vec<i64>>(&settings.value)
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
@@ -104,12 +104,12 @@ pub async fn run() -> Result<()> {
 
     tauri::Builder::default()
         .setup(move |app| {
-            // 初始化窗口
-            setup_tray(app.handle())?;
-
             // 注册监听器,之后添加新的监听器时在这个方法内部添加
             register_listeners(app.handle());
 
+            // 初始化窗口
+            setup_tray(app.handle())?;
+
             // 当所有初始化都完成后发送应用程序启动完成事件
             EventDispatcher::<ApplicationStartupComplete>::send_event(
                 app.handle(),
@@ -128,7 +128,9 @@ pub async fn run() -> Result<()> {
         // 优先注册单例插件
         .plugin(tauri_plugin_single_instance::init(|app, argv, cwd| {
             info!("{}, {argv:?}, {cwd}", app.package_info().name);
-            let windows = app.get_webview_window("main").unwrap();
+            let windows = app
+                .get_webview_window(constants::MAIN_WINDOW_LABEL)
+                .unwrap();
             if windows.is_visible().unwrap() {
                 let _ = windows.unmaximize();
             }
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "一键启动",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "identifier": "one-click-launch",
   "build": {
     "beforeDevCommand": "yarn dev",
@@ -16,9 +16,7 @@
         "title": "一键启动",
         "width": 800,
         "height": 600,
-        "minWidth": 800,
-        "minHeight": 600,
-        "devtools": true
+        "visible": false
       }
     ],
     "security": {
diff --git a/src/settings.vue b/src/settings.vue
@@ -7,6 +7,11 @@
             <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>
+            <input type="checkbox" v-model="hideAfterAutoStart" @change="toggleHideAfterAutoStart" />
+        </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>
@@ -68,6 +73,7 @@ export default {
         const theme = inject('theme');
         const autoLaunch = ref(false);
         const toggleLock = ref(false);
+        const hideAfterAutoStart = ref(false);
         const launchers = ref([]);
         const autoStartLauncherIds = ref([]);
         const launchThenExit = ref(false);
@@ -141,6 +147,19 @@ export default {
             launchThenExit.value = kv?.value === "true";
         };
 
+        const toggleLaunchThenExit = async () => {
+            await invoke("save_setting", { key: "launch_then_exit", value: launchThenExit.value ? "true" : "false" });
+        };
+
+        const loadHideAfterAutoStart = async () => {
+            const kv = await invoke("read_setting", { key: "hide_after_auto_start" });
+            hideAfterAutoStart.value = kv?.value === "true";
+        };
+
+        const toggleHideAfterAutoStart = async () => {
+            await invoke("save_setting", { key: "hide_after_auto_start", value: hideAfterAutoStart.value ? "true" : "false" });
+        };
+
         const loadCloseMainPanel = async () => {
             const kv = await invoke("read_setting", { key: "close_main_panel" });
             if (null == kv?.value) {
@@ -154,17 +173,14 @@ export default {
             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" });
-        };
-
         // 在组件挂载时加载主题
         onMounted(() => {
             loadTheme();
             fetchAutoLaunchStatus();
             refreshAutoStartLaunchers();
             loadLaunchThenExit();
             loadCloseMainPanel();
+            loadHideAfterAutoStart();
         });
 
         return {
@@ -180,7 +196,9 @@ export default {
             toggleLaunchThenExit,
             closeMainPanel,
             saveCloseMainPanel,
-            loadCloseMainPanel
+            loadCloseMainPanel,
+            hideAfterAutoStart,
+            toggleHideAfterAutoStart
         };
     }
 };
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "one-click-launch",`
`3`	`3`	`"private": true,`
`4`		`- "version": "1.0.1",`
	`4`	`+ "version": "1.0.3",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
`7`	`7`	`"dev": "vite",`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,6 @@ where`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`65`		`-fn string_to_bool(s: &str) -> bool {`
	`65`	`+pub fn string_to_bool(s: &str) -> bool {`
`66`	`66`	`matches!(s.trim().to_lowercase().as_str(), "true")`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ where`
`46`	`46`	`.bind(key)`
`47`	`47`	`.fetch_optional(executor)`
`48`	`48`	`.await?;`
`49`		`- println!("s :{:?}", settings);`
`50`	`49`	`Ok(settings)`
`51`	`50`	`}`
`52`	`51`