diff --git a/src/components/Tags/index.tsx b/src/components/Tags/index.tsx index e1fdb07..043ea6e 100644 --- a/src/components/Tags/index.tsx +++ b/src/components/Tags/index.tsx @@ -6,7 +6,7 @@ import classnames from 'classnames' import './style.scss' interface TagsProps extends BaseComponentProps, I18nProps { - data: Set + data: string[] onClick: (name: string) => void select: string rowHeight: number @@ -40,8 +40,7 @@ class TagsClass extends React.Component { const rowHeight = this.state.expand ? 'auto' : this.props.rowHeight const handleClick = canClick ? onClick : noop - const tags = [...data] - .sort() + const tags = data .map(t => { const tagClass = classnames({ 'tags-selected': select === t, 'can-click': canClick }) return ( diff --git a/src/containers/Proxies/components/Group/index.tsx b/src/containers/Proxies/components/Group/index.tsx index e549054..e691a20 100644 --- a/src/containers/Proxies/components/Group/index.tsx +++ b/src/containers/Proxies/components/Group/index.tsx @@ -21,7 +21,6 @@ export class Group extends React.Component { render () { const { config } = this.props - const proxies = new Set(config.all) const canClick = config.type === 'Selector' return (
@@ -32,7 +31,7 @@ export class Group extends React.Component {
!unUsedProxy.has(key)) .map(key => ({ ...rawProxies.data.proxies[key], name: key })) const [proxy, groups] = partition(proxies, proxy => !policyGroup.has(proxy.type)) this.data.proxy = proxy as API.Proxy[] this.data.proxyGroup = groups as API.Group[] - this.data.rules = rules.data.rules }) }