Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9c7b695081 | ||
|
|
edfbb67cdb | ||
|
|
254a939f55 | ||
|
|
bf69419c68 | ||
|
|
d6b1989a4c | ||
|
|
f0a59e6642 | ||
|
|
a793eadb32 | ||
|
|
d9c61306fe | ||
|
|
ecb28c3aa5 |
No files matched your search
@@ -1,5 +1,31 @@
|
||||
# 更新日志
|
||||
|
||||
## 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 创建提示
|
||||
- 顶部简介同步补充免费额度入口提示
|
||||
|
||||
## 2026-11-19 → v1.4.11
|
||||
|
||||
- ✨ **AI 生图弹窗新增「生图模型」点选**:按通道分组列出全部可选模型(CF Workers AI / Pollinations),点一下即选中并高亮,所选模型存 localStorage 下次沿用;自定义提供商则显示设置里配置的模型
|
||||
|
||||
@@ -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`(容器内路径与宿主机一致)
|
||||
|
||||
## 📝 使用注意
|
||||
|
||||
|
||||
+84
-24
@@ -136,6 +136,8 @@ router.post(
|
||||
voice = 'zh-CN-XiaoxiaoNeural',
|
||||
resolution = '1920x1080',
|
||||
extraPrompt = '',
|
||||
saveDir = '',
|
||||
duration = 0,
|
||||
subtitleStyle = {}
|
||||
} = req.body || {};
|
||||
|
||||
@@ -187,7 +189,7 @@ router.post(
|
||||
runAiVideo({
|
||||
task, library, images, title: String(title).trim(), url, key, model: mdl,
|
||||
voice, width: Number.isFinite(w) ? w : 1920, height: Number.isFinite(h) ? h : 1080,
|
||||
extraPrompt: String(extraPrompt || ''), subtitleStyle: subtitleStyle || {},
|
||||
extraPrompt: String(extraPrompt || ''), duration: Math.min(600, Math.max(0, Number(duration) || 0)), subtitleStyle: subtitleStyle || {},
|
||||
req
|
||||
}).catch((err) => {
|
||||
task.status = 'error';
|
||||
@@ -303,10 +305,24 @@ async function runAiVideo(ctx) {
|
||||
imagePath: files[i],
|
||||
subtitle: seg.subtitle || seg.tts || title,
|
||||
ttsFile,
|
||||
ttsSeconds: dur,
|
||||
duration: Math.max(2.5, Math.min(12, dur || 4))
|
||||
});
|
||||
}
|
||||
|
||||
// 目标时长:按各段自然时长比例分配(该路径无转场重叠)
|
||||
const targetDur = Number(ctx.duration) > 0 ? Number(ctx.duration) : 0;
|
||||
if (targetDur > 0 && segments.length) {
|
||||
const avail = Math.max(segments.length * 1.0, targetDur);
|
||||
const natural = segments.reduce((s, x) => s + x.duration, 0) || 1;
|
||||
for (const s of segments) {
|
||||
const d = Math.max(1.0, (s.duration / natural) * avail);
|
||||
s.duration = d;
|
||||
s.audioDuration = d;
|
||||
}
|
||||
logger.info(`⏱ AI 视频目标时长 ${targetDur}s → 分配 ${segments.length} 段`);
|
||||
}
|
||||
|
||||
// 4) 逐段合成
|
||||
const segFiles = [];
|
||||
for (let i = 0; i < segments.length; i++) {
|
||||
@@ -426,6 +442,9 @@ router.post(
|
||||
voice = 'zh-CN-XiaoxiaoNeural',
|
||||
resolution = '1920x1080',
|
||||
extraPrompt = '',
|
||||
saveDir = '',
|
||||
transition = 'fade',
|
||||
duration = 0,
|
||||
subtitleStyle = {}
|
||||
} = req.body || {};
|
||||
if (!libraryId) throw new ValidationError('缺少 libraryId');
|
||||
@@ -447,59 +466,79 @@ router.post(
|
||||
if (!url) throw new ValidationError('未配置模型接口地址(请到右上角设置 → AI 视频里填写)');
|
||||
if (!key) throw new ValidationError('请先在右上角设置 → AI 视频里填写模型 KEY');
|
||||
|
||||
// 转场效果白名单(防注入 ffmpeg filter)
|
||||
const TRANSITIONS = new Set(['cut','fade','fadeblack','fadewhite','slideleft','slideright','slideup','slidedown','circlecrop','circleopen','circleclose','dissolve','smoothleft','smoothright','wipeleft','wiperight','pixelize','radial','hblur']);
|
||||
const trans = TRANSITIONS.has(String(transition)) ? String(transition) : 'fade';
|
||||
|
||||
const id = `vt${++textTaskSeq}_${Date.now()}`;
|
||||
const [w, h] = String(resolution).split('x').map((n) => parseInt(n, 10));
|
||||
const task = { id, status: 'running', step: 'script', stepLabel: '正在生成', progress: 0, error: '', resultPath: '', createdAt: Date.now() };
|
||||
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) => {
|
||||
const durSec = Math.min(600, Math.max(0, Number(duration) || 0)); // 目标时长(秒),0=自动
|
||||
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||''), transition: trans, duration: durSec, 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, transition, subtitleStyle, req } = ctx;
|
||||
const work = fs.mkdtempSync(path.join(os.tmpdir(), 'flypic-tv-'));
|
||||
try {
|
||||
// 生成背景图(若无图片)
|
||||
let bgPath = '';
|
||||
// 解析全部选中图片(本地库路径 / 远程 URL 下载)—— 让每张选中图片都进视频
|
||||
const imagePaths = [];
|
||||
if (Array.isArray(images) && images.length) {
|
||||
// 用第一张图作为背景
|
||||
const rel = typeof images[0] === 'string' ? images[0] : images[0].path || images[0].url;
|
||||
if (rel && fs.existsSync(path.join(library.path, rel))) bgPath = path.join(library.path, rel);
|
||||
else if (rel && /^https?:/i.test(rel)) {
|
||||
// 下载
|
||||
try {
|
||||
const r = await fetch(rel); const buf = Buffer.from(await r.arrayBuffer());
|
||||
bgPath = path.join(work, 'bg.jpg'); fs.writeFileSync(bgPath, buf);
|
||||
} catch (_) {}
|
||||
for (const it of images) {
|
||||
const rel = typeof it === 'string' ? it : (it && (it.path || it.url)) || '';
|
||||
if (!rel) continue;
|
||||
if (/^https?:/i.test(rel)) {
|
||||
try {
|
||||
const r = await fetch(rel);
|
||||
const buf = Buffer.from(await r.arrayBuffer());
|
||||
const ext = (path.extname(new URL(rel).pathname) || '.jpg').toLowerCase();
|
||||
const fp = path.join(work, `img${imagePaths.length}${ext}`);
|
||||
fs.writeFileSync(fp, buf);
|
||||
imagePaths.push(fp);
|
||||
} catch (e) { logger.warn('图片下载失败: ' + e.message); }
|
||||
} else {
|
||||
const abs = path.join(library.path, rel);
|
||||
if (fs.existsSync(abs)) imagePaths.push(abs);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!bgPath) {
|
||||
bgPath = path.join(work, 'bg.png');
|
||||
// 兜底:无图时生成纯色背景
|
||||
if (!imagePaths.length) {
|
||||
const bgPath = path.join(work, 'bg.png');
|
||||
await videotool.run('ffmpeg', ['-y', '-f', 'lavfi', '-i', `color=c=0x1a1a2e:s=${width}x${height}`, '-frames:v', '1', bgPath], { timeoutMs: 60000 });
|
||||
imagePaths.push(bgPath);
|
||||
}
|
||||
|
||||
// LLM 生成分镜:基于内容切分
|
||||
task.step = 'script'; task.stepLabel = '正在生成脚本'; task.progress = 5;
|
||||
let script = [];
|
||||
const targetDur0 = Number(ctx.duration) > 0 ? Number(ctx.duration) : 0;
|
||||
if (content) {
|
||||
// 让模型按内容生成 N 段(N = min(8, 句子数))
|
||||
const sentences = content.split(/[。!?.!?]/).map(s=>s.trim()).filter(Boolean);
|
||||
const n = Math.min(8, Math.max(2, sentences.length));
|
||||
const baseN = Math.min(8, Math.max(2, sentences.length));
|
||||
let n = Math.max(baseN, imagePaths.length); // 分镜数 ≥ 选中图片数,保证每张图都出现
|
||||
if (targetDur0 > 0) n = Math.max(n, Math.min(30, Math.ceil(targetDur0 / 5))); // 时长越长分镜越多(约5s/段)
|
||||
script = await llmScript({ url, key, model, title, count: n, extraPrompt: (extraPrompt + ' 内容:' + content.slice(0, 1500)).trim() });
|
||||
} else {
|
||||
script = [{ subtitle: title, tts: title }];
|
||||
}
|
||||
if (!Array.isArray(script) || !script.length) script = [{ subtitle: title, tts: title }];
|
||||
|
||||
// TTS + segments
|
||||
// TTS + segments:每段轮换使用选中图片,保证所有图片都出现
|
||||
const segments = [];
|
||||
for (let i = 0; i < script.length; i++) {
|
||||
task.step = 'tts'; task.stepLabel = `正在朗读 ${i+1}/${script.length}`; task.progress = 10 + Math.round((i/script.length)*40);
|
||||
const seg = script[i];
|
||||
let segCount = Math.max(script.length, imagePaths.length);
|
||||
if (targetDur0 > 0) segCount = Math.max(segCount, Math.min(30, Math.ceil(targetDur0 / 5))); // 按目标时长补齐段数
|
||||
for (let i = 0; i < segCount; i++) {
|
||||
task.step = 'tts'; task.stepLabel = `正在朗读 ${i+1}/${segCount}`; task.progress = 10 + Math.round((i/segCount)*40);
|
||||
const seg = script[i % script.length] || {};
|
||||
let ttsFile = ''; let dur = 0;
|
||||
if (seg.tts) {
|
||||
try {
|
||||
@@ -507,7 +546,24 @@ async function runTextVideo(ctx) {
|
||||
ttsFile = t.file; dur = t.seconds;
|
||||
} catch (e) { logger.warn('TTS fail: ' + e.message); }
|
||||
}
|
||||
segments.push({ imagePath: bgPath, subtitle: seg.subtitle || seg.tts || title, ttsFile, duration: Math.max(2.5, Math.min(12, dur || 4)) });
|
||||
segments.push({ imagePath: imagePaths[i % imagePaths.length], subtitle: seg.subtitle || seg.tts || title, ttsFile, ttsSeconds: dur, duration: Math.max(2.5, Math.min(12, dur || 4)) });
|
||||
}
|
||||
|
||||
// 目标时长:画面段总长 = 目标 + 转场重叠(xfade 每次吃掉 0.6s),
|
||||
// 配音段总长 = 目标(音频走 concat 无重叠),使音画总长都精确等于目标时长
|
||||
const targetDur = Number(ctx.duration) > 0 ? Number(ctx.duration) : 0;
|
||||
if (targetDur > 0 && segments.length) {
|
||||
const n = segments.length;
|
||||
const overlap = (transition && transition !== 'cut' && n > 1) ? 0.6 * (n - 1) : 0;
|
||||
const natural = segments.reduce((s, x) => s + x.duration, 0) || 1;
|
||||
const videoTotal = targetDur + overlap; // 画面段之和
|
||||
const audioShare = overlap / n; // 每段配音比画面短的秒数(落在转场区)
|
||||
for (const s of segments) {
|
||||
const d = Math.max(1.0, (s.duration / natural) * videoTotal);
|
||||
s.duration = d;
|
||||
s.audioDuration = Math.max(0.5, d - audioShare); // 精确模式:配音对齐
|
||||
}
|
||||
logger.info(`⏱ AI 视频目标时长 ${targetDur}s → 画面 ${videoTotal.toFixed(1)}s + 转场重叠 ${overlap.toFixed(1)}s,分 ${n} 段`);
|
||||
}
|
||||
|
||||
// compose
|
||||
@@ -520,12 +576,16 @@ async function runTextVideo(ctx) {
|
||||
}
|
||||
task.step = 'merge'; task.stepLabel = '合并'; task.progress = 96;
|
||||
const finalTmp = path.join(work, 'final.mp4');
|
||||
await videotool.concatSegments(segFiles, finalTmp);
|
||||
await videotool.concatWithTransition(segFiles, finalTmp, { transition: transition || 'fade', width, height });
|
||||
|
||||
// 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);
|
||||
|
||||
|
||||
@@ -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.11';
|
||||
const SITE_VERSION = process.env.SITE_VERSION || '1.4.15';
|
||||
const TIMEOUT_MS = 8000;
|
||||
|
||||
const state = {
|
||||
|
||||
@@ -382,10 +382,26 @@ async function buildSegment(seg, outPath, { width = 1920, height = 1080, fontSiz
|
||||
`drawtext=fontfile=/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc:textfile=${textFile}:fontsize=${fontSize}:fontcolor=${color}@0.95:borderw=2:bordercolor=black@0.6:x=${xExpr}:y=${yExpr}:line_spacing=8`
|
||||
].join(',');
|
||||
|
||||
const exact = seg.audioDuration != null; // 目标时长模式:画面用 duration,配音对齐 audioDuration
|
||||
const vDur = Math.max(0.5, Number(seg.duration) || 4);
|
||||
const args = [
|
||||
'-y', '-loop', '1', '-t', seg.duration.toFixed(3), '-i', seg.imagePath
|
||||
'-y', '-loop', '1', '-t', vDur.toFixed(3), '-i', seg.imagePath
|
||||
];
|
||||
if (seg.ttsFile) {
|
||||
if (exact) {
|
||||
const aDur = Math.max(0.5, Number(seg.audioDuration) || vDur);
|
||||
const ttsDur = Number(seg.ttsSeconds) || 0;
|
||||
let chain = '';
|
||||
if (seg.ttsFile && ttsDur > aDur + 0.05) {
|
||||
const f = Math.min(4.0, ttsDur / aDur); // 配音超长则加速(最多4倍),避免截断内容
|
||||
chain += `atempo=${f.toFixed(4)},`;
|
||||
}
|
||||
chain += `atrim=0:${aDur.toFixed(3)},apad=whole_dur=${aDur.toFixed(3)}`;
|
||||
const src = seg.ttsFile
|
||||
? ['-i', seg.ttsFile]
|
||||
: ['-f', 'lavfi', '-i', 'anullsrc=channel_layout=stereo:sample_rate=44100'];
|
||||
args.push(...src, '-filter_complex', `[1:a]${chain}[a]`,
|
||||
'-map', '0:v', '-map', '[a]', '-c:a', 'aac', '-ar', '44100', '-ac', '2');
|
||||
} else if (seg.ttsFile) {
|
||||
args.push('-i', seg.ttsFile, '-map', '0:v', '-map', '1:a', '-c:a', 'aac', '-ar', '44100', '-ac', '2', '-shortest');
|
||||
} else {
|
||||
args.push('-f', 'lavfi', '-i', 'anullsrc=channel_layout=stereo:sample_rate=44100', '-map', '0:v', '-map', '1:a', '-shortest');
|
||||
@@ -424,6 +440,57 @@ async function concatSegments(segFiles, outPath) {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 带转场拼接分段 mp4(xfade 交叉过渡 + 音频直拼)
|
||||
* transition: cut/fade/slideleft/slideright/circleopen/dissolve/wipeleft/... (ffmpeg xfade 名)
|
||||
* 失败时回退为普通硬拼接
|
||||
*/
|
||||
async function concatWithTransition(segFiles, outPath, { transition = 'fade', width = 1920, height = 1080 } = {}) {
|
||||
const n = segFiles.length;
|
||||
if (n <= 1 || !transition || transition === 'cut') return concatSegments(segFiles, outPath);
|
||||
const F = 0.6; // 转场时长(秒)
|
||||
const dir = tmpDir();
|
||||
try {
|
||||
// 探测每段真实时长,用于计算 xfade offset
|
||||
const durs = [];
|
||||
for (const f of segFiles) {
|
||||
const p = await probeVideo(f);
|
||||
durs.push(p.duration > 0.2 ? p.duration : 4);
|
||||
}
|
||||
const inputs = [];
|
||||
for (const f of segFiles) inputs.push('-i', f);
|
||||
const filters = [];
|
||||
for (let i = 0; i < n; i++) {
|
||||
filters.push(`[${i}:v]scale=${width}:${height}:force_original_aspect_ratio=decrease,pad=${width}:${height}:(ow-iw)/2:(oh-ih)/2,setsar=1,format=yuv420p,fps=30[v${i}]`);
|
||||
}
|
||||
let prev = 'v0';
|
||||
let acc = durs[0];
|
||||
for (let i = 1; i < n; i++) {
|
||||
const offset = Math.max(0, acc - F);
|
||||
const out = i === n - 1 ? 'vx' : `x${i}`;
|
||||
filters.push(`[${prev}][v${i}]xfade=transition=${transition}:duration=${F}:offset=${offset.toFixed(3)}[${out}]`);
|
||||
prev = out;
|
||||
acc = acc + durs[i] - F;
|
||||
}
|
||||
const audioInputs = segFiles.map((_, i) => `[${i}:a]`).join('');
|
||||
filters.push(`${audioInputs}concat=n=${n}:v=0:a=1[aout]`);
|
||||
const args = [
|
||||
'-y', ...inputs, '-filter_complex', filters.join(';'),
|
||||
'-map', '[vx]', '-map', '[aout]',
|
||||
'-c:v', 'libx264', '-preset', 'veryfast', '-crf', '20',
|
||||
'-pix_fmt', 'yuv420p', '-movflags', '+faststart', outPath
|
||||
];
|
||||
await run(FFMPEG, args, { timeoutMs: 600 * 1000 });
|
||||
return outPath;
|
||||
} catch (err) {
|
||||
// 转场失败回退硬拼接,保证出片
|
||||
logger.warn && logger.warn(`⚠️ 转场拼接失败,回退硬拼接: ${err.message}`);
|
||||
return concatSegments(segFiles, outPath);
|
||||
} finally {
|
||||
fs.rmSync(dir, { recursive: true, force: true });
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
run,
|
||||
probeVideo,
|
||||
@@ -434,5 +501,6 @@ module.exports = {
|
||||
generateTts,
|
||||
buildSegment,
|
||||
concatSegments,
|
||||
concatWithTransition,
|
||||
textToSrt
|
||||
};
|
||||
+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.11
|
||||
- SITE_VERSION=1.4.18
|
||||
# 让容器经 host.docker.internal 访问宿主机的 AI 侧车
|
||||
extra_hosts:
|
||||
- "host.docker.internal:host-gateway"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "flypic-frontend",
|
||||
"version": "1.4.0",
|
||||
"version": "1.4.18",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
|
||||
@@ -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}`;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -60,6 +60,10 @@ 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 [transition, setTransition] = useState('fade');
|
||||
const [duration, setDuration] = useState(0); // 目标时长(秒),0=自动按配音
|
||||
const [task, setTask] = useState(null);
|
||||
const [error, setError] = useState('');
|
||||
const [starting, setStarting] = useState(false);
|
||||
@@ -92,6 +96,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 +133,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 +180,7 @@ export default function AIVideoStudioModal({ libraryId, onClose, onDone }) {
|
||||
libraryId, title: title.trim(),
|
||||
content: content.trim(),
|
||||
images: imgs,
|
||||
voice, resolution, extraPrompt: '',
|
||||
voice, resolution, extraPrompt: '', saveDir, transition, duration: Number(duration) || 0,
|
||||
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 +374,53 @@ 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>
|
||||
<label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">视频时长</label>
|
||||
<div className="flex flex-wrap gap-1.5 mb-1.5">
|
||||
{[0, 15, 30, 45, 60, 90, 120, 180, 300].map((s) => (
|
||||
<button key={s} type="button" disabled={running||done}
|
||||
onClick={() => setDuration(s)}
|
||||
className={`px-2 py-1 rounded text-xs border transition ${Number(duration)===s ? 'bg-blue-500 border-blue-500 text-white' : 'bg-white dark:bg-gray-700 border-gray-300 dark:border-gray-600 text-gray-700 dark:text-gray-300 hover:border-blue-400'}`}>
|
||||
{s === 0 ? '自动' : s < 60 ? `${s}秒` : `${s/60}分钟`}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
<div className="flex items-center gap-2">
|
||||
<input type="number" min="0" max="600" step="5" disabled={running||done}
|
||||
className={input} value={duration || ''} placeholder="自动(按配音)"
|
||||
onChange={(e) => setDuration(Math.min(600, Math.max(0, Number(e.target.value) || 0)))} />
|
||||
<span className="text-xs text-gray-500 dark:text-gray-400 whitespace-nowrap">秒 · 0=自动</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">转场效果</label>
|
||||
<select className={input} value={transition} onChange={(e) => setTransition(e.target.value)} disabled={running||done}>
|
||||
<option value="cut">无转场(直接切换)</option>
|
||||
<option value="fade">淡入淡出</option>
|
||||
<option value="fadeblack">黑场淡入</option>
|
||||
<option value="fadewhite">白场淡入</option>
|
||||
<option value="slideleft">左滑</option>
|
||||
<option value="slideright">右滑</option>
|
||||
<option value="slideup">上滑</option>
|
||||
<option value="slidedown">下滑</option>
|
||||
<option value="dissolve">溶解</option>
|
||||
<option value="wipeleft">左擦除</option>
|
||||
<option value="wiperight">右擦除</option>
|
||||
<option value="pixelize">像素化</option>
|
||||
<option value="circleopen">圆圈打开</option>
|
||||
<option value="hblur">模糊过渡</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 +444,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">
|
||||
|
||||
@@ -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.11';
|
||||
const appVersion = hub.version ? `v${String(hub.version).replace(/^v/, '')}` : 'v1.4.15';
|
||||
|
||||
// 从全局 store 获取筛选状态
|
||||
const selectedFormats = filters.formats || [];
|
||||
|
||||
@@ -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)}
|
||||
|
||||
@@ -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.11';
|
||||
const APP_VERSION = 'v1.4.15';
|
||||
const REPO_URL = 'https://gitea.88531.cn/jinghui/flypic';
|
||||
|
||||
/**
|
||||
@@ -326,7 +326,7 @@ export default function SettingsModal({ open, onClose, versionLabel, initialTab
|
||||
{active === 'aigen' && cfg && ig && (
|
||||
<div className="space-y-5">
|
||||
<p className="text-xs text-gray-500 dark:text-gray-400">
|
||||
AI 生图默认走内置 NewAPI(Pollinations + CF Workers AI 两个生图渠道);也可以切换到自己的 OpenAI 兼容提供商。密钥只保存在本机,不出服务器。
|
||||
AI 生图默认走内置 NewAPI(Pollinations + CF Workers AI 两个生图渠道,CF Workers AI 提供商可免费申请、每日有免费额度,见下方说明);也可以切换到自己的 OpenAI 兼容提供商。密钥只保存在本机,不出服务器。
|
||||
</p>
|
||||
|
||||
<div>
|
||||
@@ -364,6 +364,37 @@ export default function SettingsModal({ open, onClose, versionLabel, initialTab
|
||||
|
||||
{ig.provider === 'newapi' && (
|
||||
<div className="space-y-3 p-4 bg-gray-50 dark:bg-gray-900/50 rounded-lg border border-gray-200 dark:border-gray-700">
|
||||
{/* CF Workers AI 免费额度 + 申请地址 */}
|
||||
<div className="p-3 rounded-lg bg-blue-50 dark:bg-blue-900/20 border border-blue-200 dark:border-blue-800">
|
||||
<div className="flex items-center gap-1.5 mb-1">
|
||||
<span className="text-xs font-semibold text-blue-700 dark:text-blue-300">免费生图:Cloudflare Workers AI 提供商</span>
|
||||
<span className="px-1.5 py-0.5 text-[10px] font-medium rounded bg-blue-600 text-white">每日免费额度</span>
|
||||
</div>
|
||||
<p className="text-[11px] leading-relaxed text-blue-600/90 dark:text-blue-300/85">
|
||||
内置通道里的 CF Workers AI 提供商可自行免费申请:Workers 免费计划<strong className="font-medium">无需绑定信用卡</strong>,每天 10000 neurons 免费额度(北京时间每天 08:00 重置),FLUX.1 schnell 约 10 neurons/张,<strong className="font-medium">约合每天 1000 张免费文生图</strong>;DALL·E 3、FLUX 高质量等模型也走该额度。
|
||||
</p>
|
||||
<div className="mt-1.5 flex flex-wrap gap-x-4 gap-y-1 text-[11px]">
|
||||
<a
|
||||
href="https://dash.cloudflare.com/sign-up"
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
className="text-blue-600 dark:text-blue-400 hover:underline font-medium"
|
||||
>
|
||||
① 注册 Cloudflare 账号(免费)→
|
||||
</a>
|
||||
<a
|
||||
href="https://dash.cloudflare.com/profile/api-tokens"
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
className="text-blue-600 dark:text-blue-400 hover:underline font-medium"
|
||||
>
|
||||
② 创建 API Token(Workers AI Run 权限)→
|
||||
</a>
|
||||
</div>
|
||||
<p className="mt-1 text-[10px] text-blue-500/80 dark:text-blue-400/70">
|
||||
Token 创建时直接选「Workers AI」预设模板即可,过期时间选 No expiration;申请到的 Token 填到下方 API Key 即可免费生图。
|
||||
</p>
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-xs font-medium text-gray-600 dark:text-gray-400 mb-1">接口地址</label>
|
||||
<input
|
||||
|
||||
Reference in new issue
Block a user