@nocobase/plugin-workflow 1.5.0-beta.9 → 1.6.0-alpha.10

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

@@ -0,0 +1,31 @@
+/**
+ * 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 { Instruction } from '.';
+import { WorkflowVariableInput } from '../variable';
+export default class extends Instruction {
+    title: string;
+    type: string;
+    group: string;
+    description: string;
+    fieldset: {
+        result: {
+            type: string;
+            title: string;
+            'x-decorator': string;
+            'x-component': string;
+            'x-component-props': {
+                useTypedConstant: boolean;
+            };
+            required: boolean;
+        };
+    };
+    components: {
+        WorkflowVariableInput: typeof WorkflowVariableInput;
+    };
+}

package/dist/client/triggers/schedule/ScheduleModes.d.ts

@@ -6,6 +6,7 @@
  * 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 React from 'react';
 export declare const ScheduleModes: {
     [x: number]: {
         fieldset: {
@@ -63,12 +64,14 @@ export declare const ScheduleModes: {
                 'x-decorator': string;
                 'x-component': string;
                 'x-component-props': {
-                    showTime: boolean;
-                    placeholder: string;
+                    nullable: boolean;
+                    changeOnSelect: boolean;
+                    render(props: any): React.JSX.Element;
                 };
             };
             data?: undefined;
         };
+        validate(config: any): boolean;
     } | {
         fieldset: {
             collection: {

package/dist/client/triggers/schedule/index.d.ts

@@ -10,6 +10,7 @@
 import { SchemaInitializerItemType, useCollectionDataSource } from '@nocobase/client';
 import { Trigger } from '..';
 import { TriggerScheduleConfig } from './TriggerScheduleConfig';
+import { WorkflowVariableWrapper } from '../../variable';
 import { TriggerCollectionRecordSelect } from '../../components/TriggerCollectionRecordSelect';
 declare function useVariables(config: any, opts: any): any[];
 export default class extends Trigger {
@@ -37,6 +38,7 @@ export default class extends Trigger {
         ScheduleConfig: () => import("react").JSX.Element;
         TriggerScheduleConfig: typeof TriggerScheduleConfig;
         TriggerCollectionRecordSelect: typeof TriggerCollectionRecordSelect;
+        WorkflowVariableWrapper: typeof WorkflowVariableWrapper;
     };
     useVariables: typeof useVariables;
     useInitializers(config: any): SchemaInitializerItemType | null;

package/dist/client/variable.d.ts

@@ -6,7 +6,7 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-/// <reference types="react" />
+import React from 'react';
 export type VariableOption = {
     key?: string;
     value?: string;
@@ -59,17 +59,16 @@ export declare const systemOptions: {
     value: string;
     useOptions(options: UseVariableOptions): any;
 };
+/**
+ * @deprecated
+ */
 export declare const BaseTypeSets: {
     boolean: Set<string>;
     number: Set<string>;
     string: Set<string>;
     date: Set<string>;
 };
-export declare function useWorkflowVariableOptions(options?: UseVariableOptions): {
-    [x: number]: any;
-    key: any;
-    disabled: boolean;
-}[];
+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 WorkflowVariableInput({ variableOptions, ...props }: {
@@ -88,3 +87,15 @@ export declare function WorkflowVariableJSON({ variableOptions, ...props }: {
     [x: string]: any;
     variableOptions: any;
 }): JSX.Element;
+/**
+ * @experimental
+ */
+export declare function WorkflowVariableWrapper(props: any): JSX.Element;
+/**
+ * @experimental
+ */
+export declare const HideVariableContext: React.Context<boolean>;
+/**
+ * @experimental
+ */
+export declare function useHideVariable(): boolean;

package/dist/externalVersion.js

@@ -11,24 +11,24 @@ module.exports = {
   "react": "18.2.0",
   "@formily/core": "2.3.0",
   "@formily/react": "2.3.0",
-  "@nocobase/client": "1.5.0-beta.9",
-  "@nocobase/utils": "1.5.0-beta.9",
+  "@nocobase/client": "1.6.0-alpha.10",
+  "@nocobase/utils": "1.6.0-alpha.10",
   "antd": "5.12.8",
   "@ant-design/icons": "5.2.6",
   "react-router-dom": "6.21.0",
   "react-i18next": "11.18.6",
   "@formily/shared": "2.3.2",
   "lodash": "4.17.21",
-  "@nocobase/database": "1.5.0-beta.9",
-  "@nocobase/server": "1.5.0-beta.9",
-  "@nocobase/logger": "1.5.0-beta.9",
-  "@nocobase/actions": "1.5.0-beta.9",
-  "@nocobase/data-source-manager": "1.5.0-beta.9",
-  "@nocobase/evaluators": "1.5.0-beta.9",
+  "@nocobase/database": "1.6.0-alpha.10",
+  "@nocobase/server": "1.6.0-alpha.10",
+  "@nocobase/logger": "1.6.0-alpha.10",
+  "@nocobase/actions": "1.6.0-alpha.10",
+  "@nocobase/data-source-manager": "1.6.0-alpha.10",
+  "@nocobase/evaluators": "1.6.0-alpha.10",
   "@formily/antd-v5": "1.1.9",
   "@formily/reactive": "2.3.0",
   "dayjs": "1.11.10",
   "sequelize": "6.35.2",
-  "@nocobase/plugin-workflow-test": "1.5.0-beta.9",
-  "@nocobase/test": "1.5.0-beta.9"
+  "@nocobase/plugin-workflow-test": "1.6.0-alpha.10",
+  "@nocobase/test": "1.6.0-alpha.10"
 };

package/dist/locale/zh-CN.json

@@ -73,7 +73,7 @@
   "Preload associations": "预加载关联数据",
   "Please select the associated fields that need to be accessed in subsequent nodes. With more than two levels of to-many associations may cause performance issue, please use with caution.":
     "请选中需要在后续节点中被访问的关系字段。超过两层的对多关联可能会导致性能问题，请谨慎使用。",
-  "Choose a record of the collection to trigger.": "选择数据表中的一行记录来触发。",
+  "Choose a record or primary key of a record in the collection to trigger.": "选择数据表中的一行记录或者记录的主键来触发。",
 
   "Schedule event": "定时任务",
   "Triggered according to preset time conditions. Suitable for one-time or periodic tasks, such as sending notifications and cleaning data on a schedule.": "按预设的时间条件定时触发。适用于一次性或周期性的任务，如定时发送通知、清理数据等。",
@@ -227,5 +227,7 @@
   "Add node": "添加节点",
   "Move all downstream nodes to": "将所有下游节点移至",
   "After end of branches": "分支结束后",
-  "Inside of branch": "分支内"
+  "Inside of branch": "分支内",
+
+  "Workflow todos": "流程待办"
 }

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":"2024-12-15T11:59:31.756Z"}
+{"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-01-08T06:47:28.926Z"}

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":"2024-12-15T11:59:31.341Z"}
+{"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-01-08T06:47:28.536Z"}

package/dist/server/Plugin.d.ts

@@ -15,13 +15,15 @@ import { CustomFunction } from './functions';
 import Trigger from './triggers';
 import { InstructionInterface } from './instructions';
 import type { ExecutionModel, WorkflowModel } from './types';
-import { Context } from '@nocobase/actions';
 type ID = number | string;
 export type EventOptions = {
     eventKey?: string;
     context?: any;
     deferred?: boolean;
     manually?: boolean;
+    force?: boolean;
+    stack?: Array<ID>;
+    onTriggerFail?: Function;
     [key: string]: any;
 } & Transactionable;
 export default class PluginWorkflowServer extends Plugin {
@@ -72,11 +74,12 @@ export default class PluginWorkflowServer extends Plugin {
      */
     start(execution: ExecutionModel): void;
     createProcessor(execution: ExecutionModel, options?: {}): Processor;
+    private validateEvent;
     private createExecution;
     private prepare;
     private dispatch;
     private process;
-    execute(workflow: WorkflowModel, context: Context, options?: EventOptions): Promise<void | Processor>;
+    execute(workflow: WorkflowModel, values: any, options?: EventOptions): Promise<void | Processor>;
     /**
      * @experimental
      * @param {string} dataSourceName

package/dist/server/Plugin.js

@@ -268,6 +268,10 @@ class PluginWorkflowServer extends import_server.Plugin {
       this.checker = setInterval(() => {
         this.dispatch();
       }, 3e5);
+      this.app.on("workflow:dispatch", () => {
+        this.app.logger.info("workflow:dispatch");
+        this.dispatch();
+      });
       this.dispatch();
     });
     this.app.on("beforeStop", async () => {
@@ -323,7 +327,7 @@ class PluginWorkflowServer extends import_server.Plugin {
       logger.debug(`ignored event data:`, context);
       return;
     }
-    if (!options.manually && !workflow.enabled) {
+    if (!options.force && !options.manually && !workflow.enabled) {
       logger.warn(`workflow ${workflow.id} is not enabled, event will be ignored`);
       return;
     }
@@ -383,17 +387,42 @@ class PluginWorkflowServer extends import_server.Plugin {
   createProcessor(execution, options = {}) {
     return new import_Processor.default(execution, { ...options, plugin: this });
   }
+  async validateEvent(workflow, context, options) {
+    const trigger = this.triggers.get(workflow.type);
+    const triggerValid = await trigger.validateEvent(workflow, context, options);
+    if (!triggerValid) {
+      return false;
+    }
+    const { stack } = options;
+    let valid = true;
+    if ((stack == null ? void 0 : stack.length) > 0) {
+      const existed = await workflow.countExecutions({
+        where: {
+          id: stack
+        },
+        transaction: options.transaction
+      });
+      if (existed) {
+        this.getLogger(workflow.id).warn(
+          `workflow ${workflow.id} has already been triggered in stacks executions (${stack}), and newly triggering will be skipped.`
+        );
+        valid = false;
+      }
+    }
+    return valid;
+  }
   async createExecution(workflow, context, options) {
+    var _a;
     const { deferred } = options;
     const transaction = await this.useDataSourceTransaction("main", options.transaction, true);
     const sameTransaction = options.transaction === transaction;
-    const trigger = this.triggers.get(workflow.type);
-    const valid = await trigger.validateEvent(workflow, context, { ...options, transaction });
+    const valid = await this.validateEvent(workflow, context, { ...options, transaction });
     if (!valid) {
       if (!sameTransaction) {
         await transaction.commit();
       }
-      return null;
+      (_a = options.onTriggerFail) == null ? void 0 : _a.call(options, workflow, context, options);
+      return Promise.reject(new Error("event is not valid"));
     }
     let execution;
     try {
@@ -402,6 +431,7 @@ class PluginWorkflowServer extends import_server.Plugin {
           context,
           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
         },
         { transaction }
@@ -451,8 +481,8 @@ class PluginWorkflowServer extends import_server.Plugin {
       if ((execution == null ? void 0 : execution.status) === import_constants.EXECUTION_STATUS.QUEUEING && !this.executing && !this.pending.length) {
         this.pending.push([execution]);
       }
-    } catch (err) {
-      logger.error(`failed to create execution: ${err.message}`, err);
+    } catch (error) {
+      logger.error(`failed to create execution:`, { error });
     }
     if (this.events.length) {
       await this.prepare();
@@ -498,8 +528,11 @@ class PluginWorkflowServer extends import_server.Plugin {
         if (next) {
           await this.process(...next);
         }
+      } catch (err) {
+        console.error(err);
       } finally {
         this.executing = null;
+        this.getLogger("dispatcher").info(`execution dispatched finished`);
         if (next) {
           this.dispatch();
         }
@@ -526,7 +559,7 @@ class PluginWorkflowServer extends import_server.Plugin {
     }
     return processor;
   }
-  async execute(workflow, context, options = {}) {
+  async execute(workflow, values, options = {}) {
     const trigger = this.triggers.get(workflow.type);
     if (!trigger) {
       throw new Error(`trigger type "${workflow.type}" of workflow ${workflow.id} is not registered`);
@@ -534,7 +567,7 @@ class PluginWorkflowServer extends import_server.Plugin {
     if (!trigger.execute) {
       throw new Error(`"execute" method of trigger ${workflow.type} is not implemented`);
     }
-    return trigger.execute(workflow, context, options);
+    return trigger.execute(workflow, values, options);
   }
   /**
    * @experimental

package/dist/server/Processor.d.ts

@@ -109,6 +109,7 @@ export default class Processor {
         };
         $system: {};
         $scopes: {};
+        $env: {};
     };
     /**
      * @experimental

package/dist/server/Processor.js

@@ -369,7 +369,8 @@ class Processor {
       $context: this.execution.context,
       $jobsMapByNodeKey: this.jobsMapByNodeKey,
       $system: systemFns,
-      $scopes
+      $scopes,
+      $env: this.options.plugin.app.environment.getVariables()
     };
   }
   /**

package/dist/server/actions/workflows.js

@@ -121,7 +121,10 @@ async function trigger(context, next) {
 }
 async function execute(context, next) {
   const plugin = context.app.pm.get(import_Plugin.default);
-  const { filterByTk, autoRevision } = context.action.params;
+  const { filterByTk, values, autoRevision } = context.action.params;
+  if (!values) {
+    return context.throw(400, "values is required");
+  }
   if (!filterByTk) {
     return context.throw(400, "filterByTk is required");
   }
@@ -137,7 +140,7 @@ async function execute(context, next) {
   const { executed } = workflow;
   let processor;
   try {
-    processor = await plugin.execute(workflow, context, { manually: true });
+    processor = await plugin.execute(workflow, values, { manually: true });
     if (!processor) {
       return context.throw(400, "workflow not triggered");
     }

package/dist/server/collections/executions.js

@@ -33,6 +33,7 @@ var executions_default = {
   dumpRules: {
     group: "log"
   },
+  migrationRules: ["schema-only", "skip"],
   name: "executions",
   shared: true,
   fields: [
@@ -61,6 +62,14 @@ var executions_default = {
     {
       type: "integer",
       name: "status"
+    },
+    {
+      type: "json",
+      name: "stack"
+    },
+    {
+      type: "json",
+      name: "output"
     }
   ]
 };

package/dist/server/collections/flow_nodes.js

@@ -31,6 +31,7 @@ __export(flow_nodes_exports, {
 module.exports = __toCommonJS(flow_nodes_exports);
 var flow_nodes_default = {
   dumpRules: "required",
+  migrationRules: ["overwrite", "skip"],
   name: "flow_nodes",
   shared: true,
   fields: [

package/dist/server/collections/jobs.js

@@ -33,6 +33,7 @@ var jobs_default = {
   dumpRules: {
     group: "log"
   },
+  migrationRules: ["schema-only", "skip"],
   name: "jobs",
   shared: true,
   fields: [

package/dist/server/collections/workflows.js

@@ -32,6 +32,7 @@ module.exports = __toCommonJS(workflows_exports);
 function workflows_default() {
   return {
     dumpRules: "required",
+    migrationRules: ["overwrite", "skip"],
     name: "workflows",
     shared: true,
     repository: "WorkflowRepository",

package/dist/server/instructions/CreateInstruction.js

@@ -44,7 +44,7 @@ class CreateInstruction extends import__.Instruction {
     const created = await repository.create({
       ...options,
       context: {
-        stack: Array.from(new Set((processor.execution.context.stack ?? []).concat(processor.execution.id)))
+        stack: Array.from(new Set((processor.execution.stack ?? []).concat(processor.execution.id)))
       },
       transaction
     });

package/dist/server/instructions/DestroyInstruction.js

@@ -42,7 +42,7 @@ class DestroyInstruction extends import__.Instruction {
     const result = await repository.destroy({
       ...options,
       context: {
-        stack: Array.from(new Set((processor.execution.context.stack ?? []).concat(processor.execution.id)))
+        stack: Array.from(new Set((processor.execution.stack ?? []).concat(processor.execution.id)))
       },
       transaction: this.workflow.useDataSourceTransaction(dataSourceName, processor.transaction)
     });

package/dist/server/instructions/UpdateInstruction.js

@@ -42,7 +42,7 @@ class UpdateInstruction extends import__.Instruction {
     const result = await repository.update({
       ...options,
       context: {
-        stack: Array.from(new Set((processor.execution.context.stack ?? []).concat(processor.execution.id)))
+        stack: Array.from(new Set((processor.execution.stack ?? []).concat(processor.execution.id)))
       },
       transaction: this.workflow.useDataSourceTransaction(dataSourceName, processor.transaction)
     });

package/dist/server/triggers/CollectionTrigger.d.ts

@@ -6,11 +6,10 @@
  * 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 { Model, Transactionable } from '@nocobase/database';
+import { Model } from '@nocobase/database';
 import Trigger from '.';
 import type { WorkflowModel } from '../types';
 import type { EventOptions } from '../Plugin';
-import { Context } from '@nocobase/actions';
 export interface CollectionChangeTriggerConfig {
     collection: string;
     mode: number;
@@ -19,12 +18,10 @@ export interface CollectionChangeTriggerConfig {
 export default class CollectionTrigger extends Trigger {
     events: Map<any, any>;
     private static handler;
-    prepare(workflow: WorkflowModel, data: Model | Record<string, any>, options: any): Promise<{
+    prepare(workflow: WorkflowModel, data: Model | Record<string, any> | string | number, options: any): Promise<{
         data: any;
-        stack: any;
     }>;
     on(workflow: WorkflowModel): void;
     off(workflow: WorkflowModel): void;
-    validateEvent(workflow: WorkflowModel, context: any, options: Transactionable): Promise<boolean>;
-    execute(workflow: WorkflowModel, context: Context, options: EventOptions): Promise<void | import("..").Processor>;
+    execute(workflow: WorkflowModel, values: any, options: EventOptions): Promise<void | import("..").Processor>;
 }

package/dist/server/triggers/CollectionTrigger.js

@@ -74,17 +74,19 @@ class CollectionTrigger extends import__.default {
     if (!ctx) {
       return;
     }
+    const { stack } = options.context ?? {};
     if (workflow.sync) {
       await this.workflow.trigger(workflow, ctx, {
-        transaction
+        transaction,
+        stack
       });
     } else {
       if (transaction) {
         transaction.afterCommit(() => {
-          this.workflow.trigger(workflow, ctx);
+          this.workflow.trigger(workflow, ctx, { stack });
         });
       } else {
-        this.workflow.trigger(workflow, ctx);
+        this.workflow.trigger(workflow, ctx, { stack });
       }
     }
   }
@@ -95,13 +97,24 @@ class CollectionTrigger extends import__.default {
     const collection = collectionManager.getCollection(collectionName);
     const { transaction, context } = options;
     const { repository, filterTargetKey } = collection;
-    if (data instanceof import_database.Model && changed && changed.length && changed.filter((name) => {
+    let target = data;
+    let filterByTk;
+    let loadNeeded = false;
+    if (target && typeof target === "object") {
+      filterByTk = Array.isArray(filterTargetKey) ? (0, import_lodash.pick)(
+        target,
+        filterTargetKey.sort((a, b) => a.localeCompare(b))
+      ) : target[filterTargetKey];
+    } else {
+      filterByTk = target;
+      loadNeeded = true;
+    }
+    if (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) => !data.changedWithAssociations(getFieldRawName(collection, name)))) {
+    }).every((name) => !target.changedWithAssociations(getFieldRawName(collection, name)))) {
       return null;
     }
-    const filterByTk = Array.isArray(filterTargetKey) ? (0, import_lodash.pick)(data, filterTargetKey) : { [filterTargetKey]: data[filterTargetKey] };
     if ((0, import_utils.isValidFilter)(condition) && !(mode & MODE_BITMAP.DESTROY)) {
       const count = await repository.count({
         filterByTk,
@@ -113,22 +126,20 @@ class CollectionTrigger extends import__.default {
         return null;
       }
     }
-    let result = data;
-    if ((appends == null ? void 0 : appends.length) && !(mode & MODE_BITMAP.DESTROY)) {
+    if (loadNeeded || (appends == null ? void 0 : appends.length) && !(mode & MODE_BITMAP.DESTROY)) {
       const includeFields = appends.reduce((set, field) => {
         set.add(field.split(".")[0]);
         set.add(field);
         return set;
       }, /* @__PURE__ */ new Set());
-      result = await repository.findOne({
+      target = await repository.findOne({
         filterByTk,
         appends: Array.from(includeFields),
         transaction
       });
     }
     return {
-      data: (0, import_utils2.toJSON)(result),
-      stack: context == null ? void 0 : context.stack
+      data: (0, import_utils2.toJSON)(target)
     };
   }
   on(workflow) {
@@ -182,26 +193,27 @@ class CollectionTrigger extends import__.default {
       }
     }
   }
-  async validateEvent(workflow, context, options) {
-    if (context.stack) {
-      const existed = await workflow.countExecutions({
-        where: {
-          id: context.stack
-        },
-        transaction: options.transaction
-      });
-      if (existed) {
-        this.workflow.getLogger(workflow.id).warn(
-          `workflow ${workflow.id} has already been triggered in stack executions (${context.stack}), and newly triggering will be skipped.`
-        );
-        return false;
-      }
-    }
-    return true;
-  }
-  async execute(workflow, context, options) {
-    var _a;
-    const ctx = await this.prepare(workflow, (_a = context.action.params.values) == null ? void 0 : _a.data, options);
+  // async validateEvent(workflow: WorkflowModel, context: any, options: Transactionable): Promise<boolean> {
+  //   if (context.stack) {
+  //     const existed = await workflow.countExecutions({
+  //       where: {
+  //         id: context.stack,
+  //       },
+  //       transaction: options.transaction,
+  //     });
+  //     if (existed) {
+  //       this.workflow
+  //         .getLogger(workflow.id)
+  //         .warn(
+  //           `workflow ${workflow.id} has already been triggered in stack executions (${context.stack}), and newly triggering will be skipped.`,
+  //         );
+  //       return false;
+  //     }
+  //   }
+  //   return true;
+  // }
+  async execute(workflow, values, options) {
+    const ctx = await this.prepare(workflow, values == null ? void 0 : values.data, options);
     const [dataSourceName] = (0, import_data_source_manager.parseCollectionName)(workflow.config.collection);
     const { transaction } = options;
     return this.workflow.trigger(workflow, ctx, {

package/dist/server/triggers/ScheduleTrigger/DateFieldScheduleTrigger.d.ts

@@ -36,4 +36,5 @@ export default class DateFieldScheduleTrigger {
     trigger(workflow: WorkflowModel, record: any, nextTime: any, { transaction }?: Transactionable): Promise<void>;
     on(workflow: WorkflowModel): void;
     off(workflow: WorkflowModel): void;
+    execute(workflow: any, values: any, options: any): Promise<void | import("../..").Processor>;
 }