From 2d4a44740a85e4314a61bdadc3a2ab035fe7c9f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=91=E5=85=88=E6=A3=AE?= <leizi97@126.com>
Date: Fri, 15 Nov 2024 17:25:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AA=97=E5=8F=A3=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E9=9C=80=E8=A6=81=E7=9A=84=E6=9D=83=E9=99=90=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=AF=E5=8A=A8=E8=87=AA=E5=8A=A8=E8=81=94?=
 =?UTF-8?q?=E6=9C=BA=E9=94=99=E8=AF=AF=E7=9A=84=E8=8B=B1=E6=96=87=E6=8B=BC?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composables/configJson.ts           |  2 +-
 pages/advance.vue                   |  2 +-
 pages/index.vue                     | 12 ++++++++----
 src-tauri/capabilities/default.json |  4 +++-
 src-tauri/tauri.conf.json           |  1 -
 stores/index.ts                     |  4 ++--
 6 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/composables/configJson.ts b/composables/configJson.ts
index 424e6d5..bec035a 100644
--- a/composables/configJson.ts
+++ b/composables/configJson.ts
@@ -15,7 +15,7 @@ export const updateConfigJson = async (configJsonSeverUrl: Array<string> | strin
 			proxyNetworks,
 			autoStart,
 			relayAllPeerrpc,
-			coonectAfterStart,
+			connectAfterStart,
 			multiThread,
 			enablExitNode,
 			useSmoltcp,
diff --git a/pages/advance.vue b/pages/advance.vue
index a8f2465..6292c6d 100644
--- a/pages/advance.vue
+++ b/pages/advance.vue
@@ -26,7 +26,7 @@
 				打开日志目录
 			</ElButton>
 		</div>
-		<div><ElCheckbox v-model="mainStore.config.coonectAfterStart">软件启动后，自动"启动联机"(搭配开机自启，无感联机)</ElCheckbox></div>
+		<div><ElCheckbox v-model="mainStore.config.connectAfterStart">软件启动后，自动"启动联机"(搭配开机自启，无感联机)</ElCheckbox></div>
 		<div class="flex items-center gap-[15px] flex-nowrap">
 			<ElCheckbox v-model="mainStore.createConfigInEasytier">自动生成界面配置文件easytier/config.json</ElCheckbox>
 			<ElButton
diff --git a/pages/index.vue b/pages/index.vue
index 0d1c49c..ecd7a75 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -570,7 +570,7 @@
 		},
 		async listenConfigStart() {
 			const unListen = await listen("config", event => {
-				// console.log("config", event.payload);
+				console.log("config", event.payload);
 				const ipv4 = config.ipv4;
 				mainStore.$patch(event.payload as any);
 				config.ipv4 = ipv4;
@@ -695,6 +695,7 @@
 			is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
 			config.autoStart = is_enable_by_task;
 		} catch (err) {
+			console.log(err);
 			await invoke("spawn_autostart", { enabled: false });
 			const is_enable_by_task = (await invoke("autostart_is_enabled")) as boolean;
 			config.autoStart = is_enable_by_task;
@@ -702,7 +703,7 @@
 	};
 
 	const initConnectAfterStart = async () => {
-		if (config.coonectAfterStart && data.coreVersion) {
+		if (config.connectAfterStart && data.coreVersion) {
 			await reset();
 			await handleConnection();
 		}
@@ -743,6 +744,7 @@
 						await updateConfigJson(data.configJsonSeverUrl);
 					}
 				} catch (err) {
+					console.log(err);
 					ElMessage.error(`config.json格式错误`);
 				}
 			}
@@ -936,7 +938,7 @@
 				const {
 					proxyNetworks,
 					autoStart,
-					coonectAfterStart,
+					connectAfterStart,
 					multiThread,
 					hostname,
 					enablExitNode,
@@ -992,7 +994,9 @@
 			mainStore.configPath = "";
 			try {
 				await mkdir(path, { baseDir: BaseDirectory.Resource });
-			} catch (err) {}
+			} catch (err) {
+				console.log(err);
+			}
 		}
 	};
 
diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json
index 8ad3310..cde35a0 100644
--- a/src-tauri/capabilities/default.json
+++ b/src-tauri/capabilities/default.json
@@ -90,6 +90,8 @@
     "clipboard-manager:allow-read-text",
     "clipboard-manager:allow-write-text",
 
-    "window-state:default"
+    "window-state:default",
+    "window-state:allow-save-window-state",
+    "window-state:allow-restore-state"
   ]
 }
\ No newline at end of file
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 13d0f24..f938b8a 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -15,7 +15,6 @@
 			{
 				"title": "easytier-game 1.2.1",
 				"label": "main",
-				"url": "#/",
 				"minWidth": 340,
 				"width": 340,
 				"height": 305,
diff --git a/stores/index.ts b/stores/index.ts
index 056b823..4f1ab89 100644
--- a/stores/index.ts
+++ b/stores/index.ts
@@ -11,7 +11,7 @@ export default defineStore("main", {
 				ipv4: "",
 				proxyNetworks: "", // 子网代理
 				autoStart: false, // 是否自动启动
-				coonectAfterStart: false, //软件打开后，是否自动连接
+				connectAfterStart: false, //软件打开后，是否自动连接
 				disableIpv6: false, // 是否禁用IPv6
 				disbleListenner: false, // 是否禁用监听
 				disableEncryption: false, // 是否禁用加密
@@ -54,7 +54,7 @@ export default defineStore("main", {
 			"config.ipv4",
 			"config.proxyNetworks",
 			"config.autoStart",
-			"config.coonectAfterStart",
+			"config.connectAfterStart",
 			"config.disableIpv6",
 			"config.disbleListenner",
 			"config.disableEncryption",