5 Commits
Author SHA1 Message Date
jinghui 254a939f55 v1.4.16: AI视频生成完成不再自动关闭弹窗 + 支持选择保存目录
- 生成完成后弹窗保持打开(原 1.2s 后自动 onClose 移除),手动「关闭并刷新」
- 新增「保存到目录」下拉(素材库根目录+全部子文件夹),后端按 saveDir 落库
- 双击图片灯箱:onDoubleClick 增加 preventDefault 防浏览器吞双击事件
2026-11-22 12:00:08 +08:00
jinghui bf69419c68 v1.4.15: fix getOriginalUrl/getThumbnailUrl URL encoding for paths with Chinese/spaces/#/? 2026-11-20 21:17:16 +08:00
jinghui d6b1989a4c /vol2/1000/HD2 改为整盘挂载 (以后新建目录直接可添加素材库)
- 5 个逐目录挂载合并为 1 行父挂载, 等价无损
- 端到端验证: 新建零配置目录建库 200, 清理无残留
- README compose/docker run 示例与部署注释同步简化, CHANGELOG 并入 v1.4.14
2026-11-20 20:54:24 +08:00
jinghui f0a59e6642 补挂载 /vol2/1000/HD2/学习资料 (修「素材库路径不存在」)
- docker-compose.yml volumes + README compose/docker run 两处示例
- 端到端建库验证 200 通过, 清理无残留; CHANGELOG 并入 v1.4.14 条目
2026-11-20 20:48:21 +08:00
jinghui a793eadb32 v1.4.14: 灯箱缩略图条只列图片(视频/文档不混入) + 新增素材目录挂载
- 灯箱列表 lightboxImages 只收图片, providerImages/PhotoStrip 同源对齐
- handleImageDoubleClick 全量索引→图片子集索引映射, 视频/文档双击仍走 FileViewer
- docker-compose.yml/README 补挂载 /vol2/1000/HD2/素材 (修「素材库路径不存在」)
- 版本 4 处升 1.4.14
2026-11-20 19:22:34 +08:00
11 changed files with 86 additions and 36 deletions

No files matched your search

+12 -1
View File
@@ -1,6 +1,17 @@
# 更新日志
## 2026-11-19 → v1.4.13
## 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` 修复,灯箱/新窗口打开/导出/编辑 全链路受益
- ✨ **灯箱底部新增缩略图条**:双击图片放大后,底部列出当前文件夹(含筛选结果)的全部图片缩略图,点任意一张直接跳转查看,不用一张张翻
- 缩略图条显示「当前序号 / 总数」,当前图紫色高亮并自动滚动居中;切图时(含左右方向键/箭头按钮)缩略图条同步跟随
+6 -10
View File
@@ -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`(容器内路径与宿主机一致)
## 📝 使用注意
+10 -4
View File
@@ -136,6 +136,7 @@ router.post(
voice = 'zh-CN-XiaoxiaoNeural',
resolution = '1920x1080',
extraPrompt = '',
saveDir = '',
subtitleStyle = {}
} = req.body || {};
@@ -426,6 +427,7 @@ router.post(
voice = 'zh-CN-XiaoxiaoNeural',
resolution = '1920x1080',
extraPrompt = '',
saveDir = '',
subtitleStyle = {}
} = req.body || {};
if (!libraryId) throw new ValidationError('缺少 libraryId');
@@ -453,14 +455,14 @@ router.post(
textTasks.set(id, task);
setTimeout(() => textTasks.delete(id), 30 * 60 * 1000);
runTextVideo({ task, library, title: String(title).trim(), content: text, images, url, key, model: mdl, voice, width: Number.isFinite(w)?w:1920, height: Number.isFinite(h)?h:1080, extraPrompt: String(extraPrompt||''), subtitleStyle: subtitleStyle||{}, req }).catch((err) => {
runTextVideo({ task, library, title: String(title).trim(), content: text, images, url, key, model: mdl, voice, width: Number.isFinite(w)?w:1920, height: Number.isFinite(h)?h:1080, extraPrompt: String(extraPrompt||''), saveDir: String(saveDir||''), subtitleStyle: subtitleStyle||{}, req }).catch((err) => {
task.status = 'error'; task.error = err.message || String(err);
});
res.json({ success: true, taskId: id });
})
);
async function runTextVideo(ctx) {
const { task, library, title, content, images, url, key, model, voice, width, height, extraPrompt, subtitleStyle, req } = ctx;
const { task, library, title, content, images, url, key, model, voice, width, height, extraPrompt, saveDir, subtitleStyle, req } = ctx;
const work = fs.mkdtempSync(path.join(os.tmpdir(), 'flypic-tv-'));
try {
// 生成背景图(若无图片)
@@ -522,10 +524,14 @@ async function runTextVideo(ctx) {
const finalTmp = path.join(work, 'final.mp4');
await videotool.concatSegments(segFiles, finalTmp);
// 6) 落库:保存到用户选择的目录(默认素材库根目录)
const safeDir = String(saveDir || '').replace(/^\/+/, '').replace(/\.\./g, '');
const baseDir = safeDir ? path.join(library.path, safeDir) : library.path;
try { fs.mkdirSync(baseDir, { recursive: true }); } catch (_) {}
const safeTitle = String(title).replace(/[\\/:*?"<>|]/g, '_').slice(0, 60) || 'AI视频';
let target = path.join(library.path, `${safeTitle}.mp4`);
let target = path.join(baseDir, `${safeTitle}.mp4`);
let n = 1;
while (fs.existsSync(target)) { target = path.join(library.path, `${safeTitle}_${n}.mp4`); n++; }
while (fs.existsSync(target)) { target = path.join(baseDir, `${safeTitle}_${n}.mp4`); n++; }
fs.copyFileSync(finalTmp, target);
await reindex(req, library.path, target);
+1 -1
View File
@@ -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.13';
const SITE_VERSION = process.env.SITE_VERSION || '1.4.15';
const TIMEOUT_MS = 8000;
const state = {
+3 -5
View File
@@ -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.13
- SITE_VERSION=1.4.15
# 让容器经 host.docker.internal 访问宿主机的 AI 侧车
extra_hosts:
- "host.docker.internal:host-gateway"
+5 -2
View File
@@ -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}`;
}
/**
+33 -4
View File
@@ -60,6 +60,8 @@ export default function AIVideoStudioModal({ libraryId, onClose, onDone }) {
const [keyword, setKeyword] = useState('');
const [picked, setPicked] = useState([]);
const [taskId, setTaskId] = useState('');
const [folders, setFolders] = useState([]);
const [saveDir, setSaveDir] = useState('');
const [task, setTask] = useState(null);
const [error, setError] = useState('');
const [starting, setStarting] = useState(false);
@@ -92,6 +94,26 @@ export default function AIVideoStudioModal({ libraryId, onClose, onDone }) {
useEffect(() => { if (libraryId) loadImages(''); }, [libraryId]);
const flattenFolders = (nodes, acc = []) => {
for (const n of (nodes || [])) {
if (n && n.path) acc.push(n.path);
if (n && n.children) flattenFolders(n.children, acc);
}
return acc;
};
useEffect(() => {
if (!libraryId) return;
(async () => {
try {
const r = await fetch(`/api/image/folders?libraryId=${libraryId}`, { headers: auth });
const d = await r.json();
const tree = (d && d.data && d.data.folders) || [];
setFolders(flattenFolders(tree));
} catch (_) { setFolders([]); }
})();
}, [libraryId]);
const togglePick = (img) => {
setPicked((list) => {
const i = list.findIndex((x) => x.path === img.path);
@@ -109,7 +131,6 @@ export default function AIVideoStudioModal({ libraryId, onClose, onDone }) {
setTask(d);
if (d.status === 'done' || d.status === 'error') {
clearInterval(iv);
if (d.status === 'done') setTimeout(() => { onDone && onDone(d.resultPath); onClose(); }, 1200);
}
} catch (_) {}
}, 1500);
@@ -157,7 +178,7 @@ export default function AIVideoStudioModal({ libraryId, onClose, onDone }) {
libraryId, title: title.trim(),
content: content.trim(),
images: imgs,
voice, resolution, extraPrompt: '',
voice, resolution, extraPrompt: '', saveDir,
subtitleStyle: { position: subtitlePos, color: subtitleColor, fontSizePct: subtitleSize }
};
const r = await fetch('/api/video/aigenerate-text', { method: 'POST', headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${getToken()}` }, body: JSON.stringify(body) });
@@ -351,6 +372,14 @@ export default function AIVideoStudioModal({ libraryId, onClose, onDone }) {
</div>
</div>
<div>
<label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">保存到目录</label>
<select className={input} value={saveDir} onChange={(e) => setSaveDir(e.target.value)} disabled={running||done}>
<option value="">素材库根目录</option>
{folders.map((p) => <option key={p} value={p}>{p}</option>)}
</select>
</div>
<div className="flex items-start gap-2 rounded-lg bg-gray-50 dark:bg-gray-900/50 border border-gray-200 dark:border-gray-700 px-3 py-2 text-xs text-gray-600 dark:text-gray-400">
<Settings className="w-3.5 h-3.5 mt-0.5 flex-shrink-0" />
<span>提供商 / 模型 / KEY 在右上角「设置 → AI 视频」里配置,普通文本模型即可;配音与字幕由本地合成。</span>
@@ -374,8 +403,8 @@ export default function AIVideoStudioModal({ libraryId, onClose, onDone }) {
{error && <div className="text-sm text-red-600 bg-red-50 dark:bg-red-900/30 border border-red-200 dark:border-red-800 rounded-lg px-3 py-2">{error}</div>}
<div className="flex justify-end gap-3 pt-1">
<button onClick={onClose} disabled={running||starting} className="px-4 py-2 text-sm rounded-lg border border-gray-300 dark:border-gray-600 text-gray-700 dark:text-gray-300 hover:bg-gray-50 dark:hover:bg-gray-700 disabled:opacity-50">
{done ? '关闭' : '取消'}
<button onClick={() => (done ? (onDone && onDone(task?.resultPath)) : onClose())} disabled={running||starting} className="px-4 py-2 text-sm rounded-lg border border-gray-300 dark:border-gray-600 text-gray-700 dark:text-gray-300 hover:bg-gray-50 dark:hover:bg-gray-700 disabled:opacity-50">
{done ? '关闭并刷新' : '取消'}
</button>
{!running && !done && (
<button onClick={handleStart} disabled={starting} className="px-5 py-2 text-sm rounded-lg bg-purple-600 hover:bg-purple-700 text-white font-medium disabled:opacity-50 flex items-center gap-2">
+1 -1
View File
@@ -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.13';
const appVersion = hub.version ? `v${String(hub.version).replace(/^v/, '')}` : 'v1.4.15';
// 从全局 store 获取筛选状态
const selectedFormats = filters.formats || [];
+1 -1
View File
@@ -58,7 +58,7 @@ const ImageCell = ({
height: `${image.calculatedHeight}px`
}}
onClick={(e) => onImageClick(image, e, flatIndex)}
onDoubleClick={() => onImageDoubleClick(image, flatIndex)}
onDoubleClick={(e) => { e.preventDefault(); onImageDoubleClick(image, flatIndex); }}
onContextMenu={(e) => onContextMenu(e, image)}
draggable={true}
onDragStart={(e) => onDragStart(e, image)}
+13 -6
View File
@@ -198,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) => {
@@ -237,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) => {
@@ -661,9 +668,9 @@ onToggleFavorite={handleToggleFavorite}
)}
</PhotoProvider>
{/* 灯箱底部缩略图条:列出当前文件夹全部图片,点击跳转查看(index 与 providerImages 同源对齐) */}
{/* 灯箱底部缩略图条:只列图片(与 providerImages 同源对齐),点击跳转查看 */}
<PhotoStrip
images={filteredImages}
images={lightboxImages}
index={photoIndex}
onIndexChange={setPhotoIndex}
getThumbnailUrl={getThumbnailUrl}
+1 -1
View File
@@ -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.13';
const APP_VERSION = 'v1.4.15';
const REPO_URL = 'https://gitea.88531.cn/jinghui/flypic';
/**