@nocobase/plugin-workflow-manual 2.2.0-beta.9 → 3.0.0-alpha.1

package/dist/locale/en-US.json

@@ -17,9 +17,12 @@
   "Field name existed in form": "Field name existed in form",
   "Filter settings": "Filter settings",
   "Manual": "Manual",
+  "Manual task cannot be processed on the new page": "Manual task cannot be processed on the new page",
+  "Manual tasks are not yet supported on the new page. Return to the legacy page to process this task.": "Manual tasks are not yet supported on the new page. Return to the legacy page to process this task.",
   "My manual tasks": "My manual tasks",
   "Negotiation": "Negotiation",
   "Please check one of your update record form, and add at least one filter condition in form settings.": "Please check one of your update record form, and add at least one filter condition in form settings.",
+  "Return to legacy page": "Return to legacy page",
   "Save temporarily": "Save temporarily",
   "Separately": "Separately",
   "Task": "Task",
@@ -33,4 +36,4 @@
   "Values preset in this form will override user submitted ones when continue or reject.": "Values preset in this form will override user submitted ones when continue or reject.",
   "View user interface": "View user interface",
   "Workflow todos": "Workflow todos"
-}
+}

package/dist/locale/zh-CN.json

@@ -17,9 +17,12 @@
   "Field name existed in form": "表单中已有对应标识的字段",
   "Filter settings": "筛选设置",
   "Manual": "人工处理",
+  "Manual task cannot be processed on the new page": "人工任务无法在新版页面中处理",
+  "Manual tasks are not yet supported on the new page. Return to the legacy page to process this task.": "新版页面暂不支持处理人工任务，请返回旧版页面处理该任务。",
   "My manual tasks": "我的人工任务",
   "Negotiation": "协商机制",
   "Please check one of your update record form, and add at least one filter condition in form settings.": "请检查您的其中的更新数据表单，并在表单设置中至少添加一个筛选条件。",
+  "Return to legacy page": "返回旧版页面",
   "Save temporarily": "暂存",
   "Separately": "分别处理",
   "Task": "Task",
@@ -33,4 +36,4 @@
   "Values preset in this form will override user submitted ones when continue or reject.": "表单中预设的字段值会在用户提交继续或拒绝时覆盖相应字段的值。",
   "View user interface": "查看界面",
   "Workflow todos": "工作流待办"
-}
+}

package/dist/node_modules/joi/package.json

@@ -1 +1 @@
-{"name":"joi","description":"Object schema validation","version":"17.13.3","repository":"git://github.com/hapijs/joi","main":"lib/index.js","types":"lib/index.d.ts","browser":"dist/joi-browser.min.js","files":["lib/**/*","dist/*"],"keywords":["schema","validation"],"dependencies":{"@hapi/hoek":"^9.3.0","@hapi/topo":"^5.1.0","@sideway/address":"^4.1.5","@sideway/formula":"^3.0.1","@sideway/pinpoint":"^2.0.0"},"devDependencies":{"@hapi/bourne":"2.x.x","@hapi/code":"8.x.x","@hapi/joi-legacy-test":"npm:@hapi/joi@15.x.x","@hapi/lab":"^25.1.3","@types/node":"^14.18.63","typescript":"4.3.x"},"scripts":{"prepublishOnly":"cd browser && npm install && npm run build","test":"lab -t 100 -a @hapi/code -L -Y","test-cov-html":"lab -r html -o coverage.html -a @hapi/code"},"license":"BSD-3-Clause","_lastModified":"2026-07-06T02:57:00.119Z"}
+{"name":"joi","description":"Object schema validation","version":"17.13.3","repository":"git://github.com/hapijs/joi","main":"lib/index.js","types":"lib/index.d.ts","browser":"dist/joi-browser.min.js","files":["lib/**/*","dist/*"],"keywords":["schema","validation"],"dependencies":{"@hapi/hoek":"^9.3.0","@hapi/topo":"^5.1.0","@sideway/address":"^4.1.5","@sideway/formula":"^3.0.1","@sideway/pinpoint":"^2.0.0"},"devDependencies":{"@hapi/bourne":"2.x.x","@hapi/code":"8.x.x","@hapi/joi-legacy-test":"npm:@hapi/joi@15.x.x","@hapi/lab":"^25.1.3","@types/node":"^14.18.63","typescript":"4.3.x"},"scripts":{"prepublishOnly":"cd browser && npm install && npm run build","test":"lab -t 100 -a @hapi/code -L -Y","test-cov-html":"lab -r html -o coverage.html -a @hapi/code"},"license":"BSD-3-Clause","_lastModified":"2026-07-30T03:57:12.870Z"}

package/dist/server/ManualInstruction.d.ts

@@ -7,7 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Registry } from '@nocobase/utils';
-import WorkflowPlugin, { Processor, Instruction } from '@nocobase/plugin-workflow';
+import WorkflowPlugin, { Instruction, Processor } from '@nocobase/plugin-workflow';
+import type { FlowNodeModel, JobModel } from '@nocobase/plugin-workflow';
 import { FormHandler } from './forms';
 type FormType = {
     type: 'custom' | 'create' | 'update';
@@ -31,7 +32,7 @@ export default class extends Instruction {
     workflow: WorkflowPlugin;
     formTypes: Registry<FormHandler>;
     constructor(workflow: WorkflowPlugin);
-    run(node: any, prevJob: any, processor: Processor): Promise<import("@nocobase/plugin-workflow").JobModel>;
-    resume(node: any, job: any, processor: Processor): Promise<any>;
+    run(node: any, prevJob: any, processor: Processor): Promise<JobModel>;
+    resume(node: FlowNodeModel, job: JobModel, processor: Processor): Promise<JobModel>;
 }
 export {};

package/dist/server/ManualInstruction.js

@@ -42,64 +42,6 @@ module.exports = __toCommonJS(ManualInstruction_exports);
 var import_utils = require("@nocobase/utils");
 var import_plugin_workflow = require("@nocobase/plugin-workflow");
 var import_forms = __toESM(require("./forms"));
-const MULTIPLE_ASSIGNED_MODE = {
-  SINGLE: Symbol("single"),
-  ALL: Symbol("all"),
-  ANY: Symbol("any"),
-  ALL_PERCENTAGE: Symbol("all percentage"),
-  ANY_PERCENTAGE: Symbol("any percentage")
-};
-const Modes = {
-  [MULTIPLE_ASSIGNED_MODE.SINGLE]: {
-    getStatus(distribution, assignees) {
-      const done = distribution.find((item) => item.status !== import_plugin_workflow.JOB_STATUS.PENDING && item.count > 0);
-      return done ? done.status : null;
-    }
-  },
-  [MULTIPLE_ASSIGNED_MODE.ALL]: {
-    getStatus(distribution, assignees) {
-      const resolved = distribution.find((item) => item.status === import_plugin_workflow.JOB_STATUS.RESOLVED);
-      if (resolved && resolved.count === assignees.length) {
-        return import_plugin_workflow.JOB_STATUS.RESOLVED;
-      }
-      const rejected = distribution.find((item) => item.status < import_plugin_workflow.JOB_STATUS.PENDING);
-      if (rejected && rejected.count) {
-        return rejected.status;
-      }
-      return null;
-    }
-  },
-  [MULTIPLE_ASSIGNED_MODE.ANY]: {
-    getStatus(distribution, assignees) {
-      const resolved = distribution.find((item) => item.status === import_plugin_workflow.JOB_STATUS.RESOLVED);
-      if (resolved && resolved.count) {
-        return import_plugin_workflow.JOB_STATUS.RESOLVED;
-      }
-      const rejectedCount = distribution.reduce(
-        (count, item) => item.status < import_plugin_workflow.JOB_STATUS.PENDING ? count + item.count : count,
-        0
-      );
-      if (rejectedCount === assignees.length) {
-        return import_plugin_workflow.JOB_STATUS.REJECTED;
-      }
-      return null;
-    }
-  }
-};
-function getMode(mode) {
-  switch (true) {
-    case mode === 1:
-      return Modes[MULTIPLE_ASSIGNED_MODE.ALL];
-    case mode === -1:
-      return Modes[MULTIPLE_ASSIGNED_MODE.ANY];
-    case mode > 0:
-      return Modes[MULTIPLE_ASSIGNED_MODE.ALL_PERCENTAGE];
-    case mode < 0:
-      return Modes[MULTIPLE_ASSIGNED_MODE.ANY_PERCENTAGE];
-    default:
-      return Modes[MULTIPLE_ASSIGNED_MODE.SINGLE];
-  }
-}
 class ManualInstruction_default extends import_plugin_workflow.Instruction {
   constructor(workflow) {
     super(workflow);
@@ -136,35 +78,7 @@ class ManualInstruction_default extends import_plugin_workflow.Instruction {
     return job;
   }
   async resume(node, job, processor) {
-    var _a;
-    const { mode } = node.config;
-    const TaskRepo = this.workflow.app.db.getRepository("workflowManualTasks");
-    const tasks = await TaskRepo.find({
-      where: {
-        jobId: job.id
-      }
-    });
-    const assignees = [];
-    const distributionMap = tasks.reduce((result2, item) => {
-      if (result2[item.status] == null) {
-        result2[item.status] = 0;
-      }
-      result2[item.status] += 1;
-      assignees.push(item.userId);
-      return result2;
-    }, {});
-    const distribution = Object.keys(distributionMap).map((status2) => ({
-      status: Number.parseInt(status2, 10),
-      count: distributionMap[status2]
-    }));
-    const submitted = tasks.reduce((count, item) => item.status !== import_plugin_workflow.JOB_STATUS.PENDING ? count + 1 : count, 0);
-    const status = job.status || (getMode(mode).getStatus(distribution, assignees) ?? import_plugin_workflow.JOB_STATUS.PENDING);
-    const result = mode ? (submitted || 0) / assignees.length : ((_a = job.latestTask) == null ? void 0 : _a.result) ?? job.result;
-    processor.logger.debug(`manual resume job and next status: ${status}`);
-    job.set({
-      status,
-      result
-    });
+    processor.logger.debug(`manual resume job and next status: ${job.status}`);
     return job;
   }
 }

package/dist/server/Plugin.d.ts

@@ -9,6 +9,10 @@
 import { Plugin } from '@nocobase/server';
 import { Model } from '@nocobase/database';
 export default class extends Plugin {
+    private mergeTaskCounts;
+    private collectManualTaskStats;
+    private updateManualWorkflowTaskStats;
+    private getWorkflowKeyById;
     private updateManualTaskStats;
     onTaskSave: (task: Model, { transaction }: {
         transaction: any;

package/dist/server/Plugin.js

@@ -45,18 +45,62 @@ var jobActions = __toESM(require("./actions"));
 var import_ManualInstruction = __toESM(require("./ManualInstruction"));
 var import_constants = require("../common/constants");
 class Plugin_default extends import_server.Plugin {
-  async updateManualTaskStats(userIds, transaction) {
-    if (!userIds.length) {
-      return;
+  mergeTaskCounts(statsMap, rows, workflowKeyMap, field) {
+    for (const row of rows) {
+      const userId = row.userId;
+      const workflowKey = workflowKeyMap.get(row.workflowId);
+      if (!userId || !workflowKey) {
+        continue;
+      }
+      const key = `${userId}\0${workflowKey}`;
+      const stats = statsMap.get(key) ?? {
+        userId,
+        workflowKey,
+        type: import_constants.TASK_TYPE_MANUAL,
+        pending: 0,
+        all: 0
+      };
+      stats[field] += Number(row.count) || 0;
+      statsMap.set(key, stats);
     }
+  }
+  async collectManualTaskStats(options) {
+    var _a, _b;
     const workflowPlugin = this.app.pm.get(import_plugin_workflow.default);
     const WorkflowManualTaskModel = this.db.getModel("workflowManualTasks");
-    const uniqueUserIds = Array.from(new Set(userIds.filter(Boolean)));
-    const userStatsMap = new Map(uniqueUserIds.map((userId) => [userId, { pending: 0, all: 0 }]));
-    const pendingCounts = await WorkflowManualTaskModel.count({
+    const qualifiedColumn = (name) => {
+      const fieldName = WorkflowManualTaskModel.getAttributes()[name].field ?? name;
+      return this.db.sequelize.col(`${WorkflowManualTaskModel.name}.${fieldName}`);
+    };
+    const group = ["userId", "workflowId"].map((name) => qualifiedColumn(name));
+    const countColumn = qualifiedColumn("id");
+    const where = {};
+    if ((_a = options.userIds) == null ? void 0 : _a.length) {
+      where.userId = options.userIds;
+    }
+    if ((_b = options.workflowKeys) == null ? void 0 : _b.length) {
+      const workflowIds2 = (await Promise.all(
+        options.workflowKeys.map(
+          (workflowKey) => workflowPlugin.getWorkflowIdsByKey(workflowKey, options.transaction)
+        )
+      )).flat();
+      if (!workflowIds2.length) {
+        return [];
+      }
+      where.workflowId = workflowIds2;
+    }
+    const allCounts = await WorkflowManualTaskModel.findAll({
+      attributes: ["userId", "workflowId", [this.db.sequelize.fn("COUNT", countColumn), "count"]],
+      where,
+      group,
+      raw: true,
+      transaction: options.transaction
+    });
+    const pendingCounts = await WorkflowManualTaskModel.findAll({
+      attributes: ["userId", "workflowId", [this.db.sequelize.fn("COUNT", countColumn), "count"]],
       where: {
-        status: import_constants.TASK_STATUS.PENDING,
-        userId: uniqueUserIds
+        ...where,
+        status: import_constants.TASK_STATUS.PENDING
       },
       include: [
         {
@@ -68,58 +112,87 @@ class Plugin_default extends import_server.Plugin {
           required: true
         }
       ],
-      col: "id",
-      group: ["userId"],
+      group,
+      raw: true,
+      transaction: options.transaction
+    });
+    const workflowIds = Array.from(new Set([...allCounts, ...pendingCounts].map((row) => row.workflowId)));
+    const workflows = workflowIds.length ? await this.db.getRepository("workflows").find({
+      filter: { id: workflowIds },
+      fields: ["id", "key"],
+      transaction: options.transaction
+    }) : [];
+    const workflowKeyMap = new Map(
+      workflows.map((workflow) => [workflow.id, workflow.key])
+    );
+    const statsMap = /* @__PURE__ */ new Map();
+    this.mergeTaskCounts(statsMap, allCounts, workflowKeyMap, "all");
+    this.mergeTaskCounts(statsMap, pendingCounts, workflowKeyMap, "pending");
+    return Array.from(statsMap.values());
+  }
+  async updateManualWorkflowTaskStats(userId, workflowKey, transaction) {
+    const workflowPlugin = this.app.pm.get(import_plugin_workflow.default);
+    const [row] = await this.collectManualTaskStats({
+      userIds: [userId],
+      workflowKeys: [workflowKey],
       transaction
     });
-    const allCounts = await WorkflowManualTaskModel.count({
-      where: {
-        userId: uniqueUserIds
+    const stats = row ?? {
+      userId,
+      workflowKey,
+      type: import_constants.TASK_TYPE_MANUAL,
+      pending: 0,
+      all: 0
+    };
+    await workflowPlugin.updateTaskStatsByWorkflow(
+      {
+        userId,
+        workflowKey,
+        type: import_constants.TASK_TYPE_MANUAL,
+        stats
       },
-      col: "id",
-      group: ["userId"],
+      { transaction }
+    );
+  }
+  async getWorkflowKeyById(workflowId, transaction) {
+    const WorkflowRepo = this.db.getRepository("workflows");
+    const workflow = await WorkflowRepo.findOne({
+      filterByTk: workflowId,
+      fields: ["key"],
       transaction
     });
-    for (const row of pendingCounts) {
-      userStatsMap.set(row.userId, { ...userStatsMap.get(row.userId), pending: Number(row.count) || 0 });
-    }
-    for (const row of allCounts) {
-      userStatsMap.set(row.userId, { ...userStatsMap.get(row.userId), all: Number(row.count) || 0 });
+    return workflow == null ? void 0 : workflow.key;
+  }
+  async updateManualTaskStats(userIds, transaction) {
+    if (!userIds.length) {
+      return;
     }
-    for (const [userId, stats] of userStatsMap.entries()) {
-      await workflowPlugin.updateTasksStats(userId, import_constants.TASK_TYPE_MANUAL, stats, { transaction });
+    const workflowPlugin = this.app.pm.get(import_plugin_workflow.default);
+    const uniqueUserIds = Array.from(new Set(userIds.filter(Boolean)));
+    const rows = await this.collectManualTaskStats({ userIds: uniqueUserIds, transaction });
+    for (const row of rows) {
+      await workflowPlugin.updateTaskStatsByWorkflow(
+        {
+          userId: row.userId,
+          workflowKey: row.workflowKey,
+          type: import_constants.TASK_TYPE_MANUAL,
+          stats: row
+        },
+        { transaction }
+      );
     }
   }
   onTaskSave = async (task, { transaction }) => {
-    const workflowPlugin = this.app.pm.get(import_plugin_workflow.default);
-    const ModelClass = task.constructor;
-    const pending = await ModelClass.count({
-      where: {
-        userId: task.userId,
-        status: import_constants.TASK_STATUS.PENDING
-      },
-      include: [
-        {
-          association: "execution",
-          attributes: [],
-          where: {
-            status: import_plugin_workflow.EXECUTION_STATUS.STARTED
-          },
-          required: true
-        }
-      ],
-      col: "id",
-      distinct: true,
-      transaction
-    });
-    const all = await ModelClass.count({
-      where: {
-        userId: task.userId
-      },
-      col: "id",
-      transaction
-    });
-    await workflowPlugin.updateTasksStats(task.userId, import_constants.TASK_TYPE_MANUAL, { pending, all }, { transaction });
+    const userId = task.get("userId");
+    const workflowId = task.get("workflowId");
+    if (!userId || !workflowId) {
+      return;
+    }
+    const workflowKey = await this.getWorkflowKeyById(workflowId, transaction);
+    if (!workflowKey) {
+      return;
+    }
+    await this.updateManualWorkflowTaskStats(userId, workflowKey, transaction);
   };
   onExecutionStatusChange = async (execution, { transaction }) => {
     if (!execution.status) {
@@ -167,105 +240,15 @@ class Plugin_default extends import_server.Plugin {
     await this.updateManualTaskStats(userIds, transaction);
   };
   onWorkflowStatusChange = async (workflow, { transaction }) => {
-    const workflowPlugin = this.app.pm.get(import_plugin_workflow.default);
     const WorkflowManualTaskModel = this.db.getModel("workflowManualTasks");
-    const enalbedSet = new Set(workflowPlugin.enabledCache.keys());
-    let pendingCounts = [];
-    let allCounts = [];
-    const userStatsMap = /* @__PURE__ */ new Map();
-    if (workflow.enabled) {
-      enalbedSet.add(workflow.id);
-      const workflowId = [...enalbedSet];
-      pendingCounts = await WorkflowManualTaskModel.count({
-        where: {
-          status: import_constants.TASK_STATUS.PENDING,
-          workflowId
-        },
-        include: [
-          {
-            association: "execution",
-            attributes: [],
-            where: {
-              status: import_plugin_workflow.EXECUTION_STATUS.STARTED
-            },
-            required: true
-          }
-        ],
-        col: "id",
-        group: ["userId"],
-        transaction
-      });
-      allCounts = await WorkflowManualTaskModel.count({
-        where: {
-          workflowId
-        },
-        col: "id",
-        group: ["userId"],
-        transaction
-      });
-    } else {
-      enalbedSet.delete(workflow.id);
-      const workflowId = [...enalbedSet];
-      const tasksByUser = await WorkflowManualTaskModel.count({
-        col: "userId",
-        where: {
-          status: import_constants.TASK_STATUS.PENDING,
-          workflowId: workflow.id
-        },
-        distinct: true,
-        group: ["userId"],
-        transaction
-      });
-      const userId = [];
-      for (const item of tasksByUser) {
-        userId.push(item.userId);
-        userStatsMap.set(item.userId, { pending: 0, all: 0 });
-      }
-      pendingCounts = await WorkflowManualTaskModel.count({
-        where: {
-          status: import_constants.TASK_STATUS.PENDING,
-          userId,
-          workflowId
-        },
-        include: [
-          {
-            association: "execution",
-            attributes: [],
-            where: {
-              status: import_plugin_workflow.EXECUTION_STATUS.STARTED
-            },
-            required: true
-          }
-        ],
-        col: "id",
-        group: ["userId"],
-        transaction
-      });
-      allCounts = await WorkflowManualTaskModel.count({
-        where: {
-          userId,
-          workflowId
-        },
-        col: "id",
-        group: ["userId"],
-        transaction
-      });
-    }
-    for (const row of pendingCounts) {
-      if (!userStatsMap.get(row.userId)) {
-        userStatsMap.set(row.userId, { pending: 0, all: 0 });
-      }
-      userStatsMap.set(row.userId, { ...userStatsMap.get(row.userId), pending: Number(row.count) || 0 });
-    }
-    for (const row of allCounts) {
-      if (!userStatsMap.get(row.userId)) {
-        userStatsMap.set(row.userId, { pending: 0, all: 0 });
-      }
-      userStatsMap.set(row.userId, { ...userStatsMap.get(row.userId), all: Number(row.count) || 0 });
-    }
-    for (const [userId, stats] of userStatsMap.entries()) {
-      await workflowPlugin.updateTasksStats(userId, import_constants.TASK_TYPE_MANUAL, stats, { transaction });
-    }
+    const rows = await WorkflowManualTaskModel.findAll({
+      attributes: ["userId"],
+      where: {
+        workflowId: workflow.id
+      },
+      transaction
+    });
+    await this.updateManualTaskStats(rows.map((row) => row.get("userId")).filter(Boolean), transaction);
   };
   async load() {
     this.app.resourceManager.define({
@@ -275,7 +258,11 @@ class Plugin_default extends import_server.Plugin {
     this.app.acl.allow("workflowManualTasks", ["listMine", "get", "submit"], "loggedIn");
     const workflowPlugin = this.app.pm.get(import_plugin_workflow.default);
     workflowPlugin.registerInstruction("manual", import_ManualInstruction.default);
-    this.db.on("workflowManualTasks.afterSave", this.onTaskSave);
+    workflowPlugin.registerTaskStatsProvider(import_constants.TASK_TYPE_MANUAL, {
+      collectTaskStats: (options) => this.collectManualTaskStats(options)
+    });
+    this.db.on("workflowManualTasks.afterCreateWithAssociations", this.onTaskSave);
+    this.db.on("workflowManualTasks.afterUpdate", this.onTaskSave);
     this.db.on("workflowManualTasks.afterDestroy", this.onTaskSave);
     this.db.on("executions.afterUpdate", this.onExecutionStatusChange);
   }