@nocobase/plugin-workflow-loop 1.6.0-beta.8 → 1.6.0-beta.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -13,9 +13,9 @@ module.exports = {
13
13
  "antd": "5.12.8",
14
14
  "@formily/antd-v5": "1.1.9",
15
15
  "@formily/react": "2.3.0",
16
- "@nocobase/client": "1.6.0-beta.8",
17
- "@nocobase/plugin-workflow": "1.6.0-beta.8",
16
+ "@nocobase/client": "1.6.0-beta.9",
17
+ "@nocobase/plugin-workflow": "1.6.0-beta.9",
18
18
  "react-i18next": "11.18.6",
19
- "@nocobase/evaluators": "1.6.0-beta.8",
20
- "@nocobase/server": "1.6.0-beta.8"
19
+ "@nocobase/evaluators": "1.6.0-beta.9",
20
+ "@nocobase/server": "1.6.0-beta.9"
21
21
  };
@@ -101,7 +101,11 @@ class LoopInstruction_default extends import_plugin_workflow.Instruction {
101
101
  const [branch] = processor.getBranches(node);
102
102
  const { result, status } = job;
103
103
  if (status !== import_plugin_workflow.JOB_STATUS.PENDING) {
104
- return processor.exit();
104
+ processor.logger.warn(`loop (${job.nodeId}) has been done, ignore newly resumed event`);
105
+ return null;
106
+ }
107
+ if (branchJob.id !== job.id && branchJob.status === import_plugin_workflow.JOB_STATUS.PENDING) {
108
+ return null;
105
109
  }
106
110
  const nextIndex = result.looped + 1;
107
111
  const target = processor.getParsedValue(loop.config.target, node.id);
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "displayName.zh-CN": "工作流:循环节点",
5
5
  "description": "Used to repeat the sub-process processing of each value in an array, and can also be used for fixed times of sub-process processing.",
6
6
  "description.zh-CN": "用于对一个数组中的每个值进行重复的子流程处理,也可用于固定次数的重复子流程处理。",
7
- "version": "1.6.0-beta.8",
7
+ "version": "1.6.0-beta.9",
8
8
  "license": "AGPL-3.0",
9
9
  "main": "./dist/server/index.js",
10
10
  "homepage": "https://docs.nocobase.com/handbook/workflow-loop",
@@ -22,7 +22,7 @@
22
22
  "@nocobase/server": "1.x",
23
23
  "@nocobase/test": "1.x"
24
24
  },
25
- "gitHead": "2257b50e1cf0b2a2873673a630e5ecc80ec2e01a",
25
+ "gitHead": "eb1ff948fcf7a51175626a1a56a8b8d9b90be006",
26
26
  "keywords": [
27
27
  "Workflow"
28
28
  ]