@mldong/jeeflow 1.2.0 → 1.3.0

package/dist/facade.d.ts

@@ -28,6 +28,7 @@ export declare class JeeflowFacade {
     private getAssigneeTextData;
     private createCCInstance;
     private updateCCStatus;
+    private ccList;
     private taskDetail;
     private jumpAbleTaskNameList;
     private candidatePage;

package/dist/facade.js

@@ -80,7 +80,7 @@ export class JeeflowFacade {
             case 'processInstance/updateCCStatus':
                 return this.updateCCStatus(args);
             case 'processInstance/ccList':
-                throw new Error('ccList 需要核心分页 SPI（pageCcInstances），当前语言 1.3.0 补齐');
+                return this.ccList(args);
             case 'processTask/detail':
                 return this.taskDetail(args);
             case 'processTask/jumpAbleTaskNameList':
@@ -419,6 +419,14 @@ export class JeeflowFacade {
         const operator = String(args.operator ?? 'user1');
         await this.repo.updateCcStatus(instanceId, operator);
     }
+    // ccList 我的抄送分页（v1.3.0）：operator 作为抄送人过滤
+    async ccList(args) {
+        const pageNum = toInt(args.pageNum ?? 1);
+        const pageSize = toInt(args.pageSize ?? 10);
+        const actorId = String(args.operator ?? 'user1');
+        const { rows, total } = await this.repo.pageCcInstances(pageNum, pageSize, actorId);
+        return { rows, recordCount: total };
+    }
     async taskDetail(args) {
         const taskId = toId(args.id);
         const operator = String(args.operator ?? 'user1');

package/dist/jdbc/shared.d.ts

@@ -1,4 +1,4 @@
-import { ProcessInstance, ProcessTask, type ProcessDefine } from '../model.js';
+import { ProcessInstance, ProcessTask, type ProcessDefine, type CcInstanceRow } from '../model.js';
 import type { IDGenerator, ProcessRepository } from '../spi.js';
 /** 默认 ID 生成器：时间戳毫秒 + 同毫秒递增序号（对齐 Java nextId 默认实现） */
 export declare class TsIDGenerator implements IDGenerator {
@@ -63,4 +63,9 @@ export declare class JdbcRepository implements ProcessRepository {
     removeTaskActor(taskId: number, actors: string[]): Promise<void>;
     createCcInstance(instanceId: number, creator: string, ...actorIds: string[]): Promise<void>;
     updateCcStatus(instanceId: number, actorId: string): Promise<void>;
+    pageCcInstances(pageNum: number, pageSize: number, actorId: string): Promise<{
+        rows: CcInstanceRow[];
+        total: number;
+    }>;
+    private mapCcRow;
 }

package/dist/jdbc/shared.js

@@ -349,9 +349,17 @@ export class JdbcRepository {
         }
     }
     async addTaskActor(taskId, actors) {
+        if (actors.length === 0)
+            return;
+        // 追加语义（对齐 boot2/boot3，issues/03）：查已有参与者，去重后仅插入新增，不清空原参与者
+        const existing = await this.findTaskActors(taskId);
+        const seen = new Set(existing);
+        const toAdd = actors.filter(a => !seen.has(a));
+        if (toAdd.length === 0)
+            return;
         const conn = await this.c();
         try {
-            await this.insertTaskActors(conn, taskId, actors);
+            await this.insertTaskActors(conn, taskId, toAdd);
         }
         finally {
             await this.done(conn);
@@ -391,4 +399,46 @@ export class JdbcRepository {
             await this.done(conn);
         }
     }
+    // pageCcInstances 我的抄送分页（v1.3.0）：cc 表 join 实例 + 定义，按抄送人过滤（对齐 Java pageCcInstances）
+    async pageCcInstances(pageNum, pageSize, actorId) {
+        const where = ' FROM wf_process_instance t' +
+            ' LEFT JOIN wf_process_define pd ON t.process_define_id = pd.id' +
+            ' LEFT JOIN wf_process_cc_instance cc ON t.id = cc.process_instance_id' +
+            ' WHERE cc.actor_id = ?';
+        const cols = 't.id, t.parent_id, t.process_define_id, t.state, t.parent_node_name, t.business_no,' +
+            ' t.operator, t.expire_time, t.variable, t.create_time, t.create_user, t.update_time, t.update_user,' +
+            ' pd.name, pd.display_name, pd.version';
+        const conn = await this.c();
+        try {
+            const countRow = await conn.fetchOne(this.sql('SELECT COUNT(*) ' + where), [actorId]);
+            const total = Number(Object.values(countRow)[0] ?? 0);
+            const rows = await conn.fetchAll(this.sql(`SELECT ${cols}${where} ORDER BY t.id ASC LIMIT ? OFFSET ?`), [actorId, pageSize, (pageNum - 1) * pageSize]);
+            return {
+                rows: rows.map(r => this.mapCcRow(r)),
+                total,
+            };
+        }
+        finally {
+            await this.done(conn);
+        }
+    }
+    mapCcRow(r) {
+        let variables = {};
+        if (r.variable) {
+            try {
+                variables = JSON.parse(r.variable);
+            }
+            catch { /* 忽略坏 JSON */ }
+        }
+        return {
+            id: Number(r.id), parentId: r.parent_id != null ? Number(r.parent_id) : undefined,
+            defineId: Number(r.process_define_id), state: r.state,
+            parentNodeName: r.parent_node_name ?? '', businessNo: r.business_no ?? '', operator: r.operator ?? '',
+            expireTime: r.expire_time ?? undefined, variables,
+            createTime: r.create_time, createUser: r.create_user ?? '',
+            updateTime: r.update_time, updateUser: r.update_user ?? '',
+            defineName: r.name ?? '', defineDisplayName: r.display_name ?? '',
+            defineVersion: Number(r.version ?? 0),
+        };
+    }
 }

package/dist/memory.d.ts

@@ -1,4 +1,4 @@
-import type { ProcessDefine } from './model.js';
+import type { CcInstanceRow, ProcessDefine } from './model.js';
 import { type ProcessInstance, type ProcessTask } from './model.js';
 import type { ProcessRepository } from './spi.js';
 export declare class MemoryRepository implements ProcessRepository {
@@ -6,6 +6,7 @@ export declare class MemoryRepository implements ProcessRepository {
     private instances;
     private tasks;
     private actors;
+    private ccInstances;
     private seq;
     addDefine(def: ProcessDefine): void;
     findDefineById(id: number): Promise<ProcessDefine | null>;
@@ -26,8 +27,12 @@ export declare class MemoryRepository implements ProcessRepository {
     findTaskActors(taskId: number): Promise<string[]>;
     addTaskActor(taskId: number, actors: string[]): Promise<void>;
     removeTaskActor(taskId: number, actors: string[]): Promise<void>;
-    createCcInstance(..._args: any[]): Promise<void>;
-    updateCcStatus(..._args: any[]): Promise<void>;
+    createCcInstance(instanceId: number, _creator: string, ...actorIds: string[]): Promise<void>;
+    updateCcStatus(_instanceId: number, _actorId: string): Promise<void>;
+    pageCcInstances(pageNum: number | undefined, pageSize: number | undefined, actorId: string): Promise<{
+        rows: CcInstanceRow[];
+        total: number;
+    }>;
     allDefines(): ProcessDefine[];
     allInstances(): ProcessInstance[];
     allTasks(): ProcessTask[];

package/dist/memory.js

@@ -4,6 +4,7 @@ export class MemoryRepository {
     instances = new Map();
     tasks = new Map();
     actors = new Map();
+    ccInstances = new Map();
     seq = 1;
     addDefine(def) {
         if (!def.id)
@@ -149,8 +150,42 @@ export class MemoryRepository {
         const remove = new Set(actors);
         this.actors.set(taskId, (this.actors.get(taskId) ?? []).filter(a => !remove.has(a)));
     }
-    async createCcInstance(..._args) { }
-    async updateCcStatus(..._args) { }
+    async createCcInstance(instanceId, _creator, ...actorIds) {
+        const existing = this.ccInstances.get(instanceId) ?? [];
+        const seen = new Set(existing);
+        for (const a of actorIds) {
+            if (!seen.has(a)) {
+                existing.push(a);
+                seen.add(a);
+            }
+        }
+        this.ccInstances.set(instanceId, existing);
+    }
+    async updateCcStatus(_instanceId, _actorId) { }
+    // pageCcInstances 我的抄送分页（v1.3.0）：按抄送人 actorId 过滤，join 实例 + 定义
+    async pageCcInstances(pageNum = 1, pageSize = 10, actorId) {
+        const rows = [];
+        for (const [instId, actors] of this.ccInstances) {
+            if (actorId && !actors.includes(actorId))
+                continue;
+            const inst = this.instances.get(instId);
+            if (!inst)
+                continue;
+            const def = this.defines.get(inst.defineId);
+            rows.push({
+                id: inst.id, parentId: inst.parentId, defineId: inst.defineId, state: inst.state,
+                parentNodeName: inst.parentNodeName, businessNo: inst.businessNo, operator: inst.operator,
+                expireTime: inst.expireTime, variables: { ...inst.variables },
+                createTime: inst.createTime, createUser: inst.createUser,
+                updateTime: inst.updateTime, updateUser: inst.updateUser,
+                defineName: def?.name ?? '', defineDisplayName: def?.displayName ?? '',
+                defineVersion: def?.version ?? 0,
+            });
+        }
+        const total = rows.length;
+        const start = (pageNum - 1) * pageSize;
+        return { rows: rows.slice(start, start + pageSize), total };
+    }
     allDefines() { return [...this.defines.values()]; }
     allInstances() { return [...this.instances.values()]; }
     allTasks() {

package/dist/model.d.ts

@@ -168,3 +168,21 @@ export interface UserInfo {
     postId?: string;
     postName?: string;
 }
+export interface CcInstanceRow {
+    id: number;
+    parentId?: number;
+    defineId: number;
+    state: InstanceState;
+    parentNodeName: string;
+    businessNo: string;
+    operator: string;
+    expireTime?: Date;
+    variables: Record<string, any>;
+    createTime: Date;
+    createUser: string;
+    updateTime: Date;
+    updateUser: string;
+    defineName: string;
+    defineDisplayName: string;
+    defineVersion: number;
+}

package/dist/spi.d.ts

@@ -1,4 +1,4 @@
-import type { ProcessDefine, ProcessDesign, ProcessDesignHis, ProcessInstance, ProcessSurrogate, ProcessTask, UserInfo } from './model.js';
+import type { CcInstanceRow, ProcessDefine, ProcessDesign, ProcessDesignHis, ProcessInstance, ProcessSurrogate, ProcessTask, UserInfo } from './model.js';
 export interface ProcessRepository {
     findDefineById(id: number): Promise<ProcessDefine | null>;
     findDefineByName(name: string): Promise<ProcessDefine | null>;
@@ -20,6 +20,10 @@ export interface ProcessRepository {
     removeTaskActor(taskId: number, actors: string[]): Promise<void>;
     createCcInstance(instanceId: number, creator: string, ...actorIds: string[]): Promise<void>;
     updateCcStatus(instanceId: number, actorId: string): Promise<void>;
+    pageCcInstances(pageNum: number, pageSize: number, actorId: string): Promise<{
+        rows: CcInstanceRow[];
+        total: number;
+    }>;
 }
 export interface UserProvider {
     getUser(userId: string): Promise<UserInfo | null>;

package/package.json

@@ -1,45 +1,45 @@
-{
-  "name": "@mldong/jeeflow",
-  "version": "1.2.0",
-  "description": "jeeflow workflow engine — Node.js / TypeScript implementation",
-  "type": "module",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    ".": "./dist/index.js",
-    "./engine": "./dist/engine.js",
-    "./model": "./dist/model.js",
-    "./spi": "./dist/spi.js",
-    "./memory": "./dist/memory.js",
-    "./jdbc": "./dist/jdbc/index.js",
-    "./mysql": "./dist/jdbc/mysql.js",
-    "./postgres": "./dist/jdbc/postgres.js"
-  },
-  "scripts": {
-    "build": "tsc",
-    "test": "node --import tsx __tests__/spec.test.ts",
-    "demo": "node --import tsx demo/main.ts",
-    "prepublishOnly": "npm run build"
-  },
-  "keywords": [
-    "workflow",
-    "engine",
-    "jeeflow",
-    "typescript"
-  ],
-  "license": "Apache-2.0",
-  "devDependencies": {
-    "@types/pg": "^8.20.3",
-    "tsx": "^4.19.0",
-    "typescript": "^5.5.0"
-  },
-  "optionalDependencies": {
-    "mysql2": "^3.11.0",
-    "pg": "^8.13.0"
-  },
-  "files": [
-    "dist",
-    "LICENSE",
-    "README.md"
-  ]
-}
+{
+  "name": "@mldong/jeeflow",
+  "version": "1.3.0",
+  "description": "jeeflow workflow engine — Node.js / TypeScript implementation",
+  "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": "./dist/index.js",
+    "./engine": "./dist/engine.js",
+    "./model": "./dist/model.js",
+    "./spi": "./dist/spi.js",
+    "./memory": "./dist/memory.js",
+    "./jdbc": "./dist/jdbc/index.js",
+    "./mysql": "./dist/jdbc/mysql.js",
+    "./postgres": "./dist/jdbc/postgres.js"
+  },
+  "scripts": {
+    "build": "tsc",
+    "test": "node --import tsx __tests__/spec.test.ts",
+    "demo": "node --import tsx demo/main.ts",
+    "prepublishOnly": "npm run build"
+  },
+  "keywords": [
+    "workflow",
+    "engine",
+    "jeeflow",
+    "typescript"
+  ],
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "@types/pg": "^8.20.3",
+    "tsx": "^4.19.0",
+    "typescript": "^5.5.0"
+  },
+  "optionalDependencies": {
+    "mysql2": "^3.11.0",
+    "pg": "^8.13.0"
+  },
+  "files": [
+    "dist",
+    "LICENSE",
+    "README.md"
+  ]
+}