@mldong/jeeflow 1.8.15 → 1.8.17

package/README.md

@@ -49,6 +49,7 @@ const repo = new JdbcRepository(new MysqlAdapter(pool), new TsIDGenerator())
 
 - MySQL 连接池必须带 `supportBigNumbers: true, bigNumberStrings: true`；PostgreSQL 的 int8 默认即字符串，无此要求
 - 引擎侧已做驱动兜底：`rowId()` 把驱动返回的 number/string 统一归一化为 string，未开 `bigNumberStrings` 时小 id（Node 自建）仍可用
+- `MysqlAdapter` 走 `query()` 不走 `execute()`：mysql2 预处理绑 `LIMIT ?` 会失败，分页整段 99999999（issues/66）
 
 ## 运行演示
 

package/dist/facade.js

@@ -288,8 +288,10 @@ export class JeeflowFacade {
     }
     // ── 流程设计（需扩展仓储） ───────────────────────────────────────────────
     async designPage(args) {
-        const [rows, total] = await this.ext().pageDesigns(toInt(args.pageNum ?? 1), toInt(args.pageSize ?? 10), undefined, parseMQuery(args));
-        return { rows, recordCount: total };
+        const pageNum = toInt(args.pageNum ?? 1);
+        const pageSize = toInt(args.pageSize ?? 10);
+        const [rows, total] = await this.ext().pageDesigns(pageNum, pageSize, undefined, parseMQuery(args));
+        return pageData(pageNum, pageSize, total, rows.map(r => designRowToMap(r)));
     }
     /** 修改流程设计基本信息（对齐 boot3 ProcessDesignController.update，不写设计稿快照） */
     async designUpdate(args) {
@@ -571,8 +573,10 @@ 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, parseMQuery(args));
-        return { rows, recordCount: total };
+        const pageNum = toInt(args.pageNum ?? 1);
+        const pageSize = toInt(args.pageSize ?? 10);
+        const [rows, total] = await this.ext().pageSurrogates(pageNum, pageSize, filters, parseMQuery(args));
+        return pageData(pageNum, pageSize, total, rows);
     }
     async surrogateSave(args) {
         const ext = this.ext();
@@ -792,7 +796,7 @@ export class JeeflowFacade {
         const pageSize = toInt(args.pageSize ?? 10);
         const actorId = String(args.operator ?? 'user1');
         const { rows, total } = await this.repo.pageCcInstances(pageNum, pageSize, actorId, parseMQuery(args));
-        return { rows: rows.map(r => ccRowToMap(r)), recordCount: total };
+        return pageData(pageNum, pageSize, total, rows.map(r => ccRowToMap(r)));
     }
     async taskDetail(args) {
         const taskId = toId(args.id);
@@ -819,7 +823,12 @@ export class JeeflowFacade {
                     const flow = JSON.parse(toStr(def.content));
                     for (const n of flow.nodes ?? []) {
                         if (n.id === task.taskName) {
-                            vo.taskModel = { name: n.id, displayName: n.text?.value ?? '', type: n.type };
+                            // issues/62：taskModel 补 form/ext（节点字段权限，对齐 boot2）
+                            vo.taskModel = {
+                                name: n.id, displayName: n.text?.value ?? '', type: n.type,
+                                form: n.properties?.form ?? null,
+                                ext: n.properties?.field ?? null,
+                            };
                             break;
                         }
                     }
@@ -845,6 +854,8 @@ export class JeeflowFacade {
         return rows;
     }
     async candidatePage(args) {
+        const pageNum = toInt(args.pageNum ?? 1);
+        const pageSize = toInt(args.pageSize ?? 10);
         const taskId = toId(args.processTaskId ?? args.id);
         const task = await this.repo.findTaskById(taskId);
         if (!task)
@@ -864,13 +875,13 @@ export class JeeflowFacade {
         }
         if (candidates.length > 0) {
             const rows = candidates.map(c => ({ userId: c, realName: c }));
-            return { rows, recordCount: rows.length };
+            return pageData(pageNum, pageSize, rows.length, rows);
         }
         // 无模型候选 → 用户分页搜索（依赖 userSearch 钩子）
         if (!this.userSearch)
             throw new Error('未配置 userSearch（用户搜索钩子）');
         const [rows, total] = await this.userSearch(args);
-        return { rows, recordCount: total };
+        return pageData(pageNum, pageSize, total, rows);
     }
     async nextTaskCandidates(flow, taskName) {
         const result = [];
@@ -946,7 +957,7 @@ export class JeeflowFacade {
         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 };
+        return pageData(pageNum, pageSize, total, rows.map(r => defineRowToMap(r)));
     }
     async defineDetail(args) {
         const id = toId(args.id);
@@ -964,7 +975,7 @@ export class JeeflowFacade {
         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 };
+        return pageData(pageNum, pageSize, total, rows.map(r => instanceRowToMap(r)));
     }
     async instanceDetail(args) {
         const id = toId(args.id);
@@ -1029,14 +1040,14 @@ export class JeeflowFacade {
         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 };
+        return pageData(pageNum, pageSize, total, rows.map(r => taskRowToMap(r)));
     }
     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 };
+        return pageData(pageNum, pageSize, total, rows.map(r => taskRowToMap(r)));
     }
     /** 定义 content 解析为 LogicFlow JSON（issues/05 jsonObject） */
     parseGraph(content) {
@@ -1090,6 +1101,15 @@ function defineRowToMap(r) {
         updateTime: fmtTime(r.updateTime), updateUser: r.updateUser,
     };
 }
+/** 设计行：时间格式化（issues/63） */
+function designRowToMap(r) {
+    return {
+        id: r.id, name: r.name, displayName: r.displayName,
+        type: r.type, icon: r.icon, isDeployed: r.isDeployed, remark: r.remark,
+        createTime: fmtTime(r.createTime), createUser: r.createUser,
+        updateTime: fmtTime(r.updateTime), updateUser: r.updateUser,
+    };
+}
 /** 实例行：ext（实例变量对象）+ displayName/version（定义） */
 function instanceRowToMap(r) {
     return {
@@ -1197,3 +1217,12 @@ function toInt(v) {
         throw new Error('数值缺失或非法');
     return n;
 }
+/** issues/64：对齐 mldong 分页五键（Java pageResult / Go pageData） */
+function pageData(pageNum, pageSize, total, rows) {
+    const pn = pageNum || 1;
+    const ps = pageSize || 10;
+    let totalPage = 0;
+    if (total > 0 && ps > 0)
+        totalPage = Math.ceil(total / ps);
+    return { pageNum: pn, pageSize: ps, recordCount: total, totalPage, rows };
+}

package/dist/jdbc/mysql.js

@@ -1,18 +1,22 @@
 // MySQL 适配器（mysql2）——连接池 + `?` 占位符（与核心一致，无需转换）。
+//
+// 必须用 query() 而不是 execute()：mysql2 execute 走预处理协议，
+// LIMIT ? / OFFSET ? 会失败（Incorrect arguments / LIMIT 被绑成字符串），
+// 分页接口整段变成 facade 99999999（issues/66）。Postgres 适配器本来就走 query()。
 export class MysqlConnection {
     raw;
     constructor(raw) {
         this.raw = raw;
     }
     async execute(sql, args) {
-        await this.raw.execute(sql, args);
+        await this.raw.query(sql, args);
     }
     async fetchOne(sql, args) {
-        const [rows] = await this.raw.execute(sql, args);
+        const [rows] = await this.raw.query(sql, args);
         return rows[0] ?? null;
     }
     async fetchAll(sql, args) {
-        const [rows] = await this.raw.execute(sql, args);
+        const [rows] = await this.raw.query(sql, args);
         return rows;
     }
     async begin() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mldong/jeeflow",
-  "version": "1.8.15",
+  "version": "1.8.17",
   "description": "jeeflow workflow engine — Node.js / TypeScript implementation",
   "type": "module",
   "main": "./dist/index.js",
@@ -19,6 +19,7 @@
   "scripts": {
     "build": "tsc",
     "test": "node --import tsx __tests__/spec.test.ts",
+    "test-mysql": "node --import tsx --test __tests__/jdbc.test.ts",
     "demo": "node --import tsx demo/main.ts",
     "prepublishOnly": "npm run build"
   },