增加根据windows主题切换主题颜色的功能,优化高级配置界面显示,增加网卡名称配置

This commit is contained in:
leizi97
2024-11-04 21:23:20 +08:00
parent ddf4c32ae6
commit cf351b8708
10 changed files with 54 additions and 35 deletions
+2 -13
View File
@@ -4,17 +4,6 @@
</NuxtLayout> </NuxtLayout>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { useDark, useToggle, usePreferredDark } from "@vueuse/core"; import { initTheme } from "~/composables/theme";
import { isFunction } from "lodash-es"; initTheme();
const isDark = usePreferredDark();
const darkConfig = useDark({
selector: "html",
attribute: "class",
valueDark: "dark",
valueLight: "",
});
const toggleDark = useToggle(darkConfig);
if (isDark && isFunction(toggleDark)) {
toggleDark(isDark);
}
</script> </script>
+21
View File
@@ -0,0 +1,21 @@
import { useDark, useToggle, usePreferredDark } from "@vueuse/core";
import { isFunction } from "lodash-es";
const isDark = usePreferredDark();
const darkConfig = useDark({
selector: "html",
attribute: "class",
valueDark: "dark",
valueLight: "",
});
const toggleDark = useToggle(darkConfig);
export const initTheme = () => {
if (isDark && isFunction(toggleDark)) {
toggleDark(isDark.value);
}
};
export const setTheme = (dark: boolean) => {
if (isFunction(toggleDark)) {
toggleDark(dark);
}
}
+1 -1
View File
@@ -3,7 +3,7 @@
"private": true, "private": true,
"author": "leizi97", "author": "leizi97",
"description": "A simple network initiator based on Easytier", "description": "A simple network initiator based on Easytier",
"version": "1.1.1", "version": "1.1.2",
"scripts": { "scripts": {
"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0", "dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
"build": "nuxt generate --dotenv env/.env.prod" "build": "nuxt generate --dotenv env/.env.prod"
+20 -17
View File
@@ -1,41 +1,44 @@
<template> <template>
<div class="h-full overflow-auto flex flex-col items-start px-[25px]"> <div class="h-full overflow-auto flex flex-col items-start px-[25px]">
<div><ElCheckbox v-model="mainStore.config.coonectAfterStart">软件启动后自动"启动联机"(搭配开机自启无感联机)</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.disableIpv6">不使用IPv6</ElCheckbox></div> <div><ElCheckbox v-model="mainStore.config.disableIpv6">不使用IPv6</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口只连接到对等节点</ElCheckbox></div> <div class="flex items-center gap-[10px]">
<div><ElCheckbox v-model="mainStore.config.enablExitNode">允许此节点成为出口节点</ElCheckbox></div> <ElCheckbox v-model="mainStore.config.devName">自定义网卡名</ElCheckbox>
<div><ElCheckbox v-model="mainStore.config.disableEncryption">禁用对等节点通信的加密默认为false必须与对等节点相同</ElCheckbox></div> <ElInput maxlength="10" v-model="mainStore.config.devNameValue" placeholder="请输入网卡名"/>
<div><ElCheckbox v-model="mainStore.config.multiThread">使用多线程运行时默认为单线程</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.noTun">不创建TUN设备可以使用子网代理访问节点</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.latencyfirst">延迟优先模式将尝试使用最低延迟路径转发流量默认使用最短路径</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
<div>
<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">转发所有对等节点的RPC数据包即使对等节点不在转发网络白名单内</ElCheckbox>
</div> </div>
<div><ElCheckbox v-model="mainStore.config.disbleListenner">不监听任何端口只连接到对等节点</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.coonectAfterStart">软件启动后自动"启动联机"(搭配开机自启无感联机)</ElCheckbox></div>
<div class="flex items-center gap-[15px] flex-nowrap"> <div class="flex items-center gap-[15px] flex-nowrap">
<ElCheckbox v-model="mainStore.config.saveErrorLog">输出日志到本地</ElCheckbox> <ElCheckbox v-model="mainStore.config.saveErrorLog">输出日志到本地</ElCheckbox>
<div class="w-[140px]"> <div class="w-[140px]">
<ElSelect <ElSelect
v-model="mainStore.config.logLevel" v-model="mainStore.config.logLevel"
placeholder="请选择日志等级" placeholder="请选择日志等级"
class="ml-[5px]" class="ml-[5px]">
>
<ElOption <ElOption
v-for="item in data" v-for="item in data"
:key="item" :key="item"
:label="`level - ${item}`" :label="`level - ${item}`"
:value="item" :value="item"></ElOption>
></ElOption>
</ElSelect> </ElSelect>
</div> </div>
<ElButton <ElButton
@click="openLogDir" @click="openLogDir"
size="small" size="small">
>
打开日志目录 打开日志目录
</ElButton> </ElButton>
</div> </div>
<ElDivider />
<div><ElCheckbox v-model="mainStore.config.enablExitNode">允许此节点成为出口节点</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.disableEncryption">禁用对等节点通信的加密默认为false必须与对等节点相同</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.multiThread">使用多线程运行时默认为单线程</ElCheckbox></div>
<ElDivider />
<div><ElCheckbox v-model="mainStore.config.noTun">不创建TUN设备可以使用子网代理访问节点</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.useSmoltcp">为子网代理启用smoltcp堆栈</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.latencyfirst">延迟优先模式将尝试使用最低延迟路径转发流量默认使用最短路径</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.disableUdpHolePunching">禁用UDP打洞功能</ElCheckbox></div>
<div>
<ElCheckbox v-model="mainStore.config.relayAllPeerrpc">转发所有对等节点的RPC数据包即使对等节点不在转发网络白名单内</ElCheckbox>
</div>
</div> </div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
+3
View File
@@ -714,6 +714,9 @@
if (config.saveErrorLog) { if (config.saveErrorLog) {
args.push("--file-log-level", config.logLevel, "--file-log-dir", import.meta.env.VITE_LOG_PATH); args.push("--file-log-level", config.logLevel, "--file-log-dir", import.meta.env.VITE_LOG_PATH);
} }
if(config.devName && config.devNameValue) {
args.push("--dev-name", config.devNameValue);
}
return args; return args;
}; };
+1 -1
View File
@@ -1109,7 +1109,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
[[package]] [[package]]
name = "easytier-game" name = "easytier-game"
version = "1.1.1" version = "1.1.2"
dependencies = [ dependencies = [
"log", "log",
"planif", "planif",
+1 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "easytier-game" name = "easytier-game"
version = "1.1.1" version = "1.1.2"
homepage = "https://github.com/EasyTier/EasyTier" homepage = "https://github.com/EasyTier/EasyTier"
repository = "https://github.com/EasyTier/EasytierGame" repository = "https://github.com/EasyTier/EasytierGame"
description = "A simple network initiator based on Easytier" description = "A simple network initiator based on Easytier"
+2 -2
View File
@@ -1,7 +1,7 @@
{ {
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json", "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
"productName": "easytier-game", "productName": "easytier-game",
"version": "1.1.0", "version": "1.1.2",
"identifier": "com.tauri.easytier-game", "identifier": "com.tauri.easytier-game",
"build": { "build": {
@@ -13,7 +13,7 @@
"app": { "app": {
"windows": [ "windows": [
{ {
"title": "easytier-game 1.1.1", "title": "easytier-game 1.1.2",
"width": 335, "width": 335,
"height": 305, "height": 305,
"resizable": false, "resizable": false,
+2
View File
@@ -26,6 +26,8 @@ export default defineStore("main", {
dhcp: true, // 是否使用DHCP dhcp: true, // 是否使用DHCP
saveErrorLog: true, // 是否保存错误日志 saveErrorLog: true, // 是否保存错误日志
logLevel: "error", //日志等级 logLevel: "error", //日志等级
devName: false, //自定义网卡名
devNameValue: "", //自定义网卡名
}, },
configStartEnable: false, //使用配置文件启动 configStartEnable: false, //使用配置文件启动
configPath: "", //配置文件路径 configPath: "", //配置文件路径
+1
View File
@@ -6,6 +6,7 @@
"components/**/*.ts", "components/**/*.ts",
"components/**/*.js", "components/**/*.js",
"components/**/*.vue", "components/**/*.vue",
"app.vue",
"pages/**/*.ts", "pages/**/*.ts",
"pages/**/*.js", "pages/**/*.js",
"pages/**/*.vue", "pages/**/*.vue",