@dreamor/atlas-cli 0.7.13 → 0.7.15

package/dist/adapters/atlas/cli.js

@@ -142,7 +142,7 @@ 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）')
@@ -151,12 +151,9 @@ kind 说明:
 
   project        搜索有权限的项目列表（从 API 实时查询）
   department     搜索部门树中的部门名称（1500+ 部门节点）
-  mp-type        搜索人力类型字典值（例: "商机后-研发项目立项通过"、"研发相关" 等）
-  line-plan-type 搜索人力基线角色字典值（例: "开发"、"产品"、"测试"、"PM" 等）
-  area-code      搜索地域字典值（仅有: "北上杭"、"合肥"、"武汉"、"西南" 四条）
-
-注意: mp-type / line-plan-type / area-code 为字典数据，来源于同一字典 API，
-      搜索范围是该字典所有条目的 attrName 字段。`)
+  manpower-type  搜索人力类型（例: "斑马"、"智软"，baseline --manpower-type 用）
+  role           搜索人力基线角色（例: "开发"、"产品"、"测试"、"PM"、"设计" 等）
+  area           搜索地域（例: "北上杭"、"合肥"、"武汉"、"西南"）`)
         .action(async (kind, query, opts) => {
         try {
             await findCmd(kind, query, opts);
@@ -223,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，包含）')
@@ -244,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/baseline/index.js

@@ -26,15 +26,24 @@ function isMonthKey(v) {
         && typeof v.month === 'number'
         && Number.isFinite(v.month);
 }
+/** mpType 值映射：0=斑马 1=智软 */
+const MP_TYPE_MAP = { '0': '斑马', '1': '智软' };
+function filterBaseline(details, opts) {
+    return details.filter(d => (!opts.department || (d.departmentName && d.departmentName.includes(opts.department)))
+        && (!opts.role || (d.role && d.role.includes(opts.role)))
+        && (!opts.area || (d.areaCode && d.areaCode.includes(opts.area)))
+        && (!opts.manpowerType || (d.mpType && MP_TYPE_MAP[d.mpType]?.includes(opts.manpowerType))));
+}
 export async function monthCmd(opts) {
     const pid = getProjectId(opts);
     const months = opts.month ? [opts.month] : expandMonths(opts.from, opts.to);
     const allDetails = [];
     for (const m of months) {
         const data = await fetchBaselineMonth(pid, m);
-        // data 是数组，每项含 linePlanMonthDetailList
         for (const item of (data ?? [])) {
             const details = (item.linePlanMonthDetailList ?? []);
+            const mpType = String(item.mpType ?? '');
+            const areaCode = item.areaCode;
             for (const d of details) {
                 if (isMonthKey(d)) {
                     allDetails.push({
@@ -42,14 +51,15 @@ export async function monthCmd(opts) {
                         manpower: d.manpower ?? 0,
                         role: item.role,
                         departmentName: item.departmentName,
+                        mpType,
+                        areaCode,
                     });
                 }
             }
         }
     }
-    // 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))));
+    // Apply filters
+    const filtered = filterBaseline(allDetails, opts);
     // 聚合
     const byMonth = new Map();
     for (const d of filtered) {
@@ -74,16 +84,17 @@ export async function summaryCmd(opts) {
     for (const m of months) {
         const data = await fetchBaselineMonth(pid, m);
         for (const item of (data ?? [])) {
+            const mpType = String(item.mpType ?? '');
+            const areaCode = item.areaCode;
             for (const d of (item.linePlanMonthDetailList ?? [])) {
                 if (isMonthKey(d)) {
-                    allDetails.push({ month: monthTsToKey(d.month), manpower: d.manpower ?? 0, role: item.role, departmentName: item.departmentName });
+                    allDetails.push({ month: monthTsToKey(d.month), manpower: d.manpower ?? 0, role: item.role, departmentName: item.departmentName, mpType, areaCode });
                 }
             }
         }
     }
-    // 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))));
+    // Apply filters
+    const filtered = filterBaseline(allDetails, opts);
     const axis = opts.by ?? 'month';
     const groups = new Map();
     for (const d of filtered) {

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

@@ -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.13';
+export const ATLAS_VERSION = '0.7.15';

package/package.json

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