Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a793eadb32 | ||
|
|
d9c61306fe | ||
|
|
ecb28c3aa5 | ||
|
|
c25f8b474c | ||
|
|
cac9484861 | ||
|
|
4dcc908eaa | ||
|
|
67f8a8f708 | ||
|
|
3c3d834806 | ||
|
|
fa989d0220 | ||
|
|
b6e0c475d3 | ||
|
|
76d9d45770 | ||
|
|
6e086d629d | ||
|
|
c59791f994 | ||
|
|
58900d0d45 | ||
|
|
7d0023949b | ||
|
|
9c7c72e3e7 | ||
|
|
e17b78cd19 | ||
|
|
f07cf7a266 | ||
|
|
0bbf14f194 | ||
|
|
87cc9c00a5 | ||
|
|
1775ababf6 | ||
|
|
03fb69f892 | ||
|
|
a365c4ce42 | ||
|
|
5965d33aca | ||
|
|
94ac94436c |
No files matched your search
@@ -56,3 +56,7 @@ test-library/
|
||||
|
||||
# FlyPic 运行时配置(含 JWT 密钥/密码哈希,禁止提交)
|
||||
config/
|
||||
|
||||
# AI 模型/虚拟环境(体积过大,禁止入库)
|
||||
ai-models/
|
||||
ai/
|
||||
+163
@@ -1,5 +1,168 @@
|
||||
# 更新日志
|
||||
|
||||
## 2026-11-19 → v1.4.14
|
||||
|
||||
- ✨ **灯箱只显示图片**:双击图片打开灯箱后,底部缩略图条只列出当前文件夹(含筛选)下的图片,mp4/md 等打不开的文件不再混入(此前显示出来也点不开,纯属干扰)
|
||||
- 灯箱列表本身也同步过滤为纯图片:左右方向键/箭头按钮翻页不会再翻到视频、文档等打不开的项;顶部「序号 / 总数」与缩略图条均按图片计数
|
||||
- 视频、文档的行为不变:双击仍弹出各自的播放/查看器,不进灯箱
|
||||
- 🔧 **新增「素材」目录挂载**:docker-compose.yml 与 README(compose / docker run 两种方式)补挂载 `/vol2/1000/HD2/素材`,该目录可正常添加为素材库(此前报「素材库路径不存在」)
|
||||
|
||||
## 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 创建提示
|
||||
- 顶部简介同步补充免费额度入口提示
|
||||
|
||||
## 2026-11-19 → v1.4.11
|
||||
|
||||
- ✨ **AI 生图弹窗新增「生图模型」点选**:按通道分组列出全部可选模型(CF Workers AI / Pollinations),点一下即选中并高亮,所选模型存 localStorage 下次沿用;自定义提供商则显示设置里配置的模型
|
||||
- 生成时把所选模型带给后端(effModel = 前端所选 > 设置默认),后端加模型白名单校验,未知模型名直接 400
|
||||
- 选了参考图时提示会自动切 FLUX.2 图生图模型;右上角保留「通道设置」入口
|
||||
|
||||
## 2026-11-19 → v1.4.10
|
||||
|
||||
- ✨ **提示词全中文化**:40 条图片预设新增中文详细提示词 promptCn(主体+场景+光线+构图+风格+质量),预设卡片、悬浮提示、点击填入全部显示中文;英文 prompt 字段保留作对照与翻译兜底
|
||||
- ✨ 发送时沿用后台自动中译英链路(translatePromptToEnglish),实测中文提示词 7.3 秒翻译并出图成功
|
||||
- 视频弹窗 6 条脚本提示词本就为中文,无需改动
|
||||
|
||||
## 2026-11-19 → v1.4.9
|
||||
|
||||
**AI 生图配置统一到设置 + 提示词全中文化**——模型与通道配置不再在弹窗里重复出现,提示词所见即中文:
|
||||
|
||||
- ✨ **配置去重**:AI 生图弹窗移除「模型提供商」「模型」两个下拉(与右上角设置重复);通道/模型统一在「设置 → AI 生图」配置,弹窗内只留一句「通道与模型在右上角设置里配置」+「去设置」直达按钮
|
||||
- ✨ **设置 → AI 生图新增「默认模型」下拉**(内置 NewAPI 通道):按分组列出 CF Workers AI / Pollinations 模型,与自定义提供商的模型名同在设置页;选参考图时后端自动切 FLUX.2 图生图模型,用户无需手动换模型
|
||||
- ✨ **提示词中文化**:热门提示词按钮显示中文名、点击替换(不追加)输入框;发送前提示词原样传给后端,由后端经聊天模型翻译成英文再发上游(多模型兜底,翻译失败回落原文)
|
||||
- 🐛 修复生图翻译调用早于 `effUrl/effKey` 声明导致的运行时引用错误(TDZ)
|
||||
- 🎨 AI 生图/AI 一键生成视频弹窗改为默认全屏显示
|
||||
- 🐛 所有弹窗仅通过关闭按钮关闭,点击遮罩不再关闭(防误触丢失提示词/参考图)
|
||||
- ✨ **提示词全面详细化**:40 条图片预设从短标签扩写为完整出图提示词(主体+场景+光线+构图+风格+质量,平均 200+ 字符);预设卡片直接显示详细描述(两行预览),点击填入完整提示词而非名称;6 条视频脚本提示词扩为含镜头语言与节奏的完整脚本框架
|
||||
|
||||
## 2026-11-18 → v1.4.8
|
||||
|
||||
**搜索结果批量改名 + 关键词替换**——搜索出一批文件后直接对命中结果批量改名,支持把文件名中的关键词替换掉:
|
||||
|
||||
- ✨ **搜索结果入口**:任意搜索(Header 搜索框,模糊匹配文件名+OCR 文本)后,结果区顶部出现「批量重命名搜索结果…」按钮;打开弹窗头部徽标显示当前搜索词,范围与搜索列表完全一致(选中文件夹时含其子目录,未选中则全库)
|
||||
- ✨ **新重命名模式「关键词替换」**:找什么→替换成(文件名中所有出现处全部替换);**替换成留空 = 删除该关键词**;不含关键词的文件自动跳过并在结果中报告;预览实时显示替换前后对照
|
||||
- ✨ 搜索范围与列表同款 `LIKE` 模糊匹配(多关键词 AND、filename+ocr_text),后端 `POST /api/batch/rename-preview` 与 `/start` 新增 `scope='search'` + `keywords` 参数(folder 可不传,传了则按文件夹递归限定范围)
|
||||
- ✨ 弹窗模式改 2×2 布局(4 种模式);关键词模式下隐藏「包含子目录」开关(搜索范围本身就含子目录);文件夹右键入口的原有三种模式行为不变
|
||||
- 🎨 顶栏副标题「轻量快速的图片素材库管理」→「轻量快速的素材库管理」(去「图片」二字,与全站文件类型通用化口径一致)
|
||||
- 🛡️ 关键词与替换文本同样走文件名非法字符 `\ / : * ? " < > |` 前后端校验;预览与执行共用同一计划(命中数、跳过原因一致)
|
||||
- 端到端实测:preview/scope=search 预览命中数、keyword 执行改名+DB path 同步、搜索态按钮与弹窗渲染
|
||||
|
||||
## 2026-11-18 → v1.4.7
|
||||
|
||||
**文件类型自动识别(通用机制)**——原先统计卡、文件夹卡、多选条等多处硬编码「图片/N 张图片」,库里实际有图片/视频/文档三种类型(356 个文件被显示成「356 图片总数」)。现改为类型注册表驱动,**以后新增文件类型只需在注册表加一行,全站文案与统计自动识别**:
|
||||
|
||||
- ✨ 新建 `frontend/src/utils/fileTypes.js` 类型注册表:image→图片/张、video→视频/个、document→文档/个、audio→音频/个,未知类型一律兜底「文件/个」;提供 `typeMeta`(单文件元信息)、`countLabel`(集合计数文案:单一类型→「102 张图片」,混合→「356 个文件」)、`typeLabelOf`(动词名词:复制图片/复制视频/复制文件自动切换)、`typeCountsOf`(从选中项聚合类型计数)
|
||||
- ✨ 统计卡自动识别:图标与标题按库内实际类型显示(纯图库「图片总数」、混合库「文件总数」),下方分类型图例「图片 102 · 视频 181 · 文档 73」由注册表自动渲染,新类型自动出现
|
||||
- ✨ 文件夹卡与仪表盘提示句:「X 张图片」→ 按该文件夹实际内容显示(`countLabel`,含子目录分类型聚合,后端 `FolderModel.getTree()` 新增 `_attachTypeCounts`)
|
||||
- ✨ 后端 `GET /api/image/stats` 新增 `typeCounts` 字段(按 file_type 分组计数)
|
||||
- ✨ 右侧面板全部计数与动词文案通用化:已选择/基本信息/共同父路径/已复制/复制按钮/导出按钮 —— 消除 v1.4.4 的 `selectionHasVideo ? ... : ...` 硬编码分支(该变量已删除,零引用),选中集合含视频→「个文件/复制视频」、纯图→「张图片/复制图片」、文档→「复制文档」全自动
|
||||
- ✨ 多选工具条「已选 X 张图片」→ 按选中项类型自动(混合「个文件」);批量加水印「X 张图片」→「X 个文件」;扫描进度「X/Y 张图片」→「X/Y 个文件」;评分日志、双击查看 title 同步通用化
|
||||
- 🔍 搜索框 placeholder「搜索图片...」→「搜索文件...」(搜索本就覆盖全类型,OCR 说明保留)
|
||||
- ✨ **右侧面板文件夹信息区(原截图问题点)**:「包含图片: X 张(含子文件夹)」→「包含: X 个视频/张图片/个文件(含子文件夹)」(由该文件夹实际类型自动);「导出文件夹 (X 张)」同步按类型
|
||||
- ✨ 加载进度「已加载 X/Y 张」→「已加载 X/Y 个文件」;评分 toast「(N 张)」→「(N 个)」;批量水印按钮「开始处理 N 张/该文件夹没有图片」→「开始处理 N 个文件/该文件夹没有可处理的文件」(与弹窗头部计数口径一致)
|
||||
- ✨ 合拼入口过滤:多选点「合拼」只把图片送进画布(与 AI 生成视频入口同模式),视频/文档不参与,进入后由「至少需要 2 张图片」校验提示
|
||||
- 保留(功能输入校验,非数据展示):AI 生成视频「请至少选择 2 张图片」、合拼「至少需要 2 张图片」——这两个功能的输入确实限图片,且入口均已有类型过滤
|
||||
- ✨ 注册表与后端分类器完全对齐(backend thumbnail.js getFileType 共 6 类):补 design「设计」(psd/ai/sketch/fig…) 与 other「其他」两行——此前这两个类型在统计卡图例都兜底成「文件」导致出现两个重复的「文件 N」(如「我的素材」库 文件5/文件8);图例改按注册表固定顺序展示(orderedTypeEntries)
|
||||
- 端到端实测:stats.typeCounts 正确、统计卡图例/文件夹卡「5 个视频」/右侧面板文件夹信息区/多选条浏览器核验
|
||||
|
||||
## 2026-11-18 → v1.4.6
|
||||
|
||||
- ✨ **文件夹右键新增「批量重命名文件」**:三种模式 —— 前面加(前缀)、后面加(后缀)、全部改名(原文件名整体替换,扩展名始终保留)
|
||||
- ✨ 支持**包含子目录**开关,递归处理所有层级文件(默认开启,可只改当前文件夹)
|
||||
- ✨ 弹窗**实时预览**改名效果(输入文本后即时显示每个文件的新旧文件名对照与总数)
|
||||
- 🛡️ 全部改名模式同目录多个文件**自动编号**(文本-001、文本-002…,每个子目录独立编号;单文件不编号),避免撞名
|
||||
- 🛡️ 冲突保护:目标文件名已存在(含本次内重复)自动跳过并在结果中报告;文本含文件名非法字符 `\ / : * ? " < > |` 前后端双重校验
|
||||
- ⚡️ 复用批量水印异步任务体系:进度条、可停止(已完成的保留)、完成统计(已重命名/已跳过/失败 + 失败明细)
|
||||
- 🔒 重命名后同步更新数据库记录(path/filename);缩略图按内容 hash 存储、与文件名无关,无需重建;旧路径零残留
|
||||
- 后端新增 `POST /api/batch/rename-preview` 预览接口;`POST /api/batch/start` 的 type 扩展 `rename`
|
||||
- 端到端实测:preview 三模式(含子目录/不含子目录/自动编号)、非法字符 400、suffix/prefix 实际执行 FS+DB 一致、浏览器 UI 右键菜单→弹窗→预览→执行→完成全流程
|
||||
|
||||
## 2026-11-18 → v1.4.5
|
||||
|
||||
**优化:侧栏文件夹按日期倒序,最新的文件夹排最前**——原先侧栏/仪表盘文件夹顺序来自后端 `SELECT ... ORDER BY path`(名称字典序升序),最旧的文件夹排最前,最新日期沉底。现改为在 `FolderModel.getTree()` 按文件夹名解析出的真实日期倒序排序:
|
||||
|
||||
- 兼容两种命名格式混排:`YYYY-MM-DD` 与 `YYYYMMDD`(原纯字符串倒序会把 `20261016` 压过 `2026-11-18`,日期顺序错乱;`_归档` 还会因首字符 `_` 排到最前)
|
||||
- 无法解析为日期的文件夹(如 `_归档`、`1217`)排在所有日期文件夹之后,组内按名称倒序
|
||||
- 子文件夹同样按日期倒序
|
||||
- 侧栏与仪表盘(Dashboard)共用同一接口数据,同步生效
|
||||
|
||||
## 2026-11-18 → v1.4.4
|
||||
|
||||
**修复:选中视频文件,右侧详情面板仍显示图片信息**——根因是 `RightPanel.jsx` 全组件没有任何视频判定(`fileType === 'video'`),预览区把视频当图片渲染缩略图、底部按钮硬编码「编辑图片 / 复制图片 / 导出图片」,点「编辑图片」还会把视频塞进图片编辑器。修复:
|
||||
|
||||
- **预览区**:视频改为直接播放原文件(`<video controls>`,缩略图作 poster),不再以图片形式展示
|
||||
- **按钮按类型分流**:单选视频显示「编辑视频 / 复制视频 / 导出视频」——「编辑视频」打开视频编辑弹窗(水印/字幕声音),「复制视频」只写应用内剪贴板(视频无法转成图片写系统剪贴板,原先会走失败兜底弹 alert)
|
||||
- **新增时长字段**:视频详情显示「时长: m:ss」(取 `duration` 字段,与瀑布流角标同格式)
|
||||
- **多选文案**:选中集合含视频时,「已选择 N 张图片 / 数量 N 张图片 / 复制图片 / 导出图片」等改为「个文件 / 复制文件 / 导出文件」,计数单位「张」→「个」
|
||||
- **弹窗状态提升**:视频编辑弹窗状态从 `ImageWaterfall` 局部 state 提升到 `useUIStore`,弹窗渲染移到 App 层——原先只挂在 `ImageWaterfall` 内,而该组件在 Dashboard 视图下不渲染,某些页面点编辑视频弹窗不会出现;右侧面板与右键菜单现共用同一入口,不再重复挂载
|
||||
|
||||
## 2026-11-18 → v1.4.3
|
||||
|
||||
**优化**:侧栏首项文案「全部图片」改为「全部」(`Sidebar.jsx`)。
|
||||
|
||||
**修复:视频编辑/AI 生成视频点「开始处理」报 `[object Object]`、功能完全不可用**——根因是两处裸 `fetch` 调用没带登录态:`VideoEditModal.jsx`(`/api/video/edit`)与 `AIVideoModal.jsx`(`/api/video/aigenerate`、`/api/video/task/:id`)均未附 `Authorization` 头,而后端 `/api` 全组走认证中间件,一律 401 拒绝;前端又把 `{code, message}` 错误对象直接 `new Error()`,对象转字符串就成了 `[object Object]`。修复:三处请求补 `Authorization: `Bearer ${getToken()}`(与图片编辑器等既有调用一致),错误信息统一经 `errText()` 解析(对象取 `message`,再兜底状态码),不再出现 `[object Object]`。另修复 `MergeCollage.jsx` 拼图找相似接口同样的缺 token 问题(历史遗留)。
|
||||
|
||||
## 2026-11-18 → v1.4.2
|
||||
|
||||
**修复:添加素材库报 `Path does not exist`(视频目录)**——根因是该目录未挂载进容器(容器里看不到宿主机目录)。`docker-compose.yml` 已补挂载 `/vol2/1000/HD2/发布到平台的图片和视频`,README 使用注意新增排查方法(volumes 加一行同路径挂载后 `docker compose up -d`)。后端报错同步中文化:`素材库路径不存在: <路径>(如为宿主机目录,需先在 docker-compose.yml 的 volumes 里挂载进容器再重试)`(创建与更新两处)。
|
||||
|
||||
## 2026-11-18 → v1.4.1
|
||||
|
||||
**品牌更名**:应用正式更名为「牛仔库」(原名:牛图 / FlyPic 飞图)——页面标题(定为「牛仔库 - 素材库管理」)、登录页、顶栏、设置-关于、导出文件名、后端提示与启动日志全部同步;仓库地址、镜像名、数据目录 `.flypic` 保持不变,README 标题附更名说明。
|
||||
|
||||
**修复**:平铺库(无子文件夹)无法浏览图片——误显「素材库似乎是空的」且无法进入瀑布视图。新增 `foldersLoaded` 标记区分「文件夹加载中」与「确认无子文件夹」,无子文件夹的库直接加载全部图片;扫描完成不再清空已显示图片;Dashboard 空文案按 `totalImageCount` 分流(有图时不再误报空库)。
|
||||
|
||||
## 2026-11-17 → v1.4.0
|
||||
|
||||
视频能力大版本:素材库兼容视频目录、点击弹窗播放、四项常用视频编辑(加/去水印、加/去字幕声音),以及多选图片填标题 + 模型 KEY 后 AI 一键生成带字幕和朗读的成片。
|
||||
|
||||
- ✨ 新功能:**视频目录导入** —— 扫描识别视频文件,瀑布流卡片显示 MP4 徽标与时长角标,与图片混排同库管理(搜索/收藏/回收站通用)
|
||||
- ✨ 新功能:**单击播放** —— 点击视频卡弹出全屏播放器(原片播放、进度/音量控制),可新窗口打开原片
|
||||
- ✨ 新功能:**视频编辑**(右键「编辑视频(水印/字幕声音)…」,后端 ffmpeg 处理):
|
||||
- **加水印**:文字水印(内容/位置/字号/透明度/颜色,可叠加时间戳)
|
||||
- **去水印**:框选区域模糊/填充去除
|
||||
- **加字幕声音**:SRT 字幕烧录进画面,可同时合成朗读音轨
|
||||
- **去字幕声音**:移除画面字幕区与原音轨;处理完自动入库
|
||||
- ✨ 新功能:**AI 一键生成视频**(多选 ≥2 张图片 → 右键「AI 生成视频…」)—— 填**视频标题** + **模型 KEY**(OpenAI 兼容,留空用服务器已配 KEY),选朗读音色(6 种)与画幅(横/竖/720p),可加补充要求;流程:AI 写分镜脚本 → 逐段朗读配音 → 图片逐段配字幕合成 → 拼接成片自动入库
|
||||
- 🔧 后端新增 `/api/video`(watermark / dewatermark / subtitle / unsubtitle)与 `/api/video/ai-generate` 异步任务;`scanner.js` 识别 `fileType=video` 并入库时长
|
||||
|
||||
## 2026-11-17 → v1.3.0
|
||||
|
||||
本版本为图片管理能力的大版本:图片编辑器(裁剪/旋转/调色等 PS 常用功能)、批量水印、AI 生图、收藏体系、合拼拼图、图片右上角一键新窗口打开。
|
||||
|
||||
- ✨ 新功能:**图片编辑器** —— 双击或右键「编辑图片」进入,提供 PS 常用功能:
|
||||
- **裁剪**:画布拖拽选区 + 四角把手缩放 + 三分线辅助,支持 自由/1:1/4:3/3:2/16:9/9:16 比例锁定,应用时按原图分辨率烘焙并同步平移文字/贴图对象
|
||||
- **旋转翻转**:左转 90°、右转 90°、180°、水平/垂直翻转(底图与对象一起做几何变换)
|
||||
- **图像大小**:按宽度等比缩放(16~12000 px,含超大图像素上限保护)
|
||||
- **调色**:亮度、对比度、饱和度、色相、模糊五个滑杆实时预览,另有黑白/反色/复古/自动色阶效果与一键还原;保存、裁剪、AI 处理前自动按原分辨率烘焙
|
||||
- 文字/贴图图层、撤销重做一并接入
|
||||
- ✨ 新功能:**批量水印** —— 右键菜单「批量加水印…/批量去水印…」,弹窗批量处理当前选中图片
|
||||
- ✨ 新功能:**AI 生图** —— 设置页可配生图渠道(内置 NewAPI 两大量产模型开箱即用,或切换自己的 OpenAI 兼容 /v1/images/generations 接口:地址/模型/Key),提示词预设库辅助出图
|
||||
- ✨ 新功能:**收藏体系** —— 图片左上角星标一键收藏/取消,侧边栏「我的收藏」视图与筛选项,右键菜单同步提供收藏入口
|
||||
- ✨ 新功能:**图片右上角「在新窗口打开」** —— 悬停图片右上角出现外链按钮,点击在新标签页打开原图(不打断当前浏览;非图片类型的文件类型标识自动左移让位)
|
||||
- ✨ 新功能:**合拼拼图**(MergeCollage)与**返回顶部按钮**(BackToTop)
|
||||
- 🔧 优化:搜索支持 OCR 图内文字多关键词;重新扫描按钮补跑历史图片 OCR 索引
|
||||
|
||||
|
||||
## 2026-11-16 → v1.2.1
|
||||
|
||||
本版本修复「OCR 文字搜索不到」的根因,并新增「重新扫描」入口。旧版本的 OCR 只在**文件发生变化**时执行,OCR 功能上线前已入库的图片(数千张)文字索引一直为空,导致图内文字永远搜不到。
|
||||
|
||||
- 🐛 修复:**OCR 文字搜索不到** —— 新增 `ocr_done` 标记列,扫描时对「文件没变但缺少文字索引」的旧记录自动补跑 OCR(识别为空也记为已完成,避免重复识别);新入库/变化的图片在扫描时同步标记已识别
|
||||
- ✨ 新功能:**重新扫描按钮** —— 右上角刷新按钮旁新增「重新扫描」图标(移动端同样提供),确认后对当前素材库全量重新索引并补跑 OCR,进度条通过现有 Socket.IO 扫描进度显示,扫描期间按钮自动禁用防重复触发
|
||||
- 🔧 后端:`db.js` 新增 `updateOcrResult()` 与 `ocr_done` 列迁移;扫描统计新增 `ocr`(OCR 补扫张数)计数
|
||||
|
||||
## 2026-11-16 → v1.2.0
|
||||
|
||||
本版本在 v1.1.0 基础上补齐「设置 + 授权系统」能力:OCR 可切换线上/本地、右上角开源地址与版本号与通知公告、接入 CardAuth 授权系统做版本推送与在线统计。
|
||||
|
||||
+14
-5
@@ -1,12 +1,12 @@
|
||||
# ====== Stage 1: 构建前端 ======
|
||||
FROM node:22-slim AS frontend-builder
|
||||
FROM docker.1ms.run/library/node:22-slim AS frontend-builder
|
||||
|
||||
WORKDIR /app/frontend
|
||||
COPY frontend/ ./
|
||||
RUN npm install --legacy-peer-deps && npm run build
|
||||
|
||||
# ====== Stage 2: 安装后端依赖 ======
|
||||
FROM node:22-slim AS backend-builder
|
||||
FROM docker.1ms.run/library/node:22-slim AS backend-builder
|
||||
|
||||
# 安装编译工具(better-sqlite3 / sharp 需要)
|
||||
RUN sed -i 's|deb.debian.org|mirrors.tuna.tsinghua.edu.cn|g' /etc/apt/sources.list.d/debian.sources 2>/dev/null; \
|
||||
@@ -21,11 +21,11 @@ COPY backend/package.json ./
|
||||
RUN npm install --legacy-peer-deps
|
||||
|
||||
# ====== Stage 3: 运行 ======
|
||||
FROM node:22-slim AS runner
|
||||
FROM docker.1ms.run/library/node:22-slim AS runner
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# 运行时依赖:sharp + tesseract OCR + 中英文语言包
|
||||
# 运行时依赖:sharp + tesseract OCR + 中英文语言包 + ffmpeg(视频抽帧/转码)+ edge-tts(AI 视频朗读)
|
||||
RUN sed -i 's|deb.debian.org|mirrors.tuna.tsinghua.edu.cn|g' /etc/apt/sources.list.d/debian.sources 2>/dev/null; \
|
||||
sed -i 's|deb.debian.org|mirrors.tuna.tsinghua.edu.cn|g' /etc/apt/sources.list 2>/dev/null; \
|
||||
apt-get update && apt-get install -y --no-install-recommends \
|
||||
@@ -33,7 +33,16 @@ RUN sed -i 's|deb.debian.org|mirrors.tuna.tsinghua.edu.cn|g' /etc/apt/sources.li
|
||||
tesseract-ocr \
|
||||
tesseract-ocr-chi-sim \
|
||||
tesseract-ocr-eng \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
fonts-noto-cjk \
|
||||
fontconfig \
|
||||
ffmpeg \
|
||||
python3 \
|
||||
python3-pip \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
&& fc-cache -f
|
||||
|
||||
# edge-tts:AI 一键生成视频的朗读配音(Microsoft Edge TTS,仅安装脚本层,凭据无)
|
||||
RUN pip3 install --break-system-packages --no-cache-dir -i https://pypi.tuna.tsinghua.edu.cn/simple edge-tts
|
||||
|
||||
# 复制后端代码和依赖
|
||||
COPY --from=backend-builder /app/backend/node_modules ./backend/node_modules
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
# FlyPic 飞图(Docker 独立部署版)
|
||||
# 牛仔库(FlyPic 飞图,Docker 独立部署版)
|
||||
|
||||
> **2026-11-18 起正式更名为「牛仔库」**(原名:牛图 / FlyPic 飞图)。仓库地址、镜像名、数据目录 `.flypic` 保持不变。
|
||||
|
||||
本仓库是 [ZangXincz/FlyPic](https://github.com/ZangXincz/FlyPic) 的 Docker 化分支(上游已归档停更)。**本文档只介绍本分支修改过的功能与部署方式**,上游原有功能不再重复。
|
||||
|
||||
@@ -51,6 +53,35 @@
|
||||
|
||||
- 图片区保持原交互:**单击选中、Ctrl/Shift 多选、双击放大预览**(未改动)
|
||||
|
||||
### 8. 重新扫描按钮与 OCR 补扫(v1.2.1 新增)
|
||||
|
||||
- 右上角刷新按钮旁新增**「重新扫描」图标**(移动端同样提供):确认后对当前素材库全量重新索引并补跑 OCR 文字识别,进度条复用现有扫描进度显示,扫描期间按钮自动禁用防重复触发
|
||||
- 修复 **OCR 文字搜索不到**:OCR 功能上线前已入库的图片文字索引一直为空,且旧扫描逻辑对"文件没变"的记录永远跳过、不补识别;现在新增 `ocr_done` 标记列,重新扫描时自动为这些旧图片补跑 OCR(识别为空也记为已完成,不会反复重试)
|
||||
- 扫描统计新增 `ocr`(OCR 补扫张数)计数
|
||||
|
||||
### 9. 图片编辑器 / 批量水印 / AI 生图 / 收藏(v1.3.0 新增)
|
||||
|
||||
- **图片编辑器**:右键「编辑图片」进入,提供 PS 常用功能 —— **裁剪**(拖拽选区 + 四角把手 + 三分线,自由/1:1/4:3/3:2/16:9/9:16 比例锁定,按原图分辨率烘焙)、**旋转翻转**(左右 90°/180°/水平/垂直)、**图像大小**(等比缩放 16~12000 px)、**调色**(亮度/对比度/饱和度/色相/模糊滑杆实时预览 + 黑白/反色/复古/自动色阶 + 一键还原),文字与贴图图层随裁剪/旋转同步变换,保存前自动按原分辨率烘焙
|
||||
- **批量水印**:右键菜单「批量加水印…/批量去水印…」,弹窗对选中图片批量处理
|
||||
- **AI 生图**:设置页「AI 生图设置」可配生图渠道 —— 默认走内置 NewAPI(Pollinations / Cloudflare Workers AI 两大量产模型开箱即用),也可切换到自己的 OpenAI 兼容 `/v1/images/generations` 接口(地址/模型/Key),并提供提示词预设库
|
||||
- **收藏体系**:图片**左上角星标**一键收藏/取消,侧边栏「我的收藏」视图 + Header 筛选项,右键菜单同步提供收藏入口
|
||||
- **图片右上角「在新窗口打开」**:悬停图片右上角出现外链按钮,点击在**新标签页打开原图**,不打断当前浏览(非图片类型的文件类型标识自动左移让位)
|
||||
- **合拼拼图**与**返回顶部按钮**
|
||||
|
||||
### 10. 视频功能:目录导入 / 播放 / 常用编辑 / AI 一键成片(v1.4.0 新增)
|
||||
|
||||
- **素材库兼容视频目录**:扫描时识别视频文件(mp4 等),瀑布流卡片显示 **MP4 类型徽标**与**时长角标**(如 `0:09`),与图片混排、同一套搜索/收藏/回收站体系
|
||||
- **单击播放**:点击视频卡弹出全屏播放器(原片直接播放,可暂停/进度/音量),右上角可新窗口打开原片
|
||||
- **常用视频编辑**(右键「编辑视频(水印/字幕声音)…」,弹窗四选一 + 开始处理,后端 ffmpeg):
|
||||
- **加水印**:文字水印(内容/位置/字号/透明度/颜色),可叠加时间戳
|
||||
- **去水印**:框选区域模糊/填充去除
|
||||
- **加字幕声音**:外挂字幕轨烧录进画面(支持 SRT 字幕文件),可同时合成朗读音轨
|
||||
- **去字幕声音**:移除画面字幕区与原音轨
|
||||
- 处理完自动入库,新文件可在瀑布流直接看到
|
||||
- **AI 一键生成视频**(多选 ≥2 张图片 → 右键「AI 生成视频…」):
|
||||
- 表单:**视频标题**(AI 按此写分镜旁白,成片同名)+ **模型 KEY**(OpenAI 兼容,留空用服务器已配 KEY)+ **朗读音色**(晓晓/云希/云健/晓伊/云扬/晓臻 6 种)+ **画幅**(1920×1080 / 1080×1920 / 1280×720)+ 补充要求
|
||||
- 流程全自动:**AI 写分镜脚本 → 逐段朗读配音 → 图片逐段配字幕合成 → 拼接成片入库**(约 10–60 秒/张),完成后成片出现在素材库
|
||||
|
||||
## 🚀 部署方式
|
||||
|
||||
### 方式一:Docker Compose(推荐)
|
||||
@@ -71,6 +102,8 @@ services:
|
||||
# 素材库目录(容器内路径与宿主机一致,中文路径直接填,按需增减)
|
||||
- /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:
|
||||
@@ -111,6 +144,9 @@ docker run -d --name flypic --restart unless-stopped \
|
||||
-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
|
||||
```
|
||||
|
||||
@@ -120,7 +156,8 @@ docker run -d --name flypic --restart unless-stopped \
|
||||
|
||||
## 📝 使用注意
|
||||
|
||||
- **添加/更新素材库后需重新扫描**,图片内 OCR 文字才可被搜索到(旧索引无文字数据)
|
||||
- **添加/更新素材库后需重新扫描**,图片内 OCR 文字才可被搜索到(旧索引无文字数据)——点击右上角**「重新扫描」图标**即可,扫描时会自动补齐历史图片的 OCR 文字索引
|
||||
- **添加素材库提示 `Path does not exist`** = 该目录没有挂载进容器(容器里看不到宿主机目录)——在 `docker-compose.yml` 的 `volumes` 下加一行 `- /宿主机路径:/宿主机路径`(两边写一样的路径),再 `docker compose up -d`,然后重新添加即可
|
||||
- 素材库全量 OCR 扫描逐张识别、耗时较长,建议在不用的时候执行
|
||||
- 数据存储:素材目录下 `.flypic/`(缩略图 + SQLite 索引,含 `ocr_text` 列);应用配置在 `config/`(已 gitignore)
|
||||
- 删除素材目录下的 `.flypic` 即可清除该库索引,重新扫描重建
|
||||
|
||||
+32
-3
@@ -97,6 +97,20 @@ class LibraryDatabase {
|
||||
// 列已存在,忽略错误
|
||||
}
|
||||
|
||||
// 添加 ocr_done 列(如果不存在):1=已尝试过 OCR(含识别为空的结果),0=待补扫
|
||||
try {
|
||||
this.db.exec(`ALTER TABLE images ADD COLUMN ocr_done INTEGER DEFAULT 0`);
|
||||
} catch (e) {
|
||||
// 列已存在,忽略错误
|
||||
}
|
||||
|
||||
// 添加 duration 列(如果不存在):视频时长(秒),图片为 0
|
||||
try {
|
||||
this.db.exec(`ALTER TABLE images ADD COLUMN duration REAL DEFAULT 0`);
|
||||
} catch (e) {
|
||||
// 列已存在,忽略错误
|
||||
}
|
||||
|
||||
// Folders table
|
||||
this.db.exec(`
|
||||
CREATE TABLE IF NOT EXISTS folders (
|
||||
@@ -177,8 +191,8 @@ class LibraryDatabase {
|
||||
insertImage(imageData) {
|
||||
const stmt = this.db.prepare(`
|
||||
INSERT OR REPLACE INTO images
|
||||
(path, filename, folder, size, width, height, format, file_type, created_at, modified_at, file_hash, thumbnail_path, thumbnail_size, indexed_at, ocr_text)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
(path, filename, folder, size, width, height, format, file_type, created_at, modified_at, file_hash, thumbnail_path, thumbnail_size, indexed_at, ocr_text, ocr_done, duration)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
`);
|
||||
const result = stmt.run(
|
||||
imageData.path,
|
||||
@@ -195,13 +209,28 @@ class LibraryDatabase {
|
||||
imageData.thumbnail_path,
|
||||
imageData.thumbnail_size,
|
||||
Date.now(),
|
||||
imageData.ocr_text || ''
|
||||
imageData.ocr_text || '',
|
||||
imageData.ocr_done !== undefined ? imageData.ocr_done : 0,
|
||||
imageData.duration || 0
|
||||
);
|
||||
// 更新数据库修改时间
|
||||
this.updateLastModified();
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新单张图片的 OCR 结果并标记已识别(ocr_done=1)
|
||||
* 供扫描时对"文件未变化但缺少文字索引"的旧记录补扫使用
|
||||
*/
|
||||
updateOcrResult(imagePath, text) {
|
||||
const stmt = this.db.prepare(
|
||||
'UPDATE images SET ocr_text = ?, ocr_done = 1 WHERE path = ?'
|
||||
);
|
||||
const result = stmt.run(text || '', imagePath);
|
||||
this.updateLastModified();
|
||||
return result;
|
||||
}
|
||||
|
||||
getImageByPath(imagePath) {
|
||||
const stmt = this.db.prepare('SELECT * FROM images WHERE path = ?');
|
||||
return stmt.get(imagePath);
|
||||
|
||||
+1
-1
@@ -113,7 +113,7 @@ cleanupManager.startRoutineCleanup();
|
||||
|
||||
// 启动服务器
|
||||
server.listen(PORT, () => {
|
||||
console.log('\n🚀 FlyPic 服务器已启动');
|
||||
console.log('\n🚀 牛仔库服务器已启动');
|
||||
console.log(`📡 端口: ${PORT}`);
|
||||
console.log(`🔌 Socket.IO 就绪`);
|
||||
if (FRONTEND_DIST) console.log(`📁 前端: ${FRONTEND_DIST}`);
|
||||
|
||||
@@ -85,6 +85,10 @@ function createApp(dependencies) {
|
||||
const uploadRouter = require('./routes/upload');
|
||||
const settingsRouter = require('./routes/settings');
|
||||
const hubRouter = require('./routes/hub');
|
||||
const editRouter = require('./routes/edit');
|
||||
const batchRouter = require('./routes/batch');
|
||||
const aigenRouter = require('./routes/aigen');
|
||||
const videoRouter = require('./routes/video');
|
||||
|
||||
app.use('/api/auth', authRouter);
|
||||
app.use('/api/library', libraryRouter);
|
||||
@@ -94,6 +98,10 @@ function createApp(dependencies) {
|
||||
app.use('/api/upload', uploadRouter);
|
||||
app.use('/api/settings', settingsRouter);
|
||||
app.use('/api/hub', hubRouter);
|
||||
app.use('/api/edit', editRouter);
|
||||
app.use('/api/batch', batchRouter);
|
||||
app.use('/api/aigen', aigenRouter);
|
||||
app.use('/api/video', videoRouter);
|
||||
|
||||
// 健康检查
|
||||
app.get('/api/health', (req, res) => {
|
||||
|
||||
@@ -28,7 +28,68 @@ class FolderModel extends BaseModel {
|
||||
*/
|
||||
getTree() {
|
||||
const folders = this.findAll();
|
||||
return this._buildTree(folders);
|
||||
// 最新文件夹排最前:按文件夹名解析出的日期倒序(兼容 YYYY-MM-DD 与 YYYYMMDD 两种命名),
|
||||
// 无法解析为日期的(如 _归档、纯数字名)排在日期文件夹之后
|
||||
folders.sort((a, b) => {
|
||||
const diff = this._dateKey(b.name) - this._dateKey(a.name);
|
||||
if (diff !== 0) return diff;
|
||||
return String(b.name).localeCompare(String(a.name));
|
||||
});
|
||||
return this._attachTypeCounts(this._buildTree(folders));
|
||||
}
|
||||
|
||||
/**
|
||||
* 给树中每个节点附着 typeCounts(按文件类型分组计数,含子目录)
|
||||
* { image: 102, video: 181, document: 73 }
|
||||
* 聚合范围与 updateImageCount 一致:本文件夹 + 所有子目录前缀
|
||||
* 供前端类型注册表自动识别渲染(新增类型无需改代码)
|
||||
*/
|
||||
_attachTypeCounts(tree) {
|
||||
let rows = [];
|
||||
try {
|
||||
rows = this.db.prepare(`
|
||||
SELECT folder, file_type, COUNT(*) as c
|
||||
FROM images
|
||||
GROUP BY folder, file_type
|
||||
`).all();
|
||||
} catch {
|
||||
return tree; // 查询失败时保持无 typeCounts,前端兜底"个文件"
|
||||
}
|
||||
const byFolder = new Map();
|
||||
for (const r of rows) {
|
||||
if (!byFolder.has(r.folder)) byFolder.set(r.folder, {});
|
||||
const m = byFolder.get(r.folder);
|
||||
const t = r.file_type || 'image';
|
||||
m[t] = (m[t] || 0) + r.c;
|
||||
}
|
||||
const walk = (nodes) => {
|
||||
for (const n of nodes) {
|
||||
const counts = {};
|
||||
for (const [f, m] of byFolder) {
|
||||
if (f === n.path || f.startsWith(n.path + '/')) {
|
||||
for (const [t, c] of Object.entries(m)) {
|
||||
counts[t] = (counts[t] || 0) + c;
|
||||
}
|
||||
}
|
||||
}
|
||||
n.typeCounts = counts;
|
||||
if (n.children && n.children.length) walk(n.children);
|
||||
}
|
||||
};
|
||||
walk(tree);
|
||||
return tree;
|
||||
}
|
||||
|
||||
/**
|
||||
* 将文件夹名解析为日期键(YYYYMMDD 整数),解析不出返回 0
|
||||
*/
|
||||
_dateKey(name) {
|
||||
const m = String(name || '').match(/(\d{4})-?(\d{2})-?(\d{2})/);
|
||||
if (!m) return 0;
|
||||
const month = Number(m[2]);
|
||||
const day = Number(m[3]);
|
||||
if (month < 1 || month > 12 || day < 1 || day > 31) return 0;
|
||||
return Number(m[1] + m[2] + m[3]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -207,6 +207,12 @@ class ImageModel extends BaseModel {
|
||||
params.push(filters.endDate);
|
||||
}
|
||||
|
||||
// 收藏过滤(左侧「我的收藏」菜单)
|
||||
if (filters.favorite !== undefined && filters.favorite !== null && filters.favorite !== '') {
|
||||
query += ' AND favorite = ?';
|
||||
params.push(Number(filters.favorite) ? 1 : 0);
|
||||
}
|
||||
|
||||
// 排序
|
||||
query += ' ORDER BY created_at DESC';
|
||||
|
||||
|
||||
@@ -0,0 +1,379 @@
|
||||
/**
|
||||
* AI 生图路由
|
||||
* - 内置渠道:NewAPI(Pollinations + CF Workers AI,OpenAI 兼容 /v1/images/generations)
|
||||
* - 自定义渠道:用户在设置里填的提供商(url + apiKey + model,OpenAI 兼容)
|
||||
* - GET /api/aigen/models 内置模型分组 + 当前配置(apiKey 掩码)
|
||||
* - POST /api/aigen/generate 生成图片,返回 base64(key 不出后端)
|
||||
*/
|
||||
|
||||
const express = require('express');
|
||||
/** 文生图提示词翻译:含中文/非 ASCII 时先翻译成英文,失败则回落原文 */
|
||||
const TEXT_TRANSLATE_MODELS = (process.env.AIGEN_TRANSLATE_MODEL || 'glm-5.3-flash,deepseek-v4.1-flash,mimo-v2.6-flash').split(',').map(s=>s.trim()).filter(Boolean);
|
||||
async function translatePromptToEnglish(prompt, url, key) {
|
||||
const p = String(prompt || '').trim();
|
||||
if (!p || !/[\x80-\uFFFF]/.test(p)) return p; // 已是纯英文/ASCII,无需翻译
|
||||
for (const model of TEXT_TRANSLATE_MODELS) {
|
||||
try {
|
||||
const ctrl = new AbortController();
|
||||
const t = setTimeout(() => ctrl.abort(), 30000);
|
||||
const resp = await fetch(`${url}/chat/completions`, {
|
||||
method: 'POST',
|
||||
headers: { 'Authorization': `Bearer ${key}`, 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({
|
||||
model,
|
||||
messages: [
|
||||
{ role: 'system', content: 'You are a translator. Translate the user prompt into concise, vivid English suitable for an image generation model. Output ONLY the English prompt, no quotes, no explanation.' },
|
||||
{ role: 'user', content: p }
|
||||
],
|
||||
temperature: 0.2,
|
||||
max_tokens: 300
|
||||
}),
|
||||
signal: ctrl.signal
|
||||
});
|
||||
clearTimeout(t);
|
||||
if (!resp.ok) continue;
|
||||
const d = await resp.json();
|
||||
const out = (d && d.choices && d.choices[0] && d.choices[0].message && d.choices[0].message.content) || '';
|
||||
const clean = String(out).trim().replace(/^["'`]+|["'`]+$/g, '');
|
||||
if (clean) return clean;
|
||||
} catch (e) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
return p; // 全部失败回落原文
|
||||
}
|
||||
|
||||
const router = express.Router();
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const { asyncHandler } = require('../middleware/errorHandler');
|
||||
const logger = require('../utils/logger');
|
||||
const { getSettings } = require('../../utils/settings');
|
||||
|
||||
// 内置模型分组(NewAPI 两个生图渠道)
|
||||
const BUILTIN_GROUPS = [
|
||||
{
|
||||
key: 'cf',
|
||||
label: 'CF Workers AI',
|
||||
models: [
|
||||
{ id: 'flux-schnell', name: 'FLUX-schnell(快速)' },
|
||||
{ id: 'flux', name: 'FLUX(高质量)' },
|
||||
{ id: 'dall-e-3', name: 'DALL·E 3' }
|
||||
]
|
||||
},
|
||||
{
|
||||
key: 'pollinations',
|
||||
label: 'Pollinations',
|
||||
models: [
|
||||
{ id: 'pollinations-flux', name: 'Pollinations FLUX(高清)' },
|
||||
{ id: 'pollinations-turbo', name: 'Pollinations Turbo(极速)' },
|
||||
{ id: 'pollinations-flux-anime', name: 'Pollinations 动漫' },
|
||||
{ id: 'pollinations-sana', name: 'Pollinations Sana(轻量)' },
|
||||
{ id: 'pollinations-any-dark', name: 'Pollinations 暗黑风' }
|
||||
]
|
||||
}
|
||||
];
|
||||
|
||||
const ALLOWED_SIZES = ['1024x1024', '1280x720', '720x1280', '1536x1024', '1024x1536'];
|
||||
|
||||
// 以图生图(图片编辑)支持的模型:FLUX.2 系列走 /v1/images/edits 的 multipart 上传
|
||||
const EDIT_MODELS = [
|
||||
{ id: 'flux-2', name: 'FLUX.2 [dev](图生图)' },
|
||||
{ id: 'flux-2-klein', name: 'FLUX.2 Klein 9B(图生图·快)' },
|
||||
{ id: 'flux-2-klein-4b', name: 'FLUX.2 Klein 4B(图生图·最省)' }
|
||||
];
|
||||
|
||||
// 文生图允许的模型(内置分组 + 图生图专用),防止任意模型名打到上游
|
||||
const ALLOWED_MODELS = new Set([
|
||||
...BUILTIN_GROUPS.flatMap((g) => g.models.map((m) => m.id)),
|
||||
...EDIT_MODELS.map((m) => m.id)
|
||||
]);
|
||||
|
||||
const REF_EXTS = new Set(['.jpg', '.jpeg', '.png', '.webp', '.bmp', '.avif', '.gif']);
|
||||
const MAX_REFS = 4;
|
||||
const MIME_BY_EXT = {
|
||||
'.jpg': 'image/jpeg', '.jpeg': 'image/jpeg', '.png': 'image/png',
|
||||
'.webp': 'image/webp', '.bmp': 'image/bmp', '.avif': 'image/avif', '.gif': 'image/gif'
|
||||
};
|
||||
|
||||
/** 归一化基础地址 -> 完整 images/edits URL */
|
||||
function normalizeEditUrl(url) {
|
||||
let u = String(url || '').trim().replace(/\/+$/, '');
|
||||
if (/\/images\/edits$/.test(u)) return u;
|
||||
if (/\/images\/generations$/.test(u)) return u.replace(/\/images\/generations$/, '/images/edits');
|
||||
if (/\/v1$/.test(u)) return u + '/images/edits';
|
||||
if (/\/chat\/completions$/.test(u)) return u.replace(/\/chat\/completions$/, '/images/edits');
|
||||
return u + '/v1/images/edits';
|
||||
}
|
||||
|
||||
/**
|
||||
* 从素材库读取参考图(以图生图用)
|
||||
* refs 支持 ['a.jpg'] 或 [{ path|filename }]
|
||||
*/
|
||||
function loadRefImages(req, libraryId, refs) {
|
||||
const list = Array.isArray(refs) ? refs.filter(Boolean).slice(0, MAX_REFS) : [];
|
||||
if (list.length === 0) return [];
|
||||
const configManager = req.app.get('configManager');
|
||||
if (!configManager) throw new Error('服务未初始化');
|
||||
const config = configManager.load();
|
||||
const library = (config.libraries || []).find((l) => String(l.id) === String(libraryId));
|
||||
if (!library) throw new Error('素材库不存在,请重新选择参考图');
|
||||
|
||||
const out = [];
|
||||
for (const item of list) {
|
||||
const rel = typeof item === 'string' ? item : (item.path || item.filename);
|
||||
if (!rel) continue;
|
||||
const abs = path.resolve(path.join(library.path, rel));
|
||||
if (!abs.startsWith(path.resolve(library.path))) throw new Error('参考图路径非法');
|
||||
if (!fs.existsSync(abs)) throw new Error(`参考图不存在: ${rel}`);
|
||||
const ext = path.extname(abs).toLowerCase();
|
||||
if (!REF_EXTS.has(ext)) throw new Error(`不是图片文件: ${rel}(只能选图片做参考图)`);
|
||||
out.push({
|
||||
name: path.basename(abs),
|
||||
mime: MIME_BY_EXT[ext] || 'application/octet-stream',
|
||||
buf: fs.readFileSync(abs)
|
||||
});
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
/** 归一化基础地址 -> 完整 images/generations URL */
|
||||
function normalizeGenUrl(url) {
|
||||
let u = String(url || '').trim().replace(/\/+$/, '');
|
||||
if (/\/images\/generations$/.test(u)) return u;
|
||||
if (/\/v1$/.test(u)) return u + '/images/generations';
|
||||
if (/\/chat\/completions$/.test(u)) return u.replace(/\/chat\/completions$/, '/images/generations');
|
||||
return u + '/v1/images/generations';
|
||||
}
|
||||
|
||||
function maskKey(key) {
|
||||
if (!key) return '';
|
||||
if (key.length <= 8) return '****';
|
||||
return key.slice(0, 4) + '****' + key.slice(-4);
|
||||
}
|
||||
|
||||
/** 取当前生效的提供商配置 */
|
||||
function resolveProvider(settings) {
|
||||
const ig = settings.imagegen || {};
|
||||
if (ig.provider === 'custom' && ig.custom && ig.custom.url) {
|
||||
return {
|
||||
provider: 'custom',
|
||||
url: ig.custom.url,
|
||||
apiKey: ig.custom.apiKey || '',
|
||||
model: ig.custom.model || '',
|
||||
label: '自定义提供商'
|
||||
};
|
||||
}
|
||||
return {
|
||||
provider: 'newapi',
|
||||
url: (ig.newapi && ig.newapi.url) || 'http://192.168.68.19:3099/v1',
|
||||
// 内置 key 优先取设置里填的,其次取服务器环境变量
|
||||
apiKey: (ig.newapi && ig.newapi.apiKey) || process.env.NEWAPI_KEY || '',
|
||||
model: (ig.newapi && ig.newapi.model) || 'flux-schnell',
|
||||
label: 'NewAPI(Pollinations + CF Workers AI)'
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* GET /api/aigen/models
|
||||
* 返回内置模型分组 + 当前生效配置(掩码)
|
||||
*/
|
||||
router.get('/models', asyncHandler(async (req, res) => {
|
||||
const settings = getSettings();
|
||||
const cur = resolveProvider(settings);
|
||||
|
||||
res.json({
|
||||
success: true,
|
||||
data: {
|
||||
groups: BUILTIN_GROUPS,
|
||||
editModels: EDIT_MODELS,
|
||||
sizes: ALLOWED_SIZES,
|
||||
provider: {
|
||||
type: cur.provider,
|
||||
label: cur.label,
|
||||
builtinModel: cur.model || 'flux-schnell',
|
||||
url: cur.url,
|
||||
apiKeyMasked: maskKey(cur.apiKey),
|
||||
hasKey: !!cur.apiKey,
|
||||
customModel: (settings.imagegen && settings.imagegen.custom && settings.imagegen.custom.model) || '',
|
||||
customUrl: (settings.imagegen && settings.imagegen.custom && settings.imagegen.custom.url) || ''
|
||||
}
|
||||
}
|
||||
});
|
||||
}));
|
||||
|
||||
/**
|
||||
* POST /api/aigen/generate
|
||||
* body: { prompt, model?, size?, provider? }
|
||||
* provider: 'builtin'(按模型自动走 NewAPI)| 'custom'(用设置里的自定义提供商)
|
||||
* 返回 { images: [{ b64 }], revisedPrompt?, ms }
|
||||
*/
|
||||
router.post('/generate', asyncHandler(async (req, res) => {
|
||||
const t0 = Date.now();
|
||||
const { prompt, model, size, provider, libraryId } = req.body || {};
|
||||
// 文生图:中文提示词先翻译成英文再发给上游(图生图同样翻译)
|
||||
const originalPrompt = String(prompt || '').trim();
|
||||
|
||||
// 参考图(以图生图):兼容 refImages / refs / refPaths 三种字段
|
||||
const rawRefs = (req.body && (req.body.refImages || req.body.refs || req.body.refPaths)) || [];
|
||||
|
||||
if (!prompt || !String(prompt).trim()) {
|
||||
return res.status(400).json({ success: false, error: '提示词不能为空' });
|
||||
}
|
||||
|
||||
const settings = getSettings();
|
||||
const cur = resolveProvider(settings);
|
||||
|
||||
// 自定义提供商模式:模型用设置里填的
|
||||
const useCustom = provider === 'custom' || (provider !== 'builtin' && cur.provider === 'custom');
|
||||
let effUrl = cur.url;
|
||||
let effKey = cur.apiKey;
|
||||
let effModel = model;
|
||||
|
||||
if (useCustom) {
|
||||
if (!cur.url || cur.provider !== 'custom') {
|
||||
return res.status(400).json({ success: false, error: '未配置自定义提供商,请先到设置 → AI 生图填写' });
|
||||
}
|
||||
if (!cur.model && !model) {
|
||||
return res.status(400).json({ success: false, error: '自定义提供商未填写模型名' });
|
||||
}
|
||||
effModel = model || cur.model;
|
||||
} else {
|
||||
if (!effKey) {
|
||||
return res.status(400).json({ success: false, error: '未配置 NewAPI Key,请到设置 → AI 生图填写' });
|
||||
}
|
||||
if (effModel && !ALLOWED_MODELS.has(effModel)) {
|
||||
return res.status(400).json({ success: false, error: `未知模型: ${effModel}` });
|
||||
}
|
||||
effModel = effModel || cur.model || 'flux-schnell'; // 默认模型统一在设置 → AI 生图里配
|
||||
}
|
||||
|
||||
const effPrompt = await translatePromptToEnglish(originalPrompt, effUrl, effKey);
|
||||
const effSize = ALLOWED_SIZES.includes(size) ? size : '1024x1024';
|
||||
|
||||
// 读取参考图(有参考图 = 以图生图,走图片编辑接口)
|
||||
let refs = [];
|
||||
if (rawRefs && (Array.isArray(rawRefs) ? rawRefs.length : true)) {
|
||||
try {
|
||||
refs = loadRefImages(req, libraryId, rawRefs);
|
||||
} catch (e) {
|
||||
return res.status(400).json({ success: false, error: e.message });
|
||||
}
|
||||
}
|
||||
const isEdit = refs.length > 0;
|
||||
// 前端不再选模型:有参考图且内置模型不支持编辑时,自动切到图生图模型
|
||||
if (isEdit && !useCustom && !['flux-2', 'flux-2-klein'].includes(effModel)) {
|
||||
effModel = 'flux-2';
|
||||
}
|
||||
const targetUrl = isEdit ? normalizeEditUrl(effUrl) : normalizeGenUrl(effUrl);
|
||||
|
||||
logger.info(`[aigen] ${isEdit ? 'edit' : 'generate'} model=${effModel} size=${effSize} refs=${refs.length} provider=${useCustom ? 'custom' : 'builtin'} prompt=${String(effPrompt).slice(0, 60)} (orig: ${String(originalPrompt).slice(0, 40)})`);
|
||||
|
||||
const ctrl = new AbortController();
|
||||
const timer = setTimeout(() => ctrl.abort(), isEdit ? 300000 : 150000); // 图生图更慢,最长 300s
|
||||
let result;
|
||||
try {
|
||||
let body;
|
||||
let headers = { 'Authorization': `Bearer ${effKey}` };
|
||||
if (isEdit) {
|
||||
const form = new FormData();
|
||||
form.append('model', String(effModel || 'flux-2'));
|
||||
form.append('prompt', String(effPrompt));
|
||||
form.append('n', '1');
|
||||
form.append('size', effSize);
|
||||
refs.forEach((r, i) => {
|
||||
form.append(i === 0 ? 'image' : `image_${i}`, new Blob([r.buf], { type: r.mime }), r.name);
|
||||
});
|
||||
body = form;
|
||||
} else {
|
||||
headers['Content-Type'] = 'application/json';
|
||||
body = JSON.stringify({
|
||||
model: effModel,
|
||||
prompt: String(effPrompt),
|
||||
n: 1,
|
||||
size: effSize
|
||||
});
|
||||
}
|
||||
const resp = await fetch(targetUrl, {
|
||||
method: 'POST',
|
||||
headers,
|
||||
body,
|
||||
signal: ctrl.signal
|
||||
});
|
||||
const text = await resp.text();
|
||||
if (!resp.ok) {
|
||||
logger.error(`[aigen] upstream ${resp.status}: ${text.slice(0, 300)}`);
|
||||
let msg = `生图接口返回 ${resp.status}`;
|
||||
try {
|
||||
const j = JSON.parse(text);
|
||||
if (j.error && j.error.message) msg = j.error.message;
|
||||
else if (j.message) msg = j.message;
|
||||
} catch (e) { /* 保留默认信息 */ }
|
||||
if (isEdit && /not found|404|not support|unsupported|invalid model/i.test(msg + ' ' + resp.status)) {
|
||||
msg += '(当前模型可能不支持以图生图,请在设置里换成 flux-2 系列或支持图片编辑的模型)';
|
||||
}
|
||||
return res.status(502).json({ success: false, error: msg });
|
||||
}
|
||||
result = JSON.parse(text);
|
||||
} catch (e) {
|
||||
const aborted = e.name === 'AbortError';
|
||||
logger.error(`[aigen] fetch error: ${e.message}`);
|
||||
return res.status(502).json({
|
||||
success: false,
|
||||
error: aborted ? '生图超时(超过 150 秒)' : `生图请求失败: ${e.message}`
|
||||
});
|
||||
} finally {
|
||||
clearTimeout(timer);
|
||||
}
|
||||
|
||||
// 按魔数探测真实格式(上游可能返回 JPEG/PNG/WEBP,扩展名不能瞎写)
|
||||
function sniffExt(buf) {
|
||||
if (buf[0] === 0xFF && buf[1] === 0xD8 && buf[2] === 0xFF) return 'jpg';
|
||||
if (buf[0] === 0x89 && buf[1] === 0x50 && buf[2] === 0x4E && buf[3] === 0x47) return 'png';
|
||||
if (buf[0] === 0x52 && buf[1] === 0x49 && buf[2] === 0x46 && buf[3] === 0x46) return 'webp';
|
||||
return 'png';
|
||||
}
|
||||
|
||||
const list = result.data || [];
|
||||
const images = [];
|
||||
for (const item of list) {
|
||||
if (item.b64_json) {
|
||||
const buf = Buffer.from(item.b64_json, 'base64');
|
||||
images.push({ b64: item.b64_json, ext: sniffExt(buf) });
|
||||
} else if (item.url) {
|
||||
// 上游返回 URL:服务端拉回来转 base64,避免浏览器 CORS
|
||||
try {
|
||||
const r = await fetch(item.url, { signal: AbortSignal.timeout(60000) });
|
||||
if (r.ok) {
|
||||
const buf = Buffer.from(await r.arrayBuffer());
|
||||
images.push({ b64: buf.toString('base64'), ext: sniffExt(buf) });
|
||||
} else {
|
||||
images.push({ url: item.url });
|
||||
}
|
||||
} catch (e) {
|
||||
images.push({ url: item.url });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (images.length === 0) {
|
||||
return res.status(502).json({ success: false, error: '生图成功但未返回图片数据' });
|
||||
}
|
||||
|
||||
res.json({
|
||||
success: true,
|
||||
data: {
|
||||
images,
|
||||
ext: images[0] && images[0].ext || 'png',
|
||||
revisedPrompt: result.data && result.data[0] && result.data[0].revised_prompt,
|
||||
model: effModel,
|
||||
size: effSize,
|
||||
promptEn: effPrompt,
|
||||
edited: isEdit,
|
||||
refCount: refs.length,
|
||||
ms: Date.now() - t0
|
||||
}
|
||||
});
|
||||
}));
|
||||
|
||||
module.exports = router;
|
||||
@@ -0,0 +1,635 @@
|
||||
/**
|
||||
* 文件夹批量水印/重命名路由
|
||||
* - POST /api/batch/start 启动批量任务(加水印 / 去水印 / 重命名),返回 taskId 立即返回
|
||||
* - POST /api/batch/rename-preview 批量重命名预览(不执行)
|
||||
* - GET /api/batch/status/:id 查询任务进度
|
||||
* - POST /api/batch/cancel/:id 取消任务
|
||||
*
|
||||
* 加水印:sharp 合成 SVG 文字水印(九宫格 / 平铺、透明度、旋转、字号按图宽百分比)
|
||||
* 去水印:按百分比矩形区域生成 mask → 调 flypic-ai sidecar 的 LaMa /inpaint
|
||||
*/
|
||||
|
||||
const express = require('express');
|
||||
const router = express.Router();
|
||||
const path = require('path');
|
||||
const fs = require('fs');
|
||||
const sharp = require('sharp');
|
||||
const { asyncHandler, ValidationError, NotFoundError } = require('../middleware/errorHandler');
|
||||
const { processImage } = require('../../utils/scanner');
|
||||
const ImageModel = require('../models/ImageModel');
|
||||
const logger = require('../utils/logger');
|
||||
|
||||
const AI_BASE = process.env.AI_BASE_URL || 'http://127.0.0.1:15003';
|
||||
|
||||
const IMAGE_EXTS = new Set(['.jpg', '.jpeg', '.png', '.webp']);
|
||||
const SHARP_FMT = { '.jpg': 'jpeg', '.jpeg': 'jpeg', '.png': 'png', '.webp': 'webp' };
|
||||
|
||||
// ---------- 任务表(内存) ----------
|
||||
const tasks = new Map();
|
||||
let taskSeq = 0;
|
||||
|
||||
function newTask(type, payload) {
|
||||
const id = `bt_${Date.now()}_${++taskSeq}`;
|
||||
const task = {
|
||||
id,
|
||||
type, // 'add' | 'remove'
|
||||
status: 'running', // running | done | cancelled | error
|
||||
total: 0,
|
||||
done: 0,
|
||||
failed: 0,
|
||||
skipped: 0,
|
||||
current: '',
|
||||
errors: [],
|
||||
cancelled: false,
|
||||
startedAt: Date.now(),
|
||||
finishedAt: null,
|
||||
payload
|
||||
};
|
||||
tasks.set(id, task);
|
||||
return task;
|
||||
}
|
||||
|
||||
// 完成的任务 30 分钟后清理
|
||||
setInterval(() => {
|
||||
const cutoff = Date.now() - 30 * 60 * 1000;
|
||||
for (const [id, t] of tasks) {
|
||||
if (t.finishedAt && t.finishedAt < cutoff) tasks.delete(id);
|
||||
}
|
||||
}, 60 * 1000).unref();
|
||||
|
||||
// ---------- 工具 ----------
|
||||
|
||||
/** 按百分比区域生成 mask(白色=待修复)→ 渲染为 PNG(PIL 不认 SVG) */
|
||||
async function makeMaskBuffer(width, height, region) {
|
||||
const x = Math.max(0, Math.round((width * region.x) / 100));
|
||||
const y = Math.max(0, Math.round((height * region.y) / 100));
|
||||
const w = Math.max(1, Math.min(width - x, Math.round((width * region.w) / 100)));
|
||||
const h = Math.max(1, Math.min(height - y, Math.round((height * region.h) / 100)));
|
||||
const svg = `<svg width="${width}" height="${height}" xmlns="http://www.w3.org/2000/svg">` +
|
||||
`<rect width="${width}" height="${height}" fill="black"/>` +
|
||||
`<rect x="${x}" y="${y}" width="${w}" height="${h}" fill="white"/></svg>`;
|
||||
return sharp(Buffer.from(svg)).png().toBuffer();
|
||||
}
|
||||
|
||||
/** 生成文字水印 SVG(支持九宫格单个 / 平铺) */
|
||||
function makeWatermarkSvg(width, height, opts) {
|
||||
const text = String(opts.text || '').trim();
|
||||
const fontSize = Math.max(8, Math.round((width * (opts.fontSizePct || 4)) / 100));
|
||||
const opacity = Math.max(0, Math.min(100, opts.opacity ?? 50)) / 100;
|
||||
const color = opts.color || '#ffffff';
|
||||
const margin = Math.round((width * (opts.marginPct ?? 2)) / 100);
|
||||
const stroke = opts.stroke ? ` stroke="#000000" stroke-opacity="${opacity * 0.5}" stroke-width="${Math.max(1, fontSize / 14)}"` : '';
|
||||
const fill = color.startsWith('#')
|
||||
? (color.length === 4 || color.length === 7 ? color : '#ffffff')
|
||||
: color;
|
||||
const escape = (s) => s.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>')
|
||||
.replace(/"/g, '"').replace(/'/g, ''');
|
||||
const esc = escape(text);
|
||||
|
||||
const font = "font-family=\"Noto Sans CJK SC, Noto Sans SC, WenQuanYi Zen Hei, sans-serif\"";
|
||||
const items = [];
|
||||
|
||||
if (opts.tile) {
|
||||
// 平铺:按角度旋转整块排布
|
||||
const rotate = Number(opts.rotate ?? -30);
|
||||
const gapX = fontSize * 8;
|
||||
const gapY = fontSize * 5;
|
||||
let row = 0;
|
||||
for (let y = -height; y < height * 2; y += gapY) {
|
||||
const offset = row % 2 === 0 ? 0 : gapX / 2;
|
||||
for (let x = -width; x < width * 2; x += gapX) {
|
||||
items.push(
|
||||
`<text x="${x + offset}" y="${y}" font-size="${fontSize}" ${font} ` +
|
||||
`fill="${fill}" fill-opacity="${opacity}"${stroke}>${esc}</text>`
|
||||
);
|
||||
}
|
||||
row++;
|
||||
}
|
||||
const cx = width / 2;
|
||||
const cy = height / 2;
|
||||
return `<svg width="${width}" height="${height}" xmlns="http://www.w3.org/2000/svg">` +
|
||||
`<g transform="rotate(${rotate} ${cx} ${cy})">${items.join('')}</g></svg>`;
|
||||
}
|
||||
|
||||
// 单个水印:九宫格定位
|
||||
const pos = opts.position || 'bottom-right';
|
||||
const [va, ha] = pos.split('-');
|
||||
const rotate = Number(opts.rotate || 0);
|
||||
|
||||
let x, y, anchor;
|
||||
if (ha === 'left') { x = margin; anchor = 'start'; }
|
||||
else if (ha === 'right') { x = width - margin; anchor = 'end'; }
|
||||
else { x = width / 2; anchor = 'middle'; }
|
||||
|
||||
if (va === 'top') y = margin + fontSize;
|
||||
else if (va === 'middle') y = height / 2;
|
||||
else y = height - margin;
|
||||
|
||||
const transform = rotate ? ` transform="rotate(${rotate} ${x} ${y})"` : '';
|
||||
items.push(
|
||||
`<text x="${x}" y="${y}" font-size="${fontSize}" ${font} text-anchor="${anchor}" ` +
|
||||
`fill="${fill}" fill-opacity="${opacity}"${stroke}${transform}>${esc}</text>`
|
||||
);
|
||||
return `<svg width="${width}" height="${height}" xmlns="http://www.w3.org/2000/svg">` +
|
||||
items.join('') + `</svg>`;
|
||||
}
|
||||
|
||||
/** 结果 buffer 按原格式落盘(覆盖原图或另存) */
|
||||
async function writeResult(absPath, pngBuffer, opts = {}) {
|
||||
const ext = path.extname(absPath).toLowerCase();
|
||||
const fmt = SHARP_FMT[ext];
|
||||
if (!fmt) throw new Error(`不支持的格式: ${ext}`);
|
||||
|
||||
let target = absPath;
|
||||
if (opts.mode === 'new') {
|
||||
const base = absPath.slice(0, absPath.length - ext.length);
|
||||
const suffix = opts.suffix || '_wm';
|
||||
target = `${base}${suffix}${ext}`;
|
||||
let n = 1;
|
||||
while (fs.existsSync(target)) {
|
||||
target = `${base}${suffix}${n}${ext}`;
|
||||
n++;
|
||||
}
|
||||
}
|
||||
|
||||
const pipeline = sharp(pngBuffer);
|
||||
if (fmt === 'jpeg') await pipeline.jpeg({ quality: 92 }).toFile(target);
|
||||
else if (fmt === 'webp') await pipeline.webp({ quality: 92 }).toFile(target);
|
||||
else await pipeline.png().toFile(target);
|
||||
return target;
|
||||
}
|
||||
|
||||
/** 串行并发池 */
|
||||
async function runPool(items, concurrency, worker) {
|
||||
let idx = 0;
|
||||
const runners = Array.from({ length: Math.max(1, Math.min(concurrency, items.length)) }, async () => {
|
||||
for (;;) {
|
||||
const i = idx++;
|
||||
if (i >= items.length) break;
|
||||
await worker(items[i], i);
|
||||
}
|
||||
});
|
||||
await Promise.all(runners);
|
||||
}
|
||||
|
||||
/** 调 sidecar 去水印 */
|
||||
async function callInpaint(imageBuffer, maskBuffer) {
|
||||
const form = new FormData();
|
||||
form.append('image', new Blob([imageBuffer], { type: 'image/png' }), 'image.png');
|
||||
form.append('mask', new Blob([maskBuffer], { type: 'image/png' }), 'mask.png');
|
||||
const resp = await fetch(`${AI_BASE}/inpaint`, {
|
||||
method: 'POST',
|
||||
body: form,
|
||||
signal: AbortSignal.timeout(300 * 1000)
|
||||
});
|
||||
if (!resp.ok) {
|
||||
let msg = `AI 服务错误 (${resp.status})`;
|
||||
try {
|
||||
const j = await resp.json();
|
||||
msg = j.detail || j.error || msg;
|
||||
} catch (_) { /* 非 JSON */ }
|
||||
throw new Error(msg);
|
||||
}
|
||||
return Buffer.from(await resp.arrayBuffer());
|
||||
}
|
||||
|
||||
/** 收集文件夹内图片(含子文件夹) */
|
||||
function collectImages(req, libraryId, folder) {
|
||||
return collectRenameTargets(req, { libraryId, folder, scope: 'folder' });
|
||||
}
|
||||
|
||||
/**
|
||||
* 收集重命名目标
|
||||
* scope=folder(默认):文件夹递归(沿用 collectImages 语义)
|
||||
* scope=search:按关键词模糊匹配整个库(filename/ocr_text LIKE,跨文件夹)
|
||||
*/
|
||||
function collectRenameTargets(req, { libraryId, folder, scope, keywords }) {
|
||||
const configManager = req.app.get('configManager');
|
||||
const dbPool = req.app.get('dbPool');
|
||||
if (!configManager || !dbPool) throw new ValidationError('服务未初始化');
|
||||
|
||||
const config = configManager.load();
|
||||
const library = config.libraries.find((l) => String(l.id) === String(libraryId));
|
||||
if (!library) throw new NotFoundError('Library', libraryId);
|
||||
|
||||
const db = dbPool.acquire(library.path);
|
||||
try {
|
||||
const model = new ImageModel(db.db);
|
||||
if (scope === 'search') {
|
||||
const kw = String(keywords || '').trim();
|
||||
if (!kw) throw new ValidationError('搜索关键词不能为空');
|
||||
// folder 与搜索列表同款过滤(含子目录):选中文件夹时范围一致,未选中则全库
|
||||
const { images } = model.search({ keywords: kw, folder: folder || undefined }, null);
|
||||
return { library, images };
|
||||
}
|
||||
const { images } = model.search({ folder }, null);
|
||||
return { library, images };
|
||||
} finally {
|
||||
dbPool.release(library.path);
|
||||
}
|
||||
}
|
||||
|
||||
/** 每张图处理完后重建缩略图并更新 DB(每张独立 acquire,避免长占连接) */
|
||||
async function reindex(req, libraryPath, absPath) {
|
||||
const dbPool = req.app.get('dbPool');
|
||||
const db = dbPool.acquire(libraryPath);
|
||||
try {
|
||||
await processImage(absPath, libraryPath, db);
|
||||
} finally {
|
||||
dbPool.release(libraryPath);
|
||||
}
|
||||
}
|
||||
|
||||
// ---------- 任务执行 ----------
|
||||
|
||||
async function runAddWatermark(req, task) {
|
||||
const { library, images } = collectImages(req, task.payload.libraryId, task.payload.folder);
|
||||
const opts = task.payload.options;
|
||||
const outMode = task.payload.output === 'new' ? 'new' : 'overwrite';
|
||||
task.total = images.length;
|
||||
|
||||
const targets = [];
|
||||
for (const img of images) {
|
||||
const abs = path.join(library.path, img.path);
|
||||
const ext = path.extname(abs).toLowerCase();
|
||||
if (!IMAGE_EXTS.has(ext) || !fs.existsSync(abs)) {
|
||||
task.skipped++;
|
||||
continue;
|
||||
}
|
||||
targets.push({ img, abs, ext });
|
||||
}
|
||||
task.total = targets.length + task.skipped;
|
||||
|
||||
await runPool(targets, 3, async ({ img, abs, ext }) => {
|
||||
if (task.cancelled) return;
|
||||
task.current = img.path;
|
||||
try {
|
||||
const base = sharp(abs);
|
||||
const meta = await base.metadata();
|
||||
const w = meta.width || 1024;
|
||||
const h = meta.height || 1024;
|
||||
const svg = makeWatermarkSvg(w, h, opts);
|
||||
let out = await base.rotate().composite([{ input: Buffer.from(svg), top: 0, left: 0 }]).png().toBuffer();
|
||||
|
||||
// rotate() 可能改变尺寸(EXIF),重取
|
||||
const m2 = await sharp(out).metadata();
|
||||
if (m2.width !== w || m2.height !== h) {
|
||||
const svg2 = makeWatermarkSvg(m2.width, m2.height, opts);
|
||||
out = await sharp(out).composite([{ input: Buffer.from(svg2), top: 0, left: 0 }]).png().toBuffer();
|
||||
}
|
||||
|
||||
await writeResult(abs, out, { mode: outMode, suffix: '_wm' });
|
||||
await reindex(req, library.path, abs);
|
||||
task.done++;
|
||||
} catch (err) {
|
||||
task.failed++;
|
||||
if (task.errors.length < 20) task.errors.push({ path: img.path, error: err.message });
|
||||
logger.warn(`⚠️ 批量加水印失败 ${img.path}: ${err.message}`);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
async function runRemoveWatermark(req, task) {
|
||||
const { library, images } = collectImages(req, task.payload.libraryId, task.payload.folder);
|
||||
const region = task.payload.options.region;
|
||||
const outMode = task.payload.output === 'new' ? 'new' : 'overwrite';
|
||||
task.total = images.length;
|
||||
|
||||
const targets = [];
|
||||
for (const img of images) {
|
||||
const abs = path.join(library.path, img.path);
|
||||
const ext = path.extname(abs).toLowerCase();
|
||||
if (!IMAGE_EXTS.has(ext) || !fs.existsSync(abs)) {
|
||||
task.skipped++;
|
||||
continue;
|
||||
}
|
||||
targets.push({ img, abs, ext });
|
||||
}
|
||||
task.total = targets.length + task.skipped;
|
||||
|
||||
// LaMa CPU 推理较慢且 sidecar 为单模型,串行处理
|
||||
await runPool(targets, 1, async ({ img, abs }) => {
|
||||
if (task.cancelled) return;
|
||||
task.current = img.path;
|
||||
try {
|
||||
const srcBuf = fs.readFileSync(abs);
|
||||
const meta = await sharp(srcBuf).metadata();
|
||||
const w = meta.width || 1024;
|
||||
const h = meta.height || 1024;
|
||||
const mask = await makeMaskBuffer(w, h, region);
|
||||
const result = await callInpaint(srcBuf, mask);
|
||||
await writeResult(abs, result, { mode: outMode, suffix: '_nowm' });
|
||||
await reindex(req, library.path, abs);
|
||||
task.done++;
|
||||
} catch (err) {
|
||||
task.failed++;
|
||||
if (task.errors.length < 20) task.errors.push({ path: img.path, error: err.message });
|
||||
logger.warn(`⚠️ 批量去水印失败 ${img.path}: ${err.message}`);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// ---------- 批量重命名 ----------
|
||||
|
||||
/** 文件系统非法文件名字符(Windows 兼容) */
|
||||
const ILLEGAL_NAME_RE = /[\\/:*?"<>|]/;
|
||||
|
||||
/**
|
||||
* 计算重命名计划(preview 与执行共用,保证一致)
|
||||
* @param {object} opts { images, folder, mode: 'prefix'|'suffix'|'replace'|'keyword', text, find?, includeSubdirs }
|
||||
* keyword 模式:把文件名中的 find 全部替换为 text(text 可为空 = 删除关键词),
|
||||
* 不含 find 的文件标记 skipReason='不含关键词'
|
||||
* @returns {Array<{img, newFilename, newPath, absNew, skipReason?}>}
|
||||
*/
|
||||
function computeRenamePlan({ images, folder, mode, text, find, includeSubdirs }) {
|
||||
const cleanText = String(text || '').trim();
|
||||
const cleanFind = String(find || '').trim();
|
||||
let list = images;
|
||||
if (!includeSubdirs) {
|
||||
// 只重命名该文件夹直接子项,排除子目录内文件
|
||||
list = images.filter((img) => img.folder === folder);
|
||||
}
|
||||
// 按目录分组 + 原文件名升序,保证序号顺序稳定
|
||||
const sorted = [...list].sort(
|
||||
(a, b) => a.folder.localeCompare(b.folder) || a.filename.localeCompare(b.filename)
|
||||
);
|
||||
|
||||
const dirGroups = new Map();
|
||||
for (const img of sorted) {
|
||||
if (!dirGroups.has(img.folder)) dirGroups.set(img.folder, []);
|
||||
dirGroups.get(img.folder).push(img);
|
||||
}
|
||||
|
||||
const used = new Set(); // 已分配的目标路径(小写归一,防大小写不敏感 FS 撞名)
|
||||
const plan = [];
|
||||
for (const [, group] of dirGroups) {
|
||||
const width = Math.max(3, String(group.length).length);
|
||||
for (let i = 0; i < group.length; i++) {
|
||||
const img = group[i];
|
||||
const ext = path.extname(img.filename); // 含点,保留原样
|
||||
const base = img.filename.slice(0, img.filename.length - ext.length);
|
||||
let newBase;
|
||||
if (mode === 'prefix') newBase = cleanText + base;
|
||||
else if (mode === 'suffix') newBase = base + cleanText;
|
||||
else if (mode === 'replace') {
|
||||
// 全部改名:整段替换原文件名,同目录多个文件自动编号避免撞名
|
||||
newBase = group.length > 1
|
||||
? `${cleanText}-${String(i + 1).padStart(width, '0')}`
|
||||
: cleanText;
|
||||
} else if (mode === 'keyword') {
|
||||
// 关键词替换:文件名中所有出现的 find 换成 text;不含 find 跳过
|
||||
newBase = base.includes(cleanFind) ? base.split(cleanFind).join(cleanText) : base;
|
||||
} else newBase = base;
|
||||
|
||||
const newFilename = `${newBase}${ext}`;
|
||||
const newPath = `${img.folder ? img.folder + '/' : ''}${newFilename}`;
|
||||
const absNew = newPath; // 相对库根,执行时再 join
|
||||
|
||||
const entry = { img, newFilename, newPath, skipReason: null };
|
||||
if (mode === 'keyword' && !base.includes(cleanFind)) {
|
||||
entry.skipReason = '不含关键词';
|
||||
} else if (newFilename === img.filename) {
|
||||
entry.skipReason = '文件名未变化';
|
||||
} else if (used.has(newPath.toLowerCase())) {
|
||||
entry.skipReason = '目标文件名冲突(本次内)';
|
||||
}
|
||||
used.add(newPath.toLowerCase());
|
||||
plan.push(entry);
|
||||
}
|
||||
}
|
||||
return plan;
|
||||
}
|
||||
|
||||
async function runRename(req, task) {
|
||||
const p = task.payload;
|
||||
const { library, images } = collectRenameTargets(req, {
|
||||
libraryId: p.libraryId,
|
||||
folder: p.folder,
|
||||
scope: p.scope,
|
||||
keywords: p.keywords
|
||||
});
|
||||
const opts = task.payload.options;
|
||||
const isSearch = p.scope === 'search';
|
||||
|
||||
const plan = computeRenamePlan({
|
||||
images,
|
||||
folder: task.payload.folder,
|
||||
mode: opts.mode,
|
||||
text: opts.text,
|
||||
find: opts.find,
|
||||
includeSubdirs: isSearch ? true : opts.includeSubdirs !== false
|
||||
});
|
||||
task.total = plan.length;
|
||||
|
||||
const dbPool = req.app.get('dbPool');
|
||||
const dbUpdates = [];
|
||||
|
||||
for (const entry of plan) {
|
||||
if (task.cancelled) break;
|
||||
const { img, newFilename, newPath, skipReason } = entry;
|
||||
task.current = img.path;
|
||||
if (skipReason) {
|
||||
task.skipped++;
|
||||
continue;
|
||||
}
|
||||
const absOld = path.join(library.path, img.path);
|
||||
const absNew = path.join(library.path, newPath);
|
||||
try {
|
||||
if (!fs.existsSync(absOld)) {
|
||||
task.skipped++;
|
||||
if (task.errors.length < 20) task.errors.push({ path: img.path, error: '源文件不存在' });
|
||||
continue;
|
||||
}
|
||||
if (absOld !== absNew && fs.existsSync(absNew)) {
|
||||
task.skipped++;
|
||||
if (task.errors.length < 20) task.errors.push({ path: img.path, error: `目标已存在: ${newFilename}` });
|
||||
continue;
|
||||
}
|
||||
if (absOld !== absNew) await fs.promises.rename(absOld, absNew);
|
||||
dbUpdates.push({ oldPath: img.path, newPath, newFilename });
|
||||
task.done++;
|
||||
} catch (err) {
|
||||
task.failed++;
|
||||
if (task.errors.length < 20) task.errors.push({ path: img.path, error: err.message });
|
||||
logger.warn(`⚠️ 批量重命名失败 ${img.path}: ${err.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
// 统一更新 DB(缩略图按内容 hash 存储,与文件名无关,无需重建)
|
||||
if (dbUpdates.length > 0) {
|
||||
const db = dbPool.acquire(library.path);
|
||||
try {
|
||||
const stmt = db.db.prepare('UPDATE images SET path = ?, filename = ? WHERE path = ?');
|
||||
for (const u of dbUpdates) stmt.run(u.newPath, u.newFilename, u.oldPath);
|
||||
} finally {
|
||||
dbPool.release(library.path);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ---------- 路由 ----------
|
||||
|
||||
/**
|
||||
* POST /api/batch/rename-preview
|
||||
* body: { libraryId, folder?, scope?: 'folder'|'search', keywords?, options: { mode, text, find?, includeSubdirs } }
|
||||
* scope=search 时按 keywords 模糊匹配全库(跨文件夹),folder 可不传
|
||||
* 返回重命名预览(不执行)
|
||||
*/
|
||||
router.post(
|
||||
'/rename-preview',
|
||||
asyncHandler(async (req, res) => {
|
||||
const { libraryId, folder, scope, options } = req.body || {};
|
||||
if (!libraryId) throw new ValidationError('缺少 libraryId');
|
||||
const isSearch = scope === 'search';
|
||||
if (!isSearch && !folder) throw new ValidationError('缺少 libraryId 或 folder');
|
||||
const mode = options && options.mode;
|
||||
if (!['prefix', 'suffix', 'replace', 'keyword'].includes(mode)) {
|
||||
throw new ValidationError('mode 必须是 prefix / suffix / replace / keyword');
|
||||
}
|
||||
const text = String((options && options.text) || '').trim();
|
||||
const find = String((options && options.find) || '').trim();
|
||||
if (mode === 'keyword') {
|
||||
if (!find) throw new ValidationError('请填写要查找的关键词');
|
||||
if (ILLEGAL_NAME_RE.test(find)) throw new ValidationError('关键词包含文件名非法字符 \\ / : * ? " < > |');
|
||||
if (ILLEGAL_NAME_RE.test(text)) throw new ValidationError('替换文本包含文件名非法字符 \\ / : * ? " < > |');
|
||||
} else {
|
||||
if (!text) throw new ValidationError('重命名文本不能为空');
|
||||
if (ILLEGAL_NAME_RE.test(text)) throw new ValidationError('文本包含文件名非法字符 \\ / : * ? " < > |');
|
||||
}
|
||||
|
||||
const targets = collectRenameTargets(req, {
|
||||
libraryId, folder, scope, keywords: options && options.keywords
|
||||
});
|
||||
const plan = computeRenamePlan({
|
||||
images: targets.images,
|
||||
folder: isSearch ? null : folder,
|
||||
mode, text, find,
|
||||
includeSubdirs: isSearch ? true : options.includeSubdirs !== false
|
||||
});
|
||||
const effective = plan.filter((p) => !p.skipReason);
|
||||
res.json({
|
||||
count: effective.length,
|
||||
total: plan.length,
|
||||
samples: plan.slice(0, 6).map((p) => ({ from: p.img.filename, to: p.newFilename })),
|
||||
skipped: plan.filter((p) => p.skipReason).length
|
||||
});
|
||||
})
|
||||
);
|
||||
|
||||
/**
|
||||
* POST /api/batch/start
|
||||
* body: { libraryId, folder, type: 'add'|'remove', output?: 'overwrite'|'new', options }
|
||||
* add options: { text, tile?, position?, fontSizePct?, opacity?, color?, marginPct?, rotate?, stroke? }
|
||||
* remove options: { region: { x, y, w, h } // 图片宽高的百分比 }
|
||||
*/
|
||||
router.post(
|
||||
'/start',
|
||||
asyncHandler(async (req, res) => {
|
||||
const { libraryId, folder, type, output, options, scope } = req.body || {};
|
||||
if (!libraryId) throw new ValidationError('缺少 libraryId');
|
||||
const isSearch = type === 'rename' && scope === 'search';
|
||||
if (!folder && !isSearch) throw new ValidationError('缺少 libraryId 或 folder');
|
||||
if (!['add', 'remove', 'rename'].includes(type)) throw new ValidationError('type 必须是 add / remove / rename');
|
||||
|
||||
if (type === 'add') {
|
||||
if (!options || !String(options.text || '').trim()) throw new ValidationError('水印文字不能为空');
|
||||
} else if (type === 'rename') {
|
||||
const mode = options && options.mode;
|
||||
if (!['prefix', 'suffix', 'replace', 'keyword'].includes(mode)) {
|
||||
throw new ValidationError('mode 必须是 prefix / suffix / replace / keyword');
|
||||
}
|
||||
const text = String((options && options.text) || '').trim();
|
||||
const find = String((options && options.find) || '').trim();
|
||||
if (mode === 'keyword') {
|
||||
if (!find) throw new ValidationError('请填写要查找的关键词');
|
||||
if (ILLEGAL_NAME_RE.test(find)) throw new ValidationError('关键词包含文件名非法字符 \\ / : * ? " < > |');
|
||||
if (ILLEGAL_NAME_RE.test(text)) throw new ValidationError('替换文本包含文件名非法字符 \\ / : * ? " < > |');
|
||||
} else {
|
||||
if (!text) throw new ValidationError('重命名文本不能为空');
|
||||
if (ILLEGAL_NAME_RE.test(text)) throw new ValidationError('文本包含文件名非法字符 \\ / : * ? " < > |');
|
||||
}
|
||||
} else {
|
||||
const r = options && options.region;
|
||||
if (!r || [r.x, r.y, r.w, r.h].some((v) => typeof v !== 'number' || v < 0)) {
|
||||
throw new ValidationError('缺少水印区域 region {x,y,w,h}(百分比)');
|
||||
}
|
||||
if (r.w <= 0 || r.h <= 0) throw new ValidationError('水印区域宽高必须大于 0');
|
||||
}
|
||||
|
||||
const { images } = collectRenameTargets(req, {
|
||||
libraryId, folder, scope, keywords: options && options.keywords
|
||||
});
|
||||
if (images.length === 0) {
|
||||
throw new ValidationError(
|
||||
scope === 'search' ? '搜索没有匹配到文件' : (type === 'rename' ? '该文件夹下没有文件' : '该文件夹下没有图片')
|
||||
);
|
||||
}
|
||||
|
||||
const task = newTask(type, {
|
||||
libraryId,
|
||||
folder: folder || null,
|
||||
scope: scope || 'folder',
|
||||
keywords: scope === 'search' ? String(options?.keywords || '').trim() : null,
|
||||
output,
|
||||
options
|
||||
});
|
||||
task.total = images.length;
|
||||
logger.info(`▶️ 批量${type === 'add' ? '加水印' : type === 'remove' ? '去水印' : '重命名'}启动: ${folder} (${images.length} 张)`);
|
||||
|
||||
// 立即返回,后台执行
|
||||
const runner = type === 'add' ? runAddWatermark : type === 'remove' ? runRemoveWatermark : runRename;
|
||||
runner(req, task)
|
||||
.then(() => {
|
||||
task.status = task.cancelled ? 'cancelled' : 'done';
|
||||
})
|
||||
.catch((err) => {
|
||||
task.status = 'error';
|
||||
task.errors.push({ path: '', error: err.message });
|
||||
logger.error(`❌ 批量任务异常: ${err.message}`);
|
||||
})
|
||||
.finally(() => {
|
||||
task.current = '';
|
||||
task.finishedAt = Date.now();
|
||||
});
|
||||
|
||||
res.json({ taskId: task.id, total: images.length });
|
||||
})
|
||||
);
|
||||
|
||||
/** GET /api/batch/status/:id */
|
||||
router.get(
|
||||
'/status/:id',
|
||||
asyncHandler(async (req, res) => {
|
||||
const task = tasks.get(req.params.id);
|
||||
if (!task) throw new NotFoundError('Task', req.params.id);
|
||||
res.json({
|
||||
id: task.id,
|
||||
type: task.type,
|
||||
status: task.status,
|
||||
total: task.total,
|
||||
done: task.done,
|
||||
failed: task.failed,
|
||||
skipped: task.skipped,
|
||||
current: task.current,
|
||||
errors: task.errors,
|
||||
startedAt: task.startedAt,
|
||||
finishedAt: task.finishedAt
|
||||
});
|
||||
})
|
||||
);
|
||||
|
||||
/** POST /api/batch/cancel/:id */
|
||||
router.post(
|
||||
'/cancel/:id',
|
||||
asyncHandler(async (req, res) => {
|
||||
const task = tasks.get(req.params.id);
|
||||
if (!task) throw new NotFoundError('Task', req.params.id);
|
||||
if (task.status === 'running') {
|
||||
task.cancelled = true;
|
||||
task.status = 'cancelled';
|
||||
}
|
||||
res.json({ ok: true, status: task.status });
|
||||
})
|
||||
);
|
||||
|
||||
module.exports = router;
|
||||
@@ -0,0 +1,368 @@
|
||||
/**
|
||||
* 图片编辑路由
|
||||
* - POST /api/edit/ai 代理 AI 请求到 flypic-ai sidecar(抠图/高清/去水印/换脸)
|
||||
* - POST /api/edit/save 保存编辑结果(覆盖原图 / 另存为新图),重建缩略图并更新数据库
|
||||
*/
|
||||
|
||||
const express = require('express');
|
||||
const router = express.Router();
|
||||
const path = require('path');
|
||||
const fs = require('fs');
|
||||
const multer = require('multer');
|
||||
const sharp = require('sharp');
|
||||
const { asyncHandler } = require('../middleware/errorHandler');
|
||||
const { processImage } = require('../../utils/scanner');
|
||||
const { getSettings } = require('../../utils/settings');
|
||||
const { normalizeOnlineUrl } = require('../../utils/ocr');
|
||||
const { mapImageForFrontend } = require('../utils/fieldMapper');
|
||||
const logger = require('../utils/logger');
|
||||
|
||||
const upload = multer({
|
||||
storage: multer.memoryStorage(),
|
||||
limits: { fileSize: 200 * 1024 * 1024 } // 200MB(8K 编辑结果可能较大)
|
||||
});
|
||||
|
||||
const AI_BASE = process.env.AI_BASE_URL || 'http://127.0.0.1:15003';
|
||||
|
||||
// sidecar 端点映射
|
||||
const AI_ENDPOINTS = {
|
||||
upscale: '/upscale',
|
||||
removebg: '/remove-bg',
|
||||
inpaint: '/inpaint',
|
||||
faceswap: '/face-swap'
|
||||
};
|
||||
|
||||
/**
|
||||
* POST /api/edit/ai
|
||||
* FormData: action=upscale|removebg|inpaint|faceswap, image=file, [mask|source=file], [mode|scale|bg_color]
|
||||
* 返回:image/png 二进制 或 { error }
|
||||
*/
|
||||
router.post(
|
||||
'/ai',
|
||||
upload.any(),
|
||||
asyncHandler(async (req, res) => {
|
||||
const { action } = req.body;
|
||||
const endpoint = AI_ENDPOINTS[action];
|
||||
if (!endpoint) {
|
||||
return res.status(400).json({ error: `未知 AI 操作: ${action}` });
|
||||
}
|
||||
if (!req.files || req.files.length === 0) {
|
||||
return res.status(400).json({ error: '缺少图片文件' });
|
||||
}
|
||||
|
||||
// 组装转发表单
|
||||
const form = new FormData();
|
||||
for (const f of req.files) {
|
||||
form.append(f.fieldname, new Blob([f.buffer], { type: f.mimetype || 'image/png' }), f.filename || 'image.png');
|
||||
}
|
||||
for (const [k, v] of Object.entries(req.body)) {
|
||||
if (k !== 'action' && v !== undefined && v !== null) form.append(k, String(v));
|
||||
}
|
||||
|
||||
try {
|
||||
const upstream = await fetch(`${AI_BASE}${endpoint}`, {
|
||||
method: 'POST',
|
||||
body: form,
|
||||
signal: AbortSignal.timeout(300 * 1000) // AI 处理最长 5 分钟
|
||||
});
|
||||
|
||||
const contentType = upstream.headers.get('content-type') || '';
|
||||
if (!upstream.ok) {
|
||||
let msg = `AI 服务错误 (${upstream.status})`;
|
||||
try {
|
||||
const j = await upstream.json();
|
||||
msg = j.detail || j.error || msg;
|
||||
} catch (_) {
|
||||
/* 非 JSON 错误体 */
|
||||
}
|
||||
logger.warn(`⚠️ AI ${action} 失败: ${msg}`);
|
||||
return res.status(502).json({ error: msg });
|
||||
}
|
||||
|
||||
if (contentType.includes('application/json')) {
|
||||
const j = await upstream.json();
|
||||
return res.status(502).json({ error: j.detail || j.error || 'AI 服务返回异常' });
|
||||
}
|
||||
|
||||
const buf = Buffer.from(await upstream.arrayBuffer());
|
||||
res.set('Content-Type', 'image/png');
|
||||
res.set('X-AI-Action', action);
|
||||
return res.send(buf);
|
||||
} catch (err) {
|
||||
const timedOut = err.name === 'TimeoutError' || err.name === 'AbortError';
|
||||
logger.error(`❌ AI ${action} 代理失败: ${err.message}`);
|
||||
return res.status(502).json({
|
||||
error: timedOut ? 'AI 处理超时(超过 5 分钟),请缩小图片后重试' : `AI 服务不可达: ${err.message}`
|
||||
});
|
||||
}
|
||||
})
|
||||
);
|
||||
|
||||
const IMAGE_EXTS = new Set(['.jpg', '.jpeg', '.png', '.webp']);
|
||||
const SHARP_FORMAT = { '.jpg': 'jpeg', '.jpeg': 'jpeg', '.png': 'png', '.webp': 'webp' };
|
||||
|
||||
/**
|
||||
* POST /api/edit/save
|
||||
* FormData: image=file(编辑结果 PNG), libraryId, path(原相对路径), mode=overwrite|new
|
||||
* 返回:{ path, filename, mode, regenerated }
|
||||
*/
|
||||
router.post(
|
||||
'/save',
|
||||
upload.single('image'),
|
||||
asyncHandler(async (req, res) => {
|
||||
const { libraryId, path: relPath, mode = 'overwrite' } = req.body;
|
||||
if (!req.file || !libraryId || !relPath) {
|
||||
return res.status(400).json({ error: '缺少图片、素材库或路径参数' });
|
||||
}
|
||||
|
||||
const configManager = req.app.get('configManager');
|
||||
const dbPool = req.app.get('dbPool');
|
||||
if (!configManager || !dbPool) {
|
||||
return res.status(500).json({ error: '服务未初始化' });
|
||||
}
|
||||
|
||||
const config = configManager.load();
|
||||
const library = config.libraries.find((lib) => String(lib.id) === String(libraryId));
|
||||
if (!library) {
|
||||
return res.status(404).json({ error: '素材库不存在' });
|
||||
}
|
||||
|
||||
const libraryPath = library.path;
|
||||
const srcAbs = path.join(libraryPath, relPath);
|
||||
const ext = path.extname(srcAbs).toLowerCase();
|
||||
const db = dbPool.acquire(libraryPath);
|
||||
|
||||
let targetAbs;
|
||||
let outFormat;
|
||||
let finalRel;
|
||||
|
||||
if (mode === 'overwrite') {
|
||||
if (!IMAGE_EXTS.has(ext)) {
|
||||
// 原图格式不支持原地转码(gif/bmp/tiff 等)→ 自动降级为另存新图 PNG
|
||||
const base = path.basename(relPath, path.extname(relPath));
|
||||
const dir = path.dirname(relPath);
|
||||
finalRel = uniqueRel(libraryPath, dir, `${base}-编辑`, '.png');
|
||||
targetAbs = path.join(libraryPath, finalRel);
|
||||
outFormat = 'png';
|
||||
} else {
|
||||
targetAbs = srcAbs;
|
||||
finalRel = relPath;
|
||||
outFormat = SHARP_FORMAT[ext];
|
||||
}
|
||||
} else {
|
||||
const base = path.basename(relPath, path.extname(relPath));
|
||||
const dir = path.dirname(relPath);
|
||||
const preferExt = IMAGE_EXTS.has(ext) ? ext : '.png';
|
||||
finalRel = uniqueRel(libraryPath, dir, `${base}-编辑`, preferExt);
|
||||
targetAbs = path.join(libraryPath, finalRel);
|
||||
outFormat = SHARP_FORMAT[preferExt] || 'png';
|
||||
}
|
||||
|
||||
// 转码写盘
|
||||
let pipeline = sharp(req.file.buffer);
|
||||
if (outFormat === 'jpeg') {
|
||||
pipeline = pipeline.flatten({ background: '#ffffff' }).jpeg({ quality: 92 });
|
||||
} else if (outFormat === 'webp') {
|
||||
pipeline = pipeline.webp({ quality: 92 });
|
||||
} else {
|
||||
pipeline = pipeline.png();
|
||||
}
|
||||
|
||||
fs.mkdirSync(path.dirname(targetAbs), { recursive: true });
|
||||
await pipeline.toFile(targetAbs);
|
||||
|
||||
// 重建缩略图 + 更新数据库(文件 hash 变化会触发完整更新)
|
||||
let regenerated = false;
|
||||
try {
|
||||
await processImage(targetAbs, libraryPath, db);
|
||||
regenerated = true;
|
||||
} catch (err) {
|
||||
logger.error(`❌ 编辑保存后处理失败: ${err.message}`);
|
||||
}
|
||||
|
||||
const stat = fs.statSync(targetAbs);
|
||||
logger.info(
|
||||
`✅ 编辑保存 [${mode}] ${relPath} → ${finalRel} (${(stat.size / 1024).toFixed(0)}KB)`
|
||||
);
|
||||
|
||||
return res.json({
|
||||
success: true,
|
||||
path: finalRel.replace(/\\/g, '/'),
|
||||
filename: path.basename(finalRel),
|
||||
mode: mode === 'overwrite' && finalRel === relPath ? 'overwrite' : 'new',
|
||||
originalPath: relPath,
|
||||
size: stat.size,
|
||||
regenerated,
|
||||
modifiedAt: Math.floor(stat.mtimeMs / 1000)
|
||||
});
|
||||
})
|
||||
);
|
||||
|
||||
/**
|
||||
* POST /api/edit/find-similar — AI 自动从图库找与种子图相似的图片(合拼功能)
|
||||
* body: { libraryId, seedPath, count, excludePaths? }
|
||||
* 依赖设置中的线上模型 KEY(与 OCR 线上配置共用)
|
||||
* 返回: { success, images: [前端格式图片记录] }
|
||||
*/
|
||||
router.post(
|
||||
'/find-similar',
|
||||
asyncHandler(async (req, res) => {
|
||||
const { libraryId, seedPath, count = 3, excludePaths = [] } = req.body || {};
|
||||
if (!libraryId || !seedPath) {
|
||||
return res.status(400).json({ success: false, error: { message: '缺少 libraryId 或 seedPath' } });
|
||||
}
|
||||
|
||||
const s = getSettings();
|
||||
const online = s.ocr && s.ocr.online;
|
||||
if (!online || !online.url || !online.apiKey) {
|
||||
return res.status(400).json({
|
||||
success: false,
|
||||
error: { message: '未配置模型 KEY:请先在「设置 → OCR 识别」填写线上模型接口和 API Key' }
|
||||
});
|
||||
}
|
||||
|
||||
const configManager = req.app.get('configManager');
|
||||
const dbPool = req.app.get('dbPool');
|
||||
const config = configManager.load();
|
||||
const library = (config.libraries || []).find((l) => String(l.id) === String(libraryId));
|
||||
if (!library) {
|
||||
return res.status(404).json({ success: false, error: { message: '图库不存在' } });
|
||||
}
|
||||
|
||||
const want = Math.max(1, Math.min(9, parseInt(count, 10) || 3));
|
||||
const conn = dbPool.acquire(library.path);
|
||||
try {
|
||||
const raw = conn.db; // better-sqlite3 实例
|
||||
const seed = raw.prepare('SELECT * FROM images WHERE path = ?').get(seedPath);
|
||||
if (!seed) {
|
||||
return res.status(404).json({ success: false, error: { message: '种子图不存在' } });
|
||||
}
|
||||
|
||||
// 候选采样:优先同文件夹,不足再全库随机;排除种子与已选
|
||||
const exclude = [seedPath, ...(Array.isArray(excludePaths) ? excludePaths : [])].filter(Boolean);
|
||||
const ph = exclude.map(() => '?').join(',');
|
||||
const SAMPLE = 20;
|
||||
let cands = raw
|
||||
.prepare(
|
||||
`SELECT * FROM images WHERE folder = ? AND path NOT IN (${ph}) ORDER BY RANDOM() LIMIT ?`
|
||||
)
|
||||
.all(seed.folder, ...exclude, SAMPLE);
|
||||
if (cands.length < SAMPLE) {
|
||||
const more = raw
|
||||
.prepare(`SELECT * FROM images WHERE path NOT IN (${ph}) ORDER BY RANDOM() LIMIT ?`)
|
||||
.all(...exclude, SAMPLE - cands.length);
|
||||
cands = cands.concat(more);
|
||||
}
|
||||
if (!cands.length) {
|
||||
return res.status(400).json({ success: false, error: { message: '图库中没有其他图片可供选择' } });
|
||||
}
|
||||
|
||||
// 缩略图 → 小尺寸 JPEG base64(节省 token)
|
||||
const toDataURI = async (rec) => {
|
||||
const abs = rec.thumbnail_path
|
||||
? path.join(library.path, rec.thumbnail_path)
|
||||
: path.join(library.path, rec.path);
|
||||
const buf = await sharp(abs)
|
||||
.resize(384, 384, { fit: 'inside', withoutEnlargement: true })
|
||||
.jpeg({ quality: 70 })
|
||||
.toBuffer();
|
||||
return `data:image/jpeg;base64,${buf.toString('base64')}`;
|
||||
};
|
||||
|
||||
const seedURI = await toDataURI(seed);
|
||||
const candURIs = [];
|
||||
const validCands = [];
|
||||
for (const c of cands) {
|
||||
try {
|
||||
candURIs.push(await toDataURI(c));
|
||||
validCands.push(c);
|
||||
} catch (_) { /* 跳过损坏缩略图 */ }
|
||||
}
|
||||
if (!validCands.length) {
|
||||
return res.status(500).json({ success: false, error: { message: '候选图缩略图读取失败' } });
|
||||
}
|
||||
|
||||
const prompt =
|
||||
`第一张是参考图。后面有 ${validCands.length} 张候选图,按出现顺序编号 1 到 ${validCands.length}。` +
|
||||
`请选出与参考图在内容、主题、风格上最相似的 ${want} 张,按相似度从高到低排列,` +
|
||||
`只返回一个 JSON 数组,元素为候选图编号,例如 [3,7,12],不要输出任何其他文字。`;
|
||||
|
||||
const content = [
|
||||
{ type: 'text', text: prompt },
|
||||
{ type: 'image_url', image_url: { url: seedURI } },
|
||||
...candURIs.map((u) => ({ type: 'image_url', image_url: { url: u } }))
|
||||
];
|
||||
|
||||
const ctrl = new AbortController();
|
||||
const timer = setTimeout(() => ctrl.abort(), 90000);
|
||||
let text;
|
||||
try {
|
||||
const r = await fetch(normalizeOnlineUrl(online.url), {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
Authorization: `***}`
|
||||
},
|
||||
body: JSON.stringify({
|
||||
model: online.model || 'gpt-4o-mini',
|
||||
max_tokens: 500,
|
||||
messages: [{ role: 'user', content }]
|
||||
}),
|
||||
signal: ctrl.signal
|
||||
});
|
||||
const data = await r.json();
|
||||
if (!r.ok || data.error) {
|
||||
throw new Error((data.error && data.error.message) || `HTTP ${r.status}`);
|
||||
}
|
||||
text = data.choices && data.choices[0] && data.choices[0].message
|
||||
? data.choices[0].message.content
|
||||
: '';
|
||||
} finally {
|
||||
clearTimeout(timer);
|
||||
}
|
||||
|
||||
const m = String(text).match(/\[[\s\d,]+\]/);
|
||||
if (!m) {
|
||||
logger.warn(`find-similar 模型返回无法解析: ${String(text).slice(0, 200)}`);
|
||||
return res.status(502).json({ success: false, error: { message: '模型返回格式无法解析,请重试' } });
|
||||
}
|
||||
let idx;
|
||||
try {
|
||||
idx = JSON.parse(m[0]);
|
||||
} catch (_) {
|
||||
return res.status(502).json({ success: false, error: { message: '模型返回格式无法解析,请重试' } });
|
||||
}
|
||||
const picked = [];
|
||||
const seen = new Set();
|
||||
for (const i of idx) {
|
||||
const n = parseInt(i, 10);
|
||||
if (n >= 1 && n <= validCands.length && !seen.has(n)) {
|
||||
seen.add(n);
|
||||
picked.push(validCands[n - 1]);
|
||||
}
|
||||
if (picked.length >= want) break;
|
||||
}
|
||||
if (!picked.length) {
|
||||
return res.status(502).json({ success: false, error: { message: '未找到相似图片,请重试' } });
|
||||
}
|
||||
|
||||
logger.info(`find-similar: 种子=${seedPath} 候选=${validCands.length} 命中=${picked.length}`);
|
||||
res.json({ success: true, images: picked.map(mapImageForFrontend) });
|
||||
} finally {
|
||||
dbPool.release(library.path);
|
||||
}
|
||||
})
|
||||
);
|
||||
|
||||
/** 生成不冲突的相对路径:<base>.<ext> / <base>(1).<ext> ... */
|
||||
function uniqueRel(libraryPath, dir, baseName, ext) {
|
||||
let candidate = path.join(dir, `${baseName}${ext}`).replace(/\\/g, '/');
|
||||
let i = 0;
|
||||
while (fs.existsSync(path.join(libraryPath, candidate))) {
|
||||
i += 1;
|
||||
candidate = path.join(dir, `${baseName}(${i})${ext}`).replace(/\\/g, '/');
|
||||
}
|
||||
return candidate;
|
||||
}
|
||||
|
||||
module.exports = router;
|
||||
@@ -28,12 +28,13 @@ router.use((req, res, next) => {
|
||||
router.get('/',
|
||||
validatePagination,
|
||||
asyncHandler(async (req, res) => {
|
||||
const { libraryId, keywords, folder, formats, offset, limit } = req.query;
|
||||
const { libraryId, keywords, folder, formats, favorite, offset, limit } = req.query;
|
||||
|
||||
const filters = {};
|
||||
if (keywords) filters.keywords = keywords;
|
||||
if (folder) filters.folder = folder;
|
||||
if (formats) filters.formats = formats.split(',');
|
||||
if (favorite !== undefined) filters.favorite = favorite;
|
||||
|
||||
const pagination = (offset !== undefined && limit !== undefined)
|
||||
? { offset: parseInt(offset), limit: parseInt(limit) }
|
||||
@@ -49,8 +50,11 @@ router.get('/',
|
||||
* GET /api/image/count?libraryId=xxx
|
||||
*/
|
||||
router.get('/count', asyncHandler(async (req, res) => {
|
||||
const { libraryId } = req.query;
|
||||
const count = await imageService.getImageCount(libraryId);
|
||||
const { libraryId, favorite, folder } = req.query;
|
||||
const filters = {};
|
||||
if (favorite !== undefined) filters.favorite = favorite;
|
||||
if (folder) filters.folder = folder;
|
||||
const count = await imageService.getImageCount(libraryId, filters);
|
||||
res.json({ success: true, data: { count } });
|
||||
}));
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@ const router = express.Router();
|
||||
|
||||
router.get('/', (req, res) => {
|
||||
const s = getSettings();
|
||||
const ig = s.imagegen || {};
|
||||
res.json({
|
||||
success: true,
|
||||
data: {
|
||||
@@ -24,7 +25,32 @@ router.get('/', (req, res) => {
|
||||
apiKeyMasked: maskKey(s.ocr.online.apiKey),
|
||||
configured: !!(s.ocr.online.url && s.ocr.online.apiKey)
|
||||
},
|
||||
telemetry: s.telemetry
|
||||
telemetry: s.telemetry,
|
||||
imagegen: {
|
||||
provider: ig.provider === 'custom' ? 'custom' : 'newapi',
|
||||
newapi: {
|
||||
url: (ig.newapi && ig.newapi.url) || '',
|
||||
model: (ig.newapi && ig.newapi.model) || 'flux-schnell',
|
||||
apiKeyMasked: maskKey((ig.newapi && ig.newapi.apiKey) || ''),
|
||||
// 真正生效的 key:设置里的或环境变量兜底
|
||||
hasKey: !!((ig.newapi && ig.newapi.apiKey) || process.env.NEWAPI_KEY)
|
||||
},
|
||||
custom: {
|
||||
url: (ig.custom && ig.custom.url) || '',
|
||||
model: (ig.custom && ig.custom.model) || '',
|
||||
apiKeyMasked: maskKey((ig.custom && ig.custom.apiKey) || ''),
|
||||
configured: !!(ig.custom && ig.custom.url && ig.custom.apiKey)
|
||||
}
|
||||
},
|
||||
videoai: {
|
||||
provider: (s.videoai && s.videoai.provider) === 'custom' ? 'custom' : 'inherit',
|
||||
custom: {
|
||||
url: (s.videoai && s.videoai.custom && s.videoai.custom.url) || '',
|
||||
model: (s.videoai && s.videoai.custom && s.videoai.custom.model) || '',
|
||||
apiKeyMasked: maskKey((s.videoai && s.videoai.custom && s.videoai.custom.apiKey) || ''),
|
||||
configured: !!(s.videoai && s.videoai.custom && s.videoai.custom.url && s.videoai.custom.apiKey)
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -32,6 +58,7 @@ router.get('/', (req, res) => {
|
||||
router.put('/', (req, res) => {
|
||||
try {
|
||||
const saved = saveSettings(req.body || {});
|
||||
const ig = saved.imagegen || {};
|
||||
res.json({
|
||||
success: true,
|
||||
data: {
|
||||
@@ -42,7 +69,31 @@ router.put('/', (req, res) => {
|
||||
apiKeyMasked: maskKey(saved.ocr.online.apiKey),
|
||||
configured: !!(saved.ocr.online.url && saved.ocr.online.apiKey)
|
||||
},
|
||||
telemetry: saved.telemetry
|
||||
telemetry: saved.telemetry,
|
||||
imagegen: {
|
||||
provider: ig.provider,
|
||||
newapi: {
|
||||
url: ig.newapi.url,
|
||||
model: ig.newapi.model || 'flux-schnell',
|
||||
apiKeyMasked: maskKey(ig.newapi.apiKey),
|
||||
hasKey: !!(ig.newapi.apiKey || process.env.NEWAPI_KEY)
|
||||
},
|
||||
custom: {
|
||||
url: ig.custom.url,
|
||||
model: ig.custom.model,
|
||||
apiKeyMasked: maskKey(ig.custom.apiKey),
|
||||
configured: !!(ig.custom.url && ig.custom.apiKey)
|
||||
}
|
||||
},
|
||||
videoai: {
|
||||
provider: (saved.videoai && saved.videoai.provider) === 'custom' ? 'custom' : 'inherit',
|
||||
custom: {
|
||||
url: (saved.videoai && saved.videoai.custom && saved.videoai.custom.url) || '',
|
||||
model: (saved.videoai && saved.videoai.custom && saved.videoai.custom.model) || '',
|
||||
apiKeyMasked: maskKey((saved.videoai && saved.videoai.custom && saved.videoai.custom.apiKey) || ''),
|
||||
configured: !!(saved.videoai && saved.videoai.custom && saved.videoai.custom.url && saved.videoai.custom.apiKey)
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
} catch (e) {
|
||||
|
||||
@@ -0,0 +1,539 @@
|
||||
/**
|
||||
* 视频处理路由
|
||||
* - POST /api/video/edit 单视频编辑:watermark-add / watermark-remove / subtitle-audio / strip
|
||||
* - POST /api/video/aigenerate 多图 + 标题 + 模型KEY → AI 生成带字幕朗读的视频(异步任务)
|
||||
* - GET /api/video/task/:id 查询 AI 生成进度
|
||||
* - GET /api/video/probe ffprobe 宽高/时长(前端预览用)
|
||||
*
|
||||
* 输出约定与批量水印一致:output='new' 后缀另存(_wm/_nowm/_sub/_out),'overwrite' 原地覆盖(原子写)。
|
||||
*/
|
||||
const express = require('express');
|
||||
const router = express.Router();
|
||||
const path = require('path');
|
||||
const fs = require('fs');
|
||||
const os = require('os');
|
||||
const { asyncHandler, ValidationError, NotFoundError } = require('../middleware/errorHandler');
|
||||
const { processImage } = require('../../utils/scanner');
|
||||
const { getSettings, resolveVideoGen } = require('../../utils/settings');
|
||||
const logger = require('../utils/logger');
|
||||
const videotool = require('../../utils/videotool');
|
||||
const multer = require('multer');
|
||||
const upload = multer({ storage: multer.memoryStorage(), limits: { fileSize: 20 * 1024 * 1024 } });
|
||||
|
||||
const VIDEO_EXTS = new Set(['.mp4', '.mov', '.m4v', '.webm', '.mkv', '.avi', '.flv', '.wmv', '.mpg', '.mpeg', '.3gp', '.ts']);
|
||||
|
||||
// ---------- 通用:定位文件 ----------
|
||||
|
||||
function resolveFile(req, libraryId, relPath) {
|
||||
const configManager = req.app.get('configManager');
|
||||
const dbPool = req.app.get('dbPool');
|
||||
if (!configManager || !dbPool) throw new ValidationError('服务未初始化');
|
||||
const config = configManager.load();
|
||||
const library = config.libraries.find((l) => String(l.id) === String(libraryId));
|
||||
if (!library) throw new NotFoundError('Library', libraryId);
|
||||
const abs = path.join(library.path, relPath);
|
||||
if (!abs.startsWith(path.resolve(library.path))) throw new ValidationError('非法路径');
|
||||
if (!fs.existsSync(abs)) throw new NotFoundError('File', relPath);
|
||||
const ext = path.extname(abs).toLowerCase();
|
||||
if (!VIDEO_EXTS.has(ext)) throw new ValidationError(`不是视频文件: ${relPath}`);
|
||||
return { library, abs };
|
||||
}
|
||||
|
||||
async function reindex(req, libraryPath, absPath) {
|
||||
const dbPool = req.app.get('dbPool');
|
||||
const db = dbPool.acquire(libraryPath);
|
||||
try {
|
||||
await processImage(absPath, libraryPath, db);
|
||||
} finally {
|
||||
dbPool.release(libraryPath);
|
||||
}
|
||||
}
|
||||
|
||||
/** 输出路径:new=后缀另存,overwrite=同名临时文件原子替换 */
|
||||
function outputPath(abs, mode, suffix) {
|
||||
if (mode !== 'new') return { target: abs, atomic: true };
|
||||
const ext = path.extname(abs);
|
||||
const base = abs.slice(0, abs.length - ext.length);
|
||||
let target = `${base}${suffix}${ext}`;
|
||||
let n = 1;
|
||||
while (fs.existsSync(target)) {
|
||||
target = `${base}${suffix}${n}${ext}`;
|
||||
n++;
|
||||
}
|
||||
return { target, atomic: false };
|
||||
}
|
||||
|
||||
// ---------- 单视频编辑 ----------
|
||||
|
||||
router.post(
|
||||
'/edit',
|
||||
asyncHandler(async (req, res) => {
|
||||
const { libraryId, path: relPath, action, options = {}, output = 'new' } = req.body || {};
|
||||
if (!libraryId || !relPath) throw new ValidationError('缺少 libraryId / path');
|
||||
const { library, abs } = resolveFile(req, libraryId, relPath);
|
||||
|
||||
const SUFFIX = {
|
||||
'watermark-add': '_wm',
|
||||
'watermark-remove': '_nowm',
|
||||
'subtitle-audio': '_sub',
|
||||
'strip': '_out'
|
||||
};
|
||||
const { target, atomic } = outputPath(abs, output, SUFFIX[action] || '_edit');
|
||||
|
||||
let meta;
|
||||
switch (action) {
|
||||
case 'watermark-add':
|
||||
meta = await videotool.addWatermark(abs, target, options);
|
||||
break;
|
||||
case 'watermark-remove':
|
||||
if (!options.region) throw new ValidationError('缺少去水印区域');
|
||||
meta = await videotool.removeWatermark(abs, target, options.region);
|
||||
break;
|
||||
case 'subtitle-audio':
|
||||
meta = await videotool.addSubtitleAudio(abs, target, options);
|
||||
break;
|
||||
case 'strip':
|
||||
meta = await videotool.stripSubtitleAudio(abs, target, options);
|
||||
break;
|
||||
default:
|
||||
throw new ValidationError(`未知视频操作: ${action}`);
|
||||
}
|
||||
|
||||
await reindex(req, library.path, target);
|
||||
logger.info(`🎬 视频${{ 'watermark-add': '加水印', 'watermark-remove': '去水印', 'subtitle-audio': '加字幕声音', strip: '去字幕声音' }[action]} 完成: ${path.basename(target)}`);
|
||||
res.json({ success: true, path: path.relative(library.path, target), duration: meta && meta.duration });
|
||||
})
|
||||
);
|
||||
|
||||
// ---------- ffprobe 预览信息 ----------
|
||||
|
||||
router.get(
|
||||
'/probe',
|
||||
asyncHandler(async (req, res) => {
|
||||
const { libraryId, path: relPath } = req.query;
|
||||
if (!libraryId || !relPath) throw new ValidationError('缺少 libraryId / path');
|
||||
const { abs } = resolveFile(req, libraryId, relPath);
|
||||
const info = await videotool.probeVideo(abs);
|
||||
res.json(info);
|
||||
})
|
||||
);
|
||||
|
||||
// ---------- AI 生成视频(异步任务) ----------
|
||||
|
||||
const aiTasks = new Map();
|
||||
let aiTaskSeq = 0;
|
||||
|
||||
router.post(
|
||||
'/aigenerate',
|
||||
asyncHandler(async (req, res) => {
|
||||
const {
|
||||
libraryId,
|
||||
images, // [{ path }] 库内相对路径(同一文件夹顺序展示)
|
||||
title, // 标题
|
||||
apiKey, // 模型 KEY(留空用服务器设置)
|
||||
baseUrl, // OpenAI 兼容接口(留空用服务器设置)
|
||||
model, // 模型名
|
||||
voice = 'zh-CN-XiaoxiaoNeural',
|
||||
resolution = '1920x1080',
|
||||
extraPrompt = '',
|
||||
subtitleStyle = {}
|
||||
} = req.body || {};
|
||||
|
||||
if (!libraryId || !Array.isArray(images) || images.length < 2) {
|
||||
throw new ValidationError('请至少选择 2 张图片');
|
||||
}
|
||||
if (!title || !String(title).trim()) throw new ValidationError('请填写视频标题');
|
||||
|
||||
// 图片扩展名校验(buildSegment 用 image2 demuxer,视频文件会报 Option loop not found)
|
||||
const IMG_EXTS = new Set(['.jpg', '.jpeg', '.png', '.webp', '.gif', '.bmp', '.avif']);
|
||||
for (const it of images) {
|
||||
const p = it && it.path ? String(it.path) : '';
|
||||
if (!p || !IMG_EXTS.has(path.extname(p).toLowerCase())) {
|
||||
throw new ValidationError(`仅支持图片文件,收到: ${p || '(空)'}`);
|
||||
}
|
||||
}
|
||||
|
||||
const configManager = req.app.get('configManager');
|
||||
const config = configManager.load();
|
||||
const library = config.libraries.find((l) => String(l.id) === String(libraryId));
|
||||
if (!library) throw new NotFoundError('Library', libraryId);
|
||||
|
||||
const settings = getSettings();
|
||||
// 设置 - AI 视频(或复用 AI 生图)中的文本模型配置;请求参数可临时覆盖
|
||||
const gen = resolveVideoGen(settings);
|
||||
const url = (baseUrl || gen.url || '').replace(/\/+$/, '');
|
||||
const key = apiKey || gen.apiKey || process.env.NEWAPI_KEY || '';
|
||||
const mdl = model || gen.model || 'mimo-v2.6-flash';
|
||||
if (!url) throw new ValidationError('未配置模型接口地址(请到右上角设置 → AI 视频里填写)');
|
||||
if (!key) throw new ValidationError('请先在右上角设置 → AI 视频里填写模型 KEY');
|
||||
|
||||
const id = `vt${++aiTaskSeq}_${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()
|
||||
};
|
||||
aiTasks.set(id, task);
|
||||
// 任务完成后 30 分钟清理
|
||||
setTimeout(() => aiTasks.delete(id), 30 * 60 * 1000);
|
||||
|
||||
// 后台执行,不阻塞响应
|
||||
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 || {},
|
||||
req
|
||||
}).catch((err) => {
|
||||
task.status = 'error';
|
||||
task.error = err.message || String(err);
|
||||
logger.warn(`⚠️ AI 生成视频失败: ${task.error}`);
|
||||
});
|
||||
|
||||
res.json({ success: true, taskId: id });
|
||||
})
|
||||
);
|
||||
|
||||
router.get(
|
||||
'/task/:id',
|
||||
asyncHandler(async (req, res) => {
|
||||
const task = aiTasks.get(req.params.id) || textTasks.get(req.params.id);
|
||||
if (!task) throw new NotFoundError('Task', req.params.id);
|
||||
res.json(task);
|
||||
})
|
||||
);
|
||||
|
||||
/** LLM 生成分镜脚本:返回 [{ subtitle, tts }] 数组,长度=图片数 */
|
||||
async function llmScript({ url, key, model, title, count, extraPrompt }) {
|
||||
const sys = '你是短视频编导。根据给定标题与图片数量,输出每个画面的旁白与字幕。要求口语化、有画面感、避免空话。';
|
||||
const user = [
|
||||
`标题:${title}`,
|
||||
`共 ${count} 张图片(将按顺序做成视频分镜)。`,
|
||||
extraPrompt ? `补充要求:${extraPrompt}` : '',
|
||||
`严格只输出 JSON 数组(不要代码块标记),长度恰好 ${count},每项格式:{"subtitle":"画面字幕(15字内)","tts":"朗读文案(30字内,可与字幕不同)"}`
|
||||
].filter(Boolean).join('\n');
|
||||
|
||||
const resp = await fetch(`${url}/chat/completions`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${key}` },
|
||||
body: JSON.stringify({
|
||||
model,
|
||||
messages: [
|
||||
{ role: 'system', content: sys },
|
||||
{ role: 'user', content: user }
|
||||
],
|
||||
temperature: 0.7,
|
||||
max_tokens: 4000
|
||||
}),
|
||||
signal: AbortSignal.timeout(90 * 1000)
|
||||
});
|
||||
if (!resp.ok) {
|
||||
let msg = `模型接口错误 (${resp.status})`;
|
||||
try { const j = await resp.json(); msg = (j.error && j.error.message) || j.message || msg; } catch (_) { /* 非 JSON */ }
|
||||
throw new Error(msg);
|
||||
}
|
||||
const data = await resp.json();
|
||||
let content = data.choices && data.choices[0] && data.choices[0].message && data.choices[0].message.content;
|
||||
if (!content) throw new Error('模型未返回内容');
|
||||
content = String(content).replace(/^```(?:json)?\s*/i, '').replace(/```\s*$/, '').trim();
|
||||
let arr;
|
||||
try {
|
||||
arr = JSON.parse(content);
|
||||
} catch (_) {
|
||||
const m = content.match(/\[[\s\S]*\]/);
|
||||
if (!m) throw new Error('脚本 JSON 解析失败');
|
||||
arr = JSON.parse(m[0]);
|
||||
}
|
||||
if (!Array.isArray(arr) || !arr.length) throw new Error('脚本为空');
|
||||
return arr.map((it) => ({
|
||||
subtitle: String((it && it.subtitle) || (it && it.text) || '').slice(0, 40),
|
||||
tts: String((it && it.tts) || (it && it.subtitle) || '').slice(0, 120)
|
||||
}));
|
||||
}
|
||||
|
||||
async function runAiVideo(ctx) {
|
||||
const { task, library, images, title, url, key, model, voice, width, height, extraPrompt, subtitleStyle, req } = ctx;
|
||||
|
||||
// 1) 校验图片文件
|
||||
const files = [];
|
||||
for (const item of images) {
|
||||
const rel = typeof item === 'string' ? item : item.path;
|
||||
const abs = path.join(library.path, rel);
|
||||
if (!fs.existsSync(abs)) throw new ValidationError(`图片不存在: ${rel}`);
|
||||
files.push(abs);
|
||||
}
|
||||
|
||||
// 2) LLM 脚本
|
||||
task.step = 'script';
|
||||
task.stepLabel = '正在生成分镜脚本';
|
||||
task.progress = 5;
|
||||
const script = await llmScript({ url, key, model, title, count: files.length, extraPrompt });
|
||||
logger.info(`🎬 AI 视频脚本生成完成(${script.length} 段)`);
|
||||
|
||||
// 3) 逐段 TTS
|
||||
const work = fs.mkdtempSync(path.join(os.tmpdir(), 'flypic-aiv-'));
|
||||
try {
|
||||
const segments = [];
|
||||
for (let i = 0; i < files.length; i++) {
|
||||
if (task.cancelled) throw new Error('已取消');
|
||||
task.step = 'tts';
|
||||
task.stepLabel = `正在朗读配音 ${i + 1}/${files.length}`;
|
||||
task.progress = 10 + Math.round((i / files.length) * 40);
|
||||
const seg = script[i];
|
||||
let ttsFile = '';
|
||||
let dur = 0;
|
||||
if (seg.tts) {
|
||||
try {
|
||||
const t = await videotool.generateTts(seg.tts, {
|
||||
voice,
|
||||
outPath: path.join(work, `tts${i}.mp3`)
|
||||
});
|
||||
ttsFile = t.file;
|
||||
dur = t.seconds;
|
||||
} catch (err) {
|
||||
logger.warn(`⚠️ TTS 第${i + 1}段失败(降级为静音): ${err.message}`);
|
||||
}
|
||||
}
|
||||
segments.push({
|
||||
imagePath: files[i],
|
||||
subtitle: seg.subtitle || seg.tts || title,
|
||||
ttsFile,
|
||||
duration: Math.max(2.5, Math.min(12, dur || 4))
|
||||
});
|
||||
}
|
||||
|
||||
// 4) 逐段合成
|
||||
const segFiles = [];
|
||||
for (let i = 0; i < segments.length; i++) {
|
||||
if (task.cancelled) throw new Error('已取消');
|
||||
task.step = 'compose';
|
||||
task.stepLabel = `正在合成画面 ${i + 1}/${segments.length}`;
|
||||
task.progress = 50 + Math.round((i / segments.length) * 45);
|
||||
const out = path.join(work, `seg${i}.mp4`);
|
||||
await videotool.buildSegment(segments[i], out, { width, height, subtitleStyle: ctx.subtitleStyle });
|
||||
segFiles.push(out);
|
||||
}
|
||||
|
||||
// 5) 拼接
|
||||
task.step = 'merge';
|
||||
task.stepLabel = '正在合并视频';
|
||||
task.progress = 96;
|
||||
const finalTmp = path.join(work, 'final.mp4');
|
||||
await videotool.concatSegments(segFiles, finalTmp);
|
||||
|
||||
// 6) 落库:与第一张图同文件夹,文件名=标题
|
||||
const firstRel = typeof images[0] === 'string' ? images[0] : images[0].path;
|
||||
const dirRel = path.dirname(firstRel) === '.' ? '' : path.dirname(firstRel);
|
||||
const safeTitle = String(title).replace(/[\\/:*?"<>|]/g, '_').slice(0, 60) || 'AI视频';
|
||||
let target = path.join(library.path, dirRel, `${safeTitle}.mp4`);
|
||||
let n = 1;
|
||||
while (fs.existsSync(target)) {
|
||||
target = path.join(library.path, dirRel, `${safeTitle}_${n}.mp4`);
|
||||
n++;
|
||||
}
|
||||
fs.copyFileSync(finalTmp, target);
|
||||
await reindex(req, library.path, target);
|
||||
|
||||
task.status = 'done';
|
||||
task.progress = 100;
|
||||
task.step = 'done';
|
||||
task.stepLabel = '完成';
|
||||
task.resultPath = path.relative(library.path, target);
|
||||
logger.info(`🎬 AI 视频生成完成: ${task.resultPath}`);
|
||||
} finally {
|
||||
fs.rmSync(work, { recursive: true, force: true });
|
||||
}
|
||||
}
|
||||
|
||||
// ---------- URL 抓取:内容 + 图片 ----------
|
||||
router.post(
|
||||
'/extract-url',
|
||||
asyncHandler(async (req, res) => {
|
||||
const { url } = req.body || {};
|
||||
if (!url) throw new ValidationError('缺少 url');
|
||||
let html = '';
|
||||
try {
|
||||
const r = await fetch(url, { headers: { 'User-Agent': 'Mozilla/5.0' }, signal: AbortSignal.timeout(20000) });
|
||||
html = await r.text();
|
||||
} catch (e) { throw new ValidationError('抓取失败: ' + (e.message || e)); }
|
||||
const titleMatch = html.match(/<title[^>]*>([\s\S]*?)<\/title>/i);
|
||||
const title = titleMatch ? titleMatch[1].replace(/\s+/g, ' ').trim().slice(0, 80) : '';
|
||||
// images
|
||||
const imgs = [];
|
||||
const imgRe = /<img[^>]+src=["']([^"']+)["']/gi;
|
||||
let m;
|
||||
while ((m = imgRe.exec(html)) && imgs.length < 8) {
|
||||
let src = m[1];
|
||||
if (src.startsWith('//')) src = 'https:' + src;
|
||||
else if (src.startsWith('/')) { try { src = new URL(src, url).href; } catch (_) {} }
|
||||
else if (!/^https?:/i.test(src)) { try { src = new URL(src, url).href; } catch (_) {} }
|
||||
if (/^https?:/i.test(src) && !imgs.includes(src)) imgs.push(src);
|
||||
}
|
||||
// text: strip tags
|
||||
const text = html
|
||||
.replace(/<script[\s\S]*?<\/script>/gi, '')
|
||||
.replace(/<style[\s\S]*?<\/style>/gi, '')
|
||||
.replace(/<[^>]+>/g, ' ')
|
||||
.replace(/\s+/g, ' ')
|
||||
.trim()
|
||||
.slice(0, 4000);
|
||||
res.json({ success: true, title, text, images: imgs });
|
||||
})
|
||||
);
|
||||
|
||||
// ---------- 文档/PDF 提取 ----------
|
||||
router.post(
|
||||
'/extract-doc',
|
||||
upload.single('file'),
|
||||
asyncHandler(async (req, res) => {
|
||||
if (!req.file) throw new ValidationError('缺少文件');
|
||||
const name = req.file.originalname || 'doc';
|
||||
let text = '';
|
||||
const ext = path.extname(name).toLowerCase();
|
||||
if (ext === '.pdf') {
|
||||
const tmp = path.join(os.tmpdir(), `doc_${Date.now()}.pdf`);
|
||||
fs.writeFileSync(tmp, req.file.buffer);
|
||||
try {
|
||||
const { stdout } = await videotool.run('pdftotext', ['-layout', tmp, '-'], { timeoutMs: 60000 });
|
||||
text = stdout;
|
||||
} catch (e) {
|
||||
text = req.file.buffer.toString('utf8').replace(/[^\x20-\x7E\u4e00-\u9fa5]/g, ' ');
|
||||
} finally {
|
||||
try { fs.unlinkSync(tmp); } catch (_) {}
|
||||
}
|
||||
} else {
|
||||
text = req.file.buffer.toString('utf8');
|
||||
}
|
||||
text = String(text).replace(/\s+/g, ' ').trim().slice(0, 6000);
|
||||
res.json({ success: true, title: name.replace(/\.[^.]+$/, ''), text, images: [] });
|
||||
})
|
||||
);
|
||||
|
||||
// ---------- 文本源 AI 生成视频(提示词/URL/文档) ----------
|
||||
const textTasks = new Map();
|
||||
let textTaskSeq = 0;
|
||||
router.post(
|
||||
'/aigenerate-text',
|
||||
asyncHandler(async (req, res) => {
|
||||
const {
|
||||
libraryId, title, content, images = [],
|
||||
apiKey, baseUrl, model,
|
||||
voice = 'zh-CN-XiaoxiaoNeural',
|
||||
resolution = '1920x1080',
|
||||
extraPrompt = '',
|
||||
subtitleStyle = {}
|
||||
} = req.body || {};
|
||||
if (!libraryId) throw new ValidationError('缺少 libraryId');
|
||||
if (!title || !String(title).trim()) throw new ValidationError('请填写视频标题');
|
||||
const text = String(content || '').trim();
|
||||
if (!text && (!Array.isArray(images) || images.length === 0)) throw new ValidationError('缺少内容或图片');
|
||||
|
||||
const configManager = req.app.get('configManager');
|
||||
const config = configManager.load();
|
||||
const library = config.libraries.find((l) => String(l.id) === String(libraryId));
|
||||
if (!library) throw new NotFoundError('Library', libraryId);
|
||||
|
||||
const settings = getSettings();
|
||||
// 设置 - AI 视频(或复用 AI 生图)中的文本模型配置;请求参数可临时覆盖
|
||||
const gen = resolveVideoGen(settings);
|
||||
const url = (baseUrl || gen.url || '').replace(/\/+$/, '');
|
||||
const key = apiKey || gen.apiKey || process.env.NEWAPI_KEY || '';
|
||||
const mdl = model || gen.model || 'mimo-v2.6-flash';
|
||||
if (!url) throw new ValidationError('未配置模型接口地址(请到右上角设置 → AI 视频里填写)');
|
||||
if (!key) throw new ValidationError('请先在右上角设置 → AI 视频里填写模型 KEY');
|
||||
|
||||
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) => {
|
||||
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 work = fs.mkdtempSync(path.join(os.tmpdir(), 'flypic-tv-'));
|
||||
try {
|
||||
// 生成背景图(若无图片)
|
||||
let bgPath = '';
|
||||
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 (_) {}
|
||||
}
|
||||
}
|
||||
if (!bgPath) {
|
||||
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 });
|
||||
}
|
||||
|
||||
// LLM 生成分镜:基于内容切分
|
||||
task.step = 'script'; task.stepLabel = '正在生成脚本'; task.progress = 5;
|
||||
let script = [];
|
||||
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));
|
||||
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
|
||||
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 ttsFile = ''; let dur = 0;
|
||||
if (seg.tts) {
|
||||
try {
|
||||
const t = await videotool.generateTts(seg.tts, { voice, outPath: path.join(work, `tts${i}.mp3`) });
|
||||
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)) });
|
||||
}
|
||||
|
||||
// compose
|
||||
const segFiles = [];
|
||||
for (let i = 0; i < segments.length; i++) {
|
||||
task.step = 'compose'; task.stepLabel = `合成 ${i+1}/${segments.length}`; task.progress = 50 + Math.round((i/segments.length)*45);
|
||||
const out = path.join(work, `seg${i}.mp4`);
|
||||
await videotool.buildSegment(segments[i], out, { width, height, subtitleStyle });
|
||||
segFiles.push(out);
|
||||
}
|
||||
task.step = 'merge'; task.stepLabel = '合并'; task.progress = 96;
|
||||
const finalTmp = path.join(work, 'final.mp4');
|
||||
await videotool.concatSegments(segFiles, finalTmp);
|
||||
|
||||
const safeTitle = String(title).replace(/[\\/:*?"<>|]/g, '_').slice(0, 60) || 'AI视频';
|
||||
let target = path.join(library.path, `${safeTitle}.mp4`);
|
||||
let n = 1;
|
||||
while (fs.existsSync(target)) { target = path.join(library.path, `${safeTitle}_${n}.mp4`); n++; }
|
||||
fs.copyFileSync(finalTmp, target);
|
||||
await reindex(req, library.path, target);
|
||||
|
||||
task.status = 'done'; task.progress = 100; task.step = 'done'; task.stepLabel = '完成'; task.resultPath = path.relative(library.path, target);
|
||||
} finally {
|
||||
fs.rmSync(work, { recursive: true, force: true });
|
||||
}
|
||||
}
|
||||
|
||||
// llmScript is defined later? it's a function declaration in same module scope (hoisted). ok.
|
||||
module.exports = router;
|
||||
@@ -112,9 +112,21 @@ class ImageService {
|
||||
ORDER BY count DESC
|
||||
`).all();
|
||||
|
||||
// 按文件类型分组计数(image/video/document/...),供前端类型注册表自动识别渲染
|
||||
const typeCountsList = db.db.prepare(`
|
||||
SELECT file_type, COUNT(*) as count
|
||||
FROM images
|
||||
GROUP BY file_type
|
||||
`).all();
|
||||
const typeCounts = {};
|
||||
for (const row of typeCountsList) {
|
||||
typeCounts[row.file_type || 'image'] = row.count;
|
||||
}
|
||||
|
||||
return {
|
||||
...stats,
|
||||
formats: formatStats
|
||||
formats: formatStats,
|
||||
typeCounts
|
||||
};
|
||||
} finally {
|
||||
this.dbPool.release(library.path);
|
||||
|
||||
@@ -46,7 +46,7 @@ class LibraryService {
|
||||
|
||||
if (!fs.existsSync(normalizedPath)) {
|
||||
logger.warn(`路径不存在: ${normalizedPath}`);
|
||||
throw new ValidationError('Path does not exist', 'path');
|
||||
throw new ValidationError(`素材库路径不存在: ${normalizedPath}(如为宿主机目录,需先在 docker-compose.yml 的 volumes 里挂载进容器再重试)`, 'path');
|
||||
}
|
||||
|
||||
// 检查文件夹访问权限
|
||||
@@ -57,7 +57,7 @@ class LibraryService {
|
||||
if (readError.code === 'EACCES' || readError.code === 'EPERM') {
|
||||
logger.warn(`无访问权限: ${normalizedPath}`);
|
||||
throw new ValidationError(
|
||||
'无法访问该文件夹。请在飞牛 fnOS 的"数据共享"中将此文件夹添加到 FlyPic 应用的访问权限。',
|
||||
'无法访问该文件夹。请在飞牛 fnOS 的"数据共享"中将此文件夹添加到 牛仔库 应用的访问权限。',
|
||||
'permission'
|
||||
);
|
||||
}
|
||||
@@ -105,7 +105,7 @@ class LibraryService {
|
||||
|
||||
// 验证更新的路径是否存在
|
||||
if (updates.path && !fs.existsSync(updates.path)) {
|
||||
throw new ValidationError('Path does not exist', 'path');
|
||||
throw new ValidationError(`素材库路径不存在: ${updates.path}(如为宿主机目录,需先在 docker-compose.yml 的 volumes 里挂载进容器再重试)`, 'path');
|
||||
}
|
||||
|
||||
const success = this.configManager.updateLibrary(id, updates);
|
||||
|
||||
@@ -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.2.0';
|
||||
const SITE_VERSION = process.env.SITE_VERSION || '1.4.14';
|
||||
const TIMEOUT_MS = 8000;
|
||||
|
||||
const state = {
|
||||
|
||||
@@ -279,6 +279,19 @@ async function processImage(imagePath, libraryPath, db, dryRun = false) {
|
||||
|
||||
// Skip only if unchanged and thumbnails are up-to-date
|
||||
if (existing && existing.file_hash === currentHash && !needRegenThumbs) {
|
||||
// OCR 补扫:老记录入库时还没有 OCR 功能(ocr_done=0),
|
||||
// 文件没变也会在这里补跑一次文字识别,"重新扫描"的主要意义即在于此。
|
||||
// 识别为空也标记 ocr_done=1,避免每次扫描重复识别。
|
||||
const needsOcr = !existing.ocr_done && getFileType(imagePath) === 'image';
|
||||
if (needsOcr) {
|
||||
try {
|
||||
const backfillText = await extractText(imagePath);
|
||||
db.updateOcrResult(relativePath.replace(/\\/g, '/'), backfillText || '');
|
||||
return { status: 'ocr', path: relativePath };
|
||||
} catch (ocrError) {
|
||||
logger.warn(`OCR 补扫失败: ${filename} (${ocrError.message})`);
|
||||
}
|
||||
}
|
||||
const totalTime = Date.now() - processStartTime;
|
||||
// logger.info(`⏭️ 跳过 (未变化): ${filename} (${totalTime}ms)`);
|
||||
return { status: 'skipped', path: relativePath };
|
||||
@@ -306,8 +319,9 @@ async function processImage(imagePath, libraryPath, db, dryRun = false) {
|
||||
const actualHeight = thumbnails.height || metadata.height;
|
||||
|
||||
// OCR 文字识别(可选:tesseract 失败时返回空字符串,不影响主流程)
|
||||
// 仅图片做 OCR——视频/文档跑 tesseract 纯属浪费,线上识别还会把文件发给视觉模型
|
||||
stepStart = Date.now();
|
||||
const ocrText = await extractText(imagePath);
|
||||
const ocrText = fileType === 'image' ? await extractText(imagePath) : '';
|
||||
stepTimes.ocr = Date.now() - stepStart;
|
||||
|
||||
const imageData = {
|
||||
@@ -324,7 +338,9 @@ async function processImage(imagePath, libraryPath, db, dryRun = false) {
|
||||
file_hash: currentHash,
|
||||
thumbnail_path: thumbnails.thumbnail_path,
|
||||
thumbnail_size: thumbnails.thumbnail_size,
|
||||
ocr_text: ocrText
|
||||
ocr_text: ocrText,
|
||||
ocr_done: 1, // 新/变化文件已执行过 OCR(extractText 失败返回空串,也算已尝试)
|
||||
duration: metadata.duration || 0 // 视频时长(秒),图片为 0
|
||||
};
|
||||
|
||||
if (dryRun) {
|
||||
@@ -415,6 +431,7 @@ async function scanLibrary(libraryPath, db, onProgress, libraryId = null, resume
|
||||
const results = {
|
||||
processed: 0,
|
||||
skipped: 0,
|
||||
ocr: 0,
|
||||
errors: 0,
|
||||
stopped: false
|
||||
};
|
||||
@@ -457,6 +474,7 @@ async function scanLibrary(libraryPath, db, onProgress, libraryId = null, resume
|
||||
|
||||
// 更新统计
|
||||
if (result.status === 'processed') results.processed++;
|
||||
else if (result.status === 'ocr') results.ocr++;
|
||||
else if (result.status === 'skipped') results.skipped++;
|
||||
else if (result.status === 'error') results.errors++;
|
||||
|
||||
|
||||
+114
-3
@@ -17,7 +17,31 @@ const DEFAULTS = {
|
||||
model: 'mimo-v2.6-flash' // 默认视觉模型
|
||||
}
|
||||
},
|
||||
telemetry: true // CardAuth 心跳/版本/公告上报开关
|
||||
telemetry: true, // CardAuth 心跳/版本/公告上报开关
|
||||
// AI 生图(内置 NewAPI:Pollinations + CF Workers AI;或自定义 OpenAI 兼容提供商)
|
||||
imagegen: {
|
||||
provider: 'newapi', // 'newapi' | 'custom'
|
||||
newapi: {
|
||||
url: 'http://192.168.68.19:3099/v1',
|
||||
apiKey: '', // 留空则用服务器环境变量 NEWAPI_KEY
|
||||
model: 'flux-schnell' // 默认生图模型(弹窗不再选模型,统一在设置里配)
|
||||
},
|
||||
custom: {
|
||||
url: '',
|
||||
apiKey: '',
|
||||
model: ''
|
||||
}
|
||||
},
|
||||
// AI 视频:一句话/文本/网页/文档 → 带字幕配音的成片
|
||||
// provider='inherit' 复用上面的 AI 生图配置;'custom' 用下面自定义的文本模型
|
||||
videoai: {
|
||||
provider: 'inherit',
|
||||
custom: {
|
||||
url: '',
|
||||
model: '',
|
||||
apiKey: ''
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
function settingsPath() {
|
||||
@@ -39,7 +63,28 @@ function getSettings() {
|
||||
model: (data.ocr && data.ocr.online && data.ocr.online.model) || DEFAULTS.ocr.online.model
|
||||
}
|
||||
},
|
||||
telemetry: data.telemetry !== false
|
||||
telemetry: data.telemetry !== false,
|
||||
imagegen: {
|
||||
provider: (data.imagegen && data.imagegen.provider) === 'custom' ? 'custom' : 'newapi',
|
||||
newapi: {
|
||||
url: (data.imagegen && data.imagegen.newapi && data.imagegen.newapi.url) || DEFAULTS.imagegen.newapi.url,
|
||||
model: (data.imagegen && data.imagegen.newapi && data.imagegen.newapi.model) || DEFAULTS.imagegen.newapi.model,
|
||||
apiKey: (data.imagegen && data.imagegen.newapi && data.imagegen.newapi.apiKey) || ''
|
||||
},
|
||||
custom: {
|
||||
url: (data.imagegen && data.imagegen.custom && data.imagegen.custom.url) || '',
|
||||
apiKey: (data.imagegen && data.imagegen.custom && data.imagegen.custom.apiKey) || '',
|
||||
model: (data.imagegen && data.imagegen.custom && data.imagegen.custom.model) || ''
|
||||
}
|
||||
},
|
||||
videoai: {
|
||||
provider: (data.videoai && data.videoai.provider) === 'custom' ? 'custom' : 'inherit',
|
||||
custom: {
|
||||
url: (data.videoai && data.videoai.custom && data.videoai.custom.url) || '',
|
||||
model: (data.videoai && data.videoai.custom && data.videoai.custom.model) || '',
|
||||
apiKey: (data.videoai && data.videoai.custom && data.videoai.custom.apiKey) || ''
|
||||
}
|
||||
}
|
||||
};
|
||||
} catch (e) {
|
||||
console.error('[Settings] 读取失败,使用默认:', e.message);
|
||||
@@ -63,6 +108,40 @@ function saveSettings(settings) {
|
||||
}
|
||||
}
|
||||
if (typeof settings.telemetry === 'boolean') merged.telemetry = settings.telemetry;
|
||||
if (settings.imagegen) {
|
||||
const ig = settings.imagegen;
|
||||
if (ig.provider === 'custom' || ig.provider === 'newapi') merged.imagegen.provider = ig.provider;
|
||||
if (ig.newapi) {
|
||||
if (typeof ig.newapi.url === 'string') merged.imagegen.newapi.url = ig.newapi.url.trim();
|
||||
if (typeof ig.newapi.model === 'string') merged.imagegen.newapi.model = ig.newapi.model.trim() || 'flux-schnell';
|
||||
const k = ig.newapi.apiKey;
|
||||
// 空串/掩码 = 保持原值(与 OCR 行为一致)
|
||||
if (typeof k === 'string' && k.trim() && !k.includes('***')) {
|
||||
merged.imagegen.newapi.apiKey = k.trim();
|
||||
}
|
||||
}
|
||||
if (ig.custom) {
|
||||
if (typeof ig.custom.url === 'string') merged.imagegen.custom.url = ig.custom.url.trim();
|
||||
if (typeof ig.custom.model === 'string') merged.imagegen.custom.model = ig.custom.model.trim();
|
||||
const ck = ig.custom.apiKey;
|
||||
if (typeof ck === 'string' && ck.trim() && !ck.includes('***')) {
|
||||
merged.imagegen.custom.apiKey = ck.trim();
|
||||
}
|
||||
}
|
||||
}
|
||||
if (settings.videoai) {
|
||||
const va = settings.videoai;
|
||||
if (va.provider === 'custom' || va.provider === 'inherit') merged.videoai.provider = va.provider;
|
||||
if (va.custom) {
|
||||
if (typeof va.custom.url === 'string') merged.videoai.custom.url = va.custom.url.trim();
|
||||
if (typeof va.custom.model === 'string') merged.videoai.custom.model = va.custom.model.trim();
|
||||
const vk = va.custom.apiKey;
|
||||
// 空串/掩码 = 保持原密钥
|
||||
if (typeof vk === 'string' && vk.trim() && !vk.includes('***')) {
|
||||
merged.videoai.custom.apiKey = vk.trim();
|
||||
}
|
||||
}
|
||||
}
|
||||
fs.writeFileSync(p, JSON.stringify(merged, null, 2));
|
||||
return merged;
|
||||
}
|
||||
@@ -74,4 +153,36 @@ function maskKey(key) {
|
||||
return `${key.slice(0, 4)}***${key.slice(-4)}`;
|
||||
}
|
||||
|
||||
module.exports = { getSettings, saveSettings, maskKey, settingsPath };
|
||||
/**
|
||||
* 解析 AI 视频使用的文本大模型配置
|
||||
* - 设置-AI 视频里选了「自定义」且填了地址 → 用自定义
|
||||
* - 否则复用 AI 生图配置(内置 NewAPI / 自定义提供商)
|
||||
* 普通文本模型(chat/completions)即可,全流程由后端写分镜、TTS 配音、合成字幕。
|
||||
*/
|
||||
function resolveVideoGen(settings) {
|
||||
const s = settings || getSettings();
|
||||
const va = (s && s.videoai) || {};
|
||||
const ig = (s && s.imagegen) || {};
|
||||
const defModel = process.env.NEWAPI_TEXT_MODEL || 'mimo-v2.6-flash';
|
||||
if (va.provider === 'custom' && va.custom && va.custom.url) {
|
||||
return {
|
||||
url: String(va.custom.url).replace(/\/+$/, ''),
|
||||
model: va.custom.model || defModel,
|
||||
apiKey: va.custom.apiKey || process.env.NEWAPI_KEY || ''
|
||||
};
|
||||
}
|
||||
if (ig.provider === 'custom' && ig.custom) {
|
||||
return {
|
||||
url: String(ig.custom.url || '').replace(/\/+$/, ''),
|
||||
model: ig.custom.model || defModel,
|
||||
apiKey: ig.custom.apiKey || process.env.NEWAPI_KEY || ''
|
||||
};
|
||||
}
|
||||
return {
|
||||
url: String((ig.newapi && ig.newapi.url) || 'http://192.168.68.19:3099/v1').replace(/\/+$/, ''),
|
||||
model: defModel,
|
||||
apiKey: ((ig.newapi && ig.newapi.apiKey) || process.env.NEWAPI_KEY || '')
|
||||
};
|
||||
}
|
||||
|
||||
module.exports = { getSettings, saveSettings, maskKey, settingsPath, resolveVideoGen };
|
||||
@@ -317,6 +317,27 @@ async function getImageMetadata(imagePath) {
|
||||
}
|
||||
}
|
||||
|
||||
// 视频文件:ffprobe 提取真实宽高与时长(供卡片时长角标与播放预览)
|
||||
if (fileType === 'video') {
|
||||
try {
|
||||
const videotool = require('./videotool');
|
||||
const info = await videotool.probeVideo(imagePath);
|
||||
if (info.width && info.height) {
|
||||
return {
|
||||
width: info.width,
|
||||
height: info.height,
|
||||
format: path.extname(imagePath).slice(1).toLowerCase(),
|
||||
size: stats.size,
|
||||
created_at: stats.birthtimeMs,
|
||||
modified_at: stats.mtimeMs,
|
||||
duration: info.duration || 0
|
||||
};
|
||||
}
|
||||
} catch (_) {
|
||||
// ffprobe 缺失或文件损坏 → 走占位信息
|
||||
}
|
||||
}
|
||||
|
||||
// 对于非图片文件或 Sharp 失败的情况,返回基础信息
|
||||
const ext = path.extname(imagePath).toLowerCase().slice(1);
|
||||
return {
|
||||
|
||||
@@ -0,0 +1,438 @@
|
||||
/**
|
||||
* 视频处理工具(ffmpeg / ffprobe 封装)
|
||||
* - probeVideo ffprobe 提取宽高/时长/编码
|
||||
* - addWatermark 文字水印烧录(drawtext,textfile 避免转义地狱)
|
||||
* - removeWatermark 区域去水印(delogo)
|
||||
* - addSubtitleAudio 字幕烧录 + TTS/上传配音(音轨替换或混合)
|
||||
* - stripSubtitleAudio 移除内嵌字幕流与音轨
|
||||
* - generateTts edge-tts 朗读(返回 mp3 路径与秒数)
|
||||
*/
|
||||
const { spawn } = require('child_process');
|
||||
const fs = require('fs');
|
||||
const os = require('os');
|
||||
const path = require('path');
|
||||
const logger = require('../src/utils/logger');
|
||||
|
||||
const FFMPEG = process.env.FFMPEG_PATH || 'ffmpeg';
|
||||
const FFPROBE = process.env.FFPROBE_PATH || 'ffprobe';
|
||||
|
||||
/** 运行外部命令,超时强杀 */
|
||||
function run(cmd, args, { timeoutMs = 600 * 1000, onStderr, env } = {}) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const child = spawn(cmd, args, { stdio: ['ignore', 'pipe', 'pipe'], env });
|
||||
let out = '';
|
||||
let err = '';
|
||||
const timer = setTimeout(() => {
|
||||
child.kill('SIGKILL');
|
||||
reject(new Error(`${cmd} 超时 ${Math.round(timeoutMs / 1000)}s`));
|
||||
}, timeoutMs);
|
||||
child.stdout.on('data', (d) => { out += d; });
|
||||
child.stderr.on('data', (d) => {
|
||||
err += d;
|
||||
if (onStderr) onStderr(String(d));
|
||||
});
|
||||
child.on('error', (e) => { clearTimeout(timer); reject(e); });
|
||||
child.on('close', (code) => {
|
||||
clearTimeout(timer);
|
||||
if (code === 0) resolve({ stdout: out, stderr: err });
|
||||
else {
|
||||
// 剥掉 ffmpeg 版本/banner 行,只留真正的错误
|
||||
const clean = err.split('\n').filter((l) =>
|
||||
!/ffmpeg version|configuration:|^\s*lib(av|sw|post)|^\s*\d+\.\s+\d+\.\d+/.test(l)
|
||||
).join('\n').trim();
|
||||
reject(new Error(`${cmd} 退出码 ${code}: ${(clean || err).slice(-600)}`));
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
/** ffprobe:视频宽高/时长 */
|
||||
async function probeVideo(file) {
|
||||
const { stdout } = await run(FFPROBE, [
|
||||
'-v', 'error',
|
||||
'-select_streams', 'v:0',
|
||||
'-show_entries', 'stream=width,height,codec_name:format=duration',
|
||||
'-of', 'json',
|
||||
file
|
||||
]);
|
||||
const j = JSON.parse(stdout || '{}');
|
||||
const s = (j.streams && j.streams[0]) || {};
|
||||
const dur = parseFloat(j.format && j.format.duration);
|
||||
return {
|
||||
width: s.width || 0,
|
||||
height: s.height || 0,
|
||||
codec: s.codec_name || '',
|
||||
duration: Number.isFinite(dur) ? dur : 0
|
||||
};
|
||||
}
|
||||
|
||||
/** 位置预设 → drawtext x/y 表达式(相对画面,text_w/text_h 为文本尺寸) */
|
||||
const POSITIONS = {
|
||||
'top-left': { x: 'w*0.03', y: 'h*0.05' },
|
||||
'top-center': { x: '(w-text_w)/2', y: 'h*0.05' },
|
||||
'top-right': { x: 'w-text_w-w*0.03', y: 'h*0.05' },
|
||||
'center': { x: '(w-text_w)/2', y: '(h-text_h)/2' },
|
||||
'bottom-left': { x: 'w*0.03', y: 'h-text_h-h*0.06' },
|
||||
'bottom-center':{ x: '(w-text_w)/2', y: 'h-text_h-h*0.06' },
|
||||
'bottom-right': { x: 'w-text_w-w*0.03', y: 'h-text_h-h*0.06' }
|
||||
};
|
||||
|
||||
/** 平铺九宫格 x/y 列表(每个单元一格) */
|
||||
function tilePositions(cols, rows) {
|
||||
const list = [];
|
||||
for (let r = 0; r < rows; r++) {
|
||||
for (let c = 0; c < cols; c++) {
|
||||
list.push({
|
||||
x: `w*${(c + 0.5) / cols}-text_w/2`,
|
||||
y: `h*${(r + 0.5) / rows}-text_h/2`
|
||||
});
|
||||
}
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
/**
|
||||
* 生成 drawtext filter 串
|
||||
* @param {object} opts 文本/位置/字号%/透明度/描边/旋转/平铺
|
||||
* @param {number} width 视频像素宽(换算字号)
|
||||
* @param {number} height 视频像素高
|
||||
* @param {string} textFile 临时文本文件(UTF-8)
|
||||
*/
|
||||
function buildDrawText(opts, width, height, textFile) {
|
||||
const {
|
||||
position = 'bottom-right',
|
||||
fontSizePct = 4, // 字号 = 视频高度的百分比
|
||||
opacity = 0.6, // 0~1
|
||||
color = 'white',
|
||||
stroke = true,
|
||||
rotate = 0, // 逆时针角度
|
||||
tile = false
|
||||
} = opts;
|
||||
|
||||
const fontSize = Math.max(10, Math.round((height * fontSizePct) / 100));
|
||||
const alpha = Math.max(0, Math.min(1, opacity));
|
||||
const colorHex = /^#?[0-9a-fA-F]{6}$/.test(String(color)) ? color : 'white';
|
||||
const fg = /^#/.test(colorHex) ? colorHex : colorHex; // drawtext 接受 #RRGGBB 与颜色名
|
||||
const fgColor = fg.startsWith('#') ? `0x${fg.slice(1)}@${alpha}` : `${fg}@${alpha}`;
|
||||
|
||||
const positions = tile ? tilePositions(3, 3) : [POSITIONS[position] || POSITIONS['bottom-right']];
|
||||
|
||||
const parts = positions.map((p) => {
|
||||
const args = [
|
||||
`fontfile=/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc`,
|
||||
`textfile=${textFile}`,
|
||||
`fontsize=${fontSize}`,
|
||||
`fontcolor=${fgColor}`,
|
||||
`x=${p.x}`,
|
||||
`y=${p.y}`
|
||||
];
|
||||
if (stroke) {
|
||||
args.push('borderw=2', 'bordercolor=black@0.55');
|
||||
}
|
||||
if (rotate) args.push(`rotate=${(-rotate) * Math.PI / 180}:c=none`);
|
||||
return `drawtext=${args.join(':')}`;
|
||||
});
|
||||
return parts.join(',');
|
||||
}
|
||||
|
||||
/** 生成 SRT(多行文本按行数均分时长) */
|
||||
function textToSrt(text, durationSec) {
|
||||
const lines = String(text).split('\n').map((s) => s.trim()).filter(Boolean);
|
||||
if (!lines.length) throw new Error('字幕文本为空');
|
||||
const per = durationSec / lines.length;
|
||||
const fmt = (sec) => {
|
||||
const ms = Math.max(0, Math.round(sec * 1000));
|
||||
const h = String(Math.floor(ms / 3600000)).padStart(2, '0');
|
||||
const m = String(Math.floor((ms % 3600000) / 60000)).padStart(2, '0');
|
||||
const s = String(Math.floor((ms % 60000) / 1000)).padStart(2, '0');
|
||||
const mm = String(ms % 1000).padStart(3, '0');
|
||||
return `${h}:${m}:${s},${mm}`;
|
||||
};
|
||||
return lines.map((line, i) =>
|
||||
`${i + 1}\n${fmt(i * per)} --> ${fmt((i + 1) * per)}\n${line}\n`
|
||||
).join('\n');
|
||||
}
|
||||
|
||||
/** 临时工作目录 */
|
||||
function tmpDir() {
|
||||
return fs.mkdtempSync(path.join(os.tmpdir(), 'flypic-vid-'));
|
||||
}
|
||||
|
||||
/**
|
||||
* 加水印(烧录)
|
||||
* @param {string} input 输入视频
|
||||
* @param {string} output 输出视频
|
||||
* @param {object} opts { text, position, fontSizePct, opacity, color, stroke, rotate, tile }
|
||||
*/
|
||||
async function addWatermark(input, output, opts) {
|
||||
const text = String(opts.text || '').trim();
|
||||
if (!text) throw new Error('水印文字不能为空');
|
||||
const meta = await probeVideo(input);
|
||||
const dir = tmpDir();
|
||||
try {
|
||||
const textFile = path.join(dir, 'wm.txt');
|
||||
fs.writeFileSync(textFile, text, 'utf8');
|
||||
const vf = buildDrawText(opts, meta.width || 1280, meta.height || 720, textFile);
|
||||
await run(FFMPEG, [
|
||||
'-y', '-i', input,
|
||||
'-vf', vf,
|
||||
'-c:v', 'libx264', '-preset', 'veryfast', '-crf', '20',
|
||||
'-c:a', 'copy',
|
||||
'-movflags', '+faststart',
|
||||
output
|
||||
]);
|
||||
return meta;
|
||||
} finally {
|
||||
fs.rmSync(dir, { recursive: true, force: true });
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 去水印(delogo 区域平滑填充)
|
||||
* @param {object} region { x, y, w, h } 百分比(相对画面)
|
||||
*/
|
||||
async function removeWatermark(input, output, region) {
|
||||
const meta = await probeVideo(input);
|
||||
const W = meta.width || 1280;
|
||||
const H = meta.height || 720;
|
||||
const x = Math.max(0, Math.round((region.x / 100) * W));
|
||||
const y = Math.max(0, Math.round((region.y / 100) * H));
|
||||
const w = Math.min(W - x, Math.max(6, Math.round((region.w / 100) * W))); // delogo 要求 ≥6px
|
||||
const h = Math.min(H - y, Math.max(6, Math.round((region.h / 100) * H)));
|
||||
if (w < 6 || h < 6) throw new Error('去水印区域太小(至少约 10px)');
|
||||
await run(FFMPEG, [
|
||||
'-y', '-i', input,
|
||||
'-vf', `delogo=x=${x}:y=${y}:w=${w}:h=${h}`,
|
||||
'-c:v', 'libx264', '-preset', 'veryfast', '-crf', '20',
|
||||
'-c:a', 'copy',
|
||||
'-movflags', '+faststart',
|
||||
output
|
||||
]);
|
||||
return meta;
|
||||
}
|
||||
|
||||
/** edge-tts 朗读:文本 → mp3,返回 { file, seconds } */
|
||||
async function generateTts(text, { voice = 'zh-CN-XiaoxiaoNeural', outPath } = {}) {
|
||||
const content = String(text || '').trim();
|
||||
if (!content) throw new Error('朗读文本为空');
|
||||
const target = outPath || path.join(tmpDir(), 'tts.mp3');
|
||||
const env = { ...process.env };
|
||||
// 容器内如需代理(edge-tts 直连失败时)可注入 HTTPS_PROXY,不设置则直连
|
||||
await run('edge-tts', [
|
||||
'--voice', voice,
|
||||
'--text', content,
|
||||
'--write-media', target
|
||||
], { timeoutMs: 120 * 1000, env });
|
||||
if (!fs.existsSync(target)) throw new Error('TTS 生成失败');
|
||||
const meta = await probeVideo(target).catch(() => ({ duration: 0 }));
|
||||
// mp3 用 ffprobe format.duration 更准
|
||||
let seconds = meta.duration;
|
||||
if (!seconds) {
|
||||
const { stdout } = await run(FFPROBE, ['-v', 'error', '-show_entries', 'format=duration', '-of', 'csv=p=0', target]).catch(() => ({ stdout: '0' }));
|
||||
seconds = parseFloat(stdout) || 0;
|
||||
}
|
||||
return { file: target, seconds };
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加字幕 + 声音
|
||||
* - 字幕:多行文本烧录(drawtext,按视频时长均分逐段出现)或整段常驻
|
||||
* - 声音:ttsText 走 edge-tts 朗读;audioFile 用上传音频
|
||||
* - audioMode: 'replace' 替换原声 | 'mix' 与原声混合 | 'keep' 只加字幕不动声音
|
||||
*
|
||||
* 字幕实现:按配音时长切分视频分段,逐段烧录对应字幕后拼接——保证字幕与朗读同步。
|
||||
* 若无配音(audioMode keep 且无 tts),字幕整段常驻。
|
||||
*/
|
||||
async function addSubtitleAudio(input, output, opts) {
|
||||
const {
|
||||
subtitleText = '',
|
||||
ttsText = '',
|
||||
voice = 'zh-CN-XiaoxiaoNeural',
|
||||
audioFile = '', // 前端上传的音频(临时路径)
|
||||
audioMode = 'tts', // 'tts' | 'file' | 'none'
|
||||
audioVolume = 1.0,
|
||||
originalVolume = 1.0, // 混合时原声相对音量
|
||||
tile = false,
|
||||
fontSizePct = 5,
|
||||
opacity = 0.95,
|
||||
color = 'white'
|
||||
} = opts;
|
||||
|
||||
const text = String(subtitleText || ttsText || '').trim();
|
||||
if (!text) throw new Error('字幕文本不能为空');
|
||||
const meta = await probeVideo(input);
|
||||
const duration = meta.duration;
|
||||
if (!duration) throw new Error('无法读取视频时长');
|
||||
|
||||
const dir = tmpDir();
|
||||
try {
|
||||
// 1) 配音
|
||||
let voiceFile = '';
|
||||
let voiceSec = 0;
|
||||
if (audioMode === 'tts' && ttsText) {
|
||||
const t = await generateTts(ttsText, { voice, outPath: path.join(dir, 'voice.mp3') });
|
||||
voiceFile = t.file; voiceSec = t.seconds;
|
||||
} else if (audioMode === 'file' && audioFile && fs.existsSync(audioFile)) {
|
||||
voiceFile = audioFile;
|
||||
const { stdout } = await run(FFPROBE, ['-v', 'error', '-show_entries', 'format=duration', '-of', 'csv=p=0', voiceFile]).catch(() => ({ stdout: '0' }));
|
||||
voiceSec = parseFloat(stdout) || 0;
|
||||
}
|
||||
|
||||
const lines = text.split('\n').map((s) => s.trim()).filter(Boolean);
|
||||
|
||||
// 2) 有配音 → 分段字幕与语音同步;无配音 → 整段常驻
|
||||
if (voiceFile && voiceSec > 0) {
|
||||
const segCount = Math.max(lines.length, 1);
|
||||
const segDur = voiceSec / segCount;
|
||||
const segDir = path.join(dir, 'segs');
|
||||
fs.mkdirSync(segDir, { recursive: true });
|
||||
|
||||
const segFiles = [];
|
||||
for (let i = 0; i < segCount; i++) {
|
||||
const tFile = path.join(segDir, `s${i}.txt`);
|
||||
fs.writeFileSync(tFile, lines[i] || lines[lines.length - 1], 'utf8');
|
||||
const vf = buildDrawText({
|
||||
position: 'bottom-center', fontSizePct, opacity, color, stroke: true, tile
|
||||
}, meta.width || 1280, meta.height || 720, tFile);
|
||||
const segOut = path.join(segDir, `seg${i}.mp4`);
|
||||
const args = [
|
||||
'-y',
|
||||
'-ss', (i * segDur).toFixed(3), '-t', segDur.toFixed(3), '-i', input,
|
||||
'-ss', (i * segDur).toFixed(3), '-t', segDur.toFixed(3), '-i', voiceFile,
|
||||
'-vf', vf,
|
||||
'-map', '0:v', '-map', '1:a',
|
||||
'-c:v', 'libx264', '-preset', 'veryfast', '-crf', '20'
|
||||
];
|
||||
if (audioVolume !== 1.0) args.push('-filter:a', `volume=${audioVolume}`);
|
||||
args.push('-c:a', 'aac', '-ar', '44100', '-ac', '2', '-shortest', segOut);
|
||||
await run(FFMPEG, args);
|
||||
segFiles.push(segOut);
|
||||
}
|
||||
|
||||
// 拼接(编码参数一致,直接 concat)
|
||||
const listFile = path.join(segDir, 'list.txt');
|
||||
fs.writeFileSync(listFile, segFiles.map((f) => `file '${f}'`).join('\n'), 'utf8');
|
||||
const concatArgs = ['-y', '-f', 'concat', '-safe', '0', '-i', listFile, '-c', 'copy', '-movflags', '+faststart', output];
|
||||
await run(FFMPEG, concatArgs).catch(async () => {
|
||||
// 参数不一致兜底:重编码拼接
|
||||
await run(FFMPEG, ['-y', '-f', 'concat', '-safe', '0', '-i', listFile,
|
||||
'-c:v', 'libx264', '-preset', 'veryfast', '-crf', '20', '-c:a', 'aac',
|
||||
'-movflags', '+faststart', output]);
|
||||
});
|
||||
return { ...meta, voiceSeconds: voiceSec };
|
||||
}
|
||||
|
||||
// 无配音:字幕常驻 + 可选背景音
|
||||
const textFile = path.join(dir, 'sub.txt');
|
||||
fs.writeFileSync(textFile, text, 'utf8');
|
||||
const vf = buildDrawText({
|
||||
position: 'bottom-center', fontSizePct, opacity, color, stroke: true, tile
|
||||
}, meta.width || 1280, meta.height || 720, textFile);
|
||||
|
||||
const args = ['-y', '-i', input, '-vf', vf, '-map', '0:v'];
|
||||
if (audioMode === 'file' && voiceFile) {
|
||||
args.push('-i', voiceFile, '-map', '1:a',
|
||||
'-filter:a', `volume=${audioVolume}`,
|
||||
'-c:a', 'aac', '-shortest');
|
||||
} else {
|
||||
args.push('-map', '0:a?');
|
||||
if (originalVolume !== 1.0) {
|
||||
args.push('-filter:a', `volume=${originalVolume}`);
|
||||
}
|
||||
args.push('-c:a', 'copy');
|
||||
}
|
||||
args.push('-c:v', 'libx264', '-preset', 'veryfast', '-crf', '20',
|
||||
'-movflags', '+faststart', output);
|
||||
await run(FFMPEG, args);
|
||||
return meta;
|
||||
} finally {
|
||||
fs.rmSync(dir, { recursive: true, force: true });
|
||||
}
|
||||
}
|
||||
|
||||
/** 去掉字幕流与音轨(-sn -an,视频流直拷) */
|
||||
async function stripSubtitleAudio(input, output, { removeAudio = true, removeSubtitle = true } = {}) {
|
||||
const args = ['-y', '-i', input, '-map', '0:v', '-c:v', 'copy'];
|
||||
if (removeSubtitle) args.push('-sn');
|
||||
if (removeAudio) args.push('-an');
|
||||
else args.push('-map', '0:a?', '-c:a', 'copy');
|
||||
args.push('-movflags', '+faststart', output);
|
||||
await run(FFMPEG, args);
|
||||
return probeVideo(input);
|
||||
}
|
||||
|
||||
/**
|
||||
* AI 生成视频素材装配(分段:图 + 该段字幕 + 该段配音)
|
||||
* @param {object} seg { imagePath, subtitle, ttsFile, duration } duration=该段秒数
|
||||
*/
|
||||
async function buildSegment(seg, outPath, { width = 1920, height = 1080, fontSizePct = 5, subtitleStyle = {} } = {}) {
|
||||
const dir = tmpDir();
|
||||
try {
|
||||
const tFile = path.join(dir, 'sub.txt');
|
||||
fs.writeFileSync(tFile, seg.subtitle || '', 'utf8');
|
||||
const textFile = tFile;
|
||||
const fontSize = Math.max(12, Math.round((height * (subtitleStyle.fontSizePct || fontSizePct)) / 100));
|
||||
const color = subtitleStyle.color || 'white';
|
||||
const pos = subtitleStyle.position || 'bottom-center';
|
||||
const yExpr = pos.startsWith('top') ? 'h*0.07' : pos === 'center' ? '(h-text_h)/2' : 'h-text_h-h*0.07';
|
||||
const xExpr = pos.endsWith('left') ? 'w*0.05' : pos.endsWith('right') ? 'w-text_w-w*0.05' : '(w-text_w)/2';
|
||||
const vf = [
|
||||
`scale=${width}:${height}:force_original_aspect_ratio=decrease`,
|
||||
`pad=${width}:${height}:(ow-iw)/2:(oh-ih)/2:color=black`,
|
||||
`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 args = [
|
||||
'-y', '-loop', '1', '-t', seg.duration.toFixed(3), '-i', seg.imagePath
|
||||
];
|
||||
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');
|
||||
}
|
||||
args.push(
|
||||
'-vf', vf,
|
||||
'-c:v', 'libx264', '-preset', 'veryfast', '-crf', '20',
|
||||
'-pix_fmt', 'yuv420p',
|
||||
'-r', '30',
|
||||
outPath
|
||||
);
|
||||
await run(FFMPEG, args, { timeoutMs: 300 * 1000 });
|
||||
return outPath;
|
||||
} finally {
|
||||
fs.rmSync(dir, { recursive: true, force: true });
|
||||
}
|
||||
}
|
||||
|
||||
/** 拼接分段 mp4(先 copy,失败重编码) */
|
||||
async function concatSegments(segFiles, outPath) {
|
||||
const dir = tmpDir();
|
||||
try {
|
||||
const listFile = path.join(dir, 'list.txt');
|
||||
fs.writeFileSync(listFile, segFiles.map((f) => `file '${f}'`).join('\n'), 'utf8');
|
||||
try {
|
||||
await run(FFMPEG, ['-y', '-f', 'concat', '-safe', '0', '-i', listFile, '-c', 'copy', '-movflags', '+faststart', outPath]);
|
||||
} catch (_) {
|
||||
await run(FFMPEG, ['-y', '-f', 'concat', '-safe', '0', '-i', listFile,
|
||||
'-c:v', 'libx264', '-preset', 'veryfast', '-crf', '20', '-c:a', 'aac',
|
||||
'-pix_fmt', 'yuv420p', '-movflags', '+faststart', outPath],
|
||||
{ timeoutMs: 600 * 1000 });
|
||||
}
|
||||
return outPath;
|
||||
} finally {
|
||||
fs.rmSync(dir, { recursive: true, force: true });
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
run,
|
||||
probeVideo,
|
||||
addWatermark,
|
||||
removeWatermark,
|
||||
addSubtitleAudio,
|
||||
stripSubtitleAudio,
|
||||
generateTts,
|
||||
buildSegment,
|
||||
concatSegments,
|
||||
textToSrt
|
||||
};
|
||||
@@ -13,16 +13,26 @@ services:
|
||||
# 素材库目录(容器内路径与飞牛一致,直接填实际路径即可)
|
||||
- /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:
|
||||
- PORT=15002
|
||||
- FRONTEND_DIST=/app/backend/public
|
||||
- NODE_ENV=production
|
||||
# AI 图像处理侧车(去背景/高清/去水印/换脸)——宿主机 systemd flypic-ai 监听 127.0.0.1:15003
|
||||
- AI_BASE_URL=http://host.docker.internal:15003
|
||||
# 授权系统(CardAuth):版本推送 / 公告 / 在线人数统计 —— 失败开放,不可达不影响使用
|
||||
- HUB_URL=https://auth.88531.cn/api
|
||||
- HUB_PROJECT_ID=15
|
||||
- HUB_API_KEY=${HUB_API_KEY:-}
|
||||
- NEWAPI_KEY=${NEWAPI_KEY:-}
|
||||
# 当前站点版本(与 frontend/package.json、CHANGELOG 保持一致,界面版本徽标来源)
|
||||
- SITE_VERSION=1.4.14
|
||||
# 让容器经 host.docker.internal 访问宿主机的 AI 侧车
|
||||
extra_hosts:
|
||||
- "host.docker.internal:host-gateway"
|
||||
# 如需挂载多个素材库,取消注释并修改路径:
|
||||
# volumes:
|
||||
# - /vol1/1000/图片库:/data/library1:ro
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/png" href="/favicon.png" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>FlyPic 飞图 - 图片素材库管理</title>
|
||||
<title>牛仔库 - 素材库管理</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "flypic-frontend",
|
||||
"version": "1.2.0",
|
||||
"version": "1.4.0",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
@@ -12,6 +12,7 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"axios": "^1.6.2",
|
||||
"fabric": "^6.9.1",
|
||||
"jszip": "^3.10.1",
|
||||
"lucide-react": "^0.300.0",
|
||||
"react": "^18.2.0",
|
||||
|
||||
+45
-10
@@ -12,6 +12,9 @@ import MainContent from './components/MainContent';
|
||||
import RightPanel from './components/RightPanel';
|
||||
import Header from './components/Header';
|
||||
import LibraryMissingModal from './components/LibraryMissingModal';
|
||||
import BackToTop from './components/BackToTop';
|
||||
import ImageEditor from './components/ImageEditor';
|
||||
import VideoEditModal from './components/VideoEditModal';
|
||||
import { createLogger } from './utils/logger';
|
||||
|
||||
const logger = createLogger('App');
|
||||
@@ -20,13 +23,14 @@ function App() {
|
||||
// 使用统一的主题管理 Hook
|
||||
useTheme();
|
||||
|
||||
const { mobileView, setMobileView } = useUIStore();
|
||||
const {
|
||||
setLibraries,
|
||||
setCurrentLibrary,
|
||||
const { mobileView, setMobileView, videoEditFile, setVideoEditFile } = useUIStore();
|
||||
const {
|
||||
setLibraries,
|
||||
setCurrentLibrary,
|
||||
removeLibrary,
|
||||
setShowAddLibraryForm,
|
||||
triggerExpandLibrarySelector
|
||||
triggerExpandLibrarySelector,
|
||||
currentLibraryId
|
||||
} = useLibraryStore();
|
||||
const { selectedImage } = useImageStore();
|
||||
const { setScanProgress } = useScanStore();
|
||||
@@ -124,20 +128,28 @@ function App() {
|
||||
params.folder = imageState.selectedFolder;
|
||||
}
|
||||
|
||||
// 「我的收藏」视图:按收藏过滤
|
||||
if (imageState.favoritesView) {
|
||||
params.favorite = 1;
|
||||
}
|
||||
|
||||
// 并行加载文件夹、图片和统计信息
|
||||
Promise.all([
|
||||
imageAPI.getFolders(libraryId),
|
||||
// 如果没有选中文件夹且没有搜索条件,不加载图片(保持在 Dashboard)
|
||||
(imageState.selectedFolder || imageState.searchKeywords || imageState.filters.formats.length > 0)
|
||||
(imageState.selectedFolder || imageState.searchKeywords || imageState.filters.formats.length > 0 || imageState.favoritesView)
|
||||
? imageAPI.search(libraryId, params)
|
||||
: Promise.resolve({ images: [] }),
|
||||
: Promise.resolve({ images: null }), // null = 本次不刷新图片(平铺库由 MainContent 直接加载,避免清空已显示的图片)
|
||||
// 扫描完成后重新获取统计信息(包含 totalSize)
|
||||
imageAPI.getStats(libraryId)
|
||||
]).then(([foldersRes, imagesRes, statsRes]) => {
|
||||
useImageStore.getState().setFolders(foldersRes.folders);
|
||||
useImageStore.getState().setImages(imagesRes.images);
|
||||
if (imagesRes.images) {
|
||||
useImageStore.getState().setImages(imagesRes.images);
|
||||
}
|
||||
useImageStore.getState().setTotalImageCount(statsRes.total || 0);
|
||||
useImageStore.getState().setTotalSize(statsRes.totalSize || 0);
|
||||
useImageStore.getState().setTypeCounts(statsRes.typeCounts);
|
||||
}).catch(err => {
|
||||
logger.error('扫描完成后加载数据失败:', err.message);
|
||||
}).finally(() => {
|
||||
@@ -177,6 +189,7 @@ function App() {
|
||||
// 注意:后端返回的字段是 total 和 totalSize
|
||||
useImageStore.getState().setTotalImageCount(statsResponse.total || 0);
|
||||
useImageStore.getState().setTotalSize(statsResponse.totalSize || 0);
|
||||
useImageStore.getState().setTypeCounts(statsResponse.typeCounts);
|
||||
} catch (error) {
|
||||
logger.error('加载文件夹失败:', error.message);
|
||||
}
|
||||
@@ -493,6 +506,7 @@ function App() {
|
||||
if (isMobile) {
|
||||
return (
|
||||
<div className="flex flex-col h-screen bg-gray-50 dark:bg-gray-900">
|
||||
<BackToTop />
|
||||
<Header />
|
||||
{/* 素材库路径丢失弹窗 */}
|
||||
<LibraryMissingModal
|
||||
@@ -504,6 +518,16 @@ function App() {
|
||||
onOpenOther={handleOpenOtherLibrary}
|
||||
onCreateNew={handleCreateNewLibrary}
|
||||
/>
|
||||
<ImageEditor />
|
||||
{/* 视频编辑弹窗(store 全局状态,右侧面板/瀑布流均可触发) */}
|
||||
{videoEditFile && (
|
||||
<VideoEditModal
|
||||
file={videoEditFile}
|
||||
libraryId={currentLibraryId}
|
||||
onClose={() => setVideoEditFile(null)}
|
||||
onDone={() => { setVideoEditFile(null); window.location.reload(); }}
|
||||
/>
|
||||
)}
|
||||
<div className="flex-1 overflow-hidden relative">
|
||||
{/* 侧边栏视图 */}
|
||||
<div className={`absolute inset-0 transition-transform duration-300 ${mobileView === 'sidebar' ? 'translate-x-0' : '-translate-x-full'
|
||||
@@ -566,6 +590,7 @@ function App() {
|
||||
// 桌面端布局
|
||||
return (
|
||||
<div className="flex flex-col h-screen bg-gray-50 dark:bg-gray-900">
|
||||
<BackToTop />
|
||||
<Header />
|
||||
{/* 素材库路径丢失弹窗 */}
|
||||
<LibraryMissingModal
|
||||
@@ -576,8 +601,18 @@ function App() {
|
||||
onRescan={handleRescanLibrary}
|
||||
onOpenOther={handleOpenOtherLibrary}
|
||||
onCreateNew={handleCreateNewLibrary}
|
||||
/>
|
||||
<div ref={containerRef} className="flex flex-1 overflow-hidden">
|
||||
/>
|
||||
<ImageEditor />
|
||||
{/* 视频编辑弹窗(store 全局状态,右侧面板/瀑布流均可触发) */}
|
||||
{videoEditFile && (
|
||||
<VideoEditModal
|
||||
file={videoEditFile}
|
||||
libraryId={currentLibraryId}
|
||||
onClose={() => setVideoEditFile(null)}
|
||||
onDone={() => { setVideoEditFile(null); window.location.reload(); }}
|
||||
/>
|
||||
)}
|
||||
<div ref={containerRef} className="flex flex-1 overflow-hidden">
|
||||
{/* 左侧边栏 */}
|
||||
<div id="left-panel" style={{ width: `${leftWidth}px` }} className="flex-shrink-0 h-full bg-white dark:bg-gray-800">
|
||||
<Sidebar />
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
/**
|
||||
* AI 生图 API
|
||||
* 注意:client 的 API_BASE 已含 /api,这里只写 /aigen 段
|
||||
*/
|
||||
import { api } from '../client';
|
||||
|
||||
/** 模型分组 + 当前配置(apiKey 掩码) */
|
||||
export function getModels() {
|
||||
return api.get('/aigen/models');
|
||||
}
|
||||
|
||||
/**
|
||||
* 生成图片
|
||||
* @param {Object} payload { prompt, model?, size?, provider? }
|
||||
* provider: 'builtin' | 'custom'
|
||||
*/
|
||||
export function generate(payload) {
|
||||
return api.post('/aigen/generate', payload, { timeout: 180000 });
|
||||
}
|
||||
|
||||
export const aigenAPI = { getModels, generate };
|
||||
export default aigenAPI;
|
||||
@@ -0,0 +1,27 @@
|
||||
/**
|
||||
* 批量水印 API(文件夹级)
|
||||
*/
|
||||
|
||||
import { api } from '../client';
|
||||
|
||||
/** 启动批量任务,返回 { taskId, total } */
|
||||
export async function start(payload) {
|
||||
// payload: { libraryId, folder, type: 'add'|'remove', output?, options }
|
||||
return api.post('/batch/start', payload);
|
||||
}
|
||||
|
||||
/** 查询任务进度 */
|
||||
export async function status(taskId) {
|
||||
return api.get(`/batch/status/${taskId}`);
|
||||
}
|
||||
|
||||
/** 取消任务 */
|
||||
export async function cancel(taskId) {
|
||||
return api.post(`/batch/cancel/${taskId}`);
|
||||
}
|
||||
|
||||
/** 批量重命名预览(不执行),返回 { count, total, samples: [{from,to}], skipped } */
|
||||
export async function renamePreview(payload) {
|
||||
// payload: { libraryId, folder, options: { mode, text, includeSubdirs } }
|
||||
return api.post('/batch/rename-preview', payload);
|
||||
}
|
||||
@@ -19,8 +19,9 @@ export async function search(libraryId, params = {}, options = {}) {
|
||||
/**
|
||||
* 获取图片总数
|
||||
*/
|
||||
export async function getCount(libraryId) {
|
||||
return api.get(`/image/count?libraryId=${libraryId}`);
|
||||
export async function getCount(libraryId, params = {}) {
|
||||
const query = new URLSearchParams({ libraryId, ...params });
|
||||
return api.get(`/image/count?${query}`);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -48,8 +49,10 @@ export async function getCacheMeta(libraryId) {
|
||||
* 获取缩略图 URL
|
||||
* 使用分片结构,不再需要 size 参数
|
||||
*/
|
||||
export function getThumbnailUrl(libraryId, filename) {
|
||||
return `/api/image/thumbnail/${libraryId}/${filename}`;
|
||||
export function getThumbnailUrl(libraryId, filename, version) {
|
||||
const base = `/api/image/thumbnail/${libraryId}/${filename}`;
|
||||
// version=文件 modified_at,编辑保存后变化以穿透浏览器缓存
|
||||
return version ? `${base}?v=${version}` : base;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -8,12 +8,15 @@ import * as scan from './endpoints/scan';
|
||||
import { fileAPI } from './file';
|
||||
import { settingsAPI } from './endpoints/settings';
|
||||
import { hubAPI } from './endpoints/hub';
|
||||
import * as batch from './endpoints/batch';
|
||||
import { aigenAPI } from './endpoints/aigen';
|
||||
|
||||
export const libraryAPI = library;
|
||||
export const imageAPI = image;
|
||||
export const scanAPI = scan;
|
||||
export { fileAPI };
|
||||
export { settingsAPI, hubAPI };
|
||||
export { settingsAPI, hubAPI, aigenAPI };
|
||||
export const batchAPI = batch;
|
||||
|
||||
export { api, APIError } from './client';
|
||||
|
||||
|
||||
@@ -0,0 +1,627 @@
|
||||
import { useState, useEffect, useRef, useCallback } from 'react';
|
||||
import {
|
||||
X, Wand2, Loader2, Download, Save, RefreshCw, Sparkles,
|
||||
ChevronDown, FolderOpen, CheckCircle2, AlertTriangle,
|
||||
Image as ImageIcon, Search, Plus, Trash2
|
||||
} from 'lucide-react';
|
||||
import { aigenAPI, fileAPI, imageAPI } from '../api';
|
||||
import { useLibraryStore } from '../stores/useLibraryStore';
|
||||
import { useImageStore } from '../stores/useImageStore';
|
||||
import { PROMPT_CATEGORIES } from '../constants/promptPresets';
|
||||
|
||||
/**
|
||||
* AI 生图弹窗
|
||||
* - 热门提示词分类(点击填入/追加)
|
||||
* - 弹窗内点选生图模型(列表来自设置配置的模型分组),KEY/通道仍在「设置 → AI 生图」
|
||||
* - 生成 → 预览 → 保存到素材库 / 下载 / 重新生成
|
||||
*/
|
||||
|
||||
function flattenFolders(folders) {
|
||||
// 节点自带完整 path(FolderModel.getTree)
|
||||
const out = [{ path: '', label: '(根目录)' }];
|
||||
const walk = (list) => {
|
||||
for (const f of list || []) {
|
||||
if (f.path) out.push({ path: f.path, label: f.path });
|
||||
if (f.children && f.children.length) walk(f.children);
|
||||
}
|
||||
};
|
||||
walk(folders);
|
||||
return out;
|
||||
}
|
||||
|
||||
export default function AIGenModal({ open, onClose, onSaved }) {
|
||||
const { currentLibraryId } = useLibraryStore();
|
||||
const { folders, setFolders, setImages, selectedFolder } = useImageStore();
|
||||
|
||||
const [prompt, setPrompt] = useState('');
|
||||
const [cat, setCat] = useState('hot');
|
||||
const [sizes, setSizes] = useState([]);
|
||||
const [providerInfo, setProviderInfo] = useState(null);
|
||||
const [modelGroups, setModelGroups] = useState([]); // 可选生图模型分组
|
||||
const [selModel, setSelModel] = useState(''); // 用户点选的模型 id(空=设置默认)
|
||||
const [size, setSize] = useState('1024x1024');
|
||||
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [error, setError] = useState('');
|
||||
const [result, setResult] = useState(null); // { b64, revisedPrompt, ms, model }
|
||||
const [saveTarget, setSaveTarget] = useState('');
|
||||
const [saving, setSaving] = useState(false);
|
||||
const [saved, setSaved] = useState(false);
|
||||
const [showFolderPick, setShowFolderPick] = useState(false);
|
||||
const [advanced, setAdvanced] = useState(false);
|
||||
|
||||
// 参考图(以图生图)
|
||||
const [refs, setRefs] = useState([]); // [{ path, filename, thumbnailPath }]
|
||||
const [showRefPicker, setShowRefPicker] = useState(false);
|
||||
const [refList, setRefList] = useState([]);
|
||||
const [refQuery, setRefQuery] = useState('');
|
||||
const [refLoading, setRefLoading] = useState(false);
|
||||
const imgRef = useRef(null);
|
||||
|
||||
// 打开时拉模型列表 + 当前配置
|
||||
useEffect(() => {
|
||||
if (!open) return;
|
||||
setError('');
|
||||
setResult(null);
|
||||
setSaved(false);
|
||||
setRefs([]);
|
||||
setShowRefPicker(false);
|
||||
setRefQuery('');
|
||||
aigenAPI.getModels()
|
||||
.then((d) => {
|
||||
setSizes(d.sizes || []);
|
||||
setProviderInfo(d.provider || null);
|
||||
const groups = d.groups || [];
|
||||
setModelGroups(groups);
|
||||
const all = groups.flatMap((g) => (g.models || []).map((m) => m.id));
|
||||
const p = d.provider || {};
|
||||
// 自定义提供商:只有设置里填的那个模型可用
|
||||
if (p.type === 'custom') { setSelModel(p.customModel || ''); return; }
|
||||
const def = p.builtinModel || 'flux-schnell';
|
||||
const saved = localStorage.getItem('flypic_aigen_model');
|
||||
setSelModel(all.includes(saved) ? saved : (all.includes(def) ? def : (all[0] || def)));
|
||||
})
|
||||
.catch((e) => setError('读取模型列表失败: ' + (e.data?.error || e.message)));
|
||||
}, [open]);
|
||||
|
||||
/** 素材库缩略图地址 */
|
||||
const thumbUrl = (img) => {
|
||||
if (!img || !currentLibraryId) return '';
|
||||
const raw = img.thumbnailPath || img.path || img.filename || '';
|
||||
const fn = String(raw).replace(/\\/g, '/').split('/').pop();
|
||||
return `/api/image/thumbnail/${currentLibraryId}/${encodeURIComponent(fn)}`;
|
||||
};
|
||||
|
||||
/** 打开素材库选图:读当前库的图片(只图片,不含视频) */
|
||||
const openRefPicker = async () => {
|
||||
setShowRefPicker(true);
|
||||
setRefLoading(true);
|
||||
setRefList([]);
|
||||
try {
|
||||
const resp = await imageAPI.search(currentLibraryId, { limit: 200, offset: 0, q: refQuery || undefined });
|
||||
const list = (resp.images || []).filter((it) => {
|
||||
const t = String(it.fileType || it.type || '').toLowerCase();
|
||||
if (t === 'video') return false;
|
||||
const ext = String(it.filename || it.path || '').split('.').pop().toLowerCase();
|
||||
return !['mp4', 'mov', 'mkv', 'webm', 'avi', 'm4v', 'ts', 'flv'].includes(ext);
|
||||
});
|
||||
setRefList(list);
|
||||
} catch (e) {
|
||||
setError('读取素材库图片失败: ' + (e.data?.error || e.message));
|
||||
} finally {
|
||||
setRefLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
const isPickedRef = (img) => refs.some((r) => r.path === img.path);
|
||||
|
||||
const toggleRef = (img) => {
|
||||
setError('');
|
||||
if (isPickedRef(img)) {
|
||||
setRefs((prev) => prev.filter((r) => r.path !== img.path));
|
||||
return;
|
||||
}
|
||||
if (refs.length >= 4) { setError('最多选 4 张参考图'); return; }
|
||||
setRefs((prev) => [...prev, img]);
|
||||
};
|
||||
const handleGenerate = async () => {
|
||||
if (!prompt.trim()) { setError('请先输入提示词,或点一个热门提示词'); return; }
|
||||
setLoading(true);
|
||||
setError('');
|
||||
setSaved(false);
|
||||
try {
|
||||
const d = await aigenAPI.generate({
|
||||
prompt: prompt.trim(),
|
||||
model: selModel || undefined,
|
||||
size,
|
||||
libraryId: currentLibraryId,
|
||||
refImages: refs.map((r) => ({ path: r.path, filename: r.filename })),
|
||||
});
|
||||
const img = d.images && d.images[0];
|
||||
if (!img || !img.b64) throw new Error('未返回图片数据');
|
||||
const ext = d.ext || img.ext || 'png';
|
||||
setResult({ b64: img.b64, ext, mime: ext === 'jpg' ? 'jpeg' : ext, revisedPrompt: d.revisedPrompt, ms: d.ms, model: d.model });
|
||||
// 生成成功后刷新一次文件夹(可能有别处新入库)
|
||||
if (currentLibraryId) {
|
||||
imageAPI.getFolders(currentLibraryId).then((r) => setFolders(r.folders)).catch(() => {});
|
||||
}
|
||||
} catch (e) {
|
||||
setError(e.data?.error || e.message || '生成失败');
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
const b64ToFile = () => {
|
||||
const bin = atob(result.b64);
|
||||
const arr = new Uint8Array(bin.length);
|
||||
for (let i = 0; i < bin.length; i++) arr[i] = bin.charCodeAt(i);
|
||||
const ts = new Date();
|
||||
const pad = (n) => String(n).padStart(2, '0');
|
||||
const ext = result.ext || 'png';
|
||||
const name = `AI_${ts.getFullYear()}${pad(ts.getMonth() + 1)}${pad(ts.getDate())}_${pad(ts.getHours())}${pad(ts.getMinutes())}${pad(ts.getSeconds())}.${ext}`;
|
||||
return new File([arr], name, { type: `image/${result.mime || ext}` });
|
||||
};
|
||||
|
||||
const handleSave = async () => {
|
||||
if (!currentLibraryId) { setError('请先选择素材库'); return; }
|
||||
setSaving(true);
|
||||
setError('');
|
||||
try {
|
||||
const file = b64ToFile();
|
||||
await fileAPI.upload(currentLibraryId, saveTarget, [file], undefined, 'rename');
|
||||
setSaved(true);
|
||||
// 刷新文件夹与当前视图
|
||||
const r = await imageAPI.getFolders(currentLibraryId);
|
||||
setFolders(r.folders);
|
||||
const params = { folder: selectedFolder || '' };
|
||||
const resp = await imageAPI.search(currentLibraryId, params);
|
||||
setImages(resp.images);
|
||||
onSaved && onSaved();
|
||||
} catch (e) {
|
||||
setError('保存失败: ' + (e.data?.error || e.message));
|
||||
} finally {
|
||||
setSaving(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleDownload = () => {
|
||||
const a = document.createElement('a');
|
||||
a.href = `data:image/${result.mime || 'png'};base64,${result.b64}`;
|
||||
a.download = b64ToFile().name;
|
||||
a.click();
|
||||
};
|
||||
|
||||
const appendPrompt = (p) => {
|
||||
setPrompt(p);
|
||||
setError('');
|
||||
};
|
||||
|
||||
if (!open) return null;
|
||||
|
||||
const activeCat = PROMPT_CATEGORIES.find((c) => c.key === cat) || PROMPT_CATEGORIES[0];
|
||||
const noKey = providerInfo && !providerInfo.hasKey && providerInfo.type !== 'custom';
|
||||
|
||||
return (
|
||||
<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/50 p-4">
|
||||
<div
|
||||
className="bg-white dark:bg-gray-800 rounded-xl shadow-2xl w-[98vw] h-[98vh] max-w-none max-h-none overflow-hidden flex flex-col"
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
>
|
||||
{/* 头部 */}
|
||||
<div className="flex items-center justify-between px-5 py-3.5 border-b border-gray-200 dark:border-gray-700">
|
||||
<div className="flex items-center gap-2">
|
||||
<div className="p-1.5 rounded-lg bg-gradient-to-br from-purple-500 to-pink-500">
|
||||
<Wand2 className="w-4 h-4 text-white" />
|
||||
</div>
|
||||
<h2 className="text-base font-semibold text-gray-900 dark:text-white">AI 生图</h2>
|
||||
<span className="text-xs text-gray-400 dark:text-gray-500">热门提示词 · 一键生成 · 入库</span>
|
||||
</div>
|
||||
<button onClick={onClose} className="p-1.5 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700">
|
||||
<X className="w-5 h-5 text-gray-500" />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="flex-1 overflow-y-auto p-5">
|
||||
<div className="grid grid-cols-1 lg:grid-cols-5 gap-5">
|
||||
{/* 左:提示词 + 热门词库 */}
|
||||
<div className="lg:col-span-3 space-y-4">
|
||||
<div>
|
||||
<div className="flex items-center justify-between mb-1.5">
|
||||
<label className="text-xs font-medium text-gray-500 dark:text-gray-400">提示词</label>
|
||||
<span className="text-[11px] text-gray-400">{prompt.length} 字</span>
|
||||
</div>
|
||||
<textarea
|
||||
value={prompt}
|
||||
onChange={(e) => setPrompt(e.target.value)}
|
||||
rows={3}
|
||||
placeholder="描述你想要的画面,例如:一只戴墨镜的柴犬在海边冲浪,卡通风格"
|
||||
className="w-full px-3 py-2.5 text-sm border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 resize-none focus:ring-2 focus:ring-purple-400 focus:border-transparent"
|
||||
/>
|
||||
</div>
|
||||
|
||||
{/* 热门提示词 */}
|
||||
<div>
|
||||
<div className="flex items-center gap-1.5 mb-2">
|
||||
<Sparkles className="w-3.5 h-3.5 text-amber-500" />
|
||||
<span className="text-xs font-medium text-gray-500 dark:text-gray-400">常用热门提示词</span>
|
||||
</div>
|
||||
<div className="flex flex-wrap gap-1.5 mb-2.5">
|
||||
{PROMPT_CATEGORIES.map((c) => (
|
||||
<button
|
||||
key={c.key}
|
||||
onClick={() => setCat(c.key)}
|
||||
className={`px-2.5 py-1 rounded-full text-xs transition-colors ${
|
||||
cat === c.key
|
||||
? 'bg-purple-600 text-white'
|
||||
: 'bg-gray-100 dark:bg-gray-700 text-gray-600 dark:text-gray-300 hover:bg-gray-200 dark:hover:bg-gray-600'
|
||||
}`}
|
||||
>
|
||||
{c.label}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
<div className="grid grid-cols-1 sm:grid-cols-2 gap-1.5 max-h-56 overflow-y-auto pr-1">
|
||||
{activeCat.prompts.map((p) => (
|
||||
<button
|
||||
key={p.name}
|
||||
onClick={() => appendPrompt(p.promptCn)}
|
||||
title={p.promptCn}
|
||||
className="text-left px-2.5 py-2 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-purple-400 dark:hover:border-purple-500 hover:bg-purple-50 dark:hover:bg-purple-500/10 transition-colors group"
|
||||
>
|
||||
<div className="text-xs font-medium text-gray-800 dark:text-gray-200 truncate group-hover:text-purple-700 dark:group-hover:text-purple-300">
|
||||
{p.name}
|
||||
</div>
|
||||
<div className="mt-0.5 text-[10px] leading-4 text-gray-400 dark:text-gray-500 line-clamp-2 group-hover:text-gray-500 dark:group-hover:text-gray-400">
|
||||
{p.promptCn}
|
||||
</div>
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* 右:参数 + 生成 */}
|
||||
<div className="lg:col-span-2 space-y-3.5">
|
||||
{/* 生图模型:列出可点选的模型 */}
|
||||
<div className="px-3 py-2.5 rounded-lg bg-gray-50 dark:bg-gray-900/40 border border-gray-200 dark:border-gray-700">
|
||||
<div className="flex items-center justify-between mb-2">
|
||||
<span className="text-xs font-medium text-gray-500 dark:text-gray-400">生图模型</span>
|
||||
<button
|
||||
onClick={() => window.dispatchEvent(new CustomEvent('open:settings', { detail: { tab: 'aigen' } }))}
|
||||
className="text-[11px] text-purple-600 dark:text-purple-400 hover:underline"
|
||||
>
|
||||
通道设置
|
||||
</button>
|
||||
</div>
|
||||
{providerInfo && providerInfo.type === 'custom' ? (
|
||||
<div className="flex flex-wrap gap-1.5">
|
||||
<span className="px-2.5 py-1 rounded-full text-[11px] bg-purple-600 text-white border border-purple-600">
|
||||
{providerInfo.customModel || '自定义模型'}
|
||||
</span>
|
||||
<span className="px-1 py-1 text-[11px] text-gray-400 dark:text-gray-500 self-center">
|
||||
自定义提供商的模型在设置里配置
|
||||
</span>
|
||||
</div>
|
||||
) : (
|
||||
<div className="space-y-1.5">
|
||||
{modelGroups.map((g) => (
|
||||
<div key={g.key} className="flex items-start gap-2">
|
||||
<span className="text-[10px] text-gray-400 dark:text-gray-500 w-[76px] flex-shrink-0 pt-1 leading-4">{g.label}</span>
|
||||
<div className="flex flex-wrap gap-1.5">
|
||||
{(g.models || []).map((m) => (
|
||||
<button
|
||||
key={m.id}
|
||||
type="button"
|
||||
title={m.id}
|
||||
onClick={() => { setSelModel(m.id); localStorage.setItem('flypic_aigen_model', m.id); }}
|
||||
className={`px-2.5 py-1 rounded-full text-[11px] border transition-colors ${selModel === m.id
|
||||
? 'bg-purple-600 text-white border-purple-600'
|
||||
: 'bg-white dark:bg-gray-800 text-gray-600 dark:text-gray-300 border-gray-200 dark:border-gray-600 hover:border-purple-400 hover:text-purple-600 dark:hover:text-purple-300'}`}
|
||||
>
|
||||
{m.name}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
{!modelGroups.length && (
|
||||
<span className="text-[11px] text-gray-400 dark:text-gray-500">读取模型列表中…</span>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
{refs.length > 0 && (
|
||||
<p className="mt-1.5 text-[11px] text-amber-600 dark:text-amber-400">
|
||||
已选参考图:后端会自动切到 FLUX.2 图生图模型
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
{noKey && (
|
||||
<div className="flex items-start gap-1.5 text-[11px] text-amber-600 dark:text-amber-400">
|
||||
<AlertTriangle className="w-3.5 h-3.5 flex-shrink-0 mt-px" />
|
||||
<span>未配置 API Key。到「设置 → AI 生图」填写,或由服务器环境变量注入。</span>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 参考图:以图生图 */}
|
||||
<div>
|
||||
<div className="flex items-center justify-between mb-1.5">
|
||||
<label className="text-xs font-medium text-gray-500 dark:text-gray-400">
|
||||
参考图(以图生图){refs.length > 0 && <span className="text-purple-600 dark:text-purple-400">· 已选 {refs.length}/4</span>}
|
||||
</label>
|
||||
{refs.length > 0 && (
|
||||
<button
|
||||
onClick={() => setRefs([])}
|
||||
className="text-[11px] text-gray-400 hover:text-red-500 flex items-center gap-0.5"
|
||||
>
|
||||
<Trash2 className="w-3 h-3" />清空
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
<div className="flex items-center gap-1.5 flex-wrap">
|
||||
{refs.map((r, i) => (
|
||||
<div key={r.path || i} className="relative w-14 h-14 rounded-lg overflow-hidden border border-gray-200 dark:border-gray-600">
|
||||
<img src={thumbUrl(r)} alt={r.filename || ''} className="w-full h-full object-cover" />
|
||||
<button
|
||||
onClick={() => toggleRef(r)}
|
||||
className="absolute top-0 right-0 p-0.5 bg-black/60 text-white rounded-bl"
|
||||
title="移除"
|
||||
>
|
||||
<X className="w-3 h-3" />
|
||||
</button>
|
||||
</div>
|
||||
))}
|
||||
{refs.length < 4 && (
|
||||
<button
|
||||
onClick={openRefPicker}
|
||||
className="w-14 h-14 rounded-lg border-2 border-dashed border-gray-300 dark:border-gray-600 text-gray-400 hover:border-purple-400 hover:text-purple-500 flex flex-col items-center justify-center gap-0.5"
|
||||
title="从素材库选择参考图"
|
||||
>
|
||||
<Plus className="w-4 h-4" />
|
||||
<span className="text-[9px]">选图</span>
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
<p className="mt-1 text-[11px] text-gray-400 dark:text-gray-500">
|
||||
{refs.length > 0
|
||||
? '将按参考图生成(自动切到 FLUX.2 图生图模型),图片只在本机读取,不上传到第三方'
|
||||
: '选 1-4 张素材库图片做参考,即可换背景、改风格、保持人物一致'}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{/* 尺寸 */}
|
||||
<div>
|
||||
<label className="block text-xs font-medium text-gray-500 dark:text-gray-400 mb-1.5">尺寸</label>
|
||||
<div className="grid grid-cols-3 gap-1.5">
|
||||
{sizes.map((s) => (
|
||||
<button
|
||||
key={s}
|
||||
onClick={() => setSize(s)}
|
||||
className={`px-2 py-1.5 rounded-lg text-xs transition-colors ${
|
||||
size === s
|
||||
? 'bg-purple-600 text-white'
|
||||
: 'bg-gray-100 dark:bg-gray-700 text-gray-600 dark:text-gray-300 hover:bg-gray-200 dark:hover:bg-gray-600'
|
||||
}`}
|
||||
>
|
||||
{s.replace('x', '×')}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* 生成按钮 */}
|
||||
<button
|
||||
onClick={handleGenerate}
|
||||
disabled={loading || !prompt.trim()}
|
||||
className="w-full flex items-center justify-center gap-2 px-4 py-2.5 text-sm font-medium text-white bg-gradient-to-r from-purple-600 to-pink-600 hover:from-purple-700 hover:to-pink-700 rounded-lg disabled:opacity-50 disabled:cursor-not-allowed transition-all"
|
||||
>
|
||||
{loading ? (
|
||||
<>
|
||||
<Loader2 className="w-4 h-4 animate-spin" />
|
||||
生成中…(约 10-30 秒)
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<Wand2 className="w-4 h-4" />
|
||||
生成图片
|
||||
</>
|
||||
)}
|
||||
</button>
|
||||
|
||||
{loading && (
|
||||
<div className="text-[11px] text-gray-400 dark:text-gray-500 text-center">
|
||||
正在调用生图服务
|
||||
{refs.length > 0 ? '(以图生图,约 20-60 秒)' : ',超时上限 150 秒'}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* 错误 */}
|
||||
{error && (
|
||||
<div className="mt-4 flex items-start gap-2 px-3 py-2.5 rounded-lg bg-red-50 dark:bg-red-500/10 border border-red-200 dark:border-red-500/30 text-sm text-red-700 dark:text-red-300">
|
||||
<AlertTriangle className="w-4 h-4 flex-shrink-0 mt-0.5" />
|
||||
<span className="whitespace-pre-wrap">{error}</span>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 结果预览 */}
|
||||
{result && (
|
||||
<div className="mt-5 border border-gray-200 dark:border-gray-700 rounded-xl overflow-hidden">
|
||||
<div className="flex items-center justify-between px-4 py-2 bg-gray-50 dark:bg-gray-900/50 border-b border-gray-200 dark:border-gray-700">
|
||||
<div className="flex items-center gap-3 text-xs text-gray-500 dark:text-gray-400">
|
||||
<span>模型 {result.model}</span>
|
||||
<span>耗时 {(result.ms / 1000).toFixed(1)}s</span>
|
||||
</div>
|
||||
<div className="flex items-center gap-1.5">
|
||||
<button
|
||||
onClick={handleGenerate}
|
||||
disabled={loading}
|
||||
className="flex items-center gap-1 px-2.5 py-1.5 text-xs rounded-lg border border-gray-300 dark:border-gray-600 text-gray-600 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 disabled:opacity-50"
|
||||
>
|
||||
<RefreshCw className="w-3.5 h-3.5" /> 重新生成
|
||||
</button>
|
||||
<button
|
||||
onClick={handleDownload}
|
||||
className="flex items-center gap-1 px-2.5 py-1.5 text-xs rounded-lg border border-gray-300 dark:border-gray-600 text-gray-600 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700"
|
||||
>
|
||||
<Download className="w-3.5 h-3.5" /> 下载
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="p-4 bg-gray-100 dark:bg-gray-900 flex justify-center">
|
||||
<img
|
||||
ref={imgRef}
|
||||
src={`data:image/${result.mime || 'png'};base64,${result.b64}`}
|
||||
alt="AI 生成结果"
|
||||
className="max-h-[46vh] max-w-full object-contain rounded-lg shadow"
|
||||
/>
|
||||
</div>
|
||||
|
||||
{result.revisedPrompt && (
|
||||
<div className="px-4 py-2 text-[11px] text-gray-400 dark:text-gray-500 border-t border-gray-200 dark:border-gray-700 truncate" title={result.revisedPrompt}>
|
||||
改写提示词:{result.revisedPrompt}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 入库区 */}
|
||||
<div className="flex flex-wrap items-center gap-2 px-4 py-3 border-t border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-800">
|
||||
<div className="relative">
|
||||
<button
|
||||
onClick={() => setShowFolderPick((v) => !v)}
|
||||
className="flex items-center gap-1.5 px-3 py-2 text-xs rounded-lg border border-gray-300 dark:border-gray-600 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700"
|
||||
>
|
||||
<FolderOpen className="w-3.5 h-3.5" />
|
||||
{saveTarget || '根目录'}
|
||||
<ChevronDown className="w-3.5 h-3.5" />
|
||||
</button>
|
||||
{showFolderPick && (
|
||||
<>
|
||||
<div className="fixed inset-0 z-10"></div>
|
||||
<div className="absolute left-0 bottom-full mb-1 z-20 w-64 max-h-64 overflow-y-auto bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-lg shadow-xl p-1">
|
||||
{flattenFolders(folders).map((f) => (
|
||||
<button
|
||||
key={f.path}
|
||||
onClick={() => { setSaveTarget(f.path); setShowFolderPick(false); }}
|
||||
className={`w-full text-left px-2.5 py-1.5 rounded text-xs truncate ${
|
||||
saveTarget === f.path
|
||||
? 'bg-purple-50 dark:bg-purple-500/20 text-purple-700 dark:text-purple-300'
|
||||
: 'text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700'
|
||||
}`}
|
||||
>
|
||||
{f.path || '(根目录)'}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<button
|
||||
onClick={handleSave}
|
||||
disabled={saving || saved}
|
||||
className="flex items-center gap-1.5 px-4 py-2 text-xs font-medium rounded-lg text-white bg-blue-600 hover:bg-blue-700 disabled:opacity-50"
|
||||
>
|
||||
{saving ? <Loader2 className="w-3.5 h-3.5 animate-spin" /> : saved ? <CheckCircle2 className="w-3.5 h-3.5" /> : <Save className="w-3.5 h-3.5" />}
|
||||
{saved ? '已入库' : saving ? '入库中…' : '保存到素材库'}
|
||||
</button>
|
||||
|
||||
<span className="text-[11px] text-gray-400 dark:text-gray-500">
|
||||
{currentLibraryId ? 'PNG 格式,入库后自动建索引与缩略图' : '未选择素材库'}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* 素材库选图(以图生图) */}
|
||||
{showRefPicker && (
|
||||
<div
|
||||
className="fixed inset-0 z-[60] flex items-center justify-center bg-black/60 p-4"
|
||||
onClick={() => setShowRefPicker(false)}
|
||||
>
|
||||
<div
|
||||
className="bg-white dark:bg-gray-800 rounded-xl shadow-2xl w-full max-w-3xl max-h-[85vh] flex flex-col overflow-hidden"
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
>
|
||||
<div className="flex items-center justify-between px-4 py-3 border-b border-gray-200 dark:border-gray-700">
|
||||
<div className="flex items-center gap-2">
|
||||
<ImageIcon className="w-4 h-4 text-purple-500" />
|
||||
<h3 className="text-sm font-semibold text-gray-900 dark:text-white">从素材库选择参考图</h3>
|
||||
<span className="text-[11px] text-gray-400">已选 {refs.length}/4</span>
|
||||
</div>
|
||||
<button onClick={() => setShowRefPicker(false)} className="p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-700">
|
||||
<X className="w-4 h-4 text-gray-500" />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="px-4 py-2.5 border-b border-gray-200 dark:border-gray-700 flex items-center gap-2">
|
||||
<div className="relative flex-1">
|
||||
<Search className="w-3.5 h-3.5 text-gray-400 absolute left-2.5 top-1/2 -translate-y-1/2" />
|
||||
<input
|
||||
value={refQuery}
|
||||
onChange={(e) => setRefQuery(e.target.value)}
|
||||
onKeyDown={(e) => { if (e.key === 'Enter') openRefPicker(); }}
|
||||
placeholder="搜索文件名,回车查询"
|
||||
className="w-full pl-8 pr-3 py-1.5 text-xs border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
|
||||
/>
|
||||
</div>
|
||||
<button
|
||||
onClick={openRefPicker}
|
||||
className="px-3 py-1.5 text-xs rounded-lg bg-purple-600 text-white hover:bg-purple-700"
|
||||
>
|
||||
查询
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="flex-1 overflow-y-auto p-3">
|
||||
{refLoading ? (
|
||||
<div className="flex items-center justify-center py-16 text-xs text-gray-400 gap-2">
|
||||
<Loader2 className="w-4 h-4 animate-spin" />读取图片中…
|
||||
</div>
|
||||
) : refList.length === 0 ? (
|
||||
<div className="py-16 text-center text-xs text-gray-400">这个素材库里没有可选图片</div>
|
||||
) : (
|
||||
<div className="grid grid-cols-4 sm:grid-cols-5 md:grid-cols-6 gap-2">
|
||||
{refList.map((img) => {
|
||||
const picked = isPickedRef(img);
|
||||
const idx = refs.findIndex((r) => r.path === img.path);
|
||||
return (
|
||||
<button
|
||||
key={img.path || img.filename}
|
||||
onClick={() => toggleRef(img)}
|
||||
title={img.filename || img.path}
|
||||
className={`relative aspect-square rounded-lg overflow-hidden border-2 transition-all ${
|
||||
picked ? 'border-purple-500 ring-2 ring-purple-300' : 'border-transparent hover:border-gray-300'
|
||||
}`}
|
||||
>
|
||||
<img src={thumbUrl(img)} alt={img.filename || ''} className="w-full h-full object-cover" />
|
||||
{picked && (
|
||||
<span className="absolute top-1 left-1 w-5 h-5 rounded-full bg-purple-600 text-white text-[11px] flex items-center justify-center font-medium">
|
||||
{idx + 1}
|
||||
</span>
|
||||
)}
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="flex items-center justify-between px-4 py-2.5 border-t border-gray-200 dark:border-gray-700">
|
||||
<span className="text-[11px] text-gray-400">点图多选,按点选顺序作为参考顺序</span>
|
||||
<button
|
||||
onClick={() => setShowRefPicker(false)}
|
||||
className="px-4 py-1.5 text-xs font-medium rounded-lg bg-purple-600 text-white hover:bg-purple-700"
|
||||
>
|
||||
完成
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,238 @@
|
||||
/**
|
||||
* AI 生成视频弹窗
|
||||
* 多选图片 + 标题 + 模型 KEY → 一键生成带字幕和朗读的视频
|
||||
* 后端:POST /api/video/aigenerate(异步任务)+ GET /api/video/task/:id 轮询
|
||||
*/
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { X, Loader2, Film, CheckCircle2, AlertCircle, KeyRound } from 'lucide-react';
|
||||
import { imageAPI } from '../api';
|
||||
import { getToken } from '../api/client';
|
||||
|
||||
// 后端错误可能为字符串或 {code,message} 对象,统一取可读文本
|
||||
const errText = (e, fallback) => {
|
||||
if (!e) return fallback;
|
||||
if (typeof e === 'string') return e;
|
||||
return e.message || JSON.stringify(e);
|
||||
};
|
||||
|
||||
const VOICES = [
|
||||
{ key: 'zh-CN-XiaoxiaoNeural', label: '晓晓(女声·自然)' },
|
||||
{ key: 'zh-CN-YunxiNeural', label: '云希(男声·温暖)' },
|
||||
{ key: 'zh-CN-YunjianNeural', label: '云健(男声·浑厚)' },
|
||||
{ key: 'zh-CN-XiaoyiNeural', label: '晓伊(女声·活泼)' },
|
||||
{ key: 'zh-CN-YunyangNeural', label: '云扬(男声·播音)' },
|
||||
{ key: 'zh-TW-HsiaoChenNeural', label: '晓臻(台湾腔)' }
|
||||
];
|
||||
|
||||
const RESOLUTIONS = [
|
||||
{ key: '1920x1080', label: '横屏 1920×1080' },
|
||||
{ key: '1080x1920', label: '竖屏 1080×1920' },
|
||||
{ key: '1280x720', label: '横屏 1280×720' }
|
||||
];
|
||||
|
||||
const STEPS = {
|
||||
script: '正在生成分镜脚本',
|
||||
tts: '正在朗读配音',
|
||||
compose: '正在合成画面',
|
||||
merge: '正在合并视频',
|
||||
done: '完成'
|
||||
};
|
||||
|
||||
function AIVideoModal({ libraryId, images, onClose, onDone }) {
|
||||
const [title, setTitle] = useState('');
|
||||
const [apiKey, setApiKey] = useState('');
|
||||
const [showKey, setShowKey] = useState(false);
|
||||
const [voice, setVoice] = useState(VOICES[0].key);
|
||||
const [resolution, setResolution] = useState('1920x1080');
|
||||
const [extraPrompt, setExtraPrompt] = useState('');
|
||||
|
||||
const [taskId, setTaskId] = useState('');
|
||||
const [task, setTask] = useState(null);
|
||||
const [error, setError] = useState('');
|
||||
const [starting, setStarting] = useState(false);
|
||||
const timerRef = useRef(null);
|
||||
|
||||
const list = Array.isArray(images) ? images : [];
|
||||
|
||||
// 轮询任务进度
|
||||
useEffect(() => {
|
||||
if (!taskId) return;
|
||||
timerRef.current = setInterval(async () => {
|
||||
try {
|
||||
const res = await fetch(`/api/video/task/${taskId}`, {
|
||||
headers: { Authorization: `Bearer ${getToken()}` }
|
||||
});
|
||||
if (!res.ok) return;
|
||||
const data = await res.json();
|
||||
setTask(data);
|
||||
if (data.status === 'done' || data.status === 'error') {
|
||||
clearInterval(timerRef.current);
|
||||
if (data.status === 'done') {
|
||||
setTimeout(() => { onDone && onDone(data.resultPath); onClose(); }, 1200);
|
||||
}
|
||||
}
|
||||
} catch (_) { /* 网络抖动继续轮询 */ }
|
||||
}, 1500);
|
||||
return () => timerRef.current && clearInterval(timerRef.current);
|
||||
}, [taskId, onDone, onClose]);
|
||||
|
||||
const handleStart = async () => {
|
||||
setError('');
|
||||
if (!title.trim()) { setError('请填写视频标题'); return; }
|
||||
if (list.length < 2) { setError('请至少选择 2 张图片'); return; }
|
||||
setStarting(true);
|
||||
try {
|
||||
const res = await fetch('/api/video/aigenerate', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
Authorization: `Bearer ${getToken()}`
|
||||
},
|
||||
body: JSON.stringify({
|
||||
libraryId,
|
||||
images: list.map((img) => ({ path: img.path })),
|
||||
title: title.trim(),
|
||||
apiKey: apiKey.trim(),
|
||||
voice,
|
||||
resolution,
|
||||
extraPrompt: extraPrompt.trim()
|
||||
})
|
||||
});
|
||||
const data = await res.json().catch(() => ({}));
|
||||
if (!res.ok || data.error) throw new Error(errText(data.error, `启动失败 (${res.status})`));
|
||||
setTaskId(data.taskId);
|
||||
} catch (e) {
|
||||
setError(e.message || '启动失败');
|
||||
} finally {
|
||||
setStarting(false);
|
||||
}
|
||||
};
|
||||
|
||||
const running = !!taskId && task && task.status === 'running';
|
||||
const failed = task && task.status === 'error';
|
||||
const done = task && task.status === 'done';
|
||||
|
||||
const label = 'block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1';
|
||||
const input = 'w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 text-sm focus:ring-2 focus:ring-blue-500 focus:border-transparent';
|
||||
|
||||
return (
|
||||
<div className="fixed inset-0 z-50 bg-black bg-opacity-60 flex items-center justify-center p-4">
|
||||
<div className="bg-white dark:bg-gray-800 rounded-xl shadow-2xl w-full max-w-lg max-h-[92vh] overflow-y-auto" onClick={(e) => e.stopPropagation()}>
|
||||
<div className="flex items-center justify-between px-5 py-4 border-b border-gray-200 dark:border-gray-700">
|
||||
<div className="flex items-center gap-2">
|
||||
<Film className="w-5 h-5 text-purple-500" />
|
||||
<h2 className="text-lg font-semibold text-gray-900 dark:text-gray-100">AI 生成视频</h2>
|
||||
<span className="text-xs px-2 py-0.5 rounded-full bg-purple-100 dark:bg-purple-900/40 text-purple-700 dark:text-purple-300">{list.length} 张图片</span>
|
||||
</div>
|
||||
<button onClick={onClose} disabled={running || starting} className="p-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded">
|
||||
<X className="w-5 h-5 text-gray-500" />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="p-5 space-y-4">
|
||||
{/* 图片缩略条 */}
|
||||
<div className="flex gap-2 overflow-x-auto pb-1">
|
||||
{list.map((img, i) => (
|
||||
<div key={img.id || i} className="flex-shrink-0 w-20 h-14 rounded bg-gray-100 dark:bg-gray-700 overflow-hidden relative">
|
||||
<img
|
||||
src={img.thumbnailPath ? imageAPI.getThumbnailUrl(libraryId, img.thumbnailPath.replace(/\\/g, '/').split('/').pop(), img.modifiedAt) : ''}
|
||||
alt={img.filename || ''}
|
||||
className="w-full h-full object-cover"
|
||||
onError={(e) => { e.target.style.display = 'none'; }}
|
||||
/>
|
||||
<span className="absolute top-0.5 left-0.5 text-[10px] bg-black bg-opacity-55 text-white px-1 rounded z-10">{i + 1}</span>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label className={label}>视频标题</label>
|
||||
<input className={input} value={title} onChange={(e) => setTitle(e.target.value)} placeholder="例如:周末探店 vlog / 产品功能速览" maxLength={60} disabled={running || done} />
|
||||
<p className="text-xs text-gray-500 dark:text-gray-400 mt-1">AI 将按此标题撰写分镜旁白,成片文件名也用它。</p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label className={`${label} flex items-center gap-1`}><KeyRound className="w-3.5 h-3.5" /> 模型 KEY(OpenAI 兼容)</label>
|
||||
<div className="relative">
|
||||
<input
|
||||
type={showKey ? 'text' : 'password'}
|
||||
className={`${input} pr-16`}
|
||||
value={apiKey}
|
||||
onChange={(e) => setApiKey(e.target.value)}
|
||||
placeholder="留空则使用服务器已配置的 KEY"
|
||||
disabled={running || done}
|
||||
/>
|
||||
<button type="button" onClick={() => setShowKey(!showKey)} className="absolute right-2 top-1/2 -translate-y-1/2 text-xs text-gray-500 hover:text-gray-700 dark:hover:text-gray-300 px-1">
|
||||
{showKey ? '隐藏' : '显示'}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-2 gap-3">
|
||||
<div>
|
||||
<label className={label}>朗读音色</label>
|
||||
<select className={input} value={voice} onChange={(e) => setVoice(e.target.value)} disabled={running || done}>
|
||||
{VOICES.map((v) => <option key={v.key} value={v.key}>{v.label}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
<label className={label}>画幅</label>
|
||||
<select className={input} value={resolution} onChange={(e) => setResolution(e.target.value)} disabled={running || done}>
|
||||
{RESOLUTIONS.map((r) => <option key={r.key} value={r.key}>{r.label}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label className={label}>补充要求(可选)</label>
|
||||
<input className={input} value={extraPrompt} onChange={(e) => setExtraPrompt(e.target.value)} placeholder="例如:语气轻松活泼 / 强调性价比 / 结尾加行动号召" maxLength={100} disabled={running || done} />
|
||||
</div>
|
||||
|
||||
{/* 进度 */}
|
||||
{(running || done || failed) && (
|
||||
<div className={`rounded-lg border px-4 py-3 ${failed ? 'border-red-200 bg-red-50 dark:bg-red-900/20' : done ? 'border-green-200 bg-green-50 dark:bg-green-900/20' : 'border-blue-200 bg-blue-50 dark:bg-blue-900/20'}`}>
|
||||
<div className="flex items-center gap-2 text-sm">
|
||||
{failed ? <AlertCircle className="w-4 h-4 text-red-500" /> : done ? <CheckCircle2 className="w-4 h-4 text-green-500" /> : <Loader2 className="w-4 h-4 animate-spin text-blue-500" />}
|
||||
<span className={`font-medium ${failed ? 'text-red-700 dark:text-red-300' : done ? 'text-green-700 dark:text-green-300' : 'text-blue-700 dark:text-blue-300'}`}>
|
||||
{failed ? '生成失败' : done ? '生成完成,正在打开…' : (task.stepLabel || STEPS[task.step] || '处理中')}
|
||||
</span>
|
||||
{running && <span className="ml-auto text-xs text-blue-600 dark:text-blue-300">{task.progress || 0}%</span>}
|
||||
</div>
|
||||
{running && (
|
||||
<div className="mt-2 h-1.5 bg-blue-100 dark:bg-blue-900/50 rounded-full overflow-hidden">
|
||||
<div className="h-full bg-blue-500 rounded-full transition-all" style={{ width: `${task.progress || 0}%` }} />
|
||||
</div>
|
||||
)}
|
||||
{failed && <p className="mt-1 text-xs text-red-600 dark:text-red-400">{task.error}</p>}
|
||||
{done && task.resultPath && <p className="mt-1 text-xs text-green-600 dark:text-green-400">已保存:{task.resultPath}</p>}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{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>}
|
||||
|
||||
<p className="text-xs text-gray-500 dark:text-gray-400">
|
||||
流程:AI 写分镜脚本 → 逐段朗读配音 → 图片逐段配字幕合成 → 拼接成片入库。图片越多耗时越长(约 10–60 秒/张)。
|
||||
</p>
|
||||
|
||||
<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>
|
||||
{!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"
|
||||
>
|
||||
{starting && <Loader2 className="w-4 h-4 animate-spin" />}
|
||||
{starting ? '启动中…' : '一键生成'}
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default AIVideoModal;
|
||||
@@ -0,0 +1,391 @@
|
||||
import { useState, useEffect } from 'react';
|
||||
import { X, Film, Loader2, CheckCircle2, AlertCircle, Link as LinkIcon, FileText, Image as ImageIcon, Sparkles, Search, Check, Settings } from 'lucide-react';
|
||||
import { getToken } from '../api/client';
|
||||
|
||||
const VOICES = [
|
||||
{ key: 'zh-CN-XiaoxiaoNeural', label: '晓晓(女声·自然)' },
|
||||
{ key: 'zh-CN-YunxiNeural', label: '云希(男声·温暖)' },
|
||||
{ key: 'zh-CN-YunjianNeural', label: '云健(男声·浑厚)' },
|
||||
{ key: 'zh-CN-XiaoyiNeural', label: '晓伊(女声·活泼)' },
|
||||
{ key: 'zh-CN-YunyangNeural', label: '云扬(男声·播音)' },
|
||||
];
|
||||
const RESOLUTIONS = [
|
||||
{ key: '1920x1080', label: '横屏 1920×1080' },
|
||||
{ key: '1080x1920', label: '竖屏 1080×1920' },
|
||||
];
|
||||
const SUBTITLE_STYLES = [
|
||||
{ key: 'bottom-center', label: '底部居中', position: 'bottom-center' },
|
||||
{ key: 'top-center', label: '顶部居中', position: 'top-center' },
|
||||
{ key: 'center', label: '画面中央', position: 'center' },
|
||||
];
|
||||
const SUBTITLE_COLORS = [
|
||||
{ key: 'white', label: '白色' },
|
||||
{ key: '#FFD700', label: '金色' },
|
||||
{ key: '#00FFCC', label: '青色' },
|
||||
];
|
||||
const POPULAR_PROMPTS = [
|
||||
'产品功能速览:开头 3 秒抛出用户痛点,逐条演示 3 个核心卖点与真实使用场景,配合界面录屏特写与前后对比,结尾出现品牌名与一句话 slogan,节奏明快,字幕醒目',
|
||||
'周末探店 vlog:从推门进店的第一视角开场,依次拍环境空镜、招牌菜特写、入口咀嚼的满足表情,穿插与店主的简短对话,轻快背景音乐,暖色调,结尾给出店名地址与推荐指数',
|
||||
'知识科普:先用一个反常识的问题抓住注意力,再分三步由浅入深讲解概念,每步配一个生活化类比和简单动画示意,最后用一句话总结并抛出延伸思考,语速适中,重点处放大字幕',
|
||||
'旅行日记:以清晨出发的车窗镜头开场,交替呈现沿途风景大远景、地标建筑仰拍、当地市集人文细节与个人打卡瞬间,配舒缓音乐和游记式旁白,结尾定格日落剪影并标注地点',
|
||||
'健身打卡:开场展示今日训练目标与身材对比,中间分组记录动作特写、重量数据和力竭瞬间,穿插教练指导与呼吸节奏提示,热血鼓点配乐,结尾打出训练总消耗与坚持天数',
|
||||
'美食制作:从食材摆盘的俯拍开场,按备料、烹饪、装盘三阶段推进,关键步骤给慢镜头特写(下锅滋响、拉丝、淋酱),配清晰步骤字幕,结尾成品 360 度展示与口感描述'
|
||||
];
|
||||
|
||||
function errText(e, fb) { if (!e) return fb; if (typeof e === 'string') return e; return e.message || JSON.stringify(e); }
|
||||
|
||||
function thumbUrl(libraryId, img) {
|
||||
const tp = img.thumbnailPath || '';
|
||||
const fn = tp ? tp.replace(/\\/g, '/').split('/').pop() : '';
|
||||
if (fn) return `/api/image/thumbnail/${libraryId}/${encodeURIComponent(fn)}${img.modifiedAt ? `?v=${img.modifiedAt}` : ''}`;
|
||||
return `/api/image/original/${libraryId}/${String(img.path || '').split('/').map(encodeURIComponent).join('/')}`;
|
||||
}
|
||||
|
||||
export default function AIVideoStudioModal({ libraryId, onClose, onDone }) {
|
||||
const [tab, setTab] = useState('prompt');
|
||||
const [title, setTitle] = useState('');
|
||||
const [content, setContent] = useState('');
|
||||
const [url, setUrl] = useState('');
|
||||
const [extracted, setExtracted] = useState(null);
|
||||
const [extracting, setExtracting] = useState(false);
|
||||
const [file, setFile] = useState(null);
|
||||
const [voice, setVoice] = useState(VOICES[0].key);
|
||||
const [resolution, setResolution] = useState('1920x1080');
|
||||
const [subtitlePos, setSubtitlePos] = useState('bottom-center');
|
||||
const [subtitleColor, setSubtitleColor] = useState('white');
|
||||
const [subtitleSize, setSubtitleSize] = useState(5);
|
||||
// 素材库图片选择(弹窗内直接挑选)
|
||||
const [libImgs, setLibImgs] = useState([]);
|
||||
const [libLoading, setLibLoading] = useState(false);
|
||||
const [keyword, setKeyword] = useState('');
|
||||
const [picked, setPicked] = useState([]);
|
||||
const [taskId, setTaskId] = useState('');
|
||||
const [task, setTask] = useState(null);
|
||||
const [error, setError] = useState('');
|
||||
const [starting, setStarting] = useState(false);
|
||||
const timerRef = { current: null };
|
||||
|
||||
const auth = { Authorization: `Bearer ${getToken()}` };
|
||||
|
||||
const loadImages = async (kw) => {
|
||||
setLibLoading(true);
|
||||
try {
|
||||
const q = new URLSearchParams({ libraryId: String(libraryId), offset: '0', limit: '120' });
|
||||
if (kw && kw.trim()) q.set('keywords', kw.trim());
|
||||
const r = await fetch(`/api/image?${q}`, { headers: auth });
|
||||
const d = await r.json();
|
||||
// 只允许图片做视频画面:视频文件当图传给 ffmpeg 会直接报 Option loop not found
|
||||
const VIDEO_EXT = ['mp4', 'mov', 'mkv', 'webm', 'avi', 'm4v', 'flv', 'wmv', 'ts'];
|
||||
setLibImgs(((d && d.data && d.data.images) || []).filter((i) => {
|
||||
if (!i || !i.path) return false;
|
||||
const t = String(i.fileType || i.type || '').toLowerCase();
|
||||
if (t === 'video') return false;
|
||||
const ext = String(i.filename || i.path).split('.').pop().toLowerCase();
|
||||
return !VIDEO_EXT.includes(ext);
|
||||
}));
|
||||
} catch (_) {
|
||||
setLibImgs([]);
|
||||
} finally {
|
||||
setLibLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => { if (libraryId) loadImages(''); }, [libraryId]);
|
||||
|
||||
const togglePick = (img) => {
|
||||
setPicked((list) => {
|
||||
const i = list.findIndex((x) => x.path === img.path);
|
||||
if (i >= 0) return list.filter((x) => x.path !== img.path);
|
||||
return [...list, img];
|
||||
});
|
||||
};
|
||||
|
||||
const poll = (id) => {
|
||||
const iv = setInterval(async () => {
|
||||
try {
|
||||
const r = await fetch(`/api/video/task/${id}`, { headers: { Authorization: `Bearer ${getToken()}` } });
|
||||
if (!r.ok) return;
|
||||
const d = await r.json();
|
||||
setTask(d);
|
||||
if (d.status === 'done' || d.status === 'error') {
|
||||
clearInterval(iv);
|
||||
if (d.status === 'done') setTimeout(() => { onDone && onDone(d.resultPath); onClose(); }, 1200);
|
||||
}
|
||||
} catch (_) {}
|
||||
}, 1500);
|
||||
timerRef.current = iv;
|
||||
};
|
||||
|
||||
const handleExtractUrl = async () => {
|
||||
setExtracting(true); setError('');
|
||||
try {
|
||||
const r = await fetch('/api/video/extract-url', { method: 'POST', headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${getToken()}` }, body: JSON.stringify({ url }) });
|
||||
const d = await r.json();
|
||||
if (!r.ok || d.error) throw new Error(errText(d.error, `失败 (${r.status})`));
|
||||
setExtracted(d);
|
||||
if (!title) setTitle(d.title || '');
|
||||
setContent(d.text || '');
|
||||
} catch (e) { setError(e.message); }
|
||||
finally { setExtracting(false); }
|
||||
};
|
||||
|
||||
const handleExtractDoc = async () => {
|
||||
if (!file) return;
|
||||
setExtracting(true); setError('');
|
||||
try {
|
||||
const fd = new FormData(); fd.append('file', file);
|
||||
const r = await fetch('/api/video/extract-doc', { method: 'POST', headers: { Authorization: `Bearer ${getToken()}` }, body: fd });
|
||||
const d = await r.json();
|
||||
if (!r.ok || d.error) throw new Error(errText(d.error, `失败 (${r.status})`));
|
||||
setExtracted(d);
|
||||
if (!title) setTitle(d.title || '');
|
||||
setContent(d.text || '');
|
||||
} catch (e) { setError(e.message); }
|
||||
finally { setExtracting(false); }
|
||||
};
|
||||
|
||||
const handleStart = async () => {
|
||||
setError('');
|
||||
if (!title.trim()) { setError('请填写视频标题'); return; }
|
||||
if (tab === 'images' && picked.length === 0) { setError('请先在「素材库图片」里选择至少 1 张'); return; }
|
||||
setStarting(true);
|
||||
try {
|
||||
const imgs = picked.length
|
||||
? picked.map((i) => ({ path: i.path, filename: i.filename, width: i.width, height: i.height }))
|
||||
: ((extracted && extracted.images) || []);
|
||||
const body = {
|
||||
libraryId, title: title.trim(),
|
||||
content: content.trim(),
|
||||
images: imgs,
|
||||
voice, resolution, extraPrompt: '',
|
||||
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) });
|
||||
const d = await r.json().catch(() => ({}));
|
||||
if (!r.ok || d.error) throw new Error(errText(d.error, `启动失败 (${r.status})`));
|
||||
setTaskId(d.taskId); poll(d.taskId);
|
||||
} catch (e) { setError(e.message || '启动失败'); }
|
||||
finally { setStarting(false); }
|
||||
};
|
||||
|
||||
const running = !!taskId && task && task.status === 'running';
|
||||
const failed = task && task.status === 'error';
|
||||
const done = task && task.status === 'done';
|
||||
|
||||
const input = 'w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 text-sm focus:ring-2 focus:ring-blue-500 focus:border-transparent';
|
||||
|
||||
return (
|
||||
<div className="fixed inset-0 z-50 bg-black bg-opacity-60 flex items-center justify-center p-4">
|
||||
<div className="bg-white dark:bg-gray-800 rounded-xl shadow-2xl w-[98vw] h-[98vh] max-w-none max-h-none overflow-y-auto" onClick={(e)=>e.stopPropagation()}>
|
||||
<div className="flex items-center justify-between px-5 py-4 border-b border-gray-200 dark:border-gray-700">
|
||||
<div className="flex items-center gap-2">
|
||||
<Film className="w-5 h-5 text-purple-500" />
|
||||
<h2 className="text-lg font-semibold text-gray-900 dark:text-gray-100">AI 一键生成视频</h2>
|
||||
</div>
|
||||
<button onClick={onClose} disabled={running||starting} className="p-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded"><X className="w-5 h-5 text-gray-500" /></button>
|
||||
</div>
|
||||
<div className="p-5 space-y-4">
|
||||
{/* tabs */}
|
||||
<div className="flex gap-2 border-b border-gray-200 dark:border-gray-700 pb-2">
|
||||
{[
|
||||
{ k: 'prompt', l: '提示词', icon: Sparkles },
|
||||
{ k: 'url', l: '链接抓取', icon: LinkIcon },
|
||||
{ k: 'doc', l: '文档/PDF', icon: FileText },
|
||||
{ k: 'images', l: '素材库图片', icon: ImageIcon },
|
||||
].map(({ k, l, icon: Icon }) => (
|
||||
<button key={k} onClick={() => setTab(k)} className={`flex items-center gap-1 px-3 py-1.5 rounded-lg text-sm ${tab===k ? 'bg-purple-600 text-white' : 'bg-gray-100 dark:bg-gray-700 text-gray-700 dark:text-gray-300'}`}>
|
||||
<Icon className="w-4 h-4" /> {l}
|
||||
{k === 'images' && picked.length > 0 && <span className="ml-0.5 text-[10px] px-1 rounded bg-white/25">{picked.length}</span>}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
|
||||
{tab === 'prompt' && (
|
||||
<div className="space-y-3">
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">常用热门提示词</label>
|
||||
<div className="flex flex-wrap gap-2">
|
||||
{POPULAR_PROMPTS.map((p) => (
|
||||
<button key={p} onClick={() => { setContent(p); if (!title) setTitle(p.slice(0, 20)); }} className="px-3 py-1 text-xs rounded-full bg-gray-100 dark:bg-gray-700 text-gray-700 dark:text-gray-300 hover:bg-purple-100 dark:hover:bg-purple-900/40">
|
||||
{p}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">提示词 / 内容</label>
|
||||
<textarea className={input} rows={4} value={content} onChange={(e) => setContent(e.target.value)} placeholder="描述你想要的视频内容…" />
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{tab === 'url' && (
|
||||
<div className="space-y-3">
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">网页链接</label>
|
||||
<div className="flex gap-2">
|
||||
<input className={input} value={url} onChange={(e) => setUrl(e.target.value)} placeholder="https://..." />
|
||||
<button onClick={handleExtractUrl} disabled={extracting || !url} className="px-4 py-2 bg-blue-600 text-white rounded-lg text-sm disabled:opacity-50">
|
||||
{extracting ? '抓取中…' : '抓取'}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
{extracted && <p className="text-xs text-green-600">已抓取:{extracted.title}({extracted.images?.length || 0} 张图)</p>}
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">内容预览</label>
|
||||
<textarea className={input} rows={4} value={content} onChange={(e) => setContent(e.target.value)} />
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{tab === 'doc' && (
|
||||
<div className="space-y-3">
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">上传 PDF / 文档</label>
|
||||
<input type="file" accept=".pdf,.txt,.md,.doc,.docx" onChange={(e) => setFile(e.target.files?.[0] || null)} />
|
||||
<button onClick={handleExtractDoc} disabled={extracting || !file} className="mt-2 px-4 py-2 bg-blue-600 text-white rounded-lg text-sm disabled:opacity-50">
|
||||
{extracting ? '识别中…' : 'AI 识别'}
|
||||
</button>
|
||||
</div>
|
||||
{extracted && <p className="text-xs text-green-600">已识别:{extracted.title}</p>}
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">内容预览</label>
|
||||
<textarea className={input} rows={4} value={content} onChange={(e) => setContent(e.target.value)} />
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{tab === 'images' && (
|
||||
<div className="space-y-3">
|
||||
<div className="flex items-center gap-2">
|
||||
<div className="relative flex-1">
|
||||
<Search className="w-4 h-4 text-gray-400 absolute left-2.5 top-1/2 -translate-y-1/2" />
|
||||
<input
|
||||
className={`${input} pl-8`}
|
||||
value={keyword}
|
||||
onChange={(e) => setKeyword(e.target.value)}
|
||||
onKeyDown={(e) => { if (e.key === 'Enter') loadImages(keyword); }}
|
||||
placeholder="搜索素材库图片(回车)"
|
||||
/>
|
||||
</div>
|
||||
<button onClick={() => loadImages(keyword)} className="px-3 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">搜索</button>
|
||||
{picked.length > 0 && (
|
||||
<button onClick={() => setPicked([])} className="px-3 py-2 text-sm rounded-lg border border-gray-300 dark:border-gray-600 text-gray-500 hover:bg-gray-50 dark:hover:bg-gray-700">清空</button>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="max-h-64 overflow-y-auto rounded-lg border border-gray-200 dark:border-gray-700 bg-gray-50 dark:bg-gray-900/40 p-2">
|
||||
{libLoading && <div className="py-8 text-center text-sm text-gray-500"><Loader2 className="w-4 h-4 animate-spin inline mr-1" />加载图片…</div>}
|
||||
{!libLoading && libImgs.length === 0 && <div className="py-8 text-center text-sm text-gray-500">这个素材库还没有图片</div>}
|
||||
{!libLoading && libImgs.length > 0 && (
|
||||
<div className="grid grid-cols-4 sm:grid-cols-5 gap-2">
|
||||
{libImgs.map((img) => {
|
||||
const on = picked.some((x) => x.path === img.path);
|
||||
return (
|
||||
<button
|
||||
key={img.path}
|
||||
onClick={() => togglePick(img)}
|
||||
title={img.filename || img.path}
|
||||
className={`relative aspect-square rounded-lg overflow-hidden border-2 ${on ? 'border-purple-500 ring-2 ring-purple-300' : 'border-transparent hover:border-gray-300'}`}
|
||||
>
|
||||
<img src={thumbUrl(libraryId, img)} alt={img.filename || ''} className="w-full h-full object-cover" />
|
||||
{on && (
|
||||
<span className="absolute top-1 right-1 w-5 h-5 rounded-full bg-purple-600 text-white flex items-center justify-center">
|
||||
<Check className="w-3.5 h-3.5" />
|
||||
</span>
|
||||
)}
|
||||
{on && (
|
||||
<span className="absolute bottom-0 left-0 right-0 bg-purple-600/85 text-white text-[10px] py-0.5 truncate px-1">
|
||||
#{picked.findIndex((x) => x.path === img.path) + 1}
|
||||
</span>
|
||||
)}
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
<p className="text-xs text-gray-500 dark:text-gray-400">
|
||||
已选 {picked.length} 张(按点击顺序作为画面顺序);不选则按内容自动配图。
|
||||
</p>
|
||||
<textarea className={input} rows={2} value={content} onChange={(e) => setContent(e.target.value)} placeholder="补充说明(可选):想表达的主题、语气…" />
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">视频标题</label>
|
||||
<input className={input} value={title} onChange={(e) => setTitle(e.target.value)} placeholder="例如:产品速览 / 探店 vlog" maxLength={60} disabled={running||done} />
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-2 gap-3">
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">朗读音色</label>
|
||||
<select className={input} value={voice} onChange={(e) => setVoice(e.target.value)} disabled={running||done}>
|
||||
{VOICES.map((v) => <option key={v.key} value={v.key}>{v.label}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">画幅</label>
|
||||
<select className={input} value={resolution} onChange={(e) => setResolution(e.target.value)} disabled={running||done}>
|
||||
{RESOLUTIONS.map((r) => <option key={r.key} value={r.key}>{r.label}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-3 gap-3">
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">字幕位置</label>
|
||||
<select className={input} value={subtitlePos} onChange={(e) => setSubtitlePos(e.target.value)} disabled={running||done}>
|
||||
{SUBTITLE_STYLES.map((s) => <option key={s.key} value={s.key}>{s.label}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">字幕颜色</label>
|
||||
<select className={input} value={subtitleColor} onChange={(e) => setSubtitleColor(e.target.value)} disabled={running||done}>
|
||||
{SUBTITLE_COLORS.map((c) => <option key={c.key} value={c.key}>{c.label}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">字幕字号</label>
|
||||
<input type="range" min={3} max={8} value={subtitleSize} onChange={(e) => setSubtitleSize(parseInt(e.target.value))} disabled={running||done} className="w-full" />
|
||||
</div>
|
||||
</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>
|
||||
</div>
|
||||
|
||||
{(running || done || failed) && (
|
||||
<div className={`rounded-lg border px-4 py-3 ${failed ? 'border-red-200 bg-red-50 dark:bg-red-900/20' : done ? 'border-green-200 bg-green-50 dark:bg-green-900/20' : 'border-blue-200 bg-blue-50 dark:bg-blue-900/20'}`}>
|
||||
<div className="flex items-center gap-2 text-sm">
|
||||
{failed ? <AlertCircle className="w-4 h-4 text-red-500" /> : done ? <CheckCircle2 className="w-4 h-4 text-green-500" /> : <Loader2 className="w-4 h-4 animate-spin text-blue-500" />}
|
||||
<span className={`font-medium ${failed ? 'text-red-700 dark:text-red-300' : done ? 'text-green-700 dark:text-green-300' : 'text-blue-700 dark:text-blue-300'}`}>
|
||||
{failed ? '生成失败' : done ? '生成完成' : (task?.stepLabel || '处理中')}
|
||||
</span>
|
||||
{running && <span className="ml-auto text-xs text-blue-600 dark:text-blue-300">{task?.progress || 0}%</span>}
|
||||
</div>
|
||||
{running && <div className="mt-2 h-1.5 bg-blue-100 dark:bg-blue-900/50 rounded-full overflow-hidden"><div className="h-full bg-blue-500 rounded-full transition-all" style={{ width: `${task?.progress || 0}%` }} /></div>}
|
||||
{failed && <p className="mt-1 text-xs text-red-600 dark:text-red-400">{task?.error}</p>}
|
||||
{done && task?.resultPath && <p className="mt-1 text-xs text-green-600 dark:text-green-400">已保存:{task.resultPath}</p>}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{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>
|
||||
{!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">
|
||||
{starting && <Loader2 className="w-4 h-4 animate-spin" />}
|
||||
{starting ? '启动中…' : '一键生成'}
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
import { useEffect, useState, useCallback } from 'react';
|
||||
import { Rocket } from 'lucide-react';
|
||||
|
||||
/**
|
||||
* 返回顶部小火箭(右下角)
|
||||
* 兼容两种滚动容器:react-window 虚拟列表(内部滚动)和普通 overflow-y-auto 容器。
|
||||
*/
|
||||
function findScrolledElement() {
|
||||
const all = document.querySelectorAll('*');
|
||||
let best = null;
|
||||
let bestTop = 0;
|
||||
for (const el of all) {
|
||||
const style = window.getComputedStyle(el);
|
||||
const scrollable = (style.overflowY === 'auto' || style.overflowY === 'scroll') && el.scrollHeight > el.clientHeight + 4;
|
||||
if (scrollable && el.scrollTop > bestTop) {
|
||||
bestTop = el.scrollTop;
|
||||
best = el;
|
||||
}
|
||||
}
|
||||
return bestTop > 0 ? best : null;
|
||||
}
|
||||
|
||||
function BackToTop() {
|
||||
const [visible, setVisible] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
const onScroll = () => {
|
||||
const el = findScrolledElement();
|
||||
const top = el ? el.scrollTop : (window.scrollY || document.documentElement.scrollTop || 0);
|
||||
setVisible(top > 300);
|
||||
};
|
||||
onScroll();
|
||||
window.addEventListener('scroll', onScroll, true);
|
||||
window.addEventListener('resize', onScroll);
|
||||
const timer = setInterval(onScroll, 1500);
|
||||
return () => {
|
||||
window.removeEventListener('scroll', onScroll, true);
|
||||
window.removeEventListener('resize', onScroll);
|
||||
clearInterval(timer);
|
||||
};
|
||||
}, []);
|
||||
|
||||
const scrollToTop = useCallback(() => {
|
||||
const el = findScrolledElement();
|
||||
if (el) el.scrollTo({ top: 0, behavior: 'smooth' });
|
||||
window.scrollTo({ top: 0, behavior: 'smooth' });
|
||||
document.documentElement.scrollTo({ top: 0, behavior: 'smooth' });
|
||||
}, []);
|
||||
|
||||
if (!visible) return null;
|
||||
|
||||
return (
|
||||
<button
|
||||
onClick={scrollToTop}
|
||||
title="返回顶部"
|
||||
aria-label="返回顶部"
|
||||
className="fixed bottom-20 md:bottom-6 right-4 md:right-6 z-40 w-12 h-12 rounded-full bg-blue-600 hover:bg-blue-700 text-white shadow-lg shadow-blue-600/40 hover:shadow-blue-600/60 flex items-center justify-center transition-all hover:-translate-y-0.5 active:translate-y-0"
|
||||
>
|
||||
<Rocket size={22} className="-rotate-45" />
|
||||
</button>
|
||||
);
|
||||
}
|
||||
|
||||
export default BackToTop;
|
||||
@@ -0,0 +1,430 @@
|
||||
import { useState, useEffect, useRef, useCallback } from 'react';
|
||||
import { Replace, Loader2, X, Play, Square, CheckCircle2, AlertTriangle, ArrowRight } from 'lucide-react';
|
||||
import { batchAPI } from '../api';
|
||||
|
||||
/**
|
||||
* 批量重命名弹窗(文件夹级)
|
||||
* 模式:
|
||||
* prefix 前缀添加 —— 在原文件名前加文本
|
||||
* suffix 后缀添加 —— 在原文件名后加文本
|
||||
* replace 全部改名 —— 原文件名整体替换为文本(同目录多个文件自动加序号 -001)
|
||||
*
|
||||
* 流程:配置(实时预览)→ 启动任务(立即返回 taskId)→ 1s 轮询进度 → 完成/取消
|
||||
*/
|
||||
|
||||
const MODES = [
|
||||
{ key: 'prefix', label: '前面加', desc: '在原文件名前加文本', hint: '文本 + 原文件名 + 扩展名' },
|
||||
{ key: 'suffix', label: '后面加', desc: '在原文件名后加文本', hint: '原文件名 + 文本 + 扩展名' },
|
||||
{ key: 'replace', label: '全部改名', desc: '原文件名替换为文本', hint: '同目录多个文件自动编号:文本-001、文本-002…' },
|
||||
{ key: 'keyword', label: '关键词替换', desc: '替换文件名中的关键词', hint: '把文件名中的「找什么」全部换成「替换成」,替换成留空 = 删除该关键词' }
|
||||
];
|
||||
|
||||
const ILLEGAL_RE = /[\\/:*?"<>|]/;
|
||||
|
||||
function BatchRenameModal({ isOpen, folder, libraryId, scope, keywords, onClose, onFinished }) {
|
||||
const [phase, setPhase] = useState('config'); // config | running | done
|
||||
const [mode, setMode] = useState('prefix');
|
||||
const [text, setText] = useState('');
|
||||
const [find, setFind] = useState('');
|
||||
const [includeSubdirs, setIncludeSubdirs] = useState(true);
|
||||
const [preview, setPreview] = useState(null); // { count, total, samples, skipped }
|
||||
const [previewErr, setPreviewErr] = useState('');
|
||||
const [starting, setStarting] = useState(false);
|
||||
const [error, setError] = useState('');
|
||||
|
||||
const [taskId, setTaskId] = useState(null);
|
||||
const [progress, setProgress] = useState(null);
|
||||
const pollRef = useRef(null);
|
||||
const previewTimerRef = useRef(null);
|
||||
|
||||
const stopPolling = useCallback(() => {
|
||||
if (pollRef.current) {
|
||||
clearInterval(pollRef.current);
|
||||
pollRef.current = null;
|
||||
}
|
||||
}, []);
|
||||
|
||||
// 打开时重置
|
||||
useEffect(() => {
|
||||
if (!isOpen) return;
|
||||
setPhase('config');
|
||||
setMode('prefix');
|
||||
setText('');
|
||||
setFind('');
|
||||
setIncludeSubdirs(true);
|
||||
setPreview(null);
|
||||
setPreviewErr('');
|
||||
setError('');
|
||||
setTaskId(null);
|
||||
setProgress(null);
|
||||
setStarting(false);
|
||||
return () => stopPolling();
|
||||
}, [isOpen, stopPolling]);
|
||||
|
||||
// 实时预览(防抖 300ms)
|
||||
const needInput = mode === 'keyword' ? find.trim() : text.trim();
|
||||
useEffect(() => {
|
||||
if (!isOpen || phase !== 'config') return;
|
||||
if (previewTimerRef.current) clearTimeout(previewTimerRef.current);
|
||||
if (!needInput) {
|
||||
setPreview(null);
|
||||
setPreviewErr('');
|
||||
return;
|
||||
}
|
||||
previewTimerRef.current = setTimeout(async () => {
|
||||
try {
|
||||
const resp = await batchAPI.renamePreview({
|
||||
libraryId, folder, scope, keywords,
|
||||
options: { mode, text: text.trim(), find: find.trim(), keywords: keywords || undefined, includeSubdirs }
|
||||
});
|
||||
setPreview(resp);
|
||||
setPreviewErr('');
|
||||
} catch (err) {
|
||||
setPreview(null);
|
||||
setPreviewErr(err?.message || '预览失败');
|
||||
}
|
||||
}, 300);
|
||||
return () => { if (previewTimerRef.current) clearTimeout(previewTimerRef.current); };
|
||||
}, [isOpen, phase, mode, text, find, includeSubdirs, libraryId, folder, scope, keywords, needInput]);
|
||||
|
||||
const startPolling = useCallback((id) => {
|
||||
stopPolling();
|
||||
pollRef.current = setInterval(async () => {
|
||||
try {
|
||||
const s = await batchAPI.status(id);
|
||||
setProgress(s);
|
||||
if (s.status !== 'running') {
|
||||
stopPolling();
|
||||
setPhase('done');
|
||||
onFinished?.(s);
|
||||
}
|
||||
} catch (_) { /* 网络抖动,继续轮询 */ }
|
||||
}, 1000);
|
||||
}, [stopPolling, onFinished]);
|
||||
|
||||
const handleStart = async () => {
|
||||
setError('');
|
||||
const t = text.trim();
|
||||
const f = find.trim();
|
||||
if (mode === 'keyword') {
|
||||
if (!f) {
|
||||
setError('请填写要查找的关键词');
|
||||
return;
|
||||
}
|
||||
if (ILLEGAL_RE.test(f)) {
|
||||
setError('关键词包含文件名非法字符 \\ / : * ? " < > |');
|
||||
return;
|
||||
}
|
||||
if (ILLEGAL_RE.test(t)) {
|
||||
setError('替换文本包含文件名非法字符 \\ / : * ? " < > |');
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
if (!t) {
|
||||
setError('请输入重命名文本');
|
||||
return;
|
||||
}
|
||||
if (ILLEGAL_RE.test(t)) {
|
||||
setError('文本包含文件名非法字符 \\ / : * ? " < > |');
|
||||
return;
|
||||
}
|
||||
}
|
||||
setStarting(true);
|
||||
try {
|
||||
const resp = await batchAPI.start({
|
||||
libraryId, folder, scope, keywords, type: 'rename',
|
||||
options: { mode, text: t, find: f, keywords: keywords || undefined, includeSubdirs }
|
||||
});
|
||||
setTaskId(resp.taskId);
|
||||
setPhase('running');
|
||||
setProgress({
|
||||
status: 'running', total: resp.total, done: 0, failed: 0,
|
||||
skipped: 0, current: '', errors: []
|
||||
});
|
||||
startPolling(resp.taskId);
|
||||
} catch (err) {
|
||||
setError(err?.message || '启动失败');
|
||||
} finally {
|
||||
setStarting(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleCancel = async () => {
|
||||
if (!taskId) return;
|
||||
try { await batchAPI.cancel(taskId); } catch (_) { /* 已结束 */ }
|
||||
stopPolling();
|
||||
setPhase('done');
|
||||
};
|
||||
|
||||
const handleClose = () => {
|
||||
stopPolling();
|
||||
onClose();
|
||||
};
|
||||
|
||||
if (!isOpen) return null;
|
||||
|
||||
const pct = progress && progress.total > 0
|
||||
? Math.round(((progress.done + progress.failed + progress.skipped) / progress.total) * 100)
|
||||
: 0;
|
||||
const modeInfo = MODES.find((m) => m.key === mode);
|
||||
|
||||
return (
|
||||
<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/50 p-4">
|
||||
<div
|
||||
className="bg-white dark:bg-gray-800 rounded-xl shadow-2xl w-full max-w-xl max-h-[90vh] overflow-hidden flex flex-col"
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
>
|
||||
{/* 头部 */}
|
||||
<div className="flex items-center justify-between px-5 py-4 border-b border-gray-200 dark:border-gray-700">
|
||||
<div className="flex items-center gap-2.5">
|
||||
<Replace className="w-5 h-5 text-violet-500" />
|
||||
<h2 className="text-lg font-semibold text-gray-900 dark:text-white">批量重命名文件</h2>
|
||||
<span className="text-xs px-2 py-0.5 rounded-full bg-gray-100 dark:bg-gray-700 text-gray-600 dark:text-gray-300 truncate max-w-[240px]">
|
||||
{scope === 'search' ? `搜索:${keywords}` : folder}
|
||||
</span>
|
||||
</div>
|
||||
<button onClick={handleClose} className="p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-700">
|
||||
<X className="w-5 h-5 text-gray-500" />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* 内容 */}
|
||||
<div className="flex-1 overflow-y-auto p-5">
|
||||
{phase === 'config' && (
|
||||
<>
|
||||
{/* 重命名模式 */}
|
||||
<div className="mb-4">
|
||||
<div className="text-xs font-medium text-gray-500 dark:text-gray-400 mb-1.5">重命名方式</div>
|
||||
<div className="grid grid-cols-2 gap-2">
|
||||
{MODES.map((m) => (
|
||||
<button
|
||||
key={m.key}
|
||||
onClick={() => setMode(m.key)}
|
||||
className={`px-3 py-2.5 rounded-lg text-sm border transition-colors ${mode === m.key
|
||||
? 'border-violet-500 bg-violet-50 dark:bg-violet-900/40 text-violet-600 dark:text-violet-300 font-medium'
|
||||
: 'border-gray-300 dark:border-gray-600 text-gray-600 dark:text-gray-300 hover:border-gray-400'}`}
|
||||
>
|
||||
<div>{m.label}</div>
|
||||
<div className="text-[10px] font-normal opacity-70 mt-0.5">{m.desc}</div>
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
<div className="text-[11px] text-gray-400 dark:text-gray-500 mt-1.5">
|
||||
规则:{modeInfo.hint}(扩展名始终保留)
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* 文本输入 */}
|
||||
{mode === 'keyword' ? (
|
||||
<div className="mb-4">
|
||||
<div className="text-xs font-medium text-gray-500 dark:text-gray-400 mb-1.5">关键词</div>
|
||||
<input
|
||||
type="text"
|
||||
value={find}
|
||||
onChange={(e) => setFind(e.target.value)}
|
||||
placeholder="找什么:要被替换的文件名关键词,例如:素材"
|
||||
maxLength={100}
|
||||
autoFocus
|
||||
className="w-full px-3 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-700 text-gray-900 dark:text-white text-sm focus:outline-none focus:ring-2 focus:ring-violet-500"
|
||||
/>
|
||||
{ILLEGAL_RE.test(find) && (
|
||||
<div className="text-[11px] text-red-500 mt-1">关键词包含文件名非法字符 \ / : * ? " < > |</div>
|
||||
)}
|
||||
<div className="text-xs font-medium text-gray-500 dark:text-gray-400 mb-1.5 mt-3">替换成</div>
|
||||
<input
|
||||
type="text"
|
||||
value={text}
|
||||
onChange={(e) => setText(e.target.value)}
|
||||
placeholder="替换成:留空 = 直接删除该关键词,例如:视频"
|
||||
maxLength={100}
|
||||
className="w-full px-3 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-700 text-gray-900 dark:text-white text-sm focus:outline-none focus:ring-2 focus:ring-violet-500"
|
||||
/>
|
||||
{ILLEGAL_RE.test(text) && (
|
||||
<div className="text-[11px] text-red-500 mt-1">替换文本包含文件名非法字符 \ / : * ? " < > |</div>
|
||||
)}
|
||||
</div>
|
||||
) : (
|
||||
<div className="mb-4">
|
||||
<div className="text-xs font-medium text-gray-500 dark:text-gray-400 mb-1.5">文本内容</div>
|
||||
<input
|
||||
type="text"
|
||||
value={text}
|
||||
onChange={(e) => setText(e.target.value)}
|
||||
placeholder={mode === 'replace' ? '例如:风景素材(全部文件改为 风景素材-001.jpg …)' : '例如:2026_'}
|
||||
maxLength={100}
|
||||
autoFocus
|
||||
className="w-full px-3 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-700 text-gray-900 dark:text-white text-sm focus:outline-none focus:ring-2 focus:ring-violet-500"
|
||||
/>
|
||||
{ILLEGAL_RE.test(text) && (
|
||||
<div className="text-[11px] text-red-500 mt-1">包含文件名非法字符 \ / : * ? " < > |</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 包含子目录(搜索范围时全库命中,无需此开关) */}
|
||||
{scope !== 'search' && (
|
||||
<label className="flex items-center gap-2 mb-4 cursor-pointer select-none">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={includeSubdirs}
|
||||
onChange={(e) => setIncludeSubdirs(e.target.checked)}
|
||||
className="w-4 h-4 rounded accent-violet-500"
|
||||
/>
|
||||
<span className="text-sm text-gray-700 dark:text-gray-300">包含子目录(递归处理所有层级文件)</span>
|
||||
</label>
|
||||
)}
|
||||
|
||||
{/* 实时预览 */}
|
||||
<div className="rounded-lg border border-gray-200 dark:border-gray-700 bg-gray-50 dark:bg-gray-900/50 p-3">
|
||||
<div className="text-xs font-medium text-gray-500 dark:text-gray-400 mb-2">预览</div>
|
||||
{!needInput && (
|
||||
<div className="text-[11px] text-gray-400">{mode === 'keyword' ? '输入关键词后显示改名效果' : '输入文本后显示改名效果'}</div>
|
||||
)}
|
||||
{needInput && previewErr && (
|
||||
<div className="text-[11px] text-red-500">{previewErr}</div>
|
||||
)}
|
||||
{needInput && !previewErr && !preview && (
|
||||
<div className="text-[11px] text-gray-400 flex items-center gap-1.5">
|
||||
<Loader2 className="w-3 h-3 animate-spin" /> 计算中…
|
||||
</div>
|
||||
)}
|
||||
{preview && (
|
||||
<>
|
||||
<div className="text-[11px] text-gray-600 dark:text-gray-300 mb-2">
|
||||
将重命名 <b className="text-violet-500">{preview.count}</b> 个文件
|
||||
{preview.skipped > 0 && <span className="text-gray-400">({preview.skipped} 个跳过)</span>}
|
||||
{!includeSubdirs && <span className="text-gray-400">,仅当前文件夹</span>}
|
||||
</div>
|
||||
<div className="space-y-1">
|
||||
{preview.samples.map((s, i) => (
|
||||
<div key={i} className="flex items-center gap-2 text-[11px] font-mono">
|
||||
<span className="text-gray-500 dark:text-gray-400 truncate max-w-[45%]">{s.from}</span>
|
||||
<ArrowRight className="w-3 h-3 text-violet-400 flex-shrink-0" />
|
||||
<span className="text-violet-500 truncate">{s.to}</span>
|
||||
</div>
|
||||
))}
|
||||
{preview.total > preview.samples.length && (
|
||||
<div className="text-[10px] text-gray-400 pt-0.5">
|
||||
…共 {preview.total} 条
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{error && (
|
||||
<div className="mt-3 flex items-center gap-2 text-sm text-red-500">
|
||||
<AlertTriangle className="w-4 h-4" /> {error}
|
||||
</div>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
|
||||
{phase === 'running' && (
|
||||
<div className="py-4">
|
||||
<div className="flex items-center justify-between text-sm text-gray-600 dark:text-gray-300 mb-2">
|
||||
<span className="flex items-center gap-2">
|
||||
<Loader2 className="w-4 h-4 animate-spin text-violet-500" />
|
||||
重命名中 {progress ? `${progress.done + progress.failed + progress.skipped}/${progress.total}` : ''}
|
||||
</span>
|
||||
<span className="tabular-nums">{pct}%</span>
|
||||
</div>
|
||||
<div className="h-2 rounded-full bg-gray-200 dark:bg-gray-700 overflow-hidden">
|
||||
<div className="h-full bg-violet-500 transition-all" style={{ width: `${pct}%` }} />
|
||||
</div>
|
||||
{progress?.current && (
|
||||
<div className="mt-2 text-[11px] text-gray-400 truncate">{progress.current}</div>
|
||||
)}
|
||||
<div className="flex justify-center mt-5">
|
||||
<button
|
||||
onClick={handleCancel}
|
||||
className="px-4 py-2 rounded-lg text-sm border border-gray-300 dark:border-gray-600 text-gray-600 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 flex items-center gap-2"
|
||||
>
|
||||
<Square className="w-3.5 h-3.5" /> 停止(已完成的保留)
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{phase === 'done' && (
|
||||
<div className="py-4">
|
||||
<div className="flex items-center gap-2 mb-4">
|
||||
<CheckCircle2 className="w-5 h-5 text-emerald-500" />
|
||||
<span className="text-sm font-medium text-gray-900 dark:text-white">
|
||||
{progress?.status === 'cancelled' ? '已停止' : '重命名完成'}
|
||||
</span>
|
||||
</div>
|
||||
<div className="grid grid-cols-3 gap-3 text-center">
|
||||
<div className="rounded-lg bg-emerald-50 dark:bg-emerald-900/30 p-3">
|
||||
<div className="text-xl font-semibold text-emerald-600 dark:text-emerald-300 tabular-nums">{progress?.done ?? 0}</div>
|
||||
<div className="text-[11px] text-gray-500 dark:text-gray-400">已重命名</div>
|
||||
</div>
|
||||
<div className="rounded-lg bg-gray-100 dark:bg-gray-700/60 p-3">
|
||||
<div className="text-xl font-semibold text-gray-600 dark:text-gray-300 tabular-nums">{progress?.skipped ?? 0}</div>
|
||||
<div className="text-[11px] text-gray-500 dark:text-gray-400">已跳过</div>
|
||||
</div>
|
||||
<div className="rounded-lg bg-red-50 dark:bg-red-900/30 p-3">
|
||||
<div className="text-xl font-semibold text-red-600 dark:text-red-300 tabular-nums">{progress?.failed ?? 0}</div>
|
||||
<div className="text-[11px] text-gray-500 dark:text-gray-400">失败</div>
|
||||
</div>
|
||||
</div>
|
||||
{progress?.errors?.length > 0 && (
|
||||
<div className="mt-4 rounded-lg border border-red-200 dark:border-red-800 bg-red-50 dark:bg-red-900/20 p-3">
|
||||
<div className="text-xs font-medium text-red-600 dark:text-red-300 mb-1.5">失败明细</div>
|
||||
<div className="space-y-1">
|
||||
{progress.errors.slice(0, 8).map((e, i) => (
|
||||
<div key={i} className="text-[11px] text-red-500 dark:text-red-400 font-mono truncate">
|
||||
{e.path}: {e.error}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* 底部按钮 */}
|
||||
<div className="px-5 py-4 border-t border-gray-200 dark:border-gray-700 flex justify-end gap-2.5">
|
||||
{phase === 'config' && (
|
||||
<>
|
||||
<button
|
||||
onClick={handleClose}
|
||||
className="px-4 py-2 rounded-lg text-sm border border-gray-300 dark:border-gray-600 text-gray-600 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700"
|
||||
>
|
||||
取消
|
||||
</button>
|
||||
<button
|
||||
onClick={handleStart}
|
||||
disabled={starting || !text.trim() || ILLEGAL_RE.test(text)}
|
||||
className="px-4 py-2 rounded-lg text-sm bg-violet-500 hover:bg-violet-600 text-white flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed"
|
||||
>
|
||||
{starting ? <Loader2 className="w-4 h-4 animate-spin" /> : <Play className="w-4 h-4" />}
|
||||
开始重命名{preview ? `(${preview.count} 个)` : ''}
|
||||
</button>
|
||||
</>
|
||||
)}
|
||||
{phase === 'running' && (
|
||||
<button
|
||||
onClick={handleCancel}
|
||||
className="px-4 py-2 rounded-lg text-sm border border-gray-300 dark:border-gray-600 text-gray-600 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700"
|
||||
>
|
||||
停止
|
||||
</button>
|
||||
)}
|
||||
{phase === 'done' && (
|
||||
<button
|
||||
onClick={handleClose}
|
||||
className="px-4 py-2 rounded-lg text-sm bg-violet-500 hover:bg-violet-600 text-white"
|
||||
>
|
||||
完成
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default BatchRenameModal;
|
||||
@@ -0,0 +1,556 @@
|
||||
import { useState, useEffect, useRef, useCallback } from 'react';
|
||||
import {
|
||||
Droplets, Eraser, Loader2, X, Play, Square, CheckCircle2,
|
||||
AlertTriangle, Save, FileEdit, Eye
|
||||
} from 'lucide-react';
|
||||
import { batchAPI, imageAPI } from '../api';
|
||||
|
||||
/**
|
||||
* 批量水印弹窗(文件夹级)
|
||||
* mode='add' 批量加水印:文字水印(九宫格单个 / 平铺)
|
||||
* mode='remove' 批量去水印:按百分比区域生成 mask → 后端 LaMa inpaint
|
||||
*
|
||||
* 流程:配置 → 启动任务(立即返回 taskId)→ 1s 轮询进度 → 完成/取消
|
||||
*/
|
||||
|
||||
// 九宫格位置(与后端 makeWatermarkSvg 的 pos 规则一致)
|
||||
const POSITIONS = [
|
||||
['top-left', 'top-center', 'top-right'],
|
||||
['middle-left', 'middle-center', 'middle-right'],
|
||||
['bottom-left', 'bottom-center', 'bottom-right']
|
||||
];
|
||||
const POSITION_LABEL = {
|
||||
'top-left': '左上', 'top-center': '顶部', 'top-right': '右上',
|
||||
'middle-left': '左侧', 'middle-center': '居中', 'middle-right': '右侧',
|
||||
'bottom-left': '左下', 'bottom-center': '底部', 'bottom-right': '右下'
|
||||
};
|
||||
|
||||
// 去水印预设区域(百分比)
|
||||
const REGION_PRESETS = [
|
||||
{ key: 'bottom-right', label: '右下角', region: { x: 68, y: 86, w: 30, h: 11 } },
|
||||
{ key: 'bottom-left', label: '左下角', region: { x: 2, y: 86, w: 30, h: 11 } },
|
||||
{ key: 'top-right', label: '右上角', region: { x: 68, y: 3, w: 30, h: 11 } },
|
||||
{ key: 'top-left', label: '左上角', region: { x: 2, y: 3, w: 30, h: 11 } },
|
||||
{ key: 'center', label: '画面居中', region: { x: 35, y: 42, w: 30, h: 16 } },
|
||||
{ key: 'bottom-bar', label: '底部横条', region: { x: 0, y: 88, w: 100, h: 11 } },
|
||||
{ key: 'right-bar', label: '右侧竖条', region: { x: 85, y: 0, w: 15, h: 100 } },
|
||||
{ key: 'custom', label: '自定义', region: null }
|
||||
];
|
||||
|
||||
const clampPct = (v) => Math.max(0, Math.min(100, Number(v) || 0));
|
||||
|
||||
function Field({ label, children, hint }) {
|
||||
return (
|
||||
<div className="mb-4">
|
||||
<div className="text-xs font-medium text-gray-500 dark:text-gray-400 mb-1.5">{label}</div>
|
||||
{children}
|
||||
{hint && <div className="text-[11px] text-gray-400 dark:text-gray-500 mt-1">{hint}</div>}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function Slider({ value, onChange, min, max, step = 1, suffix = '' }) {
|
||||
return (
|
||||
<div className="flex items-center gap-3">
|
||||
<input
|
||||
type="range"
|
||||
className="flex-1 accent-blue-500"
|
||||
value={value}
|
||||
min={min}
|
||||
max={max}
|
||||
step={step}
|
||||
onChange={(e) => onChange(Number(e.target.value))}
|
||||
/>
|
||||
<span className="text-xs text-gray-600 dark:text-gray-300 w-12 text-right tabular-nums">
|
||||
{value}{suffix}
|
||||
</span>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function BatchWatermarkModal({ isOpen, mode, folder, libraryId, onClose, onFinished }) {
|
||||
const [phase, setPhase] = useState('config'); // config | running | done
|
||||
const [imageCount, setImageCount] = useState(0);
|
||||
const [starting, setStarting] = useState(false);
|
||||
const [error, setError] = useState('');
|
||||
|
||||
// 加水印配置
|
||||
const [text, setText] = useState('');
|
||||
const [tile, setTile] = useState(false);
|
||||
const [position, setPosition] = useState('bottom-right');
|
||||
const [fontSizePct, setFontSizePct] = useState(4);
|
||||
const [opacity, setOpacity] = useState(50);
|
||||
const [color, setColor] = useState('#ffffff');
|
||||
const [marginPct, setMarginPct] = useState(2);
|
||||
const [rotate, setRotate] = useState(-30);
|
||||
const [stroke, setStroke] = useState(true);
|
||||
|
||||
// 去水印配置
|
||||
const [presetKey, setPresetKey] = useState('bottom-right');
|
||||
const [region, setRegion] = useState({ x: 68, y: 86, w: 30, h: 11 });
|
||||
|
||||
// 输出方式
|
||||
const [output, setOutput] = useState('overwrite');
|
||||
|
||||
// 任务进度
|
||||
const [taskId, setTaskId] = useState(null);
|
||||
const [progress, setProgress] = useState(null);
|
||||
const pollRef = useRef(null);
|
||||
|
||||
// 打开时重置 + 取图片数
|
||||
useEffect(() => {
|
||||
if (!isOpen) return;
|
||||
setPhase('config');
|
||||
setError('');
|
||||
setTaskId(null);
|
||||
setProgress(null);
|
||||
setStarting(false);
|
||||
setOutput('overwrite');
|
||||
if (mode === 'remove') {
|
||||
setPresetKey('bottom-right');
|
||||
setRegion({ x: 68, y: 86, w: 30, h: 11 });
|
||||
}
|
||||
let cancelled = false;
|
||||
(async () => {
|
||||
try {
|
||||
const resp = await imageAPI.getCount(libraryId, { folder });
|
||||
if (!cancelled) setImageCount(resp.count ?? 0);
|
||||
} catch (_) {
|
||||
if (!cancelled) setImageCount(0);
|
||||
}
|
||||
})();
|
||||
return () => { cancelled = true; };
|
||||
}, [isOpen, mode, folder, libraryId]);
|
||||
|
||||
// 停止轮询
|
||||
const stopPolling = useCallback(() => {
|
||||
if (pollRef.current) {
|
||||
clearInterval(pollRef.current);
|
||||
pollRef.current = null;
|
||||
}
|
||||
}, []);
|
||||
|
||||
useEffect(() => stopPolling, [stopPolling]);
|
||||
|
||||
const startPolling = useCallback((id) => {
|
||||
stopPolling();
|
||||
pollRef.current = setInterval(async () => {
|
||||
try {
|
||||
const s = await batchAPI.status(id);
|
||||
setProgress(s);
|
||||
if (s.status !== 'running') {
|
||||
stopPolling();
|
||||
setPhase('done');
|
||||
onFinished?.(s);
|
||||
}
|
||||
} catch (_) {
|
||||
/* 网络抖动,继续轮询 */
|
||||
}
|
||||
}, 1000);
|
||||
}, [stopPolling, onFinished]);
|
||||
|
||||
const handleStart = async () => {
|
||||
setError('');
|
||||
if (mode === 'add' && !text.trim()) {
|
||||
setError('请输入水印文字');
|
||||
return;
|
||||
}
|
||||
setStarting(true);
|
||||
try {
|
||||
const payload = { libraryId, folder, type: mode, output };
|
||||
payload.options = mode === 'add'
|
||||
? { text: text.trim(), tile, position, fontSizePct, opacity, color, marginPct, rotate, stroke }
|
||||
: { region };
|
||||
const resp = await batchAPI.start(payload);
|
||||
setTaskId(resp.taskId);
|
||||
setPhase('running');
|
||||
setProgress({
|
||||
status: 'running', total: resp.total, done: 0, failed: 0,
|
||||
skipped: 0, current: '', errors: []
|
||||
});
|
||||
startPolling(resp.taskId);
|
||||
} catch (err) {
|
||||
setError(err?.message || '启动失败');
|
||||
} finally {
|
||||
setStarting(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleCancel = async () => {
|
||||
if (!taskId) return;
|
||||
try {
|
||||
await batchAPI.cancel(taskId);
|
||||
} catch (_) { /* 任务可能已结束 */ }
|
||||
stopPolling();
|
||||
setPhase('done');
|
||||
};
|
||||
|
||||
const handleClose = () => {
|
||||
stopPolling();
|
||||
onClose();
|
||||
};
|
||||
|
||||
if (!isOpen) return null;
|
||||
|
||||
const isAdd = mode === 'add';
|
||||
const title = isAdd ? '批量加水印' : '批量去水印';
|
||||
const Icon = isAdd ? Droplets : Eraser;
|
||||
const accent = isAdd ? 'text-blue-500' : 'text-emerald-500';
|
||||
const accentBtn = isAdd ? 'bg-blue-500 hover:bg-blue-600' : 'bg-emerald-500 hover:bg-emerald-600';
|
||||
|
||||
const pct = progress && progress.total > 0
|
||||
? Math.round(((progress.done + progress.failed + progress.skipped) / progress.total) * 100)
|
||||
: 0;
|
||||
|
||||
return (
|
||||
<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/50 p-4">
|
||||
<div
|
||||
className="bg-white dark:bg-gray-800 rounded-xl shadow-2xl w-full max-w-2xl max-h-[90vh] overflow-hidden flex flex-col"
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
>
|
||||
{/* 头部 */}
|
||||
<div className="flex items-center justify-between px-5 py-4 border-b border-gray-200 dark:border-gray-700">
|
||||
<div className="flex items-center gap-2.5">
|
||||
<Icon className={`w-5 h-5 ${accent}`} />
|
||||
<h2 className="text-lg font-semibold text-gray-900 dark:text-white">{title}</h2>
|
||||
<span className="text-xs px-2 py-0.5 rounded-full bg-gray-100 dark:bg-gray-700 text-gray-600 dark:text-gray-300 truncate max-w-[240px]">
|
||||
{folder}
|
||||
</span>
|
||||
<span className="text-xs text-gray-400">{imageCount} 个文件</span>
|
||||
</div>
|
||||
<button onClick={handleClose} className="p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-700">
|
||||
<X className="w-5 h-5 text-gray-500" />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* 内容 */}
|
||||
<div className="flex-1 overflow-y-auto p-5">
|
||||
{phase === 'config' && (
|
||||
<>
|
||||
{isAdd ? (
|
||||
<>
|
||||
<Field label="水印文字">
|
||||
<input
|
||||
type="text"
|
||||
value={text}
|
||||
onChange={(e) => setText(e.target.value)}
|
||||
placeholder="例如:素材室出品"
|
||||
maxLength={50}
|
||||
className="w-full px-3 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-700 text-gray-900 dark:text-white text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
|
||||
/>
|
||||
</Field>
|
||||
|
||||
<Field label="水印形式">
|
||||
<div className="flex gap-2">
|
||||
<button
|
||||
onClick={() => setTile(false)}
|
||||
className={`flex-1 px-3 py-2 rounded-lg text-sm border transition-colors ${!tile
|
||||
? 'border-blue-500 bg-blue-50 dark:bg-blue-900/40 text-blue-600 dark:text-blue-300'
|
||||
: 'border-gray-300 dark:border-gray-600 text-gray-600 dark:text-gray-300'}`}
|
||||
>
|
||||
单个水印
|
||||
</button>
|
||||
<button
|
||||
onClick={() => setTile(true)}
|
||||
className={`flex-1 px-3 py-2 rounded-lg text-sm border transition-colors ${tile
|
||||
? 'border-blue-500 bg-blue-50 dark:bg-blue-900/40 text-blue-600 dark:text-blue-300'
|
||||
: 'border-gray-300 dark:border-gray-600 text-gray-600 dark:text-gray-300'}`}
|
||||
>
|
||||
全屏平铺
|
||||
</button>
|
||||
</div>
|
||||
</Field>
|
||||
|
||||
{!tile && (
|
||||
<Field label="位置">
|
||||
<div className="grid grid-cols-3 gap-1.5 w-44">
|
||||
{POSITIONS.flat().map((pos) => (
|
||||
<button
|
||||
key={pos}
|
||||
onClick={() => setPosition(pos)}
|
||||
title={POSITION_LABEL[pos]}
|
||||
className={`px-1 py-1.5 rounded text-xs border transition-colors ${position === pos
|
||||
? 'border-blue-500 bg-blue-50 dark:bg-blue-900/40 text-blue-600 dark:text-blue-300 font-medium'
|
||||
: 'border-gray-300 dark:border-gray-600 text-gray-500 dark:text-gray-400 hover:border-gray-400'}`}
|
||||
>
|
||||
{POSITION_LABEL[pos]}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
</Field>
|
||||
)}
|
||||
|
||||
<div className="grid grid-cols-2 gap-x-5">
|
||||
<Field label="字号(占图宽比例)">
|
||||
<Slider value={fontSizePct} onChange={setFontSizePct} min={1} max={15} suffix="%" />
|
||||
</Field>
|
||||
<Field label="透明度">
|
||||
<Slider value={opacity} onChange={setOpacity} min={5} max={100} suffix="%" />
|
||||
</Field>
|
||||
<Field label={tile ? '倾斜角度' : '旋转角度'}>
|
||||
<Slider value={rotate} onChange={setRotate} min={-90} max={90} suffix="°" />
|
||||
</Field>
|
||||
<Field label="边距(占图宽比例)">
|
||||
<Slider value={marginPct} onChange={setMarginPct} min={0} max={10} suffix="%" />
|
||||
</Field>
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-2 gap-x-5">
|
||||
<Field label="颜色">
|
||||
<div className="flex items-center gap-2">
|
||||
<input
|
||||
type="color"
|
||||
value={color}
|
||||
onChange={(e) => setColor(e.target.value)}
|
||||
className="w-9 h-9 rounded cursor-pointer border border-gray-300 dark:border-gray-600 bg-transparent"
|
||||
/>
|
||||
{['#ffffff', '#000000', '#ff3b30', '#ffd60a'].map((c) => (
|
||||
<button
|
||||
key={c}
|
||||
onClick={() => setColor(c)}
|
||||
title={c}
|
||||
className={`w-6 h-6 rounded-full border-2 ${color === c ? 'border-blue-500' : 'border-gray-300 dark:border-gray-600'}`}
|
||||
style={{ backgroundColor: c }}
|
||||
/>
|
||||
))}
|
||||
<span className="text-xs text-gray-500 tabular-nums">{color}</span>
|
||||
</div>
|
||||
</Field>
|
||||
<Field label="描边(浅色背景更清晰)">
|
||||
<label className="flex items-center gap-2 text-sm text-gray-700 dark:text-gray-300 cursor-pointer">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={stroke}
|
||||
onChange={(e) => setStroke(e.target.checked)}
|
||||
className="accent-blue-500 w-4 h-4"
|
||||
/>
|
||||
启用黑色描边
|
||||
</label>
|
||||
</Field>
|
||||
</div>
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<Field label="水印区域(占图片宽高的百分比)" hint="批量去水印按统一区域处理,请选择水印所在的固定位置">
|
||||
<div className="flex flex-wrap gap-2 mb-3">
|
||||
{REGION_PRESETS.map((p) => (
|
||||
<button
|
||||
key={p.key}
|
||||
onClick={() => {
|
||||
setPresetKey(p.key);
|
||||
if (p.region) setRegion(p.region);
|
||||
}}
|
||||
className={`px-3 py-1.5 rounded-lg text-xs border transition-colors ${presetKey === p.key
|
||||
? 'border-emerald-500 bg-emerald-50 dark:bg-emerald-900/40 text-emerald-600 dark:text-emerald-300 font-medium'
|
||||
: 'border-gray-300 dark:border-gray-600 text-gray-600 dark:text-gray-300 hover:border-gray-400'}`}
|
||||
>
|
||||
{p.label}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
|
||||
<div className="flex items-center gap-4">
|
||||
{/* 区域示意 */}
|
||||
<div className="relative w-32 h-20 rounded border border-gray-300 dark:border-gray-600 bg-gray-100 dark:bg-gray-900 shrink-0 overflow-hidden">
|
||||
<div
|
||||
className="absolute bg-emerald-400/50 border border-emerald-500"
|
||||
style={{
|
||||
left: `${clampPct(region.x)}%`,
|
||||
top: `${clampPct(region.y)}%`,
|
||||
width: `${Math.max(1, Math.min(100 - clampPct(region.x), region.w))}%`,
|
||||
height: `${Math.max(1, Math.min(100 - clampPct(region.y), region.h))}%`
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
<div className="grid grid-cols-2 gap-x-4 gap-y-2 text-xs">
|
||||
{[['x', '左边距'], ['y', '上边距'], ['w', '宽度'], ['h', '高度']].map(([k, lb]) => (
|
||||
<label key={k} className="flex items-center gap-2">
|
||||
<span className="text-gray-500 dark:text-gray-400 w-10">{lb}</span>
|
||||
<input
|
||||
type="number"
|
||||
min={0}
|
||||
max={100}
|
||||
value={region[k]}
|
||||
onChange={(e) => {
|
||||
setPresetKey('custom');
|
||||
setRegion((r) => ({ ...r, [k]: clampPct(e.target.value) }));
|
||||
}}
|
||||
className="w-16 px-2 py-1 rounded border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-700 text-gray-900 dark:text-white tabular-nums focus:outline-none focus:ring-2 focus:ring-emerald-500"
|
||||
/>
|
||||
<span className="text-gray-400">%</span>
|
||||
</label>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</Field>
|
||||
|
||||
<div className="rounded-lg bg-amber-50 dark:bg-amber-900/20 border border-amber-200 dark:border-amber-800 px-3 py-2.5 text-xs text-amber-700 dark:text-amber-300 flex gap-2">
|
||||
<AlertTriangle className="w-4 h-4 shrink-0 mt-0.5" />
|
||||
<span>
|
||||
修复区域内的所有内容都会被抹除重建(包括文字、logo、图案)。水印位置在整批图片中不一致时请分批处理,或用编辑器单张涂抹。
|
||||
</span>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
|
||||
{/* 输出方式 */}
|
||||
<Field label="处理后">
|
||||
<div className="flex gap-2">
|
||||
<button
|
||||
onClick={() => setOutput('overwrite')}
|
||||
className={`flex-1 flex items-center justify-center gap-2 px-3 py-2.5 rounded-lg text-sm border transition-colors ${output === 'overwrite'
|
||||
? 'border-blue-500 bg-blue-50 dark:bg-blue-900/40 text-blue-600 dark:text-blue-300'
|
||||
: 'border-gray-300 dark:border-gray-600 text-gray-600 dark:text-gray-300'}`}
|
||||
>
|
||||
<FileEdit className="w-4 h-4" /> 覆盖原图
|
||||
</button>
|
||||
<button
|
||||
onClick={() => setOutput('new')}
|
||||
className={`flex-1 flex items-center justify-center gap-2 px-3 py-2.5 rounded-lg text-sm border transition-colors ${output === 'new'
|
||||
? 'border-blue-500 bg-blue-50 dark:bg-blue-900/40 text-blue-600 dark:text-blue-300'
|
||||
: 'border-gray-300 dark:border-gray-600 text-gray-600 dark:text-gray-300'}`}
|
||||
>
|
||||
<Save className="w-4 h-4" /> 另存为新图
|
||||
</button>
|
||||
</div>
|
||||
<div className="text-[11px] text-gray-400 dark:text-gray-500 mt-1.5">
|
||||
{output === 'overwrite'
|
||||
? '原图将被替换(缩略图与索引同步更新)'
|
||||
: isAdd ? '生成 新图名_wm.jpg 保留原图' : '生成 新图名_nowm.jpg 保留原图'}
|
||||
</div>
|
||||
</Field>
|
||||
|
||||
{error && (
|
||||
<div className="rounded-lg bg-red-50 dark:bg-red-900/30 border border-red-200 dark:border-red-800 px-3 py-2 text-xs text-red-600 dark:text-red-300">
|
||||
{error}
|
||||
</div>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
|
||||
{(phase === 'running' || phase === 'done') && progress && (
|
||||
<div className="py-2">
|
||||
{/* 状态 */}
|
||||
<div className="flex items-center gap-3 mb-4">
|
||||
{phase === 'running' ? (
|
||||
<Loader2 className="w-6 h-6 text-blue-500 animate-spin shrink-0" />
|
||||
) : progress.failed > 0 ? (
|
||||
<AlertTriangle className="w-6 h-6 text-amber-500 shrink-0" />
|
||||
) : (
|
||||
<CheckCircle2 className="w-6 h-6 text-emerald-500 shrink-0" />
|
||||
)}
|
||||
<div className="flex-1 min-w-0">
|
||||
<div className="text-sm font-medium text-gray-900 dark:text-white">
|
||||
{phase === 'running'
|
||||
? (isAdd ? '正在加水印…' : '正在去水印…(AI 修复较慢,请耐心等待)')
|
||||
: progress.status === 'cancelled'
|
||||
? '已取消'
|
||||
: progress.status === 'error'
|
||||
? '任务异常终止'
|
||||
: '处理完成'}
|
||||
</div>
|
||||
<div className="text-xs text-gray-500 dark:text-gray-400 truncate">
|
||||
{phase === 'running' && progress.current
|
||||
? progress.current
|
||||
: `成功 ${progress.done} · 失败 ${progress.failed}${progress.skipped ? ` · 跳过 ${progress.skipped}` : ''} / 共 ${progress.total}`}
|
||||
</div>
|
||||
</div>
|
||||
<div className="text-sm tabular-nums text-gray-600 dark:text-gray-300 shrink-0">
|
||||
{progress.done + progress.failed + progress.skipped}/{progress.total}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* 进度条 */}
|
||||
<div className="h-2.5 rounded-full bg-gray-200 dark:bg-gray-700 overflow-hidden mb-4">
|
||||
<div
|
||||
className={`h-full transition-all duration-300 ${progress.failed > 0 && phase === 'done' ? 'bg-amber-500' : isAdd ? 'bg-blue-500' : 'bg-emerald-500'}`}
|
||||
style={{ width: `${pct}%` }}
|
||||
/>
|
||||
</div>
|
||||
|
||||
{/* 统计 */}
|
||||
<div className="grid grid-cols-3 gap-2 mb-4">
|
||||
{[
|
||||
['成功', progress.done, 'text-emerald-600 dark:text-emerald-400'],
|
||||
['失败', progress.failed, progress.failed ? 'text-red-500' : 'text-gray-500'],
|
||||
['跳过', progress.skipped, 'text-gray-500']
|
||||
].map(([lb, v, cls]) => (
|
||||
<div key={lb} className="rounded-lg bg-gray-50 dark:bg-gray-900 px-3 py-2 text-center">
|
||||
<div className={`text-lg font-semibold tabular-nums ${cls}`}>{v}</div>
|
||||
<div className="text-[11px] text-gray-400">{lb}</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
|
||||
{/* 错误明细 */}
|
||||
{progress.errors && progress.errors.length > 0 && (
|
||||
<div className="rounded-lg border border-red-200 dark:border-red-800 bg-red-50/50 dark:bg-red-900/20 p-3 mb-2">
|
||||
<div className="text-xs font-medium text-red-600 dark:text-red-300 mb-1.5">
|
||||
失败明细(最多记录 20 条)
|
||||
</div>
|
||||
<div className="space-y-1 max-h-40 overflow-y-auto">
|
||||
{progress.errors.map((e, i) => (
|
||||
<div key={i} className="text-[11px] text-red-500 dark:text-red-400 font-mono break-all">
|
||||
{e.path || '(全局)'} — {e.error}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* 底部按钮 */}
|
||||
<div className="px-5 py-4 border-t border-gray-200 dark:border-gray-700 flex justify-end gap-3">
|
||||
{phase === 'config' && (
|
||||
<>
|
||||
<button
|
||||
onClick={handleClose}
|
||||
className="px-4 py-2.5 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 text-sm"
|
||||
>
|
||||
取消
|
||||
</button>
|
||||
<button
|
||||
onClick={handleStart}
|
||||
disabled={starting || imageCount === 0}
|
||||
className={`flex items-center gap-2 px-5 py-2.5 rounded-lg text-white text-sm disabled:opacity-50 disabled:cursor-not-allowed transition-colors ${accentBtn}`}
|
||||
>
|
||||
{starting ? <Loader2 className="w-4 h-4 animate-spin" /> : <Play className="w-4 h-4" />}
|
||||
{imageCount === 0 ? '该文件夹没有可处理的文件' : `开始处理 ${imageCount} 个文件`}
|
||||
</button>
|
||||
</>
|
||||
)}
|
||||
|
||||
{phase === 'running' && (
|
||||
<button
|
||||
onClick={handleCancel}
|
||||
className="flex items-center gap-2 px-4 py-2.5 rounded-lg border border-red-300 text-red-600 hover:bg-red-50 dark:hover:bg-red-900/30 text-sm"
|
||||
>
|
||||
<Square className="w-4 h-4" /> 停止任务
|
||||
</button>
|
||||
)}
|
||||
|
||||
{phase === 'done' && (
|
||||
<>
|
||||
<button
|
||||
onClick={() => setPhase('config')}
|
||||
className="px-4 py-2.5 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 text-sm"
|
||||
>
|
||||
再跑一批
|
||||
</button>
|
||||
<button
|
||||
onClick={handleClose}
|
||||
className={`flex items-center gap-2 px-5 py-2.5 rounded-lg text-white text-sm transition-colors ${accentBtn}`}
|
||||
>
|
||||
<Eye className="w-4 h-4" /> 完成,查看图片
|
||||
</button>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default BatchWatermarkModal;
|
||||
@@ -4,7 +4,7 @@
|
||||
*/
|
||||
|
||||
import { useEffect, useRef } from 'react';
|
||||
import { Trash2, Edit3, Move, Copy, FolderPlus } from 'lucide-react';
|
||||
import { Trash2, Edit3, Move, Copy, FolderPlus, Star, Droplets, Eraser, Scissors, Film, Replace } from 'lucide-react';
|
||||
|
||||
function ContextMenu({ isOpen, position, onClose, options }) {
|
||||
const menuRef = useRef(null);
|
||||
@@ -136,6 +136,12 @@ export const menuItems = {
|
||||
shortcut: 'F2',
|
||||
action
|
||||
}),
|
||||
edit: (action) => ({
|
||||
icon: <Edit3 size={16} />,
|
||||
label: '编辑图片',
|
||||
shortcut: 'E',
|
||||
action
|
||||
}),
|
||||
move: (action) => ({
|
||||
icon: <Move size={16} />,
|
||||
label: '移动到',
|
||||
@@ -147,6 +153,11 @@ export const menuItems = {
|
||||
shortcut: 'Ctrl+C',
|
||||
action
|
||||
}),
|
||||
favorite: (action, isFavorite = false) => ({
|
||||
icon: <Star size={16} className={isFavorite ? 'fill-current text-amber-400' : ''} />,
|
||||
label: isFavorite ? '取消收藏' : '收藏',
|
||||
action
|
||||
}),
|
||||
newSiblingFolder: (action) => ({
|
||||
icon: <FolderPlus size={16} />,
|
||||
label: '新建同级文件夹',
|
||||
@@ -157,6 +168,31 @@ export const menuItems = {
|
||||
label: '新建子文件夹',
|
||||
action
|
||||
}),
|
||||
batchAddWatermark: (action) => ({
|
||||
icon: <Droplets size={16} />,
|
||||
label: '批量加水印…',
|
||||
action
|
||||
}),
|
||||
batchRename: (action) => ({
|
||||
icon: <Replace size={16} />,
|
||||
label: '批量重命名文件…',
|
||||
action
|
||||
}),
|
||||
batchRemoveWatermark: (action) => ({
|
||||
icon: <Eraser size={16} />,
|
||||
label: '批量去水印…',
|
||||
action
|
||||
}),
|
||||
videoEdit: (action) => ({
|
||||
icon: <Scissors size={16} />,
|
||||
label: '编辑视频(水印/字幕声音)…',
|
||||
action
|
||||
}),
|
||||
aiVideo: (action) => ({
|
||||
icon: <Film size={16} />,
|
||||
label: 'AI 生成视频…',
|
||||
action
|
||||
}),
|
||||
divider: () => ({ divider: true })
|
||||
};
|
||||
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
import React from 'react';
|
||||
import { useLibraryStore } from '../stores/useLibraryStore';
|
||||
import { useImageStore } from '../stores/useImageStore';
|
||||
import { Folder, Image as ImageIcon, HardDrive } from 'lucide-react';
|
||||
import { Folder, Image as ImageIcon, HardDrive, File as FileIcon } from 'lucide-react';
|
||||
import { countLabel, typeMeta, typeLabelOf, orderedTypeEntries } from '../utils/fileTypes';
|
||||
|
||||
function Dashboard() {
|
||||
const { currentLibraryId, getCurrentLibrary } = useLibraryStore();
|
||||
const { totalImageCount, totalSize, folders } = useImageStore();
|
||||
const { totalImageCount, totalSize, folders, typeCounts } = useImageStore();
|
||||
|
||||
const currentLibrary = getCurrentLibrary();
|
||||
const folderCount = folders.length;
|
||||
@@ -35,11 +36,22 @@ function Dashboard() {
|
||||
<div className="bg-secondary rounded-xl p-6 shadow-sm border">
|
||||
<div className="flex items-center gap-4">
|
||||
<div className="p-3 bg-blue-100 rounded-lg text-accent">
|
||||
<ImageIcon className="w-6 h-6" />
|
||||
{(() => {
|
||||
const types = orderedTypeEntries(typeCounts);
|
||||
const StatIcon = types.length === 1 ? typeMeta(types[0][0]).icon : FileIcon;
|
||||
return <StatIcon className="w-6 h-6" />;
|
||||
})()}
|
||||
</div>
|
||||
<div>
|
||||
<div className="text-2xl font-bold text-primary">{totalImageCount.toLocaleString()}</div>
|
||||
<div className="text-sm text-tertiary">图片总数</div>
|
||||
<div className="text-sm text-tertiary">{typeLabelOf(typeCounts)}总数</div>
|
||||
{/* 分类型图例:由类型注册表自动渲染,新类型无需改代码 */}
|
||||
<div className="text-xs text-tertiary mt-0.5 flex gap-2 flex-wrap">
|
||||
{orderedTypeEntries(typeCounts)
|
||||
.map(([t, n]) => (
|
||||
<span key={t}>{typeMeta(t).label} {n.toLocaleString()}</span>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -87,7 +99,7 @@ function Dashboard() {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div className="text-xs text-tertiary">{folder.imageCount || 0} 张图片</div>
|
||||
<div className="text-xs text-tertiary">{countLabel(folder.imageCount || 0, folder.typeCounts)}</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
@@ -99,7 +111,9 @@ function Dashboard() {
|
||||
<Folder className="w-12 h-12 text-secondary mx-auto mb-4" />
|
||||
<h3 className="text-lg font-medium text-primary mb-2">暂无文件夹</h3>
|
||||
<p className="text-tertiary max-w-sm mx-auto">
|
||||
您的素材库似乎是空的。请将图片添加到素材库目录中,系统会自动扫描。
|
||||
{totalImageCount > 0
|
||||
? `此素材库的 ${countLabel(totalImageCount, typeCounts)} 没有子文件夹,已在下方瀑布视图中直接显示。`
|
||||
: '您的素材库似乎是空的。请将图片添加到素材库目录中,系统会自动扫描。'}
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useState, useEffect, useMemo, useRef } from 'react';
|
||||
import { Sun, Moon, Search, Filter, Sliders, RefreshCw, Star, Bell, Github, Settings, ExternalLink } from 'lucide-react';
|
||||
import { Sun, Moon, Search, Filter, Sliders, RefreshCw, ScanLine, Star, Bell, Github, Settings, ExternalLink, Wand2, Film } from 'lucide-react';
|
||||
import { useLibraryStore } from '../stores/useLibraryStore';
|
||||
import { useImageStore } from '../stores/useImageStore';
|
||||
import { useUIStore } from '../stores/useUIStore';
|
||||
@@ -8,6 +8,8 @@ import { useTheme } from '../hooks/useTheme';
|
||||
import { useHub } from '../hooks/useHub';
|
||||
import { libraryAPI, scanAPI, watchAPI } from '../api';
|
||||
import SettingsModal from './SettingsModal';
|
||||
import AIGenModal from './AIGenModal';
|
||||
import AIVideoStudioModal from './AIVideoStudioModal';
|
||||
import { createLogger } from '../utils/logger';
|
||||
|
||||
const logger = createLogger('Header');
|
||||
@@ -22,17 +24,23 @@ function Header() {
|
||||
|
||||
const [showFilters, setShowFilters] = useState(false);
|
||||
const [isRefreshing, setIsRefreshing] = useState(false);
|
||||
const [isRescanning, setIsRescanning] = useState(false);
|
||||
// 扫描进行中时禁用"重新扫描"按钮
|
||||
const scanProgress = useScanStore((s) => s.scanProgress);
|
||||
const [isMobile, setIsMobile] = useState(false);
|
||||
const [showMobileSettings, setShowMobileSettings] = useState(false);
|
||||
const [localSearchValue, setLocalSearchValue] = useState(searchKeywords);
|
||||
const [showNotices, setShowNotices] = useState(false);
|
||||
const [showSettings, setShowSettings] = useState(false);
|
||||
const [settingsTab, setSettingsTab] = useState('ocr');
|
||||
const [showAIGen, setShowAIGen] = useState(false);
|
||||
const [showAIVideo, setShowAIVideo] = useState(false);
|
||||
const searchDebounceRef = useRef(null);
|
||||
|
||||
// 授权系统 hub:版本 / 公告 / 在线人数
|
||||
const hub = useHub();
|
||||
const announcements = hub.announcements || [];
|
||||
const appVersion = hub.version ? `v${String(hub.version).replace(/^v/, '')}` : 'v1.2.0';
|
||||
const appVersion = hub.version ? `v${String(hub.version).replace(/^v/, '')}` : 'v1.4.14';
|
||||
|
||||
// 从全局 store 获取筛选状态
|
||||
const selectedFormats = filters.formats || [];
|
||||
@@ -40,6 +48,16 @@ function Header() {
|
||||
const selectedOrientations = filters.orientations || [];
|
||||
const selectedRatings = filters.ratings || [];
|
||||
|
||||
// 从 AI 生图弹窗跳设置(open:settings 事件,detail = 菜单 tab)
|
||||
useEffect(() => {
|
||||
const handler = (e) => {
|
||||
setSettingsTab((e.detail && e.detail.tab) || 'ocr');
|
||||
setShowSettings(true);
|
||||
};
|
||||
window.addEventListener('open:settings', handler);
|
||||
return () => window.removeEventListener('open:settings', handler);
|
||||
}, []);
|
||||
|
||||
// 检测移动端
|
||||
useEffect(() => {
|
||||
const checkMobile = () => {
|
||||
@@ -262,9 +280,12 @@ function Header() {
|
||||
setFilters({ ratings: newRatings });
|
||||
};
|
||||
|
||||
const favoriteOnly = !!filters.favoriteOnly;
|
||||
const toggleFavoriteOnly = () => setFilters({ favoriteOnly: !favoriteOnly });
|
||||
|
||||
// 清除筛选
|
||||
const clearFilters = () => {
|
||||
setFilters({ formats: [], sizes: [], orientations: [], ratings: [] });
|
||||
setFilters({ formats: [], sizes: [], orientations: [], ratings: [], favoriteOnly: false });
|
||||
};
|
||||
|
||||
const handleThumbnailHeightChange = async (height) => {
|
||||
@@ -291,6 +312,26 @@ function Header() {
|
||||
}
|
||||
};
|
||||
|
||||
// 重新扫描:重新索引全部文件,并为缺少文字索引的旧图片补跑 OCR
|
||||
const handleRescan = async () => {
|
||||
if (!currentLibraryId || isRescanning || scanProgress) return;
|
||||
|
||||
if (!window.confirm('重新扫描将重新索引全部文件,并为缺少文字索引的图片补跑 OCR 识别。库越大耗时越长(进度会在页面上方显示),确认开始?')) {
|
||||
return;
|
||||
}
|
||||
|
||||
setIsRescanning(true);
|
||||
try {
|
||||
await scanAPI.fullScan(currentLibraryId);
|
||||
// 扫描进度通过 Socket.IO 的 scanProgress 推送
|
||||
} catch (error) {
|
||||
console.error('Error rescan:', error);
|
||||
alert('重新扫描失败: ' + error.message);
|
||||
} finally {
|
||||
setIsRescanning(false);
|
||||
}
|
||||
};
|
||||
|
||||
// 从 filterOptions 中提取可用选项
|
||||
const availableFormats = filterOptions.formats;
|
||||
const availableSizes = filterOptions.sizes.map(size => ({ label: size }));
|
||||
@@ -371,6 +412,22 @@ function Header() {
|
||||
)}
|
||||
</div>
|
||||
|
||||
<button
|
||||
onClick={() => setShowAIVideo(true)}
|
||||
title="AI 生成视频"
|
||||
className="p-2 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors"
|
||||
>
|
||||
<Film className="w-5 h-5 text-purple-600 dark:text-purple-400" />
|
||||
</button>
|
||||
|
||||
<button
|
||||
onClick={() => setShowAIGen(true)}
|
||||
title="AI 生图"
|
||||
className="p-2 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors"
|
||||
>
|
||||
<Wand2 className="w-5 h-5 text-purple-600 dark:text-purple-400" />
|
||||
</button>
|
||||
|
||||
<button
|
||||
onClick={() => setShowSettings(true)}
|
||||
title="设置"
|
||||
@@ -383,7 +440,9 @@ function Header() {
|
||||
{appVersion}
|
||||
</span>
|
||||
|
||||
<SettingsModal open={showSettings} onClose={() => setShowSettings(false)} versionLabel={appVersion} />
|
||||
<SettingsModal open={showSettings} onClose={() => setShowSettings(false)} versionLabel={appVersion} initialTab={settingsTab} />
|
||||
<AIGenModal open={showAIGen} onClose={() => setShowAIGen(false)} />
|
||||
{showAIVideo && <AIVideoStudioModal libraryId={currentLibraryId} onClose={() => setShowAIVideo(false)} onDone={() => { setShowAIVideo(false); window.location.reload(); }} />}
|
||||
</>
|
||||
);
|
||||
|
||||
@@ -396,7 +455,7 @@ function Header() {
|
||||
<header className="border-b border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-800">
|
||||
{/* 顶部栏 */}
|
||||
<div className="h-14 flex items-center justify-between px-4">
|
||||
<h1 className="text-lg font-bold text-gray-900 dark:text-white">FlyPic</h1>
|
||||
<h1 className="text-lg font-bold text-gray-900 dark:text-white">牛仔库</h1>
|
||||
|
||||
<div className="flex items-center gap-2">
|
||||
<button
|
||||
@@ -406,6 +465,15 @@ function Header() {
|
||||
>
|
||||
<RefreshCw className={`w-5 h-5 text-gray-700 dark:text-gray-300 ${isRefreshing ? 'animate-spin' : ''}`} />
|
||||
</button>
|
||||
|
||||
<button
|
||||
onClick={handleRescan}
|
||||
disabled={!currentLibraryId || isRescanning || !!scanProgress}
|
||||
className="p-2 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors disabled:opacity-50"
|
||||
title="重新扫描:重新索引全部文件并补跑 OCR 文字识别"
|
||||
>
|
||||
<ScanLine className={`w-5 h-5 text-gray-700 dark:text-gray-300 ${isRescanning || scanProgress ? 'animate-pulse' : ''}`} />
|
||||
</button>
|
||||
|
||||
<button
|
||||
onClick={() => setShowMobileSettings(!showMobileSettings)}
|
||||
@@ -437,7 +505,7 @@ function Header() {
|
||||
<Search className="absolute left-3 top-2.5 w-5 h-5 text-gray-400" />
|
||||
<input
|
||||
type="text"
|
||||
placeholder="搜索图片...(支持 OCR 图内文字)"
|
||||
placeholder="搜索文件...(支持 OCR 图内文字)"
|
||||
value={searchKeywords}
|
||||
onChange={(e) => handleSearchChange(e.target.value)}
|
||||
className="w-full pl-10 pr-4 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 text-sm"
|
||||
@@ -586,6 +654,22 @@ function Header() {
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
{/* 收藏筛选 */}
|
||||
<div>
|
||||
<div className="text-xs text-gray-500 dark:text-gray-400 mb-2">收藏</div>
|
||||
<div className="flex flex-wrap gap-2">
|
||||
<button
|
||||
onClick={toggleFavoriteOnly}
|
||||
className={`px-2 py-1 text-xs rounded-full flex items-center gap-1 ${
|
||||
favoriteOnly
|
||||
? 'bg-amber-500 text-white'
|
||||
: 'bg-gray-100 dark:bg-gray-700 text-gray-700 dark:text-gray-300'
|
||||
}`}
|
||||
>
|
||||
<Star size={12} className={favoriteOnly ? 'fill-current' : ''} /> 只看收藏
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</header>
|
||||
@@ -597,8 +681,8 @@ function Header() {
|
||||
<header className="border-b border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-800">
|
||||
<div className="h-14 flex items-center justify-between px-6">
|
||||
<div className="flex-shrink-0">
|
||||
<h1 className="text-xl font-bold text-gray-900 dark:text-white">FlyPic</h1>
|
||||
<p className="text-xs text-gray-500 dark:text-gray-400">轻量快速的图片素材库管理</p>
|
||||
<h1 className="text-xl font-bold text-gray-900 dark:text-white">牛仔库</h1>
|
||||
<p className="text-xs text-gray-500 dark:text-gray-400">轻量快速的素材库管理</p>
|
||||
</div>
|
||||
|
||||
{/* 搜索栏 */}
|
||||
@@ -607,7 +691,7 @@ function Header() {
|
||||
<Search className="absolute left-3 top-2.5 w-5 h-5 text-gray-400" />
|
||||
<input
|
||||
type="text"
|
||||
placeholder="搜索图片...(支持 OCR 图内文字,多个关键词用空格分隔)"
|
||||
placeholder="搜索文件...(支持 OCR 图内文字,多个关键词用空格分隔)"
|
||||
value={localSearchValue}
|
||||
onChange={(e) => handleSearchChange(e.target.value)}
|
||||
className="w-full pl-10 pr-4 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
|
||||
@@ -661,6 +745,15 @@ function Header() {
|
||||
>
|
||||
<RefreshCw className={`w-5 h-5 text-gray-700 dark:text-gray-300 ${isRefreshing ? 'animate-spin' : ''}`} />
|
||||
</button>
|
||||
|
||||
<button
|
||||
onClick={handleRescan}
|
||||
disabled={!currentLibraryId || isRescanning || !!scanProgress}
|
||||
className="p-2 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
|
||||
title="重新扫描:重新索引全部文件并补跑 OCR 文字识别"
|
||||
>
|
||||
<ScanLine className={`w-5 h-5 text-gray-700 dark:text-gray-300 ${isRescanning || scanProgress ? 'animate-pulse' : ''}`} />
|
||||
</button>
|
||||
|
||||
<button
|
||||
onClick={toggleTheme}
|
||||
@@ -798,6 +891,23 @@ function Header() {
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* 收藏筛选 */}
|
||||
<div>
|
||||
<label className="block text-xs font-medium text-gray-600 dark:text-gray-400 mb-2">收藏</label>
|
||||
<div className="flex flex-col gap-1.5">
|
||||
<button
|
||||
onClick={toggleFavoriteOnly}
|
||||
className={`px-3 py-1.5 text-xs rounded transition-colors text-left flex items-center gap-1.5 ${
|
||||
favoriteOnly
|
||||
? 'bg-amber-500 text-white'
|
||||
: 'bg-gray-200 dark:bg-gray-600 text-gray-700 dark:text-gray-300 hover:bg-gray-300 dark:hover:bg-gray-500'
|
||||
}`}
|
||||
>
|
||||
<Star size={14} className={favoriteOnly ? 'fill-current' : ''} /> 只看收藏
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* 图片单元格组件
|
||||
*/
|
||||
|
||||
import { Play, FileText, Palette, Music, File } from 'lucide-react';
|
||||
import { Play, FileText, Palette, Music, File, Star, ExternalLink } from 'lucide-react';
|
||||
|
||||
const ImageCell = ({
|
||||
image,
|
||||
@@ -12,8 +12,10 @@ const ImageCell = ({
|
||||
editingFilename,
|
||||
editInputRef,
|
||||
getThumbnailUrl,
|
||||
getOriginalUrl,
|
||||
onImageClick,
|
||||
onImageDoubleClick,
|
||||
onToggleFavorite,
|
||||
onContextMenu,
|
||||
onDragStart,
|
||||
onEditingChange,
|
||||
@@ -72,9 +74,9 @@ const ImageCell = ({
|
||||
}}
|
||||
/>
|
||||
|
||||
{/* 文件类型标识 */}
|
||||
{/* 文件类型标识(右让位给「新窗口打开」按钮) */}
|
||||
{image.fileType && image.fileType !== 'image' && (
|
||||
<div className={`absolute top-2 right-2 rounded-md px-2 py-1 flex items-center gap-1 shadow-lg ${
|
||||
<div className={`absolute top-2 right-11 rounded-md px-2 py-1 flex items-center gap-1 shadow-lg ${
|
||||
image.fileType === 'video' ? 'bg-blue-500 bg-opacity-90' :
|
||||
image.fileType === 'audio' ? 'bg-pink-500 bg-opacity-90' :
|
||||
image.fileType === 'document' ? 'bg-green-500 bg-opacity-90' :
|
||||
@@ -91,7 +93,40 @@ const ImageCell = ({
|
||||
</span>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 视频时长角标(右下角) */}
|
||||
{image.fileType === 'video' && image.duration > 0 && (
|
||||
<div className="absolute bottom-2 right-2 rounded px-1.5 py-0.5 bg-black/70 text-white text-xs font-mono tabular-nums pointer-events-none">
|
||||
{Math.floor(image.duration / 60)}:{String(Math.floor(image.duration % 60)).padStart(2, '0')}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 在新窗口打开原图(右上角) */}
|
||||
<a
|
||||
href={getOriginalUrl ? getOriginalUrl(image) : ''}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
title="在新窗口打开"
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
onDoubleClick={(e) => e.stopPropagation()}
|
||||
className="absolute top-2 right-2 z-10 p-1 rounded-full backdrop-blur-sm bg-black/40 hover:bg-black/70 transition-all opacity-0 group-hover:opacity-100"
|
||||
>
|
||||
<ExternalLink size={14} className="text-white" />
|
||||
</a>
|
||||
|
||||
{/* 收藏标记 / 收藏按钮 */}
|
||||
<button
|
||||
type="button"
|
||||
onClick={(e) => { e.stopPropagation(); onToggleFavorite?.(image); }}
|
||||
title={image.favorite ? '取消收藏' : '收藏'}
|
||||
className={`absolute top-2 left-2 z-10 p-1 rounded-full backdrop-blur-sm transition-all ${
|
||||
image.favorite
|
||||
? 'opacity-100 bg-amber-400/80'
|
||||
: 'opacity-0 group-hover:opacity-100 bg-black/40'
|
||||
}`}
|
||||
>
|
||||
<Star size={14} className={image.favorite ? 'fill-white text-white' : 'text-white'} />
|
||||
</button>
|
||||
<div className="absolute inset-0 bg-black bg-opacity-0 group-hover:bg-opacity-20 transition-all pointer-events-none" />
|
||||
</div>
|
||||
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -5,12 +5,14 @@
|
||||
|
||||
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';
|
||||
|
||||
// Stores
|
||||
import { useLibraryStore } from '../stores/useLibraryStore';
|
||||
import { useImageStore } from '../stores/useImageStore';
|
||||
import { useUIStore } from '../stores/useUIStore';
|
||||
|
||||
// Custom Hooks
|
||||
import { useWaterfallLayout } from '../hooks/useWaterfallLayout';
|
||||
@@ -26,7 +28,8 @@ import { useInfiniteScroll } from '../hooks/useInfiniteScroll';
|
||||
|
||||
// Utils
|
||||
import { filterImages } from '../utils/imageFilters';
|
||||
import { imageAPI } from '../api';
|
||||
import { typeCountsOf, countLabel } from '../utils/fileTypes';
|
||||
import { imageAPI, fileAPI } from '../api';
|
||||
|
||||
// Components
|
||||
import ImageCell from './ImageCell';
|
||||
@@ -39,6 +42,7 @@ import UndoToast from './UndoToast';
|
||||
import RatingToast from './RatingToast';
|
||||
import FolderSelector from './FolderSelector';
|
||||
import ConflictDialog from './ConflictDialog';
|
||||
import AIVideoModal from './AIVideoModal';
|
||||
|
||||
// 虚拟滚动阈值
|
||||
const VIRTUAL_SCROLL_THRESHOLD = 50;
|
||||
@@ -53,13 +57,15 @@ function ImageWaterfall() {
|
||||
const {
|
||||
images, selectedImage, setSelectedImage, selectedImages, setSelectedImages,
|
||||
toggleImageSelection, clearSelection, imageLoadingState, selectedFolder,
|
||||
searchKeywords, filters, folders, setSelectedFolderItem
|
||||
searchKeywords, filters, folders, setSelectedFolderItem, updateImage
|
||||
} = useImageStore();
|
||||
const { setEditingImage, setMergeImages, setVideoEditFile } = useUIStore();
|
||||
|
||||
// 状态
|
||||
const [photoIndex, setPhotoIndex] = useState(-1);
|
||||
const [lastSelectedIndex, setLastSelectedIndex] = useState(null);
|
||||
const [viewerFile, setViewerFile] = useState(null);
|
||||
const [aiVideoOpen, setAiVideoOpen] = useState(false); // AI 生成视频弹窗
|
||||
const [contextMenu, setContextMenu] = useState({ isOpen: false, position: null, image: null });
|
||||
// 统一图片移动/删除撤销顺序的栈:按操作时间顺序记录 'move' | 'delete'
|
||||
const [undoStack, setUndoStack] = useState([]);
|
||||
@@ -184,7 +190,7 @@ function ImageWaterfall() {
|
||||
const getThumbnailUrl = useCallback((image) => {
|
||||
if (!currentLibraryId || !image.thumbnailPath) return '';
|
||||
const filename = image.thumbnailPath.replace(/\\/g, '/').split('/').pop();
|
||||
return imageAPI.getThumbnailUrl(currentLibraryId, filename);
|
||||
return imageAPI.getThumbnailUrl(currentLibraryId, filename, image.modifiedAt);
|
||||
}, [currentLibraryId]);
|
||||
|
||||
const getOriginalUrl = useCallback((image) => {
|
||||
@@ -192,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) => {
|
||||
@@ -213,6 +224,12 @@ function ImageWaterfall() {
|
||||
const end = Math.max(lastSelectedIndex, imageIndex);
|
||||
const rangeImages = flatImages.slice(start, end + 1);
|
||||
setSelectedImages(rangeImages);
|
||||
} else if ((image.fileType || 'image') === 'video') {
|
||||
// 视频:普通单击 = 弹出播放
|
||||
clearSelection();
|
||||
setSelectedImage(image);
|
||||
setLastSelectedIndex(imageIndex);
|
||||
setViewerFile(image);
|
||||
} else {
|
||||
// 普通单击 = 选中
|
||||
clearSelection();
|
||||
@@ -225,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) => {
|
||||
@@ -276,6 +295,20 @@ function ImageWaterfall() {
|
||||
e.dataTransfer.effectAllowed = 'move';
|
||||
}, [selectedImages]);
|
||||
|
||||
const handleToggleFavorite = useCallback(async (image) => {
|
||||
const targets = (selectedImages && selectedImages.length > 1 && selectedImages.includes(image))
|
||||
? selectedImages : [image];
|
||||
const newVal = image.favorite ? 0 : 1;
|
||||
try {
|
||||
for (const img of targets) {
|
||||
await fileAPI.updateMetadata(currentLibraryId, img.path, { favorite: newVal });
|
||||
updateImage(img.path, { favorite: newVal });
|
||||
}
|
||||
} catch (e) {
|
||||
alert('收藏操作失败: ' + (e?.message || '未知错误'));
|
||||
}
|
||||
}, [currentLibraryId, selectedImages, updateImage]);
|
||||
|
||||
// 准备移动文件(用于右键菜单)
|
||||
const handlePrepareMove = useCallback(() => {
|
||||
const itemsToMove = selectedImages.length > 0
|
||||
@@ -341,16 +374,45 @@ function ImageWaterfall() {
|
||||
];
|
||||
|
||||
if (!isMultiSelection) {
|
||||
if ((image?.fileType || 'image') === 'video') {
|
||||
menuOptions.push(
|
||||
menuItems.videoEdit(() => {
|
||||
setContextMenu({ isOpen: false, position: null, image: null });
|
||||
setVideoEditFile(image);
|
||||
}),
|
||||
menuItems.rename(() => {
|
||||
setContextMenu({ isOpen: false, position: null, image: null });
|
||||
handleStartRename(image);
|
||||
})
|
||||
);
|
||||
} else {
|
||||
menuOptions.push(
|
||||
menuItems.edit(() => {
|
||||
setContextMenu({ isOpen: false, position: null, image: null });
|
||||
setEditingImage(image);
|
||||
}),
|
||||
menuItems.rename(() => {
|
||||
setContextMenu({ isOpen: false, position: null, image: null });
|
||||
handleStartRename(image);
|
||||
})
|
||||
);
|
||||
}
|
||||
} else if (selectedImages.filter((img) => (img.fileType || 'image') === 'image').length >= 2) {
|
||||
// 多选 ≥2 张图片 → AI 生成视频
|
||||
menuOptions.push(
|
||||
menuItems.rename(() => {
|
||||
menuItems.aiVideo(() => {
|
||||
setContextMenu({ isOpen: false, position: null, image: null });
|
||||
handleStartRename(image);
|
||||
setAiVideoOpen(true);
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
menuOptions.push(
|
||||
menuItems.move(handlePrepareMove),
|
||||
menuItems.favorite(() => {
|
||||
setContextMenu({ isOpen: false, position: null, image: null });
|
||||
handleToggleFavorite(image);
|
||||
}, image?.favorite),
|
||||
menuItems.delete(async () => {
|
||||
setContextMenu({ isOpen: false, position: null, image: null });
|
||||
await handleQuickDelete();
|
||||
@@ -358,7 +420,7 @@ function ImageWaterfall() {
|
||||
);
|
||||
|
||||
return menuOptions;
|
||||
}, [selectedImages, handlePrepareMove, handleStartRename, handleCopy, handleQuickDelete, setUndoToast]);
|
||||
}, [selectedImages, handlePrepareMove, handleStartRename, handleCopy, handleQuickDelete, setUndoToast, handleToggleFavorite, setEditingImage]);
|
||||
|
||||
// 渲染单行
|
||||
const renderRow = useCallback(({ index, style }) => {
|
||||
@@ -388,8 +450,10 @@ function ImageWaterfall() {
|
||||
editingFilename={editingFilename}
|
||||
editInputRef={editInputRef}
|
||||
getThumbnailUrl={getThumbnailUrl}
|
||||
getOriginalUrl={getOriginalUrl}
|
||||
onImageClick={handleImageClick}
|
||||
onImageDoubleClick={handleImageDoubleClick}
|
||||
onToggleFavorite={handleToggleFavorite}
|
||||
onContextMenu={handleContextMenu}
|
||||
onDragStart={handleDragStart}
|
||||
onEditingChange={setEditingFilename}
|
||||
@@ -408,6 +472,7 @@ function ImageWaterfall() {
|
||||
renamingImage,
|
||||
editingFilename,
|
||||
getThumbnailUrl,
|
||||
getOriginalUrl,
|
||||
handleImageClick,
|
||||
handleImageDoubleClick,
|
||||
handleContextMenu,
|
||||
@@ -471,6 +536,52 @@ function ImageWaterfall() {
|
||||
>
|
||||
<DragDropOverlay isVisible={isDraggingOver} />
|
||||
<UploadProgress progress={uploadProgress} />
|
||||
|
||||
{/* 多选浮动操作条:显式删除入口(计数 = selectedImages ∪ selectedImage) */}
|
||||
{(() => {
|
||||
const union = [...selectedImages];
|
||||
if (selectedImage && !union.some(img => img.path === selectedImage.path)) {
|
||||
union.push(selectedImage);
|
||||
}
|
||||
const unionCount = union.length;
|
||||
if (unionCount <= 1) return null;
|
||||
const unionTypeCounts = typeCountsOf(union);
|
||||
return (
|
||||
<div className="absolute bottom-4 left-1/2 -translate-x-1/2 z-30 flex items-center gap-3 bg-gray-900/90 dark:bg-gray-800/90 backdrop-blur text-white rounded-full pl-5 pr-2 py-2 shadow-2xl">
|
||||
<span className="text-sm whitespace-nowrap">已选 {countLabel(unionCount, unionTypeCounts)}</span>
|
||||
<button
|
||||
onClick={() => {
|
||||
// 合拼是图片功能:过滤出图片(与 AI 生成视频入口一致),视频/文档不进画布
|
||||
const imgOnly = union.filter((img) => (img.fileType || 'image') === 'image');
|
||||
setMergeImages(imgOnly);
|
||||
setEditingImage(imgOnly[0] || union[0]);
|
||||
clearSelection();
|
||||
}}
|
||||
className="flex items-center gap-1.5 px-4 py-1.5 rounded-full bg-blue-600 hover:bg-blue-700 text-sm font-medium transition-colors"
|
||||
>
|
||||
<svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M4 5a1 1 0 011-1h6a1 1 0 011 1v6a1 1 0 01-1 1H5a1 1 0 01-1-1V5zm9 0a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1h-4a1 1 0 01-1-1V5zM4 14a1 1 0 011-1h6a1 1 0 011 1v5a1 1 0 01-1 1H5a1 1 0 01-1-1v-5zm9 1a1 1 0 001 1h4a1 1 0 001-1v-4a1 1 0 00-1-1h-4a1 1 0 00-1 1v4z" />
|
||||
</svg>
|
||||
合拼
|
||||
</button>
|
||||
<button
|
||||
onClick={handleQuickDelete}
|
||||
className="flex items-center gap-1.5 px-4 py-1.5 rounded-full bg-red-600 hover:bg-red-700 text-sm font-medium transition-colors"
|
||||
>
|
||||
<svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" />
|
||||
</svg>
|
||||
移入回收站
|
||||
</button>
|
||||
<button
|
||||
onClick={clearSelection}
|
||||
className="px-3 py-1.5 rounded-full text-sm text-gray-300 hover:text-white hover:bg-white/10 transition-colors"
|
||||
>
|
||||
取消选择
|
||||
</button>
|
||||
</div>
|
||||
);
|
||||
})()}
|
||||
|
||||
<PhotoProvider
|
||||
images={providerImages}
|
||||
@@ -536,8 +647,10 @@ function ImageWaterfall() {
|
||||
editingFilename={editingFilename}
|
||||
editInputRef={editInputRef}
|
||||
getThumbnailUrl={getThumbnailUrl}
|
||||
getOriginalUrl={getOriginalUrl}
|
||||
onImageClick={handleImageClick}
|
||||
onImageDoubleClick={handleImageDoubleClick}
|
||||
onToggleFavorite={handleToggleFavorite}
|
||||
onContextMenu={handleContextMenu}
|
||||
onDragStart={handleDragStart}
|
||||
onEditingChange={setEditingFilename}
|
||||
@@ -555,6 +668,14 @@ function ImageWaterfall() {
|
||||
)}
|
||||
</PhotoProvider>
|
||||
|
||||
{/* 灯箱底部缩略图条:只列图片(与 providerImages 同源对齐),点击跳转查看 */}
|
||||
<PhotoStrip
|
||||
images={lightboxImages}
|
||||
index={photoIndex}
|
||||
onIndexChange={setPhotoIndex}
|
||||
getThumbnailUrl={getThumbnailUrl}
|
||||
/>
|
||||
|
||||
{/* 文件查看器 */}
|
||||
{viewerFile && (
|
||||
<FileViewer
|
||||
@@ -564,6 +685,16 @@ function ImageWaterfall() {
|
||||
/>
|
||||
)}
|
||||
|
||||
{/* AI 生成视频弹窗 */}
|
||||
{aiVideoOpen && (
|
||||
<AIVideoModal
|
||||
libraryId={currentLibraryId}
|
||||
images={selectedImages}
|
||||
onClose={() => setAiVideoOpen(false)}
|
||||
onDone={() => { setAiVideoOpen(false); window.location.reload(); }}
|
||||
/>
|
||||
)}
|
||||
|
||||
{/* 右键菜单 */}
|
||||
<ContextMenu
|
||||
isOpen={contextMenu.isOpen}
|
||||
|
||||
@@ -82,7 +82,7 @@ export default function Login() {
|
||||
<div className="inline-flex items-center justify-center mb-4">
|
||||
<img
|
||||
src="/ICON_256.PNG"
|
||||
alt="FlyPic Logo"
|
||||
alt="牛仔库 Logo"
|
||||
className="w-20 h-20 object-contain"
|
||||
onError={(e) => {
|
||||
// 如果 ICON_256.PNG 加载失败,尝试 favicon.png
|
||||
@@ -91,7 +91,7 @@ export default function Login() {
|
||||
/>
|
||||
</div>
|
||||
<h1 className="text-3xl font-bold text-gray-900 dark:text-white mb-2">
|
||||
FlyPic 飞图
|
||||
牛仔库
|
||||
</h1>
|
||||
<p className="text-gray-600 dark:text-gray-400">
|
||||
{hasPassword ? '请输入密码访问' : '首次使用,请设置访问密码'}
|
||||
|
||||
@@ -9,15 +9,20 @@ import requestManager, { RequestType } from '../services/requestManager';
|
||||
import domCleanup from '../utils/domCleanup';
|
||||
import ImageWaterfall from './ImageWaterfall';
|
||||
import Dashboard from './Dashboard';
|
||||
import BatchRenameModal from './BatchRenameModal';
|
||||
import { PencilLine } from 'lucide-react';
|
||||
import { createLogger } from '../utils/logger';
|
||||
|
||||
const logger = createLogger('MainContent');
|
||||
|
||||
function MainContent() {
|
||||
const { currentLibraryId } = useLibraryStore();
|
||||
const { searchKeywords, filters, selectedFolder, setImages, setOriginalImages, imageLoadingState, images } = useImageStore();
|
||||
const { searchKeywords, filters, selectedFolder, favoritesView, setImages, setOriginalImages, imageLoadingState, images, refreshTick, folders, foldersLoaded } = useImageStore();
|
||||
const { scanProgress } = useScanStore();
|
||||
|
||||
// 搜索结果批量重命名弹窗
|
||||
const [searchRenameOpen, setSearchRenameOpen] = useState(false);
|
||||
|
||||
// 使用 ref 跟踪最新的请求上下文
|
||||
const currentRequestContextRef = useRef(null);
|
||||
// 文件夹切换防抖
|
||||
@@ -47,8 +52,8 @@ function MainContent() {
|
||||
const loadImages = useCallback(async (isInitialLoad = true) => {
|
||||
if (!currentLibraryId) return;
|
||||
|
||||
// 如果没有选中文件夹且没有搜索条件,显示 Dashboard
|
||||
if (!selectedFolder && !searchKeywords && filters.formats.length === 0) {
|
||||
// 如果没有选中文件夹且没有搜索条件,显示 Dashboard(「我的收藏」视图除外;无子文件夹的平铺库直接进瀑布)
|
||||
if (!selectedFolder && !searchKeywords && filters.formats.length === 0 && !favoritesView && (!foldersLoaded || folders.length > 0)) {
|
||||
setImages([]);
|
||||
useImageStore.getState().setImageLoadingState({
|
||||
isLoading: false,
|
||||
@@ -80,6 +85,7 @@ function MainContent() {
|
||||
limit: 100
|
||||
};
|
||||
if (selectedFolder) params.folder = selectedFolder;
|
||||
if (favoritesView) params.favorite = 1;
|
||||
if (searchKeywords) params.keywords = searchKeywords;
|
||||
if (filters.formats?.length > 0) params.formats = filters.formats.join(',');
|
||||
|
||||
@@ -128,7 +134,7 @@ function MainContent() {
|
||||
currentRequestContextRef.current = null;
|
||||
}
|
||||
}
|
||||
}, [currentLibraryId, searchKeywords, selectedFolder, setImages, setOriginalImages, cancelCurrentRequest]);
|
||||
}, [currentLibraryId, searchKeywords, selectedFolder, favoritesView, setImages, setOriginalImages, cancelCurrentRequest]);
|
||||
|
||||
// 监听文件夹/搜索变化
|
||||
useEffect(() => {
|
||||
@@ -161,7 +167,7 @@ function MainContent() {
|
||||
clearTimeout(debounceTimerRef.current);
|
||||
}
|
||||
};
|
||||
}, [currentLibraryId, searchKeywords, selectedFolder, loadImages, cancelCurrentRequest]);
|
||||
}, [currentLibraryId, searchKeywords, selectedFolder, favoritesView, refreshTick, folders, foldersLoaded, loadImages, cancelCurrentRequest]);
|
||||
|
||||
// 恢复撤销前的文件夹状态
|
||||
useEffect(() => {
|
||||
@@ -207,7 +213,7 @@ function MainContent() {
|
||||
/>
|
||||
</div>
|
||||
<div className="text-xs text-blue-600 dark:text-blue-400">
|
||||
已处理 {scanProgress?.current || 0} / {scanProgress?.total || 0} 张图片
|
||||
已处理 {scanProgress.processed} / {scanProgress.total} 个文件
|
||||
{getEstimatedTime() && ` · ${getEstimatedTime()}`}
|
||||
</div>
|
||||
</div>
|
||||
@@ -218,7 +224,7 @@ function MainContent() {
|
||||
<div className="px-4 py-2 bg-gray-100 dark:bg-gray-800 border-b border-gray-200 dark:border-gray-700">
|
||||
<div className="flex items-center justify-between text-sm">
|
||||
<span className="text-gray-600 dark:text-gray-400">
|
||||
已加载 {images.length} / {imageLoadingState.totalCount} 张
|
||||
已加载 {images.length} / {imageLoadingState.totalCount} 个文件
|
||||
</span>
|
||||
<div className="w-32 h-1.5 bg-gray-200 rounded-full overflow-hidden">
|
||||
<div
|
||||
@@ -232,10 +238,42 @@ function MainContent() {
|
||||
|
||||
{/* Content */}
|
||||
<div className="flex-1 overflow-hidden">
|
||||
{(!selectedFolder && !searchKeywords && filters.formats.length === 0) ? (
|
||||
{(!selectedFolder && !searchKeywords && filters.formats.length === 0 && !favoritesView && (!foldersLoaded || folders.length > 0)) ? (
|
||||
<Dashboard />
|
||||
) : (
|
||||
<ImageWaterfall />
|
||||
<>
|
||||
{/* 搜索结果工具条:对模糊命中的全部文件批量重命名 */}
|
||||
{searchKeywords && (
|
||||
<div className="px-3 sm:px-5 pt-3 flex items-center gap-2 flex-wrap">
|
||||
<span className="text-xs text-gray-500 dark:text-gray-400">
|
||||
搜索「{searchKeywords}」的模糊匹配结果
|
||||
</span>
|
||||
<button
|
||||
onClick={() => setSearchRenameOpen(true)}
|
||||
className="inline-flex items-center gap-1.5 text-xs px-2.5 py-1 rounded-lg bg-violet-500 text-white hover:bg-violet-600 transition-colors"
|
||||
>
|
||||
<PencilLine className="w-3.5 h-3.5" />
|
||||
批量重命名搜索结果…
|
||||
</button>
|
||||
</div>
|
||||
)}
|
||||
<ImageWaterfall />
|
||||
{/* 搜索结果批量重命名 */}
|
||||
{searchRenameOpen && (
|
||||
<BatchRenameModal
|
||||
isOpen={searchRenameOpen}
|
||||
folder={selectedFolder}
|
||||
libraryId={currentLibraryId}
|
||||
scope="search"
|
||||
keywords={searchKeywords}
|
||||
onClose={() => setSearchRenameOpen(false)}
|
||||
onFinished={() => {
|
||||
setSearchRenameOpen(false);
|
||||
useImageStore.getState().bumpRefresh();
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1,452 @@
|
||||
/**
|
||||
* MergeCollage — 多图合拼面板
|
||||
* - 常见合拼布局模板(横排/竖排/品字/宫格/一大N小)
|
||||
* - 槽位从图库选图(搜索 + 分页)
|
||||
* - 填了模型 KEY 后可 AI 自动从图库找相似图并自动合拼
|
||||
* - 合成结果通过 onMerge(blob) 交还编辑器替换底图
|
||||
*/
|
||||
import { useState, useEffect, useCallback } from 'react';
|
||||
import { X, Loader2, Sparkles } from 'lucide-react';
|
||||
import { imageAPI, settingsAPI } from '../api';
|
||||
import { getToken } from '../api/client';
|
||||
import { useUIStore } from '../stores/useUIStore';
|
||||
|
||||
/** 布局模板:cells 为归一化矩形 [x, y, w, h],aspect 为输出画布宽高比 */
|
||||
const LAYOUTS = [
|
||||
{ id: '2h', name: '两图横排', aspect: 2, cells: [[0, 0, 0.5, 1], [0.5, 0, 0.5, 1]] },
|
||||
{ id: '2v', name: '两图竖排', aspect: 0.5, cells: [[0, 0, 1, 0.5], [0, 0.5, 1, 0.5]] },
|
||||
{ id: '3h', name: '三图横排', aspect: 3, cells: [[0, 0, 1/3, 1], [1/3, 0, 1/3, 1], [2/3, 0, 1/3, 1]] },
|
||||
{ id: '3v', name: '三图竖排', aspect: 1/3, cells: [[0, 0, 1, 1/3], [0, 1/3, 1, 1/3], [0, 2/3, 1, 1/3]] },
|
||||
{ id: '1+2', name: '一大两小', aspect: 1.5, cells: [[0, 0, 0.6, 1], [0.6, 0, 0.4, 0.5], [0.6, 0.5, 0.4, 0.5]] },
|
||||
{ id: '2+1', name: '两小一大', aspect: 1.5, cells: [[0, 0, 0.5, 0.5], [0.5, 0, 0.5, 0.5], [0, 0.5, 1, 0.5]] },
|
||||
{ id: '2x2', name: '四宫格', aspect: 1, cells: [[0, 0, 0.5, 0.5], [0.5, 0, 0.5, 0.5], [0, 0.5, 0.5, 0.5], [0.5, 0.5, 0.5, 0.5]] },
|
||||
{ id: '1+3', name: '一大三小', aspect: 1, cells: [[0, 0, 0.5, 1], [0.5, 0, 0.5, 1/3], [0.5, 1/3, 0.5, 1/3], [0.5, 2/3, 0.5, 1/3]] },
|
||||
{ id: '3x2', name: '六宫格', aspect: 1.5, cells: [[0, 0, 1/3, 0.5], [1/3, 0, 1/3, 0.5], [2/3, 0, 1/3, 0.5], [0, 0.5, 1/3, 0.5], [1/3, 0.5, 1/3, 0.5], [2/3, 0.5, 1/3, 0.5]] },
|
||||
{ id: '3x3', name: '九宫格', aspect: 1, cells: Array.from({ length: 9 }, (_, i) => [(i % 3) / 3, Math.floor(i / 3) / 3, 1/3, 1/3]) }
|
||||
];
|
||||
|
||||
/** 按图片数量选默认布局:先找槽位数完全一致的,否则取能容纳的最小布局 */
|
||||
function layoutForCount(n) {
|
||||
if (n <= 1) return '2h';
|
||||
const exact = LAYOUTS.find((l) => l.cells.length === n);
|
||||
if (exact) return exact.id;
|
||||
const bigger = LAYOUTS
|
||||
.filter((l) => l.cells.length > n)
|
||||
.sort((a, b) => a.cells.length - b.cells.length);
|
||||
return bigger[0] ? bigger[0].id : '3x3';
|
||||
}
|
||||
|
||||
const GAP_OPTIONS = [
|
||||
{ value: 0, label: '无' },
|
||||
{ value: 16, label: '细' },
|
||||
{ value: 32, label: '粗' }
|
||||
];
|
||||
|
||||
/** 缩略图 URL(无缩略图时回退原图) */
|
||||
function thumbUrl(libId, rec) {
|
||||
if (!rec) return '';
|
||||
if (rec.thumbnailPath) {
|
||||
const fn = rec.thumbnailPath.replace(/\\/g, '/').split('/').pop();
|
||||
return imageAPI.getThumbnailUrl(libId, fn, rec.modifiedAt);
|
||||
}
|
||||
return imageAPI.getOriginalUrl(libId, rec.path);
|
||||
}
|
||||
|
||||
function loadImg(src) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const im = new Image();
|
||||
im.onload = () => resolve(im);
|
||||
im.onerror = () => reject(new Error('图片加载失败: ' + src));
|
||||
im.src = src;
|
||||
});
|
||||
}
|
||||
|
||||
export default function MergeCollage({ image, libraryId, onMerge, setStatus, setBusy }) {
|
||||
const [layoutId, setLayoutId] = useState('2h');
|
||||
const [slots, setSlots] = useState([image, null]);
|
||||
const [gap, setGap] = useState(16);
|
||||
const [keyReady, setKeyReady] = useState(null); // null=未检查
|
||||
const [pickerFor, setPickerFor] = useState(null); // 正在选图的槽位下标
|
||||
const [pickQuery, setPickQuery] = useState('');
|
||||
const [pickImages, setPickImages] = useState([]);
|
||||
const [pickOffset, setPickOffset] = useState(0);
|
||||
const [pickHasMore, setPickHasMore] = useState(false);
|
||||
const [pickLoading, setPickLoading] = useState(false);
|
||||
|
||||
const layout = LAYOUTS.find((l) => l.id === layoutId) || LAYOUTS[0];
|
||||
const filled = slots.filter(Boolean).length;
|
||||
|
||||
// 打开时:有多选种子图则自动填槽 + 选布局;否则当前图为第 1 格
|
||||
useEffect(() => {
|
||||
const st = useUIStore.getState();
|
||||
const seeds = st.mergeImages;
|
||||
if (seeds && seeds.length >= 1) {
|
||||
const lid = layoutForCount(seeds.length);
|
||||
const L = LAYOUTS.find((l) => l.id === lid);
|
||||
setLayoutId(lid);
|
||||
setSlots(L.cells.map((_, i) => seeds[i] || null));
|
||||
st.setMergeImages(null);
|
||||
} else {
|
||||
setLayoutId('2h');
|
||||
setSlots([image, null]);
|
||||
}
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [image && image.path]);
|
||||
|
||||
// 检查模型 KEY 是否已配置
|
||||
useEffect(() => {
|
||||
settingsAPI.getSettings()
|
||||
.then((d) => setKeyReady(!!(d.online && d.online.configured)))
|
||||
.catch(() => setKeyReady(null));
|
||||
}, []);
|
||||
|
||||
// 退出时清掉未消费的种子,避免下次误触发
|
||||
useEffect(() => () => useUIStore.getState().setMergeImages(null), []);
|
||||
|
||||
const changeLayout = useCallback((id) => {
|
||||
setLayoutId(id);
|
||||
const L = LAYOUTS.find((l) => l.id === id);
|
||||
setSlots((prev) => L.cells.map((_, i) => prev[i] || null));
|
||||
}, []);
|
||||
|
||||
// ---------- 图库选择器 ----------
|
||||
const loadPicker = useCallback(async (offset, kw) => {
|
||||
setPickLoading(true);
|
||||
try {
|
||||
const params = { offset, limit: 48 };
|
||||
if (kw && kw.trim()) params.keywords = kw.trim();
|
||||
const r = await imageAPI.search(libraryId, params);
|
||||
setPickImages((prev) => (offset === 0 ? r.images : [...prev, ...r.images]));
|
||||
setPickOffset(offset + (r.images ? r.images.length : 0));
|
||||
setPickHasMore(!!r.hasMore);
|
||||
} catch (e) {
|
||||
setStatus('加载图库失败: ' + (e.message || ''));
|
||||
} finally {
|
||||
setPickLoading(false);
|
||||
}
|
||||
}, [libraryId, setStatus]);
|
||||
|
||||
const openPicker = (idx) => {
|
||||
setPickerFor(idx);
|
||||
setPickQuery('');
|
||||
setPickImages([]);
|
||||
setPickOffset(0);
|
||||
loadPicker(0, '');
|
||||
};
|
||||
|
||||
const pickSearch = () => {
|
||||
setPickImages([]);
|
||||
loadPicker(0, pickQuery);
|
||||
};
|
||||
|
||||
const assignSlot = (rec) => {
|
||||
setSlots((prev) => {
|
||||
const next = [...prev];
|
||||
next[pickerFor] = rec;
|
||||
return next;
|
||||
});
|
||||
setPickerFor(null);
|
||||
};
|
||||
|
||||
// ---------- 合成渲染 ----------
|
||||
const doRender = useCallback(async (slotList) => {
|
||||
const cells = layout.cells;
|
||||
const list = slotList || slots;
|
||||
const usable = list.filter(Boolean);
|
||||
if (usable.length < 2) {
|
||||
setStatus('至少需要 2 张图片才能合拼');
|
||||
return;
|
||||
}
|
||||
let W, H;
|
||||
if (layout.aspect >= 1) { W = 2000; H = Math.round(2000 / layout.aspect); }
|
||||
else { H = 2000; W = Math.round(2000 * layout.aspect); }
|
||||
const off = document.createElement('canvas');
|
||||
off.width = W;
|
||||
off.height = H;
|
||||
const ctx = off.getContext('2d');
|
||||
ctx.fillStyle = '#ffffff';
|
||||
ctx.fillRect(0, 0, W, H);
|
||||
const g = gap;
|
||||
try {
|
||||
let done = 0;
|
||||
for (let i = 0; i < cells.length; i++) {
|
||||
const rec = list[i];
|
||||
if (!rec) continue;
|
||||
done += 1;
|
||||
setBusy(`合拼生成中 ${done}/${usable.length}`);
|
||||
const [cx, cy, cw, ch] = cells[i];
|
||||
const x = cx * W + g / 2;
|
||||
const y = cy * H + g / 2;
|
||||
const w = cw * W - g;
|
||||
const h = ch * H - g;
|
||||
const im = await loadImg(imageAPI.getOriginalUrl(libraryId, rec.path));
|
||||
const s = Math.max(w / im.width, h / im.height);
|
||||
const dw = im.width * s;
|
||||
const dh = im.height * s;
|
||||
ctx.save();
|
||||
ctx.beginPath();
|
||||
ctx.rect(x, y, w, h);
|
||||
ctx.clip();
|
||||
ctx.drawImage(im, x + (w - dw) / 2, y + (h - dh) / 2, dw, dh);
|
||||
ctx.restore();
|
||||
im.onload = null;
|
||||
im.src = '';
|
||||
}
|
||||
const blob = await new Promise((res, rej) =>
|
||||
off.toBlob((b) => (b ? res(b) : rej(new Error('画布导出失败'))), 'image/png')
|
||||
);
|
||||
await onMerge(blob);
|
||||
setStatus(`合拼完成(${usable.length} 张 · ${W}×${H}),可继续编辑后保存`);
|
||||
} catch (e) {
|
||||
setStatus('合拼失败: ' + (e.message || ''));
|
||||
} finally {
|
||||
setBusy('');
|
||||
}
|
||||
}, [layout, slots, gap, libraryId, onMerge, setStatus, setBusy]);
|
||||
|
||||
// ---------- AI 自动找相似图并合拼 ----------
|
||||
const aiAutoMerge = async () => {
|
||||
const emptyIdx = slots.map((s, i) => (s ? null : i)).filter((i) => i !== null);
|
||||
if (!emptyIdx.length) {
|
||||
return doRender(slots);
|
||||
}
|
||||
const seedRec = slots.find(Boolean) || image;
|
||||
if (keyReady === false) {
|
||||
setStatus('未配置模型 KEY:请到 设置 → OCR 识别 填写线上模型接口和 KEY');
|
||||
return;
|
||||
}
|
||||
setBusy('AI 正在图库中找相似图');
|
||||
try {
|
||||
const resp = await fetch('/api/edit/find-similar', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
Authorization: `Bearer ${getToken()}`
|
||||
},
|
||||
body: JSON.stringify({
|
||||
libraryId,
|
||||
seedPath: seedRec.path,
|
||||
count: emptyIdx.length,
|
||||
excludePaths: slots.filter(Boolean).map((s) => s.path)
|
||||
})
|
||||
});
|
||||
const j = await resp.json().catch(() => ({}));
|
||||
if (!resp.ok) {
|
||||
throw new Error((j.error && j.error.message) || `请求失败 (${resp.status})`);
|
||||
}
|
||||
const next = [...slots];
|
||||
(j.images || []).forEach((img, k) => {
|
||||
if (k < emptyIdx.length) next[emptyIdx[k]] = img;
|
||||
});
|
||||
setSlots(next);
|
||||
setStatus(`AI 找到 ${(j.images || []).length} 张相似图,正在合拼…`);
|
||||
await doRender(next);
|
||||
} catch (e) {
|
||||
setStatus('AI 合拼失败: ' + (e.message || ''));
|
||||
setBusy('');
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="space-y-3">
|
||||
{/* 布局模板 */}
|
||||
<div className="text-xs font-semibold text-gray-600 dark:text-gray-300">合拼布局</div>
|
||||
<div className="grid grid-cols-2 gap-1.5">
|
||||
{LAYOUTS.map((L) => {
|
||||
const active = L.id === layoutId;
|
||||
return (
|
||||
<button
|
||||
key={L.id}
|
||||
onClick={() => changeLayout(L.id)}
|
||||
className={`p-1.5 rounded-lg border transition-colors ${
|
||||
active
|
||||
? 'border-blue-500 bg-blue-50 dark:bg-blue-900/30'
|
||||
: 'border-gray-200 dark:border-gray-600 hover:border-blue-300'
|
||||
}`}
|
||||
>
|
||||
<div
|
||||
className="relative w-full bg-gray-100 dark:bg-gray-700 rounded overflow-hidden"
|
||||
style={{ paddingBottom: `${(1 / L.aspect) * 100}%` }}
|
||||
>
|
||||
{L.cells.map((c, i) => (
|
||||
<span
|
||||
key={i}
|
||||
className={`absolute ${active ? 'bg-blue-400' : 'bg-gray-300 dark:bg-gray-500'}`}
|
||||
style={{
|
||||
left: `${c[0] * 100}%`,
|
||||
top: `${c[1] * 100}%`,
|
||||
width: `${c[2] * 100}%`,
|
||||
height: `${c[3] * 100}%`,
|
||||
border: '1px solid rgba(255,255,255,0.85)',
|
||||
boxSizing: 'border-box'
|
||||
}}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
<div className={`text-[10px] text-center mt-1 ${active ? 'text-blue-600 dark:text-blue-400' : 'text-gray-500'}`}>
|
||||
{L.name} · {L.cells.length}图
|
||||
</div>
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
|
||||
{/* 槽位 */}
|
||||
<div className="flex items-center justify-between">
|
||||
<div className="text-xs font-semibold text-gray-600 dark:text-gray-300">图片槽位</div>
|
||||
<div className="text-[10px] text-gray-400">{filled}/{layout.cells.length} 已选</div>
|
||||
</div>
|
||||
<div className="grid grid-cols-3 gap-1.5">
|
||||
{layout.cells.map((_, i) => {
|
||||
const rec = slots[i];
|
||||
return (
|
||||
<div key={i} className="relative group aspect-square">
|
||||
<button
|
||||
onClick={() => openPicker(i)}
|
||||
className="w-full h-full rounded border border-dashed border-gray-300 dark:border-gray-600 overflow-hidden hover:border-blue-400 transition-colors flex items-center justify-center bg-gray-50 dark:bg-gray-700/50"
|
||||
title={rec ? '点击换图' : '点击从图库选图'}
|
||||
>
|
||||
{rec ? (
|
||||
<img src={thumbUrl(libraryId, rec)} alt="" className="w-full h-full object-cover" />
|
||||
) : (
|
||||
<span className="text-gray-400 text-lg">+</span>
|
||||
)}
|
||||
</button>
|
||||
{rec && (
|
||||
<button
|
||||
onClick={() => setSlots((prev) => { const n = [...prev]; n[i] = null; return n; })}
|
||||
className="absolute -top-1 -right-1 w-4 h-4 rounded-full bg-red-500 text-white items-center justify-center hidden group-hover:flex leading-none text-[10px]"
|
||||
title="清空此槽"
|
||||
>
|
||||
<X className="w-3 h-3" />
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
|
||||
{/* 间距 */}
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="text-xs text-gray-500 dark:text-gray-400">图片间距</span>
|
||||
<div className="flex gap-1">
|
||||
{GAP_OPTIONS.map((o) => (
|
||||
<button
|
||||
key={o.value}
|
||||
onClick={() => setGap(o.value)}
|
||||
className={`px-2 py-0.5 rounded text-[11px] border transition-colors ${
|
||||
gap === o.value
|
||||
? 'border-blue-500 text-blue-600 bg-blue-50 dark:bg-blue-900/30'
|
||||
: 'border-gray-200 dark:border-gray-600 text-gray-500'
|
||||
}`}
|
||||
>
|
||||
{o.label}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* AI 自动合拼 */}
|
||||
<button
|
||||
onClick={aiAutoMerge}
|
||||
disabled={filled < 1}
|
||||
className="w-full py-2 rounded-lg bg-gradient-to-r from-violet-500 to-fuchsia-500 text-white text-sm hover:opacity-90 disabled:opacity-50 transition-opacity flex items-center justify-center gap-1.5"
|
||||
>
|
||||
<Sparkles className="w-4 h-4" />
|
||||
AI 自动找相似图并合拼
|
||||
</button>
|
||||
{keyReady === false && (
|
||||
<p className="text-[11px] text-amber-600 dark:text-amber-400 leading-relaxed">
|
||||
未配置模型 KEY:到 设置 → OCR 识别 填写线上模型接口和 API Key 后,AI 可自动从图库找相似图。
|
||||
</p>
|
||||
)}
|
||||
<p className="text-[11px] text-gray-400 leading-relaxed">
|
||||
「AI 自动合拼」以第 1 张为参考,从图库找相似图填满空槽并直接生成;也可手动点槽选图后点下方按钮生成。
|
||||
</p>
|
||||
|
||||
<button
|
||||
onClick={() => doRender(slots)}
|
||||
disabled={filled < 2}
|
||||
className="w-full py-2 rounded-lg bg-blue-600 text-white text-sm hover:bg-blue-700 disabled:opacity-50 transition-colors"
|
||||
>
|
||||
生成合拼({filled} 张)
|
||||
</button>
|
||||
|
||||
{/* 图库选择器 */}
|
||||
{pickerFor !== null && (
|
||||
<div
|
||||
className="fixed inset-0 z-[60] bg-black/60 flex items-center justify-center p-4"
|
||||
onClick={() => setPickerFor(null)}
|
||||
>
|
||||
<div
|
||||
className="bg-white dark:bg-gray-800 rounded-xl shadow-2xl w-full max-w-3xl max-h-[80vh] flex flex-col"
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
>
|
||||
<div className="flex items-center gap-2 px-4 py-3 border-b border-gray-200 dark:border-gray-700">
|
||||
<span className="text-sm font-medium text-gray-700 dark:text-gray-200 flex-shrink-0">
|
||||
选择图片(第 {pickerFor + 1} 格)
|
||||
</span>
|
||||
<input
|
||||
value={pickQuery}
|
||||
onChange={(e) => setPickQuery(e.target.value)}
|
||||
onKeyDown={(e) => e.key === 'Enter' && pickSearch()}
|
||||
placeholder="搜索文件名…"
|
||||
className="flex-1 min-w-0 text-sm rounded border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-700 px-2 py-1.5 outline-none focus:border-blue-400"
|
||||
/>
|
||||
<button
|
||||
onClick={pickSearch}
|
||||
className="px-3 py-1.5 text-sm rounded bg-blue-600 text-white hover:bg-blue-700 flex-shrink-0"
|
||||
>
|
||||
搜索
|
||||
</button>
|
||||
<button
|
||||
onClick={() => setPickerFor(null)}
|
||||
className="p-1.5 rounded text-gray-400 hover:text-gray-600 hover:bg-gray-100 dark:hover:bg-gray-700 flex-shrink-0"
|
||||
>
|
||||
<X className="w-4 h-4" />
|
||||
</button>
|
||||
</div>
|
||||
<div className="flex-1 overflow-y-auto p-3">
|
||||
<div className="grid grid-cols-4 sm:grid-cols-6 gap-2">
|
||||
{pickImages.map((img) => (
|
||||
<button
|
||||
key={img.path}
|
||||
onClick={() => assignSlot(img)}
|
||||
className="aspect-square rounded overflow-hidden border border-gray-200 dark:border-gray-600 hover:border-blue-500 hover:ring-1 hover:ring-blue-500 transition-all"
|
||||
title={img.filename}
|
||||
>
|
||||
<img
|
||||
src={thumbUrl(libraryId, img)}
|
||||
alt={img.filename}
|
||||
loading="lazy"
|
||||
className="w-full h-full object-cover"
|
||||
/>
|
||||
</button>
|
||||
))}
|
||||
{!pickImages.length && !pickLoading && (
|
||||
<div className="col-span-full text-center text-sm text-gray-400 py-8">没有找到图片</div>
|
||||
)}
|
||||
{pickLoading && (
|
||||
<div className="col-span-full flex items-center justify-center gap-2 text-sm text-gray-400 py-8">
|
||||
<Loader2 className="w-4 h-4 animate-spin" /> 加载中…
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
{pickHasMore && (
|
||||
<div className="px-4 py-2.5 border-t border-gray-200 dark:border-gray-700 text-center">
|
||||
<button
|
||||
onClick={() => loadPicker(pickOffset, pickQuery)}
|
||||
disabled={pickLoading}
|
||||
className="px-4 py-1.5 text-sm rounded border border-gray-300 dark:border-gray-600 text-gray-600 dark:text-gray-300 hover:bg-gray-50 dark:hover:bg-gray-700 disabled:opacity-50"
|
||||
>
|
||||
加载更多(已 {pickImages.length} 张)
|
||||
</button>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -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
|
||||
);
|
||||
}
|
||||
@@ -40,7 +40,7 @@ function RatingToast({ isVisible, rating, count, onClose, duration = 2000 }) {
|
||||
</div>
|
||||
<span className="text-sm font-medium">
|
||||
{rating === 0 ? '已取消评分' : `已评 ${rating} 星`}
|
||||
{count > 1 ? ` (${count} 张)` : ''}
|
||||
{count > 1 ? ` (${count} 个)` : ''}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -9,13 +9,14 @@ import { imageAPI, fileAPI } from '../api';
|
||||
import JSZip from 'jszip';
|
||||
import RatingStars from './RatingStars';
|
||||
import { createLogger } from '../utils/logger';
|
||||
import { typeMeta, typeCountsOf, countLabel, typeLabelOf } from '../utils/fileTypes';
|
||||
|
||||
const logger = createLogger('RightPanel');
|
||||
|
||||
function RightPanel() {
|
||||
const { currentLibraryId } = useLibraryStore();
|
||||
const { selectedImage, selectedImages, selectedFolder, selectedFolderItem, images, setSelectedImage, setSelectedImages, updateImage } = useImageStore();
|
||||
const { setMobileView, isResizingPanels, resizingSide } = useUIStore();
|
||||
const { setMobileView, isResizingPanels, resizingSide, setEditingImage, setVideoEditFile } = useUIStore();
|
||||
const { copyToClipboard } = useClipboardStore();
|
||||
const [isMobile, setIsMobile] = useState(false);
|
||||
const [imageUrl, setImageUrl] = useState(''); // 当前显示的图片URL
|
||||
@@ -50,6 +51,8 @@ function RightPanel() {
|
||||
// 判断是单选还是多选
|
||||
const isMultiSelect = actualSelectedCount > 1;
|
||||
const displayImage = selectedImages.length > 0 ? selectedImages[0] : selectedImage;
|
||||
// 视频文件判定:右侧面板按文件类型展示,视频不再套用图片文案/操作
|
||||
const singleIsVideo = !isMultiSelect && (displayImage?.fileType === 'video');
|
||||
const { getCurrentLibrary } = useLibraryStore();
|
||||
const currentLibrary = getCurrentLibrary();
|
||||
|
||||
@@ -319,7 +322,7 @@ function RightPanel() {
|
||||
setSelectedImages(updatedSelectedImages);
|
||||
}
|
||||
|
||||
logger.file(`已更新 ${paths.length} 张图片的评分为 ${newRating} 星`);
|
||||
logger.file(`已更新 ${paths.length} 个文件的评分为 ${newRating} 星`);
|
||||
} catch (error) {
|
||||
logger.error('更新评分失败:', error);
|
||||
alert('更新评分失败: ' + (error.message || '未知错误'));
|
||||
@@ -423,7 +426,7 @@ function RightPanel() {
|
||||
}
|
||||
// Handle both forward and backslash
|
||||
const filename = thumbnailPath.replace(/\\/g, '/').split('/').pop();
|
||||
return imageAPI.getThumbnailUrl(currentLibraryId, filename);
|
||||
return imageAPI.getThumbnailUrl(currentLibraryId, filename, selectedImage?.modifiedAt);
|
||||
};
|
||||
|
||||
const getOriginalUrl = () => {
|
||||
@@ -597,7 +600,14 @@ function RightPanel() {
|
||||
|
||||
// 2. 获取原图URL,写入系统剪贴板
|
||||
const imageUrl = imageAPI.getOriginalUrl(currentLibraryId, selectedImage.path);
|
||||
|
||||
|
||||
// 视频无法转换为图片写入系统剪贴板,仅保留应用内复制(供粘贴移动)
|
||||
if (selectedImage?.fileType === 'video') {
|
||||
setImageCopied(true);
|
||||
setTimeout(() => setImageCopied(false), 2000);
|
||||
return;
|
||||
}
|
||||
|
||||
// 方案1:尝试现代 Clipboard API(需要 HTTPS)
|
||||
if (isClipboardApiSupported()) {
|
||||
try {
|
||||
@@ -770,6 +780,10 @@ function RightPanel() {
|
||||
return selectedImage ? [selectedImage] : [];
|
||||
};
|
||||
|
||||
// 选中集合类型计数(由类型注册表驱动文案:图片/视频/文档…混合自动按"文件")
|
||||
const selectionTypeCounts = typeCountsOf(getImagesToProcess());
|
||||
const selectionTypeLabel = typeLabelOf(selectionTypeCounts);
|
||||
|
||||
// 批量复制图片
|
||||
const copyMultipleImages = async () => {
|
||||
try {
|
||||
@@ -920,7 +934,7 @@ function RightPanel() {
|
||||
setExportProgress(100);
|
||||
const link = document.createElement('a');
|
||||
link.href = URL.createObjectURL(zipBlob);
|
||||
link.download = `FlyPic_导出_${imagesToExport.length}张_${Date.now()}.zip`;
|
||||
link.download = `牛仔库_导出_${imagesToExport.length}张_${Date.now()}.zip`;
|
||||
document.body.appendChild(link);
|
||||
link.click();
|
||||
document.body.removeChild(link);
|
||||
@@ -1083,15 +1097,16 @@ function RightPanel() {
|
||||
|
||||
const totalCount = folderImages.length;
|
||||
const totalSize = folderImages.reduce((sum, img) => sum + (img.size || 0), 0);
|
||||
|
||||
return { totalCount, totalSize };
|
||||
const folderTypeCounts = typeCountsOf(folderImages);
|
||||
|
||||
return { totalCount, totalSize, folderTypeCounts };
|
||||
};
|
||||
|
||||
// ========== 文件夹详情渲染 ==========
|
||||
if (isShowingFolder) {
|
||||
const folderPath = selectedFolderItem.path;
|
||||
const folderName = selectedFolderItem.name;
|
||||
const { totalCount, totalSize } = getFolderStats(folderPath);
|
||||
const { totalCount, totalSize, folderTypeCounts } = getFolderStats(folderPath);
|
||||
const fullPath = currentLibrary?.path
|
||||
? normalizePath(`${currentLibrary.path}${getPathSeparator()}${folderPath}`)
|
||||
: folderPath;
|
||||
@@ -1148,8 +1163,8 @@ function RightPanel() {
|
||||
)}
|
||||
</div>
|
||||
<div>
|
||||
<span className="text-gray-500 dark:text-gray-400">包含图片:</span>
|
||||
<p className="text-gray-900 dark:text-gray-100">{totalCount} 张(含子文件夹)</p>
|
||||
<span className="text-gray-500 dark:text-gray-400">包含:</span>
|
||||
<p className="text-gray-900 dark:text-gray-100">{countLabel(totalCount, folderTypeCounts)}(含子文件夹)</p>
|
||||
</div>
|
||||
<div>
|
||||
<span className="text-gray-500 dark:text-gray-400">总大小:</span>
|
||||
@@ -1200,7 +1215,7 @@ function RightPanel() {
|
||||
<span>
|
||||
{isExportingFolder
|
||||
? `打包中... ${folderExportProgress}%`
|
||||
: `导出文件夹 (${totalCount} 张)`
|
||||
: `导出文件夹 (${countLabel(totalCount, folderTypeCounts)})`
|
||||
}
|
||||
</span>
|
||||
</div>
|
||||
@@ -1251,7 +1266,7 @@ function RightPanel() {
|
||||
}
|
||||
}
|
||||
}}
|
||||
title="双击查看第一张图片"
|
||||
title="双击查看原文件"
|
||||
>
|
||||
{(() => {
|
||||
const imagesToShow = getImagesToProcess().slice(0, 5);
|
||||
@@ -1312,7 +1327,16 @@ function RightPanel() {
|
||||
}}
|
||||
title="双击查看原文件"
|
||||
>
|
||||
{imageUrl ? (
|
||||
{singleIsVideo ? (
|
||||
// 视频:直接播放原文件(不再以图片缩略图形式展示)
|
||||
<video
|
||||
src={getOriginalUrl()}
|
||||
poster={imageUrl || undefined}
|
||||
controls
|
||||
preload="metadata"
|
||||
className="w-full h-full object-contain bg-black"
|
||||
/>
|
||||
) : imageUrl ? (
|
||||
<img
|
||||
src={imageUrl}
|
||||
alt={displayImage.filename}
|
||||
@@ -1346,7 +1370,7 @@ function RightPanel() {
|
||||
<div className="flex-1 overflow-y-auto p-4 space-y-4 min-h-0">
|
||||
<div>
|
||||
<h3 className="text-xs font-semibold text-gray-700 dark:text-gray-300 mb-2">
|
||||
{isMultiSelect ? `已选择 ${actualSelectedCount} 张图片` : '基本信息'}
|
||||
{isMultiSelect ? `已选择 ${countLabel(actualSelectedCount, selectionTypeCounts)}` : '基本信息'}
|
||||
</h3>
|
||||
<div className="space-y-2 text-xs">
|
||||
{isMultiSelect ? (
|
||||
@@ -1359,7 +1383,7 @@ function RightPanel() {
|
||||
<>
|
||||
<div>
|
||||
<span className="text-gray-500 dark:text-gray-400">数量:</span>
|
||||
<p className="text-gray-900 dark:text-gray-100 text-xs">{stats.count} 张图片</p>
|
||||
<p className="text-gray-900 dark:text-gray-100 text-xs">{countLabel(stats.count, selectionTypeCounts)}</p>
|
||||
</div>
|
||||
<div>
|
||||
<span className="text-gray-500 dark:text-gray-400">评分:</span>
|
||||
@@ -1492,6 +1516,14 @@ function RightPanel() {
|
||||
<span className="text-gray-500 dark:text-gray-400">尺寸:</span>
|
||||
<p className="text-gray-900 dark:text-gray-100 text-xs">{selectedImage.width} × {selectedImage.height}</p>
|
||||
</div>
|
||||
{singleIsVideo && selectedImage.duration > 0 && (
|
||||
<div>
|
||||
<span className="text-gray-500 dark:text-gray-400">时长:</span>
|
||||
<p className="text-gray-900 dark:text-gray-100 text-xs font-mono tabular-nums">
|
||||
{Math.floor(selectedImage.duration / 60)}:{String(Math.floor(selectedImage.duration % 60)).padStart(2, '0')}
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
<div>
|
||||
<span className="text-gray-500 dark:text-gray-400">文件大小:</span>
|
||||
<p className="text-gray-900 dark:text-gray-100 text-xs">{formatFileSize(selectedImage.size)}</p>
|
||||
@@ -1552,7 +1584,7 @@ function RightPanel() {
|
||||
</div>
|
||||
{isMultiSelect && (
|
||||
<p className="text-xs text-gray-400 dark:text-gray-500 mt-1">
|
||||
已选择 {actualSelectedCount} 张图片的共同父路径
|
||||
已选择 {countLabel(actualSelectedCount, selectionTypeCounts)}的共同父路径
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
@@ -1563,6 +1595,25 @@ function RightPanel() {
|
||||
{/* Actions - 仅桌面端显示 */}
|
||||
{!isMobile && (
|
||||
<div className="p-4 border-t border-gray-200 dark:border-gray-700 space-y-2 flex-shrink-0">
|
||||
{/* 编辑图片/视频(单选时) */}
|
||||
{!isMultiSelect && selectedImage && (
|
||||
<button
|
||||
onClick={() => {
|
||||
if (singleIsVideo) {
|
||||
// 视频 → 视频编辑弹窗(水印/字幕声音)
|
||||
setVideoEditFile(selectedImage);
|
||||
} else {
|
||||
setEditingImage(selectedImage);
|
||||
}
|
||||
}}
|
||||
className="w-full flex items-center justify-center gap-2 px-4 py-2 rounded-lg bg-blue-600 text-white hover:bg-blue-700 transition-colors"
|
||||
>
|
||||
<svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z" />
|
||||
</svg>
|
||||
{singleIsVideo ? '编辑视频' : '编辑图片'}
|
||||
</button>
|
||||
)}
|
||||
{/* 复制按钮 */}
|
||||
<button
|
||||
onClick={copyMultipleImages}
|
||||
@@ -1575,12 +1626,14 @@ function RightPanel() {
|
||||
{imageCopied ? (
|
||||
<>
|
||||
<Check className="w-4 h-4" />
|
||||
<span>已复制{isMultiSelect ? ` ${actualSelectedCount} 张` : ''}</span>
|
||||
<span>已复制{isMultiSelect ? ` ${countLabel(actualSelectedCount, selectionTypeCounts)}` : ''}</span>
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<Copy className="w-4 h-4" />
|
||||
<span>复制图片{isMultiSelect ? ` (${actualSelectedCount})` : ''}</span>
|
||||
<span>
|
||||
{`复制${singleIsVideo ? '视频' : selectionTypeLabel}${isMultiSelect ? ` (${actualSelectedCount})` : ''}`}
|
||||
</span>
|
||||
</>
|
||||
)}
|
||||
</button>
|
||||
@@ -1596,7 +1649,7 @@ function RightPanel() {
|
||||
<span>
|
||||
{isExporting
|
||||
? `打包中... ${exportProgress}%`
|
||||
: `导出图片${isMultiSelect ? ` (${actualSelectedCount})` : ''}`
|
||||
: `导出${singleIsVideo ? '视频' : selectionTypeLabel}${isMultiSelect ? ` (${actualSelectedCount})` : ''}`
|
||||
}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import { useState, useEffect } from 'react';
|
||||
import { X, ScanText, Info, Save, FlaskConical, Github, ExternalLink } from 'lucide-react';
|
||||
import { settingsAPI } from '../api';
|
||||
import { X, ScanText, Info, Save, FlaskConical, Github, ExternalLink, Wand2, Film } from 'lucide-react';
|
||||
import { settingsAPI, aigenAPI } from '../api';
|
||||
|
||||
const APP_VERSION = 'v1.2.0';
|
||||
const APP_VERSION = 'v1.4.14';
|
||||
const REPO_URL = 'https://gitea.88531.cn/jinghui/flypic';
|
||||
|
||||
/**
|
||||
@@ -10,20 +10,30 @@ const REPO_URL = 'https://gitea.88531.cn/jinghui/flypic';
|
||||
* - OCR 识别:本地 tesseract / 线上接口切换、线上参数、测试
|
||||
* - 关于:版本号 / 开源地址
|
||||
*/
|
||||
export default function SettingsModal({ open, onClose, versionLabel }) {
|
||||
export default function SettingsModal({ open, onClose, versionLabel, initialTab }) {
|
||||
const [active, setActive] = useState('ocr');
|
||||
const [cfg, setCfg] = useState(null); // { provider, online:{url,model,apiKeyMasked} }
|
||||
const [apiKeyInput, setApiKeyInput] = useState(''); // 新密钥(留空=保持原密钥)
|
||||
const [ig, setIg] = useState(null); // imagegen 配置
|
||||
const [igNewKey, setIgNewKey] = useState(''); // NewAPI 新密钥
|
||||
const [igCustomKey, setIgCustomKey] = useState(''); // 自定义提供商新密钥
|
||||
const [igGroups, setIgGroups] = useState([]); // 内置模型分组(默认模型下拉用)
|
||||
const [va, setVa] = useState(null); // AI 视频文本模型配置
|
||||
const [vaKey, setVaKey] = useState(''); // AI 视频新密钥
|
||||
const [saving, setSaving] = useState(false);
|
||||
const [testing, setTesting] = useState(false);
|
||||
const [msg, setMsg] = useState(null); // { type, text }
|
||||
|
||||
useEffect(() => {
|
||||
if (!open) return;
|
||||
if (initialTab) setActive(initialTab);
|
||||
setMsg(null);
|
||||
setApiKeyInput('');
|
||||
setIgNewKey('');
|
||||
setIgCustomKey('');
|
||||
setVaKey('');
|
||||
settingsAPI.getSettings()
|
||||
.then((d) => setCfg({
|
||||
.then((d) => { setCfg({
|
||||
provider: d?.provider || 'local',
|
||||
online: {
|
||||
url: d?.online?.url || 'https://ai.88531.cn/v1',
|
||||
@@ -31,8 +41,35 @@ export default function SettingsModal({ open, onClose, versionLabel }) {
|
||||
apiKeyMasked: d?.online?.apiKeyMasked || ''
|
||||
},
|
||||
telemetry: d?.telemetry !== false
|
||||
}))
|
||||
});
|
||||
setIg({
|
||||
provider: d?.imagegen?.provider || 'newapi',
|
||||
newapi: {
|
||||
url: d?.imagegen?.newapi?.url || 'http://192.168.68.19:3099/v1',
|
||||
model: d?.imagegen?.newapi?.model || 'flux-schnell',
|
||||
apiKeyMasked: d?.imagegen?.newapi?.apiKeyMasked || '',
|
||||
hasKey: !!d?.imagegen?.newapi?.hasKey
|
||||
},
|
||||
custom: {
|
||||
url: d?.imagegen?.custom?.url || '',
|
||||
model: d?.imagegen?.custom?.model || '',
|
||||
apiKeyMasked: d?.imagegen?.custom?.apiKeyMasked || ''
|
||||
}
|
||||
});
|
||||
setVa({
|
||||
provider: d?.videoai?.provider === 'custom' ? 'custom' : 'inherit',
|
||||
custom: {
|
||||
url: d?.videoai?.custom?.url || '',
|
||||
model: d?.videoai?.custom?.model || '',
|
||||
apiKeyMasked: d?.videoai?.custom?.apiKeyMasked || '',
|
||||
configured: !!d?.videoai?.custom?.configured
|
||||
}
|
||||
});
|
||||
})
|
||||
.catch((e) => setMsg({ type: 'error', text: '读取设置失败: ' + (e.data?.message || e.message) }));
|
||||
aigenAPI.getModels()
|
||||
.then((d) => setIgGroups(d.groups || []))
|
||||
.catch(() => setIgGroups([]));
|
||||
}, [open]);
|
||||
|
||||
if (!open) return null;
|
||||
@@ -51,11 +88,65 @@ export default function SettingsModal({ open, onClose, versionLabel }) {
|
||||
model: cfg.online.model,
|
||||
apiKey: apiKeyInput // 空字符串 = 保留原密钥
|
||||
}
|
||||
}
|
||||
},
|
||||
...(ig ? {
|
||||
imagegen: {
|
||||
provider: ig.provider,
|
||||
newapi: {
|
||||
url: ig.newapi.url,
|
||||
model: ig.newapi.model || 'flux-schnell',
|
||||
apiKey: igNewKey || '' // 空 = 保持原密钥
|
||||
},
|
||||
custom: {
|
||||
url: ig.custom.url,
|
||||
model: ig.custom.model,
|
||||
apiKey: igCustomKey || ''
|
||||
}
|
||||
}
|
||||
} : {}),
|
||||
...(va ? {
|
||||
videoai: {
|
||||
provider: va.provider,
|
||||
custom: {
|
||||
url: va.custom.url,
|
||||
model: va.custom.model,
|
||||
apiKey: vaKey || ''
|
||||
}
|
||||
}
|
||||
} : {})
|
||||
};
|
||||
const data = await settingsAPI.updateSettings(payload);
|
||||
setCfg((c) => ({ ...(c || {}), ...data, online: { ...(c?.online || {}), ...(data?.online || {}) } }));
|
||||
if (data?.imagegen) {
|
||||
setIg({
|
||||
provider: data.imagegen.provider || 'newapi',
|
||||
newapi: {
|
||||
url: data.imagegen.newapi?.url || '',
|
||||
apiKeyMasked: data.imagegen.newapi?.apiKeyMasked || '',
|
||||
hasKey: !!data.imagegen.newapi?.hasKey
|
||||
},
|
||||
custom: {
|
||||
url: data.imagegen.custom?.url || '',
|
||||
model: data.imagegen.custom?.model || '',
|
||||
apiKeyMasked: data.imagegen.custom?.apiKeyMasked || ''
|
||||
}
|
||||
});
|
||||
}
|
||||
setApiKeyInput('');
|
||||
if (data?.videoai) {
|
||||
setVa({
|
||||
provider: data.videoai.provider === 'custom' ? 'custom' : 'inherit',
|
||||
custom: {
|
||||
url: data.videoai.custom?.url || '',
|
||||
model: data.videoai.custom?.model || '',
|
||||
apiKeyMasked: data.videoai.custom?.apiKeyMasked || '',
|
||||
configured: !!data.videoai.custom?.configured
|
||||
}
|
||||
});
|
||||
}
|
||||
setIgNewKey('');
|
||||
setIgCustomKey('');
|
||||
setVaKey('');
|
||||
setMsg({ type: 'ok', text: '已保存,新配置立即生效' });
|
||||
} catch (e) {
|
||||
setMsg({ type: 'error', text: '保存失败: ' + (e.data?.message || e.message) });
|
||||
@@ -90,11 +181,13 @@ export default function SettingsModal({ open, onClose, versionLabel }) {
|
||||
|
||||
const menus = [
|
||||
{ key: 'ocr', label: 'OCR 识别', icon: ScanText },
|
||||
{ key: 'aigen', label: 'AI 生图', icon: Wand2 },
|
||||
{ key: 'videoai', label: 'AI 视频', icon: Film },
|
||||
{ key: 'about', label: '关于', icon: Info }
|
||||
];
|
||||
|
||||
return (
|
||||
<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/50 p-4" onClick={onClose}>
|
||||
<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/50 p-4">
|
||||
<div
|
||||
className="bg-white dark:bg-gray-800 rounded-xl shadow-2xl w-full max-w-3xl max-h-[85vh] overflow-hidden flex"
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
@@ -122,7 +215,7 @@ export default function SettingsModal({ open, onClose, versionLabel }) {
|
||||
<div className="flex-1 p-6 overflow-y-auto">
|
||||
<div className="flex items-center justify-between mb-4">
|
||||
<h2 className="text-lg font-semibold text-gray-900 dark:text-white">
|
||||
{active === 'ocr' ? 'OCR 识别设置' : '关于'}
|
||||
{active === 'ocr' ? 'OCR 识别设置' : active === 'aigen' ? 'AI 生图设置' : active === 'videoai' ? 'AI 视频设置' : '关于'}
|
||||
</h2>
|
||||
<button onClick={onClose} className="p-1.5 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700">
|
||||
<X className="w-5 h-5 text-gray-500" />
|
||||
@@ -230,6 +323,256 @@ export default function SettingsModal({ open, onClose, versionLabel }) {
|
||||
</div>
|
||||
)}
|
||||
|
||||
{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 两个生图渠道,CF Workers AI 提供商可免费申请、每日有免费额度,见下方说明);也可以切换到自己的 OpenAI 兼容提供商。密钥只保存在本机,不出服务器。
|
||||
</p>
|
||||
|
||||
<div>
|
||||
<div className="text-xs font-medium text-gray-600 dark:text-gray-400 mb-2">生图通道</div>
|
||||
<div className="space-y-2">
|
||||
<label className="flex items-start gap-2.5 p-3 border border-gray-200 dark:border-gray-700 rounded-lg cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-700/50">
|
||||
<input
|
||||
type="radio"
|
||||
className="mt-0.5"
|
||||
checked={ig.provider === 'newapi'}
|
||||
onChange={() => setIg((v) => ({ ...v, provider: 'newapi' }))}
|
||||
/>
|
||||
<span>
|
||||
<span className="block text-sm font-medium text-gray-900 dark:text-white">内置 NewAPI(推荐)</span>
|
||||
<span className="block text-xs text-gray-500 dark:text-gray-400 mt-0.5">
|
||||
Pollinations / CF Workers AI 两大生图模型,开箱即用
|
||||
{ig.newapi.hasKey ? ',Key 已配置' : ',未配置 Key'}
|
||||
</span>
|
||||
</span>
|
||||
</label>
|
||||
<label className="flex items-start gap-2.5 p-3 border border-gray-200 dark:border-gray-700 rounded-lg cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-700/50">
|
||||
<input
|
||||
type="radio"
|
||||
className="mt-0.5"
|
||||
checked={ig.provider === 'custom'}
|
||||
onChange={() => setIg((v) => ({ ...v, provider: 'custom' }))}
|
||||
/>
|
||||
<span>
|
||||
<span className="block text-sm font-medium text-gray-900 dark:text-white">自定义提供商</span>
|
||||
<span className="block text-xs text-gray-500 dark:text-gray-400 mt-0.5">任意 OpenAI 兼容 /v1/images/generations 接口(OpenAI、Stability、中转站等)</span>
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{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
|
||||
type="text"
|
||||
value={ig.newapi.url}
|
||||
onChange={(e) => setIg((v) => ({ ...v, newapi: { ...v.newapi, url: e.target.value } }))}
|
||||
placeholder="http://192.168.68.19:3099/v1(默认)"
|
||||
className="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-xs font-medium text-gray-600 dark:text-gray-400 mb-1">API Key</label>
|
||||
<input
|
||||
type="password"
|
||||
value={igNewKey}
|
||||
onChange={(e) => setIgNewKey(e.target.value)}
|
||||
placeholder={ig.newapi.apiKeyMasked ? `已配置(${ig.newapi.apiKeyMasked}),留空保持不变` : 'NewAPI 令牌(留空则用服务器环境变量)'}
|
||||
className="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-xs font-medium text-gray-600 dark:text-gray-400 mb-1">默认模型</label>
|
||||
<select
|
||||
value={ig.newapi.model || 'flux-schnell'}
|
||||
onChange={(e) => setIg((v) => ({ ...v, newapi: { ...v.newapi, model: e.target.value } }))}
|
||||
className="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
|
||||
>
|
||||
{igGroups.map((g) => (
|
||||
<optgroup key={g.key} label={g.label}>
|
||||
{g.models.map((m) => (
|
||||
<option key={m.id} value={m.id}>{m.name}</option>
|
||||
))}
|
||||
</optgroup>
|
||||
))}
|
||||
{!igGroups.length && <option value="flux-schnell">FLUX.1 schnell(快速)</option>}
|
||||
</select>
|
||||
<p className="mt-1 text-[11px] text-gray-400 dark:text-gray-500">
|
||||
AI 生图弹窗使用此模型;选了参考图时后端自动切到 FLUX.2 图生图模型。
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{ig.provider === 'custom' && (
|
||||
<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">
|
||||
<div>
|
||||
<label className="block text-xs font-medium text-gray-600 dark:text-gray-400 mb-1">接口地址</label>
|
||||
<input
|
||||
type="text"
|
||||
value={ig.custom.url}
|
||||
onChange={(e) => setIg((v) => ({ ...v, custom: { ...v.custom, url: e.target.value } }))}
|
||||
placeholder="https://api.openai.com/v1"
|
||||
className="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-xs font-medium text-gray-600 dark:text-gray-400 mb-1">模型名称</label>
|
||||
<input
|
||||
type="text"
|
||||
value={ig.custom.model}
|
||||
onChange={(e) => setIg((v) => ({ ...v, custom: { ...v.custom, model: e.target.value } }))}
|
||||
placeholder="gpt-image-1 / flux-dev / stable-diffusion-xl ..."
|
||||
className="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-xs font-medium text-gray-600 dark:text-gray-400 mb-1">API Key</label>
|
||||
<input
|
||||
type="password"
|
||||
value={igCustomKey}
|
||||
onChange={(e) => setIgCustomKey(e.target.value)}
|
||||
placeholder={ig.custom.apiKeyMasked ? `已配置(${ig.custom.apiKeyMasked}),留空保持不变` : 'sk-...'}
|
||||
className="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="flex items-center gap-3">
|
||||
<button
|
||||
onClick={handleSave}
|
||||
disabled={saving}
|
||||
className="flex items-center gap-1.5 px-4 py-2 text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 rounded-lg disabled:opacity-50"
|
||||
>
|
||||
<Save className="w-4 h-4" />
|
||||
{saving ? '保存中...' : '保存'}
|
||||
</button>
|
||||
<span className="text-xs text-gray-400 dark:text-gray-500">保存后立即生效,无需重启</span>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{active === 'videoai' && cfg && va && (
|
||||
<div className="space-y-5">
|
||||
<p className="text-xs text-gray-500 dark:text-gray-400">
|
||||
AI 视频用这个模型来写分镜脚本、把提示词/网页/文档内容组织成讲解稿(普通文本模型即可,无需多模态)。
|
||||
配音、字幕与成片合成由服务器本地完成。密钥只保存在本机,不出服务器。
|
||||
</p>
|
||||
|
||||
<div>
|
||||
<div className="text-xs font-medium text-gray-600 dark:text-gray-400 mb-2">文本模型来源</div>
|
||||
<div className="space-y-2">
|
||||
<label className="flex items-start gap-2.5 p-3 border border-gray-200 dark:border-gray-700 rounded-lg cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-700/50">
|
||||
<input
|
||||
type="radio"
|
||||
className="mt-0.5"
|
||||
checked={va.provider === 'inherit'}
|
||||
onChange={() => setVa((v) => ({ ...v, provider: 'inherit' }))}
|
||||
/>
|
||||
<span>
|
||||
<span className="block text-sm font-medium text-gray-900 dark:text-white">复用「AI 生图」配置(推荐)</span>
|
||||
<span className="block text-xs text-gray-500 dark:text-gray-400 mt-0.5">用上面 AI 生图里的地址与 Key,无需重复填写</span>
|
||||
</span>
|
||||
</label>
|
||||
<label className="flex items-start gap-2.5 p-3 border border-gray-200 dark:border-gray-700 rounded-lg cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-700/50">
|
||||
<input
|
||||
type="radio"
|
||||
className="mt-0.5"
|
||||
checked={va.provider === 'custom'}
|
||||
onChange={() => setVa((v) => ({ ...v, provider: 'custom' }))}
|
||||
/>
|
||||
<span>
|
||||
<span className="block text-sm font-medium text-gray-900 dark:text-white">单独配置提供商 / 模型 / Key</span>
|
||||
<span className="block text-xs text-gray-500 dark:text-gray-400 mt-0.5">任意 OpenAI 兼容 /v1/chat/completions 的文本模型</span>
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{va.provider === 'custom' && (
|
||||
<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">
|
||||
<div>
|
||||
<label className="block text-xs font-medium text-gray-600 dark:text-gray-400 mb-1">接口地址(BASE URL)</label>
|
||||
<input
|
||||
type="text"
|
||||
value={va.custom.url}
|
||||
onChange={(e) => setVa((v) => ({ ...v, custom: { ...v.custom, url: e.target.value } }))}
|
||||
placeholder="https://api.openai.com/v1 或 http://192.168.68.19:3099/v1"
|
||||
className="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-xs font-medium text-gray-600 dark:text-gray-400 mb-1">模型名称</label>
|
||||
<input
|
||||
type="text"
|
||||
value={va.custom.model}
|
||||
onChange={(e) => setVa((v) => ({ ...v, custom: { ...v.custom, model: e.target.value } }))}
|
||||
placeholder="mimo-v2.6-flash / gpt-4o-mini / qwen-plus ..."
|
||||
className="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-xs font-medium text-gray-600 dark:text-gray-400 mb-1">API Key</label>
|
||||
<input
|
||||
type="password"
|
||||
value={vaKey}
|
||||
onChange={(e) => setVaKey(e.target.value)}
|
||||
placeholder={va.custom.apiKeyMasked ? `已配置(${va.custom.apiKeyMasked}),留空保持不变` : 'sk-... 或中转站 48 位令牌'}
|
||||
className="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="flex items-center gap-3">
|
||||
<button
|
||||
onClick={handleSave}
|
||||
disabled={saving}
|
||||
className="flex items-center gap-1.5 px-4 py-2 text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 rounded-lg disabled:opacity-50"
|
||||
>
|
||||
<Save className="w-4 h-4" />
|
||||
{saving ? '保存中...' : '保存'}
|
||||
</button>
|
||||
<span className="text-xs text-gray-400 dark:text-gray-500">保存后立即生效,无需重启</span>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{active === 'about' && (
|
||||
<div className="space-y-4 text-sm">
|
||||
<div className="flex items-center justify-between py-2 border-b border-gray-100 dark:border-gray-700">
|
||||
@@ -238,7 +581,7 @@ export default function SettingsModal({ open, onClose, versionLabel }) {
|
||||
</div>
|
||||
<div className="flex items-center justify-between py-2 border-b border-gray-100 dark:border-gray-700">
|
||||
<span className="text-gray-500 dark:text-gray-400">项目名称</span>
|
||||
<span className="font-medium text-gray-900 dark:text-white">FlyPic 素材库</span>
|
||||
<span className="font-medium text-gray-900 dark:text-white">牛仔库</span>
|
||||
</div>
|
||||
<div className="flex items-center justify-between py-2">
|
||||
<span className="text-gray-500 dark:text-gray-400">开源地址</span>
|
||||
@@ -254,7 +597,7 @@ export default function SettingsModal({ open, onClose, versionLabel }) {
|
||||
</a>
|
||||
</div>
|
||||
<p className="text-xs text-gray-400 dark:text-gray-500 pt-2">
|
||||
FlyPic 基于 ZangXincz/FlyPic 二次开发,修复多项问题并新增 OCR 图内文字搜索、线上 OCR、授权系统接入等能力。
|
||||
牛仔库(FlyPic)基于 ZangXincz/FlyPic 二次开发,修复多项问题并新增 OCR 图内文字搜索、线上 OCR、授权系统接入等能力。
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useState, useMemo, useEffect, useRef, useCallback } from 'react';
|
||||
import { Folder, Search, ChevronRight, ChevronDown, X, Trash2, ChevronsRight, ChevronsDown } from 'lucide-react';
|
||||
import { Folder, Search, ChevronRight, ChevronDown, X, Trash2, ChevronsRight, ChevronsDown, FolderPlus, Star } from 'lucide-react';
|
||||
import { useLibraryStore } from '../stores/useLibraryStore';
|
||||
import { useImageStore } from '../stores/useImageStore';
|
||||
import { useScanStore } from '../stores/useScanStore';
|
||||
@@ -11,6 +11,8 @@ import ContextMenu, { menuItems } from './ContextMenu';
|
||||
import UndoToast from './UndoToast';
|
||||
import FolderSelector from './FolderSelector';
|
||||
import ConflictDialog from './ConflictDialog';
|
||||
import BatchWatermarkModal from './BatchWatermarkModal';
|
||||
import BatchRenameModal from './BatchRenameModal';
|
||||
import { createLogger } from '../utils/logger';
|
||||
|
||||
const logger = createLogger('Sidebar');
|
||||
@@ -37,7 +39,7 @@ function Sidebar() {
|
||||
expandLibrarySelector,
|
||||
resetExpandLibrarySelector
|
||||
} = useLibraryStore();
|
||||
const { folders, selectedFolder, totalImageCount, setSelectedFolder, setSelectedFolderItem } = useImageStore();
|
||||
const { folders, selectedFolder, totalImageCount, favoritesView, setFavoritesView, favoriteTick, setSelectedFolder, setSelectedFolderItem, bumpRefresh } = useImageStore();
|
||||
const { isScanning } = useScanStore();
|
||||
|
||||
const [showAddLibrary, setShowAddLibrary] = useState(false);
|
||||
@@ -51,6 +53,9 @@ function Sidebar() {
|
||||
const [missingLibrary, setMissingLibrary] = useState(null); // 切换时发现的丢失素材库
|
||||
const [isLibrarySelectorOpen, setIsLibrarySelectorOpen] = useState(false); // 素材库选择器展开状态
|
||||
const [contextMenu, setContextMenu] = useState({ isOpen: false, position: null, folder: null });
|
||||
// 批量水印弹窗 { mode: 'add'|'remove', folder }
|
||||
const [batchWatermark, setBatchWatermark] = useState(null);
|
||||
const [batchRename, setBatchRename] = useState(null);
|
||||
const [undoToast, setUndoToast] = useState({ isVisible: false, message: '', count: 0 });
|
||||
const [undoHistory, setUndoHistory] = useState([]); // 撤销历史栈,支持多次撤销
|
||||
const [dragOverFolder, setDragOverFolder] = useState(null); // 拖拽悬停的文件夹
|
||||
@@ -95,6 +100,28 @@ function Sidebar() {
|
||||
setUndoToast({ isVisible: false, message: '', count: 0 });
|
||||
}, [selectedFolder]);
|
||||
|
||||
// 收藏数量角标(素材库切换、收藏状态变化时刷新)
|
||||
const [favoriteCount, setFavoriteCount] = useState(0);
|
||||
useEffect(() => {
|
||||
if (!currentLibraryId) return;
|
||||
let alive = true;
|
||||
imageAPI.getCount(currentLibraryId, { favorite: 1 })
|
||||
.then(res => { if (alive) setFavoriteCount(res?.count ?? 0); })
|
||||
.catch(() => { /* 角标失败不影响主功能 */ });
|
||||
return () => { alive = false; };
|
||||
}, [currentLibraryId, favoriteTick]);
|
||||
|
||||
// 点击「我的收藏」:进入收藏视图(不选中任何文件夹)
|
||||
const handleFavoritesClick = () => {
|
||||
onUserActionStart();
|
||||
setSelectedFolder(null);
|
||||
setSelectedFolderItem(null);
|
||||
const { clearSelection } = useImageStore.getState();
|
||||
clearSelection();
|
||||
setFavoritesView(true);
|
||||
logger.user('打开我的收藏');
|
||||
};
|
||||
|
||||
// 响应全局状态:显示新建素材库表单
|
||||
useEffect(() => {
|
||||
if (showAddLibraryForm) {
|
||||
@@ -825,6 +852,45 @@ function Sidebar() {
|
||||
}, 50);
|
||||
};
|
||||
|
||||
// 完成创建文件夹(回车/失焦提交)
|
||||
const handleFinishCreateFolder = async () => {
|
||||
if (!creatingFolder) return;
|
||||
const name = (newFolderName || '').trim();
|
||||
if (!name) {
|
||||
handleCancelCreateFolder();
|
||||
return;
|
||||
}
|
||||
if (!currentLibraryId) {
|
||||
handleCancelCreateFolder();
|
||||
return;
|
||||
}
|
||||
|
||||
// 拼接完整相对路径
|
||||
const parent = creatingFolder.parentPath || '';
|
||||
const fullPath = parent ? `${parent}/${name}` : name;
|
||||
|
||||
try {
|
||||
await fileAPI.createFolder(currentLibraryId, fullPath);
|
||||
logger.file(`✅ 创建文件夹: ${fullPath}`);
|
||||
// 刷新文件夹树
|
||||
const foldersRes = await imageAPI.getFolders(currentLibraryId);
|
||||
const { setFolders } = useImageStore.getState();
|
||||
setFolders(foldersRes.folders);
|
||||
} catch (error) {
|
||||
logger.error('❌ 创建文件夹失败:', error);
|
||||
alert(error?.data?.error || error?.message || '创建文件夹失败');
|
||||
} finally {
|
||||
setCreatingFolder(null);
|
||||
setNewFolderName('');
|
||||
}
|
||||
};
|
||||
|
||||
// 取消创建文件夹(Esc)
|
||||
const handleCancelCreateFolder = useCallback(() => {
|
||||
setCreatingFolder(null);
|
||||
setNewFolderName('');
|
||||
}, []);
|
||||
|
||||
const handleAddLibrary = async () => {
|
||||
// 扫描期间禁止添加素材库
|
||||
if (isScanning()) {
|
||||
@@ -930,9 +996,9 @@ function Sidebar() {
|
||||
'⚠️ 文件夹权限不足\n\n' +
|
||||
errorMessage + '\n\n' +
|
||||
'操作步骤:\n' +
|
||||
'1. 应用中心找到 FlyPic 应用\n' +
|
||||
'1. 应用中心找到 牛仔库 应用\n' +
|
||||
'2. 点击 应用设置\n' +
|
||||
'3. 将该文件夹添加到 FlyPic 应用的读写权限'
|
||||
'3. 将该文件夹添加到 牛仔库 应用的读写权限'
|
||||
);
|
||||
} else {
|
||||
alert('添加素材库失败: ' + errorMessage);
|
||||
@@ -1436,6 +1502,31 @@ function Sidebar() {
|
||||
onOpenOther={handleMissingOpenOther}
|
||||
onCreateNew={handleMissingCreateNew}
|
||||
/>
|
||||
|
||||
{/* 批量水印弹窗(加水印 / 去水印) */}
|
||||
<BatchWatermarkModal
|
||||
isOpen={!!batchWatermark}
|
||||
mode={batchWatermark?.mode}
|
||||
folder={batchWatermark?.folder}
|
||||
libraryId={currentLibraryId}
|
||||
onClose={() => setBatchWatermark(null)}
|
||||
onFinished={(result) => {
|
||||
logger.file(`批量水印任务完成: ${batchWatermark?.folder}`, result);
|
||||
bumpRefresh(); // 让图片区重新加载(覆盖模式下缩略图已更新)
|
||||
}}
|
||||
/>
|
||||
|
||||
{/* 批量重命名弹窗 */}
|
||||
<BatchRenameModal
|
||||
isOpen={!!batchRename}
|
||||
folder={batchRename?.folder}
|
||||
libraryId={currentLibraryId}
|
||||
onClose={() => setBatchRename(null)}
|
||||
onFinished={(result) => {
|
||||
logger.file(`批量重命名完成: ${batchRename?.folder}`, result);
|
||||
bumpRefresh(); // 让图片区重新加载(文件名/路径已更新)
|
||||
}}
|
||||
/>
|
||||
|
||||
{/* Library Management */}
|
||||
<div className="p-4 border-b border-gray-200 dark:border-gray-700">
|
||||
@@ -1593,28 +1684,83 @@ function Sidebar() {
|
||||
<ChevronsDown className="w-4 h-4" />
|
||||
)}
|
||||
</button>
|
||||
<button
|
||||
onClick={() => handleStartCreateFolder('child', selectedFolder || '')}
|
||||
className="px-2 py-1.5 border border-gray-300 dark:border-gray-600 rounded hover:bg-green-100 dark:hover:bg-green-900 text-green-600 dark:text-green-400 transition-colors"
|
||||
title="新建文件夹(在当前文件夹下)"
|
||||
>
|
||||
<FolderPlus className="w-4 h-4" />
|
||||
</button>
|
||||
</div>
|
||||
{/* 根级新建文件夹输入框(当前未选中文件夹时挂在树顶) */}
|
||||
{creatingFolder && creatingFolder.type === 'child' && !creatingFolder.basePath && (
|
||||
<div className="flex items-center py-1.5 rounded bg-green-50 dark:bg-green-900/30 px-1">
|
||||
<div className="w-5 mr-1" />
|
||||
<Folder className="w-4 h-4 mr-2 text-green-500 flex-shrink-0" />
|
||||
<input
|
||||
ref={newFolderInputRef}
|
||||
type="text"
|
||||
value={newFolderName}
|
||||
onChange={(e) => setNewFolderName(e.target.value)}
|
||||
onKeyDown={(e) => {
|
||||
if (e.key === 'Enter') {
|
||||
e.preventDefault();
|
||||
handleFinishCreateFolder();
|
||||
} else if (e.key === 'Escape') {
|
||||
e.preventDefault();
|
||||
handleCancelCreateFolder();
|
||||
}
|
||||
}}
|
||||
onBlur={handleFinishCreateFolder}
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
autoFocus
|
||||
className="flex-1 text-sm text-gray-700 dark:text-gray-300 bg-transparent border-none outline-none focus:outline-none underline decoration-2 decoration-green-500 underline-offset-2"
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
{/* 全部图片选项 */}
|
||||
<div
|
||||
className={`flex items-center px-3 py-2 cursor-pointer rounded-md transition-colors ${selectedFolder === null
|
||||
className={`flex items-center px-3 py-2 cursor-pointer rounded-md transition-colors ${selectedFolder === null && !favoritesView
|
||||
? 'bg-blue-50 dark:bg-blue-900'
|
||||
: 'hover:bg-gray-100 dark:hover:bg-gray-700'
|
||||
}`}
|
||||
onClick={() => setSelectedFolder(null)}
|
||||
onClick={() => { setFavoritesView(false); setSelectedFolder(null); }}
|
||||
>
|
||||
<div className="w-5 mr-1" />
|
||||
<Folder className="w-4 h-4 mr-2 text-blue-500 flex-shrink-0" />
|
||||
<span className="text-sm text-gray-700 dark:text-gray-200 font-medium flex-1">
|
||||
全部图片
|
||||
全部
|
||||
</span>
|
||||
<span className="text-xs text-gray-500 dark:text-gray-300 ml-2">
|
||||
{totalImageCount}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
{/* 我的收藏 */}
|
||||
<div
|
||||
className={`flex items-center px-3 py-2 cursor-pointer rounded-md transition-colors ${favoritesView
|
||||
? 'bg-amber-50 dark:bg-amber-900/30'
|
||||
: 'hover:bg-gray-100 dark:hover:bg-gray-700'
|
||||
}`}
|
||||
onClick={handleFavoritesClick}
|
||||
title="查看我收藏的图片"
|
||||
>
|
||||
<div className="w-5 mr-1" />
|
||||
<Star
|
||||
size={16}
|
||||
className={`mr-2 flex-shrink-0 ${favoritesView ? 'text-amber-500 fill-amber-500' : 'text-amber-500'}`}
|
||||
/>
|
||||
<span className={`text-sm font-medium flex-1 ${favoritesView ? 'text-amber-700 dark:text-amber-300' : 'text-gray-700 dark:text-gray-200'}`}>
|
||||
我的收藏
|
||||
</span>
|
||||
<span className="text-xs text-gray-500 dark:text-gray-300 ml-2">
|
||||
{favoriteCount}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
{/* 分隔线 */}
|
||||
{(filteredFolders.length > 0 || folders.length > 0) && (
|
||||
<div className="h-px bg-gray-200 dark:bg-gray-700 my-2" />
|
||||
@@ -1646,6 +1792,20 @@ function Sidebar() {
|
||||
menuItems.divider(),
|
||||
menuItems.rename(() => handleStartRenameFolder(contextMenu.folder)),
|
||||
menuItems.move(() => handleMoveFolderClick(contextMenu.folder.path)),
|
||||
menuItems.divider(),
|
||||
menuItems.batchRename(() => {
|
||||
setContextMenu({ isOpen: false, position: null, folder: null });
|
||||
setBatchRename({ folder: contextMenu.folder.path });
|
||||
}),
|
||||
menuItems.batchAddWatermark(() => {
|
||||
setContextMenu({ isOpen: false, position: null, folder: null });
|
||||
setBatchWatermark({ mode: 'add', folder: contextMenu.folder.path });
|
||||
}),
|
||||
menuItems.batchRemoveWatermark(() => {
|
||||
setContextMenu({ isOpen: false, position: null, folder: null });
|
||||
setBatchWatermark({ mode: 'remove', folder: contextMenu.folder.path });
|
||||
}),
|
||||
menuItems.divider(),
|
||||
menuItems.delete(async () => {
|
||||
setContextMenu({ isOpen: false, position: null, folder: null });
|
||||
await handleDeleteFolder(contextMenu.folder.path);
|
||||
|
||||
@@ -0,0 +1,353 @@
|
||||
/**
|
||||
* 视频编辑弹窗
|
||||
* 四项常用编辑:加水印 / 去水印 / 添加字幕+声音 / 去掉字幕+声音
|
||||
* 后端:POST /api/video/edit(同步处理,另存为新图或覆盖原视频)
|
||||
*/
|
||||
import { useState } from 'react';
|
||||
import { X, Droplets, Eraser, Type, Scissors, Loader2 } from 'lucide-react';
|
||||
import { imageAPI } from '../api';
|
||||
import { getToken } from '../api/client';
|
||||
|
||||
// 后端错误可能为字符串或 {code,message} 对象,统一取可读文本
|
||||
const errText = (e, fallback) => {
|
||||
if (!e) return fallback;
|
||||
if (typeof e === 'string') return e;
|
||||
return e.message || JSON.stringify(e);
|
||||
};
|
||||
|
||||
const ACTIONS = [
|
||||
{ key: 'watermark-add', label: '加水印', icon: Droplets },
|
||||
{ key: 'watermark-remove', label: '去水印', icon: Eraser },
|
||||
{ key: 'subtitle-audio', label: '加字幕声音', icon: Type },
|
||||
{ key: 'strip', label: '去字幕声音', icon: Scissors }
|
||||
];
|
||||
|
||||
const POSITIONS = [
|
||||
{ key: 'bottom-right', label: '右下角' },
|
||||
{ key: 'bottom-left', label: '左下角' },
|
||||
{ key: 'top-right', label: '右上角' },
|
||||
{ key: 'top-left', label: '左上角' },
|
||||
{ key: 'top-center', label: '顶部居中' },
|
||||
{ key: 'bottom-center', label: '底部居中' },
|
||||
{ key: 'center', label: '画面居中' }
|
||||
];
|
||||
|
||||
// 去水印预设区域(百分比,与批量水印一致)
|
||||
const WM_REGIONS = [
|
||||
{ key: 'bottom-right', label: '右下角', region: { x: 68, y: 86, w: 30, h: 11 } },
|
||||
{ key: 'bottom-left', label: '左下角', region: { x: 2, y: 86, w: 30, h: 11 } },
|
||||
{ key: 'top-right', label: '右上角', region: { x: 68, y: 3, w: 30, h: 11 } },
|
||||
{ key: 'top-left', label: '左上角', region: { x: 2, y: 3, w: 30, h: 11 } },
|
||||
{ key: 'center', label: '画面居中', region: { x: 35, y: 42, w: 30, h: 16 } },
|
||||
{ key: 'bottom-bar', label: '底部横条', region: { x: 0, y: 88, w: 100, h: 11 } },
|
||||
{ key: 'right-bar', label: '右侧竖条', region: { x: 85, y: 0, w: 15, h: 100 } },
|
||||
{ key: 'custom', label: '自定义', region: null }
|
||||
];
|
||||
|
||||
const VOICES = [
|
||||
{ key: 'zh-CN-XiaoxiaoNeural', label: '晓晓(女声·自然)' },
|
||||
{ key: 'zh-CN-YunxiNeural', label: '云希(男声·温暖)' },
|
||||
{ key: 'zh-CN-YunjianNeural', label: '云健(男声·浑厚)' },
|
||||
{ key: 'zh-CN-XiaoyiNeural', label: '晓伊(女声·活泼)' },
|
||||
{ key: 'zh-CN-YunyangNeural', label: '云扬(男声·播音)' },
|
||||
{ key: 'zh-CN-liaoning-XiaobeiNeural', label: '晓北(东北话)' },
|
||||
{ key: 'zh-TW-HsiaoChenNeural', label: '晓臻(台湾腔)' }
|
||||
];
|
||||
|
||||
const clampPct = (n) => Math.max(0, Math.min(100, Number(n) || 0));
|
||||
|
||||
function VideoEditModal({ file, libraryId, onClose, onDone }) {
|
||||
const [action, setAction] = useState('watermark-add');
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [error, setError] = useState('');
|
||||
const [outputMode, setOutputMode] = useState('new');
|
||||
|
||||
// 加水印
|
||||
const [wmText, setWmText] = useState('');
|
||||
const [wmPos, setWmPos] = useState('bottom-right');
|
||||
const [wmSize, setWmSize] = useState(4);
|
||||
const [wmOpacity, setWmOpacity] = useState(0.6);
|
||||
const [wmColor, setWmColor] = useState('#ffffff');
|
||||
const [wmTile, setWmTile] = useState(false);
|
||||
|
||||
// 去水印
|
||||
const [regionKey, setRegionKey] = useState('bottom-right');
|
||||
const [region, setRegion] = useState({ x: 68, y: 86, w: 30, h: 11 });
|
||||
|
||||
// 字幕声音
|
||||
const [subText, setSubText] = useState('');
|
||||
const [voice, setVoice] = useState(VOICES[0].key);
|
||||
const [audioMode, setAudioMode] = useState('tts'); // tts | none
|
||||
const [subSize, setSubSize] = useState(5);
|
||||
|
||||
// 去字幕声音
|
||||
const [rmAudio, setRmAudio] = useState(true);
|
||||
const [rmSub, setRmSub] = useState(true);
|
||||
|
||||
if (!file) return null;
|
||||
|
||||
const thumbUrl = file.thumbnailPath
|
||||
? imageAPI.getThumbnailUrl(libraryId, file.thumbnailPath.replace(/\\/g, '/').split('/').pop(), file.modifiedAt)
|
||||
: '';
|
||||
|
||||
const handleSubmit = async () => {
|
||||
setError('');
|
||||
let options = {};
|
||||
if (action === 'watermark-add') {
|
||||
if (!wmText.trim()) { setError('请填写水印文字'); return; }
|
||||
options = { text: wmText.trim(), position: wmPos, fontSizePct: wmSize, opacity: wmOpacity, color: wmColor, tile: wmTile };
|
||||
} else if (action === 'watermark-remove') {
|
||||
options = { region };
|
||||
} else if (action === 'subtitle-audio') {
|
||||
if (!subText.trim()) { setError('请填写字幕内容'); return; }
|
||||
options = {
|
||||
subtitleText: subText.trim(),
|
||||
ttsText: audioMode === 'tts' ? subText.trim() : '',
|
||||
voice,
|
||||
audioMode: audioMode === 'tts' ? 'tts' : 'none',
|
||||
fontSizePct: subSize,
|
||||
opacity: 0.95
|
||||
};
|
||||
} else if (action === 'strip') {
|
||||
if (!rmAudio && !rmSub) { setError('请至少勾选一项'); return; }
|
||||
options = { removeAudio: rmAudio, removeSubtitle: rmSub };
|
||||
}
|
||||
|
||||
setBusy(true);
|
||||
try {
|
||||
const res = await fetch('/api/video/edit', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
Authorization: `Bearer ${getToken()}`
|
||||
},
|
||||
body: JSON.stringify({ libraryId, path: file.path, action, options, output: outputMode })
|
||||
});
|
||||
const data = await res.json().catch(() => ({}));
|
||||
if (!res.ok || data.error) throw new Error(errText(data.error, `处理失败 (${res.status})`));
|
||||
onDone && onDone(data.path);
|
||||
onClose();
|
||||
} catch (e) {
|
||||
setError(e.message || '处理失败');
|
||||
} finally {
|
||||
setBusy(false);
|
||||
}
|
||||
};
|
||||
|
||||
const label = 'block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1';
|
||||
const input = 'w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 text-sm focus:ring-2 focus:ring-blue-500 focus:border-transparent';
|
||||
|
||||
return (
|
||||
<div className="fixed inset-0 z-50 bg-black bg-opacity-60 flex items-center justify-center p-4">
|
||||
<div className="bg-white dark:bg-gray-800 rounded-xl shadow-2xl w-full max-w-3xl max-h-[92vh] overflow-y-auto" onClick={(e) => e.stopPropagation()}>
|
||||
{/* 头部 */}
|
||||
<div className="flex items-center justify-between px-5 py-4 border-b border-gray-200 dark:border-gray-700 sticky top-0 bg-white dark:bg-gray-800 z-10">
|
||||
<div className="flex items-center gap-2">
|
||||
<Scissors className="w-5 h-5 text-blue-500" />
|
||||
<h2 className="text-lg font-semibold text-gray-900 dark:text-gray-100">视频编辑</h2>
|
||||
<span className="text-xs text-gray-500 dark:text-gray-400 truncate max-w-xs ml-2">{file.filename}</span>
|
||||
</div>
|
||||
<button onClick={onClose} disabled={busy} className="p-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded">
|
||||
<X className="w-5 h-5 text-gray-500" />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* 功能切换 */}
|
||||
<div className="grid grid-cols-4 gap-2 px-5 pt-4">
|
||||
{ACTIONS.map((a) => {
|
||||
const Icon = a.icon;
|
||||
return (
|
||||
<button
|
||||
key={a.key}
|
||||
onClick={() => { setAction(a.key); setError(''); }}
|
||||
disabled={busy}
|
||||
className={`flex flex-col items-center gap-1 py-3 rounded-lg border text-sm transition-colors ${
|
||||
action === a.key
|
||||
? 'border-blue-500 bg-blue-50 dark:bg-blue-900/30 text-blue-600 dark:text-blue-300'
|
||||
: 'border-gray-200 dark:border-gray-700 text-gray-600 dark:text-gray-400 hover:bg-gray-50 dark:hover:bg-gray-750'
|
||||
}`}
|
||||
>
|
||||
<Icon className="w-5 h-5" />
|
||||
{a.label}
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
|
||||
<div className="p-5 space-y-4">
|
||||
{/* 预览缩略图 + 去水印区域框 */}
|
||||
{thumbUrl && (
|
||||
<div className="relative rounded-lg overflow-hidden bg-black max-h-64 mx-auto" style={{ aspectRatio: '16/9' }}>
|
||||
<img src={thumbUrl} alt="" className="w-full h-full object-contain" />
|
||||
{action === 'watermark-remove' && (
|
||||
<div
|
||||
className="absolute border-2 border-red-500 bg-red-500 bg-opacity-20"
|
||||
style={{
|
||||
left: `${clampPct(region.x)}%`,
|
||||
top: `${clampPct(region.y)}%`,
|
||||
width: `${Math.max(1, Math.min(100 - clampPct(region.x), region.w))}%`,
|
||||
height: `${Math.max(1, Math.min(100 - clampPct(region.y), region.h))}%`
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* ===== 加水印 ===== */}
|
||||
{action === 'watermark-add' && (
|
||||
<>
|
||||
<div>
|
||||
<label className={label}>水印文字</label>
|
||||
<input className={input} value={wmText} onChange={(e) => setWmText(e.target.value)} placeholder="例如:© 资享网 或 88531.cn" maxLength={50} />
|
||||
</div>
|
||||
<div className="grid grid-cols-2 gap-3">
|
||||
<div>
|
||||
<label className={label}>位置</label>
|
||||
<select className={input} value={wmPos} onChange={(e) => setWmPos(e.target.value)}>
|
||||
{POSITIONS.map((p) => <option key={p.key} value={p.key}>{p.label}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
<label className={label}>颜色</label>
|
||||
<input type="color" className="h-10 w-full cursor-pointer rounded border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-700" value={wmColor} onChange={(e) => setWmColor(e.target.value)} />
|
||||
</div>
|
||||
<div>
|
||||
<label className={label}>字号(画面高度 {wmSize}%)</label>
|
||||
<input type="range" min="2" max="12" step="1" value={wmSize} onChange={(e) => setWmSize(Number(e.target.value))} className="w-full" />
|
||||
</div>
|
||||
<div>
|
||||
<label className={label}>不透明度 {Math.round(wmOpacity * 100)}%</label>
|
||||
<input type="range" min="0.1" max="1" step="0.05" value={wmOpacity} onChange={(e) => setWmOpacity(Number(e.target.value))} className="w-full" />
|
||||
</div>
|
||||
</div>
|
||||
<label className="flex items-center gap-2 text-sm text-gray-700 dark:text-gray-300">
|
||||
<input type="checkbox" checked={wmTile} onChange={(e) => setWmTile(e.target.checked)} />
|
||||
平铺整个画面(九宫格水印)
|
||||
</label>
|
||||
</>
|
||||
)}
|
||||
|
||||
{/* ===== 去水印 ===== */}
|
||||
{action === 'watermark-remove' && (
|
||||
<>
|
||||
<div>
|
||||
<label className={label}>水印位置预设(红框 = 将被抹除的区域)</label>
|
||||
<div className="grid grid-cols-4 gap-2">
|
||||
{WM_REGIONS.map((p) => (
|
||||
<button
|
||||
key={p.key}
|
||||
onClick={() => { setRegionKey(p.key); if (p.region) setRegion(p.region); }}
|
||||
className={`py-2 text-xs rounded border ${
|
||||
regionKey === p.key
|
||||
? 'border-blue-500 bg-blue-50 dark:bg-blue-900/30 text-blue-600 dark:text-blue-300'
|
||||
: 'border-gray-200 dark:border-gray-700 text-gray-600 dark:text-gray-400'
|
||||
}`}
|
||||
>{p.label}</button>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
{regionKey === 'custom' && (
|
||||
<div className="grid grid-cols-4 gap-3">
|
||||
{['x', 'y', 'w', 'h'].map((k) => (
|
||||
<div key={k}>
|
||||
<label className={label}>{{ x: '左', y: '上', w: '宽', h: '高' }[k]} (%)</label>
|
||||
<input type="number" min="0" max="100" className={input} value={region[k]} onChange={(e) => setRegion({ ...region, [k]: clampPct(e.target.value) })} />
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
<p className="text-xs text-gray-500 dark:text-gray-400">提示:去水印通过平滑插值抹除区域,适合纯色/简单背景的台标与角标。</p>
|
||||
</>
|
||||
)}
|
||||
|
||||
{/* ===== 加字幕声音 ===== */}
|
||||
{action === 'subtitle-audio' && (
|
||||
<>
|
||||
<div>
|
||||
<label className={label}>字幕内容(每行一条,多行按顺序分段显示)</label>
|
||||
<textarea
|
||||
className={`${input} h-28 resize-y`}
|
||||
value={subText}
|
||||
onChange={(e) => setSubText(e.target.value)}
|
||||
placeholder={'第一段字幕\n第二段字幕\n第三段字幕'}
|
||||
/>
|
||||
</div>
|
||||
<div className="grid grid-cols-3 gap-3">
|
||||
<div>
|
||||
<label className={label}>声音</label>
|
||||
<select className={input} value={audioMode} onChange={(e) => setAudioMode(e.target.value)}>
|
||||
<option value="tts">AI 朗读字幕(推荐)</option>
|
||||
<option value="none">仅加字幕,不加声音</option>
|
||||
</select>
|
||||
</div>
|
||||
{audioMode === 'tts' && (
|
||||
<div>
|
||||
<label className={label}>朗读音色</label>
|
||||
<select className={input} value={voice} onChange={(e) => setVoice(e.target.value)}>
|
||||
{VOICES.map((v) => <option key={v.key} value={v.key}>{v.label}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
)}
|
||||
<div>
|
||||
<label className={label}>字号(画面高度 {subSize}%)</label>
|
||||
<input type="range" min="3" max="9" step="1" value={subSize} onChange={(e) => setSubSize(Number(e.target.value))} className="w-full mt-2" />
|
||||
</div>
|
||||
</div>
|
||||
<p className="text-xs text-gray-500 dark:text-gray-400">开启朗读时字幕逐段与配音同步显示,生成的新视频会替换原音轨。</p>
|
||||
</>
|
||||
)}
|
||||
|
||||
{/* ===== 去字幕声音 ===== */}
|
||||
{action === 'strip' && (
|
||||
<>
|
||||
<div className="space-y-2">
|
||||
<label className="flex items-center gap-2 text-sm text-gray-700 dark:text-gray-300">
|
||||
<input type="checkbox" checked={rmAudio} onChange={(e) => setRmAudio(e.target.checked)} />
|
||||
去掉声音(静音,视频直拷无损)
|
||||
</label>
|
||||
<label className="flex items-center gap-2 text-sm text-gray-700 dark:text-gray-300">
|
||||
<input type="checkbox" checked={rmSub} onChange={(e) => setRmSub(e.target.checked)} />
|
||||
去掉内嵌字幕轨
|
||||
</label>
|
||||
</div>
|
||||
<p className="text-xs text-gray-500 dark:text-gray-400">注:对已“烧录”进画面的字幕/水印无效(那是像素),烧录内容请用「去水印」。</p>
|
||||
</>
|
||||
)}
|
||||
|
||||
{/* 输出方式 */}
|
||||
<div className="pt-2 border-t border-gray-200 dark:border-gray-700">
|
||||
<label className={label}>输出方式</label>
|
||||
<div className="flex gap-4">
|
||||
<label className="flex items-center gap-2 text-sm text-gray-700 dark:text-gray-300">
|
||||
<input type="radio" checked={outputMode === 'new'} onChange={() => setOutputMode('new')} />
|
||||
另存为新视频(原视频不动)
|
||||
</label>
|
||||
<label className="flex items-center gap-2 text-sm text-gray-700 dark:text-gray-300">
|
||||
<input type="radio" checked={outputMode === 'overwrite'} onChange={() => setOutputMode('overwrite')} />
|
||||
覆盖原视频
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{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-2">
|
||||
<button onClick={onClose} disabled={busy} 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">
|
||||
取消
|
||||
</button>
|
||||
<button
|
||||
onClick={handleSubmit}
|
||||
disabled={busy}
|
||||
className="px-5 py-2 text-sm rounded-lg bg-blue-600 hover:bg-blue-700 text-white font-medium disabled:opacity-50 flex items-center gap-2"
|
||||
>
|
||||
{busy && <Loader2 className="w-4 h-4 animate-spin" />}
|
||||
{busy ? '处理中,请稍候…' : '开始处理'}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default VideoEditModal;
|
||||
@@ -0,0 +1,101 @@
|
||||
/**
|
||||
* AI 生图 · 常用热门提示词库
|
||||
* 分类 + 预设提示词(中英双语)
|
||||
* 展示与点击填入均使用中文详细提示词 promptCn(用户要求显示中文);
|
||||
* 发送时后台自动把含中文的提示词翻译成英文(aigen.js translatePromptToEnglish,失败回落原文)
|
||||
* 英文 prompt 字段保留:供对照上游效果,也作为翻译失败时的兜底
|
||||
* 每条均为「主体 + 场景 + 光线 + 构图 + 风格 + 质量」的完整详细描述
|
||||
*/
|
||||
|
||||
export const PROMPT_CATEGORIES = [
|
||||
{
|
||||
key: 'hot',
|
||||
label: '🔥 热门',
|
||||
prompts: [
|
||||
{ name: '赛博朋克城市夜景', promptCn: '雨后的赛博朋克城市夜景街道,两侧高楼挂满中文与日文霓虹招牌,湿漉漉的柏油路面倒映五彩灯光,天空中飞行汽车拖出光轨,人群撑着透明雨伞穿行,体积雾弥漫,电影感打光,银翼杀手氛围,超精细,8K,广角镜头', prompt: 'cyberpunk city street at night after rain, towering neon signs in chinese and japanese, colorful reflections on wet asphalt, flying cars leaving light trails in the sky, dense crowd with transparent umbrellas, volumetric fog, cinematic lighting, blade runner mood, ultra detailed, 8k, wide angle' },
|
||||
{ name: '治愈系猫咪', promptCn: '一只毛茸茸的橘猫蜷缩在洒满阳光的窗台上,午后温暖的黄金时刻光线,空气中漂浮着细微尘埃,薄纱窗帘被微风轻轻吹起,旁边有几盆绿植,背景虚化,暖色调,写实摄影,85毫米镜头,浅景深,毛发细节丰富', prompt: 'a fluffy orange cat curled up on a sunlit windowsill, warm golden hour afternoon light, dust particles floating in the air, sheer curtains gently blowing, potted plants nearby, soft focus background, cozy warm tones, photorealistic, 85mm lens, shallow depth of field, highly detailed fur' },
|
||||
{ name: '水晶球微缩世界', promptCn: '玻璃雪水晶球里装着一座微缩雪夜村庄,摆在质朴的木桌上,微距摄影,小屋里透出暖黄灯光,梦幻光斑背景,柔和影棚柔光箱打光,飘浮的雪尘闪烁,浅景深,童话温馨氛围,超精细,8K', prompt: 'miniature snowy village inside a glass snow globe on a rustic wooden table, macro photography, tiny warm window lights glowing, dreamy bokeh, soft studio softbox lighting, sparkling snow dust, shallow depth of field, whimsical cozy atmosphere, ultra detailed, 8k' },
|
||||
{ name: '复古胶片人像', promptCn: '一位年轻女性的复古胶片人像,柯达 Portra 400 胶片质感,柔和的窗边光线,怀旧暖色调,细腻胶片颗粒,色彩微微褪色,1970 年代穿搭风格,浅浅微笑,浅景深,50 毫米镜头,模拟摄影美学', prompt: 'vintage film portrait of a young woman, kodak portra 400 film look, soft window light, nostalgic warm tones, subtle film grain, slightly faded colors, 1970s styling, gentle smile, shallow depth of field, 50mm lens, analog photography aesthetic' },
|
||||
{ name: '极简几何壁纸', promptCn: '极简几何壁纸,圆形、三角形与拱形相互交叠,薰衣草紫、蜜桃粉与薄荷绿的柔和渐变,干净的扁平化设计,细腻噪点纹理,均衡的重复构图,现代抽象背景,无文字,4K', prompt: 'minimalist geometric wallpaper with overlapping circles triangles and arches, pastel gradient of lavender peach and mint, clean flat design, subtle noise texture, balanced repeating composition, modern abstract background, no text, 4k' }
|
||||
]
|
||||
},
|
||||
{
|
||||
key: 'portrait',
|
||||
label: '👤 头像人像',
|
||||
prompts: [
|
||||
{ name: '动漫男头', promptCn: '动漫男生头像,黑色短发微乱,宽松连帽卫衣,背景是黄昏时分的城市天际线,精细插画,鲜艳的夕阳配色,干净的线条,眼神有神,半身构图,日系动漫风格,高质量', prompt: 'anime boy avatar, short messy black hair, oversized hoodie, city skyline at dusk in the background, detailed illustration, vibrant sunset colors, clean lineart, expressive eyes, upper body shot, japanese anime style, high quality' },
|
||||
{ name: '动漫女头', promptCn: '动漫女生头像,银色长发,精致的花环发饰,柔和的马卡龙色调,干净的线条,吉卜力工作室风格,浅浅微笑,梦幻花卉背景,精细插画,肖像构图,佳作级质量', prompt: 'anime girl avatar, long silver hair, delicate flower crown, soft pastel colors, clean lineart, studio ghibli inspired style, gentle smile, dreamy floral background, detailed illustration, portrait framing, masterpiece quality' },
|
||||
{ name: '3D 卡通头像', promptCn: '年轻男性的 3D 卡通头像,皮克斯风格,圆润友善的脸庞,明亮有神的大眼睛,柔和的影棚打光,纯色渐变背景,光滑的黏土渲染质感,可爱亲切,Octane 渲染,高质量', prompt: '3D cartoon avatar of a young man, pixar style, round friendly face, big sparkling eyes, soft studio lighting, plain gradient background, smooth clay render, cute and approachable, octane render, high quality' },
|
||||
{ name: '写真级人像', promptCn: '专业级写真人像特写,浅景深,柔和的自然窗光,皮肤纹理清晰真实,85 毫米 f/1.8 镜头,中性干净的背景,焦点锐利落在眼睛上,商业摄影,轻微调色', prompt: 'professional headshot portrait, shallow depth of field, soft natural window light, high detail skin texture, 85mm f/1.8 lens, neutral clean background, sharp focus on eyes, commercial photography, subtle color grading' },
|
||||
{ name: '像素风头像', promptCn: '像素风头像,64x64 网格,复古游戏风格,粗犷干净的描边,限定 16 色调色板,可爱自信的表情,对称构图,怀旧 8-bit 氛围,像素清晰锐利,无抗锯齿', prompt: 'pixel art avatar, 64x64 grid, retro game style, bold clean outlines, limited 16 color palette, cute confident expression, symmetrical composition, nostalgic 8-bit vibe, crisp pixels, no anti-aliasing' }
|
||||
]
|
||||
},
|
||||
{
|
||||
key: 'wallpaper',
|
||||
label: '🖼 壁纸风景',
|
||||
prompts: [
|
||||
{ name: '雪山日出', promptCn: '日出时分的雪山山脉,金色晨光染亮山峰,清澈见底的高山湖完美倒映雪山,几缕薄雾缭绕,超广角构图,8K 风景摄影,冷蓝阴影渐变为暖金色,天空壮丽', prompt: 'snow mountain range at sunrise, golden alpenglow on the peaks, crystal clear alpine lake perfectly mirroring the mountains, wisps of mist, ultra wide angle, 8k landscape photography, cold blue shadows turning warm gold, dramatic sky' },
|
||||
{ name: '海上星河', promptCn: '夜晚银河横跨平静的海面,长曝光摄影,漫天繁星,轻柔的海浪泛着微光,深蓝色调,宁静辽阔的场景,高细节天文摄影,地平线泛着微光', prompt: 'milky way arching over a calm ocean at night, long exposure photography, thousands of stars, gentle glowing waves, deep blue tones, tranquil and vast scene, high detail astrophotography, horizon glow' },
|
||||
{ name: '梯田晨雾', promptCn: '清晨被晨雾笼罩的梯田稻田,层层远山在雾中渐隐,无人机航拍视角,中国传统山水画意境,柔和光线,宁静氛围,青绿与灰调,超精细', prompt: 'terraced rice fields at dawn covered in morning mist, layered mountains fading into the distance, aerial drone view, traditional chinese landscape painting mood, soft light, serene atmosphere, green and grey tones, ultra detailed' },
|
||||
{ name: '梦幻森林', promptCn: '充满魔力的梦幻森林,发光的蘑菇与飞舞的萤火虫,体积光束穿过树冠洒落,布满苔藓的古树,奇幻氛围,幽蓝与翠绿的魔法光晕,高细节数字艺术', prompt: 'enchanted forest with glowing mushrooms and floating fireflies, volumetric light rays breaking through the canopy, moss covered ancient trees, fantasy atmosphere, magical blue and green glow, highly detailed digital art' },
|
||||
{ name: '沙漠驼队', promptCn: '日落时分穿越金色沙丘的骆驼商队,长长的戏剧性投影,暖橙色调,国家地理风格,辽阔的沙漠地平线,沙丘波纹质感,广角电影感镜头,空气中扬着沙尘', prompt: 'camel caravan crossing golden sand dunes at sunset, long dramatic shadows, warm orange tones, national geographic style, vast desert horizon, rippled sand texture, wide cinematic shot, dusty air' }
|
||||
]
|
||||
},
|
||||
{
|
||||
key: 'anime',
|
||||
label: '✨ 动漫插画',
|
||||
prompts: [
|
||||
{ name: '樱花下的少女', promptCn: '樱花树下的动漫少女,粉色花瓣随春风飘散,柔和的马卡龙色调,逆光的花朵,浅浅微笑,温暖的午后光线,精细的日系插画,佳作级质量', prompt: 'anime girl standing under a cherry blossom tree, pink petals drifting in the spring breeze, soft pastel colors, backlit flowers, gentle smile, warm afternoon light, detailed anime illustration, masterpiece quality' },
|
||||
{ name: '机甲战士', promptCn: '矗立在废墟城市中的巨型机甲战士,戏剧性的低角度仰拍,科幻动漫风格,精密的机械细节,蒸汽与火花四溅,动态光影,空气中漂浮尘埃,史诗般的体量感,高细节', prompt: 'giant mecha robot standing in a ruined city, dramatic low angle, sci-fi anime style, intricate mechanical parts, steam and sparks, dynamic lighting, floating dust, epic sense of scale, highly detailed' },
|
||||
{ name: '魔法使', promptCn: '年轻魔法师施展发光的咒语,符文悬浮飞舞,背景是幽暗的古老图书馆,奇幻动漫插画,绚丽的魔法特效,轮廓光,闪烁的光粒,动态的施法姿态', prompt: 'young wizard casting a glowing spell, floating arcane runes, dark ancient library background, fantasy anime illustration, vibrant magic effects, rim lighting, sparkling light particles, dynamic pose' },
|
||||
{ name: '校园日常', promptCn: '夕阳下放学回家的校园动漫场景,暖橙色天空与高耸的积云,长长的影子铺在路面上,日常系治愈氛围,干净的线条,新海诚风格,精细背景,怀旧感', prompt: 'anime scene of students walking home at sunset, warm orange sky with towering cumulus clouds, long shadows on the road, slice of life mood, clean lineart, makoto shinkai style, detailed background, nostalgic feeling' },
|
||||
{ name: '和风少女', promptCn: '身穿色彩斑斓和服的少女,手捧日式和果子,传统榻榻米房间与障子拉门,柔和的漫射光,精致的布料花纹,优雅恬静,精细的日系插画', prompt: 'girl in a colorful kimono holding japanese wagashi sweet, traditional tatami room with sliding shoji doors, soft diffused light, delicate fabric patterns, elegant and calm, detailed anime art' }
|
||||
]
|
||||
},
|
||||
{
|
||||
key: 'commerce',
|
||||
label: '🛍 电商海报',
|
||||
prompts: [
|
||||
{ name: '产品主图', promptCn: '奢侈品香水瓶置于白色大理石台座上的产品摄影,柔和渐变背景,影棚漫射打光,细腻倒影,优雅高级的商业大片,锐利细节,8K,留出文字排版空间', prompt: 'product photography of a luxury perfume bottle on a white marble pedestal, soft gradient background, diffused studio lighting, subtle reflections, elegant high-end commercial shot, sharp detail, 8k, negative space for text' },
|
||||
{ name: '美食海报', promptCn: '芝士融化的豪华汉堡,芝麻面包,热气升腾,深色氛围背景,戏剧性侧光,商业美食摄影,食材新鲜诱人,锐利细节,浅景深', prompt: 'gourmet burger with melted cheese and sesame bun, steam rising, dark moody background, dramatic side light, commercial food photography, fresh appetizing ingredients, sharp detail, shallow depth of field' },
|
||||
{ name: '双十一促销', promptCn: '电商大促海报背景,红金配色,漂浮的礼盒、丝带与五彩纸屑,现代 3D 渲染,喜庆热闹的氛围,高光材质,影棚打光,中央留出标题文案空间', prompt: 'e-commerce sale banner background, red and gold color scheme, floating gift boxes ribbons and confetti, modern 3d render, festive energetic atmosphere, glossy materials, studio lighting, empty center space for headline' },
|
||||
{ name: '化妆品展示', promptCn: '精华液瓶被鲜花与水珠环绕,干净的白色背景,明亮的自然光,清新自然的氛围,商业产品摄影,细节清晰锐利,柔和阴影', prompt: 'cosmetic serum bottle surrounded by fresh flowers and water droplets, clean white background, bright natural light, fresh and natural mood, commercial product photo, crisp detail, soft shadows' },
|
||||
{ name: '数码新品', promptCn: '悬浮在发光平台之上的智能手机,科技产品渲染,蓝紫霓虹点缀,深色背景配流光线条,未来感商业风格,倒影锐利,高细节,8K', prompt: 'smartphone floating above a glowing platform, tech product render, blue and purple neon accents, dark background with light streaks, futuristic commercial style, sharp reflections, high detail, 8k' }
|
||||
]
|
||||
},
|
||||
{
|
||||
key: 'icon3d',
|
||||
label: '🧊 图标3D',
|
||||
prompts: [
|
||||
{ name: '3D 立方图标', promptCn: '宝箱造型的 3D 图标,光泽材质,柔和阴影,马卡龙渐变背景,黏土渲染风格,圆润可爱的造型,影棚打光,居中构图,App 图标设计,高质量', prompt: '3d icon of a treasure chest, glossy material, soft shadows, pastel gradient background, clay render style, cute rounded shapes, studio lighting, centered composition, app icon design, high quality' },
|
||||
{ name: '玻璃质感', promptCn: '云存储主题的玻璃拟态 3D 图标,半透明磨砂玻璃质感,悬浮在柔和渐变背景之上,柔和影棚光,细腻的折射与高光,干净极简背景,现代 UI 图标', prompt: 'glassmorphism 3d icon of cloud storage, translucent frosted glass, floating above a soft gradient, soft studio light, subtle refractions and highlights, clean minimal background, modern ui icon' },
|
||||
{ name: '卡通食物', promptCn: '拉面碗造型的可爱 3D 图标,卡哇伊风格,粗描边,鲜艳配色,光滑的塑料材质,顶部袅袅升起的蒸汽,柔和的环境光遮蔽,居中 App 图标', prompt: 'cute 3d icon of a ramen bowl, kawaii style, thick outlines, vibrant colors, glossy plastic material, swirling steam on top, soft ambient occlusion, centered app icon' },
|
||||
{ name: '徽章印章', promptCn: '五角星金色徽章 3D 图标,金属材质,浮雕细节,深蓝色背景,高级质感,柔和的轮廓光,居中构图,高质量渲染', prompt: '3d golden badge icon with a star, metallic material, embossed details, dark blue background, premium look, soft rim light, centered composition, high quality render' },
|
||||
{ name: '游戏手柄', promptCn: '复古手柄造型的 3D 游戏图标,哑光塑料材质,活泼的配色,柔和的环境光遮蔽,居中放在马卡龙背景上,圆润可爱风格,图标设计', prompt: '3d gamepad icon, retro controller, matte plastic material, playful colors, soft ambient occlusion, centered on pastel background, rounded cute style, icon design' }
|
||||
]
|
||||
},
|
||||
{
|
||||
key: 'art',
|
||||
label: '🎨 艺术风格',
|
||||
prompts: [
|
||||
{ name: '浮世绘海浪', promptCn: '浮世绘风格的巨浪,葛饰北斋《神奈川冲浪里》意境,木版画质感,靛蓝色调,浪花如爪般飞溅,远处可见富士山,传统日式艺术,纸张纹理可见', prompt: 'great wave cresting in ukiyo-e style, hokusai inspired, woodblock print texture, indigo blue palette, foamy claw-like spray, mount fuji in the distance, traditional japanese art, visible paper grain' },
|
||||
{ name: '梵高星空', promptCn: '《星月夜》风格的油画,漩涡般翻涌的夜空,明亮的黄色星辰,深色柏树剪影,厚重的颜料笔触,后印象派,油画肌理,浓郁的蓝黄对比', prompt: 'starry night style painting, swirling turbulent sky, glowing yellow stars, dark cypress silhouette, thick impasto brushstrokes, post-impressionism, oil painting texture, vibrant blues and yellows' },
|
||||
{ name: '水彩花卉', promptCn: '精致的水彩花卉,笔触松动随意,边缘自然晕染,白色背景,植物图鉴风格,粉绿柔和色调,构图留白通透,手绘纸张纹理', prompt: 'delicate watercolor flowers, loose brushstrokes, soft bleeding edges, white background, botanical illustration style, pastel pink and green palette, airy composition, hand painted paper texture' },
|
||||
{ name: '低多边形', promptCn: '低多边形风格的风景,松林与雪山,棱面几何结构,日落的橙紫鲜艳配色,干净利落的三角切面,风格化数字艺术', prompt: 'low poly landscape with pine forest and snow mountains, faceted geometry, vibrant sunset colors of orange and purple sky, clean triangles, stylized digital art' },
|
||||
{ name: '水墨仙鹤', promptCn: '水墨画风格的仙鹤飞过荷塘,笔法简练自信,大量留白意境,宣纸纹理,微妙的墨色浓淡渐变,东方美学神韵', prompt: 'chinese ink wash painting of a crane flying over a lotus pond, minimal confident brush strokes, elegant negative space, rice paper texture, subtle grey ink gradients, oriental aesthetic' }
|
||||
]
|
||||
},
|
||||
{
|
||||
key: 'scene',
|
||||
label: '🏠 室内场景',
|
||||
prompts: [
|
||||
{ name: '温馨书房', promptCn: '温馨的家庭书房,顶天立地的书架墙,皮质扶手椅,暖黄台灯光,窗外下着雨挂着水珠,写实摄影,琥珀暖色调,私密安逸的氛围,细节丰富,8K', prompt: 'cozy home library with floor to ceiling bookshelves, leather armchair, warm lamp light, rainy window with droplets, photorealistic, warm amber tones, intimate atmosphere, detailed interior, 8k' },
|
||||
{ name: '北欧客厅', promptCn: '北欧风客厅,白色墙面,浅色橡木家具,大型绿植,大落地窗透进充足自然光,极简装饰,室内设计摄影,通透明亮,清新色调', prompt: 'scandinavian living room, white walls, light oak furniture, large green plants, big windows with natural daylight, minimal decor, interior design photography, airy and clean, bright tones' },
|
||||
{ name: '咖啡角落', promptCn: '咖啡馆小角落,意式咖啡机与玻璃甜点柜,清晨阳光透过窗户洒入,惬意温暖的氛围,暖色木质调,杯中升起袅袅热气,写实摄影', prompt: 'small cafe corner with an espresso machine and glass pastry display, morning sunlight streaming through the window, hygge atmosphere, warm wood tones, steam rising from a cup, photorealistic' },
|
||||
{ name: '阁楼卧室', promptCn: '阁楼卧室,倾斜的天窗,星星串灯,亚麻床品,几盆绿植,柔和的清晨光线,文艺清新的氛围照,低饱和色调,织物质感细腻', prompt: 'attic bedroom with a slanted skylight window, fairy lights, linen bedding, potted plants, soft morning light, aesthetic cozy photo, muted tones, detailed textiles' },
|
||||
{ name: '赛博房间', promptCn: '未来感卧室,悬浮的全息屏幕,青色与洋红的霓虹灯带,极简家具,赛博朋克室内风格,体积光晕,道具细节丰富,电影感打光', prompt: 'futuristic bedroom with floating holographic screens, neon strip lights in cyan and magenta, minimalist furniture, cyberpunk interior, volumetric glow, detailed props, cinematic lighting' }
|
||||
]
|
||||
}
|
||||
];
|
||||
|
||||
export default PROMPT_CATEGORIES;
|
||||
@@ -28,11 +28,13 @@ export const useImageDelete = () => {
|
||||
* 快速删除(乐观更新,立即响应)
|
||||
*/
|
||||
const handleQuickDelete = useCallback(async () => {
|
||||
const items = selectedImages.length > 0
|
||||
? selectedImages.map(img => ({ type: 'file', path: img.path }))
|
||||
: selectedImage
|
||||
? [{ type: 'file', path: selectedImage.path }]
|
||||
: [];
|
||||
// 并集:selectedImages(ctrl/shift 多选)∪ selectedImage(普通单击)
|
||||
// 否则「先单击一张再 ctrl 多选」时会漏删单击那张
|
||||
const union = [...selectedImages];
|
||||
if (selectedImage && !union.some(img => img.path === selectedImage.path)) {
|
||||
union.push(selectedImage);
|
||||
}
|
||||
const items = union.map(img => ({ type: 'file', path: img.path }));
|
||||
|
||||
if (items.length === 0) return;
|
||||
|
||||
|
||||
@@ -50,6 +50,7 @@ export const useInfiniteScroll = () => {
|
||||
limit: LOAD_CONFIG.pageSize
|
||||
};
|
||||
if (selectedFolder) params.folder = selectedFolder;
|
||||
if (useImageStore.getState().favoritesView) params.favorite = 1;
|
||||
if (searchKeywords) params.keywords = searchKeywords;
|
||||
if (filters.formats?.length > 0) params.formats = filters.formats.join(',');
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@ export const useWaterfallLayout = (images, options = {}) => {
|
||||
// 使用 ref 记录上次宽度,避免频繁 setState
|
||||
const lastWidthRef = { current: 0 };
|
||||
let debounceTimer = null;
|
||||
let fallbackTimer = null;
|
||||
|
||||
const emitSize = (width, height) => {
|
||||
// 仅当差异超过阈值时更新,减少重算次数
|
||||
@@ -57,21 +58,37 @@ export const useWaterfallLayout = (images, options = {}) => {
|
||||
return false;
|
||||
};
|
||||
|
||||
const attachObserver = () => {
|
||||
if (resizeObserver || !containerRef.current) return;
|
||||
resizeObserver = new ResizeObserver(() => {
|
||||
// 拖动时跳过更新,避免频繁重算布局
|
||||
if (useUIStore.getState().isResizingPanels) return;
|
||||
measureAndEmit();
|
||||
});
|
||||
resizeObserver.observe(containerRef.current);
|
||||
};
|
||||
|
||||
const tryInit = () => {
|
||||
if (measureAndEmit()) {
|
||||
// 成功获取宽度,设置 ResizeObserver
|
||||
if (containerRef.current) {
|
||||
resizeObserver = new ResizeObserver(() => {
|
||||
// 拖动时跳过更新,避免频繁重算布局
|
||||
if (useUIStore.getState().isResizingPanels) return;
|
||||
measureAndEmit();
|
||||
});
|
||||
resizeObserver.observe(containerRef.current);
|
||||
attachObserver();
|
||||
if (fallbackTimer) {
|
||||
clearInterval(fallbackTimer);
|
||||
fallbackTimer = null;
|
||||
}
|
||||
} else if (retryCount < maxRetries) {
|
||||
// 重试
|
||||
retryCount++;
|
||||
requestAnimationFrame(tryInit);
|
||||
} else if (!fallbackTimer) {
|
||||
// rAF 重试耗尽后低频轮询兜底,避免 containerWidth 永久卡 0 导致网格空白
|
||||
fallbackTimer = setInterval(() => {
|
||||
if (measureAndEmit()) {
|
||||
attachObserver();
|
||||
clearInterval(fallbackTimer);
|
||||
fallbackTimer = null;
|
||||
}
|
||||
}, 500);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -85,6 +102,9 @@ export const useWaterfallLayout = (images, options = {}) => {
|
||||
if (debounceTimer) {
|
||||
clearTimeout(debounceTimer);
|
||||
}
|
||||
if (fallbackTimer) {
|
||||
clearInterval(fallbackTimer);
|
||||
}
|
||||
};
|
||||
}, []);
|
||||
|
||||
|
||||
+21
-11
@@ -107,40 +107,50 @@ body {
|
||||
color: #7a7a7a; /* 占位符颜色调亮 */
|
||||
}
|
||||
|
||||
/* Custom scrollbar */
|
||||
/* Custom scrollbar(加粗:16px,便于拖动) */
|
||||
::-webkit-scrollbar {
|
||||
width: 8px;
|
||||
height: 8px;
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-track {
|
||||
background: transparent;
|
||||
background: rgba(0, 0, 0, 0.04);
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
/* 亮色主题滚动条 */
|
||||
::-webkit-scrollbar-thumb {
|
||||
background: rgba(0, 0, 0, 0.15); /* 降低不透明度,更柔和 */
|
||||
border-radius: 4px;
|
||||
background: rgba(0, 0, 0, 0.3); /* 整条 16px 都是可拖动块 */
|
||||
border-radius: 8px;
|
||||
transition: background 0.2s ease;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-thumb:hover {
|
||||
background: rgba(0, 0, 0, 0.25); /* 悬停时稍微明显 */
|
||||
background: rgba(0, 0, 0, 0.5); /* 悬停更明显 */
|
||||
}
|
||||
|
||||
/* Firefox 滚动条 */
|
||||
* {
|
||||
scrollbar-width: auto;
|
||||
scrollbar-color: rgba(0, 0, 0, 0.28) rgba(0, 0, 0, 0.04);
|
||||
}
|
||||
|
||||
/* 暗色主题滚动条 - 护眼优化 */
|
||||
.dark ::-webkit-scrollbar-track {
|
||||
background: rgba(255, 255, 255, 0.03); /* 极淡背景 */
|
||||
background: rgba(255, 255, 255, 0.05); /* 极淡背景 */
|
||||
}
|
||||
|
||||
.dark ::-webkit-scrollbar-thumb {
|
||||
background: rgba(255, 255, 255, 0.15); /* 降低亮度,减少刺激 */
|
||||
border-radius: 4px;
|
||||
background: rgba(255, 255, 255, 0.35); /* 提高可见度 */
|
||||
transition: background 0.2s ease;
|
||||
}
|
||||
|
||||
.dark ::-webkit-scrollbar-thumb:hover {
|
||||
background: rgba(255, 255, 255, 0.25); /* 悬停时更明显 */
|
||||
background: rgba(255, 255, 255, 0.55); /* 悬停更明显 */
|
||||
}
|
||||
|
||||
.dark * {
|
||||
scrollbar-color: rgba(255, 255, 255, 0.32) rgba(255, 255, 255, 0.05);
|
||||
}
|
||||
|
||||
/* Toast 滑入动画 */
|
||||
|
||||
@@ -11,24 +11,36 @@ export const useImageStore = create((set, get) => ({
|
||||
selectedImage: null,
|
||||
selectedImages: [],
|
||||
totalImageCount: 0,
|
||||
typeCounts: {}, // 按文件类型计数 { image: 102, video: 181, document: 73 }
|
||||
totalSize: 0, // 素材库总大小(字节)
|
||||
|
||||
// 文件夹
|
||||
folders: [],
|
||||
foldersLoaded: false, // folders 是否已完成首次加载(区分「加载中」与「确认无文件夹」)
|
||||
selectedFolder: null, // 当前浏览的文件夹路径
|
||||
selectedFolderItem: null, // 选中的文件夹对象(用于显示详情、操作等)
|
||||
|
||||
// 搜索和过滤
|
||||
searchKeywords: '',
|
||||
// 左侧导航「我的收藏」视图(独立于文件夹浏览)
|
||||
favoritesView: false,
|
||||
setFavoritesView: (v) => set({ favoritesView: v }),
|
||||
// 收藏数量变化信号(收藏/取消收藏后 +1,侧栏角标据此刷新)
|
||||
favoriteTick: 0,
|
||||
filters: {
|
||||
formats: [],
|
||||
sizes: [], // 文件大小范围筛选
|
||||
orientations: [], // 图片方向筛选(多选): ['horizontal', 'vertical', 'square']
|
||||
ratings: [], // 评分筛选(多选): [0, 1, 2, 3, 4, 5]
|
||||
favoriteOnly: false, // 仅看收藏
|
||||
},
|
||||
|
||||
// 原始图片列表(用于生成筛选选项,不受筛选影响)
|
||||
originalImages: [],
|
||||
|
||||
// 列表刷新信号(编辑器另存新图后 +1,MainContent 监听后重新拉取)
|
||||
refreshTick: 0,
|
||||
bumpRefresh: () => set((state) => ({ refreshTick: state.refreshTick + 1 })),
|
||||
|
||||
// 加载状态
|
||||
imageLoadingState: {
|
||||
@@ -72,9 +84,13 @@ export const useImageStore = create((set, get) => ({
|
||||
clearSelection: () => set({ selectedImages: [], selectedImage: null, selectedFolderItem: null }),
|
||||
|
||||
// 文件夹操作
|
||||
setFolders: (folders) => set({ folders }),
|
||||
setFolders: (folders) => set({ folders, foldersLoaded: true }),
|
||||
|
||||
setSelectedFolder: (folder) => set({ selectedFolder: folder }),
|
||||
setSelectedFolder: (folder) => set((state) => ({
|
||||
selectedFolder: folder,
|
||||
// 进入任何文件夹即退出「我的收藏」视图;置空(回全部图片)由调用方自行清 favoritesView
|
||||
favoritesView: folder ? false : state.favoritesView
|
||||
})),
|
||||
|
||||
setSelectedFolderItem: (folderItem) => set({ selectedFolderItem: folderItem }),
|
||||
|
||||
@@ -91,12 +107,14 @@ export const useImageStore = create((set, get) => ({
|
||||
formats: [],
|
||||
sizes: [],
|
||||
orientations: [],
|
||||
ratings: []
|
||||
ratings: [],
|
||||
favoriteOnly: false
|
||||
}
|
||||
}),
|
||||
|
||||
// 统计
|
||||
setTotalImageCount: (count) => set({ totalImageCount: count }),
|
||||
setTypeCounts: (counts) => set({ typeCounts: counts || {} }),
|
||||
setTotalSize: (size) => set({ totalSize: size }),
|
||||
|
||||
// 加载状态
|
||||
@@ -112,11 +130,15 @@ export const useImageStore = create((set, get) => ({
|
||||
images: state.images.map(img =>
|
||||
img.path === oldPath ? { ...img, ...newData } : img
|
||||
),
|
||||
originalImages: state.originalImages.map(img =>
|
||||
originalImages: state.originalImages.map(img =>
|
||||
img.path === oldPath ? { ...img, ...newData } : img
|
||||
),
|
||||
selectedImage: state.selectedImage?.path === oldPath
|
||||
? { ...state.selectedImage, ...newData }
|
||||
: state.selectedImage
|
||||
: state.selectedImage,
|
||||
// 收藏状态变化 → 通知侧栏刷新收藏角标
|
||||
favoriteTick: newData && newData.favorite !== undefined
|
||||
? state.favoriteTick + 1
|
||||
: state.favoriteTick
|
||||
}))
|
||||
}));
|
||||
@@ -17,7 +17,19 @@ export const useUIStore = create((set) => ({
|
||||
// 面板调整状态
|
||||
isResizingPanels: false,
|
||||
resizingSide: null, // 'left' | 'right' | null
|
||||
|
||||
|
||||
// 图片编辑器(打开的图片记录,null=关闭)
|
||||
editingImage: null,
|
||||
setEditingImage: (image) => set({ editingImage: image }),
|
||||
|
||||
// 视频编辑弹窗(打开的视频记录,null=关闭;右侧面板与瀑布流共用)
|
||||
videoEditFile: null,
|
||||
setVideoEditFile: (file) => set({ videoEditFile: file }),
|
||||
|
||||
// 合拼种子图(多选后点「合拼」带入编辑器,null=无)
|
||||
mergeImages: null,
|
||||
setMergeImages: (images) => set({ mergeImages: images }),
|
||||
|
||||
// 主题操作
|
||||
setTheme: (theme) => set({ theme }),
|
||||
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
/**
|
||||
* 文件类型注册表(单一数据源)
|
||||
*
|
||||
* 所有"图片/视频/文档…张/个"文案与图标都从这里取,
|
||||
* 新增文件类型只需在 TABLE 加一行,全站文案与统计卡自动识别。
|
||||
*/
|
||||
import { Image as ImageIcon, Video, FileText, File, Music, PenTool, HelpCircle } from 'lucide-react';
|
||||
|
||||
const TABLE = {
|
||||
image: { label: '图片', unit: '张', icon: ImageIcon },
|
||||
video: { label: '视频', unit: '个', icon: Video },
|
||||
audio: { label: '音频', unit: '个', icon: Music },
|
||||
document: { label: '文档', unit: '个', icon: FileText },
|
||||
design: { label: '设计', unit: '个', icon: PenTool },
|
||||
other: { label: '其他', unit: '个', icon: HelpCircle },
|
||||
};
|
||||
|
||||
/**
|
||||
* 按注册表顺序返回类型计数条目(图例等排序稳定展示用);
|
||||
* 注册表之外的未知类型键附在末尾。
|
||||
* @param {Object} typeCounts - { image: 102, video: 181 }
|
||||
* @returns {Array<[string, number]>}
|
||||
*/
|
||||
export function orderedTypeEntries(typeCounts) {
|
||||
const c = typeCounts || {};
|
||||
const known = Object.keys(TABLE).filter((k) => (c[k] || 0) > 0).map((k) => [k, c[k]]);
|
||||
const extra = Object.entries(c).filter(([k, n]) => n > 0 && !(k in TABLE));
|
||||
return [...known, ...extra];
|
||||
}
|
||||
|
||||
/** 未知类型兜底:一律按"文件" */
|
||||
const FALLBACK = { label: '文件', unit: '个', icon: File };
|
||||
|
||||
/**
|
||||
* 单个文件的类型元信息
|
||||
* @param {string} fileType - image | video | document | ...
|
||||
* @returns {{label, unit, icon}}
|
||||
*/
|
||||
export function typeMeta(fileType) {
|
||||
return TABLE[fileType] || FALLBACK;
|
||||
}
|
||||
|
||||
/**
|
||||
* 从条目列表聚合类型计数 { image: 2, video: 1 }
|
||||
* @param {Array<{fileType?: string}>} items
|
||||
*/
|
||||
export function typeCountsOf(items) {
|
||||
const counts = {};
|
||||
for (const it of items || []) {
|
||||
const t = it?.fileType || 'image';
|
||||
counts[t] = (counts[t] || 0) + 1;
|
||||
}
|
||||
return counts;
|
||||
}
|
||||
|
||||
/**
|
||||
* 集合计数文案(按类型自动识别):
|
||||
* - 单一已知类型:`102 张图片` / `181 个视频`
|
||||
* - 多类型混合、未知类型、或没给计数:`356 个文件`
|
||||
*
|
||||
* @param {number} count - 总数
|
||||
* @param {Object} [typeCounts] - { image: 102, video: 181, document: 73 }
|
||||
*/
|
||||
export function countLabel(count, typeCounts) {
|
||||
const entries = Object.entries(typeCounts || {}).filter(([, n]) => n > 0);
|
||||
if (entries.length === 1) {
|
||||
const { label, unit } = typeMeta(entries[0][0]);
|
||||
return `${count} ${unit}${label}`;
|
||||
}
|
||||
return `${count} 个文件`;
|
||||
}
|
||||
|
||||
/**
|
||||
* 集合的类型名词(用于"复制图片/导出视频"等动词文案):
|
||||
* - 单一类型:'图片' / '视频' / '文档'
|
||||
* - 多类型混合或未知:'文件'
|
||||
*/
|
||||
export function typeLabelOf(typeCounts) {
|
||||
const entries = Object.entries(typeCounts || {}).filter(([, n]) => n > 0);
|
||||
if (entries.length === 1) return typeMeta(entries[0][0]).label;
|
||||
return FALLBACK.label;
|
||||
}
|
||||
@@ -48,13 +48,14 @@ export const matchSizeRange = (sizeKB, range) => {
|
||||
* @returns {Array} 筛选后的图片列表
|
||||
*/
|
||||
export const filterImages = (images, filters) => {
|
||||
const { formats, sizes, orientations, ratings } = filters;
|
||||
const { formats, sizes, orientations, ratings, favoriteOnly } = filters;
|
||||
|
||||
// 如果没有任何筛选条件,直接返回原始图片
|
||||
if ((!formats || formats.length === 0) &&
|
||||
(!sizes || sizes.length === 0) &&
|
||||
(!orientations || orientations.length === 0) &&
|
||||
(!ratings || ratings.length === 0)) {
|
||||
(!ratings || ratings.length === 0) &&
|
||||
!favoriteOnly) {
|
||||
return images;
|
||||
}
|
||||
|
||||
@@ -66,6 +67,11 @@ export const filterImages = (images, filters) => {
|
||||
}
|
||||
}
|
||||
|
||||
// 收藏筛选
|
||||
if (favoriteOnly) {
|
||||
if (!img.favorite) return false;
|
||||
}
|
||||
|
||||
// 文件大小筛选
|
||||
if (sizes && sizes.length > 0) {
|
||||
const sizeKB = img.size / 1024;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/**
|
||||
* FlyPic 前端日志系统
|
||||
* 牛仔库(FlyPic)前端日志系统
|
||||
* 专注于用户操作和UI交互日志
|
||||
*
|
||||
* 日志分类:
|
||||
|
||||
Generated
+1179
-17
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user