@nocobase/plugin-workflow-loop 1.3.44-beta → 1.4.0-alpha.0

package/dist/client/LoopInstruction.d.ts

@@ -7,7 +7,16 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import React from 'react';
-import { VariableOption, WorkflowVariableInput, Instruction } from '@nocobase/plugin-workflow/client';
+import { VariableOption, WorkflowVariableInput, WorkflowVariableTextArea, Instruction, RadioWithTooltip, CalculationConfig } from '@nocobase/plugin-workflow/client';
+declare function LoopCondition({ value, onChange }: {
+    value: any;
+    onChange: any;
+}): React.JSX.Element;
+declare function useScopeVariables(node: any, options: any): VariableOption[];
+declare function LoopVariableTextArea({ variableOptions, ...props }: {
+    [x: string]: any;
+    variableOptions: any;
+}): JSX.Element;
 export default class extends Instruction {
     title: string;
     type: string;
@@ -22,17 +31,69 @@ export default class extends Instruction {
             'x-component': string;
             'x-component-props': {
                 changeOnSelect: boolean;
-                useTypedConstant: string[];
+                nullable: boolean;
+                useTypedConstant: (string | (string | {
+                    step: number;
+                    min: number;
+                    precision: number;
+                })[])[];
                 className: string;
             };
             required: boolean;
+            default: number;
+            'x-reactions': {
+                target: string;
+                effects: string[];
+                fulfill: {
+                    state: {
+                        value: string;
+                    };
+                };
+            }[];
         };
+        condition: {
+            type: string;
+            'x-decorator': string;
+            'x-component': string;
+            'x-reactions': {
+                dependencies: string[];
+                fulfill: {
+                    state: {
+                        visible: string;
+                    };
+                };
+            }[];
+            default: boolean;
+        };
+        exit: {
+            type: string;
+            title: string;
+            'x-decorator': string;
+            'x-component': string;
+            'x-component-props': {
+                direction: string;
+                options: {
+                    label: string;
+                    value: number;
+                }[];
+            };
+            default: number;
+        };
+    };
+    scope: {
+        renderEngineReference: (key: string) => React.JSX.Element;
     };
     components: {
+        LoopCondition: typeof LoopCondition;
         WorkflowVariableInput: typeof WorkflowVariableInput;
+        WorkflowVariableTextArea: typeof WorkflowVariableTextArea;
+        LoopVariableTextArea: typeof LoopVariableTextArea;
+        RadioWithTooltip: typeof RadioWithTooltip;
+        CalculationConfig: typeof CalculationConfig;
     };
     Component({ data }: {
         data: any;
     }): React.JSX.Element;
-    useScopeVariables(node: any, options: any): VariableOption[];
+    useScopeVariables: typeof useScopeVariables;
 }
+export {};

package/dist/client/index.js

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-(function(n,e){typeof exports=="object"&&typeof module!="undefined"?e(exports,require("@nocobase/client"),require("react/jsx-runtime"),require("@ant-design/icons"),require("@nocobase/plugin-workflow/client"),require("react-i18next")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client","react/jsx-runtime","@ant-design/icons","@nocobase/plugin-workflow/client","react-i18next"],e):(n=typeof globalThis!="undefined"?globalThis:n||self,e(n["@nocobase/plugin-workflow-loop"]={},n["@nocobase/client"],n.jsxRuntime,n["@ant-design/icons"],n["@nocobase/plugin-workflow"],n["react-i18next"]))})(this,function(n,e,o,v,t,k){"use strict";var V=Object.defineProperty,W=Object.defineProperties;var P=Object.getOwnPropertyDescriptors;var O=Object.getOwnPropertySymbols;var F=Object.prototype.hasOwnProperty,M=Object.prototype.propertyIsEnumerable;var I=(n,e,o)=>e in n?V(n,e,{enumerable:!0,configurable:!0,writable:!0,value:o}):n[e]=o,N=(n,e)=>{for(var o in e||(e={}))F.call(e,o)&&I(n,o,e[o]);if(O)for(var o of O(e))M.call(e,o)&&I(n,o,e[o]);return n},T=(n,e)=>W(n,P(e));var h=(n,e,o)=>(I(n,typeof e!="symbol"?e+"":e,o),o);var y=(n,e,o)=>new Promise((v,t)=>{var k=i=>{try{d(o.next(i))}catch(w){t(w)}},u=i=>{try{d(o.throw(i))}catch(w){t(w)}},d=i=>i.done?v(i.value):Promise.resolve(i.value).then(k,u);d((o=o.apply(n,e)).next())});const u="workflow-loop";function d(p,g={}){const{t:r}=i(g);return r(p)}function i(p){return k.useTranslation(u,p)}function w(p,g){let r=p,f=null;for(let a=0;a<g.length;a++){const c=g[a],s=r.find(m=>m.value===c);if(!s)return null;f=s,!s.isLeaf&&s.loadChildren&&s.loadChildren(s),s.children&&(r=s.children)}return f}class j extends t.Instruction{constructor(){super(...arguments);h(this,"title",`{{t("Loop", { ns: "${u}" })}}`);h(this,"type","loop");h(this,"group","control");h(this,"description",`{{t("By using a loop node, you can perform the same operation on multiple sets of data. The source of these sets can be either multiple records from a query node or multiple associated records of a single record. Loop node can also be used for iterating a certain number of times or for looping through each character in a string. However, excessive looping may cause performance issues, so use with caution.", { ns: "${u}" })}}`);h(this,"fieldset",{target:{type:"string",title:`{{t("Loop target", { ns: "${u}" })}}`,description:`{{t("A single number will be treated as a loop count, a single string will be treated as an array of characters, and other non-array values will be converted to arrays. The loop node ends when the loop count is reached, or when the array loop is completed. You can also add condition nodes to the loop to terminate it.", { ns: "${u}" })}}`,"x-decorator":"FormItem","x-component":"WorkflowVariableInput","x-component-props":{changeOnSelect:!0,useTypedConstant:["string","number","null"],className:e.css`
+(function(o,n){typeof exports=="object"&&typeof module!="undefined"?n(exports,require("@nocobase/client"),require("react/jsx-runtime"),require("react"),require("@ant-design/icons"),require("antd"),require("@formily/antd-v5"),require("@formily/react"),require("@nocobase/plugin-workflow/client"),require("react-i18next")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client","react/jsx-runtime","react","@ant-design/icons","antd","@formily/antd-v5","@formily/react","@nocobase/plugin-workflow/client","react-i18next"],n):(o=typeof globalThis!="undefined"?globalThis:o||self,n(o["@nocobase/plugin-workflow-loop"]={},o["@nocobase/client"],o.jsxRuntime,o.react,o["@ant-design/icons"],o.antd,o["@formily/antd-v5"],o["@formily/react"],o["@nocobase/plugin-workflow"],o["react-i18next"]))})(this,function(o,n,e,d,v,L,y,C,a,w){"use strict";var U=Object.defineProperty,Y=Object.defineProperties;var z=Object.getOwnPropertyDescriptors;var F=Object.getOwnPropertySymbols;var A=Object.prototype.hasOwnProperty,B=Object.prototype.propertyIsEnumerable;var q=(o,n,e)=>n in o?U(o,n,{enumerable:!0,configurable:!0,writable:!0,value:e}):o[n]=e,g=(o,n)=>{for(var e in n||(n={}))A.call(n,e)&&q(o,e,n[e]);if(F)for(var e of F(n))B.call(n,e)&&q(o,e,n[e]);return o},m=(o,n)=>Y(o,z(n));var S=(o,n)=>{var e={};for(var d in o)A.call(o,d)&&n.indexOf(d)<0&&(e[d]=o[d]);if(o!=null&&F)for(var d of F(o))n.indexOf(d)<0&&B.call(o,d)&&(e[d]=o[d]);return e};var b=(o,n,e)=>(q(o,typeof n!="symbol"?n+"":n,e),e);var O=(o,n,e)=>new Promise((d,v)=>{var L=a=>{try{C(e.next(a))}catch(w){v(w)}},y=a=>{try{C(e.throw(a))}catch(w){v(w)}},C=a=>a.done?d(a.value):Promise.resolve(a.value).then(L,y);C((e=e.apply(o,n)).next())});const c="workflow-loop";function T(s,l={}){const{t:r}=E(l);return r(s)}function E(s){return w.useTranslation(c,s)}function $(s,l){let r=s,f=null;for(let i=0;i<l.length;i++){const h=l[i],t=r.find(u=>u.value===h);if(!t)return null;f=t,!t.isLeaf&&t.loadChildren&&t.loadChildren(t),t.children&&(r=t.children)}return f}function j({value:s,onChange:l}){const{t:r}=w.useTranslation(),f=d.useCallback(t=>{l(m(g({},s),{checkpoint:t.target.value}))},[s,l]),i=d.useCallback(t=>{l(m(g({},s),{continueOnFalse:t.target.value}))},[s,l]),h=d.useCallback(t=>{l(m(g({},s),{calculation:t}))},[s,l]);return e.jsxs(e.Fragment,{children:[e.jsx(L.Checkbox,{checked:!!s,onChange:t=>{l(t.target.checked?{checkpoint:0,continueOnFalse:!1,calculation:{group:{type:"and",calculations:[]}}}:!1)},children:r("Enable loop condition",{ns:c})}),s?e.jsx(L.Card,{children:e.jsxs(y.FormLayout,{layout:"vertical",children:[e.jsx(y.FormItem,{label:r("Condition",{ns:c}),children:e.jsx(a.CalculationConfig,{value:s.calculation,onChange:h,useVariableHook:V})}),e.jsx(y.FormItem,{label:r("When to check",{ns:c}),children:e.jsx(a.RadioWithTooltip,{value:s.checkpoint,onChange:f,options:[{label:r("Before each starts",{ns:c}),value:0},{label:r("After each ends",{ns:c}),value:1}]})}),e.jsx(y.FormItem,{label:r("When condition is not met on item",{ns:c}),children:e.jsx(a.RadioWithTooltip,{value:s.continueOnFalse,onChange:i,options:[{label:r("Exit loop",{ns:c}),value:!1},{label:r("Continue on next item",{ns:c}),value:!0}]})})]})}):null]})}function N(s,l){const r=n.useCompile(),f=T("Loop target"),i=T("Loop index (starts from 0)"),h=T("Loop sequence (starts from 1)"),t=T("Loop length"),{target:u}=s.config;if(u==null)return null;const{fieldNames:p=a.defaultFieldNames,scope:x}=l;let I={key:"item",[p.value]:"item",[p.label]:f};if(typeof u=="string"&&u.startsWith("{{")&&u.endsWith("}}")){const _=u.slice(2,-2).split(".").map(k=>k.trim()),D=x!=null?x:[a.scopeOptions,a.nodesOptions,a.triggerOptions].map(k=>{const W=k.useOptions(m(g({},l),{current:s})).filter(Boolean);return{[p.label]:r(k.label),[p.value]:k.value,key:k.value,[p.children]:W,disabled:W&&!W.length}}),K=$(D,_);I=Object.assign({},K,I)}return[I,{key:"index",[p.value]:"index",[p.label]:i},{key:"sequence",[p.value]:"sequence",[p.label]:h},{key:"length",[p.value]:"length",[p.label]:t}]}function V(s={}){var p;const{values:l}=C.useForm(),r=a.useNodeContext(),f=m(g({},r),{config:m(g({},r.config),{target:l.target})}),i=a.useWorkflowVariableOptions(s),h=N(f,m(g({},s),{scope:i.filter(x=>["$scopes","$jobsMapByNodeKey","$context"].includes(x.key))})),{fieldNames:t=a.defaultFieldNames}=s;if(!h)return i;const u=i.find(x=>x[t.value]==="$scopes");return u&&(u[t.children]||(u[t.children]=[]),u[t.children].unshift({key:r.key,[t.value]:r.key,[t.label]:(p=r.title)!=null?p:`#${r.id}`,[t.children]:h}),u.disabled=!1),[...i]}function M(r){var f=r,{variableOptions:s}=f,l=S(f,["variableOptions"]);const i=V(s);return e.jsx(n.Variable.TextArea,g({scope:i},l))}class P extends a.Instruction{constructor(){super(...arguments);b(this,"title",`{{t("Loop", { ns: "${c}" })}}`);b(this,"type","loop");b(this,"group","control");b(this,"description",`{{t("By using a loop node, you can perform the same operation on multiple sets of data. The source of these sets can be either multiple records from a query node or multiple associated records of a single record. Loop node can also be used for iterating a certain number of times or for looping through each character in a string. However, excessive looping may cause performance issues, so use with caution.", { ns: "${c}" })}}`);b(this,"fieldset",{target:{type:"string",title:`{{t("Loop target", { ns: "${c}" })}}`,description:`{{t("A single number will be treated as a loop count, a single string will be treated as an array of characters, and other non-array values will be converted to arrays. The loop node ends when the loop count is reached, or when the array loop is completed. You can also add condition nodes to the loop to terminate it.", { ns: "${c}" })}}`,"x-decorator":"FormItem","x-component":"WorkflowVariableInput","x-component-props":{changeOnSelect:!0,nullable:!1,useTypedConstant:["string",["number",{step:1,min:0,precision:0}]],className:n.css`
           width: 100%;
 
           .variable {
@@ -17,6 +17,6 @@
           .ant-input.null-value {
             width: 100%;
           }
-        `},required:!0}});h(this,"components",{WorkflowVariableInput:t.WorkflowVariableInput})}Component({data:r}){var s;const{nodes:f}=t.useFlowContext(),{styles:a}=t.useStyles(),c=f.find(m=>m.upstreamId===r.id&&m.branchIndex!=null);return o.jsx(t.NodeDefaultView,{data:r,children:o.jsx("div",{className:a.nodeSubtreeClass,children:o.jsxs("div",{className:e.cx(a.branchBlockClass,e.css`
+        `},required:!0,default:1,"x-reactions":[{target:"calculation",effects:["onFieldValueChange"],fulfill:{state:{value:null}}},{target:"expression",effects:["onFieldValueChange"],fulfill:{state:{value:""}}}]},condition:{type:"boolean","x-decorator":"FormItem","x-component":"LoopCondition","x-reactions":[{dependencies:["target"],fulfill:{state:{visible:"{{Boolean($deps[0])}}"}}}],default:!1},exit:{type:"number",title:`{{t("When node inside loop failed", { ns: "${c}" })}}`,"x-decorator":"FormItem","x-component":"RadioWithTooltip","x-component-props":{direction:"vertical",options:[{label:`{{t("Exit workflow", { ns: "${c}" })}}`,value:0},{label:`{{t("Exit loop and continue workflow", { ns: "${c}" })}}`,value:1},{label:`{{t("Continue loop on next item", { ns: "${c}" })}}`,value:2}]},default:0}});b(this,"scope",{renderEngineReference:a.renderEngineReference});b(this,"components",{LoopCondition:j,WorkflowVariableInput:a.WorkflowVariableInput,WorkflowVariableTextArea:a.WorkflowVariableTextArea,LoopVariableTextArea:M,RadioWithTooltip:a.RadioWithTooltip,CalculationConfig:a.CalculationConfig});b(this,"useScopeVariables",N)}Component({data:r}){var t;const{nodes:f}=a.useFlowContext(),{styles:i}=a.useStyles(),h=f.find(u=>u.upstreamId===r.id&&u.branchIndex!=null);return e.jsx(a.NodeDefaultView,{data:r,children:e.jsx("div",{className:i.nodeSubtreeClass,children:e.jsxs("div",{className:n.cx(i.branchBlockClass,n.css`
                 padding-left: 20em;
-              `),children:[o.jsx(t.Branch,{from:r,entry:c,branchIndex:(s=c==null?void 0:c.branchIndex)!=null?s:0}),o.jsxs("div",{className:a.branchClass,children:[o.jsx("div",{className:"workflow-branch-lines"}),o.jsx("div",{className:e.cx(a.addButtonClass,a.loopLineClass),children:o.jsx(v.ArrowUpOutlined,{})})]})]})})})}useScopeVariables(r,f){const a=e.useCompile(),c=d("Loop target"),s=d("Loop index"),m=d("Loop length"),{target:x}=r.config;if(!x)return null;const{fieldNames:l=t.defaultFieldNames}=f;let L={key:"item",[l.value]:"item",[l.label]:c};if(typeof x=="string"&&x.startsWith("{{")&&x.endsWith("}}")){const S=x.slice(2,-2).split(".").map(b=>b.trim()),A=[t.scopeOptions,t.nodesOptions,t.triggerOptions].map(b=>{const C=b.useOptions(T(N({},f),{current:r})).filter(Boolean);return{[l.label]:a(b.label),[l.value]:b.value,key:b.value,[l.children]:C,disabled:C&&!C.length}}),B=w(A,S);L=Object.assign({},B,L)}return[L,{key:"index",[l.value]:"index",[l.label]:s},{key:"length",[l.value]:"length",[l.label]:m}]}}class q extends e.Plugin{afterAdd(){return y(this,null,function*(){})}beforeLoad(){return y(this,null,function*(){})}load(){return y(this,null,function*(){this.app.pm.get("workflow").registerInstruction("loop",j)})}}n.default=q,Object.defineProperties(n,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});
+              `),children:[e.jsx(a.Branch,{from:r,entry:h,branchIndex:(t=h==null?void 0:h.branchIndex)!=null?t:0}),e.jsxs("div",{className:i.branchClass,children:[e.jsx("div",{className:"workflow-branch-lines"}),e.jsx("div",{className:n.cx(i.addButtonClass,i.loopLineClass),children:e.jsx(v.ArrowUpOutlined,{})})]})]})})})}}class H extends n.Plugin{afterAdd(){return O(this,null,function*(){})}beforeLoad(){return O(this,null,function*(){})}load(){return O(this,null,function*(){this.app.pm.get("workflow").registerInstruction("loop",P)})}}o.default=H,Object.defineProperties(o,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});

package/dist/constants.d.ts

@@ -0,0 +1,21 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export declare const CHECKPOINT: {
+    BEFORE: number;
+    AFTER: number;
+};
+export declare const CONTINUE_ON_FALSE: {
+    BREAK: boolean;
+    CONTINUE: boolean;
+};
+export declare const EXIT: {
+    CONTINUE: number;
+    BREAK: number;
+    RETURN: number;
+};

package/dist/constants.js

@@ -0,0 +1,52 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var constants_exports = {};
+__export(constants_exports, {
+  CHECKPOINT: () => CHECKPOINT,
+  CONTINUE_ON_FALSE: () => CONTINUE_ON_FALSE,
+  EXIT: () => EXIT
+});
+module.exports = __toCommonJS(constants_exports);
+const CHECKPOINT = {
+  BEFORE: 0,
+  AFTER: 1
+};
+const CONTINUE_ON_FALSE = {
+  BREAK: false,
+  CONTINUE: true
+};
+const EXIT = {
+  CONTINUE: 2,
+  BREAK: 1,
+  RETURN: 0
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  CHECKPOINT,
+  CONTINUE_ON_FALSE,
+  EXIT
+});

package/dist/externalVersion.js

@@ -10,8 +10,12 @@
 module.exports = {
   "react": "18.2.0",
   "@ant-design/icons": "5.2.6",
-  "@nocobase/client": "1.3.44-beta",
-  "@nocobase/plugin-workflow": "1.3.44-beta",
+  "antd": "5.12.8",
+  "@formily/antd-v5": "1.1.9",
+  "@formily/react": "2.3.0",
+  "@nocobase/client": "1.4.0-alpha.0",
+  "@nocobase/plugin-workflow": "1.4.0-alpha.0",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "1.3.44-beta"
+  "@nocobase/evaluators": "1.4.0-alpha.0",
+  "@nocobase/server": "1.4.0-alpha.0"
 };

package/dist/locale/zh-CN.json

@@ -1,8 +1,22 @@
 {
   "Loop": "循环",
   "Loop target": "循环对象",
-  "Loop index": "当前索引",
+  "Loop index (starts from 0)": "当前索引（从 0 开始）",
+  "Loop sequence (starts from 1)": "当前序号（从 1 开始）",
   "Loop length": "循环长度",
   "By using a loop node, you can perform the same operation on multiple sets of data. The source of these sets can be either multiple records from a query node or multiple associated records of a single record. Loop node can also be used for iterating a certain number of times or for looping through each character in a string. However, excessive looping may cause performance issues, so use with caution.": "使用循环节点可以对多条数据进行同样的操作，多条数据的来源可以是查询节点的多条结果，或者一条数据的多条关系数据。也可以用于一定次数的循环，或者对字符串中每一个字符的循环处理。循环次数过高可能引起性能问题，请谨慎使用。",
-  "A single number will be treated as a loop count, a single string will be treated as an array of characters, and other non-array values will be converted to arrays. The loop node ends when the loop count is reached, or when the array loop is completed. You can also add condition nodes to the loop to terminate it.": "单一数字值将被视为循环次数，单一字符串值将被视为字符数组，其他非数组值将被转换为数组。达到循环次数，或者将数组循环完成后，循环节点结束。你也可以在循环中添加条件节点，以终止循环。"
+  "A single number will be treated as a loop count, a single string will be treated as an array of characters, and other non-array values will be converted to arrays. The loop node ends when the loop count is reached, or when the array loop is completed. You can also add condition nodes to the loop to terminate it.": "单一数字值将被视为循环次数，单一字符串值将被视为字符数组，其他非数组值将被转换为数组。达到循环次数，或者将数组循环完成后，循环节点结束。你也可以在循环中添加条件节点，以终止循环。",
+  "Enable loop condition": "启用循环条件",
+  "Loop condition on each item": "循环每一项的条件",
+  "When to check": "检查时机",
+  "Before each starts": "每一轮开始之前",
+  "After each ends": "每一轮完成之后",
+  "When condition is not met on item": "当项不满足条件时",
+  "Exit loop": "退出循环",
+  "Continue on next item": "继续下一项",
+  "Condition": "条件",
+  "When node inside loop failed": "当循环内节点执行失败时",
+  "Continue loop on next item": "继续循环下一项",
+  "Exit loop and continue workflow": "退出循环并继续工作流",
+  "Exit workflow": "退出工作流"
 }

package/dist/server/LoopInstruction.d.ts

@@ -7,15 +7,30 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Processor, Instruction, FlowNodeModel, JobModel } from '@nocobase/plugin-workflow';
+export type LoopInstructionConfig = {
+    target: any;
+    condition?: {
+        checkpoint?: number;
+        continueOnFalse?: boolean;
+        calculation?: any;
+        expression?: string;
+    } | false;
+    exit?: number;
+};
 export default class extends Instruction {
-    run(node: FlowNodeModel, prevJob: JobModel, processor: Processor): Promise<{
+    run(node: FlowNodeModel, prevJob: JobModel, processor: Processor): Promise<JobModel | {
         status: 1;
-        result: number;
+        result: {
+            looped: number;
+        };
     }>;
     resume(node: FlowNodeModel, branchJob: any, processor: Processor): Promise<any>;
-    getScope(node: any, index: any, processor: any): {
+    getScope(node: any, { looped }: {
+        looped: any;
+    }, processor: any): {
         item: any;
         index: any;
+        sequence: any;
         length: number;
     };
 }

package/dist/server/LoopInstruction.js

@@ -7,9 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -23,13 +25,23 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var LoopInstruction_exports = {};
 __export(LoopInstruction_exports, {
   default: () => LoopInstruction_default
 });
 module.exports = __toCommonJS(LoopInstruction_exports);
+var import_evaluators = __toESM(require("@nocobase/evaluators"));
 var import_plugin_workflow = require("@nocobase/plugin-workflow");
+var import_constants = require("../constants");
 function getTargetLength(target) {
   let length = 0;
   if (typeof target === "number") {
@@ -38,30 +50,48 @@ function getTargetLength(target) {
     }
     length = Math.floor(target);
   } else {
-    const targets = (Array.isArray(target) ? target : [target]).filter((t) => t != null);
+    const targets = Array.isArray(target) ? target : [target].filter((t) => t != null);
     length = targets.length;
   }
   return length;
 }
+function calculateCondition(node, processor) {
+  const { engine, calculation, expression } = node.config.condition ?? {};
+  const evaluator = import_evaluators.default.get(engine);
+  return evaluator ? evaluator(expression, processor.getScope(node.id, true)) : (0, import_plugin_workflow.logicCalculate)(processor.getParsedValue(calculation, node.id, { includeSelfScope: true }));
+}
 class LoopInstruction_default extends import_plugin_workflow.Instruction {
   async run(node, prevJob, processor) {
     const [branch] = processor.getBranches(node);
     const target = processor.getParsedValue(node.config.target, node.id);
     const length = getTargetLength(target);
+    const looped = 0;
     if (!branch || !length) {
       return {
         status: import_plugin_workflow.JOB_STATUS.RESOLVED,
-        result: 0
+        result: { looped }
       };
     }
     const job = await processor.saveJob({
       status: import_plugin_workflow.JOB_STATUS.PENDING,
-      // save loop index
-      result: 0,
+      result: { looped },
       nodeId: node.id,
       nodeKey: node.key,
       upstreamId: (prevJob == null ? void 0 : prevJob.id) ?? null
     });
+    if (node.config.condition) {
+      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;
+        }
+      }
+    }
     await processor.run(branch, job);
     return null;
   }
@@ -73,30 +103,56 @@ class LoopInstruction_default extends import_plugin_workflow.Instruction {
     if (status !== import_plugin_workflow.JOB_STATUS.PENDING) {
       return processor.exit();
     }
-    const nextIndex = result + 1;
+    const nextIndex = result.looped + 1;
     const target = processor.getParsedValue(loop.config.target, node.id);
-    if (branchJob.status > import_plugin_workflow.JOB_STATUS.PENDING) {
-      job.set({ result: nextIndex });
+    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);
+      if (loop.config.condition) {
+        const { calculation, expression, continueOnFalse } = loop.config.condition ?? {};
+        if (calculation || expression) {
+          const condition = calculateCondition(loop, processor);
+          if (!condition && !continueOnFalse) {
+            job.set({
+              status: import_plugin_workflow.JOB_STATUS.RESOLVED,
+              result: { looped: nextIndex, broken: true }
+            });
+            return job;
+          }
+        }
+      }
       const length = getTargetLength(target);
       if (nextIndex < length) {
         await processor.saveJob(job);
         await processor.run(branch, job);
-        return null;
+        return processor.exit();
+      } else {
+        job.set({
+          status: import_plugin_workflow.JOB_STATUS.RESOLVED
+        });
       }
+    } else {
+      job.set(
+        loop.config.exit ? {
+          result: { looped: result.looped, broken: true },
+          status: import_plugin_workflow.JOB_STATUS.RESOLVED
+        } : {
+          status: branchJob.status
+        }
+      );
     }
-    job.set({
-      status: branchJob.status
-    });
     return job;
   }
-  getScope(node, index, processor) {
+  getScope(node, { looped }, processor) {
     const target = processor.getParsedValue(node.config.target, node.id);
     const targets = (Array.isArray(target) ? target : [target]).filter((t) => t != null);
     const length = getTargetLength(target);
-    const item = typeof target === "number" ? index : targets[index];
+    const index = looped;
+    const item = typeof target === "number" ? index : targets[looped];
     const result = {
       item,
       index,
+      sequence: index + 1,
       length
     };
     return result;

package/dist/server/migrations/20240929212031-change-loop-result.d.ts

@@ -0,0 +1,20 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+import { Migration } from '@nocobase/server';
+export default class extends Migration {
+    up(): Promise<void>;
+}

package/dist/server/migrations/20240929212031-change-loop-result.js

@@ -0,0 +1,55 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var change_loop_result_exports = {};
+__export(change_loop_result_exports, {
+  default: () => change_loop_result_default
+});
+module.exports = __toCommonJS(change_loop_result_exports);
+var import_server = require("@nocobase/server");
+class change_loop_result_default extends import_server.Migration {
+  async up() {
+    const { db, app } = this.context;
+    const JobRepo = db.getRepository("jobs");
+    await db.sequelize.transaction(async (transaction) => {
+      const records = await JobRepo.find({
+        filter: {
+          node: {
+            type: "loop"
+          }
+        },
+        transaction
+      });
+      app.logger.debug(`${records.length} records need to be migrated.`);
+      for (const record of records) {
+        const { result } = record;
+        if (typeof result === "number") {
+          await record.update({ result: { looped: result } }, { transaction });
+        }
+      }
+    });
+  }
+}

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.3.44-beta",
+  "version": "1.4.0-alpha.0",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-loop",
@@ -17,11 +17,12 @@
   "peerDependencies": {
     "@nocobase/client": "1.x",
     "@nocobase/database": "1.x",
+    "@nocobase/evaluators": "1.x",
     "@nocobase/plugin-workflow": ">=0.17.0-alpha.3",
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x"
   },
-  "gitHead": "1d5666123ac1e2997e434e38defef963ba0d9f90",
+  "gitHead": "8ffa7b54bbaf720c0c9857da4b19a99110dffc4b",
   "keywords": [
     "Workflow"
   ]