@mldong/jeeflow 1.5.0 → 1.6.0

package/dist/builtin.d.ts

@@ -0,0 +1,59 @@
+import type { FlowNode, ProcessInstance } from './model.js';
+import type { IAssignmentHandler } from './registry.js';
+import type { OrgUserProvider, UserProvider } from './spi.js';
+export declare const HANDLER_OPERATOR_ASSIGNMENT = "com.mldong.jeeflow.interceptor.impl.OperatorAssignmentHandler";
+export declare const HANDLER_FORM_FIELD_ASSIGNEE = "com.mldong.jeeflow.interceptor.impl.FormFieldAssigneeHandler";
+export declare const HANDLER_DEPT_LEADER: string;
+export declare const HANDLER_DEPT_MAIN_LEADER: string;
+export declare const HANDLER_APPLICANT_DEPT_LEADER: string;
+export declare const HANDLER_APPLICANT_DEPT_MAIN_LEADER: string;
+export declare const HANDLER_TASK_ROLE_ASSIGNEE: string;
+/** 流程发起人（兜底 "apply.operator"） */
+export declare class OperatorAssignmentHandler implements IAssignmentHandler {
+    assign(_node: FlowNode, inst: ProcessInstance | null, _operator: string): Promise<string[]>;
+}
+/** 按表单字段值分配参与者：精确匹配 node.id → vars 字段；_数字 后缀去后缀再匹配。 */
+export declare class FormFieldAssigneeHandler implements IAssignmentHandler {
+    assign(node: FlowNode, inst: ProcessInstance | null, _operator: string): Promise<string[]>;
+    private findFieldValue;
+    private collect;
+    private add;
+}
+/** 组织维度 handler 公共依赖 */
+declare class OrgBase {
+    protected userProv?: UserProvider | undefined;
+    protected orgProv?: OrgUserProvider | undefined;
+    constructor(userProv?: UserProvider | undefined, orgProv?: OrgUserProvider | undefined);
+    protected byDept(deptId: string, main: boolean): Promise<string[]>;
+    protected deptIdOf(userId: string): Promise<string>;
+}
+/** 当前用户（任务操作人）部门领导 */
+export declare class DeptLeaderAssignmentHandler extends OrgBase implements IAssignmentHandler {
+    assign(_node: FlowNode, _inst: ProcessInstance | null, operator: string): Promise<string[]>;
+}
+/** 当前用户（任务操作人）部门分管领导 */
+export declare class DeptMainLeaderAssignmentHandler extends OrgBase implements IAssignmentHandler {
+    assign(_node: FlowNode, _inst: ProcessInstance | null, operator: string): Promise<string[]>;
+}
+/** 发起人部门领导 */
+export declare class ApplicantDeptLeaderAssignmentHandler extends OrgBase implements IAssignmentHandler {
+    assign(_node: FlowNode, inst: ProcessInstance | null, _operator: string): Promise<string[]>;
+}
+/** 发起人部门分管领导 */
+export declare class ApplicantDeptMainLeaderAssignmentHandler extends OrgBase implements IAssignmentHandler {
+    assign(_node: FlowNode, inst: ProcessInstance | null, _operator: string): Promise<string[]>;
+}
+/** 任务节点唯一编码关联角色（roleCode = 节点 id） */
+export declare class TaskRoleAssigneeHandler implements IAssignmentHandler {
+    private orgProv?;
+    constructor(orgProv?: OrgUserProvider | undefined);
+    assign(node: FlowNode, _inst: ProcessInstance | null, _operator: string): Promise<string[]>;
+}
+/**
+ * 注册内置通用参与者处理器到注册表（组织维度 handler 依赖 userProv/orgProv）。
+ * 与 HandlerRegistry.registerAssignment 组合使用。
+ */
+export declare function registerBuiltinAssignments(reg: {
+    registerAssignment(name: string, handler: IAssignmentHandler): void;
+}, userProv?: UserProvider, orgProv?: OrgUserProvider): void;
+export {};

package/dist/builtin.js

@@ -0,0 +1,135 @@
+// ─── 内置通用参与者处理器（issues/16）───────────────────────────────────────────
+// 注册名与 Java 类全限定名一致，跨语言流程 JSON 通用（前端设计器配置天然兼容）。
+// OperatorAssignmentHandler / FormFieldAssigneeHandler 为纯引擎语义，零外部依赖；
+// 组织维度 handler 通过 OrgUserProvider SPI 取数据，业务方只实现数据接口。
+export const HANDLER_OPERATOR_ASSIGNMENT = 'com.mldong.jeeflow.interceptor.impl.OperatorAssignmentHandler';
+export const HANDLER_FORM_FIELD_ASSIGNEE = 'com.mldong.jeeflow.interceptor.impl.FormFieldAssigneeHandler';
+const ORG_HANDLERS_PREFIX = 'com.mldong.jeeflow.interceptor.impl.OrgUserAssignmentHandlers$';
+export const HANDLER_DEPT_LEADER = ORG_HANDLERS_PREFIX + 'DeptLeaderAssignmentHandler';
+export const HANDLER_DEPT_MAIN_LEADER = ORG_HANDLERS_PREFIX + 'DeptMainLeaderAssignmentHandler';
+export const HANDLER_APPLICANT_DEPT_LEADER = ORG_HANDLERS_PREFIX + 'ApplicantDeptLeaderAssignmentHandler';
+export const HANDLER_APPLICANT_DEPT_MAIN_LEADER = ORG_HANDLERS_PREFIX + 'ApplicantDeptMainLeaderAssignmentHandler';
+export const HANDLER_TASK_ROLE_ASSIGNEE = ORG_HANDLERS_PREFIX + 'TaskRoleAssigneeHandler';
+// 表单字段编号后缀正则（task_01 → task）
+const NUMBER_SUFFIX_PATTERN = /^(.+?)_(\d+)$/;
+// ─── 纯引擎语义 ────────────────────────────────────────────────────────────────
+/** 流程发起人（兜底 "apply.operator"） */
+export class OperatorAssignmentHandler {
+    async assign(_node, inst, _operator) {
+        if (inst?.operator)
+            return [inst.operator];
+        return ['apply.operator'];
+    }
+}
+/** 按表单字段值分配参与者：精确匹配 node.id → vars 字段；_数字 后缀去后缀再匹配。 */
+export class FormFieldAssigneeHandler {
+    async assign(node, inst, _operator) {
+        if (!inst || !node)
+            return [];
+        const value = this.findFieldValue(inst.variables, node.id);
+        if (value == null)
+            return [];
+        return this.collect(value);
+    }
+    findFieldValue(variables, fieldName) {
+        if (fieldName in variables)
+            return variables[fieldName];
+        const m = NUMBER_SUFFIX_PATTERN.exec(fieldName);
+        if (m && m[1] in variables)
+            return variables[m[1]];
+        return null;
+    }
+    collect(value) {
+        const ids = [];
+        if (Array.isArray(value)) {
+            for (const item of value)
+                this.add(ids, String(item));
+        }
+        else {
+            this.add(ids, String(value));
+        }
+        return ids;
+    }
+    add(ids, token) {
+        for (const s of token.split(',')) {
+            const t = s.trim();
+            if (t && !ids.includes(t))
+                ids.push(t);
+        }
+    }
+}
+// ─── 组织维度（OrgUserProvider SPI）───────────────────────────────────────────
+/** 组织维度 handler 公共依赖 */
+class OrgBase {
+    userProv;
+    orgProv;
+    constructor(userProv, orgProv) {
+        this.userProv = userProv;
+        this.orgProv = orgProv;
+    }
+    async byDept(deptId, main) {
+        if (!deptId || !this.orgProv)
+            return [];
+        return main ? await this.orgProv.findDeptMainLeaders(deptId) ?? [] : await this.orgProv.findDeptLeaders(deptId) ?? [];
+    }
+    async deptIdOf(userId) {
+        if (!userId || !this.userProv)
+            return '';
+        const u = await this.userProv.getUser(userId);
+        return u?.deptId ?? '';
+    }
+}
+/** 当前用户（任务操作人）部门领导 */
+export class DeptLeaderAssignmentHandler extends OrgBase {
+    async assign(_node, _inst, operator) {
+        return this.byDept(await this.deptIdOf(operator), false);
+    }
+}
+/** 当前用户（任务操作人）部门分管领导 */
+export class DeptMainLeaderAssignmentHandler extends OrgBase {
+    async assign(_node, _inst, operator) {
+        return this.byDept(await this.deptIdOf(operator), true);
+    }
+}
+/** 发起人部门领导 */
+export class ApplicantDeptLeaderAssignmentHandler extends OrgBase {
+    async assign(_node, inst, _operator) {
+        if (!inst)
+            return [];
+        return this.byDept(await this.deptIdOf(inst.operator), false);
+    }
+}
+/** 发起人部门分管领导 */
+export class ApplicantDeptMainLeaderAssignmentHandler extends OrgBase {
+    async assign(_node, inst, _operator) {
+        if (!inst)
+            return [];
+        return this.byDept(await this.deptIdOf(inst.operator), true);
+    }
+}
+/** 任务节点唯一编码关联角色（roleCode = 节点 id） */
+export class TaskRoleAssigneeHandler {
+    orgProv;
+    constructor(orgProv) {
+        this.orgProv = orgProv;
+    }
+    async assign(node, _inst, _operator) {
+        if (!node || !this.orgProv)
+            return [];
+        return await this.orgProv.findByRole(node.id) ?? [];
+    }
+}
+// ─── 注册 ──────────────────────────────────────────────────────────────────────
+/**
+ * 注册内置通用参与者处理器到注册表（组织维度 handler 依赖 userProv/orgProv）。
+ * 与 HandlerRegistry.registerAssignment 组合使用。
+ */
+export function registerBuiltinAssignments(reg, userProv, orgProv) {
+    reg.registerAssignment(HANDLER_OPERATOR_ASSIGNMENT, new OperatorAssignmentHandler());
+    reg.registerAssignment(HANDLER_FORM_FIELD_ASSIGNEE, new FormFieldAssigneeHandler());
+    reg.registerAssignment(HANDLER_DEPT_LEADER, new DeptLeaderAssignmentHandler(userProv, orgProv));
+    reg.registerAssignment(HANDLER_DEPT_MAIN_LEADER, new DeptMainLeaderAssignmentHandler(userProv, orgProv));
+    reg.registerAssignment(HANDLER_APPLICANT_DEPT_LEADER, new ApplicantDeptLeaderAssignmentHandler(userProv, orgProv));
+    reg.registerAssignment(HANDLER_APPLICANT_DEPT_MAIN_LEADER, new ApplicantDeptMainLeaderAssignmentHandler(userProv, orgProv));
+    reg.registerAssignment(HANDLER_TASK_ROLE_ASSIGNEE, new TaskRoleAssigneeHandler(orgProv));
+}

package/dist/engine.d.ts

@@ -11,6 +11,7 @@ export declare const KeyDeptName = "u_deptName";
 export declare const KeyPostID = "u_postId";
 export declare const KeyPostName = "u_postName";
 export declare const KeyNextNodeOperator = "tf_nextNodeOperator";
+export declare const KeyProcessStartNextNodeOperator = "f_nextNodeOperator";
 export declare const KeyAutoExecute = "flow.auto";
 export declare const KeyAdminID = "flow.admin";
 export interface Engine {

package/dist/engine.js

@@ -10,6 +10,8 @@ export const KeyPostID = 'u_postId';
 export const KeyPostName = 'u_postName';
 // v1.0.1：下一节点处理人（对齐 boot3 tf_nextNodeOperator）
 export const KeyNextNodeOperator = 'tf_nextNodeOperator';
+// v1.6.0：流程启动时预指派人（对齐 boot3 f_nextNodeOperator）——startAndExecute 时转换为 tf_
+export const KeyProcessStartNextNodeOperator = 'f_nextNodeOperator';
 // v1.0.1：系统代执行 / 超级管理员（对齐 boot3 FlowConst）
 export const KeyAutoExecute = 'flow.auto';
 export const KeyAdminID = 'flow.admin';
@@ -303,7 +305,7 @@ export class EngineImpl {
         }
     }
     async createTask(node, inst, operator, vars) {
-        const actors = await this.resolveActors(node, inst, vars);
+        const actors = await this.resolveActors(node, inst, operator, vars);
         if (!actors.length)
             return;
         const performType = parseInt(String(node.properties?.performType ?? '0'));
@@ -338,14 +340,14 @@ export class EngineImpl {
             nt.actorIds = actors;
         await this.repo.saveTask(nt);
     }
-    async resolveActors(node, inst, vars) {
+    async resolveActors(node, inst, operator, vars) {
         // 1a. Registry 按名称解析（推荐）
         if (this.registry) {
             const handlerName = node.properties?.assignmentHandler ?? '';
             if (handlerName) {
                 const h = this.registry.resolveAssignment(handlerName);
                 if (h)
-                    return await h.assign(node, inst);
+                    return await h.assign(node, inst, operator);
             }
         }
         // 1b. Extensions 兼容

package/dist/facade.d.ts

@@ -1,4 +1,4 @@
-import type { ProcessExtRepository, ProcessRepository } from './spi.js';
+import type { OrgUserProvider, ProcessExtRepository, ProcessRepository } from './spi.js';
 import type { EngineImpl } from './engine.js';
 export type UserSearch = (query: Record<string, any>) => Promise<[Record<string, any>[], number]> | [Record<string, any>[], number];
 export declare class JeeflowFacade {
@@ -6,8 +6,10 @@ export declare class JeeflowFacade {
     private readonly repo;
     private readonly extRepo?;
     private userSearch?;
+    private orgProv?;
     constructor(engine: EngineImpl, repo: ProcessRepository, extRepo?: ProcessExtRepository | undefined);
     setUserSearch(fn: UserSearch): this;
+    setOrgProvider(orgProv: OrgUserProvider): this;
     flow(action: string, args?: Record<string, any>): Promise<Record<string, any>>;
     private dispatch;
     private startAndExecute;
@@ -17,6 +19,12 @@ export declare class JeeflowFacade {
     private withdraw;
     private execute;
     private designPage;
+    /** 修改流程设计基本信息（对齐 boot3 ProcessDesignController.update，不写设计稿快照） */
+    private designUpdate;
+    /** 更新流程设计定义（设计稿保存，issues/08）：content 快照入库 + 同步基本信息 + 置未部署 */
+    private designUpdateDefine;
+    /** 重新部署流程定义（issues/08）：替换最新定义内容 + 置已部署（对齐 boot3 redeploy） */
+    private designRedeploy;
     private designDetail;
     private designSave;
     private surrogatePage;

package/dist/facade.js

@@ -4,6 +4,7 @@
 // action（boot2/boot3 端点短名）路由。返回统一结构 {code, msg, data}
 // （code=0 成功 / 99999999 失败）。操作人约定：args.operator 显式传入。
 import { TaskState, } from './model.js';
+import { KeyNextNodeOperator, KeyProcessStartNextNodeOperator } from './engine.js';
 // submitType 枚举（对齐 boot3）
 const SUBMIT_APPLY = 0;
 const SUBMIT_AGREE = 1;
@@ -17,6 +18,7 @@ export class JeeflowFacade {
     repo;
     extRepo;
     userSearch;
+    orgProv;
     constructor(engine, repo, extRepo) {
         this.engine = engine;
         this.repo = repo;
@@ -27,6 +29,11 @@ export class JeeflowFacade {
         this.userSearch = fn;
         return this;
     }
+    // 注入组织用户提供者（candidatePage candidateGroups 角色取人，v1.6.0）
+    setOrgProvider(orgProv) {
+        this.orgProv = orgProv;
+        return this;
+    }
     async flow(action, args = {}) {
         try {
             const data = await this.dispatch(action, args);
@@ -48,6 +55,8 @@ export class JeeflowFacade {
             case 'processDefine/deploy':
             case 'processDesign/deploy':
                 return this.deploy(args, action === 'processDesign/deploy');
+            case 'processDesign/redeploy':
+                return this.designRedeploy(args);
             case 'processDefine/redeploy':
                 return this.redeploy(args);
             case 'processDefine/remove':
@@ -72,6 +81,10 @@ export class JeeflowFacade {
                 return this.designDetail(args);
             case 'processDesign/save':
                 return this.designSave(args);
+            case 'processDesign/update':
+                return this.designUpdate(args);
+            case 'processDesign/updateDefine':
+                return this.designUpdateDefine(args);
             case 'processDesign/remove':
                 return this.ext().removeDesign(toId(args.id));
             case 'processSurrogate/page':
@@ -125,6 +138,11 @@ export class JeeflowFacade {
         for (const task of doing) {
             await this.repo.addTaskActor(task.id, [operator]);
             flowArgs.submitType = SUBMIT_APPLY;
+            // 对齐 boot3：f_nextNodeOperator（发起时预指派人）→ tf_nextNodeOperator（引擎执行参数）
+            const startNextOp = flowArgs[KeyProcessStartNextNodeOperator];
+            if (startNextOp != null && String(startNextOp) !== '') {
+                flowArgs[KeyNextNodeOperator] = startNextOp;
+            }
             await this.engine.executeProcessTask(task.id, operator, flowArgs);
         }
         return { processInstanceId: inst.id };
@@ -247,6 +265,100 @@ export class JeeflowFacade {
         const [rows, total] = await this.ext().pageDesigns(toInt(args.pageNum ?? 1), toInt(args.pageSize ?? 10), undefined, parseMQuery(args));
         return { rows, recordCount: total };
     }
+    /** 修改流程设计基本信息（对齐 boot3 ProcessDesignController.update，不写设计稿快照） */
+    async designUpdate(args) {
+        const ext = this.ext();
+        const design = await ext.findDesignById(toId(args.id));
+        if (!design)
+            throw new Error('流程设计不存在');
+        if (args.name != null)
+            design.name = String(args.name);
+        if (args.displayName != null)
+            design.displayName = String(args.displayName);
+        if (args.type != null)
+            design.type = String(args.type);
+        if (args.icon != null)
+            design.icon = String(args.icon);
+        if (args.remark != null)
+            design.remark = String(args.remark);
+        design.updateUser = String(args.operator ?? 'system');
+        await ext.updateDesign(design);
+        return {};
+    }
+    /** 更新流程设计定义（设计稿保存，issues/08）：content 快照入库 + 同步基本信息 + 置未部署 */
+    async designUpdateDefine(args) {
+        const ext = this.ext();
+        const designId = toId(args.processDesignId);
+        const design = await ext.findDesignById(designId);
+        if (!design)
+            throw new Error('流程设计不存在');
+        if (args.content == null)
+            throw new Error('content 缺失');
+        const content = toStr(args.content);
+        // 与最新一条相同则不重复入库（对齐 boot3 updateDefine）
+        const hisList = await ext.listDesignHis(designId);
+        if (hisList.length === 0 || toStr(hisList[0].content) !== content) {
+            await ext.saveDesignHis({
+                id: 0, processDesignId: designId, content,
+                createTime: new Date(), createUser: String(args.operator ?? 'system'),
+            });
+        }
+        // 同步设计基本信息（jsonObject 里的 name/displayName/type）+ 内容变更 → 未部署
+        try {
+            const flow = JSON.parse(content);
+            if (flow?.name)
+                design.name = flow.name;
+            if (flow?.displayName)
+                design.displayName = flow.displayName;
+            if (flow?.type)
+                design.type = flow.type;
+        }
+        catch { /* ignore */ }
+        design.isDeployed = 0;
+        design.updateUser = String(args.operator ?? 'system');
+        await ext.updateDesign(design);
+        return {};
+    }
+    /** 重新部署流程定义（issues/08）：替换最新定义内容 + 置已部署（对齐 boot3 redeploy） */
+    async designRedeploy(args) {
+        const ext = this.ext();
+        const designId = toId(args.id);
+        const design = await ext.findDesignById(designId);
+        if (!design)
+            throw new Error('流程设计不存在');
+        const hisList = await ext.listDesignHis(designId);
+        if (hisList.length === 0)
+            throw new Error('流程设计没有内容，无法发布');
+        const content = toStr(hisList[0].content);
+        let flow;
+        try {
+            flow = JSON.parse(content);
+        }
+        catch (e) {
+            throw new Error('流程定义 JSON 解析失败: ' + String(e));
+        }
+        if (!flow?.name)
+            throw new Error('流程定义缺少 name');
+        // 按 name 取最新定义：有则替换内容（version 不变），无则新建（对齐 boot3 redeploy）
+        const last = await this.repo.findDefineByName(flow.name);
+        let defineId;
+        if (!last) {
+            defineId = await this.saveDeployedDefine(content, args);
+        }
+        else {
+            last.name = flow.name;
+            last.displayName = flow.displayName ?? '';
+            last.type = flow.type ?? '';
+            last.content = content;
+            last.updateUser = String(args.operator ?? 'system');
+            await this.repo.updateDefine(last);
+            defineId = last.id;
+        }
+        design.isDeployed = 1;
+        design.updateUser = String(args.operator ?? 'system');
+        await ext.updateDesign(design);
+        return { processDefineId: defineId };
+    }
     async designDetail(args) {
         const ext = this.ext();
         const design = await ext.findDesignById(toId(args.id));
@@ -307,6 +419,9 @@ export class JeeflowFacade {
             if (args.remark != null)
                 found.remark = String(args.remark);
             found.updateUser = operator;
+            // 内容快照变更 → 置为未部署（对齐 boot3 updateDefine 语义，issues/08）
+            if (args.content != null)
+                found.isDeployed = 0;
             await ext.updateDesign(found);
             design = found;
         }
@@ -441,7 +556,8 @@ export class JeeflowFacade {
         return his.map(t => ({
             taskName: t.taskName, displayName: t.displayName, taskType: t.taskType ?? null,
             performType: t.performType ?? null, taskState: t.taskState, operator: t.actorId ?? '',
-            finishTime: t.finishTime ?? null, variable: t.variables ?? {},
+            finishTime: fmtTime(t.finishTime), variable: t.variables ?? {},
+            ext: t.variables ?? {}, // issues/15：前端读 ext.tf_approvalComment
         }));
     }
     async getAssigneeTextData(args) {
@@ -491,6 +607,7 @@ export class JeeflowFacade {
             performType: task.performType ?? null, taskState: task.taskState,
             operator: task.actorId ?? '', formKey: task.formKey ?? '',
             taskActorIdList: actors, executable: task.isAllowed(operator),
+            taskFormData: formDataOf(task.variables, 'tf_'), // issues/15
         };
         // taskModel：流程定义中对应节点
         const inst = await this.repo.findInstanceById(task.processInstanceId);
@@ -535,13 +652,13 @@ export class JeeflowFacade {
         const inst = await this.repo.findInstanceById(task.processInstanceId);
         if (!inst)
             throw new Error('流程实例不存在');
-        // 模型候选解析：后继任务节点的 candidateUsers 配置
+        // 模型候选解析：后继任务节点的 candidateUsers / candidateGroups 配置
         let candidates = [];
         const def = await this.repo.findDefineById(inst.defineId);
         if (def) {
             try {
                 const flow = JSON.parse(toStr(def.content));
-                candidates = this.nextTaskCandidates(flow, task.taskName);
+                candidates = await this.nextTaskCandidates(flow, task.taskName);
             }
             catch { /* ignore */ }
         }
@@ -555,10 +672,10 @@ export class JeeflowFacade {
         const [rows, total] = await this.userSearch(args);
         return { rows, recordCount: total };
     }
-    nextTaskCandidates(flow, taskName) {
+    async nextTaskCandidates(flow, taskName) {
         const result = [];
         const visited = new Set();
-        const collect = (node) => {
+        const collect = async (node) => {
             const v = node.properties?.candidateUsers;
             if (v) {
                 for (const s of String(v).split(',')) {
@@ -567,8 +684,22 @@ export class JeeflowFacade {
                         result.push(t);
                 }
             }
+            // candidateGroups：按角色取人（v1.6.0，对齐 boot4 GlobalCandidateHandler）
+            const g = node.properties?.candidateGroups;
+            if (g && this.orgProv) {
+                for (const rc of String(g).split(',')) {
+                    const role = rc.trim();
+                    if (!role)
+                        continue;
+                    const ids = await this.orgProv.findByRole(role);
+                    for (const uid of ids ?? []) {
+                        if (uid && !result.includes(uid))
+                            result.push(uid);
+                    }
+                }
+            }
         };
-        const walk = (nodeId) => {
+        const walk = async (nodeId) => {
             if (visited.has(nodeId))
                 return;
             visited.add(nodeId);
@@ -579,15 +710,15 @@ export class JeeflowFacade {
                 if (!target)
                     continue;
                 if (target.type === 'snaker:task' || target.type === 'snaker:custom') {
-                    collect(target);
+                    await collect(target);
                     continue;
                 }
                 if (['snaker:fork', 'snaker:join', 'snaker:decision'].includes(target.type)) {
-                    walk(target.id);
+                    await walk(target.id);
                 }
             }
         };
-        walk(taskName);
+        await walk(taskName);
         return result;
     }
     async taskAddActor(args) {
@@ -657,6 +788,7 @@ export class JeeflowFacade {
                 createTime: t.createTime, createUser: t.createUser,
                 updateTime: t.updateTime, updateUser: t.updateUser,
                 taskActorIdList: t.actorIds ?? [],
+                taskFormData: formDataOf(t.variables, 'tf_'), // issues/15
             };
             const ext = { ...(t.variables ?? {}) };
             const doing = t.taskState === TaskState.Doing;
@@ -666,15 +798,23 @@ export class JeeflowFacade {
             if (doing)
                 activeTaskList.push(vo);
         }
-        return {
+        const data = {
             id: inst.id, parentId: inst.parentId, processDefineId: inst.defineId,
             state: inst.state, parentNodeName: inst.parentNodeName,
             businessNo: inst.businessNo, operator: inst.operator,
-            variables: inst.variables, createTime: inst.createTime, createUser: inst.createUser,
+            variables: inst.variables,
+            formData: formDataOf(inst.variables, 'f_'), // issues/15
+            createTime: inst.createTime, createUser: inst.createUser,
             jsonObject: graph, // issues/05
             tasks,
             activeTaskList,
         };
+        if (def0) {
+            data.displayName = def0.displayName; // issues/15
+            data.name = def0.name;
+            data.version = def0.version;
+        }
+        return data;
     }
     /** 流程 JSON 中第一个任务节点 id（issues/05-4 isFirstTaskNode 用） */
     firstTaskNodeId(graph) {
@@ -711,6 +851,17 @@ export class JeeflowFacade {
     }
 }
 // ── 行转 Map（issues/05-2 列表字段契约 + 05-3 时间格式）─────────────────────
+/** issues/15：取 vars 中 prefix 前缀字段，输出「带前缀 + 去前缀副本」（对齐 boot3 getFormData） */
+function formDataOf(vars, prefix) {
+    const out = {};
+    for (const [k, v] of Object.entries(vars ?? {})) {
+        if (k.startsWith(prefix)) {
+            out[k] = v;
+            out[k.slice(prefix.length)] = v;
+        }
+    }
+    return out;
+}
 /** Date → 'yyyy-MM-dd HH:mm:ss'（null/undefined → null） */
 function fmtTime(v) {
     if (v == null)
@@ -779,6 +930,7 @@ function taskRowToMap(r) {
         processDefineName: r.processDefineName, processDefineDisplayName: r.processDefineDisplayName,
         instanceVariable: r.instanceVariable, instanceCreateTime: fmtTime(r.instanceCreateTime),
         ext, instanceExt, version: r.defineVersion,
+        taskFormData: formDataOf(r.variables, 'tf_'), // issues/15
     };
 }
 // ── 工具 ──────────────────────────────────────────────────────────────────────

package/dist/index.d.ts

@@ -3,4 +3,5 @@ export { MemoryRepository } from './memory.js';
 export { HandlerRegistry, type IAssignmentHandler, type IDecisionHandler, type HandlerMeta } from './registry.js';
 export { enumDict, enumDictKeys, type DictItem } from './metadata.js';
 export * from './model.js';
-export type { ProcessRepository, UserProvider, IDGenerator, ExpressionEvaluator } from './spi.js';
+export type { ProcessRepository, UserProvider, OrgUserProvider, IDGenerator, ExpressionEvaluator } from './spi.js';
+export { registerBuiltinAssignments, OperatorAssignmentHandler, FormFieldAssigneeHandler, DeptLeaderAssignmentHandler, DeptMainLeaderAssignmentHandler, ApplicantDeptLeaderAssignmentHandler, ApplicantDeptMainLeaderAssignmentHandler, TaskRoleAssigneeHandler, HANDLER_OPERATOR_ASSIGNMENT, HANDLER_FORM_FIELD_ASSIGNEE, HANDLER_DEPT_LEADER, HANDLER_DEPT_MAIN_LEADER, HANDLER_APPLICANT_DEPT_LEADER, HANDLER_APPLICANT_DEPT_MAIN_LEADER, HANDLER_TASK_ROLE_ASSIGNEE, } from './builtin.js';

package/dist/index.js

@@ -3,3 +3,4 @@ export { MemoryRepository } from './memory.js';
 export { HandlerRegistry } from './registry.js';
 export { enumDict, enumDictKeys } from './metadata.js';
 export * from './model.js';
+export { registerBuiltinAssignments, OperatorAssignmentHandler, FormFieldAssigneeHandler, DeptLeaderAssignmentHandler, DeptMainLeaderAssignmentHandler, ApplicantDeptLeaderAssignmentHandler, ApplicantDeptMainLeaderAssignmentHandler, TaskRoleAssigneeHandler, HANDLER_OPERATOR_ASSIGNMENT, HANDLER_FORM_FIELD_ASSIGNEE, HANDLER_DEPT_LEADER, HANDLER_DEPT_MAIN_LEADER, HANDLER_APPLICANT_DEPT_LEADER, HANDLER_APPLICANT_DEPT_MAIN_LEADER, HANDLER_TASK_ROLE_ASSIGNEE, } from './builtin.js';

package/dist/registry.d.ts

@@ -1,7 +1,8 @@
 import type { FlowNode, ProcessInstance } from './model.js';
 /** 参与者指派处理器接口——对标 Java AssignmentHandler */
 export interface IAssignmentHandler {
-    assign(node: FlowNode, inst: ProcessInstance): string[] | Promise<string[]>;
+    /** 返回参与者列表（operator: 当前任务操作人，issues/16 对齐 Java Execution.getOperator） */
+    assign(node: FlowNode, inst: ProcessInstance, operator: string): string[] | Promise<string[]>;
 }
 /** 决策处理器接口——对标 Java DecisionHandler */
 export interface IDecisionHandler {

package/dist/spi.d.ts

@@ -49,6 +49,14 @@ export interface ProcessRepository {
 export interface UserProvider {
     getUser(userId: string): Promise<UserInfo | null>;
 }
+export interface OrgUserProvider {
+    /** 部门领导（deptId → 领导 userId 列表） */
+    findDeptLeaders(deptId: string): Promise<string[]>;
+    /** 部门分管领导（deptId → 分管领导 userId 列表） */
+    findDeptMainLeaders(deptId: string): Promise<string[]>;
+    /** 按角色取人（roleCode → userId 列表） */
+    findByRole(roleCode: string): Promise<string[]>;
+}
 export interface IDGenerator {
     nextId(): number;
 }

package/package.json

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