@nocobase/plugin-workflow-manual 2.1.30 → 2.1.32

package/dist/externalVersion.js

@@ -8,7 +8,7 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.1.30",
+  "@nocobase/client": "2.1.32",
   "react": "18.2.0",
   "react-router-dom": "6.30.1",
   "@formily/react": "2.3.7",
@@ -19,14 +19,14 @@ module.exports = {
   "dayjs": "1.11.13",
   "react-i18next": "11.18.6",
   "lodash": "4.18.1",
-  "@nocobase/plugin-workflow": "2.1.30",
-  "@nocobase/plugin-mobile": "2.1.30",
-  "@nocobase/utils": "2.1.30",
-  "@nocobase/server": "2.1.30",
-  "@nocobase/database": "2.1.30",
-  "@nocobase/actions": "2.1.30",
-  "@nocobase/test": "2.1.30",
-  "@nocobase/plugin-workflow-test": "2.1.30",
+  "@nocobase/plugin-workflow": "2.1.32",
+  "@nocobase/plugin-mobile": "2.1.32",
+  "@nocobase/utils": "2.1.32",
+  "@nocobase/server": "2.1.32",
+  "@nocobase/database": "2.1.32",
+  "@nocobase/actions": "2.1.32",
+  "@nocobase/test": "2.1.32",
+  "@nocobase/plugin-workflow-test": "2.1.32",
   "@formily/core": "2.3.7",
   "sequelize": "6.35.2"
 };

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-24T00:54:03.848Z"}
+{"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-29T05:59:41.638Z"}

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/actions.js

@@ -41,7 +41,62 @@ __export(actions_exports, {
 });
 module.exports = __toCommonJS(actions_exports);
 var import_actions = __toESM(require("@nocobase/actions"));
+var import_database = require("@nocobase/database");
 var import_plugin_workflow = __toESM(require("@nocobase/plugin-workflow"));
+function getSubmittedRatio(tasks) {
+  if (!tasks.length) {
+    return 0;
+  }
+  const submitted = tasks.reduce((count, item) => item.status !== import_plugin_workflow.JOB_STATUS.PENDING ? count + 1 : count, 0);
+  return submitted / tasks.length;
+}
+function getSingleModeStatus(distribution) {
+  var _a;
+  return ((_a = distribution.find((item) => item.status !== import_plugin_workflow.JOB_STATUS.PENDING && item.count > 0)) == null ? void 0 : _a.status) ?? null;
+}
+function getAllModeStatus(distribution, assignees) {
+  const resolved = distribution.find((item) => item.status === import_plugin_workflow.JOB_STATUS.RESOLVED);
+  if ((resolved == null ? void 0 : resolved.count) === assignees.length) {
+    return import_plugin_workflow.JOB_STATUS.RESOLVED;
+  }
+  const rejected = distribution.find((item) => item.status < import_plugin_workflow.JOB_STATUS.PENDING);
+  return (rejected == null ? void 0 : rejected.count) ? rejected.status : null;
+}
+function getAnyModeStatus(distribution, assignees) {
+  const resolved = distribution.find((item) => item.status === import_plugin_workflow.JOB_STATUS.RESOLVED);
+  if (resolved == null ? void 0 : 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
+  );
+  return rejectedCount === assignees.length ? import_plugin_workflow.JOB_STATUS.REJECTED : null;
+}
+async function updateJobByManualTasks(job, node, database, latestTask, transaction) {
+  const mode = node.config.mode ?? 0;
+  const tasks = await database.getModel("workflowManualTasks").findAll({
+    where: {
+      jobId: job.id
+    },
+    transaction
+  });
+  const assignees = [];
+  const distributionMap = /* @__PURE__ */ new Map();
+  for (const task of tasks) {
+    distributionMap.set(task.status, (distributionMap.get(task.status) ?? 0) + 1);
+    assignees.push(task.userId);
+  }
+  const distribution = Array.from(distributionMap.entries()).map(([status2, count]) => ({ status: status2, count }));
+  const status = mode === 1 ? getAllModeStatus(distribution, assignees) : mode === -1 ? getAnyModeStatus(distribution, assignees) : getSingleModeStatus(distribution);
+  await job.update(
+    {
+      status: status ?? import_plugin_workflow.JOB_STATUS.PENDING,
+      result: mode ? getSubmittedRatio(tasks) : latestTask.result ?? job.result
+    },
+    { transaction }
+  );
+}
 async function submit(context, next) {
   var _a, _b, _c;
   const repository = import_actions.utils.getRepositoryFromParams(context);
@@ -78,48 +133,99 @@ async function submit(context, next) {
     return context.throw(400);
   }
   task.execution.workflow = task.workflow;
-  const processor = plugin.createProcessor(task.execution);
-  await processor.prepare();
-  const assignees = processor.getParsedValue(task.node.config.assignees ?? [], task.nodeId).flat().filter(Boolean);
-  if (!assignees.includes(currentUser.id) || task.userId !== currentUser.id) {
-    return context.throw(403);
-  }
-  const presetValues = processor.getParsedValue(actionItem.values ?? {}, task.nodeId, {
-    additionalScope: {
-      // @deprecated
-      currentUser,
-      // @deprecated
-      currentRecord: values.result[formKey],
-      // @deprecated
-      currentTime: /* @__PURE__ */ new Date(),
-      $user: currentUser,
-      $nForm: values.result[formKey],
-      $nDate: {
-        now: /* @__PURE__ */ new Date()
+  const formConfig = forms[formKey];
+  const handler = instruction.formTypes.get(formConfig.type);
+  const usesMainDataSource = (formConfig.dataSource ?? "main") === "main";
+  const transactionOptions = context.db.sequelize.getDialect() === "sqlite" ? { type: import_database.Transaction.TYPES.IMMEDIATE } : {};
+  const validateTask = () => {
+    if (task.status !== import_plugin_workflow.JOB_STATUS.PENDING || task.job.status !== import_plugin_workflow.JOB_STATUS.PENDING || task.execution.status !== import_plugin_workflow.EXECUTION_STATUS.STARTED) {
+      return context.throw(400);
+    }
+  };
+  const getPresetValues = (processor) => {
+    const assignees = processor.getParsedValue(task.node.config.assignees ?? [], task.nodeId).flat().filter(Boolean);
+    if (!assignees.includes(currentUser.id) || task.userId !== currentUser.id) {
+      return context.throw(403);
+    }
+    return processor.getParsedValue(actionItem.values ?? {}, task.nodeId, {
+      additionalScope: {
+        // @deprecated
+        currentUser,
+        // @deprecated
+        currentRecord: values.result[formKey],
+        // @deprecated
+        currentTime: /* @__PURE__ */ new Date(),
+        $user: currentUser,
+        $nForm: values.result[formKey],
+        $nDate: {
+          now: /* @__PURE__ */ new Date()
+        }
       }
+    });
+  };
+  const setTaskResult = (presetValues) => {
+    task.set({
+      status: actionItem.status,
+      result: actionItem.status ? { [formKey]: { ...values.result[formKey], ...presetValues }, _: actionKey } : { ...task.result ?? {}, ...values.result }
+    });
+    task.changed("result", true);
+  };
+  const handleFormSubmission = async (transaction) => {
+    const processor = plugin.createProcessor(task.execution, { transaction });
+    await processor.prepare();
+    const presetValues = getPresetValues(processor);
+    setTaskResult(presetValues);
+    if (handler && task.status) {
+      const { actions: actions2, ...formOptions } = formConfig;
+      const parsedFormConfig = {
+        ...processor.getParsedValue(formOptions, task.nodeId),
+        actions: actions2
+      };
+      await handler.call(instruction, task, parsedFormConfig, transaction);
     }
-  });
-  task.set({
-    status: actionItem.status,
-    result: actionItem.status ? { [formKey]: { ...values.result[formKey], ...presetValues }, _: actionKey } : { ...task.result ?? {}, ...values.result }
-  });
-  task.changed("result", true);
-  const handler = instruction.formTypes.get(forms[formKey].type);
-  if (handler && task.status) {
-    await handler.call(instruction, task, forms[formKey], processor);
+    return presetValues;
+  };
+  let shouldResume = false;
+  try {
+    const lock = await context.app.lockManager.tryAcquire((0, import_plugin_workflow.getJobLockKey)(task.job.id));
+    await lock.runExclusive(async () => {
+      let presetValues = {};
+      if (!usesMainDataSource) {
+        await Promise.all([task.reload(), task.job.reload(), task.execution.reload()]);
+        validateTask();
+        presetValues = await handleFormSubmission();
+      }
+      await context.db.sequelize.transaction(transactionOptions, async (transaction) => {
+        await Promise.all([
+          task.reload({ transaction }),
+          task.job.reload({ transaction }),
+          task.execution.reload({ transaction })
+        ]);
+        validateTask();
+        if (usesMainDataSource) {
+          await handleFormSubmission(transaction);
+        } else {
+          setTaskResult(presetValues);
+        }
+        await task.save({ transaction });
+        await updateJobByManualTasks(task.job, task.node, context.db, task, transaction);
+        shouldResume = task.job.status !== import_plugin_workflow.JOB_STATUS.PENDING;
+      });
+    }, 6e4);
+  } catch (error) {
+    if ((0, import_plugin_workflow.isLockAcquireError)(error)) {
+      return context.throw(409);
+    }
+    throw error;
   }
-  await task.save();
-  await processor.exit();
   context.body = task;
   context.status = 202;
   await next();
-  if (task.execution.status !== import_plugin_workflow.EXECUTION_STATUS.STARTED) {
+  if (!shouldResume) {
     return;
   }
-  task.job.execution = task.execution;
-  task.job.latestTask = task;
-  processor.logger.info(`manual node (${task.nodeId}) action trigger execution (${task.execution.id}) to resume`);
-  plugin.resume(task.job);
+  plugin.getLogger(task.execution.workflowId).info(`manual node (${task.nodeId}) action trigger execution (${task.execution.id}) to resume`);
+  plugin.resume(task.job).catch(() => void 0);
 }
 async function listMine(context, next) {
   context.action.mergeParams({

package/dist/server/forms/create.d.ts

@@ -6,9 +6,9 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import { Processor } from '@nocobase/plugin-workflow';
+import type { Transaction } from '@nocobase/database';
 import ManualInstruction from '../ManualInstruction';
 export default function (this: ManualInstruction, instance: any, { dataSource, collection }: {
     dataSource?: string;
     collection: any;
-}, processor: Processor): Promise<void>;
+}, transaction?: Transaction): Promise<void>;

package/dist/server/forms/create.js

@@ -29,7 +29,7 @@ __export(create_exports, {
   default: () => create_default
 });
 module.exports = __toCommonJS(create_exports);
-async function create_default(instance, { dataSource = "main", collection }, processor) {
+async function create_default(instance, { dataSource = "main", collection }, transaction) {
   const repo = this.workflow.app.dataSourceManager.dataSources.get(dataSource).collectionManager.getRepository(collection);
   if (!repo) {
     throw new Error(`collection ${collection} for create data on manual node not found`);
@@ -43,8 +43,8 @@ async function create_default(instance, { dataSource = "main", collection }, pro
       updatedBy: instance.userId
     },
     context: {
-      executionId: processor.execution.id
+      executionId: instance.executionId
     },
-    transaction: processor.transaction
+    transaction
   });
 }

package/dist/server/forms/index.d.ts

@@ -6,9 +6,9 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import { Processor } from '@nocobase/plugin-workflow';
+import type { Transaction } from '@nocobase/database';
 import ManualInstruction from '../ManualInstruction';
-export type FormHandler = (this: ManualInstruction, instance: any, formConfig: any, processor: Processor) => Promise<void>;
+export type FormHandler = (this: ManualInstruction, instance: any, formConfig: any, transaction?: Transaction) => Promise<void>;
 export default function ({ formTypes }: {
     formTypes: any;
 }): void;

package/dist/server/forms/update.d.ts

@@ -6,10 +6,10 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import { Processor } from '@nocobase/plugin-workflow';
+import type { Transaction } from '@nocobase/database';
 import ManualInstruction from '../ManualInstruction';
 export default function (this: ManualInstruction, instance: any, { dataSource, collection, filter }: {
     dataSource?: string;
     collection: any;
     filter?: {};
-}, processor: Processor): Promise<void>;
+}, transaction?: Transaction): Promise<void>;

package/dist/server/forms/update.js

@@ -29,7 +29,7 @@ __export(update_exports, {
   default: () => update_default
 });
 module.exports = __toCommonJS(update_exports);
-async function update_default(instance, { dataSource = "main", collection, filter = {} }, processor) {
+async function update_default(instance, { dataSource = "main", collection, filter = {} }, transaction) {
   const repo = this.workflow.app.dataSourceManager.dataSources.get(dataSource).collectionManager.getRepository(collection);
   if (!repo) {
     throw new Error(`collection ${collection} for update data on manual node not found`);
@@ -37,14 +37,14 @@ async function update_default(instance, { dataSource = "main", collection, filte
   const { _, ...form } = instance.result;
   const [values] = Object.values(form);
   await repo.update({
-    filter: processor.getParsedValue(filter, instance.nodeId),
+    filter,
     values: {
       ...values ?? {},
       updatedBy: instance.userId
     },
     context: {
-      executionId: processor.execution.id
+      executionId: instance.executionId
     },
-    transaction: processor.transaction
+    transaction
   });
 }

package/package.json

@@ -6,7 +6,7 @@
   "description": "Could be used for workflows which some of decisions are made by users.",
   "description.ru-RU": "Может использоваться в рабочих процессах, где какие-то решения принимаются пользователями.",
   "description.zh-CN": "用于人工控制部分决策的流程。",
-  "version": "2.1.30",
+  "version": "2.1.32",
   "license": "Apache-2.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-manual",
@@ -35,7 +35,7 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "c1a4bff0fd3c8b30e06fc6f50ad33e054b04061a",
+  "gitHead": "737a1324f650d7bc66594203b68eb0180553a551",
   "keywords": [
     "Workflow"
   ]