Upload 前端页面/core/侧边栏数据引擎.js

前端页面/core/侧边栏数据引擎.js

@@ -184,11 +184,15 @@ export async function loadSidebarContent({
     // 现统一收口到本函数：所有取数路径都先过滤、再切片，renderBatch 只负责渲染。
     // 创作者Tab的 keyword 由后端搜索接口过滤，此处不做本地过滤（与原口径一致）。
     const _applySearchScope = (dataArray) => {
-        if (!keyword || tab === "creators") return dataArray;
-        return filterItemsByKeyword(dataArray, keyword);
+        const scoped = !keyword || tab === "creators" ? dataArray : filterItemsByKeyword(dataArray, keyword);
+        if (!expandItemId || tab === "creators") return scoped;
+        const target = dataArray.find(item => String(item.id) === String(expandItemId));
+        if (!target) return scoped;
+        return [target, ...scoped.filter(item => String(item.id) !== String(expandItemId))];
     };
 
     // ========== 渲染函数：渲染一批数据（只渲染，过滤由 _applySearchScope 统一负责）==========
+    let targetLookupStarted = false;
     const renderBatch = (dataArray, append = false) => {
         if (renderToken !== getRenderToken()) return;
 
@@ -209,7 +213,7 @@ export async function loadSidebarContent({
             emptyState.textContent = t(keyword ? 'feedback.no_search_results' : 'feedback.no_list_data');
             emptyState.setAttribute('role', 'status');
             contentArea.replaceChildren(emptyState);
-            return 0;
+            if (!expandItemId) return 0;
         }
 
         // 渲染卡片
@@ -224,7 +228,7 @@ export async function loadSidebarContent({
                 cards.push(card);
                 fragment.appendChild(card);
                 // 检查是否是需要展开的卡片
-                if (expandItemId && data.id === expandItemId) {
+                if (expandItemId && String(data.id) === String(expandItemId)) {
                     targetCard = card;
                 }
             });
@@ -256,25 +260,28 @@ export async function loadSidebarContent({
             });
         }
 
-        // 【问题1修复】首屏未找到目标卡片，fallback到独立详情页
-        if (expandItemId && !targetCard && !append && canNavigate()) {
+        // 目标不在列表快照中时补取，仍使用原榜单卡片展开。
+        if (expandItemId && !targetCard && !append && !targetLookupStarted && canNavigate()) {
+            targetLookupStarted = true;
             (async () => {
                 try {
                     const res = await api.getItemById(expandItemId);
                     if (!canNavigate()) return;
-                    if (res.status === "success" && res.data) {
-                        const module = await import("../market/资源详情页面组件.js");
-                        if (!canNavigate()) return;
-                        const view = module.createItemDetailView(res.data, currentUser);
-                        if (!canNavigate()) {
-                            view._cleanup?.();
-                            return;
-                        }
-                        window.dispatchEvent(new CustomEvent("comfy-route-view", { detail: { view } }));
+                    if (res?.status !== "success" || !res.data || String(res.data.id) !== String(expandItemId)) {
+                        showToast(t('notif.item_not_found'), "error");
+                        return;
                     }
-                } catch (e) {
-                    if (!canNavigate()) return;
-                    console.warn("展开卡片详情失败");
+                    const target = state.allData.find(item => String(item.id) === String(expandItemId)) || proxyImages([res.data])[0];
+                    state.loader?.stop();
+                    state.loader = null;
+                    state.allData = [target, ...state.allData.filter(item => String(item.id) !== String(expandItemId))];
+                    const scoped = _applySearchScope(state.allData);
+                    renderBatch(scoped.slice(0, pageSize), false);
+                    if (scoped.length > pageSize) {
+                        _setupPaginationLoader(contentArea, state, pageSize, loadMoreData, keyword, tab, renderToken, getRenderToken);
+                    }
+                } catch (_) {
+                    if (canNavigate()) showToast(t('notif.load_item_failed'), "error");
                 }
             })();
         }