weaver-e9-assistant-cli 1.1.3 → 1.1.4

package/dist/cli.js

@@ -31,7 +31,7 @@ import { collectQueryableBusiness } from './report.js';
 import { listCube, getCubeCondition, getCubeInit, exportCubeExcel, getSearchColumnInfo, listCubeExcel, getCubeCountData, getCubeGroupData, getExpCardConfig, getModeBrowserOptions, getCardFields, submitCubeCard, deleteCubeData, printCubePdf, listCubeMenus, findCubeByName, fetchMenuMounts, previewCubeCard, fetchCubeRowsByIds, resolveCubeCondition, downloadCubeImportTemplate, importCubeExcel, assertEditableCardValues } from './cube.js';
 import { getCurrentUser, getCurrentUserIsAdmin } from './wfuser.js';
 import { getSubordinates, assertUserIdsInScope, assertNamesInScope, isScopeEnforced } from './subordinate.js';
-import { resolveHrmTab, getHrmTabs, getHrmConditions, resolveHrmCondition, hrmList, buildHrmCardUrl, findHrmOrgNode, applyResolvedPersonIds } from './hrm.js';
+import { resolveHrmTab, getHrmTabs, getHrmConditions, resolveHrmCondition, hrmList, buildHrmCardUrl, findHrmOrgNode, applyResolvedPersonIds, expandHrmOrgTree } from './hrm.js';
 import { parseArgs, flagStr, flagBool } from './args.js';
 import { todayStr } from './util.js';
 import { BOX_TOP, DIVIDER } from './render.js';
@@ -146,6 +146,7 @@ function usage() {
         '  e9 cube find <名称>          按名模糊匹配台账（列候选消歧，返回 customid+mode+app，供 list/create 等用）',
         '  e9 cube find <名称> --tree-detail   展开 tree 测试类台账的全部树节点路径（默认只显首条菜单路径）',
         '  e9 subordinate list [--name <姓名>] [--all-level] [--page <n>] [--json] [--raw] [--refresh]   查询我的下属（默认直接下属；--all-level 全部层级）',
+        '  e9 hrm tree [--id <组织id>] [--type <1分部|2部门>] [--depth <n>] [--dept <部门名|id>] [--subcompany <分部名|id>] [--json]   组织架构树',
         '  e9 hrm tabs                                         列出人事搜索范围（全部人员/同部门/我的下属）',
         '  e9 hrm conditions [--tab <全部人员|同部门|我的下属>]   列出该范围可用搜索条件（label→domkey）',
         '  e9 hrm search [--tab <全部人员|同部门|我的下属>] [--name <姓名>] [--condition "岗位=经理;性别=男"]',
@@ -1747,15 +1748,16 @@ async function runBlog(args) {
             return { ...it, matchType, _sort: matchType === 'exact' ? 0 : matchType === 'prefix' ? 1 : 2 };
         });
         annotated.sort((a, b) => a._sort - b._sort);
+        const atBase = endpointFor(cfg).baseUrl.replace(/\/+$/, '');
         if (args.flags.json) {
-            console.log(JSON.stringify({ pageIndex: r.pageIndex, pageSize: r.pageSize, noMore: r.noMore, query: q || undefined, items: annotated.map(({ _sort, ...rest }) => rest) }, null, 2));
+            console.log(JSON.stringify({ pageIndex: r.pageIndex, pageSize: r.pageSize, noMore: r.noMore, query: q || undefined, items: annotated.map(({ _sort, ...rest }) => withLink('hrm', { id: rest.uid, name: rest.name }, atBase, rest)) }, null, 2));
             return;
         }
         console.log(`E9 微博 @ 提及用户列表 [第 ${r.pageIndex} 页]${r.noMore ? '' : '（还有更多）'}  共 ${annotated.length} 条${q ? ` · 搜索「${flagStr(args, 'name')}」` : ''}`);
         for (let i = 0; i < annotated.length; i++) {
             const it = annotated[i];
             const tag = it.matchType === 'exact' ? ' ★精确匹配' : it.matchType === 'prefix' ? ' ·前缀' : '';
-            console.log(`${i + 1}. ${it.name}  (uid=${it.uid})${tag}`);
+            console.log(`${i + 1}. ${hyperlinkFor('hrm', { id: it.uid }, atBase, it.name)}  (uid=${it.uid})${tag}`);
         }
         return;
     }
@@ -3781,8 +3783,9 @@ async function runSubordinate(args) {
         console.error(JSON.stringify(r.raw.counts, null, 2));
         console.error('===== 解析结果 =====');
     }
+    const subBase = endpointFor(cfg).baseUrl.replace(/\/+$/, '');
     if (args.flags.json) {
-        console.log(JSON.stringify({ lastname, allLevel, page, pageSize: r.pageSize, total: r.total, count: r.count, items: r.items.map((it) => ({ id: it.id, name: it.name, fields: it.fields })) }, null, 2));
+        console.log(JSON.stringify({ lastname, allLevel, page, pageSize: r.pageSize, total: r.total, count: r.count, items: r.items.map((it) => withLink('hrm', { id: it.id, name: it.name, fields: it.fields }, subBase)) }, null, 2));
         return;
     }
     console.log(`我的下属${allLevel ? '（全部层级）' : '（直接下属）'}${name ? ` · 姓名过滤「${name}」` : ''} [第 ${page} 页${r.pageSize != null ? ` · 每页 ${r.pageSize} 条` : ''}${r.total != null ? ` / 共 ${r.total} 人` : ''}]  当前 ${r.count} 人`);
@@ -3790,13 +3793,16 @@ async function runSubordinate(args) {
         console.log('（无下属）');
         return;
     }
-    const cols = (r.columns || []).filter((c) => c.dataIndex && c.dataIndex !== 'randomFieldId');
+    // 表头同样排除 id 列（服务端把 id 列的标题误标为「是否在线」，列出来会误导）与 randomFieldId
+    const hdrIdCol = r.items[0]?.idCol;
+    const cols = (r.columns || []).filter((c) => c.dataIndex && c.dataIndex !== 'randomFieldId' && c.dataIndex !== hdrIdCol);
     if (cols.length)
         console.log(`字段(${cols.length}): ${cols.map((c) => c.title ?? c.dataIndex).join(' | ')}`);
     for (let i = 0; i < r.items.length; i++) {
         const it = r.items[i];
-        console.log(`${i + 1}. ${it.name || '(无姓名)'}  [id=${it.id || ''}]`);
-        const meta = it.fields.filter((f) => f.value && f.title && f.dataIndex !== it.idCol).slice(0, 6).map((f) => `${f.title}=${f.value}`).join(' | ');
+        console.log(`${i + 1}. ${hyperlinkFor('hrm', { id: it.id }, subBase, it.name || '(无姓名)')}  [id=${it.id || ''}]`);
+        // 排除内部列：id 列（其标题被服务端误标为「是否在线」）、姓名列（已作可点标题）、randomFieldId（id 的副本）
+        const meta = it.fields.filter((f) => f.value && f.title && f.dataIndex !== it.idCol && f.dataIndex !== it.nameCol && f.dataIndex !== 'randomFieldId').slice(0, 6).map((f) => `${f.title}=${f.value}`).join(' | ');
         if (meta)
             console.log(`   ${meta}`);
     }
@@ -3804,6 +3810,18 @@ async function runSubordinate(args) {
 
 // ─── 组织人事（HRM）搜索 ─────────────────────────────────
 
+/**
+ * hrm search 结果里值为「字典编码」的列（dataIndex）。
+ * E9 在人事搜索接口（hrm/search/getHrmSearchResult）里**不解析**这些字段——给的是 id/code，
+ * 而同为人员列表的 subordinateinfo/getSearchResult 会解析（部门/分部/直接上级都给中文名）。
+ * 实测：岗位 jobtitlespan 给的就是 "1830"、性别 sexspan 给 "1"。OA 的「查询人员」页同样只显示编码。
+ * 故渲染时标注「（编码）」，避免用户把 1830 误读成名称。
+ */
+const HRM_CODE_FIELDS = new Set([
+    'sex', 'accounttype', 'belongto', 'jobtitle', 'jobGroupId',
+    'jobactivity', 'jobcall', 'joblevel', 'status', 'systemlanguage', 'locationid',
+]);
+
 /** 组织节点名称 → id（用于 --dept/--subcompany 名称定位；纯数字原样直传）。 */
 async function resolveHrmOrgValue(cfg, keyword, { matchType, flag }) {
     const node = await findHrmOrgNode(cfg, keyword, { matchType });
@@ -3859,8 +3877,56 @@ async function runHrm(args) {
         }
         return;
     }
+    if (sub === 'tree') {
+        // 组织架构树：无参列顶层分部；--dept/--subcompany 定位到该组织后展开；--id（+可选 --type）直接指定起点；--depth 展示层数
+        const depth = Math.min(Math.max(Number(flagStr(args, 'depth') ?? '1') || 1, 1), 5);
+        const deptSpec = flagStr(args, 'dept');
+        const subSpec = flagStr(args, 'subcompany');
+        let start = { type: '0', id: '0' };
+        let located = null;
+        if (deptSpec || subSpec) {
+            const kw = deptSpec ?? subSpec;
+            const wantType = deptSpec ? '2' : '1';
+            const label = deptSpec ? '部门' : '分部';
+            if (/^\d+$/.test(kw)) {
+                located = { id: kw, type: wantType, name: kw };
+            }
+            else {
+                located = await findHrmOrgNode(cfg, kw, { matchType: wantType });
+                if (!located)
+                    throw new Error(`未找到${label}「${kw}」。可先跑 e9 hrm tree 查看顶层分部，或改用数字 id。`);
+            }
+            start = { type: located.type, id: located.id };
+        }
+        else if (flagStr(args, 'id')) {
+            start = { type: flagStr(args, 'type') ?? '1', id: flagStr(args, 'id') };
+        }
+        const r = await expandHrmOrgTree(cfg, { ...start, depth });
+        if (args.flags.json) {
+            console.log(JSON.stringify({ start, located, depth, nodes: r.nodes, total: r.total, truncated: r.truncated }, null, 2));
+            return;
+        }
+        console.log(located
+            ? `E9 组织架构 · ${located.name || located.id}（type=${start.type} id=${start.id}）`
+            : 'E9 组织架构 · 顶层分部');
+        if (!r.nodes.length) {
+            console.log('（无下级组织）');
+            return;
+        }
+        const render = (nodes, indent) => {
+            for (const n of nodes) {
+                const kind = n.type === '1' ? '分部' : n.type === '2' ? '部门' : `type=${n.type}`;
+                console.log(`${indent}${n.name}  [${kind} id=${n.id}]`);
+                if (n.children.length)
+                    render(n.children, indent + '  ');
+            }
+        };
+        render(r.nodes, '  ');
+        console.log(`\n共 ${r.total} 个组织节点${r.truncated ? '（已达显示上限，结果被截断）' : ''}。`);
+        return;
+    }
     if (sub !== 'search') {
-        console.error(`hrm 子命令: tabs/conditions/search，收到: ${sub}`);
+        console.error(`hrm 子命令: tabs/conditions/search/tree，收到: ${sub}`);
         process.exit(1);
     }
     const tab = flagStr(args, 'tab') ?? '全部人员';
@@ -3940,8 +4006,12 @@ async function runHrm(args) {
         const it = r.items[i];
         const head = hyperlinkFor('hrm', it, base, it.name || '(无姓名)');
         console.log(`${i + 1}. ${head}  [id=${it.id || ''}]`);
-        // 行 meta 去掉姓名（head 已显示）与 id 类列，避免重复
-        const meta = it.fields.filter((f) => !['lastname', 'id', 'randomField0', 'randomFieldId'].includes(f.dataIndex)).slice(0, 8).map((f) => `${f.title}=${f.value}`).join(' | ');
+        // 行 meta 去掉姓名（head 已显示）与 id 类列，避免重复；字典编码字段标注「（编码）」
+        const meta = it.fields
+            .filter((f) => !['lastname', 'id', 'randomField0', 'randomFieldId'].includes(f.dataIndex))
+            .slice(0, 8)
+            .map((f) => `${f.title}=${f.value}${f.value && HRM_CODE_FIELDS.has(f.dataIndex) ? '（编码）' : ''}`)
+            .join(' | ');
         if (meta)
             console.log(`   ${meta}`);
     }
@@ -4046,7 +4116,7 @@ async function main() {
     const cmd = args._[0] ?? 'todo';
     if (cmd === 'version') {
         const buildHash = createHash('sha256').update(fs.readFileSync(new URL(import.meta.url))).digest('hex').slice(0, 12);
-        console.log(JSON.stringify({ name: 'weaver-e9-assistant-cli', version: '1.1.3', buildHash }, null, 2));
+        console.log(JSON.stringify({ name: 'weaver-e9-assistant-cli', version: '1.1.4', buildHash }, null, 2));
         return;
     }
     if (cmd === 'whoami') {

package/dist/hrm.js

@@ -411,6 +411,36 @@ export async function findHrmOrgNode(cfg, keyword, { matchType = null, maxDepth
     return null;
 }
 
+/**
+ * 递归展开组织树（供 `e9 hrm tree` 用）。
+ * 起点 (type,id)：'0'/'0' = 顶层分部；'1'/<分部id> = 子分部+部门；'2'/<部门id> = 子部门。
+ * depth = 展示层数（1 = 只列起点下一层）；maxNodes 防失控（超限截断，调用方须提示）。
+ */
+export async function expandHrmOrgTree(cfg, { type = '0', id = '0', depth = 1, maxNodes = 500 } = {}) {
+    let count = 0;
+    let truncated = false;
+    async function walk(t, i, levels) {
+        if (levels < 1)
+            return [];
+        const r = await getHrmSearchTree(cfg, { type: t, id: i });
+        const out = [];
+        for (const n of r.datas) {
+            if (count >= maxNodes) {
+                truncated = true;
+                break;
+            }
+            count++;
+            const node = { id: n.id, name: n.name, type: n.type, isParent: n.isParent, children: [] };
+            if (n.isParent && levels > 1)
+                node.children = await walk(n.type, n.id, levels - 1);
+            out.push(node);
+        }
+        return out;
+    }
+    const nodes = await walk(type, id, depth);
+    return { nodes, total: count, truncated };
+}
+
 // ─── 编排：完整搜索 ──────────────────────────────────────
 
 /**

package/dist/subordinate.js

@@ -116,7 +116,7 @@ export function normalizeSubordinateRow(row, columns) {
         title: c.title,
         value: stripHtml(get(`${c.dataIndex}span`) ?? get(c.dataIndex)),
     }));
-    return { id, name, fields, raw: row };
+    return { id, name, fields, idCol: idCol?.dataIndex, nameCol: nameCol?.dataIndex, raw: row };
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weaver-e9-assistant-cli",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "泛微 e-cology E9 HTTP 能力 CLI 封装（待办、微博、新建流程、邮件、公文、日程、考勤、建模台账）",
   "type": "module",
   "bin": {