From cdd3fada1f9852b061af54f22760c9181ad9ee59 Mon Sep 17 00:00:00 2001 From: leizi97 Date: Wed, 20 Nov 2024 22:36:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=86=85=E6=A0=B8=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=8F=AF=E5=88=87=E6=8D=A2?= =?UTF-8?q?easytier=E5=86=85=E6=A0=B8=E7=89=88=E6=9C=AC=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=B8=AE=E5=8A=A9=E5=92=8C=E6=B8=85=E9=99=A4=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.vue | 14 +- assets/css/main.css | 1 + package.json | 2 +- pages/index.vue | 294 +++++++++--------- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- .../easytier/{tool => }/clear_local_data.bat | 11 +- src-tauri/easytier/帮助.txt | 6 +- src-tauri/tauri.conf.json | 6 +- stores/index.ts | 4 +- utils/index.ts | 14 +- 11 files changed, 190 insertions(+), 166 deletions(-) rename src-tauri/easytier/{tool => }/clear_local_data.bat (79%) diff --git a/app.vue b/app.vue index 6ebf70e..b859953 100644 --- a/app.vue +++ b/app.vue @@ -11,10 +11,20 @@ const original = console[fnName]; console[fnName] = (message) => { original(message); - logger(message); + if (import.meta.env.PROD) { + try { + if (typeof message === "string") { + logger(message); + } else { + logger(JSON.stringify(message)); + } + } catch (e) { + logger(`${message}`); + } + } }; } - forwardConsole("log", trace); + forwardConsole("log", info); forwardConsole("debug", debug); forwardConsole("info", info); forwardConsole("warn", warn); diff --git a/assets/css/main.css b/assets/css/main.css index da101dc..72fd54d 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -35,4 +35,5 @@ html.dark body { .full-label .el-form-item__label { width: 100%; + padding-right: 0; } \ No newline at end of file diff --git a/package.json b/package.json index 928c55c..af7877e 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.2.2", + "version": "1.2.3", "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 3d99ff5..9ec025e 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -2,8 +2,7 @@ + :model="config"> @@ -73,8 +65,7 @@ placeholder="请选择服务器地址" default-first-option v-model="config.serverUrl" - @change="handleServerUrlChange" - > + @change="handleServerUrlChange"> @@ -98,8 +87,7 @@ v-for="item in mainStore.basePeers" :key="item" :label="item" - :value="item" - > + :value="item">

{{ item }}

@@ -109,8 +97,7 @@ @click.stop="handleDeleteServerUrl(item)" round :icon="Delete" - type="danger" - > + type="danger">
@@ -130,8 +117,7 @@ + v-model="config.networkName">
@@ -149,8 +135,7 @@ maxlength="100" placeholder="请输入网络密码" v-model="config.networkPassword" - type="password" - > + type="password">
@@ -167,13 +152,11 @@ + v-model="config.hostname"> + label="局域网IP"> + v-model="config.ipv4"> @@ -209,28 +190,24 @@ size="default" :type="!data.isStart ? 'primary' : 'danger'" :disabled="data.startLoading || !data.coreVersion || data.update" - @click="handleConnection" - > + @click="handleConnection"> {{ !data.isStart ? "启动联机" : "停止联机" }}