mirror of
https://github.com/woodchen-ink/clash-and-dashboard.git
synced 2025-07-18 14:01:56 +08:00
Fix: display GLOBAL select
This commit is contained in:
parent
6c04fa4cb8
commit
ddc2138cb7
@ -3,7 +3,7 @@ import useSWR from 'swr'
|
||||
import EE from '@lib/event'
|
||||
import { useRound } from '@lib/hook'
|
||||
import { Card, Header, Icon, Checkbox } from '@components'
|
||||
import { useI18n, useConfig, useProxy, useProxyProviders } from '@stores'
|
||||
import { useI18n, useConfig, useProxy, useProxyProviders, useGeneral } from '@stores'
|
||||
import * as API from '@lib/request'
|
||||
|
||||
import { Proxy, Group, Provider } from './components'
|
||||
@ -28,14 +28,20 @@ export function compareDesc (a: API.Proxy, b: API.Proxy) {
|
||||
}
|
||||
|
||||
function ProxyGroups () {
|
||||
const { groups } = useProxy()
|
||||
const { groups, global } = useProxy()
|
||||
const { data: config, set: setConfig } = useConfig()
|
||||
const { general } = useGeneral()
|
||||
const { useTranslation } = useI18n()
|
||||
const { t } = useTranslation('Proxies')
|
||||
|
||||
const list = useMemo(
|
||||
() => general.mode === 'global' ? [global] : groups,
|
||||
[general, groups, global]
|
||||
)
|
||||
|
||||
return <>
|
||||
{
|
||||
groups.length !== 0 &&
|
||||
list.length !== 0 &&
|
||||
<div className="proxies-container">
|
||||
<Header title={t('groupTitle')}>
|
||||
<Checkbox
|
||||
@ -48,7 +54,7 @@ function ProxyGroups () {
|
||||
<Card className="proxies-group-card">
|
||||
<ul className="proxies-group-list">
|
||||
{
|
||||
groups.map(p => (
|
||||
list.map(p => (
|
||||
<li className="proxies-group-item" key={p.name}>
|
||||
<Group config={p} />
|
||||
</li>
|
||||
|
@ -92,7 +92,7 @@ export interface Data {
|
||||
/**
|
||||
* clash proxy mode
|
||||
*/
|
||||
mode?: string
|
||||
mode?: 'script' | 'rule' | 'direct' | 'global'
|
||||
|
||||
/**
|
||||
* clash tty log level
|
||||
|
@ -163,7 +163,7 @@ export function useGeneral () {
|
||||
port: data.port,
|
||||
socksPort: data['socks-port'],
|
||||
redirPort: data['redir-port'],
|
||||
mode: data.mode,
|
||||
mode: data.mode.toLowerCase() as Models.Data['general']['mode'],
|
||||
logLevel: data['log-level'],
|
||||
allowLan: data['allow-lan']
|
||||
})
|
||||
|
Loading…
x
Reference in New Issue
Block a user