@nocobase/plugin-workflow-loop 1.9.0-beta.8 → 2.0.0-alpha.2

package/dist/externalVersion.js

@@ -12,10 +12,10 @@ module.exports = {
   "@ant-design/icons": "5.6.1",
   "antd": "5.24.2",
   "@formily/antd-v5": "1.2.3",
-  "@formily/react": "2.3.0",
-  "@nocobase/client": "1.9.0-beta.8",
-  "@nocobase/plugin-workflow": "1.9.0-beta.8",
+  "@formily/react": "2.3.7",
+  "@nocobase/client": "2.0.0-alpha.2",
+  "@nocobase/plugin-workflow": "2.0.0-alpha.2",
   "react-i18next": "11.18.6",
-  "@nocobase/evaluators": "1.9.0-beta.8",
-  "@nocobase/server": "1.9.0-beta.8"
+  "@nocobase/evaluators": "2.0.0-alpha.2",
+  "@nocobase/server": "2.0.0-alpha.2"
 };

package/dist/server/LoopInstruction.d.ts

@@ -22,6 +22,7 @@ export default class extends Instruction {
         status: 1;
         result: {
             looped: number;
+            done: number;
         };
     }>;
     resume(node: FlowNodeModel, branchJob: any, processor: Processor): Promise<JobModel>;

package/dist/server/LoopInstruction.js

@@ -65,16 +65,16 @@ class LoopInstruction_default extends import_plugin_workflow.Instruction {
     const [branch] = processor.getBranches(node);
     const target = processor.getParsedValue(node.config.target, node.id);
     const length = getTargetLength(target);
-    const looped = 0;
+    const result = { looped: 0, done: 0 };
     if (!branch || !length) {
       return {
         status: import_plugin_workflow.JOB_STATUS.RESOLVED,
-        result: { looped }
+        result
       };
     }
     const job = processor.saveJob({
       status: import_plugin_workflow.JOB_STATUS.PENDING,
-      result: { looped },
+      result,
       nodeId: node.id,
       nodeKey: node.key,
       upstreamId: (prevJob == null ? void 0 : prevJob.id) ?? null
@@ -82,18 +82,29 @@ class LoopInstruction_default extends import_plugin_workflow.Instruction {
     if (node.config.condition) {
       const { checkpoint, calculation, expression, continueOnFalse } = node.config.condition ?? {};
       if ((calculation || expression) && !checkpoint) {
-        const condition = calculateCondition(node, processor);
-        if (!condition) {
+        while (result.looped < length) {
+          const condition = calculateCondition(node, processor);
+          if (condition) {
+            break;
+          }
+          result.looped += 1;
+          job.set("result", result);
           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;
+            continue;
           }
+          job.set({
+            status: import_plugin_workflow.JOB_STATUS.RESOLVED,
+            result: { ...result, broken: true }
+          });
+          return job;
+        }
+        if (result.looped >= length) {
+          job.set({
+            status: import_plugin_workflow.JOB_STATUS.RESOLVED,
+            result
+          });
+          return job;
         }
       }
     }
@@ -111,26 +122,37 @@ class LoopInstruction_default extends import_plugin_workflow.Instruction {
     if (branchJob.id !== job.id && branchJob.status === import_plugin_workflow.JOB_STATUS.PENDING) {
       return null;
     }
-    const nextIndex = result.looped + 1;
+    result.looped += 1;
     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 } });
-      processor.saveJob(job);
+      result.done += 1;
       const length = getTargetLength(target);
-      if (nextIndex < length) {
-        if (loop.config.condition) {
-          const { calculation, expression, continueOnFalse } = loop.config.condition ?? {};
-          if (calculation || expression) {
+      if (loop.config.condition) {
+        const { calculation, expression, continueOnFalse } = loop.config.condition ?? {};
+        if (calculation || expression) {
+          while (result.looped < length) {
             const condition = calculateCondition(loop, processor);
-            if (!condition && !continueOnFalse) {
+            if (condition) {
+              processor.logger.debug(`loop condition matched, continue inner branch (looped: ${result.looped})`);
+              break;
+            }
+            if (!continueOnFalse) {
+              processor.logger.debug(`loop condition not matches, break (looped: ${result.looped})`);
               job.set({
                 status: import_plugin_workflow.JOB_STATUS.RESOLVED,
-                result: { looped: nextIndex, broken: true }
+                result: { ...result, broken: true }
               });
               return job;
             }
+            result.looped += 1;
+            processor.logger.debug(`loop condition not matches, try next loop item (looped: ${result.looped})`);
           }
         }
+      }
+      job.set({ result });
+      job.changed("result", true);
+      processor.saveJob(job);
+      if (result.looped < length) {
         await processor.run(branch, job);
         return;
       } else {
@@ -141,7 +163,7 @@ class LoopInstruction_default extends import_plugin_workflow.Instruction {
     } else {
       job.set(
         loop.config.exit ? {
-          result: { looped: result.looped, broken: true },
+          result: { ...result, broken: true },
           status: import_plugin_workflow.JOB_STATUS.RESOLVED
         } : {
           status: branchJob.status

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.9.0-beta.8",
+  "version": "2.0.0-alpha.2",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-loop",
@@ -15,14 +15,14 @@
     "react-i18next": "^11.15.1"
   },
   "peerDependencies": {
-    "@nocobase/client": "1.x",
-    "@nocobase/database": "1.x",
-    "@nocobase/evaluators": "1.x",
+    "@nocobase/client": "2.x",
+    "@nocobase/database": "2.x",
+    "@nocobase/evaluators": "2.x",
     "@nocobase/plugin-workflow": ">=0.17.0-alpha.3",
-    "@nocobase/server": "1.x",
-    "@nocobase/test": "1.x"
+    "@nocobase/server": "2.x",
+    "@nocobase/test": "2.x"
   },
-  "gitHead": "f3d4f3d1ba7adbf4d4c60e656c23da45565769c8",
+  "gitHead": "1322f486b248bef53ed8c8f42f0a39dfd02125fd",
   "keywords": [
     "Workflow"
   ]