2 Commits
Author SHA1 Message Date
jinghui 6e086d629d feat(v1.4.8): 搜索结果批量重命名 + 关键词替换模式
- 搜索结果工具条新增「批量重命名搜索结果…」入口(scope=search)
- 后端 rename-preview/start 支持 scope=search:与列表同款模糊匹配(关键词空格分词 AND,filename/OCR LIKE),可选 folder 递归限定
- 新增关键词替换模式:find 关键词 + replace 替换成(留空=删除关键词),不含关键词的文件自动跳过并报告
- 弹窗模式选择改 2x2 网格,搜索范围显示「搜索:关键词」徽标
- 关键词模式隐藏「包含子目录」(搜索范围已含子目录)
2026-11-18 22:57:46 +08:00
jinghui c59791f994 v1.4.7: 类型文案全面去「张」——注册表驱动 countLabel/typeCountsOf,补 design/other 类型行,统计图例按注册表顺序展示 2026-11-18 22:30:57 +08:00
18 changed files with 445 additions and 104 deletions

No files matched your search

+29
View File
@@ -1,5 +1,34 @@
# 更新日志
## 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
- ✨ **文件夹右键新增「批量重命名文件」**:三种模式 —— 前面加(前缀)、后面加(后缀)、全部改名(原文件名整体替换,扩展名始终保留)
+43 -1
View File
@@ -35,7 +35,49 @@ class FolderModel extends BaseModel {
if (diff !== 0) return diff;
return String(b.name).localeCompare(String(a.name));
});
return this._buildTree(folders);
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;
}
/**
+92 -25
View File
@@ -195,6 +195,15 @@ async function callInpaint(imageBuffer, maskBuffer) {
/** 收集文件夹内图片(含子文件夹) */
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('服务未初始化');
@@ -206,6 +215,13 @@ function collectImages(req, libraryId, folder) {
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 {
@@ -320,11 +336,14 @@ const ILLEGAL_NAME_RE = /[\\/:*?"<>|]/;
/**
* 计算重命名计划(preview 与执行共用,保证一致)
* @param {object} opts { images, folder, mode: 'prefix'|'suffix'|'replace', text, includeSubdirs }
* @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, includeSubdirs }) {
function computeRenamePlan({ images, folder, mode, text, find, includeSubdirs }) {
const cleanText = String(text || '').trim();
const cleanFind = String(find || '').trim();
let list = images;
if (!includeSubdirs) {
// 只重命名该文件夹直接子项,排除子目录内文件
@@ -357,6 +376,9 @@ function computeRenamePlan({ images, folder, mode, text, includeSubdirs }) {
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}`;
@@ -364,7 +386,9 @@ function computeRenamePlan({ images, folder, mode, text, includeSubdirs }) {
const absNew = newPath; // 相对库根,执行时再 join
const entry = { img, newFilename, newPath, skipReason: null };
if (newFilename === img.filename) {
if (mode === 'keyword' && !base.includes(cleanFind)) {
entry.skipReason = '不含关键词';
} else if (newFilename === img.filename) {
entry.skipReason = '文件名未变化';
} else if (used.has(newPath.toLowerCase())) {
entry.skipReason = '目标文件名冲突(本次内)';
@@ -377,15 +401,23 @@ function computeRenamePlan({ images, folder, mode, text, includeSubdirs }) {
}
async function runRename(req, task) {
const { library, images } = collectImages(req, task.payload.libraryId, task.payload.folder);
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,
includeSubdirs: opts.includeSubdirs !== false
find: opts.find,
includeSubdirs: isSearch ? true : opts.includeSubdirs !== false
});
task.total = plan.length;
@@ -439,26 +471,40 @@ async function runRename(req, task) {
/**
* POST /api/batch/rename-preview
* body: { libraryId, folder, options: { mode, text, includeSubdirs } }
* 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, options } = req.body || {};
if (!libraryId || !folder) throw new ValidationError('缺少 libraryId 或 folder');
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'].includes(mode)) {
throw new ValidationError('mode 必须是 prefix / suffix / replace');
if (!['prefix', 'suffix', 'replace', 'keyword'].includes(mode)) {
throw new ValidationError('mode 必须是 prefix / suffix / replace / keyword');
}
const text = String((options && options.text) || '').trim();
if (!text) throw new ValidationError('重命名文本不能为空');
if (ILLEGAL_NAME_RE.test(text)) throw new ValidationError('文本包含文件名非法字符 \\ / : * ? " < > |');
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 { images } = collectImages(req, libraryId, folder);
const targets = collectRenameTargets(req, {
libraryId, folder, scope, keywords: options && options.keywords
});
const plan = computeRenamePlan({
images, folder, mode, text,
includeSubdirs: options.includeSubdirs !== false
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({
@@ -479,20 +525,28 @@ router.post(
router.post(
'/start',
asyncHandler(async (req, res) => {
const { libraryId, folder, type, output, options } = req.body || {};
if (!libraryId || !folder) throw new ValidationError('缺少 libraryId 或 folder');
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'].includes(mode)) {
throw new ValidationError('mode 必须是 prefix / suffix / replace');
if (!['prefix', 'suffix', 'replace', 'keyword'].includes(mode)) {
throw new ValidationError('mode 必须是 prefix / suffix / replace / keyword');
}
if (!String(options.text || '').trim()) throw new ValidationError('重命名文本不能为空');
if (ILLEGAL_NAME_RE.test(String(options.text).trim())) {
throw new ValidationError('文本包含文件名非法字符 \\ / : * ? " < > |');
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;
@@ -502,10 +556,23 @@ router.post(
if (r.w <= 0 || r.h <= 0) throw new ValidationError('水印区域宽高必须大于 0');
}
const { images } = collectImages(req, libraryId, folder);
if (images.length === 0) throw new ValidationError(type === 'rename' ? '该文件夹下没有文件' : '该文件夹下没有图片');
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, output, options });
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} 张)`);
+13 -1
View File
@@ -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);
+1 -1
View File
@@ -16,7 +16,7 @@ const { getSettings } = require('./settings');
const HUB_URL = (process.env.HUB_URL || 'https://auth.88531.cn/api').replace(/\/+$/, '');
const HUB_PROJECT_ID = process.env.HUB_PROJECT_ID || '';
const HUB_API_KEY = process.env.HUB_API_KEY || '';
const SITE_VERSION = process.env.SITE_VERSION || '1.4.6';
const SITE_VERSION = process.env.SITE_VERSION || '1.4.8';
const TIMEOUT_MS = 8000;
const state = {
+1 -1
View File
@@ -28,7 +28,7 @@ services:
- HUB_API_KEY=${HUB_API_KEY:-}
- NEWAPI_KEY=${NEWAPI_KEY:-}
# 当前站点版本(与 frontend/package.json、CHANGELOG 保持一致,界面版本徽标来源)
- SITE_VERSION=1.4.6
- SITE_VERSION=1.4.8
# 让容器经 host.docker.internal 访问宿主机的 AI 侧车
extra_hosts:
- "host.docker.internal:host-gateway"
+2
View File
@@ -149,6 +149,7 @@ function App() {
}
useImageStore.getState().setTotalImageCount(statsRes.total || 0);
useImageStore.getState().setTotalSize(statsRes.totalSize || 0);
useImageStore.getState().setTypeCounts(statsRes.typeCounts);
}).catch(err => {
logger.error('扫描完成后加载数据失败:', err.message);
}).finally(() => {
@@ -188,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);
}
+89 -38
View File
@@ -15,15 +15,17 @@ import { batchAPI } from '../api';
const MODES = [
{ key: 'prefix', label: '前面加', desc: '在原文件名前加文本', hint: '文本 + 原文件名 + 扩展名' },
{ key: 'suffix', label: '后面加', desc: '在原文件名后加文本', hint: '原文件名 + 文本 + 扩展名' },
{ key: 'replace', label: '全部改名', desc: '原文件名替换为文本', hint: '同目录多个文件自动编号:文本-001、文本-002…' }
{ key: 'replace', label: '全部改名', desc: '原文件名替换为文本', hint: '同目录多个文件自动编号:文本-001、文本-002…' },
{ key: 'keyword', label: '关键词替换', desc: '替换文件名中的关键词', hint: '把文件名中的「找什么」全部换成「替换成」,替换成留空 = 删除该关键词' }
];
const ILLEGAL_RE = /[\\/:*?"<>|]/;
function BatchRenameModal({ isOpen, folder, libraryId, onClose, onFinished }) {
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('');
@@ -48,6 +50,7 @@ function BatchRenameModal({ isOpen, folder, libraryId, onClose, onFinished }) {
setPhase('config');
setMode('prefix');
setText('');
setFind('');
setIncludeSubdirs(true);
setPreview(null);
setPreviewErr('');
@@ -59,11 +62,11 @@ function BatchRenameModal({ isOpen, folder, libraryId, onClose, onFinished }) {
}, [isOpen, stopPolling]);
// 实时预览(防抖 300ms)
const needInput = mode === 'keyword' ? find.trim() : text.trim();
useEffect(() => {
if (!isOpen || phase !== 'config') return;
if (previewTimerRef.current) clearTimeout(previewTimerRef.current);
const t = text.trim();
if (!t) {
if (!needInput) {
setPreview(null);
setPreviewErr('');
return;
@@ -71,8 +74,8 @@ function BatchRenameModal({ isOpen, folder, libraryId, onClose, onFinished }) {
previewTimerRef.current = setTimeout(async () => {
try {
const resp = await batchAPI.renamePreview({
libraryId, folder,
options: { mode, text: t, includeSubdirs }
libraryId, folder, scope, keywords,
options: { mode, text: text.trim(), find: find.trim(), keywords: keywords || undefined, includeSubdirs }
});
setPreview(resp);
setPreviewErr('');
@@ -82,7 +85,7 @@ function BatchRenameModal({ isOpen, folder, libraryId, onClose, onFinished }) {
}
}, 300);
return () => { if (previewTimerRef.current) clearTimeout(previewTimerRef.current); };
}, [isOpen, phase, mode, text, includeSubdirs, libraryId, folder]);
}, [isOpen, phase, mode, text, find, includeSubdirs, libraryId, folder, scope, keywords, needInput]);
const startPolling = useCallback((id) => {
stopPolling();
@@ -102,19 +105,35 @@ function BatchRenameModal({ isOpen, folder, libraryId, onClose, onFinished }) {
const handleStart = async () => {
setError('');
const t = text.trim();
if (!t) {
setError('请输入重命名文本');
return;
}
if (ILLEGAL_RE.test(t)) {
setError('文本包含文件名非法字符 \\ / : * ? " < > |');
return;
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, type: 'rename',
options: { mode, text: t, includeSubdirs }
libraryId, folder, scope, keywords, type: 'rename',
options: { mode, text: t, find: f, keywords: keywords || undefined, includeSubdirs }
});
setTaskId(resp.taskId);
setPhase('running');
@@ -161,7 +180,7 @@ function BatchRenameModal({ isOpen, folder, libraryId, onClose, onFinished }) {
<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]">
{folder}
{scope === 'search' ? `搜索:${keywords}` : folder}
</span>
</div>
<button onClick={handleClose} className="p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-700">
@@ -176,7 +195,7 @@ function BatchRenameModal({ isOpen, folder, libraryId, onClose, onFinished }) {
{/* 重命名模式 */}
<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-3 gap-2">
<div className="grid grid-cols-2 gap-2">
{MODES.map((m) => (
<button
key={m.key}
@@ -196,23 +215,54 @@ function BatchRenameModal({ isOpen, folder, libraryId, onClose, onFinished }) {
</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">包含文件名非法字符 \ / : * ? " &lt; &gt; |</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">关键词包含文件名非法字符 \ / : * ? " &lt; &gt; |</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">替换文本包含文件名非法字符 \ / : * ? " &lt; &gt; |</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">包含文件名非法字符 \ / : * ? " &lt; &gt; |</div>
)}
</div>
)}
{/* 包含子目录 */}
{/* 包含子目录(搜索范围时全库命中,无需此开关) */}
{scope !== 'search' && (
<label className="flex items-center gap-2 mb-4 cursor-pointer select-none">
<input
type="checkbox"
@@ -222,17 +272,18 @@ function BatchRenameModal({ isOpen, folder, libraryId, onClose, onFinished }) {
/>
<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>
{!text.trim() && (
<div className="text-[11px] text-gray-400">输入文本后显示改名效果</div>
{!needInput && (
<div className="text-[11px] text-gray-400">{mode === 'keyword' ? '输入关键词后显示改名效果' : '输入文本后显示改名效果'}</div>
)}
{text.trim() && previewErr && (
{needInput && previewErr && (
<div className="text-[11px] text-red-500">{previewErr}</div>
)}
{text.trim() && !previewErr && !preview && (
{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>
@@ -216,7 +216,7 @@ function BatchWatermarkModal({ isOpen, mode, folder, libraryId, onClose, onFinis
<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>
<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" />
@@ -517,7 +517,7 @@ function BatchWatermarkModal({ isOpen, mode, folder, libraryId, onClose, onFinis
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} 张`}
{imageCount === 0 ? '该文件夹没有可处理的文件' : `开始处理 ${imageCount} 个文件`}
</button>
</>
)}
+18 -6
View File
@@ -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>
@@ -100,7 +112,7 @@ function Dashboard() {
<h3 className="text-lg font-medium text-primary mb-2">暂无文件夹</h3>
<p className="text-tertiary max-w-sm mx-auto">
{totalImageCount > 0
? `此素材库的 ${totalImageCount} 张图片没有子文件夹,已在下方瀑布视图中直接显示。`
? `此素材库的 ${countLabel(totalImageCount, typeCounts)} 没有子文件夹,已在下方瀑布视图中直接显示。`
: '您的素材库似乎是空的。请将图片添加到素材库目录中,系统会自动扫描。'}
</p>
</div>
+3 -3
View File
@@ -38,7 +38,7 @@ function Header() {
// 授权系统 hub:版本 / 公告 / 在线人数
const hub = useHub();
const announcements = hub.announcements || [];
const appVersion = hub.version ? `v${String(hub.version).replace(/^v/, '')}` : 'v1.4.6';
const appVersion = hub.version ? `v${String(hub.version).replace(/^v/, '')}` : 'v1.4.8';
// 从全局 store 获取筛选状态
const selectedFormats = filters.formats || [];
@@ -494,7 +494,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"
@@ -680,7 +680,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"
+7 -3
View File
@@ -27,6 +27,7 @@ import { useInfiniteScroll } from '../hooks/useInfiniteScroll';
// Utils
import { filterImages } from '../utils/imageFilters';
import { typeCountsOf, countLabel } from '../utils/fileTypes';
import { imageAPI, fileAPI } from '../api';
// Components
@@ -536,13 +537,16 @@ onToggleFavorite={handleToggleFavorite}
}
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">已选 {unionCount} 张图片</span>
<span className="text-sm whitespace-nowrap">已选 {countLabel(unionCount, unionTypeCounts)}</span>
<button
onClick={() => {
setMergeImages(union);
setEditingImage(union[0]);
// 合拼是图片功能:过滤出图片(与 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"
+40 -3
View File
@@ -9,6 +9,8 @@ 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');
@@ -18,6 +20,9 @@ function MainContent() {
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);
// 文件夹切换防抖
@@ -208,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>
@@ -219,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
@@ -236,7 +241,39 @@ function MainContent() {
{(!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>
+1 -1
View File
@@ -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>
+19 -18
View File
@@ -9,6 +9,7 @@ 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');
@@ -321,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 || '未知错误'));
@@ -779,8 +780,9 @@ function RightPanel() {
return selectedImage ? [selectedImage] : [];
};
// 选中集合是否含视频(决定多选计数单位文案:视频用「个」,图片用「张」)
const selectionHasVideo = getImagesToProcess().some(img => img?.fileType === 'video');
// 选中集合类型计数(由类型注册表驱动文案:图片/视频/文档…混合自动按"文件")
const selectionTypeCounts = typeCountsOf(getImagesToProcess());
const selectionTypeLabel = typeLabelOf(selectionTypeCounts);
// 批量复制图片
const copyMultipleImages = async () => {
@@ -1095,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;
@@ -1160,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>
@@ -1212,7 +1215,7 @@ function RightPanel() {
<span>
{isExportingFolder
? `打包中... ${folderExportProgress}%`
: `导出文件夹 (${totalCount} 张)`
: `导出文件夹 (${countLabel(totalCount, folderTypeCounts)})`
}
</span>
</div>
@@ -1263,7 +1266,7 @@ function RightPanel() {
}
}
}}
title="双击查看第一张图片"
title="双击查看原文件"
>
{(() => {
const imagesToShow = getImagesToProcess().slice(0, 5);
@@ -1367,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} ${selectionHasVideo ? '个文件' : '张图片'}` : '基本信息'}
{isMultiSelect ? `已选择 ${countLabel(actualSelectedCount, selectionTypeCounts)}` : '基本信息'}
</h3>
<div className="space-y-2 text-xs">
{isMultiSelect ? (
@@ -1380,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} {selectionHasVideo ? '个文件' : '张图片'}</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>
@@ -1581,7 +1584,7 @@ function RightPanel() {
</div>
{isMultiSelect && (
<p className="text-xs text-gray-400 dark:text-gray-500 mt-1">
已选择 {actualSelectedCount} {selectionHasVideo ? '个文件' : '张图片'}的共同父路径
已选择 {countLabel(actualSelectedCount, selectionTypeCounts)}的共同父路径
</p>
)}
</div>
@@ -1623,15 +1626,13 @@ function RightPanel() {
{imageCopied ? (
<>
<Check className="w-4 h-4" />
<span>已复制{isMultiSelect ? ` ${actualSelectedCount} ${selectionHasVideo ? '个' : '张'}` : ''}</span>
<span>已复制{isMultiSelect ? ` ${countLabel(actualSelectedCount, selectionTypeCounts)}` : ''}</span>
</>
) : (
<>
<Copy className="w-4 h-4" />
<span>
{singleIsVideo
? '复制视频'
: `${selectionHasVideo ? '复制文件' : '复制图片'}${isMultiSelect ? ` (${actualSelectedCount})` : ''}`}
{`复制${singleIsVideo ? '视频' : selectionTypeLabel}${isMultiSelect ? ` (${actualSelectedCount})` : ''}`}
</span>
</>
)}
@@ -1648,7 +1649,7 @@ function RightPanel() {
<span>
{isExporting
? `打包中... ${exportProgress}%`
: `${singleIsVideo ? '导出视频' : selectionHasVideo ? '导出文件' : '导出图片'}${isMultiSelect ? ` (${actualSelectedCount})` : ''}`
: `导出${singleIsVideo ? '视频' : selectionTypeLabel}${isMultiSelect ? ` (${actualSelectedCount})` : ''}`
}
</span>
</div>
+1 -1
View File
@@ -2,7 +2,7 @@ import { useState, useEffect } from 'react';
import { X, ScanText, Info, Save, FlaskConical, Github, ExternalLink, Wand2 } from 'lucide-react';
import { settingsAPI } from '../api';
const APP_VERSION = 'v1.4.6';
const APP_VERSION = 'v1.4.8';
const REPO_URL = 'https://gitea.88531.cn/jinghui/flypic';
/**
+2
View File
@@ -11,6 +11,7 @@ export const useImageStore = create((set, get) => ({
selectedImage: null,
selectedImages: [],
totalImageCount: 0,
typeCounts: {}, // 按文件类型计数 { image: 102, video: 181, document: 73 }
totalSize: 0, // 素材库总大小(字节)
// 文件夹
@@ -113,6 +114,7 @@ export const useImageStore = create((set, get) => ({
// 统计
setTotalImageCount: (count) => set({ totalImageCount: count }),
setTypeCounts: (counts) => set({ typeCounts: counts || {} }),
setTotalSize: (size) => set({ totalSize: size }),
// 加载状态
+82
View File
@@ -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;
}