From a5f0537cb09bf8ab47ea586628a72d0396b5a894 Mon Sep 17 00:00:00 2001
From: layhuts <layhuts@163.com>
Date: Sat, 9 May 2026 13:38:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86viewedKeys=E7=94=B1?=
 =?UTF-8?q?=E4=BA=8E=20FIFO=20=E9=A1=BA=E5=BA=8F=EF=BC=8C=E6=98=BE?=
 =?UTF-8?q?=E5=BC=8F=E6=8F=90=E4=BE=9B=E7=9A=84=E5=80=BC=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E4=BC=9A=E8=A2=AB=E5=BC=82=E6=AD=A5=E5=AD=98=E5=82=A8=E6=81=A2?=
 =?UTF-8?q?=E5=A4=8D=E9=9D=99=E9=BB=98=E5=9C=B0=E7=A7=BB=E9=99=A4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/src/vxe-table/use-viewed-row.ts   | 60 ++++++++++---------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/packages/effects/plugins/src/vxe-table/use-viewed-row.ts b/packages/effects/plugins/src/vxe-table/use-viewed-row.ts
index 8b60a2dd7..bba919b3e 100644
--- a/packages/effects/plugins/src/vxe-table/use-viewed-row.ts
+++ b/packages/effects/plugins/src/vxe-table/use-viewed-row.ts
@@ -198,39 +198,45 @@ export function useViewedRow<T = any>(
   const persist = useDebounceFn(persistImmediate, 300);
 
   // ========== 从存储恢复 ==========
-  function restoreFromStorage() {
+  async function restoreFromStorage(): Promise<void> {
     if (!adapter) return;
 
-    adapter
-      .getKeys()
-      .then((stored) => {
-        if (stored && stored.length > 0) {
-          for (const key of stored) {
-            viewedSet.value.add(key);
-          }
-          if (maxSize > 0) {
-            enforceMaxSize(viewedSet.value, maxSize);
-          }
-          triggerRef(viewedSet);
+    try {
+      const stored = await adapter
+        .getKeys();
+      if (stored && stored.length > 0) {
+        for (const key of stored) {
+          viewedSet.value.add(key);
         }
-      })
-      .catch((error) => {
-        console.error('[viewedRow] restore failed:', error);
-      });
-  }
-
-  restoreFromStorage();
-
-  // 合并外部传入的 viewedKeys
-  if (options.viewedKeys) {
-    const keys = isRef(options.viewedKeys)
-      ? options.viewedKeys.value
-      : options.viewedKeys;
-    for (const key of keys) {
-      viewedSet.value.add(key);
+        if (maxSize > 0) {
+          enforceMaxSize(viewedSet.value, maxSize);
+        }
+        triggerRef(viewedSet);
+      }
+    } catch (error) {
+      console.error('[viewedRow] restore failed:', error);
     }
   }
 
+  // 先恢复存储，再合并外部 viewedKeys，确保 viewedKeys 是最新插入的（最后被淘汰）
+  restoreFromStorage().then(() => {
+    if (options.viewedKeys) {
+      const keys = isRef(options.viewedKeys)
+        ? options.viewedKeys.value
+        : options.viewedKeys;
+      updateViewedSet((set) => {
+        let changed = false;
+        for (const key of keys) {
+          if (!set.has(key)) {
+            set.add(key);
+            changed = true;
+          }
+        }
+        return changed;
+      });
+    }
+  });
+
   // ========== 更新 viewedSet 的统一入口 ==========
   function updateViewedSet(updater: (set: Set<number | string>) => boolean) {
     const changed = updater(viewedSet.value);