fix: global for sing-box

Zephyruso · Feb 19, 2025 · 14027c9 · 14027c9
1 parent 5cc577f
commit 14027c9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git 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
@@ -137,7 +137,7 @@ export default defineComponent({
                 key={mode}
                 value={mode}
               >
-                {t(mode.toLowerCase()) || mode}
+                {t(mode.toLowerCase())}
               </option>
             )
           })}

diff --git 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 = () => {