diff --git a/composables/tray.ts b/composables/tray.ts index 1ec16df..a5e1213 100644 --- a/composables/tray.ts +++ b/composables/tray.ts @@ -92,15 +92,14 @@ export async function MenuItemShow(text: string) { export async function setTrayRunState(tray: TrayIcon | null, isRunning: boolean = false) { if (!tray) return; - tray.setIcon(isRunning ? "easytier/icons/icon-inactive.ico" : "easytier/icons/icon.ico"); + await tray.setIcon(isRunning ? "easytier/icons/icon-inactive.ico" : "easytier/icons/icon.ico"); } -// export async function setTrayTooltip(tooltip: string) { -// if (tooltip) { -// const tray = await useTray() -// if (!tray) -// return -// tray.setTooltip(`EasyTier\n${pkg.version}\n${tooltip}`) -// tray.setTitle(`EasyTier\n${pkg.version}\n${tooltip}`) -// } -// } +export async function setTrayTooltip(tray: TrayIcon | null, tooltip?: string | null) { + if (!tray) return; + if (tooltip) { + await tray.setTooltip(`EasyTier\n${pkg.version}\n${tooltip}`); + } else { + await tray.setTooltip(`EasyTier\n${pkg.version}`); + } +} diff --git a/env/.env.dev b/env/.env.dev index 7b44346..e4d5eba 100644 --- a/env/.env.dev +++ b/env/.env.dev @@ -1 +1,3 @@ -VITE_CONFIG_PATH=easytier/config/ \ No newline at end of file +VITE_CONFIG_PATH=easytier/config/ +VITE_LOG_PATH=easytier/logs/ +VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart \ No newline at end of file diff --git a/env/.env.prod b/env/.env.prod index 7b44346..e4d5eba 100644 --- a/env/.env.prod +++ b/env/.env.prod @@ -1 +1,3 @@ -VITE_CONFIG_PATH=easytier/config/ \ No newline at end of file +VITE_CONFIG_PATH=easytier/config/ +VITE_LOG_PATH=easytier/logs/ +VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart \ No newline at end of file diff --git a/package.json b/package.json index 8125263..7b46d05 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.9", + "version": "1.1.0", "scripts": { "dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0", "build": "nuxt generate --dotenv env/.env.prod" diff --git a/pages/advance.vue b/pages/advance.vue index a2975b0..b6bb1a0 100644 --- a/pages/advance.vue +++ b/pages/advance.vue @@ -1,8 +1,7 @@