refactor: specialType

This commit is contained in:
kunish 2023-09-05 02:42:54 +08:00
parent a12fb8a6a9
commit c53d9624ca
No known key found for this signature in database
GPG Key ID: 647A12B4F782C430
2 changed files with 12 additions and 12 deletions

View File

@ -1,7 +1,7 @@
import { createMemo } from 'solid-js' import { createMemo, Show } from 'solid-js'
import { twMerge } from 'tailwind-merge' import { twMerge } from 'tailwind-merge'
import { Latency } from '~/components' import { Latency } from '~/components'
import { filterGroupType, formatProxyType } from '~/helpers' import { filterSpecialProxyType, formatProxyType } from '~/helpers'
import { useProxies } from '~/signals' import { useProxies } from '~/signals'
export const ProxyNodeCard = (props: { export const ProxyNodeCard = (props: {
@ -12,6 +12,14 @@ export const ProxyNodeCard = (props: {
const { proxyName, isSelected, onClick } = props const { proxyName, isSelected, onClick } = props
const { proxyNodeMap } = useProxies() const { proxyNodeMap } = useProxies()
const proxyNode = createMemo(() => proxyNodeMap()[proxyName]) const proxyNode = createMemo(() => proxyNodeMap()[proxyName])
const specialType = () =>
filterSpecialProxyType(proxyNode()?.type)
? proxyNode()?.xudp
? 'xudp'
: proxyNode()?.udp
? 'udp'
: null
: null
return ( return (
<div <div
@ -32,15 +40,7 @@ export const ProxyNodeCard = (props: {
)} )}
> >
{formatProxyType(proxyNode()?.type)} {formatProxyType(proxyNode()?.type)}
{filterGroupType(proxyNode()?.type) ? ( <Show when={specialType()}>{` :: ${specialType()}`}</Show>
<span>
{' :: '}
{proxyNode()?.xudp && 'x'}
{proxyNode()?.udp && 'udp'}
</span>
) : (
<span>{proxyNode()?.now}</span>
)}
</div> </div>
<div class="text-xs"> <div class="text-xs">
<Latency name={props.proxyName} /> <Latency name={props.proxyName} />

View File

@ -34,7 +34,7 @@ export const formatProxyType = (type = '') => {
return t return t
} }
export const filterGroupType = (type = '') => { export const filterSpecialProxyType = (type = '') => {
const t = type.toLowerCase() const t = type.toLowerCase()
const conditions = [ const conditions = [
'selector', 'selector',