@mldong/jeeflow 1.8.10 → 1.8.11

package/dist/engine.js

@@ -148,7 +148,7 @@ export class EngineImpl {
                     const [actors, lc] = getCsState(vars, curNode.id);
                     if (actors && lc + 1 < actors.length) {
                         // 聚合根：创建串行会签下一步任务
-                        const nt = inst.createTask(this.nextId(), curNode.id, curNode.text.value, actors[lc + 1], operator, curNode.properties?.form ?? '', now);
+                        const nt = inst.createTask(this.nextId(), curNode.id, curNode.text.value, actors[lc + 1], operator, curNode.properties?.form ?? '', now, 1);
                         nt.variables = {
                             [`nrOfInstances_${curNode.id}`]: actors.length,
                             [`loopCounter_${curNode.id}`]: lc + 1,
@@ -363,10 +363,11 @@ export class EngineImpl {
             switch (ct) {
                 case 'PARALLEL':
                     for (const actor of actors)
-                        await this.repo.saveTask(inst.createTask(this.nextId(), node.id, node.text.value, actor, operator, form, now));
+                        await this.repo.saveTask(inst.createTask(this.nextId(), node.id, node.text.value, actor, operator, form, now, 1));
                     return;
                 case 'SEQUENTIAL': {
-                    const nt = inst.createTask(this.nextId(), node.id, node.text.value, actors[0], operator, form, now);
+                    // 顺序会签任务也是会签任务（issues/57 E29 修正：仅普通分支默认 0）
+                    const nt = inst.createTask(this.nextId(), node.id, node.text.value, actors[0], operator, form, now, 1);
                     nt.variables = {
                         [`nrOfInstances_${node.id}`]: actors.length,
                         [`loopCounter_${node.id}`]: 0,
@@ -377,7 +378,7 @@ export class EngineImpl {
                 }
                 default:
                     for (const actor of actors)
-                        await this.repo.saveTask(inst.createTask(this.nextId(), node.id, node.text.value, actor, operator, form, now));
+                        await this.repo.saveTask(inst.createTask(this.nextId(), node.id, node.text.value, actor, operator, form, now, 1));
                     return;
             }
         }

package/dist/facade.js

@@ -143,6 +143,13 @@ export class JeeflowFacade {
             flowArgs[k] = v;
         }
         const inst = await this.engine.startProcessInstanceById(defineId, operator, flowArgs);
+        // issues/56 E28：发起时抄送（f_ccActors）创建 cc 实例（对齐 Java enableCcActors 语义）
+        const ccList = Array.isArray(flowArgs.f_ccActors) ? flowArgs.f_ccActors
+            : typeof flowArgs.f_ccActors === 'string' && flowArgs.f_ccActors.trim()
+                ? flowArgs.f_ccActors.split(',').map((x) => x.trim()).filter(Boolean) : [];
+        if (ccList.length > 0) {
+            await this.repo.createCcInstance(inst.id, operator, ...ccList);
+        }
         // startAndExecute：自动完成申请节点（assignee="applicant" → 发起人）
         const doing = await this.repo.findDoingTasks(inst.id);
         for (const task of doing) {
@@ -229,9 +236,18 @@ export class JeeflowFacade {
         // 撤回：废弃全部 doing 任务 + 实例状态（v1.0.1：updateInstance 级联落库）
         const operator = String(args.operator ?? 'user1');
         const now = new Date();
-        const abandoned = inst.abandonAllDoing(now);
-        inst.reject(now);
+        // findInstanceById 不加载 tasks（空），必须按实例查 doing 任务废弃
+        const abandoned = [];
+        for (const t of await this.repo.findDoingTasks(instanceId)) {
+            t.abandon(now);
+            abandoned.push(t);
+        }
+        // issues/53 E25：撤回状态应为 Withdraw(30) 而非 Reject(45)（对齐 Java）
+        inst.withdraw(now);
         inst.updateUser = operator;
+        // 级联覆盖防护（issues/57 补正）：废弃副本同步回聚合——updateInstance 级联会用
+        // 聚合内旧任务覆盖已废弃状态（memory 加载 tasks 时必现）
+        inst.tasks = abandoned;
         for (const t of abandoned)
             await this.repo.updateTask(t);
         await this.repo.updateInstance(inst);
@@ -532,13 +548,24 @@ export class JeeflowFacade {
             await ext.updateDesign(found);
             design = found;
         }
-        // 内容快照（设计稿内容存历史表）
+        // 内容快照（设计稿内容存历史表）——issues/51 E23：无 content 也写默认快照
+        // （对齐 Java contentBytes 默认 JSON），保证「新建 → 部署」链路可用
         if (args.content != null) {
             await ext.saveDesignHis({
                 id: '', processDesignId: design.id, content: String(args.content),
                 createTime: new Date(), createUser: operator,
             });
         }
+        else {
+            await ext.saveDesignHis({
+                id: '', processDesignId: design.id,
+                content: JSON.stringify({
+                    name: design.name, displayName: design.displayName, type: design.type,
+                    nodes: [], edges: [],
+                }),
+                createTime: new Date(), createUser: operator,
+            });
+        }
         return { id: design.id };
     }
     // ── 委托代理（需扩展仓储） ───────────────────────────────────────────────

package/dist/jdbc/shared.js

@@ -491,10 +491,12 @@ export class JdbcRepository {
         try {
             const countRow = await conn.fetchOne(this.sql('SELECT COUNT(DISTINCT t.id) ' + where), [filter, ...cond.params]);
             const total = Number(Object.values(countRow)[0] ?? 0);
+            // issues/45 E17：pd.display_name 与 t.display_name 列名冲突（DISTINCT 时后者覆盖）——
+            // 流程名加别名 pd_display_name，mapTaskRow 分别映射
             const cols = 'DISTINCT t.id, t.process_instance_id, t.task_name, t.display_name, t.task_type, t.perform_type,' +
                 ' t.task_state, t.operator, t.finish_time, t.expire_time, t.form_key, t.task_parent_id, t.variable,' +
                 ' t.create_time, t.create_user, t.update_time, t.update_user,' +
-                ' pd.name, pd.display_name, pd.version AS process_define_version,' +
+                ' pd.name, pd.display_name AS pd_display_name, pd.version AS process_define_version,' +
                 ' pi.variable AS instance_variable, pi.create_time AS instance_create_time';
             const rows = await conn.fetchAll(this.sql(`SELECT ${cols}${where} ORDER BY t.id DESC LIMIT ? OFFSET ?`), [filter, ...cond.params, pageSize, (pageNum - 1) * pageSize]);
             return { rows: rows.map(r => this.mapTaskRow(r)), total };
@@ -598,7 +600,7 @@ export class JdbcRepository {
             taskParentId: r.task_parent_id != null ? rowId(r.task_parent_id) : undefined,
             variables, createTime: r.create_time, createUser: rowId(r.create_user),
             updateTime: r.update_time, updateUser: rowId(r.update_user),
-            processDefineName: r.name ?? '', processDefineDisplayName: r.display_name ?? '',
+            processDefineName: r.name ?? '', processDefineDisplayName: r.pd_display_name ?? '',
             defineVersion: Number(r.process_define_version ?? 0),
             instanceVariable: r.instance_variable ?? '', instanceCreateTime: r.instance_create_time,
         };

package/dist/model.d.ts

@@ -155,6 +155,8 @@ export declare class ProcessInstance {
     finish(now: Date): void;
     /** 驳回流程 */
     reject(now: Date): void;
+    /** 撤回流程（issues/53 E25：withdraw 用 Withdraw(30)，与 reject 区分） */
+    withdraw(now: Date): void;
     /** 追加变量 */
     addVariable(vars: Record<string, any>): void;
     /** 获取进行中任务 */
@@ -163,8 +165,8 @@ export declare class ProcessInstance {
     getDoneTasks(): ProcessTask[];
     /** 所有任务是否都已完成（join 合并判断） */
     isAllTasksFinished(): boolean;
-    /** 创建任务（子实体工厂） */
-    createTask(id: string, taskName: string, displayName: string, actor: string, operator: string, formKey: string, now: Date): ProcessTask;
+    /** 创建任务（子实体工厂）——performType：0 普通 / 1 会签（issues/52 E24 落库对齐 Java） */
+    createTask(id: string, taskName: string, displayName: string, actor: string, operator: string, formKey: string, now: Date, performType?: number): ProcessTask;
 }
 export declare class ProcessTask {
     id: string;

package/dist/model.js

@@ -128,6 +128,11 @@ export class ProcessInstance {
         this.state = InstanceState.Reject;
         this.updateTime = now;
     }
+    /** 撤回流程（issues/53 E25：withdraw 用 Withdraw(30)，与 reject 区分） */
+    withdraw(now) {
+        this.state = InstanceState.Withdraw;
+        this.updateTime = now;
+    }
     /** 追加变量 */
     addVariable(vars) {
         Object.assign(this.variables, vars);
@@ -144,13 +149,13 @@ export class ProcessInstance {
     isAllTasksFinished() {
         return !this.tasks.some(t => t.isDoing());
     }
-    /** 创建任务（子实体工厂） */
-    createTask(id, taskName, displayName, actor, operator, formKey, now) {
+    /** 创建任务（子实体工厂）——performType：0 普通 / 1 会签（issues/52 E24 落库对齐 Java） */
+    createTask(id, taskName, displayName, actor, operator, formKey, now, performType = 0) {
         const task = new ProcessTask({
             id, processInstanceId: this.id,
             taskName, displayName, taskState: TaskState.Doing,
             actorId: '', actorIds: [actor],
-            taskType: 0, performType: 0, formKey,
+            taskType: 0, performType, formKey,
             variables: {},
             createTime: now, updateTime: now, createUser: operator, updateUser: operator,
         });

package/package.json

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