diff --git a/app/server/public/index.html b/app/server/public/index.html
index 56da3fa..9b33885 100644
--- a/app/server/public/index.html
+++ b/app/server/public/index.html
@@ -2296,18 +2296,24 @@
}
// 扁平文件列表 → 树节点 { name, path, dirs: Map, files: [] }
+ // 目录标记行(?dirs=1:filename 以 '/' 结尾 + dir:true)只沿途铺设路径节点、不入任何 files[],
+ // 不含文件的空夹子因此也能渲染;与同名文件路径铺出的节点经 dirs Map 天然去重。
function buildFilesTree(files) {
const root = { name: '', path: '', dirs: new Map(), files: [] };
for (const f of files) {
- const segs = String(f.filename).split('/');
+ const isDir = f.dir === true || /\/$/.test(String(f.filename));
+ const name = isDir ? String(f.filename).replace(/\/+$/, '') : String(f.filename);
+ if (!name) continue;
+ const segs = name.split('/');
let node = root, rel = '';
- for (let i = 0; i < segs.length - 1; i++) {
+ const dirDepth = isDir ? segs.length : segs.length - 1; // 文件:末段是文件名;目录:全是路径段
+ for (let i = 0; i < dirDepth; i++) {
const seg = segs[i];
rel = rel ? rel + '/' + seg : seg;
if (!node.dirs.has(seg)) node.dirs.set(seg, { name: seg, path: rel, dirs: new Map(), files: [] });
node = node.dirs.get(seg);
}
- node.files.push(f);
+ if (!isDir) node.files.push(f);
}
return root;
}
@@ -2409,8 +2415,9 @@
filesTreeRoot = null;
updateFilesFooter();
try {
- const files = await req('GET', '/api/sessions/' + state.sessionId + '/files');
- filesAllPaths = files.map(f => f.filename);
+ const files = await req('GET', '/api/sessions/' + state.sessionId + '/files?dirs=1');
+ // 目录标记行不参与选中/全选/计数,只用来铺树(空文件夹可见)
+ filesAllPaths = files.filter(f => !(f.dir === true || /\/$/.test(String(f.filename)))).map(f => f.filename);
// 重建目录树后只渲染当前目录这一层(后端已按时间倒序,组内再排一次防旧排序缓存)
filesTreeRoot = buildFilesTree(files);
renderFilesDir(); // filesCurDir 失效时自动退回根目录
diff --git a/app/server/routes/files.js b/app/server/routes/files.js
index 87b9872..0f125b4 100644
--- a/app/server/routes/files.js
+++ b/app/server/routes/files.js
@@ -79,7 +79,8 @@ router.get('/:id/files', function (req, res) {
try {
const session = engine.getSession(req.params.id);
if (!session) return res.status(404).json({ error: '会话不存在' });
- res.json(listTaskFiles(engine.taskDirOf(session.id)));
+ // ?dirs=1:附带目录标记行,前端任务文件面板用它展示空文件夹(默认不附,老消费者不受影响)
+ res.json(listTaskFiles(engine.taskDirOf(session.id), { dirs: req.query.dirs === '1' }));
} catch (err) {
res.status(500).json({ error: String(err && err.message || err) });
}
diff --git a/app/server/routes/sessions.js b/app/server/routes/sessions.js
index 8dfb2db..c2a6b5d 100644
--- a/app/server/routes/sessions.js
+++ b/app/server/routes/sessions.js
@@ -38,8 +38,10 @@ function getMessage(req, res) {
res.json(row);
}
-// 递归列出任务目录文件
-function listTaskFiles(dir) {
+// 递归列出任务目录文件。opts.dirs=true 时额外输出目录标记行
+//(filename 以 '/' 结尾 + dir:true),使不含任何文件的空夹子也能被前端展示。
+function listTaskFiles(dir, opts) {
+ const wantDirs = !!(opts && opts.dirs);
const out = [];
(function rec(d, rel) {
let entries;
@@ -47,7 +49,10 @@ function listTaskFiles(dir) {
for (const e of entries) {
const abs = path.join(d, e.name);
const relPath = rel ? rel + '/' + e.name : e.name;
- if (e.isDirectory()) rec(abs, relPath);
+ if (e.isDirectory()) {
+ if (wantDirs) out.push({ filename: relPath + '/', dir: true });
+ rec(abs, relPath);
+ }
else if (e.isFile()) {
let size = null, mtime = null, ctime = null;
// birthtime 在部分文件系统不可用(返回 0),回退 mtime;新生成/上传的文件两者基本一致