diff --git a/src/components/sidebar/LogsCtrl.tsx b/src/components/sidebar/LogsCtrl.tsx index 53e922a6..7b9d57a2 100644 --- a/src/components/sidebar/LogsCtrl.tsx +++ b/src/components/sidebar/LogsCtrl.tsx @@ -20,10 +20,16 @@ export default defineComponent({ const { t } = useI18n() const settingsModel = ref(false) const insertLogSearchHistory = debounce((log: string) => { - if (!log || logSearchHistory.value.includes(log)) { + if (!log) { return } + const idx = logSearchHistory.value.indexOf(log) + + if (idx !== -1) { + logSearchHistory.value.splice(idx, 1) + } + logSearchHistory.value.unshift(log) if (logSearchHistory.value.length > 5) { logSearchHistory.value.pop() diff --git a/src/components/sidebar/ProxiesCtrl.tsx b/src/components/sidebar/ProxiesCtrl.tsx index 1cd9dca2..5bdb2256 100644 --- a/src/components/sidebar/ProxiesCtrl.tsx +++ b/src/components/sidebar/ProxiesCtrl.tsx @@ -137,7 +137,7 @@ export default defineComponent({ key={mode} value={mode} > - {t(mode.toLowerCase()) || mode} + {t(mode.toLowerCase())} ) })} diff --git a/src/composables/proxies.ts b/src/composables/proxies.ts index ab96aa6f..91e61d6d 100644 --- a/src/composables/proxies.ts +++ b/src/composables/proxies.ts @@ -1,4 +1,3 @@ -import { isSingBox } from '@/api' import { PROXY_TAB_TYPE } from '@/constant' import { configs } from '@/store/config' import { @@ -24,19 +23,13 @@ const renderGroups = computed(() => { return proxyProviederList.value.map((group) => group.name) } - if (!isSingBox.value && configs.value?.mode.toUpperCase() === GLOBAL) { + if (configs.value?.mode.toUpperCase() === GLOBAL) { return [GLOBAL] } - const proxyGroups = [...proxyGroupList.value] - - if (isSingBox.value) { - proxyGroups.push(GLOBAL) - } - return manageHiddenGroup.value - ? proxyGroups - : proxyGroups.filter((name) => !hiddenGroupMap.value[name]) + ? proxyGroupList.value + : proxyGroupList.value.filter((name) => !hiddenGroupMap.value[name]) }) export const useProxies = () => {