@mldong/jeeflow 1.8.5 → 1.8.7

package/dist/engine.d.ts

@@ -55,3 +55,7 @@ export declare class EngineImpl implements Engine {
     private addUserInfo;
     private nextId;
 }
+/** 会签判定（issue 42，对齐 Java ProcessTaskPerformTypeEnum.codeOf）：
+ *  '1' / 'ALL' / 'COUNTERSIGN'（大小写不敏感）→ 会签。
+ *  设计器属性面板保存 'ALL' 字符串符合 Java 契约，引擎必须兼容 */
+export declare function isCountersign(v: any): boolean;

package/dist/engine.js

@@ -356,11 +356,10 @@ export class EngineImpl {
         const actors = await this.resolveActors(node, inst, operator, vars);
         if (!actors.length)
             return;
-        const performType = parseInt(String(node.properties?.performType ?? '0'));
         const ct = node.properties?.countersignType;
         const now = new Date();
         const form = node.properties?.form ?? '';
-        if (performType === 1 && ct) {
+        if (isCountersign(node.properties?.performType) && ct) {
             switch (ct) {
                 case 'PARALLEL':
                     for (const actor of actors)
@@ -513,6 +512,13 @@ function isTruthy(v) {
         return v !== 0;
     return v != null;
 }
+/** 会签判定（issue 42，对齐 Java ProcessTaskPerformTypeEnum.codeOf）：
+ *  '1' / 'ALL' / 'COUNTERSIGN'（大小写不敏感）→ 会签。
+ *  设计器属性面板保存 'ALL' 字符串符合 Java 契约，引擎必须兼容 */
+export function isCountersign(v) {
+    const s = String(v ?? '').trim().toUpperCase();
+    return s === '1' || s === 'ALL' || s === 'COUNTERSIGN';
+}
 /** 办理提交的 f_ 字段按任务节点 field 权限过滤（issues/26）——
  *  任务节点 properties.field 声明 PERMISSION_f_{全名}（前端约定，优先）或
  *  PERMISSION_{去前缀名}（兼容）的字段，值非 EDIT(2)（只读 1/隐藏 3 等）→ 剔除不入变量。

package/dist/facade.d.ts

@@ -46,6 +46,10 @@ export declare class JeeflowFacade {
     private surrogateSave;
     private getLastByName;
     private highLight;
+    /** 节点成员进度（issue 41，对齐 boot3 highLight）：按任务状态 + 会签变量组装
+     *  nodeProgress——会签节点带 type（PARALLEL/SEQUENTIAL），成员 done/active 标记；
+     *  动态参与人节点（无静态 actorIds）不返回；name 缺省（引擎不持有宿主用户体系，前端降级显示 id） */
+    private buildNodeProgress;
     private collectPath;
     /** 决策输出边表达式求值（args = 实例变量 + 决策节点前置任务变量） */
     private evalDecisionExpr;

package/dist/facade.js

@@ -4,7 +4,7 @@
 // action（boot2/boot3 端点短名）路由。返回统一结构 {code, msg, data}
 // （code=0 成功 / 99999999 失败）。操作人约定：args.operator 显式传入。
 import { TaskState, } from './model.js';
-import { KeyNextNodeOperator, KeyProcessStartNextNodeOperator } from './engine.js';
+import { KeyNextNodeOperator, KeyProcessStartNextNodeOperator, isCountersign } from './engine.js';
 // submitType 枚举（对齐 boot3）
 const SUBMIT_APPLY = 0;
 const SUBMIT_AGREE = 1;
@@ -603,14 +603,60 @@ export class JeeflowFacade {
                 history.push(t.taskName);
         // 路径补全：start 沿边递归（遇活跃节点停止）；决策分支按表达式求值过滤（issues/06）
         const def = await this.repo.findDefineById(inst.defineId);
+        let nodeProgress = {};
         if (def) {
             try {
                 const flow = JSON.parse(toStr(def.content));
+                nodeProgress = this.buildNodeProgress(flow, his);
                 await this.collectPath(flow, 'start', '', active, history, edges, new Set(), inst.variables ?? {}, his);
             }
             catch { /* ignore */ }
         }
-        return { activeNodeNames: active, historyNodeNames: history, historyEdgeNames: edges };
+        return { activeNodeNames: active, historyNodeNames: history, historyEdgeNames: edges, nodeProgress };
+    }
+    /** 节点成员进度（issue 41，对齐 boot3 highLight）：按任务状态 + 会签变量组装
+     *  nodeProgress——会签节点带 type（PARALLEL/SEQUENTIAL），成员 done/active 标记；
+     *  动态参与人节点（无静态 actorIds）不返回；name 缺省（引擎不持有宿主用户体系，前端降级显示 id） */
+    buildNodeProgress(flow, his) {
+        const progress = {};
+        const names = [...new Set(his.map(t => t.taskName))];
+        for (const name of names) {
+            const tasks = his.filter(t => t.taskName === name);
+            const vars = tasks[0]?.variables ?? {};
+            // 完整办理人列表：会签变量 operatorList_{node} 优先（顺序会签全量），否则任务 actorIds 并集
+            let members = Array.isArray(vars[`operatorList_${name}`]) ? vars[`operatorList_${name}`] : null;
+            if (!members || members.length === 0) {
+                members = [...new Set(tasks.flatMap(t => t.actorIds ?? []))];
+            }
+            if (!members || members.length === 0)
+                continue; // 动态参与人：无静态成员，不返回
+            const doneSet = new Set();
+            for (const t of tasks) {
+                if (t.taskState === TaskState.Done)
+                    for (const a of t.actorIds ?? [])
+                        doneSet.add(a);
+            }
+            const activeActor = tasks.find(t => t.taskState === TaskState.Doing)?.actorIds?.[0];
+            const node = (flow.nodes ?? []).find((n) => n.id === name);
+            // 会签判定：定义节点属性（引擎创建任务时 performType 未落任务表，取模型为准）
+            const nodeProps = node?.properties ?? {};
+            const isCs = isCountersign(nodeProps.performType) || nodeProps.countersignType != null;
+            const item = {
+                members: members.map((id) => {
+                    const m = { id, name: '' };
+                    if (doneSet.has(id))
+                        m.done = true;
+                    else if (id === activeActor)
+                        m.active = true;
+                    return m;
+                }),
+            };
+            if (isCs && nodeProps.countersignType) {
+                item.type = nodeProps.countersignType;
+            }
+            progress[name] = item;
+        }
+        return progress;
     }
     async collectPath(flow, nodeId, edgeName, active, history, edges, visited, vars, historyTasks) {
         if (visited.has(nodeId))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mldong/jeeflow",
-  "version": "1.8.5",
+  "version": "1.8.7",
   "description": "jeeflow workflow engine — Node.js / TypeScript implementation",
   "type": "module",
   "main": "./dist/index.js",