Merge branch 'refs/heads/master'

# Conflicts:
#	README.md

Author: Silwings-git

README.md

@@ -51,19 +51,23 @@
 
 ## 版本说明
 
-### v1.0.4 | 2025-08-27
+### v1.0.5 | 2025-09-30
 
 #### ✨ 新增功能
 
-- 支持创建 **编组级快捷方式**（编组内右键），运行编组快捷方式时会自动打开编组中的全部资源
-- 支持双击编辑资源路径，并可为资源设置启动参数（⚠️ 如果路径包含空格，需要使用引号包裹）
+- 支持资源启动间隔设置(可在设置页设置)
 
-#### 🔧 优化与改进
+#### 历史版本
 
-- 优化了设置页的交互与体验
-- 修复了一些已知漏洞，提升了稳定性
+- v1.0.4 | 2025-08-27
 
-#### 历史版本
+  ** ✨ 新增功能
+  - 支持创建 **编组级快捷方式**（编组内右键），运行编组快捷方式时会自动打开编组中的全部资源
+  - 支持双击编辑资源路径，并可为资源设置启动参数（⚠️ 如果路径包含空格，需要使用引号包裹）
+
+  ** 🔧 优化与改进
+  - 优化了设置页的交互与体验
+  - 修复了一些已知漏洞，提升了稳定性
 
 - v1.0.3 | 2025-03-09
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "one-click-launch",
   "private": true,
-  "version": "1.0.4",
+  "version": "1.0.5",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "one-click-launch"
-version = "1.0.4"
+version = "1.0.5"
 description = "One Click Launch"
 authors = ["Silwings"]
 edition = "2024"
@@ -41,6 +41,7 @@ lazy_static = "1.5.0"
 itertools = "0.14.0"
 dirs = "5.0.1"
 shlex = "1.3.0"
+humantime = "2.3.0"
 
 [features]
 portable = []

src-tauri/Cargo.toml

@@ -1,4 +1,4 @@
-use std::{path::Path, process::Command};
+use std::{path::Path, process::Command, time::Duration};
 
 use anyhow::Result;
 use rand::{Rng, distributions::Alphanumeric};
@@ -10,9 +10,11 @@ use tracing::info;
 use crate::{
     DatabaseManager,
     api::window_api,
+    constants::RESOURCE_LAUNCH_INTERVAL,
     db::{
         launcher,
         launcher_resource::{self, CreateResourceParam, LauncherResource},
+        settings,
     },
     error::OneClickLaunchError,
     events::{
@@ -330,7 +332,9 @@ pub async fn launch(app: AppHandle, launcher_id: i64) -> Result<(), OneClickLaun
         return Ok(());
     }
 
-    launch_resources(&app, &resources);
+    let delay = get_launch_delay(&app).await?;
+
+    launch_resources(&app, &resources, delay).await;
 
     EventDispatcher::<LauncherLaunched>::send_event(
         &app,
@@ -349,14 +353,18 @@ pub async fn open_path(app: AppHandle, path: &str) -> Result<(), OneClickLaunchE
     Ok(())
 }
 
-pub fn launch_resources(app: &AppHandle, resources: &[LauncherResource]) {
-    for resource in resources.iter() {
+pub async fn launch_resources(app: &AppHandle, resources: &[LauncherResource], delay: Duration) {
+    for (i, resource) in resources.iter().enumerate() {
         if let Err(e) = open_using_default_program(app, resource.path.as_str()) {
             info!(
                 "启动资源失败,资源名称: {:?},资源路径: {:?},错误信息: {:?}",
                 &resource.name, &resource.path, e
             );
         }
+        // 最后一个资源之后不再等待
+        if i < resources.len() - 1 {
+            tokio::time::sleep(delay).await;
+        }
     }
 }
 
@@ -445,3 +453,16 @@ fn current_exe_path_str() -> Result<String, OneClickLaunchError> {
     }
     Ok(app_path)
 }
+
+pub async fn get_launch_delay(app: &AppHandle) -> Result<Duration> {
+    let db: State<'_, DatabaseManager> = app.try_state().ok_or(
+        OneClickLaunchError::ExecutionError("Unable to get DatabaseManager".to_string()),
+    )?;
+
+    Ok(settings::read(&db.pool, RESOURCE_LAUNCH_INTERVAL)
+        .await
+        .unwrap_or_default()
+        .map(|setting| setting.value)
+        .map(|d| d.parse::<humantime::Duration>().unwrap().into())
+        .unwrap_or_else(|| Duration::from_secs(0)))
+}

src-tauri/src/api/launcher_api.rs

@@ -11,6 +11,7 @@ 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 RESOURCE_LAUNCH_INTERVAL: &str = "resource_launch_interval";
 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/constants.rs

@@ -1,3 +1,5 @@
+use std::time::Duration;
+
 use tauri::{AppHandle, Manager};
 use tracing::{debug, error};
 
@@ -157,7 +159,11 @@ fn launch_auto_start_launchers(app: &AppHandle, payload: &ApplicationStartupComp
                     {
                         // 如果用户设置的自启启动器为空则不执行启动
                         if !launcher_resources.is_empty() {
-                            launcher_api::launch_resources(&app_cloned, &launcher_resources);
+                            let delay = launcher_api::get_launch_delay(&app_cloned)
+                                .await
+                                .unwrap_or_else(|_e| Duration::from_secs(0));
+                            launcher_api::launch_resources(&app_cloned, &launcher_resources, delay)
+                                .await;
                             debug!("自启启动器已启动. 启动器信息: {:?}", launcher_resources);
                             let _ = EventDispatcher::<LauncherLaunched>::send_event(
                                 &app_cloned,

src-tauri/src/events/system_listeners.rs

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "一键启动",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "identifier": "one-click-launch",
   "build": {
     "beforeDevCommand": "yarn dev",

src-tauri/tauri.conf.json

@@ -37,6 +37,20 @@
             </el-select>
         </div>
 
+        <div class="setting-item">
+            <div class="setting-label with-tooltip">
+                <p class="setting-label">资源启动间隔</p>
+                <el-tooltip content="多个资源启动时的时间间隔（单位：秒）" placement="top">
+                    <Help :class="['help', theme]" theme="outline" size="15" />
+                </el-tooltip>
+            </div>
+            <el-select append-to=".home" v-model="resourceLaunchInterval" @change="saveResourceLaunchInterval"
+                class="setting-select" placeholder="请选择间隔" style="width: 240px">
+                <el-option v-for="option in launchIntervalOptions" :key="option.value" :label="option.label"
+                    :value="option.value" />
+            </el-select>
+        </div>
+
         <div class="setting-item">
             <p class="setting-label">主题</p>
             <el-select append-to=".home" v-model="theme" @change="changeTheme" placeholder="请选择" class="setting-select">
@@ -86,7 +100,17 @@ export default {
         const closeMainPanel = ref("m1");
         // 初始状态提示
         const appVersion = ref('加载中...');
-
+        // 下拉选项配置
+        const launchIntervalOptions = ref([
+            { value: '0s', label: '0 秒' },
+            { value: '1s', label: '1 秒' },
+            { value: '2s', label: '2 秒' },
+            { value: '3s', label: '3 秒' },
+            { value: '4s', label: '4 秒' },
+            { value: '5s', label: '5 秒' }
+        ]);
+        // 间隔状态
+        const resourceLaunchInterval = ref(0);
         // 主题相关
         const loadTheme = async () => {
             try {
@@ -166,6 +190,23 @@ export default {
             }
         };
 
+        // 加载已保存的间隔设置
+        const loadResourceLaunchInterval = async () => {
+            const savedInterval = await invoke("read_setting", { key: "resource_launch_interval" });
+            console.log("savedInterval:", savedInterval);
+            if (savedInterval?.value) {
+                resourceLaunchInterval.value = savedInterval?.value;
+            }
+        };
+
+        // 保存间隔设置
+        const saveResourceLaunchInterval = async () => {
+            await invoke("save_setting", {
+                key: "resource_launch_interval",
+                value: resourceLaunchInterval.value + ""
+            });
+        };
+
         // 其他设置
         const loadLaunchThenExit = async () => {
             try {
@@ -252,7 +293,8 @@ export default {
                 loadLaunchThenExit(),
                 loadCloseMainPanel(),
                 loadHideAfterAutoStart(),
-                getAppVersion()
+                getAppVersion(),
+                loadResourceLaunchInterval()
             ]);
         });
 
@@ -272,7 +314,10 @@ export default {
             saveCloseMainPanel,
             hideAfterAutoStart,
             toggleHideAfterAutoStart,
-            openGitHubRepo
+            openGitHubRepo,
+            resourceLaunchInterval,
+            launchIntervalOptions,
+            saveResourceLaunchInterval
         };
     }
 };