CalvinBackup/CyberStrikeAI
1
0
Fork 0
mirror of https://github.com/Ed1s0nZ/CyberStrikeAI.git synced 2026-08-14 23:20:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add files via upload

Browse Source
This commit is contained in:
公明
2026-06-30 11:06:29 +08:00
committed by GitHub
parent d03f2fcf2b
commit cfc49ba16f
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/static/js/chat.js
+10 -12
View File
@@ -6623,13 +6623,11 @@ function goConversationsPage(page) {
const totalPages = Math.max(1, Math.ceil((conversationsPagination.total || 0) / conversationsPagination.pageSize) || 1); const totalPages = Math.max(1, Math.ceil((conversationsPagination.total || 0) / conversationsPagination.pageSize) || 1);
const next = Math.min(Math.max(1, page), totalPages); const next = Math.min(Math.max(1, page), totalPages);
const lastRendered = conversationsPagination.lastRenderedPage; const lastRendered = conversationsPagination.lastRenderedPage;
const alreadyOnPage = next === conversationsPagination.page if (lastRendered != null && next === lastRendered) {
&& (lastRendered == null || next === lastRendered);
if (alreadyOnPage) {
return; return;
} }
const fromPage = typeof lastRendered === 'number' ? lastRendered : conversationsPagination.page; const fromPage = typeof lastRendered === 'number' ? lastRendered : conversationsPagination.page;
conversationsPagination.skipEmptyDirection = next < fromPage ? -1 : 1; conversationsPagination.skipEmptyDirection = next > fromPage ? 1 : (next < fromPage ? -1 : 0);
conversationsPagination._emptySkipCount = 0; conversationsPagination._emptySkipCount = 0;
conversationsPagination.page = next; conversationsPagination.page = next;
loadConversationsWithGroups(conversationsSearchQuery); loadConversationsWithGroups(conversationsSearchQuery);
@@ -6807,18 +6805,21 @@ async function loadConversationsWithGroups(searchQuery = '') {
uniqueConversations.push(conv); uniqueConversations.push(conv);
}); });
const hasSearchQuery = searchQuery && searchQuery.trim();
const hasProjectFilter = !!getConversationProjectFilter();
// 与请求参数 exclude_grouped 一致：后端已排除分组内对话，勿再用 mapping 缓存二次过滤（易导致 2→1 等页被滤空）
const listUsesUngroupedApi = !hasSearchQuery && !hasProjectFilter;
if (uniqueConversations.length === 0) { if (uniqueConversations.length === 0) {
listContainer.innerHTML = emptyStateHtml; listContainer.innerHTML = emptyStateHtml;
if (typeof window.applyTranslations === 'function') window.applyTranslations(listContainer); if (typeof window.applyTranslations === 'function') window.applyTranslations(listContainer);
renderConversationsPagination(0); renderConversationsPagination(0);
return; return;
} }
// 分离置顶和普通对话 // 分离置顶和普通对话
const pinnedConvs = []; const pinnedConvs = [];
const normalConvs = []; const normalConvs = [];
const hasSearchQuery = searchQuery && searchQuery.trim();
const hasProjectFilter = !!getConversationProjectFilter();
uniqueConversations.forEach(conv => { uniqueConversations.forEach(conv => {
// 如果有搜索关键词，显示所有匹配的对话（全局搜索，包括分组中的） // 如果有搜索关键词，显示所有匹配的对话（全局搜索，包括分组中的）
@@ -6842,11 +6843,8 @@ async function loadConversationsWithGroups(searchQuery = '') {
return; return;
} }
// 如果没有搜索关键词，使用原有逻辑 // 未走 exclude_grouped 接口时，才用 mapping 缓存过滤分组内对话
// "最近对话"列表应该只显示不在任何分组中的对话 if (!listUsesUngroupedApi && conversationGroupMappingCache[conv.id]) {
// 无论是否在分组详情页，都不应该在"最近对话"中显示分组中的对话
if (conversationGroupMappingCache[conv.id]) {
// 对话在某个分组中，不应该显示在"最近对话"列表中
return; return;
} }