@dreamor/atlas-cli 0.7.12 → 0.7.14

package/dist/adapters/atlas/cli.js

@@ -142,10 +142,18 @@ function registerProjectCommands(program) {
     // atlas find
     program
         .command('find <kind> <query>')
-        .description('搜索项目/部门/字典值（kind: project|department|mp-type|line-plan-type|area-code）')
+        .description('搜索项目/部门/字典值（kind: project|department|manpower-type|role|area）')
         .option('--json', '输出 JSON 信封')
         .option('--refresh', '刷新字典/部门/项目缓存')
         .option('--limit <n>', '最多返回 N 个候选（默认 20）')
+        .addHelpText('after', `
+kind 说明:
+
+  project        搜索有权限的项目列表（从 API 实时查询）
+  department     搜索部门树中的部门名称（1500+ 部门节点）
+  manpower-type        搜索人力类型（仅有: "斑马"、"智软" 两条，baseline --manpower-type 用）
+  role 搜索人力基线角色（例: "开发"、"产品"、"测试"、"PM"、"设计" 等）
+  area      搜索地域（仅有: "北上杭"、"合肥"、"武汉"、"西南" 四条）`)
         .action(async (kind, query, opts) => {
         try {
             await findCmd(kind, query, opts);
@@ -212,8 +220,8 @@ function registerBaselineCommands(program) {
         .option('--json', '输出 JSON')
         .option('--department <name>', '按部门名称/ID 筛选（子串，不区分大小写）')
         .option('--role <name>', '按角色/备注筛选（子串，不区分大小写）')
-        .option('--area-code <code>', '按地域筛选（子串，不区分大小写）')
-        .option('--mp-type <type>', '按人力类型筛选（子串，不区分大小写）')
+        .option('--area <code>', '按地域筛选（子串，不区分大小写）')
+        .option('--manpower-type <type>', '按人力类型筛选（子串，不区分大小写）')
         .option('--month <yyyymm>', '查询月份（YYYY-MM，与 --from/--to 互斥）')
         .option('--from <yyyymm>', '起始月份（YYYY-MM，包含）')
         .option('--to <yyyymm>', '结束月份（YYYY-MM，包含）')
@@ -233,8 +241,8 @@ function registerBaselineCommands(program) {
         .option('--by <axis>', 'month | department | role', 'month')
         .option('--department <name>', '按部门名称/ID 筛选（子串，不区分大小写）')
         .option('--role <name>', '按角色/备注筛选（子串，不区分大小写）')
-        .option('--area-code <code>', '按地域筛选（子串，不区分大小写）')
-        .option('--mp-type <type>', '按人力类型筛选（子串，不区分大小写）')
+        .option('--area <code>', '按地域筛选（子串，不区分大小写）')
+        .option('--manpower-type <type>', '按人力类型筛选（子串，不区分大小写）')
         .option('--from <yyyymm>', '起始月份（YYYY-MM，包含）')
         .option('--to <yyyymm>', '结束月份（YYYY-MM，包含）')
         .option('--json', '输出 JSON')

package/dist/adapters/atlas/commands/actual/index.js

@@ -49,15 +49,18 @@ export async function monthCmd(opts) {
             log(`月 ${m} 拉取失败: ${e instanceof Error ? e.message : e}`);
         }
     }
+    // Apply --department / --role filter
+    const filtered = all.filter(p => (!opts.department || (p.departmentName && p.departmentName.includes(opts.department)))
+        && (!opts.role || (p.role && p.role.includes(opts.role))));
     if (opts.json || isJsonMode()) {
-        jsonOk({ projectId: pid, entries: all }, { failedMonths });
+        jsonOk({ projectId: pid, entries: filtered }, { failedMonths });
         return;
     }
-    if (all.length === 0) {
+    if (filtered.length === 0) {
         log('无实际工时数据');
         return;
     }
-    for (const p of all) {
+    for (const p of filtered) {
         log(`  ${p.staffName}: ${p.manpower.toFixed(2)} (${p.role ?? ''})`);
     }
 }
@@ -77,8 +80,11 @@ export async function summaryCmd(opts) {
             log(`月 ${m} 拉取失败: ${e instanceof Error ? e.message : e}`);
         }
     }
+    // Apply --department / --role filter
+    const filtered = all.filter(p => (!opts.department || (p.departmentName && p.departmentName.includes(opts.department)))
+        && (!opts.role || (p.role && p.role.includes(opts.role))));
     const axis = (opts.by ?? 'month');
-    const rows = aggregateByAxis(all, axis);
+    const rows = aggregateByAxis(filtered, axis);
     if (opts.json || isJsonMode()) {
         jsonOk({ rows }, { failedMonths });
         return;
@@ -104,14 +110,17 @@ export async function exportCmd(opts) {
             log(`月 ${m} 拉取失败: ${e instanceof Error ? e.message : e}`);
         }
     }
+    // Apply --department / --role filter
+    const filteredRows = rows.filter(p => (!opts.department || (p.departmentName && p.departmentName.includes(opts.department)))
+        && (!opts.role || (p.role && p.role.includes(opts.role))));
     const content = opts.format === 'csv'
-        ? (await import('papaparse')).default.unparse(rows)
-        : JSON.stringify(rows, null, 2);
+        ? (await import('papaparse')).default.unparse(filteredRows)
+        : JSON.stringify(filteredRows, null, 2);
     enforceOutputLimit(content);
     const safePath = resolveSecureExportPath(opts.out);
     await secureWriteFile(safePath, content);
-    log(`已导出 ${rows.length} 条记录`);
+    log(`已导出 ${filteredRows.length} 条记录`);
     if (opts.json || isJsonMode()) {
-        jsonOk({ exported: rows.length, format: opts.format, out: safePath }, { failedMonths });
+        jsonOk({ exported: filteredRows.length, format: opts.format, out: safePath }, { failedMonths });
     }
 }

package/dist/adapters/atlas/commands/baseline/index.js

@@ -47,9 +47,12 @@ export async function monthCmd(opts) {
             }
         }
     }
+    // Apply --department / --role filter
+    const filtered = allDetails.filter(d => (!opts.department || (d.departmentName && d.departmentName.includes(opts.department)))
+        && (!opts.role || (d.role && d.role.includes(opts.role))));
     // 聚合
     const byMonth = new Map();
-    for (const d of allDetails) {
+    for (const d of filtered) {
         byMonth.set(d.month, (byMonth.get(d.month) ?? 0) + d.manpower);
     }
     const monthKeys = [...byMonth.keys()].sort();
@@ -78,9 +81,12 @@ export async function summaryCmd(opts) {
             }
         }
     }
+    // Apply --department / --role filter
+    const filtered = allDetails.filter(d => (!opts.department || (d.departmentName && d.departmentName.includes(opts.department)))
+        && (!opts.role || (d.role && d.role.includes(opts.role))));
     const axis = opts.by ?? 'month';
     const groups = new Map();
-    for (const d of allDetails) {
+    for (const d of filtered) {
         const k = axis === 'month' ? d.month : axis === 'department' ? (d.departmentName ?? '其他') : (d.role ?? '其他');
         groups.set(k, (groups.get(k) ?? 0) + d.manpower);
     }

package/dist/adapters/atlas/commands/project/index.js

@@ -74,13 +74,13 @@ export async function findCmd(kind, query, opts) {
     }
     else if (kind === 'department') {
         const data = await client.post('/yuntu-service/department/tree/select.json', {});
-        // 需要确认实际响应格式
         const nodes = Array.isArray(data) ? data : [];
         const flatten = (items) => {
             const r = [];
             for (const n of items) {
-                if (n.name.includes(query))
-                    r.push({ id: n.id, name: n.name, kind: 'department' });
+                const name = n.deptName ?? '';
+                if (name.includes(query))
+                    r.push({ id: String(n.id ?? n.deptCode ?? ''), name, kind: 'department' });
                 if (n.children)
                     r.push(...flatten(n.children));
             }
@@ -91,7 +91,16 @@ export async function findCmd(kind, query, opts) {
     else {
         const dictData = await client.post('/yuntu-service/dictionary/select.json', { dictType: kind });
         const entries = Array.isArray(dictData) ? dictData : [];
-        results = entries
+        // 字典 API 忽略 dictType 参数，始终返回全部 181 条。
+        // 按 typeDesc 字段在各 kind 间精确过滤
+        const kindTypeDesc = {
+            'manpower-type': '人力类型',
+            'role': '人力基线角色',
+            'area': '地域',
+        };
+        const desc = kindTypeDesc[kind];
+        const filtered = desc ? entries.filter(e => e.typeDesc === desc) : entries;
+        results = filtered
             .filter((e) => (e.attrName ?? '').includes(query))
             .map((e) => ({ id: e.attrValue ?? '', name: e.attrName ?? '', kind }));
     }

package/dist/adapters/atlas/commands/suggest.js

@@ -7,9 +7,9 @@ const RULES = [
     { pattern: /项目.*列表|列出.*项目|projects/i, command: 'atlas projects', description: '列出所有项目', weight: 10, requiresAuth: true, exitCodes: [0, 2] },
     { pattern: /绑定|link|关联/i, command: 'atlas link <project>', description: '绑定项目（可省后续 --project-id）', weight: 10, requiresAuth: true, exitCodes: [0, 4, 5] },
     { pattern: /解绑|unlink/i, command: 'atlas unlink', description: '解绑项目', weight: 10, requiresAuth: true, exitCodes: [0] },
-    { pattern: /搜索|找|find|查询项目/i, command: 'atlas find project <query>', description: '搜索项目（也支持 department/mp-type/line-plan-type/area-code）', weight: 10, requiresAuth: true, exitCodes: [0, 2] },
+    { pattern: /搜索|找|find|查询项目/i, command: 'atlas find project <query>', description: '搜索项目（也支持 department/manpower-type/role/area）', weight: 10, requiresAuth: true, exitCodes: [0, 2] },
     { pattern: /部门|department/i, command: 'atlas find department <query>', description: '搜索部门', weight: 7, requiresAuth: true, exitCodes: [0, 2] },
-    { pattern: /字典|类型|mp.type|line.plan/i, command: 'atlas find mp-type <query>', description: '搜索 MP 类型字典值', weight: 7, requiresAuth: true, exitCodes: [0, 2] },
+    { pattern: /字典|类型|mp.type|line.plan/i, command: 'atlas find manpower-type <query>', description: '搜索 MP 类型字典值', weight: 7, requiresAuth: true, exitCodes: [0, 2] },
     // ── 基线人力 ────────────────────────────
     { pattern: /基线|计划|baseline|人月.*计划/i, command: 'atlas baseline month --month YYYY-MM', description: '查看指定月份基线人力', weight: 5, requiresAuth: true, exitCodes: [0, 2, 3, 4, 5] },
     { pattern: /基线.*汇总|baseline.*summar/i, command: 'atlas baseline summary [--by month|department|role]', description: '按月/部门/角色汇总基线人力', weight: 5, requiresAuth: true, exitCodes: [0, 2, 3] },

package/dist/adapters/atlas/util/version.js

@@ -1 +1 @@
-export const ATLAS_VERSION = '0.7.12';
+export const ATLAS_VERSION = '0.7.14';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreamor/atlas-cli",
-  "version": "0.7.12",
+  "version": "0.7.14",
   "description": "Atlas CLI - 斑马云图人力基线管理工具",
   "type": "module",
   "bin": {