diff --git a/package.json b/package.json index 0f0063e..a75cee5 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "dependencies": { "@tauri-apps/api": ">=2.0.0-beta.8", "@tauri-apps/plugin-clipboard-manager": "2.1.0-beta.0", + "@tauri-apps/plugin-process": "2.0.0-beta.2", "@tauri-apps/plugin-store": "2.0.0-beta.2", "pinia": "^2.1.7", "vue": "^3.3.4", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index daa395a..ead0782 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -18,3 +18,4 @@ serde_json = "1" anyhow = "1.0" tokio = { version = "1.36.0", features = ["rt-multi-thread", "net", "macros", "io-util", "time", "sync"] } tauri-plugin-clipboard-manager = "2.1.0-beta.1" +tauri-plugin-process = "2.0.0-beta.3" diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json index ac47d4f..592dd7a 100644 --- a/src-tauri/capabilities/default.json +++ b/src-tauri/capabilities/default.json @@ -2,7 +2,9 @@ "$schema": "../gen/schemas/desktop-schema.json", "identifier": "default", "description": "Capability for the main window", - "windows": ["main"], + "windows": [ + "main" + ], "permissions": [ "event:default", "window:default", @@ -23,6 +25,8 @@ "store:allow-entries", "store:allow-delete", "clipboard-manager:default", - "clipboard-manager:allow-write-text" + "clipboard-manager:allow-write-text", + "process:default", + "process:allow-restart" ] -} +} \ No newline at end of file diff --git a/src-tauri/src/adb.rs b/src-tauri/src/adb.rs index 19fc408..9d7404e 100644 --- a/src-tauri/src/adb.rs +++ b/src-tauri/src/adb.rs @@ -76,7 +76,7 @@ impl Device { return Ok((width, height)); } } - }; + } Err(anyhow::anyhow!("Failed to get screen size")) } } diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 7ec4485..2de74f3 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -130,6 +130,7 @@ fn load_default_keyconfig(app: tauri::AppHandle) -> Result { #[tokio::main] async fn main() { tauri::Builder::default() + .plugin(tauri_plugin_process::init()) .plugin(tauri_plugin_clipboard_manager::init()) .plugin(tauri_plugin_store::Builder::new().build()) .setup(|app| { diff --git a/src/components/setting/Basic.vue b/src/components/setting/Basic.vue index 86f5b54..778eb8a 100644 --- a/src/components/setting/Basic.vue +++ b/src/components/setting/Basic.vue @@ -14,7 +14,7 @@ import { NCard, NIcon, } from "naive-ui"; - +import { relaunch } from "@tauri-apps/plugin-process"; import { onMounted, ref } from "vue"; const localStore = new Store("store.bin"); @@ -63,7 +63,8 @@ function delLocalStore(key?: string) { positiveText: "删除", negativeText: "取消", onPositiveClick: () => { - localStore.clear(); + // localStore.clear(); + relaunch(); }, }); } diff --git a/src/components/setting/Script.vue b/src/components/setting/Script.vue index 0d6bfea..4203619 100644 --- a/src/components/setting/Script.vue +++ b/src/components/setting/Script.vue @@ -1,13 +1,15 @@