weaver-e9-assistant-cli 1.0.0 → 1.1.1

package/dist/todobatch.js

@@ -41,10 +41,13 @@ function pickRandomFields(row) {
 
 /** 拉待办列表并取出与 requestIds 匹配的原始行（含 randomField）+ dataKey。跨页匹配直到全部命中或到末尾。 */
 async function loadRowsFor(cfg, requestIds) {
+    // 修复 #6：逐页定位待办是最耗时环节，实时打印进度，避免长时间无输出被误判卡死。
     const wanted = new Set(requestIds.map(String));
     const found = new Map();
     let dataKey = '';
+    console.error(`  [批量] 正在待办列表定位 ${requestIds.length} 条流程（按请求顺序逐页搜索）...`);
     for (let current = 1; current <= 10; current++) {
+        console.error(`  [批量] 读取待办第 ${current} 页...`);
         const list = await getWfList(cfg, { category: 'todo', page: current, pageSize: '100' });
         dataKey = list.dataKey || dataKey;
         const rows = extractRows(list.raw?.datas);
@@ -53,6 +56,7 @@ async function loadRowsFor(cfg, requestIds) {
             if (wanted.has(rid) && !found.has(rid))
                 found.set(rid, row);
         }
+        console.error(`  [批量] 第 ${current} 页已定位 ${found.size}/${requestIds.length} 条`);
         if (rows.length < 100 || found.size === wanted.size)
             break;
         if (!rows.length)
@@ -68,6 +72,7 @@ async function loadRowsFor(cfg, requestIds) {
 
 /** 批量门禁（抓包实证）：checks(dataKey+randomDatas) + getSecondAuthConfig4List(requestIds=rid_uid+__weaver_request_url__=base64)。 */
 async function runGate(api, checkId, rows, dataKey) {
+    console.error(`  [批量] 执行门禁检查（${checkId}）...`);
     const check = await api.post('/api/ec/dev/table/checks', {
         dataKey,
         checkId,
@@ -92,6 +97,7 @@ export async function batchSubmit(cfg, opts) {
     const api = await createApiFromProfile(cfg);
     const { dataKey, rows } = await loadRowsFor(cfg, requestIds);
     const gate = await runGate(api, 'batchSubmit', rows, dataKey);
+    console.error(`  [批量] 提交 ${requestIds.length} 条流程（requestBatchSubmit）...`);
     const result = await api.post('/api/workflow/reqform/requestBatchSubmit', {
         multiSubIds: requestIds.join(',') + ',',
         remark: String(opts.remark ?? 'OK'),
@@ -99,6 +105,7 @@ export async function batchSubmit(cfg, opts) {
         belongtoUserids: userIds.join(',') + ',',
         needBatchSubmit: '1',
     });
+    console.error(`  [批量] 提交响应已返回（status=${result?.status ?? '?'}）`);
     return { requestIds, userIds, gate, result };
 }
 

package/dist/wfuser.js

@@ -5,6 +5,7 @@
  *   aiAgentToken 鉴权。返回 data.{userid, username, deptid, deptname, subcompanyname, jobs}。
  */
 import { AuthTokenSession } from './auth-token.js';
+import { createApiFromProfile } from './client.js';
 import { todayStr } from './util.js';
 /** 取当前登录用户信息。 */
 export async function getCurrentUser(cfg) {
@@ -28,6 +29,42 @@ export async function getCurrentUser(cfg) {
         jobs: String(cur.jobs ?? ''),
     };
 }
+/**
+ * 当前用户是否系统管理员。GET /api/ec/dev/app/getUserInfo?__random__=<ts> → isAdmin===true。
+ * 返回 { isAdmin: true|false|undefined }——undefined 表示无法确认（未取到 isAdmin 字段），
+ * 调用方按「非管理员」fail-closed 处理（越权防护默认不放行）。
+ * 鉴权：token 通道优先；token no-op（200 但无 isAdmin）且配了 cookie → 强制 cookie 头重发逃生。
+ */
+export async function getCurrentUserIsAdmin(cfg) {
+    const api = await createApiFromProfile(cfg);
+    let r = await api.get('/api/ec/dev/app/getUserInfo', { __random__: Date.now() });
+    let isAdmin = pickIsAdmin(r?.json);
+    if (isAdmin === undefined && cfg.cookie) {
+        r = await api.get('/api/ec/dev/app/getUserInfo', { __random__: Date.now() }, { forceCookie: true });
+        isAdmin = pickIsAdmin(r?.json);
+    }
+    return { isAdmin, raw: r?.json ?? null };
+}
+
+/** 深度扫描找 isAdmin 字段（键名大小写不敏感，取值 true/'true'/1 → true）。 */
+function pickIsAdmin(obj) {
+    if (obj == null)
+        return undefined;
+    if (typeof obj === 'object') {
+        for (const [k, v] of Object.entries(obj)) {
+            if (String(k).toLowerCase() === 'isadmin') {
+                return v === true || v === 'true' || v === '1' || v === 1;
+            }
+            if (v && typeof v === 'object') {
+                const r = pickIsAdmin(v);
+                if (r !== undefined)
+                    return r;
+            }
+        }
+    }
+    return undefined;
+}
+
 // 人员类标签（→ userid 或 username）
 const PERSON_LABEL = /申请人|发起人|续签人|经办人|经手人|创建人|人员|姓名|联系人|负责人|填报人/;
 // 部门类标签（→ deptid 或 deptname）

package/dist/workplan.js

@@ -389,6 +389,43 @@ export async function importWorkplanExcel(cfg, opts = {}) {
     const result = parseWorkplanImportResult(response.json);
     return { imported: result.success, filePath, fileid: String(fileid), ...result };
 }
+// ─── 导出日程（Excel）────────────────────────────────────
+/**
+ * 导出日程为 xls。走 cookie（导出接口无 aiAgentToken），GET 直接返回附件流。
+ * endpoint：exportExcelList=日程清单 / exportExcel4Html=日程一览表。
+ * 参数：bywhat（1日/2周/3月）、selectDate、objType、objIds、workPlanType。
+ */
+export async function exportWorkplanExcel(cfg, opts = {}) {
+    const endpoint = opts.type === 'html' ? 'exportExcel4Html' : 'exportExcelList';
+    const params = new URLSearchParams({
+        bywhat: opts.bywhat ?? '3',
+        selectDate: opts.selectDate ?? todayStr(),
+        objType: opts.objType ?? '1',
+        objIds: opts.objIds ?? '',
+        workPlanType: opts.workPlanType ?? '',
+        _t: String(Date.now()),
+    });
+    const api = await createApiFromProfile(cfg);
+    const headers = await api.getHeaders(undefined, { forceCookie: true });
+    delete headers['Content-Type'];
+    const url = `${api.baseUrl}/api/workplan/calendar/${endpoint}?${params.toString()}`;
+    const response = await fetch(url, { headers, signal: AbortSignal.timeout(60000) });
+    if (!response.ok)
+        throw new Error(`日程导出失败：HTTP ${response.status}`);
+    const buf = Buffer.from(await response.arrayBuffer());
+    const disposition = response.headers.get('content-disposition') || '';
+    const m = disposition.match(/filename\*?=(?:UTF-8''|")?([^";]+)/i);
+    let filename = m ? m[1].trim() : `日程导出-${opts.selectDate ?? todayStr()}.xls`;
+    if (filename.startsWith('"') && filename.endsWith('"'))
+        filename = filename.slice(1, -1);
+    try { filename = decodeURIComponent(filename); } catch { /* 保留原样 */ }
+    const outDir = path.resolve(opts.outDir || path.join(os.homedir(), 'Downloads'));
+    fs.mkdirSync(outDir, { recursive: true });
+    const outPath = nextAvailablePath(outDir, filename);
+    fs.writeFileSync(outPath, buf);
+    return { downloaded: true, outPath, filename, size: buf.length, endpoint };
+}
+
 // ─── 工具函数 ────────────────────────────────────────────
 function stringify(v) { if (v === undefined || v === null || v === '')
     return undefined; return String(v); }

package/package.json

@@ -1,25 +1,27 @@
-{
-  "name": "weaver-e9-assistant-cli",
-  "version": "1.0.0",
-  "description": "泛微 e-cology E9 HTTP 能力 CLI 封装（待办、微博、新建流程、邮件、公文、日程、考勤、建模台账）",
-  "type": "module",
-  "bin": {
-    "e9": "dist/cli.js"
-  },
-  "engines": {
-    "node": ">=18"
-  },
-  "optionalDependencies": {
-    "playwright": "^1.62.1"
-  },
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "start": "node dist/cli.js",
-    "e9": "node dist/cli.js",
-    "build": "node --check dist/cli.js && node --check dist/cube.js && node --check dist/workplan.js && node --check dist/fileutil.js && node --check dist/kq.js && node --check dist/links.js && node --check dist/report.js && node --check dist/workflow.js && node --check dist/parse.js && node --check dist/todosubmit.js && node --check dist/wfsummary.js && node --check dist/wfstart.js && node --check dist/submissionplan.js && node --check dist/submissionstate.js && node --check dist/auth-token.js && node --check dist/todobatch.js && node --check dist/pageopen.js && node --check dist/createcontext.js && node --check dist/querystate.js && node --check dist/wfops.js",
-    "test": "node --test tests/*.test.js",
-    "dev": "node dist/cli.js"
-  }
-}
+{
+  "name": "weaver-e9-assistant-cli",
+  "version": "1.1.1",
+  "description": "泛微 e-cology E9 HTTP 能力 CLI 封装（待办、微博、新建流程、邮件、公文、日程、考勤、建模台账）",
+  "type": "module",
+  "bin": {
+    "e9": "dist/cli.js"
+  },
+  "engines": {
+    "node": ">=18"
+  },
+  "optionalDependencies": {
+    "playwright": "^1.63.0"
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "start": "node dist/cli.js",
+    "e9": "node dist/cli.js",
+    "build": "node --check dist/cli.js && node --check dist/cube.js && node --check dist/workplan.js && node --check dist/fileutil.js && node --check dist/kq.js && node --check dist/links.js && node --check dist/report.js && node --check dist/workflow.js && node --check dist/parse.js && node --check dist/todosubmit.js && node --check dist/wfsummary.js && node --check dist/wfstart.js && node --check dist/submissionplan.js && node --check dist/submissionstate.js && node --check dist/auth-token.js && node --check dist/todobatch.js && node --check dist/pageopen.js && node --check dist/createcontext.js && node --check dist/querystate.js && node --check dist/wfops.js && node --check dist/subordinate.js",
+    "test": "node --test \"tests/**/*.test.js\"",
+    "prepack": "npm test",
+    "release": "node scripts/release.js",
+    "dev": "node dist/cli.js"
+  }
+}