@mldong/jeeflow 1.3.0 → 1.5.0

package/dist/model.d.ts

@@ -80,13 +80,52 @@ export interface ProcessSurrogate {
 export declare enum InstanceState {
     Doing = 10,
     Done = 20,
-    Reject = 45
+    Withdraw = 30,
+    Interrupt = 40,
+    Reject = 45,
+    Pending = 50,
+    Abandon = 99
 }
 export declare enum TaskState {
     Doing = 10,
     Done = 20,
+    Withdraw = 30,
+    Interrupt = 40,
+    Pending = 50,
     Abandoned = 99
 }
+/** 流程定义状态（wf_process_define_state） */
+export declare enum DefineState {
+    Disable = 0,
+    Enable = 1
+}
+/** 流程提交类型（wf_process_submit_type） */
+export declare enum SubmitType {
+    Apply = 0,
+    Agree = 1,
+    Reject = 2,
+    Rollback = 3,
+    Jump = 4,
+    ReApply = 5,
+    RollbackToOperator = 6,
+    CountersignDisagree = 20
+}
+/** 任务类型（wf_process_task_type） */
+export declare enum TaskType {
+    Major = 0,
+    Secondary = 1,
+    Record = 2
+}
+/** 任务参与方式（wf_process_task_perform_type） */
+export declare enum PerformType {
+    Normal = 0,
+    Countersign = 1
+}
+/** 会签类型（wf_countersign_type） */
+export declare enum CountersignType {
+    Parallel = 0,
+    Sequential = 1
+}
 export declare const BusinessNoKey = "BUSINESS_NO";
 export declare class ProcessInstance {
     id: number;
@@ -186,3 +225,57 @@ export interface CcInstanceRow {
     defineDisplayName: string;
     defineVersion: number;
 }
+export interface DefineRow {
+    id: number;
+    name: string;
+    displayName: string;
+    type: string;
+    state: number;
+    version: number;
+    createTime: Date;
+    createUser: string;
+    updateTime: Date;
+    updateUser: string;
+}
+export interface InstanceRow {
+    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;
+}
+export interface TaskRow {
+    id: number;
+    processInstanceId: number;
+    taskName: string;
+    displayName: string;
+    taskType: number;
+    performType: number;
+    taskState: TaskState;
+    operator: string;
+    finishTime?: Date;
+    expireTime?: Date;
+    formKey: string;
+    taskParentId?: number;
+    variables: Record<string, any>;
+    createTime: Date;
+    createUser: string;
+    updateTime: Date;
+    updateUser: string;
+    processDefineName: string;
+    processDefineDisplayName: string;
+    defineVersion: number;
+    instanceVariable: string;
+    instanceCreateTime: Date;
+}

package/dist/model.js

@@ -11,14 +11,59 @@ export var InstanceState;
 (function (InstanceState) {
     InstanceState[InstanceState["Doing"] = 10] = "Doing";
     InstanceState[InstanceState["Done"] = 20] = "Done";
+    InstanceState[InstanceState["Withdraw"] = 30] = "Withdraw";
+    InstanceState[InstanceState["Interrupt"] = 40] = "Interrupt";
     InstanceState[InstanceState["Reject"] = 45] = "Reject";
+    InstanceState[InstanceState["Pending"] = 50] = "Pending";
+    InstanceState[InstanceState["Abandon"] = 99] = "Abandon";
 })(InstanceState || (InstanceState = {}));
 export var TaskState;
 (function (TaskState) {
     TaskState[TaskState["Doing"] = 10] = "Doing";
     TaskState[TaskState["Done"] = 20] = "Done";
+    TaskState[TaskState["Withdraw"] = 30] = "Withdraw";
+    TaskState[TaskState["Interrupt"] = 40] = "Interrupt";
+    TaskState[TaskState["Pending"] = 50] = "Pending";
     TaskState[TaskState["Abandoned"] = 99] = "Abandoned";
 })(TaskState || (TaskState = {}));
+// ─── 字典枚举（v1.4.0，对齐 Java enums，值与 boot3 字典一致） ───────────────
+/** 流程定义状态（wf_process_define_state） */
+export var DefineState;
+(function (DefineState) {
+    DefineState[DefineState["Disable"] = 0] = "Disable";
+    DefineState[DefineState["Enable"] = 1] = "Enable";
+})(DefineState || (DefineState = {}));
+/** 流程提交类型（wf_process_submit_type） */
+export var SubmitType;
+(function (SubmitType) {
+    SubmitType[SubmitType["Apply"] = 0] = "Apply";
+    SubmitType[SubmitType["Agree"] = 1] = "Agree";
+    SubmitType[SubmitType["Reject"] = 2] = "Reject";
+    SubmitType[SubmitType["Rollback"] = 3] = "Rollback";
+    SubmitType[SubmitType["Jump"] = 4] = "Jump";
+    SubmitType[SubmitType["ReApply"] = 5] = "ReApply";
+    SubmitType[SubmitType["RollbackToOperator"] = 6] = "RollbackToOperator";
+    SubmitType[SubmitType["CountersignDisagree"] = 20] = "CountersignDisagree";
+})(SubmitType || (SubmitType = {}));
+/** 任务类型（wf_process_task_type） */
+export var TaskType;
+(function (TaskType) {
+    TaskType[TaskType["Major"] = 0] = "Major";
+    TaskType[TaskType["Secondary"] = 1] = "Secondary";
+    TaskType[TaskType["Record"] = 2] = "Record";
+})(TaskType || (TaskType = {}));
+/** 任务参与方式（wf_process_task_perform_type） */
+export var PerformType;
+(function (PerformType) {
+    PerformType[PerformType["Normal"] = 0] = "Normal";
+    PerformType[PerformType["Countersign"] = 1] = "Countersign";
+})(PerformType || (PerformType = {}));
+/** 会签类型（wf_countersign_type） */
+export var CountersignType;
+(function (CountersignType) {
+    CountersignType[CountersignType["Parallel"] = 0] = "Parallel";
+    CountersignType[CountersignType["Sequential"] = 1] = "Sequential";
+})(CountersignType || (CountersignType = {}));
 export const BusinessNoKey = 'BUSINESS_NO';
 // ─── 聚合根：ProcessInstance ───────────────────────────────────────────────────
 export class ProcessInstance {

package/dist/registry.d.ts

@@ -7,12 +7,30 @@ export interface IAssignmentHandler {
 export interface IDecisionHandler {
     decide(node: FlowNode, inst: ProcessInstance, vars: Record<string, any>): string | Promise<string>;
 }
-/** 处理器注册表——按名称注册/解析（对标 Spring IoC） */
+/** 处理器元数据（v1.4.0，SPI 实现清单字典源） */
+export interface HandlerMeta {
+    /** 处理器标识：节点配置的 handlerName（与字典 value 一致） */
+    name: string;
+    /** 显示名（字典 label） */
+    displayName?: string;
+    /** 排序（小在前） */
+    order?: number;
+    /** 分组（拦截器 pre/post 显式声明；其余可为空） */
+    group?: string;
+}
+/** 处理器注册表——按名称注册/解析 + 元数据清单（对标 Spring IoC / Java HandlerRegistry） */
 export declare class HandlerRegistry {
     private assignments;
     private decisions;
-    registerAssignment(name: string, handler: IAssignmentHandler): void;
-    registerDecision(name: string, handler: IDecisionHandler): void;
+    private metas;
+    registerAssignment(name: string, handler: IAssignmentHandler, meta?: Omit<HandlerMeta, 'name'>): void;
+    registerDecision(name: string, handler: IDecisionHandler, meta?: Omit<HandlerMeta, 'name'>): void;
     resolveAssignment(name: string): IAssignmentHandler | undefined;
     resolveDecision(name: string): IDecisionHandler | undefined;
+    /** 按处理器类型列出可用实现的元数据（typeName: AssignmentHandler / DecisionHandler，按 order 升序） */
+    listHandlers(typeName: 'AssignmentHandler' | 'DecisionHandler'): HandlerMeta[];
+    /** 按处理器类型 + 分组列出（拦截器 pre/post） */
+    listHandlersGroup(typeName: 'AssignmentHandler' | 'DecisionHandler', group: string): HandlerMeta[];
+    /** 已注册的处理器名称清单（含未带元数据的） */
+    listHandlerNames(): string[];
 }

package/dist/registry.js

@@ -1,12 +1,17 @@
-/** 处理器注册表——按名称注册/解析（对标 Spring IoC） */
+/** 处理器注册表——按名称注册/解析 + 元数据清单（对标 Spring IoC / Java HandlerRegistry） */
 export class HandlerRegistry {
     assignments = new Map();
     decisions = new Map();
-    registerAssignment(name, handler) {
+    metas = new Map();
+    registerAssignment(name, handler, meta) {
         this.assignments.set(name, handler);
+        if (meta)
+            this.metas.set(name, { name, ...meta });
     }
-    registerDecision(name, handler) {
+    registerDecision(name, handler, meta) {
         this.decisions.set(name, handler);
+        if (meta)
+            this.metas.set(name, { name, ...meta });
     }
     resolveAssignment(name) {
         return this.assignments.get(name);
@@ -14,4 +19,22 @@ export class HandlerRegistry {
     resolveDecision(name) {
         return this.decisions.get(name);
     }
+    // ── SPI 实现清单（v1.4.0）──
+    /** 按处理器类型列出可用实现的元数据（typeName: AssignmentHandler / DecisionHandler，按 order 升序） */
+    listHandlers(typeName) {
+        const names = typeName === 'AssignmentHandler'
+            ? [...this.assignments.keys()]
+            : [...this.decisions.keys()];
+        return names
+            .map(n => this.metas.get(n) ?? { name: n })
+            .sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
+    }
+    /** 按处理器类型 + 分组列出（拦截器 pre/post） */
+    listHandlersGroup(typeName, group) {
+        return this.listHandlers(typeName).filter(m => m.group === group);
+    }
+    /** 已注册的处理器名称清单（含未带元数据的） */
+    listHandlerNames() {
+        return [...this.assignments.keys(), ...this.decisions.keys()];
+    }
 }

package/dist/spi.d.ts

@@ -1,4 +1,9 @@
-import type { CcInstanceRow, ProcessDefine, ProcessDesign, ProcessDesignHis, ProcessInstance, ProcessSurrogate, ProcessTask, UserInfo } from './model.js';
+import type { CcInstanceRow, DefineRow, InstanceRow, TaskRow, ProcessDefine, ProcessDesign, ProcessDesignHis, ProcessInstance, ProcessSurrogate, ProcessTask, UserInfo } from './model.js';
+export interface QueryCondition {
+    column: string;
+    operator: string;
+    value: any;
+}
 export interface ProcessRepository {
     findDefineById(id: number): Promise<ProcessDefine | null>;
     findDefineByName(name: string): Promise<ProcessDefine | null>;
@@ -20,10 +25,26 @@ 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<{
+    pageCcInstances(pageNum: number, pageSize: number, actorId: string, conditions?: QueryCondition[]): Promise<{
         rows: CcInstanceRow[];
         total: number;
     }>;
+    pageDefines(pageNum: number, pageSize: number, conditions?: QueryCondition[]): Promise<{
+        rows: DefineRow[];
+        total: number;
+    }>;
+    pageInstances(pageNum: number, pageSize: number, operator: string, conditions?: QueryCondition[]): Promise<{
+        rows: InstanceRow[];
+        total: number;
+    }>;
+    pageTodoTasks(pageNum: number, pageSize: number, actorId: string, conditions?: QueryCondition[]): Promise<{
+        rows: TaskRow[];
+        total: number;
+    }>;
+    pageDoneTasks(pageNum: number, pageSize: number, operator: string, conditions?: QueryCondition[]): Promise<{
+        rows: TaskRow[];
+        total: number;
+    }>;
 }
 export interface UserProvider {
     getUser(userId: string): Promise<UserInfo | null>;
@@ -39,13 +60,13 @@ export interface ProcessExtRepository {
     saveDesign(d: ProcessDesign): Promise<void>;
     updateDesign(d: ProcessDesign): Promise<void>;
     removeDesign(id: number): Promise<void>;
-    pageDesigns(pageNum?: number, pageSize?: number, filters?: Record<string, any>): Promise<[ProcessDesign[], number]>;
+    pageDesigns(pageNum?: number, pageSize?: number, filters?: Record<string, any>, conditions?: QueryCondition[]): Promise<[ProcessDesign[], number]>;
     saveDesignHis(his: ProcessDesignHis): Promise<void>;
     listDesignHis(designId: number): Promise<ProcessDesignHis[]>;
     findSurrogateById(id: number): Promise<ProcessSurrogate | null>;
     saveSurrogate(s: ProcessSurrogate): Promise<void>;
     updateSurrogate(s: ProcessSurrogate): Promise<void>;
     removeSurrogate(id: number): Promise<void>;
-    pageSurrogates(pageNum?: number, pageSize?: number, filters?: Record<string, any>): Promise<[ProcessSurrogate[], number]>;
+    pageSurrogates(pageNum?: number, pageSize?: number, filters?: Record<string, any>, conditions?: QueryCondition[]): Promise<[ProcessSurrogate[], number]>;
     getSurrogate(operator: string, processName: string, at?: Date): Promise<ProcessSurrogate | null>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mldong/jeeflow",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "jeeflow workflow engine — Node.js / TypeScript implementation",
   "type": "module",
   "main": "./dist/index.js",
@@ -29,7 +29,9 @@
   ],
   "license": "Apache-2.0",
   "devDependencies": {
+    "@types/express": "^4.17.25",
     "@types/pg": "^8.20.3",
+    "express": "^4.22.2",
     "tsx": "^4.19.0",
     "typescript": "^5.5.0"
   },