@nocobase/plugin-workflow-parallel 1.8.14 → 1.8.16

package/dist/externalVersion.js

@@ -11,11 +11,11 @@ module.exports = {
   "react": "18.2.0",
   "antd": "5.24.2",
   "@ant-design/icons": "5.6.1",
-  "@nocobase/client": "1.8.14",
-  "@nocobase/plugin-workflow": "1.8.14",
+  "@nocobase/client": "1.8.16",
+  "@nocobase/plugin-workflow": "1.8.16",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "1.8.14",
-  "@nocobase/plugin-workflow-test": "1.8.14",
-  "@nocobase/test": "1.8.14",
-  "@nocobase/utils": "1.8.14"
+  "@nocobase/server": "1.8.16",
+  "@nocobase/plugin-workflow-test": "1.8.16",
+  "@nocobase/test": "1.8.16",
+  "@nocobase/utils": "1.8.16"
 };

package/dist/server/ParallelInstruction.d.ts

@@ -15,5 +15,5 @@ export declare const PARALLEL_MODE: {
 };
 export default class extends Instruction {
     run(node: FlowNodeModel, prevJob: JobModel, processor: Processor): Promise<void>;
-    resume(node: FlowNodeModel, branchJob: any, processor: Processor): Promise<any>;
+    resume(node: FlowNodeModel, branchJob: any, processor: Processor): Promise<JobModel>;
 }

package/dist/server/ParallelInstruction.js

@@ -120,7 +120,8 @@ class ParallelInstruction_default extends import_plugin_workflow.Instruction {
     const job = processor.findBranchParentJob(branchJob, node);
     const { result, status } = job;
     if (status !== import_plugin_workflow.JOB_STATUS.PENDING) {
-      return processor.exit();
+      processor.logger.warn(`parallel (${job.nodeId}) has been done, ignore newly resumed event`);
+      return null;
     }
     const jobNode = processor.nodesMap.get(branchJob.nodeId);
     const branchStartNode = processor.findBranchStartNode(jobNode, node);
@@ -133,8 +134,8 @@ class ParallelInstruction_default extends import_plugin_workflow.Instruction {
       status: Modes[mode].getStatus(newResult)
     });
     if (job.status === import_plugin_workflow.JOB_STATUS.PENDING) {
-      await job.save({ transaction: processor.transaction });
-      return processor.exit();
+      processor.saveJob(job);
+      return null;
     }
     return job;
   }

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：并行分支节点",
   "description": "Could be used for parallel execution of branch processes in the workflow.",
   "description.zh-CN": "用于在工作流中需要并行执行的分支流程。",
-  "version": "1.8.14",
+  "version": "1.8.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-parallel",
@@ -22,7 +22,7 @@
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x"
   },
-  "gitHead": "16a9193a22b9a5c5ebb588727153583da8edb92e",
+  "gitHead": "3fc4fcf3f7205dece49356a4f1442c6707d509a1",
   "keywords": [
     "Workflow"
   ]