@nocobase/plugin-workflow 1.8.0-beta.1 → 1.8.0-beta.12

package/dist/client/nodes/calculation.d.ts

@@ -78,4 +78,5 @@ export default class extends Instruction {
         label: any;
     };
     useInitializers(node: any): SchemaInitializerItemType;
+    testable: boolean;
 }

package/dist/client/nodes/condition.d.ts

@@ -119,4 +119,5 @@ export default class extends Instruction {
     Component({ data }: {
         data: any;
     }): React.JSX.Element;
+    testable: boolean;
 }

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

@@ -152,6 +152,7 @@ export declare const executionSchema: {
                         appends: string[];
                         pageSize: number;
                         sort: string[];
+                        except: string[];
                         filter: {};
                     };
                 };

package/dist/client/variable.d.ts

@@ -7,6 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import React from 'react';
+import { CollectionManager } from '@nocobase/client';
 export type VariableOption = {
     key?: string;
     value?: string;
@@ -21,7 +22,9 @@ export type VariableDataType = 'boolean' | 'number' | 'string' | 'date' | {
         multiple?: boolean;
         entity?: boolean;
     };
-} | ((field: any) => boolean);
+} | ((field: any, options: {
+    collectionManager?: CollectionManager;
+}) => boolean);
 export type UseVariableOptions = {
     types?: VariableDataType[];
     fieldNames?: {
@@ -70,7 +73,7 @@ export declare const BaseTypeSets: {
 };
 export declare function useWorkflowVariableOptions(options?: UseVariableOptions): any[];
 export declare function getCollectionFieldOptions(options: any): VariableOption[];
-export declare function useGetCollectionFields(dataSourceName?: any): (collectionName: any) => import("@nocobase/client").CollectionFieldOptions[];
+export declare function useGetDataSourceCollectionManager(dataSourceName?: any): CollectionManager;
 export declare function WorkflowVariableInput({ variableOptions, ...props }: {
     [x: string]: any;
     variableOptions: any;

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

@@ -223,6 +223,20 @@ declare const _default: {
         constraints?: undefined;
         through?: undefined;
         otherKey?: undefined;
+    } | {
+        type: string;
+        name: string;
+        target: string;
+        foreignKey: string;
+        sourceKey: string;
+        constraints: boolean;
+        interface?: undefined;
+        uiSchema?: undefined;
+        defaultValue?: undefined;
+        required?: undefined;
+        onDelete?: undefined;
+        through?: undefined;
+        otherKey?: undefined;
     } | {
         type: string;
         name: string;

package/dist/common/collections/workflows.js

@@ -170,8 +170,7 @@ var workflows_default = {
       target: "workflowStats",
       foreignKey: "key",
       sourceKey: "key",
-      constraints: false,
-      onDelete: "CASCADE"
+      constraints: false
       // interface: 'oho',
       // uiSchema: {
       //   type: 'object',

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.8.0-beta.1",
-  "@nocobase/utils": "1.8.0-beta.1",
+  "@nocobase/client": "1.8.0-beta.12",
+  "@nocobase/utils": "1.8.0-beta.12",
   "antd": "5.24.2",
   "@ant-design/icons": "5.6.1",
   "react-router-dom": "6.28.1",
@@ -20,16 +20,17 @@ module.exports = {
   "lodash": "4.17.21",
   "@dnd-kit/core": "6.1.0",
   "@formily/shared": "2.3.2",
+  "@nocobase/plugin-mobile": "1.8.0-beta.12",
   "sequelize": "6.35.2",
-  "@nocobase/database": "1.8.0-beta.1",
-  "@nocobase/server": "1.8.0-beta.1",
-  "@nocobase/data-source-manager": "1.8.0-beta.1",
-  "@nocobase/logger": "1.8.0-beta.1",
-  "@nocobase/evaluators": "1.8.0-beta.1",
+  "@nocobase/database": "1.8.0-beta.12",
+  "@nocobase/server": "1.8.0-beta.12",
+  "@nocobase/data-source-manager": "1.8.0-beta.12",
+  "@nocobase/logger": "1.8.0-beta.12",
+  "@nocobase/evaluators": "1.8.0-beta.12",
   "@formily/antd-v5": "1.2.3",
   "@formily/reactive": "2.3.0",
-  "@nocobase/actions": "1.8.0-beta.1",
+  "@nocobase/actions": "1.8.0-beta.12",
   "dayjs": "1.11.13",
-  "@nocobase/plugin-workflow-test": "1.8.0-beta.1",
-  "@nocobase/test": "1.8.0-beta.1"
+  "@nocobase/plugin-workflow-test": "1.8.0-beta.12",
+  "@nocobase/test": "1.8.0-beta.12"
 };

package/dist/locale/en-US.json

@@ -208,5 +208,6 @@
   "After end of branches": "After end of branches",
   "Inside of branch": "Inside of branch",
   "Workflow todos": "Workflow todos",
-  "New version enabled": "New version enabled"
-}
+  "New version enabled": "New version enabled",
+  "Workflow is not exists": "Workflow is not exists"
+}

package/dist/locale/zh-CN.json

@@ -243,5 +243,6 @@
   "Inside of branch": "分支内",
 
   "Workflow todos": "流程待办",
-  "New version enabled": "已启用新版本"
+  "New version enabled": "已启用新版本",
+  "Workflow is not exists": "工作流不存在"
 }

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-06-03T16:07:49.657Z"}
+{"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-03T08:31:50.099Z"}

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-06-03T16:07:49.333Z"}
+{"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-03T08:31:49.751Z"}

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-06-03T16:07:49.140Z"}
+{"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-03T08:31:49.578Z"}

package/dist/server/Plugin.js

@@ -147,17 +147,21 @@ class PluginWorkflowServer extends import_server.Plugin {
     this.ready = true;
     const collection = this.db.getCollection("workflows");
     const workflows = await collection.repository.find({
-      filter: { enabled: true },
-      appends: ["stats", "versionStats"]
+      appends: ["versionStats"]
     });
     for (const workflow of workflows) {
-      if (!workflow.stats) {
-        workflow.stats = await workflow.createStats({ executed: 0 });
+      if (workflow.current) {
+        workflow.stats = await workflow.getStats();
+        if (!workflow.stats) {
+          workflow.stats = await workflow.createStats({ executed: 0 });
+        }
       }
       if (!workflow.versionStats) {
         workflow.versionStats = await workflow.createVersionStats({ executed: 0 });
       }
-      this.toggle(workflow, true, { silent: true });
+      if (workflow.enabled) {
+        this.toggle(workflow, true, { silent: true });
+      }
     }
     this.checker = setInterval(() => {
       this.getLogger("dispatcher").info(`(cycling) check for queueing executions`);

package/dist/server/actions/nodes.js

@@ -52,8 +52,7 @@ async function create(context, next) {
   context.body = await db.sequelize.transaction(async (transaction) => {
     const workflow = await repository.getSourceModel(transaction);
     workflow.versionStats = await workflow.getVersionStats({ transaction });
-    const { executed } = workflow.versionStats;
-    if (executed) {
+    if (workflow.versionStats.executed > 0) {
       context.throw(400, "Node could not be created in executed workflow");
     }
     const instance = await repository.create({
@@ -147,7 +146,7 @@ async function destroy(context, next) {
     fields: [...fields, "workflowId"],
     appends: ["upstream", "downstream", "workflow.versionStats.executed"]
   });
-  if (instance.workflow.versionStats.executed) {
+  if (instance.workflow.versionStats.executed > 0) {
     context.throw(400, "Nodes in executed workflow could not be deleted");
   }
   await db.sequelize.transaction(async (transaction) => {
@@ -207,7 +206,7 @@ async function update(context, next) {
       appends: ["workflow.versionStats.executed"],
       transaction
     });
-    if (workflow.versionStats.executed) {
+    if (workflow.versionStats.executed > 0) {
       context.throw(400, "Nodes in executed workflow could not be reconfigured");
     }
     return repository.update({

package/dist/server/actions/workflows.js

@@ -57,7 +57,7 @@ async function update(context, next) {
       filterByTk,
       appends: ["versionStats"]
     });
-    if (workflow.versionStats.executed) {
+    if (workflow.versionStats.executed > 0) {
       return context.throw(400, "config of executed workflow can not be updated");
     }
   }
@@ -84,11 +84,19 @@ async function destroy(context, next) {
       transaction
     });
     revisions.forEach((item) => ids.add(item.id));
-    context.body = await repository.destroy({
+    const deleted = await repository.destroy({
       filterByTk: Array.from(ids),
       individualHooks: true,
       transaction
     });
+    const StatsRepo = context.db.getRepository("workflowStats");
+    await StatsRepo.destroy({
+      filter: {
+        key: Array.from(keysSet)
+      },
+      transaction
+    });
+    context.body = deleted;
   });
   next();
 }
@@ -150,7 +158,7 @@ async function execute(context, next) {
     filter: { key: workflow.key }
   });
   let newVersion;
-  if (!executed && autoRevision) {
+  if (executed == 0 && autoRevision) {
     newVersion = await repository.revision({
       filterByTk: workflow.id,
       filter: { key: workflow.key },

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

@@ -21,5 +21,15 @@ export declare class CalculationInstruction extends Instruction {
         result: any;
         status: -2;
     }>;
+    test({ engine, expression }: {
+        engine?: string;
+        expression?: string;
+    }): Promise<{
+        result: any;
+        status: 1;
+    } | {
+        result: any;
+        status: -2;
+    }>;
 }
 export default CalculationInstruction;

package/dist/server/instructions/CalculationInstruction.js

@@ -51,6 +51,21 @@ class CalculationInstruction extends import__.Instruction {
       };
     }
   }
+  async test({ engine = "math.js", expression = "" }) {
+    const evaluator = import_evaluators.evaluators.get(engine);
+    try {
+      const result = evaluator && expression ? evaluator(expression) : null;
+      return {
+        result,
+        status: import_constants.JOB_STATUS.RESOLVED
+      };
+    } catch (e) {
+      return {
+        result: e.toString(),
+        status: import_constants.JOB_STATUS.ERROR
+      };
+    }
+  }
 }
 var CalculationInstruction_default = CalculationInstruction;
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -29,5 +29,16 @@ export declare class ConditionInstruction extends Instruction {
         result: boolean;
     }>;
     resume(node: FlowNodeModel, branchJob: JobModel, processor: Processor): Promise<any>;
+    test({ engine, calculation, expression }: {
+        engine: any;
+        calculation: any;
+        expression?: string;
+    }): Promise<{
+        result: any;
+        status: 1;
+    } | {
+        result: any;
+        status: -2;
+    }>;
 }
 export default ConditionInstruction;

package/dist/server/instructions/ConditionInstruction.js

@@ -84,6 +84,21 @@ class ConditionInstruction extends import__.Instruction {
     }
     return processor.exit(branchJob.status);
   }
+  async test({ engine, calculation, expression = "" }) {
+    const evaluator = import_evaluators.evaluators.get(engine);
+    try {
+      const result = evaluator ? evaluator(expression) : (0, import_logicCalculate.logicCalculate)(calculation);
+      return {
+        result,
+        status: import_constants.JOB_STATUS.RESOLVED
+      };
+    } catch (e) {
+      return {
+        result: e.toString(),
+        status: import_constants.JOB_STATUS.ERROR
+      };
+    }
+  }
 }
 var ConditionInstruction_default = ConditionInstruction;
 // Annotate the CommonJS export names for ESM import in node:

package/dist/server/migrations/20250619213102-add-missed-stats.d.ts

@@ -0,0 +1,14 @@
+/**
+ * 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.
+ */
+import { Migration } from '@nocobase/server';
+export default class extends Migration {
+    appVersion: string;
+    on: string;
+    up(): Promise<void>;
+}

package/dist/server/migrations/20250619213102-add-missed-stats.js

@@ -0,0 +1,61 @@
+/**
+ * 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 add_missed_stats_exports = {};
+__export(add_missed_stats_exports, {
+  default: () => add_missed_stats_default
+});
+module.exports = __toCommonJS(add_missed_stats_exports);
+var import_server = require("@nocobase/server");
+class add_missed_stats_default extends import_server.Migration {
+  appVersion = "<1.8.0";
+  on = "afterLoad";
+  async up() {
+    const { db } = this.context;
+    const WorkflowRepo = db.getRepository("workflows");
+    const ExecutionRepo = db.getRepository("executions");
+    await db.sequelize.transaction(async (transaction) => {
+      const workflows = await WorkflowRepo.find({
+        filter: {
+          current: true
+        },
+        appends: ["stats"],
+        transaction
+      });
+      for (const workflow of workflows) {
+        if (!workflow.stats) {
+          const executed = await ExecutionRepo.count({
+            filter: {
+              key: workflow.key
+            },
+            transaction
+          }) || workflow.allExecuted || 0;
+          await workflow.createStats({ executed }, { transaction });
+        }
+      }
+    });
+  }
+}

package/dist/server/triggers/CollectionTrigger.js

@@ -67,7 +67,7 @@ function getFieldRawName(collection, name) {
 class CollectionTrigger extends import__.default {
   events = /* @__PURE__ */ new Map();
   // async function, should return promise
-  static async handler(workflowId, data, options) {
+  static async handler(workflowId, eventType, data, options) {
     const workflow = this.workflow.enabledCache.get(workflowId);
     const { skipWorkflow = false, stack } = options.context ?? {};
     if (skipWorkflow) {
@@ -75,7 +75,7 @@ class CollectionTrigger extends import__.default {
     }
     const [dataSourceName] = (0, import_data_source_manager.parseCollectionName)(workflow.config.collection);
     const transaction = this.workflow.useDataSourceTransaction(dataSourceName, options.transaction);
-    const ctx = await this.prepare(workflow, data, { ...options, transaction });
+    const ctx = await this.prepare(workflow, data, { ...options, transaction, eventType });
     if (!ctx) {
       return;
     }
@@ -99,7 +99,7 @@ class CollectionTrigger extends import__.default {
     const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(workflow.config.collection);
     const { collectionManager } = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName);
     const collection = collectionManager.getCollection(collectionName);
-    const { transaction, context } = options;
+    const { transaction, context, eventType } = options;
     const { repository, filterTargetKey } = collection;
     let target = data;
     let filterByTk;
@@ -113,7 +113,7 @@ class CollectionTrigger extends import__.default {
       filterByTk = target;
       loadNeeded = true;
     }
-    if (target instanceof import_database.Model && changed && changed.length && changed.filter((name) => {
+    if (eventType === MODE_BITMAP_EVENTS.get(MODE_BITMAP.UPDATE) && target instanceof import_database.Model && changed && changed.length && changed.filter((name) => {
       const field = collection.getField(name);
       return field && !["linkTo", "hasOne", "hasMany", "belongsToMany"].includes(field.options.type);
     }).every((name) => !target.changedWithAssociations(getFieldRawName(collection, name)))) {
@@ -162,7 +162,7 @@ class CollectionTrigger extends import__.default {
       const name = getHookId(workflow, `${collection}.${type}`);
       if (mode & key) {
         if (!this.events.has(name)) {
-          const listener = this.constructor.handler.bind(this, workflow.id);
+          const listener = this.constructor.handler.bind(this, workflow.id, type);
           this.events.set(name, listener);
           db.on(event, listener);
         }

package/dist/server/triggers/ScheduleTrigger/DateFieldScheduleTrigger.js

@@ -44,6 +44,7 @@ var import_cron_parser = __toESM(require("cron-parser"));
 var import_utils = require("./utils");
 var import_data_source_manager = require("@nocobase/data-source-manager");
 var import_lodash = require("lodash");
+var import_utils2 = require("../../utils");
 function getOnTimestampWithOffset({ field, offset = 0, unit = 1e3 }, now) {
   if (!field) {
     return null;
@@ -317,16 +318,24 @@ class DateFieldScheduleTrigger {
     });
     const eventKey = `${workflow.id}:${recordPk}@${nextTime}`;
     this.cache.delete(eventKey);
-    this.workflow.trigger(
+    const json = (0, import_utils2.toJSON)(data);
+    const args = [
       workflow,
       {
-        data: data.toJSON(),
+        data: json,
         date: new Date(nextTime)
       },
       {
         eventKey
       }
-    );
+    ];
+    if (transaction) {
+      transaction.afterCommit(() => {
+        this.workflow.trigger(...args);
+      });
+    } else {
+      this.workflow.trigger(...args);
+    }
     if (!workflow.config.repeat || workflow.config.limit && workflow.stats.executed >= workflow.config.limit - 1) {
       return;
     }

package/package.json

@@ -4,13 +4,13 @@
   "displayName.zh-CN": "工作流",
   "description": "A powerful BPM tool that provides foundational support for business automation, with the capability to extend unlimited triggers and nodes.",
   "description.zh-CN": "一个强大的 BPM 工具，为业务自动化提供基础支持，并且可任意扩展更多的触发器和节点。",
-  "version": "1.8.0-beta.1",
+  "version": "1.8.0-beta.12",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/workflow",
   "dependencies": {
-    "@nocobase/plugin-workflow-test": "1.8.0-beta.1"
+    "@nocobase/plugin-workflow-test": "1.8.0-beta.12"
   },
   "devDependencies": {
     "@ant-design/icons": "5.x",
@@ -40,13 +40,14 @@
     "@nocobase/logger": "1.x",
     "@nocobase/plugin-data-source-main": "1.x",
     "@nocobase/plugin-error-handler": "1.x",
+    "@nocobase/plugin-mobile": "1.x",
     "@nocobase/plugin-users": "1.x",
     "@nocobase/resourcer": "1.x",
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "103935669123174f2942247202e3d9ff15f0d4ed",
+  "gitHead": "b244f9b23ce35bd75baf7b357c6d53d0fbddf3be",
   "keywords": [
     "Workflow"
   ]

package/dist/client/3c67def1831d0b23.js

@@ -1,10 +0,0 @@
-/**
- * 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.
- */
-
-"use strict";(self.webpackChunk_nocobase_plugin_workflow=self.webpackChunk_nocobase_plugin_workflow||[]).push([["383"],{8958:function(e,t,n){n.d(t,{a:function(){return a}});var o=n(8156),r=n.n(o),c=n(3238),i=n(6128),l=n(3772),u=n(7893),a=function(){var e=(0,c.useTranslation)().t,t=(0,l.useRecord)().id,n=(0,l.useActionContext)().setVisible;return r().createElement(i.Link,{to:(0,u.s_)(t),onClick:function(){return n(!1)}},e("View"))}},2266:function(e,t,n){n.d(t,{P:function(){return b},r:function(){return v}});var o=n(8156),r=n.n(o),c=n(2721),i=n(482),l=n(3238),u=n(3772),a=n(9144),s=n(573);function p(){return(p=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o])}return e}).apply(this,arguments)}function f(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},o=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(o=o.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),o.forEach(function(t){var o;o=n[t],t in e?Object.defineProperty(e,t,{value:o,enumerable:!0,configurable:!0,writable:!0}):e[t]=o})}return e}function d(){var e,t,n=(e=["\n        display: flex;\n      "],t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}})));return d=function(){return n},n}function m(e){var t,n=(0,u.useCompile)()(e.label),o=(null!=(t=a.uy[e.value])?t:{}).color;return r().createElement(c.Tag,{color:o,closable:e.closable,onClose:e.onClose},n)}function y(e){var t=(0,u.useCompile)();return r().createElement(r().Fragment,null,r().createElement(m,e),e.description?r().createElement("span",null,t(e.description)):null)}function b(e){var t,n,o=p({},function(e){if(null==e)throw TypeError("Cannot destructure "+e);return e}(e)),i=o.multiple?"multiple":null;return r().createElement(c.Select,(t=f({role:"button","data-testid":"select-".concat(i||"single")},o),n=n={mode:i,optionLabelProp:"label",tagRender:m},Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):(function(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);n.push.apply(n,o)}return n})(Object(n)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))}),t),a.C6.filter(function(e){return!!e.value&&e.value!==a.r9.ABORTED}).map(function(e){return r().createElement(c.Select.Option,f({key:e.value},e),r().createElement(y,e))}))}function v(e){var t=(0,l.useTranslation)().t,n=(0,u.useResourceActionContext)().refresh,a=(0,u.useResourceContext)().resource,p=(0,u.useRecord)(),f=(0,o.useCallback)(function(){c.Modal.confirm({title:(0,s.KQ)("Cancel the execution"),icon:r().createElement(i.ExclamationCircleFilled,null),content:(0,s.KQ)("Are you sure you want to cancel the execution?"),onOk:function(){a.cancel({filterByTk:p.id}).then(function(){c.message.success(t("Operation succeeded")),n()}).catch(function(e){console.error(e.data.error)})}})},[p]);return r().createElement("div",{className:(0,u.css)(d())},e.children,p.status?null:r().createElement(c.Tooltip,{title:(0,s.KQ)("Cancel the execution")},r().createElement(c.Button,{type:"link",danger:!0,onClick:f,shape:"circle",size:"small",icon:r().createElement(i.StopOutlined,null)})))}},2659:function(e,t,n){n.d(t,{V:function(){return b}});var o,r=n(8156),c=n.n(r),i=n(6128),l=n(3238),u=n(2721),a=n(3772),s=n(1768),p=n(9144),f=n(573),d=n(7893);function m(e,t,n,o,r,c,i){try{var l=e[c](i),u=l.value}catch(e){n(e);return}l.done?t(u):Promise.resolve(u).then(o,r)}function y(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var b={type:"void",name:"executionHistoryDrawer",title:'{{t("Execution history", { ns: "'.concat(f.A7,'" })}}'),"x-component":"Action.Drawer",properties:{content:{type:"void","x-decorator":"ExecutionResourceProvider","x-decorator-props":{collection:s.Z,resourceName:"executions",request:{resource:"executions",action:"list",params:{appends:["workflow.id","workflow.title"],pageSize:20,sort:["-createdAt"],filter:{}}}},properties:{actions:{type:"void","x-component":"ActionBar","x-component-props":{style:{marginBottom:16}},properties:{refresher:{type:"void",title:'{{ t("Refresh") }}',"x-component":"Action","x-use-component-props":"useRefreshActionProps","x-component-props":{icon:"ReloadOutlined"}},delete:{type:"void",title:'{{t("Delete")}}',"x-component":"Action","x-component-props":{icon:"DeleteOutlined",useAction:"{{ cm.useBulkDestroyAction }}",confirm:{title:"{{t('Delete record')}}",content:"{{t('Are you sure you want to delete it?')}}"}}},clear:{type:"void",title:'{{t("Clear")}}',"x-component":"Action","x-component-props":{useAction:function(){var e=(0,l.useTranslation)().t,t=(0,a.useResourceActionContext)(),n=t.refresh,o=t.defaultRequest,r=(0,a.useResourceContext)().resource,c=(0,a.useActionContext)().setVisible;return{run:function(){var t;return(t=function(){var t;return function(e,t){var n,o,r,c,i={label:0,sent:function(){if(1&r[0])throw r[1];return r[1]},trys:[],ops:[]};return c={next:l(0),throw:l(1),return:l(2)},"function"==typeof Symbol&&(c[Symbol.iterator]=function(){return this}),c;function l(c){return function(l){var u=[c,l];if(n)throw TypeError("Generator is already executing.");for(;i;)try{if(n=1,o&&(r=2&u[0]?o.return:u[0]?o.throw||((r=o.return)&&r.call(o),0):o.next)&&!(r=r.call(o,u[1])).done)return r;switch(o=0,r&&(u=[2&u[0],r.value]),u[0]){case 0:case 1:r=u;break;case 4:return i.label++,{value:u[1],done:!1};case 5:i.label++,o=u[1],u=[0];continue;case 7:u=i.ops.pop(),i.trys.pop();continue;default:if(!(r=(r=i.trys).length>0&&r[r.length-1])&&(6===u[0]||2===u[0])){i=0;continue}if(3===u[0]&&(!r||u[1]>r[0]&&u[1]<r[3])){i.label=u[1];break}if(6===u[0]&&i.label<r[1]){i.label=r[1],r=u;break}if(r&&i.label<r[2]){i.label=r[2],i.ops.push(u);break}r[2]&&i.ops.pop(),i.trys.pop();continue}u=t.call(e,i)}catch(e){u=[6,e],o=0}finally{n=r=0}if(5&u[0])throw u[1];return{value:u[0]?u[1]:void 0,done:!0}}}}(this,function(i){switch(i.label){case 0:return[4,r.destroy({filter:null==(t=o.params)?void 0:t.filter})];case 1:return i.sent(),u.message.success(e("Operation succeeded")),n(),c(!1),[2]}})},function(){var e=this,n=arguments;return new Promise(function(o,r){var c=t.apply(e,n);function i(e){m(c,o,r,i,l,"next",e)}function l(e){m(c,o,r,i,l,"throw",e)}i(void 0)})})()}}},confirm:{title:'{{t("Clear all executions", { ns: "'.concat(f.A7,'" })}}'),content:'{{t("Clear executions will not reset executed count, and started executions will not be deleted, are you sure you want to delete them all?", { ns: "'.concat(f.A7,'" })}}')}}}}},table:{type:"void","x-component":"Table.Void","x-component-props":{rowKey:"id",rowSelection:{type:"checkbox"},useDataSource:"{{ cm.useDataSourceFromRAC }}"},properties:{id:{type:"void","x-decorator":"Table.Column.Decorator","x-component":"Table.Column",properties:{id:{type:"number","x-component":"CollectionField","x-read-pretty":!0}}},createdAt:{type:"void","x-decorator":"Table.Column.Decorator","x-component":"Table.Column",properties:{createdAt:{type:"string","x-component":"CollectionField","x-component-props":{showTime:!0},"x-read-pretty":!0}}},workflowId:{type:"void","x-decorator":"Table.Column.Decorator","x-component":"Table.Column",title:'{{t("Version", { ns: "'.concat(f.A7,'" })}}'),properties:{workflowId:(y(o={type:"number"},"x-component",function(e){var t=e.value,n=(0,a.useActionContext)().setVisible;return c().createElement(i.Link,{to:(0,d.SI)(t),onClick:function(){return n(!1)}},"#".concat(t))}),y(o,"x-read-pretty",!0),o)}},status:{type:"void","x-decorator":"Table.Column.Decorator","x-component":"Table.Column",title:'{{t("Status", { ns: "'.concat(f.A7,'" })}}'),properties:{status:{type:"number","x-decorator":"ExecutionStatusColumn","x-component":"CollectionField","x-read-pretty":!0}}},actions:{type:"void",title:'{{ t("Actions") }}',"x-component":"Table.Column",properties:{actions:{type:"void","x-component":"Space","x-component-props":{split:"|"},properties:{link:{type:"void","x-component":"ExecutionLink"},delete:{type:"void",title:'{{ t("Delete") }}',"x-component":"Action.Link","x-component-props":{confirm:{title:"{{t('Delete record')}}",content:"{{t('Are you sure you want to delete it?')}}"},useAction:"{{ cm.useDestroyActionAndRefreshCM }}"},"x-reactions":[{dependencies:["..status"],fulfill:{state:{visible:"{{ $deps[0] !== ".concat(p.r9.STARTED," }}")}}}]}}}}}}}}}}}},8327:function(e,t,n){n.d(t,{X:function(){return c}});var o=n(3772);function r(e,t,n,o,r,c,i){try{var l=e[c](i),u=l.value}catch(e){n(e);return}l.done?t(u):Promise.resolve(u).then(o,r)}function c(){var e=(0,o.useResourceActionContext)();return{onClick:function(){var t;return(t=function(){var t;return function(e,t){var n,o,r,c,i={label:0,sent:function(){if(1&r[0])throw r[1];return r[1]},trys:[],ops:[]};return c={next:l(0),throw:l(1),return:l(2)},"function"==typeof Symbol&&(c[Symbol.iterator]=function(){return this}),c;function l(c){return function(l){var u=[c,l];if(n)throw TypeError("Generator is already executing.");for(;i;)try{if(n=1,o&&(r=2&u[0]?o.return:u[0]?o.throw||((r=o.return)&&r.call(o),0):o.next)&&!(r=r.call(o,u[1])).done)return r;switch(o=0,r&&(u=[2&u[0],r.value]),u[0]){case 0:case 1:r=u;break;case 4:return i.label++,{value:u[1],done:!1};case 5:i.label++,o=u[1],u=[0];continue;case 7:u=i.ops.pop(),i.trys.pop();continue;default:if(!(r=(r=i.trys).length>0&&r[r.length-1])&&(6===u[0]||2===u[0])){i=0;continue}if(3===u[0]&&(!r||u[1]>r[0]&&u[1]<r[3])){i.label=u[1];break}if(6===u[0]&&i.label<r[1]){i.label=r[1],r=u;break}if(r&&i.label<r[2]){i.label=r[2],i.ops.push(u);break}r[2]&&i.ops.pop(),i.trys.pop();continue}u=t.call(e,i)}catch(e){u=[6,e],o=0}finally{n=r=0}if(5&u[0])throw u[1];return{value:u[0]?u[1]:void 0,done:!0}}}}(this,function(n){return null==e||null==(t=e.refresh)||t.call(e),[2]})},function(){var e=this,n=arguments;return new Promise(function(o,c){var i=t.apply(e,n);function l(e){r(i,o,c,l,u,"next",e)}function u(e){r(i,o,c,l,u,"throw",e)}l(void 0)})})()}}}}}]);