@nocobase/plugin-workflow 1.9.0-beta.5 → 1.9.0-beta.7

package/dist/client/schemas/executions.d.ts

@@ -45,6 +45,7 @@ export declare const executionSchema: {
                         foreignKey?: undefined;
                         unique?: undefined;
                         onDelete?: undefined;
+                        defaultValue?: undefined;
                     } | {
                         type: string;
                         name: string;
@@ -69,6 +70,7 @@ export declare const executionSchema: {
                         autoIncrement?: undefined;
                         unique?: undefined;
                         onDelete?: undefined;
+                        defaultValue?: undefined;
                     } | {
                         type: string;
                         name: string;
@@ -80,6 +82,7 @@ export declare const executionSchema: {
                         foreignKey?: undefined;
                         unique?: undefined;
                         onDelete?: undefined;
+                        defaultValue?: undefined;
                     } | {
                         type: string;
                         name: string;
@@ -91,6 +94,7 @@ export declare const executionSchema: {
                         target?: undefined;
                         foreignKey?: undefined;
                         onDelete?: undefined;
+                        defaultValue?: undefined;
                     } | {
                         type: string;
                         name: string;
@@ -102,6 +106,7 @@ export declare const executionSchema: {
                         target?: undefined;
                         foreignKey?: undefined;
                         unique?: undefined;
+                        defaultValue?: undefined;
                     } | {
                         type: string;
                         name: string;
@@ -121,6 +126,19 @@ export declare const executionSchema: {
                         foreignKey?: undefined;
                         unique?: undefined;
                         onDelete?: undefined;
+                        defaultValue?: undefined;
+                    } | {
+                        type: string;
+                        name: string;
+                        defaultValue: boolean;
+                        interface?: undefined;
+                        uiSchema?: undefined;
+                        primaryKey?: undefined;
+                        autoIncrement?: undefined;
+                        target?: undefined;
+                        foreignKey?: undefined;
+                        unique?: undefined;
+                        onDelete?: undefined;
                     } | {
                         interface: string;
                         type: string;
@@ -142,7 +160,11 @@ export declare const executionSchema: {
                         foreignKey?: undefined;
                         unique?: undefined;
                         onDelete?: undefined;
+                        defaultValue?: undefined;
                     })[];
+                    indexes: {
+                        fields: string[];
+                    }[];
                 };
                 resourceName: string;
                 request: {

package/dist/client/variable.d.ts

@@ -71,7 +71,7 @@ export declare const BaseTypeSets: {
     string: Set<string>;
     date: Set<string>;
 };
-export declare function useWorkflowVariableOptions(options?: UseVariableOptions): any[];
+export declare function useWorkflowVariableOptions(options?: UseVariableOptions, preset?: VariableOption[]): VariableOption[];
 export declare function getCollectionFieldOptions(options: any): VariableOption[];
 export declare function useGetDataSourceCollectionManager(dataSourceName?: any): CollectionManager;
 export declare function WorkflowVariableInput({ variableOptions, ...props }: {

package/dist/common/collections/executions.d.ts

@@ -34,6 +34,7 @@ declare const _default: {
         foreignKey?: undefined;
         unique?: undefined;
         onDelete?: undefined;
+        defaultValue?: undefined;
     } | {
         type: string;
         name: string;
@@ -58,6 +59,7 @@ declare const _default: {
         autoIncrement?: undefined;
         unique?: undefined;
         onDelete?: undefined;
+        defaultValue?: undefined;
     } | {
         type: string;
         name: string;
@@ -69,6 +71,7 @@ declare const _default: {
         foreignKey?: undefined;
         unique?: undefined;
         onDelete?: undefined;
+        defaultValue?: undefined;
     } | {
         type: string;
         name: string;
@@ -80,6 +83,7 @@ declare const _default: {
         target?: undefined;
         foreignKey?: undefined;
         onDelete?: undefined;
+        defaultValue?: undefined;
     } | {
         type: string;
         name: string;
@@ -91,6 +95,7 @@ declare const _default: {
         target?: undefined;
         foreignKey?: undefined;
         unique?: undefined;
+        defaultValue?: undefined;
     } | {
         type: string;
         name: string;
@@ -110,6 +115,19 @@ declare const _default: {
         foreignKey?: undefined;
         unique?: undefined;
         onDelete?: undefined;
+        defaultValue?: undefined;
+    } | {
+        type: string;
+        name: string;
+        defaultValue: boolean;
+        interface?: undefined;
+        uiSchema?: undefined;
+        primaryKey?: undefined;
+        autoIncrement?: undefined;
+        target?: undefined;
+        foreignKey?: undefined;
+        unique?: undefined;
+        onDelete?: undefined;
     } | {
         interface: string;
         type: string;
@@ -131,6 +149,10 @@ declare const _default: {
         foreignKey?: undefined;
         unique?: undefined;
         onDelete?: undefined;
+        defaultValue?: undefined;
     })[];
+    indexes: {
+        fields: string[];
+    }[];
 };
 export default _default;

package/dist/common/collections/executions.js

@@ -101,6 +101,11 @@ var executions_default = {
         enum: "{{ExecutionStatusOptions}}"
       }
     },
+    {
+      type: "boolean",
+      name: "dispatched",
+      defaultValue: false
+    },
     {
       type: "json",
       name: "stack"
@@ -121,5 +126,6 @@ var executions_default = {
         "x-read-pretty": true
       }
     }
-  ]
+  ],
+  indexes: [{ fields: ["dispatched", "id"] }]
 };

package/dist/externalVersion.js

@@ -11,8 +11,8 @@ module.exports = {
   "react": "18.2.0",
   "@formily/core": "2.3.0",
   "@formily/react": "2.3.0",
-  "@nocobase/client": "1.9.0-beta.5",
-  "@nocobase/utils": "1.9.0-beta.5",
+  "@nocobase/client": "1.9.0-beta.7",
+  "@nocobase/utils": "1.9.0-beta.7",
   "antd": "5.24.2",
   "@ant-design/icons": "5.6.1",
   "react-router-dom": "6.28.1",
@@ -20,17 +20,17 @@ module.exports = {
   "lodash": "4.17.21",
   "@dnd-kit/core": "6.1.0",
   "@formily/shared": "2.3.2",
-  "@nocobase/plugin-mobile": "1.9.0-beta.5",
+  "@nocobase/plugin-mobile": "1.9.0-beta.7",
   "sequelize": "6.35.2",
-  "@nocobase/database": "1.9.0-beta.5",
-  "@nocobase/server": "1.9.0-beta.5",
-  "@nocobase/data-source-manager": "1.9.0-beta.5",
-  "@nocobase/logger": "1.9.0-beta.5",
-  "@nocobase/evaluators": "1.9.0-beta.5",
+  "@nocobase/database": "1.9.0-beta.7",
+  "@nocobase/server": "1.9.0-beta.7",
+  "@nocobase/data-source-manager": "1.9.0-beta.7",
+  "@nocobase/logger": "1.9.0-beta.7",
+  "@nocobase/evaluators": "1.9.0-beta.7",
   "@formily/antd-v5": "1.2.3",
   "@formily/reactive": "2.3.0",
-  "@nocobase/actions": "1.9.0-beta.5",
+  "@nocobase/actions": "1.9.0-beta.7",
   "dayjs": "1.11.13",
-  "@nocobase/plugin-workflow-test": "1.9.0-beta.5",
-  "@nocobase/test": "1.9.0-beta.5"
+  "@nocobase/plugin-workflow-test": "1.9.0-beta.7",
+  "@nocobase/test": "1.9.0-beta.7"
 };

package/dist/locale/zh-CN.json

@@ -241,12 +241,14 @@
   "Move all downstream nodes to": "将所有下游节点移至",
   "After end of branches": "分支结束后",
   "Inside of branch": "分支内",
-
+  "Workflow tasks": "流程待办",
   "Workflow todos": "流程待办",
   "New version enabled": "已启用新版本",
   "Workflow is not exists": "工作流不存在",
 
   "Select users": "选择用户",
   "Query users": "查询用户",
-  "Add": "添加"
+  "Add": "添加",
+  "The workflow tasks page has already been created.": "工作流待办页面已创建。",
+  "No workflow tasks available. Please contact the administrator.": "没有可用的工作流待办，请联系管理员。"
 }

package/dist/node_modules/cron-parser/package.json

@@ -1 +1 @@
-{"name":"cron-parser","version":"4.4.0","description":"Node.js library for parsing crontab instructions","main":"lib/parser.js","types":"index.d.ts","typesVersions":{"<4.1":{"*":["types/ts3/*"]}},"directories":{"test":"test"},"scripts":{"test:tsd":"tsd","test:unit":"TZ=UTC tap ./test/*.js","test:cover":"TZ=UTC tap --coverage-report=html ./test/*.js","lint":"eslint .","lint:fix":"eslint --fix .","test":"npm run lint && npm run test:unit && npm run test:tsd"},"repository":{"type":"git","url":"https://github.com/harrisiirak/cron-parser.git"},"keywords":["cron","crontab","parser"],"author":"Harri Siirak","contributors":["Nicholas Clawson","Daniel Prentis <daniel@salsitasoft.com>","Renault John Lecoultre","Richard Astbury <richard.astbury@gmail.com>","Meaglin Wasabi <Meaglin.wasabi@gmail.com>","Mike Kusold <hello@mikekusold.com>","Alex Kit <alex.kit@atmajs.com>","Santiago Gimeno <santiago.gimeno@gmail.com>","Daniel <darc.tec@gmail.com>","Christian Steininger <christian.steininger.cs@gmail.com>","Mykola Piskovyi <m.piskovyi@gmail.com>","Brian Vaughn <brian.david.vaughn@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Yasuhiroki <yasuhiroki.duck@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Brendan Warkentin <faazshift@gmail.com>","Charlie Fish <fishcharlie.code@gmail.com>","Ian Graves <ian+diskimage@iangrav.es>","Andy Thompson <me@andytson.com>","Regev Brody <regevbr@gmail.com>"],"license":"MIT","dependencies":{"luxon":"^1.28.0"},"devDependencies":{"eslint":"^8.2.0","sinon":"^10.0.0","tap":"^16.0.1","tsd":"^0.19.0"},"engines":{"node":">=0.8"},"browser":{"fs":false},"tap":{"check-coverage":false},"tsd":{"directory":"test","compilerOptions":{"lib":["es2017","dom"]}},"_lastModified":"2025-07-24T15:19:35.741Z"}
+{"name":"cron-parser","version":"4.4.0","description":"Node.js library for parsing crontab instructions","main":"lib/parser.js","types":"index.d.ts","typesVersions":{"<4.1":{"*":["types/ts3/*"]}},"directories":{"test":"test"},"scripts":{"test:tsd":"tsd","test:unit":"TZ=UTC tap ./test/*.js","test:cover":"TZ=UTC tap --coverage-report=html ./test/*.js","lint":"eslint .","lint:fix":"eslint --fix .","test":"npm run lint && npm run test:unit && npm run test:tsd"},"repository":{"type":"git","url":"https://github.com/harrisiirak/cron-parser.git"},"keywords":["cron","crontab","parser"],"author":"Harri Siirak","contributors":["Nicholas Clawson","Daniel Prentis <daniel@salsitasoft.com>","Renault John Lecoultre","Richard Astbury <richard.astbury@gmail.com>","Meaglin Wasabi <Meaglin.wasabi@gmail.com>","Mike Kusold <hello@mikekusold.com>","Alex Kit <alex.kit@atmajs.com>","Santiago Gimeno <santiago.gimeno@gmail.com>","Daniel <darc.tec@gmail.com>","Christian Steininger <christian.steininger.cs@gmail.com>","Mykola Piskovyi <m.piskovyi@gmail.com>","Brian Vaughn <brian.david.vaughn@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Yasuhiroki <yasuhiroki.duck@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Brendan Warkentin <faazshift@gmail.com>","Charlie Fish <fishcharlie.code@gmail.com>","Ian Graves <ian+diskimage@iangrav.es>","Andy Thompson <me@andytson.com>","Regev Brody <regevbr@gmail.com>"],"license":"MIT","dependencies":{"luxon":"^1.28.0"},"devDependencies":{"eslint":"^8.2.0","sinon":"^10.0.0","tap":"^16.0.1","tsd":"^0.19.0"},"engines":{"node":">=0.8"},"browser":{"fs":false},"tap":{"check-coverage":false},"tsd":{"directory":"test","compilerOptions":{"lib":["es2017","dom"]}},"_lastModified":"2025-09-11T06:34:49.591Z"}

package/dist/node_modules/lru-cache/package.json

@@ -1 +1 @@
-{"name":"lru-cache","description":"A cache object that deletes the least-recently-used items.","version":"8.0.5","author":"Isaac Z. Schlueter <i@izs.me>","keywords":["mru","lru","cache"],"sideEffects":false,"scripts":{"build":"npm run prepare","preprepare":"rm -rf dist","prepare":"tsc -p tsconfig.json && tsc -p tsconfig-esm.json","postprepare":"bash fixup.sh","pretest":"npm run prepare","presnap":"npm run prepare","test":"c8 tap","snap":"c8 tap","preversion":"npm test","postversion":"npm publish","prepublishOnly":"git push origin --follow-tags","format":"prettier --write .","typedoc":"typedoc --tsconfig tsconfig-esm.json ./src/*.ts","benchmark-results-typedoc":"bash scripts/benchmark-results-typedoc.sh","prebenchmark":"npm run prepare","benchmark":"make -C benchmark","preprofile":"npm run prepare","profile":"make -C benchmark profile"},"main":"./dist/cjs/index-cjs.js","module":"./dist/mjs/index.js","types":"./dist/mjs/index.d.ts","exports":{"./min":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.min.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index.min.js"}},".":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index-cjs.js"}}},"repository":"git://github.com/isaacs/node-lru-cache.git","devDependencies":{"@size-limit/preset-small-lib":"^7.0.8","@types/node":"^17.0.31","@types/tap":"^15.0.6","benchmark":"^2.1.4","c8":"^7.11.2","clock-mock":"^1.0.6","esbuild":"^0.17.11","eslint-config-prettier":"^8.5.0","marked":"^4.2.12","mkdirp":"^2.1.5","prettier":"^2.6.2","size-limit":"^7.0.8","tap":"^16.3.4","ts-node":"^10.7.0","tslib":"^2.4.0","typedoc":"^0.23.24","typescript":"^4.6.4"},"license":"ISC","files":["dist"],"engines":{"node":">=16.14"},"prettier":{"semi":false,"printWidth":70,"tabWidth":2,"useTabs":false,"singleQuote":true,"jsxSingleQuote":false,"bracketSameLine":true,"arrowParens":"avoid","endOfLine":"lf"},"tap":{"coverage":false,"node-arg":["--expose-gc","--no-warnings","--loader","ts-node/esm"],"ts":false},"size-limit":[{"path":"./dist/mjs/index.js"}],"_lastModified":"2025-07-24T15:19:35.376Z"}
+{"name":"lru-cache","description":"A cache object that deletes the least-recently-used items.","version":"8.0.5","author":"Isaac Z. Schlueter <i@izs.me>","keywords":["mru","lru","cache"],"sideEffects":false,"scripts":{"build":"npm run prepare","preprepare":"rm -rf dist","prepare":"tsc -p tsconfig.json && tsc -p tsconfig-esm.json","postprepare":"bash fixup.sh","pretest":"npm run prepare","presnap":"npm run prepare","test":"c8 tap","snap":"c8 tap","preversion":"npm test","postversion":"npm publish","prepublishOnly":"git push origin --follow-tags","format":"prettier --write .","typedoc":"typedoc --tsconfig tsconfig-esm.json ./src/*.ts","benchmark-results-typedoc":"bash scripts/benchmark-results-typedoc.sh","prebenchmark":"npm run prepare","benchmark":"make -C benchmark","preprofile":"npm run prepare","profile":"make -C benchmark profile"},"main":"./dist/cjs/index-cjs.js","module":"./dist/mjs/index.js","types":"./dist/mjs/index.d.ts","exports":{"./min":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.min.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index.min.js"}},".":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index-cjs.js"}}},"repository":"git://github.com/isaacs/node-lru-cache.git","devDependencies":{"@size-limit/preset-small-lib":"^7.0.8","@types/node":"^17.0.31","@types/tap":"^15.0.6","benchmark":"^2.1.4","c8":"^7.11.2","clock-mock":"^1.0.6","esbuild":"^0.17.11","eslint-config-prettier":"^8.5.0","marked":"^4.2.12","mkdirp":"^2.1.5","prettier":"^2.6.2","size-limit":"^7.0.8","tap":"^16.3.4","ts-node":"^10.7.0","tslib":"^2.4.0","typedoc":"^0.23.24","typescript":"^4.6.4"},"license":"ISC","files":["dist"],"engines":{"node":">=16.14"},"prettier":{"semi":false,"printWidth":70,"tabWidth":2,"useTabs":false,"singleQuote":true,"jsxSingleQuote":false,"bracketSameLine":true,"arrowParens":"avoid","endOfLine":"lf"},"tap":{"coverage":false,"node-arg":["--expose-gc","--no-warnings","--loader","ts-node/esm"],"ts":false},"size-limit":[{"path":"./dist/mjs/index.js"}],"_lastModified":"2025-09-11T06:34:49.258Z"}

package/dist/node_modules/nodejs-snowflake/package.json

@@ -1 +1 @@
-{"name":"nodejs-snowflake","collaborators":["Utkarsh Srivastava <utkarsh@sagacious.dev>"],"description":"Generate time sortable 64 bits unique ids for distributed systems (inspired from twitter snowflake)","version":"2.0.1","license":"Apache 2.0","repository":{"type":"git","url":"https://github.com/utkarsh-pro/nodejs-snowflake.git"},"files":["nodejs_snowflake_bg.wasm","nodejs_snowflake.js","nodejs_snowflake.d.ts"],"main":"nodejs_snowflake.js","types":"nodejs_snowflake.d.ts","_lastModified":"2025-07-24T15:19:35.186Z"}
+{"name":"nodejs-snowflake","collaborators":["Utkarsh Srivastava <utkarsh@sagacious.dev>"],"description":"Generate time sortable 64 bits unique ids for distributed systems (inspired from twitter snowflake)","version":"2.0.1","license":"Apache 2.0","repository":{"type":"git","url":"https://github.com/utkarsh-pro/nodejs-snowflake.git"},"files":["nodejs_snowflake_bg.wasm","nodejs_snowflake.js","nodejs_snowflake.d.ts"],"main":"nodejs_snowflake.js","types":"nodejs_snowflake.d.ts","_lastModified":"2025-09-11T06:34:48.715Z"}

package/dist/server/Plugin.js

@@ -81,7 +81,7 @@ class PluginWorkflowServer extends import_server.Plugin {
     const execution = await ExecutionRepo.findOne({
       filterByTk: event.executionId
     });
-    if (!execution || execution.status !== import_constants.EXECUTION_STATUS.QUEUEING) {
+    if (!execution || execution.dispatched) {
       this.getLogger("dispatcher").info(
         `execution (${event.executionId}) from queue not found or not in queueing status, skip`
       );
@@ -474,7 +474,7 @@ class PluginWorkflowServer extends import_server.Plugin {
    * @experimental
    */
   async start(execution) {
-    if (execution.status !== import_constants.EXECUTION_STATUS.STARTED) {
+    if (execution.status) {
       return;
     }
     this.getLogger(execution.workflowId).info(`starting deferred execution (${execution.id})`);
@@ -526,7 +526,7 @@ class PluginWorkflowServer extends import_server.Plugin {
           key: workflow.key,
           eventKey: options.eventKey ?? (0, import_crypto.randomUUID)(),
           stack: options.stack,
-          status: deferred ? import_constants.EXECUTION_STATUS.STARTED : import_constants.EXECUTION_STATUS.QUEUEING
+          dispatched: deferred ?? false
         },
         { transaction }
       );
@@ -571,13 +571,15 @@ class PluginWorkflowServer extends import_server.Plugin {
     logger.info(`preparing execution for event`);
     try {
       const execution = await this.createExecution(...event);
-      if ((execution == null ? void 0 : execution.status) === import_constants.EXECUTION_STATUS.QUEUEING) {
+      if (!(execution == null ? void 0 : execution.dispatched)) {
         if (!this.executing && !this.pending.length) {
           logger.info(`local pending list is empty, adding execution (${execution.id}) to pending list`);
           this.pending.push([execution]);
         } else {
           logger.info(`local pending list is not empty, sending execution (${execution.id}) to queue`);
-          this.app.backgroundJobManager.publish(`${this.name}.pendingExecution`, { executionId: execution.id });
+          if (this.ready) {
+            this.app.backgroundJobManager.publish(`${this.name}.pendingExecution`, { executionId: execution.id });
+          }
         }
       }
     } catch (error) {
@@ -625,9 +627,7 @@ class PluginWorkflowServer extends import_server.Plugin {
             async (transaction) => {
               const execution = await this.db.getRepository("executions").findOne({
                 filter: {
-                  status: {
-                    [import_database.Op.is]: import_constants.EXECUTION_STATUS.QUEUEING
-                  },
+                  dispatched: false,
                   "workflow.enabled": true
                 },
                 sort: "id",
@@ -637,6 +637,7 @@ class PluginWorkflowServer extends import_server.Plugin {
                 this.getLogger(execution.workflowId).info(`execution (${execution.id}) fetched from db`);
                 await execution.update(
                   {
+                    dispatched: true,
                     status: import_constants.EXECUTION_STATUS.STARTED
                   },
                   { transaction }
@@ -668,9 +669,9 @@ class PluginWorkflowServer extends import_server.Plugin {
   async process(execution, job, options = {}) {
     var _a, _b;
     const logger = this.getLogger(execution.workflowId);
-    if (execution.status === import_constants.EXECUTION_STATUS.QUEUEING) {
+    if (!execution.dispatched) {
       const transaction = await this.useDataSourceTransaction("main", options.transaction);
-      await execution.update({ status: import_constants.EXECUTION_STATUS.STARTED }, { transaction });
+      await execution.update({ dispatched: true, status: import_constants.EXECUTION_STATUS.STARTED }, { transaction });
       logger.info(`execution (${execution.id}) from pending list updated to started`);
     }
     const processor = this.createProcessor(execution, options);
@@ -746,9 +747,8 @@ class PluginWorkflowServer extends import_server.Plugin {
       });
     }
     if (userId) {
-      this.app.emit("ws:sendToTag", {
-        tagKey: "userId",
-        tagValue: `${userId}`,
+      this.app.emit("ws:sendToUser", {
+        userId,
         message: { type: "workflow:tasks:updated", payload: record.get() }
       });
     }

package/dist/server/Processor.d.ts

@@ -43,7 +43,7 @@ export default class Processor {
     /**
      * @experimental
      */
-    nodesMap: Map<number, FlowNodeModel>;
+    nodesMap: Map<string | number, FlowNodeModel>;
     private jobsMapByNodeKey;
     private jobResultsMapByNodeKey;
     private jobsToSave;
@@ -61,7 +61,7 @@ export default class Processor {
     run(node: any, input?: any): any;
     end(node: any, job: JobModel): Promise<any>;
     private recall;
-    exit(s?: number): Promise<any>;
+    exit(s?: number | true): Promise<any>;
     /**
      * @experimental
      */
@@ -95,7 +95,7 @@ export default class Processor {
     /**
      * @experimental
      */
-    getScope(sourceNodeId: number, includeSelfScope?: boolean): {
+    getScope(sourceNodeId?: number | string, includeSelfScope?: boolean): {
         $context: any;
         $jobsMapByNodeKey: {
             [key: string]: any;
@@ -107,7 +107,7 @@ export default class Processor {
     /**
      * @experimental
      */
-    getParsedValue(value: any, sourceNodeId: number, { additionalScope, includeSelfScope }?: {
+    getParsedValue(value: any, sourceNodeId?: number | string, { additionalScope, includeSelfScope }?: {
         additionalScope?: {};
         includeSelfScope?: boolean;
     }): any;

package/dist/server/Processor.js

@@ -39,6 +39,7 @@ __export(Processor_exports, {
   default: () => Processor
 });
 module.exports = __toCommonJS(Processor_exports);
+var import_sequelize = require("sequelize");
 var import_database = require("@nocobase/database");
 var import_evaluators = require("@nocobase/evaluators");
 var import_utils = require("@nocobase/utils");
@@ -117,10 +118,23 @@ class Processor {
     if (!execution.workflow) {
       execution.workflow = plugin.enabledCache.get(execution.workflowId) || await execution.getWorkflow({ transaction });
     }
-    const nodes = await execution.workflow.getNodes({ transaction });
+    const nodes = execution.workflow.nodes || await execution.workflow.getNodes({ transaction });
     execution.workflow.nodes = nodes;
     this.makeNodes(nodes);
+    const JobDBModel = plugin.db.getModel("jobs");
+    const jobIds = await JobDBModel.findAll({
+      attributes: ["executionId", "nodeId", [(0, import_sequelize.fn)("MAX", (0, import_sequelize.col)("id")), "id"]],
+      group: ["executionId", "nodeId"],
+      where: {
+        executionId: execution.id
+      },
+      raw: true,
+      transaction
+    });
     const jobs = await execution.getJobs({
+      where: {
+        id: jobIds.map((item) => item.id)
+      },
       order: [["id", "ASC"]],
       transaction
     });
@@ -129,7 +143,7 @@ class Processor {
   }
   async start() {
     const { execution } = this;
-    if (execution.status !== import_constants.EXECUTION_STATUS.STARTED) {
+    if (execution.status) {
       this.logger.warn(`execution was ended with status ${execution.status} before, could not be started again`);
       return;
     }
@@ -143,7 +157,7 @@ class Processor {
   }
   async resume(job) {
     const { execution } = this;
-    if (execution.status !== import_constants.EXECUTION_STATUS.STARTED) {
+    if (execution.status) {
       this.logger.warn(`execution was ended with status ${execution.status} before, could not be resumed`);
       return;
     }
@@ -154,12 +168,14 @@ class Processor {
   async exec(instruction, node, prevJob) {
     let job;
     try {
-      this.logger.info(`execution (${this.execution.id}) run instruction [${node.type}] for node (${node.id})`);
       this.logger.debug(`config of node`, { data: node.config });
       job = await instruction(node, prevJob, this);
-      if (!job) {
+      if (job === null) {
         return this.exit();
       }
+      if (!job) {
+        return this.exit(true);
+      }
     } catch (err) {
       this.logger.error(
         `execution (${this.execution.id}) run instruction [${node.type}] for node (${node.id}) failed: `,
@@ -201,6 +217,7 @@ class Processor {
     if (typeof instruction.run !== "function") {
       return Promise.reject(new Error("`run` should be implemented for customized execution of the node"));
     }
+    this.logger.info(`execution (${this.execution.id}) run instruction [${node.type}] for node (${node.id})`);
     return this.exec(instruction.run.bind(instruction), node, input);
   }
   // parent node should take over the control
@@ -225,16 +242,35 @@ class Processor {
         new Error(`"resume" method should be implemented for [${node.type}] instruction of node (#${node.id})`)
       );
     }
+    this.logger.info(`execution (${this.execution.id}) resume instruction [${node.type}] for node (${node.id})`);
     return this.exec(instruction.resume.bind(instruction), node, job);
   }
   async exit(s) {
+    if (s === true) {
+      return;
+    }
     if (this.jobsToSave.size) {
       const newJobs = [];
       for (const job of this.jobsToSave.values()) {
         if (job.isNewRecord) {
           newJobs.push(job);
         } else {
-          await job.save({ transaction: this.mainTransaction });
+          const JobCollection = this.options.plugin.db.getCollection("jobs");
+          const changes = [];
+          if (job.changed("status")) {
+            changes.push([`status`, job.status]);
+            job.changed("status", false);
+          }
+          if (job.changed("result")) {
+            changes.push([`result`, JSON.stringify(job.result ?? null)]);
+            job.changed("result", false);
+          }
+          if (changes.length) {
+            await this.options.plugin.db.sequelize.query(
+              `UPDATE ${JobCollection.quotedTableName()} SET ${changes.map(([key]) => `${key} = ?`)} WHERE id='${job.id}'`,
+              { replacements: changes.map(([, value]) => value), transaction: this.mainTransaction }
+            );
+          }
         }
       }
       if (newJobs.length) {
@@ -273,18 +309,24 @@ class Processor {
       job = payload;
       job.set("updatedAt", /* @__PURE__ */ new Date());
     } else {
-      job = model.build({
-        ...payload,
-        id: this.options.plugin.snowflake.getUniqueID().toString(),
-        createdAt: /* @__PURE__ */ new Date(),
-        updatedAt: /* @__PURE__ */ new Date(),
-        executionId: this.execution.id
-      });
+      job = model.build(
+        {
+          ...payload,
+          id: this.options.plugin.snowflake.getUniqueID().toString(),
+          createdAt: /* @__PURE__ */ new Date(),
+          updatedAt: /* @__PURE__ */ new Date(),
+          executionId: this.execution.id
+        },
+        {
+          isNewRecord: true
+        }
+      );
     }
     this.jobsToSave.set(job.id, job);
     this.lastSavedJob = job;
     this.jobsMapByNodeKey[job.nodeKey] = job;
     this.jobResultsMapByNodeKey[job.nodeKey] = job.result;
+    this.logger.debug(`job added to save list: ${JSON.stringify(job)}`);
     return job;
   }
   /**
@@ -349,7 +391,7 @@ class Processor {
     for (let n = this.findBranchEndNode(node); n && n !== node.upstream; n = n.upstream) {
       branchJobs.push(...allJobs.filter((item) => item.nodeId === n.id));
     }
-    branchJobs.sort((a, b) => a.updatedAt.getTime() - b.updatedAt.getTime());
+    branchJobs.sort((a, b) => a.id - b.id);
     return branchJobs[branchJobs.length - 1] || null;
   }
   /**
@@ -362,8 +404,8 @@ class Processor {
       execution: this.execution,
       node
     };
-    for (const [name, fn] of this.options.plugin.functions.getEntities()) {
-      (0, import_set.default)(systemFns, name, fn.bind(scope));
+    for (const [name, fn2] of this.options.plugin.functions.getEntities()) {
+      (0, import_set.default)(systemFns, name, fn2.bind(scope));
     }
     const $scopes = {};
     for (let n = includeSelfScope ? node : this.findBranchParentNode(node); n; n = this.findBranchParentNode(n)) {

package/dist/server/actions/executions.js

@@ -70,14 +70,14 @@ async function cancel(context, next) {
   await context.db.sequelize.transaction(async (transaction) => {
     await execution.update(
       {
-        status: import_constants.EXECUTION_STATUS.CANCELED
+        status: import_constants.EXECUTION_STATUS.ABORTED
       },
       { transaction }
     );
     const pendingJobs = execution.jobs.filter((job) => job.status === import_constants.JOB_STATUS.PENDING);
     await JobRepo.update({
       values: {
-        status: import_constants.JOB_STATUS.CANCELED
+        status: import_constants.JOB_STATUS.ABORTED
       },
       filter: {
         id: pendingJobs.map((job) => job.id)

package/dist/server/instructions/ConditionInstruction.js

@@ -75,7 +75,6 @@ class ConditionInstruction extends import__.Instruction {
     }
     const savedJob = processor.saveJob(job);
     await processor.run(branchNode, savedJob);
-    return null;
   }
   async resume(node, branchJob, processor) {
     const job = processor.findBranchParentJob(branchJob, node);

package/dist/server/instructions/index.d.ts

@@ -15,7 +15,7 @@ export interface IJob {
     result?: unknown;
     [key: string]: unknown;
 }
-export type InstructionResult = IJob | Promise<IJob> | null;
+export type InstructionResult = IJob | Promise<IJob> | Promise<void> | null | void;
 export type Runner = (node: FlowNodeModel, input: any, processor: Processor) => InstructionResult;
 export type InstructionInterface = {
     run: Runner;

package/dist/server/migrations/20250820145214-mobile-tasks-uid.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.
+ */
+/**
+ * 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 {
+    appVersion: string;
+    up(): Promise<void>;
+}