weaver-e9-assistant-cli 1.1.1 → 1.1.3

package/dist/wfstart.js

@@ -431,10 +431,42 @@ async function resolveFieldLinkages(cfg, workflowId, f, merged) {
  *   明细浏览框字段解析并提交 id 与 name；确认后由提交计划冻结，避免二次解析漂移。
  * 返回 E9Response（成功通常含 requestid）。
  */
+/**
+ * ★字段属性硬规则：只允许填写「可编辑」(viewattr=1) 的字段。
+ * 只读(2)/隐藏(3) 字段**禁止**由用户/助手填值——不得绕过表单字段属性自行填值。
+ * 明细表字段同样按 viewattr 判定。无属性信息(viewattr 缺失)不拦，交给后端判定，避免误伤。
+ */
+export function findNonEditableFields(form, values, details = []) {
+    const byId = new Map();
+    for (const table of form?.tables ?? []) {
+        for (const fld of table.fields ?? [])
+            byId.set(String(fld.id), fld);
+    }
+    const bad = [];
+    const checkId = (rawId) => {
+        const id = String(rawId ?? '').replace(/^field/, '');
+        const fld = byId.get(id);
+        if (!fld || fld.viewattr == null || fld.viewattr === 1)
+            return;
+        bad.push({ id, label: fld.label, viewattr: fld.viewattr });
+    };
+    for (const k of Object.keys(values ?? {}))
+        checkId(k);
+    for (const d of details ?? [])
+        for (const row of d?.rows ?? [])
+            for (const k of Object.keys(row ?? {}))
+                checkId(k);
+    return bad;
+}
+
 export async function prepareCreateSubmission(cfg, workflowId, values, requestname, details = []) {
     const f = await describeFormFields(cfg, workflowId);
     if (f.verifyRight === false)
         throw new Error('无权限（verifyRight:false），跑 e9 auth token-login');
+    // ★字段属性硬规则：只读/隐藏字段禁止填值（不得绕过字段属性自行填值）
+    const badFields = findNonEditableFields(f, values, details);
+    if (badFields.length)
+        throw new Error(`拒绝填写只读/隐藏字段：${badFields.map((b) => `${b.label ?? b.id}(${VIEWATTR_LABEL[b.viewattr] ?? 'va=' + b.viewattr})`).join('、')}。表单只允许填写「可编辑」字段，不得绕过字段属性自行填值。`);
     const name = requestname || `${f.workflowName ?? '流程'}-系统管理员-${todayStr()}`;
     const merged = { ...values };
     // 用户未填的人员/部门/日期字段，用当前用户信息默认补上
@@ -449,8 +481,8 @@ export async function prepareCreateSubmission(cfg, workflowId, values, requestna
             const id = String(fld.id);
             if (merged[id] !== undefined)
                 continue; // 用户已填
-            if (fld.viewattr === 2)
-                continue; // 只读字段由系统/联动控制，不补默认值（避免覆盖联动计算，如外出时间 WCSJ）
+            if (fld.viewattr === 2 || fld.viewattr === 3)
+                continue; // 只读/隐藏字段由系统/联动控制，不补默认值（不得绕过字段属性自行填值）
             const dv = defaultForField(fld.label, fld.htmltype, user);
             if (dv)
                 merged[id] = dv;

package/dist/wfuser.js

@@ -4,18 +4,17 @@
  * 接口（用户抓包确认）：GET /api/hrm/login/getAccountList?__random__=<ts>
  *   aiAgentToken 鉴权。返回 data.{userid, username, deptid, deptname, subcompanyname, jobs}。
  */
-import { AuthTokenSession } from './auth-token.js';
 import { createApiFromProfile } from './client.js';
 import { todayStr } from './util.js';
-/** 取当前登录用户信息。 */
+/**
+ * 取当前登录用户信息。GET /api/hrm/login/getAccountList?__random__=<ts>
+ * 走 E9Api（ensureValid + 双头 + 重试 + 失效逃生，见 client.js）——2026-09-20 e9pc 实测：
+ * 裸 fetch(aiAgentToken) 会 404（缺头/token 状态不同步），E9Api 通道正常返回 accountlist。
+ */
 export async function getCurrentUser(cfg) {
-    const sess = AuthTokenSession.fromProfile(cfg);
-    const base = cfg.baseUrl.replace(/\/+$/, '');
-    const r = await fetch(`${base}/api/hrm/login/getAccountList?__random__=${Date.now()}`, {
-        headers: { aiAgentToken: sess.token, 'X-Requested-With': 'XMLHttpRequest' },
-        signal: AbortSignal.timeout(12000),
-    });
-    const j = await r.json();
+    const api = await createApiFromProfile(cfg);
+    const r = await api.get('/api/hrm/login/getAccountList', { __random__: Date.now() });
+    const j = r?.json ?? {};
     const d = j?.data ?? {};
     // accountlist 里 iscurrent=1 的是当前账号；data 顶层也有当前用户字段
     const list = Array.isArray(d.accountlist) ? d.accountlist : [];

package/dist/workflow.js

@@ -48,9 +48,9 @@ export const DEFAULT_FILTERS = {
 /** 各分类的 viewScope/complete/menuIds/默认viewcondition（来自 HAR 抓包实跑确认）。
  *  menuIds 可由 cfg 覆盖：cfg.doneMenuIds/mineMenuIds；viewcondition 可由 opts 覆盖（子 tab）。 */
 export const CATEGORY_SCOPE = {
-    todo: { viewScope: 'doing', complete: '0', menuIdsKey: 'menuIds', defaultViewcondition: '5' },
-    done: { viewScope: 'done', complete: '2', menuIdsKey: 'doneMenuIds', defaultMenuIds: '1,90', defaultViewcondition: '10' },
-    mine: { viewScope: 'mine', complete: '2', menuIdsKey: 'mineMenuIds', defaultMenuIds: '1,14', defaultViewcondition: '16' },
+    todo: { viewScope: 'doing', complete: '0', menuIdsKey: 'menuIds', defaultViewcondition: '5', fullTab: '0', pageTitle: '待办事宜', countEndpoint: 'doingCountInfo' },
+    done: { viewScope: 'done', complete: '2', menuIdsKey: 'doneMenuIds', defaultMenuIds: '1,90', defaultViewcondition: '10', fullTab: '10', pageTitle: '已办事宜', countEndpoint: 'doneCountInfo' },
+    mine: { viewScope: 'mine', complete: '2', menuIdsKey: 'mineMenuIds', defaultMenuIds: '1,14', defaultViewcondition: '16', fullTab: '16', pageTitle: '我的请求', countEndpoint: 'mineCountInfo' },
 };
 /** 排序字段映射表 */
 const SORT_FIELD_MAP = {
@@ -86,19 +86,43 @@ export function parseTimeRange(range) {
         return { from: parts[0], to: parts[0] };
     return { from: parts[0] || "", to: parts[1] || "" };
 }
+/** 日期过滤的预设值（OA reqlist 的 createdateselect/recievedateselect/operatedateselect 共用）：
+ *  0=全部 1=今天 2=本周 3=本月 4=本季 5=本年；自定义区间用 select=0 + from/to。 */
+const DATE_PRESETS = { '全部': '0', '不限': '0', '今天': '1', '本周': '2', '本月': '3', '本季': '4', '本年': '5' };
+/**
+ * 解析日期过滤，返回 { select, from, to }：
+ *  - 预设名（今天/本周/本月/本季/本年/全部/不限）→ select=1~5 或 0，from/to 空；
+ *  - 数字 0~5 → 直接当 select；
+ *  - 日期范围（"YYYY-MM-DD [YYYY-MM-DD]"）→ select='0' + from/to（自定义区间）。
+ */
+export function resolveDateFilter(spec) {
+    const s = String(spec ?? '').trim();
+    if (!s)
+        return { select: '0', from: '', to: '' };
+    if (DATE_PRESETS[s] !== undefined)
+        return { select: DATE_PRESETS[s], from: '', to: '' };
+    if (/^[0-5]$/.test(s))
+        return { select: s, from: '', to: '' };
+    const parts = s.split(/\s+/);
+    return { select: '0', from: parts[0] || '', to: parts[1] || parts[0] || '' };
+}
 
 /** 子分类 viewcondition 映射表 */
 export const TODO_TABS = {
     "全部": "0", "待处理": "5", "待阅": "6", "被退回": "7",
-    "转发": "4", "未读": "1", "新反馈": "2", "已查阅": "3", "关注": "37",
+    "被督办": "4", "未读": "1", "反馈": "2", "超时": "3", "我的关注": "37",
 };
 
+/** 已办页签（实测 .18 doneBaseInfo.groupinfo；旧表把 17/18 误记成「审批中/已结束」）。 */
 export const DONE_TABS = {
-    "全部": "10", "关注": "38",
+    "全部": "10", "未归档": "11", "已归档": "12", "待回复": "13",
+    "未读": "14", "反馈": "15", "我的关注": "38",
 };
 
+/** 我发起页签（实测 .18 mineBaseInfo.groupinfo）。 */
 export const MINE_TABS = {
-    "全部": "16", "审批中": "17", "已结束": "18", "关注": "39",
+    "全部": "16", "未归档": "17", "已归档": "18",
+    "未读": "19", "反馈": "20", "我的关注": "39",
 };
 
 export function resolveSubCategory(spec, category) {
@@ -297,6 +321,97 @@ export function mergeSmartTodoGroups(results, page = 1) {
     };
 }
 
+// ─── 按 OA 二级分类页签分组（待办/已办/我发起通用）────────────
+
+/** 内置页签表（CountInfo 不返回 topTab 时回退；实测仅待办返回 topTab，已办/我发起均不返回）。 */
+function builtinTabs(category) {
+    const map = category === 'done' ? DONE_TABS : category === 'mine' ? MINE_TABS : TODO_TABS;
+    return Object.entries(map).map(([title, viewcondition]) => ({ title, viewcondition: String(viewcondition), groupid: '' }));
+}
+
+/**
+ * 取 OA 二级分类页签清单（三级数据源，逐级回退）：
+ *   ① {scope}CountInfo.topTab——**只有待办返回**（实测 .18）；附带各页签计数 totalcount[groupid]。
+ *   ② {scope}BaseInfo.groupinfo——**已办/我发起的唯一来源**（实测 .18：done 7 个页签、mine 6 个）；无计数。
+ *   ③ 内置页签名表（网络异常时的兜底）；无计数。
+ * 已剔除「全部」页签——它是其它所有页签的并集，单列会吞掉全部分类。
+ */
+export async function getOaTabs(cfg, category) {
+    const scope = CATEGORY_SCOPE[category] ?? CATEGORY_SCOPE.todo;
+    const menuIds = String(cfg[scope.menuIdsKey] ?? scope.defaultMenuIds ?? cfg.menuIds ?? '1,13');
+    const menuPathIds = String(cfg[scope.menuIdsKey] ?? cfg.menuPathIds ?? menuIds);
+    const mapTab = (t) => ({ title: String(t?.title ?? ''), viewcondition: String(t?.viewcondition ?? ''), groupid: String(t?.groupid ?? '') });
+    let tabs = [];
+    let counts = {};
+    let source = 'builtin';
+    const api = await createApiFromProfile(cfg);
+    // ① CountInfo.topTab（待办有；已办/我发起实测不返回）
+    try {
+        const r = await api.post(`/api/workflow/reqlist/${scope.countEndpoint}`, buildScopeBody(scope.defaultViewcondition, scope, menuIds, menuPathIds));
+        const j = r.json ?? {};
+        counts = j.totalcount ?? {};
+        tabs = (j.topTab ?? []).map(mapTab).filter((t) => t.title && t.viewcondition !== '');
+        if (tabs.length)
+            source = 'countinfo';
+    }
+    catch { /* 落到下一级 */ }
+    // ② BaseInfo.groupinfo（已办/我发起的权威来源）
+    if (!tabs.length) {
+        try {
+            const r = await api.post(`/api/workflow/reqlist/${scope.viewScope}BaseInfo`, buildScopeBody(scope.defaultViewcondition, scope, menuIds, menuPathIds));
+            tabs = (r.json?.groupinfo ?? []).map(mapTab).filter((t) => t.title && t.viewcondition !== '');
+            if (tabs.length)
+                source = 'baseinfo';
+        }
+        catch { /* 落到下一级 */ }
+    }
+    // ③ 内置表兜底
+    if (!tabs.length)
+        tabs = builtinTabs(category);
+    return { tabs: tabs.filter((t) => t.viewcondition !== String(scope.fullTab)), counts, scope, source };
+}
+
+/**
+ * 按 OA 页签分组取数：每个页签独立查询、并发执行，同一 requestId 只保留在靠前的页签里（避免重复推荐）。
+ * 只列有数据的分类：计数已知且为 0 的页签直接跳过（不查询）；查完 total=0 的也不展示。
+ */
+export async function getOaTabGroups(cfg, opts = {}) {
+    const category = opts.category ?? 'todo';
+    const { tabs, counts } = await getOaTabs(cfg, category);
+    const results = await Promise.all(tabs.map(async (tab) => {
+        const known = tab.groupid && counts[tab.groupid] !== undefined ? Number(counts[tab.groupid]) : NaN;
+        if (Number.isFinite(known) && known === 0)
+            return null; // 计数已知为 0 → 不查询
+        const result = await getWfList(cfg, { ...opts, category, subCategory: tab.viewcondition, _singleWorkflow: false });
+        return { tab, result };
+    }));
+    const seen = new Set();
+    const groups = [];
+    for (const entry of results) {
+        if (!entry)
+            continue;
+        const { tab, result } = entry;
+        if (!result.total)
+            continue; // 无数据不展示
+        const items = result.items.filter((item) => {
+            const id = String(item.requestId ?? '');
+            if (!id || seen.has(id))
+                return !id;
+            seen.add(id);
+            return true;
+        });
+        groups.push({ key: tab.viewcondition, title: tab.title, viewcondition: tab.viewcondition, total: result.total, items, result: { ...result, items } });
+    }
+    return {
+        category,
+        page: opts.page ?? 1,
+        groups,
+        categoryTotals: Object.fromEntries(groups.map((g) => [g.viewcondition, Number(g.total) || 0])),
+        // 仅用于诊断：各分类相加（页签间有交集，绝不能称为“总数”）
+        categoryTotalSum: groups.reduce((sum, g) => sum + (Number(g.total) || 0), 0),
+    };
+}
+
 /** 解析 doingBaseInfo.treedata 中的流程类型节点。 */
 export function parseWorkflowTypes(tree) {
     const out = [];
@@ -371,28 +486,22 @@ function buildFilters(opts) {
     if (opts.creatorSubcom)
         f.creatersubcompanyid = opts.creatorSubcom;
     if (opts.createTime) {
-        const ct = parseTimeRange(opts.createTime);
-        if (ct.from) {
-            f.createdateselect = '1';
-            f.createdatefrom = ct.from;
-            f.createdateto = ct.to;
-        }
+        const ct = resolveDateFilter(opts.createTime);
+        f.createdateselect = ct.select;
+        f.createdatefrom = ct.from;
+        f.createdateto = ct.to;
     }
     if (opts.receiveTime) {
-        const rt = parseTimeRange(opts.receiveTime);
-        if (rt.from) {
-            f.recievedateselect = '1';
-            f.recievedatefrom = rt.from;
-            f.recievedateto = rt.to;
-        }
+        const rt = resolveDateFilter(opts.receiveTime);
+        f.recievedateselect = rt.select;
+        f.recievedatefrom = rt.from;
+        f.recievedateto = rt.to;
     }
     if (opts.operateTime) {
-        const ot = parseTimeRange(opts.operateTime);
-        if (ot.from) {
-            f.operatedateselect = '1';
-            f.operatedatefrom = ot.from;
-            f.operatedateto = ot.to;
-        }
+        const ot = resolveDateFilter(opts.operateTime);
+        f.operatedateselect = ot.select;
+        f.operatedatefrom = ot.from;
+        f.operatedateto = ot.to;
     }
     if (opts.requestLevel)
         f.requestlevel = opts.requestLevel;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weaver-e9-assistant-cli",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "泛微 e-cology E9 HTTP 能力 CLI 封装（待办、微博、新建流程、邮件、公文、日程、考勤、建模台账）",
   "type": "module",
   "bin": {
@@ -18,7 +18,7 @@
   "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",
+    "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 && node --check dist/hrm.js",
     "test": "node --test \"tests/**/*.test.js\"",
     "prepack": "npm test",
     "release": "node scripts/release.js",