From affce1125bebd460751b47092627a4cf9cfff0fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=91=E5=85=88=E6=A3=AE?= Date: Mon, 20 Jan 2025 15:34:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E5=BA=93=EF=BC=8C=E6=96=B0=E5=A2=9E=E9=85=8D=E7=BD=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=8A=9F=E8=83=BD=20#4=EF=BC=8C=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E4=BD=93=E9=AA=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/css/main.css | 9 +- build.bat | 10 +- composables/tray.ts | 2 +- env/.env.dev | 2 + env/.env.prod | 2 + package.json | 9 +- pages/index.vue | 272 +++++++++++++++++++++++++++++++++----- pnpm-lock.yaml | 131 +++++++----------- src-tauri/Cargo.lock | 14 +- src-tauri/Cargo.toml | 8 +- src-tauri/tauri.conf.json | 4 +- utils/element.ts | 6 +- utils/index.ts | 14 ++ 13 files changed, 337 insertions(+), 146 deletions(-) diff --git a/assets/css/main.css b/assets/css/main.css index 1078c32..fc9b324 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -55,5 +55,12 @@ html.dark body { } .el-select-dropdown__wrap { - max-height: 150px!important; + max-height: 138px!important; +} + +.el-popper:not(.is-pure) { + font-size: 10px!important; + line-height: 1.2em!important; + padding: 5px!important; + font-weight: lighter!important; } \ No newline at end of file diff --git a/build.bat b/build.bat index 401e399..85acdd9 100644 --- a/build.bat +++ b/build.bat @@ -1,9 +1,9 @@ rustup default nightly -@echo 使用rust nightly构建支持win7的版本,请先将根目录的windows.0.48.5 放入以下目录 -@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x64 -@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x86 -@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x64 -@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x86 +rem 使用rust nightly构建支持win7的版本,请先将根目录的windows.0.48.5 放入以下目录 +rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x64 +rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x86 +rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x64 +rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x86 pnpm tauri build -- -Z build-std --target x86_64-win7-windows-msvc rustup default stable pnpm tauri build diff --git a/composables/tray.ts b/composables/tray.ts index 6760620..088f191 100644 --- a/composables/tray.ts +++ b/composables/tray.ts @@ -89,7 +89,7 @@ export async function MenuItemPublicPeers() { id: "publicPeers", text: "公共节点", action: async () => { - await open("https://easytier.gd.nkbpal.cn/status/easytier") + await open(import.meta.env.VITE_PUBLIC_PEERS_URL) }, }); } diff --git a/env/.env.dev b/env/.env.dev index 29c28e6..7f166d0 100644 --- a/env/.env.dev +++ b/env/.env.dev @@ -1,5 +1,7 @@ VITE_CONFIG_PATH=easytier/config/ +VITE_CONFIG_ADMIN_PATH=easytier/config/.admin/ VITE_CONFIG_FILE_NAME=easytier/config.json VITE_LOG_PATH=easytier/logs/ VITE_CACHE_PATH=easytier/cache/ +VITE_PUBLIC_PEERS_URL=https://easytier.gd.nkbpal.cn/status/easytier VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart \ No newline at end of file diff --git a/env/.env.prod b/env/.env.prod index 29c28e6..7f166d0 100644 --- a/env/.env.prod +++ b/env/.env.prod @@ -1,5 +1,7 @@ VITE_CONFIG_PATH=easytier/config/ +VITE_CONFIG_ADMIN_PATH=easytier/config/.admin/ VITE_CONFIG_FILE_NAME=easytier/config.json VITE_LOG_PATH=easytier/logs/ VITE_CACHE_PATH=easytier/cache/ +VITE_PUBLIC_PEERS_URL=https://easytier.gd.nkbpal.cn/status/easytier VITE_AUTO_START_SERVICE_NAME=easytierGameAutoStart \ No newline at end of file diff --git a/package.json b/package.json index 3f479b2..d2c5d65 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.3.7", + "version": "1.3.8", "scripts": { "dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0", "build": "nuxt generate --dotenv env/.env.prod", @@ -16,14 +16,14 @@ "@nuxtjs/tailwindcss": "6.13.1", "@pinia/nuxt": "0.9.0", "@tauri-apps/api": "^2.2.0", - "@tauri-apps/cli": "2.2.4", + "@tauri-apps/cli": "2.2.5", "@tauri-apps/plugin-cli": "^2.2.0", "@tauri-apps/plugin-clipboard-manager": "2.2.0", + "@tauri-apps/plugin-dialog": "2.2.0", "@tauri-apps/plugin-fs": "^2.2.0", "@tauri-apps/plugin-log": "^2.2.0", "@tauri-apps/plugin-shell": "^2.2.0", "@tauri-apps/plugin-window-state": "^2.2.0", - "@tauri-apps/plugin-dialog": "2.2.0", "@types/lodash-es": "^4.17.12", "@vitejs/plugin-vue-jsx": "^4.1.1", "@vueuse/core": "12.4.0", @@ -36,7 +36,6 @@ "pinia-plugin-persistedstate": "^4.2.0", "postcss": "^8.4.38", "prettier": "3.4.2", - "prettier-plugin-tailwindcss": "0.6.10", - "vue-clipboard3": "^2.0.0" + "prettier-plugin-tailwindcss": "0.6.10" } } diff --git a/pages/index.vue b/pages/index.vue index 645cd39..7958bb5 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -85,6 +85,18 @@ +
房间名 - +
房间密码 - +
成员名 - +
- + @@ -234,6 +252,7 @@ split-button trigger="click" size="default" + placement="right-end" :type="!data.isStart ? 'primary' : 'danger'" :disabled="data.startLoading || !data.coreVersion || data.update" @click="handleConnection" @@ -245,13 +264,13 @@ command="import_config" :icon="Link" > - 导入配置 + 导入联机配置 - 分享联机相关配置 + 分享联机配置 @@ -276,6 +295,21 @@ > 使用外部配置文件 + + + + + 配置管理 + + + 保存当前配置 + @@ -511,7 +545,7 @@ @click="openConfigDir" size="small" > - 打开配置目录 + 打开存储目录 + +
+ + 打开存储目录 + + + 刷新 + +
+
+ + + + +
+ +