From fa480a8162d9334ee21c77fe5253203861056a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=91=E5=85=88=E6=A3=AE?= Date: Mon, 3 Nov 2025 15:20:28 +0800 Subject: [PATCH] =?UTF-8?q?#Update=20=E5=B0=86=E2=80=9C=E5=AD=90=E7=BD=91?= =?UTF-8?q?=E4=BB=A3=E7=90=86=E2=80=9D=E6=8C=89=E9=92=AE=E7=A7=BB=E8=87=B3?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E8=81=94=E6=9C=BA=E4=B8=8B=E6=8B=89=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E5=86=85=EF=BC=8C=E5=B0=86=E2=80=9C=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E5=92=8C=E5=AF=BC=E5=85=A5=E9=85=8D=E7=BD=AE=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E2=80=9C=E7=A7=BB=E5=88=B0=E4=B8=BB=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + package.json | 2 +- pages/index.vue | 74 +++++++++++++++++++++++++++------------------ pnpm-lock.yaml | 79 +++++++++++++++++++++++-------------------------- 4 files changed, 84 insertions(+), 72 deletions(-) diff --git a/.gitignore b/.gitignore index f101bc2..ae3609b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ dist .idea .vscode release +target src-tauri/easytier/logs src-tauri/easytier/tool/ResourcesExtract.exe diff --git a/package.json b/package.json index a6c750f..ff8e29a 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "@vitejs/plugin-vue-jsx": "5.1.1", "@vueuse/core": "12.7.0", "archiver": "^7.0.1", - "element-plus": "2.11.5", + "element-plus": "2.11.7", "less": "4.2.1", "lodash-es": "^4.17.21", "nuxt": "3.19.2", diff --git a/pages/index.vue b/pages/index.vue index 38e0415..7c3a001 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -337,6 +337,12 @@ + 子网代理 + + -
- + - 子网代理 - - - 高级选项 - + + 分享/导入 + + + +
+ + 高级选项 + +
@@ -1172,7 +1189,6 @@ ); }; - let unlistenDownload: UnlistenFn | null = null; let unlistenDownloadError: UnlistenFn | null = null; let progress = ref(0); @@ -1506,7 +1522,6 @@ checkNewVersion(); } await storageDialog(); - }); // storageEventEmitter.addEventListener("localStorageChange", () => { @@ -1519,7 +1534,6 @@ return data.configJsonSeverUrl; }); - onBeforeUnmount(() => { unListenAll(); listenObj.unListenReleaseList && listenObj.unListenReleaseList(); @@ -1529,7 +1543,6 @@ cidrTimer && clearInterval(cidrTimer); stopPreventSleep(); // unListenStorage && unListenStorage(); - }); const getArgs = async () => { @@ -1600,7 +1613,7 @@ args.push("--disable-p2p"); } if (mainStore.config.disableIpv6) { - args.push("--disable-ipv6"); + args.push("--disable-ipv6", "true"); } if (mainStore.config.disbleListenner) { args.push("--no-listener"); @@ -1632,28 +1645,28 @@ mainStore.config.proxyNetworks = formatProxyNetworks.join("\n"); } if (mainStore.config.disableEncryption) { - args.push("--disable-encryption"); + args.push("--disable-encryption", "true"); } if (mainStore.config.multiThread) { - args.push("--multi-thread"); + args.push("--multi-thread", "true"); } if (mainStore.config.enablExitNode) { - args.push("--enable-exit-node"); + args.push("--enable-exit-node", "true"); } if (mainStore.config.noTun) { - args.push("--no-tun"); + args.push("--no-tun", "true"); } if (mainStore.config.latencyfirst) { - args.push("--latency-first"); + args.push("--latency-first", "true"); } if (mainStore.config.useSmoltcp) { - args.push("--use-smoltcp"); + args.push("--use-smoltcp", "true"); } if (mainStore.config.disableUdpHolePunching) { - args.push("--disable-udp-hole-punching"); + args.push("--disable-udp-hole-punching", "true"); } if (mainStore.config.relayAllPeerrpc) { - args.push("--relay-all-peer-rpc"); + args.push("--relay-all-peer-rpc", "true"); } if (mainStore.config.saveErrorLog) { args.push("--file-log-level", mainStore.config.logLevel, "--file-log-dir", import.meta.env.VITE_LOG_PATH); @@ -1680,7 +1693,7 @@ args.push("--bind-device", "true"); } if (mainStore.proxyForwardBySystem) { - args.push("--proxy-forward-by-system"); + args.push("--proxy-forward-by-system", "true"); } if (mainStore.config.acceptDNS) { args.push("--accept-dns", "true"); @@ -1879,6 +1892,9 @@ if (command === "create_server") { await handleShowServerDialog(); } + if (command === "cidr") { + await handleShowCidrDialog(); + } if (command === "config_admin") { configAdminData.visible = true; const path = import.meta.env.VITE_CONFIG_ADMIN_PATH; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 015e767..6a056fb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,7 +17,7 @@ importers: version: 2.3.2(vue@3.5.22(typescript@5.8.3)) '@element-plus/nuxt': specifier: 1.1.4 - version: 1.1.4(@element-plus/icons-vue@2.3.2(vue@3.5.22(typescript@5.8.3)))(element-plus@2.11.5(vue@3.5.22(typescript@5.8.3)))(magicast@0.3.5) + version: 1.1.4(@element-plus/icons-vue@2.3.2(vue@3.5.22(typescript@5.8.3)))(element-plus@2.11.7(vue@3.5.22(typescript@5.8.3)))(magicast@0.3.5) '@nuxtjs/tailwindcss': specifier: 6.13.2 version: 6.13.2(magicast@0.3.5) @@ -64,8 +64,8 @@ importers: specifier: ^7.0.1 version: 7.0.1 element-plus: - specifier: 2.11.5 - version: 2.11.5(vue@3.5.22(typescript@5.8.3)) + specifier: 2.11.7 + version: 2.11.7(vue@3.5.22(typescript@5.8.3)) less: specifier: 4.2.1 version: 4.2.1 @@ -432,8 +432,8 @@ packages: cpu: [x64] os: [win32] - '@fastify/busboy@3.1.1': - resolution: {integrity: sha512-5DGmA8FTdB2XbDeEwc/5ZXBl6UbBAyBOOLlPuBnZ/N1SwdH9Ii+cOX3tBROlDgcTXxjOYnLMVoKk9+FXAw0CJw==} + '@fastify/busboy@3.2.0': + resolution: {integrity: sha512-m9FVDXU3GT2ITSe0UaMA5rU3QkfC/UXtCU8y0gSN/GugTqtVldOBWIB5V6V3sbmenVZUIpU6f+mPEO2+m5iTaA==} '@floating-ui/core@1.6.8': resolution: {integrity: sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA==} @@ -514,8 +514,8 @@ packages: resolution: {integrity: sha512-5XUvZuffe3KetyhbWwd4n2ktd7wraocCYw10tlM+/u/95iAz29GjNiuNxbCD1T6Bn1MyGc4QLVNKOWhzJkVFAw==} engines: {node: ^14.16.0 || >=16.0.0} - '@netlify/open-api@2.37.0': - resolution: {integrity: sha512-zXnRFkxgNsalSgU8/vwTWnav3R+8KG8SsqHxqaoJdjjJtnZR7wo3f+qqu4z+WtZ/4V7fly91HFUwZ6Uz2OdW7w==} + '@netlify/open-api@2.42.0': + resolution: {integrity: sha512-oHFCCo5FigIZcni/IioNKPwL9jC2++RUnHHfHFOhXKyLDGB8x93cU03N15RuZhG92+VM6dOzhM4WDEDeG6hXcQ==} engines: {node: '>=14.8.0'} '@netlify/runtime-utils@1.3.1': @@ -1521,16 +1521,16 @@ packages: resolution: {integrity: sha512-LOtTn+JgJvX8WfBVJtF08TGrdjuFzGJc4mkP8EdDI8ADbvO7kiexYep1o8dwnt0okb0jYclCDXF13xU7Ge4zSw==} engines: {node: '>=18.0.0'} - '@whatwg-node/fetch@0.10.6': - resolution: {integrity: sha512-6uzhO2aQ757p3bSHcemA8C4pqEXuyBqyGAM7cYpO0c6/igRMV9As9XL0W12h5EPYMclgr7FgjmbVQBoWEdJ/yA==} + '@whatwg-node/fetch@0.10.11': + resolution: {integrity: sha512-eR8SYtf9Nem1Tnl0IWrY33qJ5wCtIWlt3Fs3c6V4aAaTFLtkEQErXu3SSZg/XCHrj9hXSJ8/8t+CdMk5Qec/ZA==} engines: {node: '>=18.0.0'} - '@whatwg-node/node-fetch@0.7.18': - resolution: {integrity: sha512-IxKdVWfZYasGiyxBcsROxq6FmDQu3MNNiOYJ/yqLKhe+Qq27IIWsK7ItbjS2M9L5aM5JxjWkIS7JDh7wnsn+CQ==} + '@whatwg-node/node-fetch@0.8.1': + resolution: {integrity: sha512-cQmQEo7IsI0EPX9VrwygXVzrVlX43Jb7/DBZSmpnC7xH4xkyOnn/HykHpTaQk7TUs7zh59A5uTGqx3p2Ouzffw==} engines: {node: '>=18.0.0'} - '@whatwg-node/promise-helpers@1.3.1': - resolution: {integrity: sha512-D+OwTEunoQhVHVToD80dPhfz9xgPLqJyEA3F5jCRM14A2u8tBBQVdZekqfqx6ZAfZ+POT4Hb0dn601UKMsvADw==} + '@whatwg-node/promise-helpers@1.3.2': + resolution: {integrity: sha512-Nst5JdK47VIl9UcGwtv2Rcgyn5lWtZ0/mhRQ4G8NN2isxpq2TO30iqHzmwoJycjWuyUfg3GFXqP/gFHXeV57IA==} engines: {node: '>=16.0.0'} '@whatwg-node/server@0.9.71': @@ -1760,11 +1760,8 @@ packages: caniuse-api@3.0.0: resolution: {integrity: sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==} - caniuse-lite@1.0.30001713: - resolution: {integrity: sha512-wCIWIg+A4Xr7NfhTuHdX+/FKh3+Op3LBbSp2N5Pfx6T/LhdQy3GTyoTg48BReaW/MyMNZAkTadsBtai3ldWK0Q==} - - caniuse-lite@1.0.30001735: - resolution: {integrity: sha512-EV/laoX7Wq2J9TQlyIXRxTJqIw4sxfXS4OYgudGxBYRuTv0q7AM6yMEpU/Vo1I94thg9U6EZ2NfZx9GJq83u7w==} + caniuse-lite@1.0.30001753: + resolution: {integrity: sha512-Bj5H35MD/ebaOV4iDLqPEtiliTN29qkGtEHCwawWn4cYm+bPJM2NsaP30vtZcnERClMzp52J4+aw2UNbK4o+zw==} chalk@4.1.2: resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} @@ -2161,8 +2158,8 @@ packages: electron-to-chromium@1.5.202: resolution: {integrity: sha512-NxbYjRmiHcHXV1Ws3fWUW+SLb62isauajk45LUJ/HgIOkUA7jLZu/X2Iif+X9FBNK8QkF9Zb4Q2mcwXCcY30mg==} - element-plus@2.11.5: - resolution: {integrity: sha512-O+bIVHQCjUDm4GiIznDXRoS8ar2TpWLwfOGnN/Aam0VXf5kbuc4SxdKKJdovWNxmxeqbcwjsSZPKgtXNcqys4A==} + element-plus@2.11.7: + resolution: {integrity: sha512-Bh47wuzsqaNBNDkbtlOlZER1cGcOB8GsXp/+C9b95MOrk0wvoHUV4NKKK7xMkfYNFYdYysQ752oMhnExgAL6+g==} peerDependencies: vue: ^3.2.0 @@ -4686,11 +4683,11 @@ snapshots: dependencies: vue: 3.5.22(typescript@5.8.3) - '@element-plus/nuxt@1.1.4(@element-plus/icons-vue@2.3.2(vue@3.5.22(typescript@5.8.3)))(element-plus@2.11.5(vue@3.5.22(typescript@5.8.3)))(magicast@0.3.5)': + '@element-plus/nuxt@1.1.4(@element-plus/icons-vue@2.3.2(vue@3.5.22(typescript@5.8.3)))(element-plus@2.11.7(vue@3.5.22(typescript@5.8.3)))(magicast@0.3.5)': dependencies: '@element-plus/icons-vue': 2.3.2(vue@3.5.22(typescript@5.8.3)) '@nuxt/kit': 3.17.7(magicast@0.3.5) - element-plus: 2.11.5(vue@3.5.22(typescript@5.8.3)) + element-plus: 2.11.7(vue@3.5.22(typescript@5.8.3)) magic-string: 0.27.0 unplugin: 1.16.1 transitivePeerDependencies: @@ -4790,7 +4787,7 @@ snapshots: '@esbuild/win32-x64@0.25.10': optional: true - '@fastify/busboy@3.1.1': + '@fastify/busboy@3.2.0': optional: true '@floating-ui/core@1.6.8': @@ -4917,7 +4914,7 @@ snapshots: write-file-atomic: 6.0.0 optional: true - '@netlify/open-api@2.37.0': + '@netlify/open-api@2.42.0': optional: true '@netlify/runtime-utils@1.3.1': @@ -6026,25 +6023,25 @@ snapshots: '@whatwg-node/disposablestack@0.0.6': dependencies: - '@whatwg-node/promise-helpers': 1.3.1 + '@whatwg-node/promise-helpers': 1.3.2 tslib: 2.8.1 optional: true - '@whatwg-node/fetch@0.10.6': + '@whatwg-node/fetch@0.10.11': dependencies: - '@whatwg-node/node-fetch': 0.7.18 + '@whatwg-node/node-fetch': 0.8.1 urlpattern-polyfill: 10.1.0 optional: true - '@whatwg-node/node-fetch@0.7.18': + '@whatwg-node/node-fetch@0.8.1': dependencies: - '@fastify/busboy': 3.1.1 + '@fastify/busboy': 3.2.0 '@whatwg-node/disposablestack': 0.0.6 - '@whatwg-node/promise-helpers': 1.3.1 + '@whatwg-node/promise-helpers': 1.3.2 tslib: 2.8.1 optional: true - '@whatwg-node/promise-helpers@1.3.1': + '@whatwg-node/promise-helpers@1.3.2': dependencies: tslib: 2.8.1 optional: true @@ -6052,8 +6049,8 @@ snapshots: '@whatwg-node/server@0.9.71': dependencies: '@whatwg-node/disposablestack': 0.0.6 - '@whatwg-node/fetch': 0.10.6 - '@whatwg-node/promise-helpers': 1.3.1 + '@whatwg-node/fetch': 0.10.11 + '@whatwg-node/promise-helpers': 1.3.2 tslib: 2.8.1 optional: true @@ -6150,7 +6147,7 @@ snapshots: autoprefixer@10.4.21(postcss@8.5.6): dependencies: browserslist: 4.24.4 - caniuse-lite: 1.0.30001713 + caniuse-lite: 1.0.30001753 fraction.js: 4.3.7 normalize-range: 0.1.2 picocolors: 1.1.1 @@ -6193,14 +6190,14 @@ snapshots: browserslist@4.24.4: dependencies: - caniuse-lite: 1.0.30001713 + caniuse-lite: 1.0.30001753 electron-to-chromium: 1.5.137 node-releases: 2.0.19 update-browserslist-db: 1.1.1(browserslist@4.24.4) browserslist@4.25.2: dependencies: - caniuse-lite: 1.0.30001735 + caniuse-lite: 1.0.30001753 electron-to-chromium: 1.5.202 node-releases: 2.0.19 update-browserslist-db: 1.1.3(browserslist@4.25.2) @@ -6313,13 +6310,11 @@ snapshots: caniuse-api@3.0.0: dependencies: browserslist: 4.25.2 - caniuse-lite: 1.0.30001735 + caniuse-lite: 1.0.30001753 lodash.memoize: 4.1.2 lodash.uniq: 4.5.0 - caniuse-lite@1.0.30001713: {} - - caniuse-lite@1.0.30001735: {} + caniuse-lite@1.0.30001753: {} chalk@4.1.2: dependencies: @@ -6663,7 +6658,7 @@ snapshots: electron-to-chromium@1.5.202: {} - element-plus@2.11.5(vue@3.5.22(typescript@5.8.3)): + element-plus@2.11.7(vue@3.5.22(typescript@5.8.3)): dependencies: '@ctrl/tinycolor': 3.6.1 '@element-plus/icons-vue': 2.3.2(vue@3.5.22(typescript@5.8.3)) @@ -7551,7 +7546,7 @@ snapshots: netlify@13.3.5: dependencies: - '@netlify/open-api': 2.37.0 + '@netlify/open-api': 2.42.0 lodash-es: 4.17.21 micro-api-client: 3.3.0 node-fetch: 3.3.2