@nocobase/plugin-workflow-loop 1.8.0-alpha.7 → 1.8.0-alpha.8

package/dist/externalVersion.js

@@ -13,9 +13,9 @@ module.exports = {
   "antd": "5.24.2",
   "@formily/antd-v5": "1.2.3",
   "@formily/react": "2.3.0",
-  "@nocobase/client": "1.8.0-alpha.7",
-  "@nocobase/plugin-workflow": "1.8.0-alpha.7",
+  "@nocobase/client": "1.8.0-alpha.8",
+  "@nocobase/plugin-workflow": "1.8.0-alpha.8",
   "react-i18next": "11.18.6",
-  "@nocobase/evaluators": "1.8.0-alpha.7",
-  "@nocobase/server": "1.8.0-alpha.7"
+  "@nocobase/evaluators": "1.8.0-alpha.8",
+  "@nocobase/server": "1.8.0-alpha.8"
 };

package/dist/server/LoopInstruction.d.ts

@@ -24,7 +24,7 @@ export default class extends Instruction {
             looped: number;
         };
     }>;
-    resume(node: FlowNodeModel, branchJob: any, processor: Processor): Promise<any>;
+    resume(node: FlowNodeModel, branchJob: any, processor: Processor): Promise<JobModel>;
     getScope(node: any, { looped }: {
         looped: any;
     }, processor: any): {

package/dist/server/LoopInstruction.js

@@ -72,7 +72,7 @@ class LoopInstruction_default extends import_plugin_workflow.Instruction {
         result: { looped }
       };
     }
-    const job = await processor.saveJob({
+    const job = processor.saveJob({
       status: import_plugin_workflow.JOB_STATUS.PENDING,
       result: { looped },
       nodeId: node.id,
@@ -83,12 +83,17 @@ class LoopInstruction_default extends import_plugin_workflow.Instruction {
       const { checkpoint, calculation, expression, continueOnFalse } = node.config.condition ?? {};
       if ((calculation || expression) && !checkpoint) {
         const condition = calculateCondition(node, processor);
-        if (!condition && !continueOnFalse) {
-          job.set({
-            status: import_plugin_workflow.JOB_STATUS.RESOLVED,
-            result: { looped, broken: true }
-          });
-          return job;
+        if (!condition) {
+          if (continueOnFalse) {
+            job.set("result", { looped: 1 });
+            processor.saveJob(job);
+          } else {
+            job.set({
+              status: import_plugin_workflow.JOB_STATUS.RESOLVED,
+              result: { looped, broken: true }
+            });
+            return job;
+          }
         }
       }
     }
@@ -111,7 +116,7 @@ class LoopInstruction_default extends import_plugin_workflow.Instruction {
     const target = processor.getParsedValue(loop.config.target, node.id);
     if (branchJob.status === import_plugin_workflow.JOB_STATUS.RESOLVED || branchJob.status < import_plugin_workflow.JOB_STATUS.PENDING && loop.config.exit === import_constants.EXIT.CONTINUE) {
       job.set({ result: { looped: nextIndex } });
-      await processor.saveJob(job);
+      processor.saveJob(job);
       const length = getTargetLength(target);
       if (nextIndex < length) {
         if (loop.config.condition) {
@@ -128,7 +133,7 @@ class LoopInstruction_default extends import_plugin_workflow.Instruction {
           }
         }
         await processor.run(branch, job);
-        return processor.exit();
+        return null;
       } else {
         job.set({
           status: import_plugin_workflow.JOB_STATUS.RESOLVED

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：循环节点",
   "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.",
   "description.zh-CN": "用于对一个数组中的每个值进行重复的子流程处理，也可用于固定次数的重复子流程处理。",
-  "version": "1.8.0-alpha.7",
+  "version": "1.8.0-alpha.8",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-loop",
@@ -22,7 +22,7 @@
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x"
   },
-  "gitHead": "2e7c115c1012f54a800156f6c2f38cb4c83fc181",
+  "gitHead": "17d36b98700b0c32ebb621781e7fe27a81740c16",
   "keywords": [
     "Workflow"
   ]