Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bf69419c68 | ||
|
|
d6b1989a4c | ||
|
|
f0a59e6642 | ||
|
|
a793eadb32 | ||
|
|
d9c61306fe |
No files matched your search
@@ -1,5 +1,26 @@
|
||||
# 更新日志
|
||||
|
||||
## 2026-11-19 → v1.4.14
|
||||
|
||||
- ✨ **灯箱只显示图片**:双击图片打开灯箱后,底部缩略图条只列出当前文件夹(含筛选)下的图片,mp4/md 等打不开的文件不再混入(此前显示出来也点不开,纯属干扰)
|
||||
- 灯箱列表本身也同步过滤为纯图片:左右方向键/箭头按钮翻页不会再翻到视频、文档等打不开的项;顶部「序号 / 总数」与缩略图条均按图片计数
|
||||
- 视频、文档的行为不变:双击仍弹出各自的播放/查看器,不进灯箱
|
||||
- 🔧 **新增「素材」目录挂载**:docker-compose.yml 与 README(compose / docker run 两种方式)补挂载 `/vol2/1000/HD2/素材`,该目录可正常添加为素材库(此前报「素材库路径不存在」)
|
||||
- 🔧 **新增「学习资料」目录挂载**:docker-compose.yml 与 README(compose / docker run 两种方式)补挂载 `/vol2/1000/HD2/学习资料`(同上修复「素材库路径不存在」,端到端建库验证通过)
|
||||
- 🔧 **挂载方式升级为整盘**:`/vol2/1000/HD2` 下 5 个逐目录挂载合并为一行整盘挂载 `- /vol2/1000/HD2:/vol2/1000/HD2` —— 该盘下任意子目录(含以后在飞牛上新建的文件夹)可直接在页面添加为素材库,不再需要改配置重启;README compose / docker run 示例同步简化
|
||||
|
||||
## 2026-11-20 → v1.4.15
|
||||
|
||||
- 🐛 **修复「部分目录图片双击不弹出灯箱」**:`getOriginalUrl`/`getThumbnailUrl` 未对含中文/空格/#/? 的路径做 URL 编码,原图请求 404 → 灯箱图片加载失败 → 用户感知「双击不弹」。按 `/` 分段 `encodeURIComponent` 修复,灯箱/新窗口打开/导出/编辑 全链路受益
|
||||
|
||||
- ✨ **灯箱底部新增缩略图条**:双击图片放大后,底部列出当前文件夹(含筛选结果)的全部图片缩略图,点任意一张直接跳转查看,不用一张张翻
|
||||
- 缩略图条显示「当前序号 / 总数」,当前图紫色高亮并自动滚动居中;切图时(含左右方向键/箭头按钮)缩略图条同步跟随
|
||||
- 缩略图走原 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 创建提示
|
||||
|
||||
@@ -99,10 +99,8 @@ services:
|
||||
ports:
|
||||
- "15002:15002"
|
||||
volumes:
|
||||
# 素材库目录(容器内路径与宿主机一致,中文路径直接填,按需增减)
|
||||
- /vol2/1000/HD2/壁纸:/vol2/1000/HD2/壁纸
|
||||
- /vol2/1000/HD2/我的文档:/vol2/1000/HD2/我的文档
|
||||
- /vol2/1000/HD2/发布到平台的图片和视频:/vol2/1000/HD2/发布到平台的图片和视频
|
||||
# 数据盘整盘挂载(容器内路径与宿主机一致,中文路径直接填):盘下任意子目录含以后新建的,可直接添加为素材库
|
||||
- /vol2/1000/HD2:/vol2/1000/HD2
|
||||
# 持久化配置(素材库列表、管理员密码,不用改)
|
||||
- /vol3/1000/HD3/docker/flypic/config:/root/.flypic
|
||||
environment:
|
||||
@@ -116,10 +114,10 @@ services:
|
||||
```
|
||||
|
||||
```bash
|
||||
# 首次部署(编辑 volumes 换成你的素材库目录)
|
||||
# 首次部署(编辑 volumes 把整盘或你的素材目录挂进来)
|
||||
docker compose up -d --build
|
||||
|
||||
# 新增素材库:volumes 加一行挂载后重启
|
||||
# 新增素材库:整盘挂载后直接在页面添加即可,无需改配置
|
||||
docker compose up -d
|
||||
|
||||
# 更新代码
|
||||
@@ -142,15 +140,13 @@ docker run -d --name flypic --restart unless-stopped \
|
||||
-e FRONTEND_DIST=/app/backend/public \
|
||||
-e NODE_ENV=production \
|
||||
-v /vol3/1000/HD3/docker/flypic/config:/root/.flypic \
|
||||
-v /vol2/1000/HD2/壁纸:/vol2/1000/HD2/壁纸 \
|
||||
-v "/vol2/1000/HD2/我的文档:/vol2/1000/HD2/我的文档" \
|
||||
-v "/vol2/1000/HD2/发布到平台的图片和视频:/vol2/1000/HD2/发布到平台的图片和视频" \
|
||||
-v "/vol2/1000/HD2:/vol2/1000/HD2" \
|
||||
jpccr.ccs.tencentyun.com/jinghui/flypic:latest
|
||||
```
|
||||
|
||||
- 公网镜像 `jpccr.ccs.tencentyun.com/jinghui/flypic:latest`(匿名可拉);内网镜像 `192.168.68.19:3200/jinghui/flypic:latest`
|
||||
- 没有镜像就本地构建:`docker build -t flypic:latest .`,替换上面的镜像名
|
||||
- 素材库目录按需增减 `-v`(容器内路径与宿主机一致)
|
||||
- 素材库挂载:推荐整盘 `-v "/数据盘:/数据盘"`(盘下任意子目录直接添加、免改配置),也可只挂需要的子目录 `-v`(容器内路径与宿主机一致)
|
||||
|
||||
## 📝 使用注意
|
||||
|
||||
|
||||
@@ -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.15';
|
||||
const TIMEOUT_MS = 8000;
|
||||
|
||||
const state = {
|
||||
|
||||
+3
-5
@@ -10,10 +10,8 @@ services:
|
||||
ports:
|
||||
- "15002:15002"
|
||||
volumes:
|
||||
# 素材库目录(容器内路径与飞牛一致,直接填实际路径即可)
|
||||
- /vol2/1000/HD2/壁纸:/vol2/1000/HD2/壁纸
|
||||
- /vol2/1000/HD2/我的文档:/vol2/1000/HD2/我的文档
|
||||
- /vol2/1000/HD2/发布到平台的图片和视频:/vol2/1000/HD2/发布到平台的图片和视频
|
||||
# 数据盘整盘挂载(容器内路径与飞牛一致):/vol2/1000/HD2 下任意子目录(含以后新建的)可直接添加为素材库,无需改配置
|
||||
- /vol2/1000/HD2:/vol2/1000/HD2
|
||||
# 持久化配置(config.json 存储素材库路径、密码等,不用改)
|
||||
- /vol3/1000/HD3/docker/flypic/config:/root/.flypic
|
||||
environment:
|
||||
@@ -28,7 +26,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.15
|
||||
# 让容器经 host.docker.internal 访问宿主机的 AI 侧车
|
||||
extra_hosts:
|
||||
- "host.docker.internal:host-gateway"
|
||||
|
||||
@@ -50,7 +50,8 @@ export async function getCacheMeta(libraryId) {
|
||||
* 使用分片结构,不再需要 size 参数
|
||||
*/
|
||||
export function getThumbnailUrl(libraryId, filename, version) {
|
||||
const base = `/api/image/thumbnail/${libraryId}/${filename}`;
|
||||
const encoded = encodeURIComponent(filename);
|
||||
const base = `/api/image/thumbnail/${libraryId}/${encoded}`;
|
||||
// version=文件 modified_at,编辑保存后变化以穿透浏览器缓存
|
||||
return version ? `${base}?v=${version}` : base;
|
||||
}
|
||||
@@ -59,7 +60,9 @@ export function getThumbnailUrl(libraryId, filename, version) {
|
||||
* 获取原图 URL
|
||||
*/
|
||||
export function getOriginalUrl(libraryId, path) {
|
||||
return `/api/image/original/${libraryId}/${path}`;
|
||||
// 按 '/' 分段编码,避免中文/空格/#/? 等字符导致原图 URL 404(灯箱/新窗口打开失败)
|
||||
const encoded = String(path).split('/').map(encodeURIComponent).join('/');
|
||||
return `/api/image/original/${libraryId}/${encoded}`;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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.15';
|
||||
|
||||
// 从全局 store 获取筛选状态
|
||||
const selectedFormats = filters.formats || [];
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -197,10 +198,15 @@ function ImageWaterfall() {
|
||||
return imageAPI.getOriginalUrl(currentLibraryId, image.path);
|
||||
}, [currentLibraryId]);
|
||||
|
||||
// 灯箱只收图片:视频/文档双击走 FileViewer,不进灯箱列表(底部缩略图条同源,打不开的文件不显示)
|
||||
const lightboxImages = useMemo(() => {
|
||||
return filteredImages.filter(img => (img.fileType || 'image') === 'image');
|
||||
}, [filteredImages]);
|
||||
|
||||
// PhotoProvider 图片列表
|
||||
const providerImages = useMemo(() => {
|
||||
return filteredImages.map(img => ({ src: getOriginalUrl(img), key: img.id }));
|
||||
}, [filteredImages, getOriginalUrl]);
|
||||
return lightboxImages.map(img => ({ src: getOriginalUrl(img), key: img.id }));
|
||||
}, [lightboxImages, getOriginalUrl]);
|
||||
|
||||
// 图片点击处理 —— 单击选中,双击放大
|
||||
const handleImageClick = useCallback((image, event, imageIndex) => {
|
||||
@@ -236,11 +242,13 @@ function ImageWaterfall() {
|
||||
const handleImageDoubleClick = useCallback((image, flatIndex) => {
|
||||
const fileType = image.fileType || 'image';
|
||||
if (fileType === 'image') {
|
||||
setPhotoIndex(flatIndex);
|
||||
// flatIndex 是全量列表索引,灯箱列表只含图片 → 映射为图片子集索引
|
||||
const idx = lightboxImages.findIndex(im => im.id === image.id);
|
||||
setPhotoIndex(idx >= 0 ? idx : 0);
|
||||
} else {
|
||||
setViewerFile(image);
|
||||
}
|
||||
}, []);
|
||||
}, [lightboxImages]);
|
||||
|
||||
// 文件名双击处理(重命名)
|
||||
const handleFilenameDoubleClick = useCallback((e, image) => {
|
||||
@@ -660,6 +668,14 @@ onToggleFavorite={handleToggleFavorite}
|
||||
)}
|
||||
</PhotoProvider>
|
||||
|
||||
{/* 灯箱底部缩略图条:只列图片(与 providerImages 同源对齐),点击跳转查看 */}
|
||||
<PhotoStrip
|
||||
images={lightboxImages}
|
||||
index={photoIndex}
|
||||
onIndexChange={setPhotoIndex}
|
||||
getThumbnailUrl={getThumbnailUrl}
|
||||
/>
|
||||
|
||||
{/* 文件查看器 */}
|
||||
{viewerFile && (
|
||||
<FileViewer
|
||||
|
||||
@@ -0,0 +1,152 @@
|
||||
/**
|
||||
* 灯箱底部缩略图条 + 幻灯片播放
|
||||
* 双击图片放大后,在底部列出当前文件夹(含筛选)下的全部图片,
|
||||
* 点击任意缩略图直接跳转查看,与 react-photo-view 的 index 一一对应。
|
||||
* 左侧提供幻灯片播放:▶ 播放 / ⏸ 暂停,间隔可选(1/2/3/5/10 秒,localStorage 记忆)。
|
||||
*
|
||||
* 通过 portal 挂到 body:react-photo-view 也是 portal 到 body(z-index 2000),
|
||||
* 这里用 2100 保证压在其上方,且不被祖先的 transform/filter 形成的层叠上下文困住。
|
||||
*/
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { createPortal } from 'react-dom';
|
||||
|
||||
const INTERVAL_KEY = 'flypic_slideshow_interval';
|
||||
const INTERVAL_OPTIONS = [1, 2, 3, 5, 10];
|
||||
|
||||
export default function PhotoStrip({ images, index, onIndexChange, getThumbnailUrl }) {
|
||||
const stripRef = useRef(null);
|
||||
const [playing, setPlaying] = useState(false);
|
||||
const [intervalSec, setIntervalSec] = useState(() => {
|
||||
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(
|
||||
<div className="fixed bottom-0 left-0 right-0 z-[2100] bg-black/85 backdrop-blur-sm border-t border-white/10">
|
||||
<div className="flex items-center gap-2 px-3 py-2">
|
||||
{/* 当前进度 */}
|
||||
<span className="shrink-0 text-[11px] text-gray-300 tabular-nums select-none pr-1 border-r border-white/15 mr-1">
|
||||
{index + 1} / {total}
|
||||
</span>
|
||||
|
||||
{/* 幻灯片播放:▶/⏸ + 间隔选择 */}
|
||||
<button
|
||||
type="button"
|
||||
title={playing ? '暂停幻灯片播放' : '幻灯片播放'}
|
||||
aria-label={playing ? '暂停幻灯片' : '播放幻灯片'}
|
||||
onClick={() => total >= 2 && setPlaying((p) => !p)}
|
||||
className={`shrink-0 w-7 h-7 rounded-full flex items-center justify-center transition-colors ${
|
||||
playing
|
||||
? 'bg-purple-500 text-white hover:bg-purple-400'
|
||||
: 'bg-white/10 text-gray-200 hover:bg-white/20'
|
||||
} ${total < 2 ? 'opacity-40 cursor-not-allowed' : ''}`}
|
||||
>
|
||||
{playing ? (
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="currentColor">
|
||||
<rect x="6" y="4" width="4" height="16" rx="1" />
|
||||
<rect x="14" y="4" width="4" height="16" rx="1" />
|
||||
</svg>
|
||||
) : (
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="currentColor">
|
||||
<path d="M7 4.5v15l13-7.5z" />
|
||||
</svg>
|
||||
)}
|
||||
</button>
|
||||
<select
|
||||
title="幻灯片切换间隔"
|
||||
aria-label="幻灯片切换间隔"
|
||||
value={intervalSec}
|
||||
onChange={(e) => changeInterval(parseFloat(e.target.value))}
|
||||
className={`shrink-0 h-7 rounded bg-white/10 text-[11px] text-gray-200 px-1 pr-4 outline-none cursor-pointer hover:bg-white/20 border border-transparent focus:border-purple-400/60 ${
|
||||
playing ? 'border-purple-400/60' : ''
|
||||
}`}
|
||||
>
|
||||
{INTERVAL_OPTIONS.map((s) => (
|
||||
<option key={s} value={s} className="bg-gray-900 text-gray-100">
|
||||
{s} 秒
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
|
||||
{/* 缩略图横向滚动条 */}
|
||||
<div
|
||||
ref={stripRef}
|
||||
className="flex-1 flex items-center gap-1.5 overflow-x-auto overflow-y-hidden scrollbar-thin"
|
||||
style={{ scrollbarWidth: 'thin' }}
|
||||
>
|
||||
{images.map((img, i) => {
|
||||
const src = getThumbnailUrl ? getThumbnailUrl(img) : '';
|
||||
const active = i === index;
|
||||
const bad = failed[img.id ?? i];
|
||||
return (
|
||||
<button
|
||||
key={img.id ?? i}
|
||||
type="button"
|
||||
data-active={active ? 'true' : 'false'}
|
||||
title={img.filename || ''}
|
||||
onClick={() => onIndexChange(i)}
|
||||
className={`relative shrink-0 w-12 h-12 rounded overflow-hidden border-2 transition-all duration-150 ${
|
||||
active
|
||||
? 'border-purple-500 ring-2 ring-purple-400/60 scale-105 z-10'
|
||||
: 'border-transparent opacity-55 hover:opacity-100 hover:border-white/40'
|
||||
}`}
|
||||
>
|
||||
{src && !bad ? (
|
||||
<img
|
||||
src={src}
|
||||
alt={img.filename || ''}
|
||||
decoding="async"
|
||||
draggable={false}
|
||||
onError={() => setFailed((f) => ({ ...f, [img.id ?? i]: true }))}
|
||||
className="w-full h-full object-cover pointer-events-none"
|
||||
/>
|
||||
) : (
|
||||
<span className="w-full h-full flex items-center justify-center bg-gray-800 text-[9px] text-gray-400">
|
||||
{(img.format || (img.filename || '').split('.').pop() || '').slice(0, 5)}
|
||||
</span>
|
||||
)}
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
</div>
|
||||
</div>,
|
||||
document.body
|
||||
);
|
||||
}
|
||||
@@ -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.15';
|
||||
const REPO_URL = 'https://gitea.88531.cn/jinghui/flypic';
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user