wood/clash-and-dashboard
1
0
Fork 0
mirror of https://github.com/woodchen-ink/clash-and-dashboard.git synced 2025-07-18 14:01:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: cannot switch proxy in Global

Browse Source
This commit is contained in:
Dreamacro 2019-08-06 16:00:26 +08:00
parent e52541847f
commit f4d9de2a14
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/stores/HookStore.ts
View File

@ -44,6 +44,8 @@ function useData () {
const policyGroup = new Set(['Selector', 'URLTest', 'Fallback', 'LoadBalance']) const policyGroup = new Set(['Selector', 'URLTest', 'Fallback', 'LoadBalance'])
const unUsedProxy = new Set(['DIRECT', 'REJECT', 'GLOBAL']) const unUsedProxy = new Set(['DIRECT', 'REJECT', 'GLOBAL'])
const proxyList = rawProxies.data.proxies['GLOBAL'] as API.Group const proxyList = rawProxies.data.proxies['GLOBAL'] as API.Group
// fix missing name
proxyList.name = 'GLOBAL'
const proxies = proxyList.all const proxies = proxyList.all
.filter(key => !unUsedProxy.has(key)) .filter(key => !unUsedProxy.has(key))
.map(key => ({ ...rawProxies.data.proxies[key], name: key })) .map(key => ({ ...rawProxies.data.proxies[key], name: key }))
@ -51,7 +53,7 @@ function useData () {
setMulti({ setMulti({
proxy: proxy as API.Proxy[], proxy: proxy as API.Proxy[],
proxyGroup: groups as API.Group[], proxyGroup: general.mode === 'Global' ? [proxyList] : groups as API.Group[],
rules: rules.data.rules rules: rules.data.rules
}) })
} }