From d9c61306fe6ecb683f7122c2979d7fead52a753f Mon Sep 17 00:00:00 2001 From: jinghui Date: Fri, 20 Nov 2026 00:07:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=81=AF=E7=AE=B1=E5=BA=95=E9=83=A8?= =?UTF-8?q?=E7=BC=A9=E7=95=A5=E5=9B=BE=E6=9D=A1=20+=20=E5=B9=BB=E7=81=AF?= =?UTF-8?q?=E7=89=87=E6=92=AD=E6=94=BE=EF=BC=88=E5=8F=AF=E9=80=89=E9=97=B4?= =?UTF-8?q?=E9=9A=94=EF=BC=89=20(v1.4.13)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 10 ++ backend/utils/hub.js | 2 +- docker-compose.yml | 2 +- frontend/src/components/Header.jsx | 2 +- frontend/src/components/ImageWaterfall.jsx | 9 ++ frontend/src/components/PhotoStrip.jsx | 152 +++++++++++++++++++++ frontend/src/components/SettingsModal.jsx | 2 +- 7 files changed, 175 insertions(+), 4 deletions(-) create mode 100644 frontend/src/components/PhotoStrip.jsx diff --git a/CHANGELOG.md b/CHANGELOG.md index ba9b58d..4d7e38e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # 更新日志 +## 2026-11-19 → v1.4.13 + +- ✨ **灯箱底部新增缩略图条**:双击图片放大后,底部列出当前文件夹(含筛选结果)的全部图片缩略图,点任意一张直接跳转查看,不用一张张翻 +- 缩略图条显示「当前序号 / 总数」,当前图紫色高亮并自动滚动居中;切图时(含左右方向键/箭头按钮)缩略图条同步跟随 +- 缩略图走原 thumbnail 缩略图接口全量加载(弹层滚动容器内不使用 lazy,避免 Chromium 中永不加载),无缩略图的文件显示格式角标兜底 +- 缩略图条通过 portal 挂到 body、层级压在灯箱(z-index 2000)之上,不被祖先层叠上下文遮挡;数据与灯箱图片列表同源同序,跳转序号严格对齐 +- ✨ **幻灯片播放**:缩略图条左侧新增 ▶ 播放 / ⏸ 暂停按钮,开启后按选定间隔自动切下一张,放完最后一张循环回首张;手动点缩略图或用箭头切图时计时器重新计时,每张图都停留满一个间隔;关闭灯箱自动停播 +- 切换间隔可选 1 / 2 / 3 / 5 / 10 秒(下拉选择),选择存 localStorage 下次沿用,默认 3 秒 +- 修复缩略图破图:后端对部分视频缩略图返回 0 字节 webp 导致浏览器显示碎图,加载失败自动退化为格式角标 + ## 2026-11-19 → v1.4.12 - ✨ **设置 → AI 生图新增「免费生图:Cloudflare Workers AI 提供商」说明卡**:标注每日免费额度(10000 neurons/天,北京时间 08:00 重置,FLUX.1 schnell 约 10 neurons/张 ≈ 每天约 1000 张),并给出两步申请地址——① 注册 Cloudflare 账号(免费、无需信用卡)② 创建 API Token(Workers AI Run 权限),含 Token 创建提示 diff --git a/backend/utils/hub.js b/backend/utils/hub.js index fc65da1..6788fb6 100644 --- a/backend/utils/hub.js +++ b/backend/utils/hub.js @@ -16,7 +16,7 @@ const { getSettings } = require('./settings'); const HUB_URL = (process.env.HUB_URL || 'https://auth.88531.cn/api').replace(/\/+$/, ''); const HUB_PROJECT_ID = process.env.HUB_PROJECT_ID || ''; const HUB_API_KEY = process.env.HUB_API_KEY || ''; -const SITE_VERSION = process.env.SITE_VERSION || '1.4.12'; +const SITE_VERSION = process.env.SITE_VERSION || '1.4.13'; const TIMEOUT_MS = 8000; const state = { diff --git a/docker-compose.yml b/docker-compose.yml index a1675bc..9d5b4ac 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,7 +28,7 @@ services: - HUB_API_KEY=${HUB_API_KEY:-} - NEWAPI_KEY=${NEWAPI_KEY:-} # 当前站点版本(与 frontend/package.json、CHANGELOG 保持一致,界面版本徽标来源) - - SITE_VERSION=1.4.12 + - SITE_VERSION=1.4.13 # 让容器经 host.docker.internal 访问宿主机的 AI 侧车 extra_hosts: - "host.docker.internal:host-gateway" diff --git a/frontend/src/components/Header.jsx b/frontend/src/components/Header.jsx index 35b7567..1832236 100644 --- a/frontend/src/components/Header.jsx +++ b/frontend/src/components/Header.jsx @@ -40,7 +40,7 @@ const [showAIVideo, setShowAIVideo] = useState(false); // 授权系统 hub:版本 / 公告 / 在线人数 const hub = useHub(); const announcements = hub.announcements || []; - const appVersion = hub.version ? `v${String(hub.version).replace(/^v/, '')}` : 'v1.4.12'; + const appVersion = hub.version ? `v${String(hub.version).replace(/^v/, '')}` : 'v1.4.13'; // 从全局 store 获取筛选状态 const selectedFormats = filters.formats || []; diff --git a/frontend/src/components/ImageWaterfall.jsx b/frontend/src/components/ImageWaterfall.jsx index f82ff04..fd086f4 100644 --- a/frontend/src/components/ImageWaterfall.jsx +++ b/frontend/src/components/ImageWaterfall.jsx @@ -5,6 +5,7 @@ import { useState, useMemo, useCallback, useRef } from 'react'; import { PhotoProvider } from 'react-photo-view'; +import PhotoStrip from './PhotoStrip'; import 'react-photo-view/dist/react-photo-view.css'; import { VariableSizeList as List } from 'react-window'; @@ -660,6 +661,14 @@ onToggleFavorite={handleToggleFavorite} )} + {/* 灯箱底部缩略图条:列出当前文件夹全部图片,点击跳转查看(index 与 providerImages 同源对齐) */} + + {/* 文件查看器 */} {viewerFile && ( { + const v = parseFloat(localStorage.getItem(INTERVAL_KEY)); + return INTERVAL_OPTIONS.includes(v) ? v : 3; + }); + // 缩略图加载失败(后端可能返回 0 字节 webp)→ 退化为格式角标 + const [failed, setFailed] = useState({}); + + const total = images ? images.length : 0; + + const changeInterval = (v) => { + setIntervalSec(v); + localStorage.setItem(INTERVAL_KEY, String(v)); + }; + + // 灯箱关闭即停播(组件在 index<0 时仍挂载,只是返回 null) + useEffect(() => { + if (index < 0 && playing) setPlaying(false); + }, [index, playing]); + + // 幻灯片:每张停留 intervalSec,到末尾循环回首张; + // 手动跳转(index 变化)会重排计时器,让新图也停留满一个间隔。 + useEffect(() => { + if (!playing || index < 0 || total < 2) return undefined; + const t = setTimeout(() => onIndexChange((index + 1) % total), intervalSec * 1000); + return () => clearTimeout(t); + }, [playing, index, intervalSec, total, onIndexChange]); + + // 切换图片时把当前缩略图滚到条中间(只滚条自身,不动页面) + useEffect(() => { + if (index < 0 || !stripRef.current) return; + const el = stripRef.current.querySelector('[data-active="true"]'); + if (!el) return; + const c = stripRef.current; + c.scrollTo({ + left: el.offsetLeft - c.clientWidth / 2 + el.clientWidth / 2, + behavior: 'smooth', + }); + }, [index]); + + if (index < 0 || !images || !images.length) return null; + + return createPortal( +
+
+ {/* 当前进度 */} + + {index + 1} / {total} + + + {/* 幻灯片播放:▶/⏸ + 间隔选择 */} + + + + {/* 缩略图横向滚动条 */} +
+ {images.map((img, i) => { + const src = getThumbnailUrl ? getThumbnailUrl(img) : ''; + const active = i === index; + const bad = failed[img.id ?? i]; + return ( + + ); + })} +
+
+
, + document.body + ); +} diff --git a/frontend/src/components/SettingsModal.jsx b/frontend/src/components/SettingsModal.jsx index 4a74885..60a0e10 100644 --- a/frontend/src/components/SettingsModal.jsx +++ b/frontend/src/components/SettingsModal.jsx @@ -2,7 +2,7 @@ import { useState, useEffect } from 'react'; import { X, ScanText, Info, Save, FlaskConical, Github, ExternalLink, Wand2, Film } from 'lucide-react'; import { settingsAPI, aigenAPI } from '../api'; -const APP_VERSION = 'v1.4.12'; +const APP_VERSION = 'v1.4.13'; const REPO_URL = 'https://gitea.88531.cn/jinghui/flypic'; /**