From 83159151b986502a663dfe74748e0ba1408a3a6e Mon Sep 17 00:00:00 2001
From: Jokul <wangshengshan011@163.com>
Date: Sun, 12 Jul 2026 00:28:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20DbSelector=20=E8=BF=9E=E6=8E=A5=E5=90=8E?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=80=89=E6=8B=A9=E7=AC=AC=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E6=9C=89=E6=95=B0=E6=8D=AE=E7=9A=84=20DB=EF=BC=8C=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=20DB=20=E6=97=B6=E9=87=8D=E6=96=B0=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E9=94=AE=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 getDefaultDb(): 优先恢复 lastDbMap > 第一个有数据的 DB > DB0
- onMounted 执行 DB 选择（覆盖首次连接和右键重连场景）
- activeId watcher 改为完整 DB 选择流程（不再硬编码 DB0）
- isConnected watcher 精简为仅加载自定义名称（避免竞态重复调用）
- switchDb() 新增 scanKeys 重新加载键树
---
 .../src/components/key/DbSelector.vue         | 46 +++++++++++++++----
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/renderer/src/components/key/DbSelector.vue b/src/renderer/src/components/key/DbSelector.vue
index 2cc4167..82d4591 100644
--- a/src/renderer/src/components/key/DbSelector.vue
+++ b/src/renderer/src/components/key/DbSelector.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watch, computed } from 'vue'
+import { ref, watch, computed, onMounted } from 'vue'
 import { useConnectionStore } from '@renderer/stores/connection'
 import { useKeyStore } from '@renderer/stores/key'
 import { useI18n } from '@renderer/i18n'
@@ -113,14 +113,36 @@ async function fetchDbInfo() {
   }
 }
 
+// Determine the default DB: saved last DB > first non-empty > 0
+function getDefaultDb(): number {
+  if (!connStore.activeId) return 0
+  // Restore saved DB if exists
+  const saved = connStore.lastDbMap[connStore.activeId]
+  if (saved !== undefined && saved !== null) return saved
+  // Auto-detect: first non-empty DB
+  for (let i = 0; i < dbCount.value; i++) {
+    if ((dbKeyCounts.value[i] ?? 0) > 0) return i
+  }
+  return 0
+}
+
+// Initialize DB selection on mount (covers initial connect and right-click reconnect)
+onMounted(async () => {
+  if (!connStore.isConnected || !connStore.activeId) return
+  loadCustomNames()
+  await fetchDbInfo()
+  const defaultDb = getDefaultDb()
+  selectedDb.value = defaultDb
+  keyStore.currentDb = defaultDb
+  await window.electronAPI.redis.selectDb(connStore.activeId, defaultDb)
+  await keyStore.scanKeys(connStore.activeId, '0', true)
+})
+
 watch(
   () => connStore.isConnected,
-  async (connected) => {
+  (connected) => {
     if (connected) {
-      selectedDb.value = 0
-      keyStore.currentDb = 0
       loadCustomNames()
-      await fetchDbInfo()
     }
   }
 )
@@ -128,12 +150,14 @@ watch(
 watch(
   () => connStore.activeId,
   async () => {
+    if (!connStore.isConnected || !connStore.activeId) return
     loadCustomNames()
-    if (connStore.isConnected) {
-      selectedDb.value = 0
-      keyStore.currentDb = 0
-      await fetchDbInfo()
-    }
+    await fetchDbInfo()
+    const defaultDb = getDefaultDb()
+    selectedDb.value = defaultDb
+    keyStore.currentDb = defaultDb
+    await window.electronAPI.redis.selectDb(connStore.activeId, defaultDb)
+    await keyStore.scanKeys(connStore.activeId, '0', true)
   }
 )
 
@@ -142,6 +166,8 @@ async function switchDb(db: number) {
   selectedDb.value = db
   connStore.saveLastDb(connStore.activeId, db)
   await keyStore.selectDb(connStore.activeId, db)
+  // Reload key tree for the new DB
+  await keyStore.scanKeys(connStore.activeId, '0', true)
 }
 
 function formatCount(n: number): string {