update
This commit is contained in:
@@ -154,6 +154,6 @@
|
||||
<!-- 移动端遮罩 -->
|
||||
<div class="mobile-overlay" id="mobile-overlay" onclick="toggleMobileSidebar()"></div>
|
||||
|
||||
<script src="/assets/js/app.js?v=5"></script>
|
||||
<script src="/assets/js/app.js?v=6"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
// 全局变量
|
||||
let allAlbums = []; // 存储所有相册数据
|
||||
let displayedAlbums = []; // 当前显示的相册数据
|
||||
let filteredAlbums = null; // 过滤后的相册数据(有筛选时使用,null=无筛选)
|
||||
let searchTimeout = null;
|
||||
let currentDisplayPage = 1; // 前端显示的分页
|
||||
let albumsPerPage = 50; // 每次显示50个相册
|
||||
@@ -251,26 +252,28 @@ function handleScroll() {
|
||||
async function loadMoreAlbums() {
|
||||
// 如果在收藏页,不加载更多数据
|
||||
if (isInFavoritesPage) return;
|
||||
|
||||
if (isLoadingMore || !hasMoreAlbums || !isAllAlbumsLoaded) return;
|
||||
|
||||
if (isLoadingMore || !hasMoreAlbums) return;
|
||||
// 全量模式下(无筛选)需等 isAllAlbumsLoaded;过滤模式下直接使用 filteredAlbums
|
||||
if (!currentFilter && !isAllAlbumsLoaded) return;
|
||||
|
||||
isLoadingMore = true;
|
||||
try {
|
||||
// 显示加载更多指示器
|
||||
showLoadingMore();
|
||||
|
||||
|
||||
// 增加当前显示页数
|
||||
currentDisplayPage++;
|
||||
|
||||
|
||||
// 显示下一页数据
|
||||
displayCurrentPage();
|
||||
|
||||
|
||||
// 初始化图片懒加载
|
||||
initLazyLoading();
|
||||
|
||||
|
||||
// 预加载下一批图片
|
||||
preloadNextBatchImages();
|
||||
|
||||
|
||||
} catch (error) {
|
||||
console.error('加载更多相册失败:', error);
|
||||
showLoadMoreError();
|
||||
@@ -456,37 +459,49 @@ async function loadAlbums(reset = false) {
|
||||
|
||||
// 显示当前页的相册数据
|
||||
function displayCurrentPage() {
|
||||
// 有筛选时用 filteredAlbums,否则用 allAlbums
|
||||
const source = filteredAlbums || allAlbums;
|
||||
const startIndex = (currentDisplayPage - 1) * albumsPerPage;
|
||||
const endIndex = startIndex + albumsPerPage;
|
||||
|
||||
|
||||
// 获取当前页要显示的相册
|
||||
displayedAlbums = allAlbums.slice(startIndex, endIndex);
|
||||
|
||||
displayedAlbums = source.slice(startIndex, endIndex);
|
||||
|
||||
// 如果是第一页,直接显示;否则追加显示
|
||||
if (currentDisplayPage === 1) {
|
||||
displayAlbums(displayedAlbums);
|
||||
} else {
|
||||
appendAlbums(displayedAlbums);
|
||||
}
|
||||
|
||||
|
||||
// 检查是否还有更多数据可以显示
|
||||
hasMoreAlbums = (currentDisplayPage * albumsPerPage) < allAlbums.length;
|
||||
hasMoreAlbums = (currentDisplayPage * albumsPerPage) < source.length;
|
||||
}
|
||||
|
||||
// 搜索相册
|
||||
// 防抖搜索函数
|
||||
async function debouncedSearch() {
|
||||
const searchTerm = document.getElementById('search-input').value.toLowerCase().trim();
|
||||
|
||||
|
||||
if (searchTerm === '') {
|
||||
// 显示所有已加载的相册
|
||||
// 搜索框为空 → 清除过滤状态,显示所有相册
|
||||
currentFilter = null;
|
||||
filteredAlbums = null;
|
||||
displayAlbums(allAlbums);
|
||||
updateStats();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// 直接使用后端搜索API进行全站搜索
|
||||
await performServerSearch(searchTerm);
|
||||
const results = await performServerSearchWithResult(searchTerm);
|
||||
if (results && results.length > 0) {
|
||||
filteredAlbums = results;
|
||||
currentDisplayPage = 1;
|
||||
hasMoreAlbums = results.length > albumsPerPage;
|
||||
displayAlbums(results);
|
||||
updateStats(results);
|
||||
initLazyLoading();
|
||||
}
|
||||
}
|
||||
|
||||
// 在当前已加载的数据集中搜索
|
||||
@@ -522,11 +537,22 @@ function showSearchHint(searchTerm) {
|
||||
|
||||
// 执行服务器端搜索(全站搜索)
|
||||
async function performServerSearch(searchTerm) {
|
||||
try {
|
||||
// 显示搜索中的骨架屏
|
||||
showSkeleton(4);
|
||||
const results = await performServerSearchWithResult(searchTerm);
|
||||
if (results && results.length > 0) {
|
||||
displayAlbums(results);
|
||||
const oldStats = document.getElementById('stats');
|
||||
if (oldStats) {
|
||||
oldStats.innerHTML = `在全站找到 ${results.length} 个包含 "${searchTerm}" 的相册`;
|
||||
}
|
||||
updateStats(results);
|
||||
initLazyLoading();
|
||||
}
|
||||
}
|
||||
|
||||
const response = await fetch(`${API_BASE}/search?q=${encodeURIComponent(searchTerm)}&page=1&limit=${albumsPerPage}`);
|
||||
/// 执行服务器端搜索并返回结果数组(不直接渲染)
|
||||
async function performServerSearchWithResult(searchTerm) {
|
||||
try {
|
||||
const response = await fetch(`${API_BASE}/search?q=${encodeURIComponent(searchTerm)}&page=1&limit=200`);
|
||||
if (!response.ok) {
|
||||
throw new Error(`HTTP error! status: ${response.status}`);
|
||||
}
|
||||
@@ -534,23 +560,13 @@ async function performServerSearch(searchTerm) {
|
||||
const serverResults = await response.json();
|
||||
|
||||
if (serverResults.length === 0) {
|
||||
showError(`没有找到包含 "${searchTerm}" 的相册`);
|
||||
return;
|
||||
return [];
|
||||
}
|
||||
|
||||
// 显示服务器搜索结果
|
||||
displayAlbums(serverResults);
|
||||
const oldStats = document.getElementById('stats');
|
||||
if (oldStats) {
|
||||
oldStats.innerHTML = `在全站找到 ${serverResults.length} 个包含 "${searchTerm}" 的相册`;
|
||||
}
|
||||
|
||||
// 初始化图片懒加载
|
||||
initLazyLoading();
|
||||
|
||||
return serverResults;
|
||||
} catch (error) {
|
||||
console.error('全站搜索失败:', error);
|
||||
showError('全站搜索失败,请重试');
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1418,6 +1434,11 @@ async function filterByTag(tag) {
|
||||
if (!response.ok) throw new Error('搜索失败');
|
||||
const results = await response.json();
|
||||
|
||||
// 保存过滤结果到 filteredAlbums,重置分页
|
||||
filteredAlbums = results;
|
||||
currentDisplayPage = 1;
|
||||
hasMoreAlbums = filteredAlbums.length > albumsPerPage;
|
||||
|
||||
displayAlbums(results);
|
||||
updateStats(results);
|
||||
initLazyLoading();
|
||||
@@ -1460,6 +1481,11 @@ async function filterByPerson(personName) {
|
||||
if (detailResp.ok) {
|
||||
const detail = await detailResp.json();
|
||||
if (detail && detail.albums) {
|
||||
// 保存过滤结果到 filteredAlbums,重置分页
|
||||
filteredAlbums = detail.albums;
|
||||
currentDisplayPage = 1;
|
||||
hasMoreAlbums = filteredAlbums.length > albumsPerPage;
|
||||
|
||||
displayAlbums(detail.albums);
|
||||
updateStats(detail.albums);
|
||||
initLazyLoading();
|
||||
@@ -1468,10 +1494,11 @@ async function filterByPerson(personName) {
|
||||
}
|
||||
} catch (e) { /* 回退 */ }
|
||||
}
|
||||
await performServerSearch(personName);
|
||||
// 回退到全站搜索,也要保存过滤结果
|
||||
filteredAlbums = await performServerSearchWithResult(personName);
|
||||
} catch (error) {
|
||||
console.error('人物筛选失败:', error);
|
||||
await performServerSearch(personName);
|
||||
filteredAlbums = await performServerSearchWithResult(personName);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1497,6 +1524,8 @@ function showFilterStatus(text) {
|
||||
// 清除筛选
|
||||
function clearFilter() {
|
||||
currentFilter = null;
|
||||
filteredAlbums = null; // 清除过滤结果缓存
|
||||
currentDisplayPage = 1;
|
||||
|
||||
// 新版筛选条
|
||||
const bar = document.getElementById('filter-bar');
|
||||
|
||||
Reference in New Issue
Block a user