diff --git a/composables/configJson.ts b/composables/configJson.ts index 9a5b984..4a59f9e 100644 --- a/composables/configJson.ts +++ b/composables/configJson.ts @@ -7,7 +7,7 @@ import { bounce } from "~/utils"; const b = bounce(600); export type ConfigServerUrlType = Array; -export const updateConfigJsonBounce = (configJsonSeverUrl?: ConfigServerUrlType) => { +export const updateConfigJsonBounce = (configJsonSeverUrl?: ConfigServerUrlType | null) => { b(async () => { const mainStore = useMainStore(); if (mainStore.createConfigInEasytier) { @@ -16,7 +16,7 @@ export const updateConfigJsonBounce = (configJsonSeverUrl?: ConfigServerUrlType) }); }; -export const updateConfigJson = async (configJsonSeverUrl?: ConfigServerUrlType) => { +export const updateConfigJson = async (configJsonSeverUrl?: ConfigServerUrlType | null) => { const mainStore = useMainStore(); const path = import.meta.env.VITE_CONFIG_FILE_NAME; if (isNil(configJsonSeverUrl)) { diff --git a/package.json b/package.json index ff8e29a..fc55aac 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.5.1", + "version": "1.5.2", "scripts": { "dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0", "build": "nuxt generate --dotenv env/.env.prod", diff --git a/pages/member.vue b/pages/member.vue index 56ebd64..5bfefad 100644 --- a/pages/member.vue +++ b/pages/member.vue @@ -72,12 +72,14 @@ {{ row.ipv4 || "-" }}
- - {{ row.proxy?.[0] || "-" }} - + + + {{ row.proxy?.[0] || "-" }}代理 + +
@@ -249,7 +251,7 @@ const proxyMember = data.proxy?.filter(proxy => proxy.src.startsWith(`${ipv4}:`)); const proxyObj: Record = {}; for (const proxy of proxyMember) { - proxyObj[proxy.src.split(":")[0]] = [proxy.transport_type, proxy.state]; + proxyObj[proxy.dst.split(":")[0]] = [proxy.transport_type, proxy.state]; } return data.member.map(m => { m.proxy = proxyObj?.[m.ipv4.split(":")?.[0]] || m?.proxy || ["", "Closed"]; diff --git a/pages/nodesList.vue b/pages/nodesList.vue index d3c49b1..c35965f 100644 --- a/pages/nodesList.vue +++ b/pages/nodesList.vue @@ -143,7 +143,6 @@