From 8c911f47f9bd5a5feab95723591f2f28553062f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=91=E5=85=88=E6=A3=AE?= Date: Fri, 25 Oct 2024 18:40:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97=E8=BE=93?= =?UTF-8?q?=E5=87=BA=E5=92=8C=E6=8F=90=E7=A4=BA=20=E6=88=90=E5=91=98?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BAbug=E4=BF=AE=E5=A4=8D=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=93=E5=8C=85=E5=90=8E=E7=9A=84=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E7=BB=93=E6=9E=84=EF=BC=8C=E6=B8=85=E7=88=BD=E5=B9=B2?= =?UTF-8?q?=E5=87=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composables/tray.ts | 2 +- package.json | 2 +- pages/index.vue | 6 +- pages/log.vue | 2 +- pages/member.vue | 139 ++---------------- src-tauri/.gitignore | 4 +- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- .../WinIPBroadcast-x86_64-pc-windows-msvc.exe | Bin 107008 -> 0 bytes src-tauri/capabilities/default.json | 4 +- src-tauri/easytier/Packet.dll | Bin 0 -> 220032 bytes src-tauri/easytier/README.md | 1 + src-tauri/easytier/easytier-cli.exe | Bin 0 -> 2101760 bytes src-tauri/easytier/easytier-core.exe | Bin 0 -> 9406464 bytes src-tauri/easytier/icons/icon-inactive.ico | Bin 0 -> 67646 bytes src-tauri/easytier/icons/icon.ico | Bin 0 -> 70140 bytes .../{ => easytier/tool}/WinIPBroadcast.exe | Bin src-tauri/easytier/wintun.dll | Bin 0 -> 427552 bytes src-tauri/src/lib.rs | 32 ++-- src-tauri/tauri.conf.json | 13 +- utils/index.ts | 39 ++++- 21 files changed, 89 insertions(+), 159 deletions(-) delete mode 100644 src-tauri/WinIPBroadcast-x86_64-pc-windows-msvc.exe create mode 100644 src-tauri/easytier/Packet.dll create mode 100644 src-tauri/easytier/README.md create mode 100644 src-tauri/easytier/easytier-cli.exe create mode 100644 src-tauri/easytier/easytier-core.exe create mode 100644 src-tauri/easytier/icons/icon-inactive.ico create mode 100644 src-tauri/easytier/icons/icon.ico rename src-tauri/{ => easytier/tool}/WinIPBroadcast.exe (100%) create mode 100644 src-tauri/easytier/wintun.dll diff --git a/composables/tray.ts b/composables/tray.ts index 312f56b..1ec16df 100644 --- a/composables/tray.ts +++ b/composables/tray.ts @@ -92,7 +92,7 @@ export async function MenuItemShow(text: string) { export async function setTrayRunState(tray: TrayIcon | null, isRunning: boolean = false) { if (!tray) return; - tray.setIcon(isRunning ? "icons/icon-inactive.ico" : "icons/icon.ico"); + tray.setIcon(isRunning ? "easytier/icons/icon-inactive.ico" : "easytier/icons/icon.ico"); } // export async function setTrayTooltip(tooltip: string) { diff --git a/package.json b/package.json index aac47f2..188bdf7 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "private": true, "author": "leizi97", "description": "A simple network initiator based on Easytier", - "version": "1.0.7", + "version": "1.0.8", "scripts": { "dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0", "build": "nuxt generate --dotenv env/.env.prod" diff --git a/pages/index.vue b/pages/index.vue index d52eb30..52d449f 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -361,7 +361,7 @@ const unListen = await listen("config", (event) => { // console.log("config", event.payload); const ipv4 = config.ipv4; - mainStore.$patch(event.payload); + mainStore.$patch(event.payload as any); config.ipv4 = ipv4; }); this.unListenConfigStart = unListen; @@ -651,7 +651,7 @@ await etWindows( "log", { - title: "日志", + title: "联机日志", width: 600, height: 380, resizable: false, @@ -662,7 +662,7 @@ logsTimer && clearInterval(logsTimer); logsTimer = setInterval(() => { appWindow.emitTo("log", "logs", data.log); - }, 3000); + }, 600); }, () => { data.logVisible = false; diff --git a/pages/log.vue b/pages/log.vue index cd39490..1aa22a3 100644 --- a/pages/log.vue +++ b/pages/log.vue @@ -5,7 +5,7 @@ v-model="data.log" resize="none" readonly - placeholder="等待日志中..." + placeholder="等待日志中，请先'启动联机'..." />