@mldong/jeeflow 1.4.0 → 1.5.1

package/dist/engine.d.ts

@@ -31,6 +31,8 @@ export declare class EngineImpl implements Engine {
     setExtensions(ext: EngineExtensions): void;
     setRegistry(reg: HandlerRegistry): void;
     private firePre;
+    /** 表达式求值（v1.5.0，门面 highLight 决策分支过滤用） */
+    evalExpr(expr: string, vars: Record<string, any>): Promise<any>;
     private firePost;
     private fireEvent;
     startProcessInstanceById(defineId: number, operator: string, args?: Record<string, any>): Promise<ProcessInstance>;

package/dist/engine.js

@@ -36,6 +36,12 @@ export class EngineImpl {
                 return false;
         return true;
     }
+    /** 表达式求值（v1.5.0，门面 highLight 决策分支过滤用） */
+    async evalExpr(expr, vars) {
+        if (!this.exprEval)
+            throw new Error('ExpressionEvaluator 未配置');
+        return this.exprEval.eval(expr, vars);
+    }
     async firePost(node, inst) {
         if (!this.ext?.interceptors)
             return;

package/dist/facade.d.ts

@@ -17,6 +17,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;
@@ -24,6 +30,8 @@ export declare class JeeflowFacade {
     private getLastByName;
     private highLight;
     private collectPath;
+    /** 决策输出边表达式求值（args = 实例变量 + 决策节点前置任务变量） */
+    private evalDecisionExpr;
     private approvalRecord;
     private getAssigneeTextData;
     private createCCInstance;
@@ -36,4 +44,14 @@ export declare class JeeflowFacade {
     private taskAddActor;
     private taskLatest;
     private ext;
+    private definePage;
+    private defineDetail;
+    private instancePage;
+    private instanceDetail;
+    /** 流程 JSON 中第一个任务节点 id（issues/05-4 isFirstTaskNode 用） */
+    private firstTaskNodeId;
+    private todoList;
+    private doneList;
+    /** 定义 content 解析为 LogicFlow JSON（issues/05 jsonObject） */
+    private parseGraph;
 }

package/dist/facade.js

@@ -3,6 +3,7 @@
 // 集成方只实现一个转发端点：把 body JSON 转成对象传入 flow()，所有流程能力按
 // action（boot2/boot3 端点短名）路由。返回统一结构 {code, msg, data}
 // （code=0 成功 / 99999999 失败）。操作人约定：args.operator 显式传入。
+import { TaskState, } from './model.js';
 // submitType 枚举（对齐 boot3）
 const SUBMIT_APPLY = 0;
 const SUBMIT_AGREE = 1;
@@ -37,20 +38,34 @@ export class JeeflowFacade {
     }
     async dispatch(action, args) {
         switch (action) {
+            case 'processDefine/page':
+                return this.definePage(args);
+            case 'processDefine/detail':
+                return this.defineDetail(args);
             case 'processDefine/startAndExecute':
             case 'processInstance/startAndExecute':
                 return this.startAndExecute(args);
             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':
                 return this.repo.removeDefine(toId(args.id));
             case 'processDefine/upAndDown':
                 return this.repo.updateDefineState(toId(args.id), toInt(args.state));
+            case 'processInstance/page':
+                return this.instancePage(args);
+            case 'processInstance/detail':
+                return this.instanceDetail(args);
             case 'processInstance/withdraw':
                 return this.withdraw(args);
+            case 'processTask/todoList':
+                return this.todoList(args);
+            case 'processTask/doneList':
+                return this.doneList(args);
             case 'processTask/execute':
                 return this.execute(args);
             case 'processDesign/page':
@@ -59,6 +74,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':
@@ -231,9 +250,103 @@ export class JeeflowFacade {
     }
     // ── 流程设计（需扩展仓储） ───────────────────────────────────────────────
     async designPage(args) {
-        const [rows, total] = await this.ext().pageDesigns(toInt(args.pageNum ?? 1), toInt(args.pageSize ?? 10));
+        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));
@@ -244,12 +357,25 @@ export class JeeflowFacade {
             type: design.type, icon: design.icon, isDeployed: design.isDeployed, remark: design.remark,
         };
         const hisList = await ext.listDesignHis(design.id);
+        let jsonObject;
         if (hisList.length > 0) {
             try {
-                data.jsonObject = JSON.parse(toStr(hisList[0].content));
+                jsonObject = JSON.parse(toStr(hisList[0].content));
             }
             catch { /* ignore */ }
         }
+        // issues/07：jsonObject 缺失基本信息时从设计表补齐（对齐 boot3 ProcessDesignServiceImpl.findById）
+        if (!jsonObject || typeof jsonObject !== 'object')
+            jsonObject = {};
+        if (!(jsonObject.name))
+            jsonObject.name = design.name;
+        if (!(jsonObject.displayName))
+            jsonObject.displayName = design.displayName;
+        if (!(jsonObject.type))
+            jsonObject.type = design.type;
+        if (!(jsonObject.processDesignId))
+            jsonObject.processDesignId = design.id;
+        data.jsonObject = jsonObject;
         data.his = hisList;
         return data;
     }
@@ -281,6 +407,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;
         }
@@ -296,7 +425,7 @@ export class JeeflowFacade {
     // ── 委托代理（需扩展仓储） ───────────────────────────────────────────────
     async surrogatePage(args) {
         const filters = args.operator != null ? { operator: String(args.operator) } : undefined;
-        const [rows, total] = await this.ext().pageSurrogates(toInt(args.pageNum ?? 1), toInt(args.pageSize ?? 10), filters);
+        const [rows, total] = await this.ext().pageSurrogates(toInt(args.pageNum ?? 1), toInt(args.pageSize ?? 10), filters, parseMQuery(args));
         return { rows, recordCount: total };
     }
     async surrogateSave(args) {
@@ -353,26 +482,33 @@ export class JeeflowFacade {
         for (const t of his)
             if (!active.includes(t.taskName) && !history.includes(t.taskName))
                 history.push(t.taskName);
-        // 路径补全：start 沿边递归（遇活跃节点停止）
+        // 路径补全：start 沿边递归（遇活跃节点停止）；决策分支按表达式求值过滤（issues/06）
         const def = await this.repo.findDefineById(inst.defineId);
         if (def) {
             try {
                 const flow = JSON.parse(toStr(def.content));
-                this.collectPath(flow, 'start', '', active, history, edges, new Set());
+                await this.collectPath(flow, 'start', '', active, history, edges, new Set(), inst.variables ?? {}, his);
             }
             catch { /* ignore */ }
         }
         return { activeNodeNames: active, historyNodeNames: history, historyEdgeNames: edges };
     }
-    collectPath(flow, nodeId, edgeName, active, history, edges, visited) {
+    async collectPath(flow, nodeId, edgeName, active, history, edges, visited, vars, historyTasks) {
         if (visited.has(nodeId))
             return;
         visited.add(nodeId);
         if (edgeName && !edges.includes(edgeName))
             edges.push(edgeName);
+        const src = (flow.nodes ?? []).find((n) => n.id === nodeId);
         for (const e of flow.edges ?? []) {
             if (e.sourceNodeId !== nodeId)
                 continue;
+            // 决策节点：输出边表达式求值过滤（对齐 boot3 recursionModel，issues/06）
+            if (src?.type === 'snaker:decision') {
+                const expr = e.properties?.expr;
+                if (expr && !await this.evalDecisionExpr(flow, src, expr, vars, historyTasks))
+                    continue;
+            }
             const target = (flow.nodes ?? []).find((n) => n.id === e.targetNodeId);
             if (!target)
                 continue;
@@ -381,7 +517,25 @@ export class JeeflowFacade {
                 history.push(tid);
             if (active.includes(tid))
                 continue;
-            this.collectPath(flow, tid, e.id, active, history, edges, visited);
+            await this.collectPath(flow, tid, e.id, active, history, edges, visited, vars, historyTasks);
+        }
+    }
+    /** 决策输出边表达式求值（args = 实例变量 + 决策节点前置任务变量） */
+    async evalDecisionExpr(flow, decision, expr, vars, historyTasks) {
+        const args = { ...(vars ?? {}) };
+        for (const e of flow.edges ?? []) {
+            if (e.targetNodeId === decision.id) {
+                const t = (historyTasks ?? []).find((x) => x.taskName === e.sourceNodeId);
+                if (t?.variables)
+                    Object.assign(args, t.variables);
+                break;
+            }
+        }
+        try {
+            return Boolean(await this.engine.evalExpr(expr, args));
+        }
+        catch {
+            return false;
         }
     }
     async approvalRecord(args) {
@@ -424,8 +578,8 @@ export class JeeflowFacade {
         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 };
+        const { rows, total } = await this.repo.pageCcInstances(pageNum, pageSize, actorId, parseMQuery(args));
+        return { rows: rows.map(r => ccRowToMap(r)), recordCount: total };
     }
     async taskDetail(args) {
         const taskId = toId(args.id);
@@ -446,6 +600,7 @@ export class JeeflowFacade {
         if (inst) {
             const def = await this.repo.findDefineById(inst.defineId);
             if (def) {
+                vo.jsonObject = this.parseGraph(def.content); // issues/05
                 try {
                     const flow = JSON.parse(toStr(def.content));
                     for (const n of flow.nodes ?? []) {
@@ -558,8 +713,206 @@ export class JeeflowFacade {
             throw new Error('未配置 ProcessExtRepository（扩展仓储）');
         return this.extRepo;
     }
+    // ═══ 基础分页/详情（v1.5.0 补齐，对齐 Java 门面）═══
+    async definePage(args) {
+        const pageNum = toInt(args.pageNum ?? 1);
+        const pageSize = toInt(args.pageSize ?? 10);
+        const { rows, total } = await this.repo.pageDefines(pageNum, pageSize, parseMQuery(args));
+        return { rows: rows.map(r => defineRowToMap(r)), recordCount: total };
+    }
+    async defineDetail(args) {
+        const id = toId(args.id);
+        const def = await this.repo.findDefineById(id);
+        if (!def)
+            throw new Error('流程定义不存在');
+        return {
+            id: def.id, name: def.name, displayName: def.displayName,
+            type: def.type, state: def.state, version: def.version,
+            jsonObject: this.parseGraph(def.content), // issues/05
+        };
+    }
+    async instancePage(args) {
+        const pageNum = toInt(args.pageNum ?? 1);
+        const pageSize = toInt(args.pageSize ?? 10);
+        const operator = String(args.operator ?? 'user1');
+        const { rows, total } = await this.repo.pageInstances(pageNum, pageSize, operator, parseMQuery(args));
+        return { rows: rows.map(r => instanceRowToMap(r)), recordCount: total };
+    }
+    async instanceDetail(args) {
+        const id = toId(args.id);
+        const inst = await this.repo.findInstanceById(id);
+        if (!inst)
+            throw new Error('流程实例不存在');
+        const def0 = await this.repo.findDefineById(inst.defineId);
+        const graph = def0 ? this.parseGraph(def0.content) : undefined;
+        // 任务列表（issues/05-4）：全量 tasks + activeTaskList（仅 DOING）+ 任务行 ext/isFirstTaskNode
+        const firstTaskNodeId = this.firstTaskNodeId(graph);
+        const tasks = [];
+        const activeTaskList = [];
+        for (const t of inst.tasks ?? []) {
+            const vo = {
+                id: t.id, processInstanceId: t.processInstanceId, taskName: t.taskName,
+                displayName: t.displayName, taskType: t.taskType ?? null,
+                performType: t.performType ?? null, taskState: t.taskState,
+                operator: t.actorId ?? '', finishTime: t.finishTime,
+                expireTime: t.expireTime, formKey: t.formKey ?? '', taskParentId: t.parentTaskId ?? null,
+                variable: JSON.stringify(t.variables ?? {}),
+                createTime: t.createTime, createUser: t.createUser,
+                updateTime: t.updateTime, updateUser: t.updateUser,
+                taskActorIdList: t.actorIds ?? [],
+            };
+            const ext = { ...(t.variables ?? {}) };
+            const doing = t.taskState === TaskState.Doing;
+            ext.isFirstTaskNode = doing && t.taskName === firstTaskNodeId;
+            vo.ext = ext;
+            tasks.push(vo);
+            if (doing)
+                activeTaskList.push(vo);
+        }
+        return {
+            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,
+            jsonObject: graph, // issues/05
+            tasks,
+            activeTaskList,
+        };
+    }
+    /** 流程 JSON 中第一个任务节点 id（issues/05-4 isFirstTaskNode 用） */
+    firstTaskNodeId(graph) {
+        for (const n of graph?.nodes ?? []) {
+            if (n?.type === 'snaker:task')
+                return n.id;
+        }
+        return '';
+    }
+    async todoList(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.pageTodoTasks(pageNum, pageSize, actorId, parseMQuery(args));
+        return { rows: rows.map(r => taskRowToMap(r)), recordCount: total };
+    }
+    async doneList(args) {
+        const pageNum = toInt(args.pageNum ?? 1);
+        const pageSize = toInt(args.pageSize ?? 10);
+        const operator = String(args.operator ?? 'user1');
+        const { rows, total } = await this.repo.pageDoneTasks(pageNum, pageSize, operator, parseMQuery(args));
+        return { rows: rows.map(r => taskRowToMap(r)), recordCount: total };
+    }
+    /** 定义 content 解析为 LogicFlow JSON（issues/05 jsonObject） */
+    parseGraph(content) {
+        try {
+            const str = typeof content === 'string' ? content : new TextDecoder().decode(content);
+            const obj = JSON.parse(str);
+            return obj && typeof obj === 'object' ? obj : undefined;
+        }
+        catch {
+            return undefined;
+        }
+    }
+}
+// ── 行转 Map（issues/05-2 列表字段契约 + 05-3 时间格式）─────────────────────
+/** Date → 'yyyy-MM-dd HH:mm:ss'（null/undefined → null） */
+function fmtTime(v) {
+    if (v == null)
+        return null;
+    const p = (n) => String(n).padStart(2, '0');
+    return `${v.getFullYear()}-${p(v.getMonth() + 1)}-${p(v.getDate())} ${p(v.getHours())}:${p(v.getMinutes())}:${p(v.getSeconds())}`;
+}
+/** JSON 字符串 → 对象（坏 JSON / 空返回空对象） */
+function parseVarMap(json) {
+    if (!json)
+        return {};
+    try {
+        const o = JSON.parse(json);
+        return o && typeof o === 'object' ? o : {};
+    }
+    catch {
+        return {};
+    }
+}
+/** 定义行：时间格式化 */
+function defineRowToMap(r) {
+    return {
+        id: r.id, name: r.name, displayName: r.displayName, type: r.type,
+        state: r.state, version: r.version,
+        createTime: fmtTime(r.createTime), createUser: r.createUser,
+        updateTime: fmtTime(r.updateTime), updateUser: r.updateUser,
+    };
+}
+/** 实例行：ext（实例变量对象）+ displayName/version（定义） */
+function instanceRowToMap(r) {
+    return {
+        id: r.id, parentId: r.parentId ?? null, processDefineId: r.defineId,
+        state: r.state, parentNodeName: r.parentNodeName, businessNo: r.businessNo,
+        operator: r.operator, expireTime: fmtTime(r.expireTime),
+        variable: r.variables, createTime: fmtTime(r.createTime), createUser: r.createUser,
+        updateTime: fmtTime(r.updateTime), updateUser: r.updateUser,
+        processDefineName: r.defineName, processDefineDisplayName: r.defineDisplayName,
+        processDefineVersion: r.defineVersion,
+        ext: r.variables, displayName: r.defineDisplayName, version: r.defineVersion,
+    };
+}
+/** 抄送行：ext（实例变量对象）+ displayName/version（定义） */
+function ccRowToMap(r) {
+    return {
+        id: r.id, parentId: r.parentId ?? null, processDefineId: r.defineId,
+        state: r.state, parentNodeName: r.parentNodeName, businessNo: r.businessNo,
+        operator: r.operator, expireTime: fmtTime(r.expireTime),
+        variable: r.variables, createTime: fmtTime(r.createTime), createUser: r.createUser,
+        updateTime: fmtTime(r.updateTime), updateUser: r.updateUser,
+        processDefineName: r.defineName, processDefineDisplayName: r.defineDisplayName,
+        processDefineVersion: r.defineVersion,
+        ext: r.variables, displayName: r.defineDisplayName, version: r.defineVersion,
+    };
+}
+/** 任务行：ext（任务变量，空回退实例变量）+ instanceExt + version */
+function taskRowToMap(r) {
+    const instanceExt = parseVarMap(r.instanceVariable);
+    const ext = Object.keys(r.variables ?? {}).length > 0 ? r.variables : instanceExt;
+    return {
+        id: r.id, processInstanceId: r.processInstanceId, taskName: r.taskName,
+        displayName: r.displayName, taskType: r.taskType, performType: r.performType,
+        taskState: r.taskState, operator: r.operator, finishTime: fmtTime(r.finishTime),
+        expireTime: fmtTime(r.expireTime), formKey: r.formKey, taskParentId: r.taskParentId ?? null,
+        variable: r.variables, createTime: fmtTime(r.createTime), createUser: r.createUser,
+        updateTime: fmtTime(r.updateTime), updateUser: r.updateUser,
+        processDefineName: r.processDefineName, processDefineDisplayName: r.processDefineDisplayName,
+        instanceVariable: r.instanceVariable, instanceCreateTime: fmtTime(r.instanceCreateTime),
+        ext, instanceExt, version: r.defineVersion,
+    };
 }
 // ── 工具 ──────────────────────────────────────────────────────────────────────
+/** m_ 前缀查询参数解析（issues/05-5，对齐 Java JeeflowQueryParser）：
+ *  m_EQ_taskName → t.task_name EQ；m_pd_LIKE_displayName → pd.display_name LIKE */
+function parseMQuery(args) {
+    const out = [];
+    for (const [key, value] of Object.entries(args)) {
+        if (!key.startsWith('m_') || value == null || value === '')
+            continue;
+        const parts = key.slice(2).split('_');
+        if (parts.length < 2)
+            continue;
+        let column;
+        let operator;
+        if (parts.length === 2) {
+            // 无别名 → 默认主表别名 t（对齐 Java，白名单列均带表别名）
+            operator = parts[0];
+            column = 't.' + toUnderscore(parts[1]);
+        }
+        else {
+            operator = parts[1];
+            column = parts[0] + '.' + toUnderscore(parts[2]);
+        }
+        out.push({ column, operator: operator.toUpperCase(), value });
+    }
+    return out;
+}
+function toUnderscore(camel) {
+    return camel.replace(/[A-Z]/g, c => '_' + c.toLowerCase());
+}
 function toStr(v) {
     if (v == null)
         return '';

package/dist/jdbc/ext.d.ts

@@ -1,5 +1,5 @@
 import { ProcessDesign, ProcessDesignHis, ProcessSurrogate } from '../model.js';
-import type { IDGenerator, ProcessExtRepository } from '../spi.js';
+import type { IDGenerator, ProcessExtRepository, QueryCondition } from '../spi.js';
 import { type SqlAdapter } from './shared.js';
 export declare class JdbcProcessExtRepository implements ProcessExtRepository {
     private readonly adapter;
@@ -13,7 +13,10 @@ export declare class JdbcProcessExtRepository implements 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]>;
+    private buildExtWhere;
+    private static readonly DESIGN_WHITELIST;
+    private static readonly SURROGATE_WHITELIST;
     saveDesignHis(his: ProcessDesignHis): Promise<void>;
     listDesignHis(designId: number): Promise<ProcessDesignHis[]>;
     private static SURROGATE_COLS;
@@ -21,7 +24,7 @@ export declare class JdbcProcessExtRepository implements ProcessExtRepository {
     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>;
     private querySurrogate;
     private mapDesign;

package/dist/jdbc/ext.js

@@ -76,7 +76,7 @@ export class JdbcProcessExtRepository {
             await this.done(conn);
         }
     }
-    async pageDesigns(pageNum = 1, pageSize = 10, filters) {
+    async pageDesigns(pageNum = 1, pageSize = 10, filters, conditions) {
         let sql = `SELECT ${JdbcProcessExtRepository.DESIGN_COLS} FROM wf_process_design t WHERE 1=1`;
         let countSql = 'SELECT COUNT(*) FROM wf_process_design t WHERE 1=1';
         const args = [];
@@ -89,6 +89,12 @@ export class JdbcProcessExtRepository {
                 args2.push(val);
             }
         }
+        // m_ 条件（issues/05-5）：LIKE/EQ 等走白名单
+        const cond = this.buildExtWhere(conditions ?? [], JdbcProcessExtRepository.DESIGN_WHITELIST);
+        sql += cond.sql;
+        countSql += cond.sql;
+        args.push(...cond.params);
+        args2.push(...cond.params);
         const conn = await this.c();
         try {
             const countRow = await conn.fetchOne(this.sql(countSql), args2);
@@ -102,6 +108,53 @@ export class JdbcProcessExtRepository {
             await this.done(conn);
         }
     }
+    // m_ 条件 WHERE 构建（issues/05-5，白名单 + 参数化）
+    buildExtWhere(conditions, whitelist) {
+        let sql = '';
+        const params = [];
+        for (const c of conditions) {
+            if (!whitelist.has(c.column))
+                continue;
+            const val = c.value;
+            if (val == null || val === '')
+                continue;
+            switch (c.operator.toUpperCase()) {
+                case 'EQ':
+                    sql += ` AND ${c.column} = ?`;
+                    params.push(val);
+                    break;
+                case 'LIKE':
+                    sql += ` AND ${c.column} LIKE ?`;
+                    params.push(`%${val}%`);
+                    break;
+                case 'LLIKE':
+                    sql += ` AND ${c.column} LIKE ?`;
+                    params.push(`%${val}`);
+                    break;
+                case 'RLIKE':
+                    sql += ` AND ${c.column} LIKE ?`;
+                    params.push(`${val}%`);
+                    break;
+                case 'IN': {
+                    if (Array.isArray(val) && val.length > 0) {
+                        const marks = val.map(() => '?').join(',');
+                        sql += ` AND ${c.column} IN (${marks})`;
+                        params.push(...val);
+                    }
+                    break;
+                }
+            }
+        }
+        return { sql, params };
+    }
+    static DESIGN_WHITELIST = new Set([
+        't.id', 't.name', 't.display_name', 't.type', 't.is_deployed', 't.remark',
+        't.create_time', 't.update_time',
+    ]);
+    static SURROGATE_WHITELIST = new Set([
+        't.id', 't.process_name', 't.operator', 't.surrogate', 't.enabled',
+        't.start_time', 't.end_time', 't.create_time', 't.update_time',
+    ]);
     // ── 设计历史 ─────────────────────────────────────────────────────────────
     async saveDesignHis(his) {
         if (!his.id)
@@ -182,7 +235,7 @@ export class JdbcProcessExtRepository {
             await this.done(conn);
         }
     }
-    async pageSurrogates(pageNum = 1, pageSize = 10, filters) {
+    async pageSurrogates(pageNum = 1, pageSize = 10, filters, conditions) {
         let sql = `SELECT ${JdbcProcessExtRepository.SURROGATE_COLS} FROM wf_process_surrogate t WHERE 1=1`;
         let countSql = 'SELECT COUNT(*) FROM wf_process_surrogate t WHERE 1=1';
         const args = [];
@@ -195,6 +248,12 @@ export class JdbcProcessExtRepository {
                 args2.push(val);
             }
         }
+        // m_ 条件（issues/05-5）
+        const cond = this.buildExtWhere(conditions ?? [], JdbcProcessExtRepository.SURROGATE_WHITELIST);
+        sql += cond.sql;
+        countSql += cond.sql;
+        args.push(...cond.params);
+        args2.push(...cond.params);
         const conn = await this.c();
         try {
             const countRow = await conn.fetchOne(this.sql(countSql), args2);