@nocobase/plugin-workflow 0.20.0-alpha.9 → 0.21.0-alpha.2

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

@@ -51,6 +51,7 @@ export default class extends Instruction {
         ValueBlock: (() => JSX.Element) & {
             Initializer: () => JSX.Element;
             Result: (props: any) => JSX.Element;
+            Designer: () => JSX.Element;
         };
     };
     useVariables({ key, title }: {

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

@@ -8,15 +8,12 @@ export default class extends Instruction {
     description: string;
     fieldset: {
         collection: {
+            'x-reactions': any[];
             type: string;
             title: string;
             required: boolean;
-            'x-reactions': any[];
             'x-decorator': string;
             'x-component': string;
-            'x-component-props': {
-                className: string;
-            };
         };
         params: {
             type: string;
@@ -24,13 +21,13 @@ export default class extends Instruction {
                 values: {
                     type: string;
                     title: string;
+                    description: string;
                     'x-decorator': string;
                     'x-decorator-props': {
                         labelAlign: string;
                         className: string;
                     };
                     'x-component': string;
-                    description: string;
                 };
                 appends: {
                     type: string;

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

@@ -8,15 +8,12 @@ export default class extends Instruction {
     description: string;
     fieldset: {
         collection: {
+            'x-reactions': any[];
             type: string;
             title: string;
             required: boolean;
-            'x-reactions': any[];
             'x-decorator': string;
             'x-component': string;
-            'x-component-props': {
-                className: string;
-            };
         };
         params: {
             type: string;
@@ -27,11 +24,11 @@ export default class extends Instruction {
                     title: string;
                     'x-decorator': string;
                     'x-component': string;
+                    'x-use-component-props': () => {
+                        options: any[];
+                        className: string;
+                    };
                     'x-component-props': {
-                        useProps(): {
-                            options: any[];
-                            className: string;
-                        };
                         dynamicComponent: string;
                     };
                 };

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

@@ -10,15 +10,12 @@ export default class extends Instruction {
     description: string;
     fieldset: {
         collection: {
+            'x-reactions': any[];
             type: string;
             title: string;
             required: boolean;
-            'x-reactions': any[];
             'x-decorator': string;
             'x-component': string;
-            'x-component-props': {
-                className: string;
-            };
         };
         multiple: {
             type: string;
@@ -36,11 +33,11 @@ export default class extends Instruction {
                     title: string;
                     'x-decorator': string;
                     'x-component': string;
+                    'x-use-component-props': () => {
+                        options: any[];
+                        className: string;
+                    };
                     'x-component-props': {
-                        useProps(): {
-                            options: any[];
-                            className: string;
-                        };
                         dynamicComponent: string;
                     };
                 };

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

@@ -13,15 +13,12 @@ export default class extends Instruction {
     description: string;
     fieldset: {
         collection: {
+            'x-reactions': any[];
             type: string;
             title: string;
             required: boolean;
-            'x-reactions': any[];
             'x-decorator': string;
             'x-component': string;
-            'x-component-props': {
-                className: string;
-            };
         };
         params: {
             type: string;
@@ -46,11 +43,11 @@ export default class extends Instruction {
                     type: string;
                     'x-decorator': string;
                     'x-component': string;
+                    'x-use-component-props': () => {
+                        options: any[];
+                        className: string;
+                    };
                     'x-component-props': {
-                        useProps(): {
-                            options: any[];
-                            className: string;
-                        };
                         dynamicComponent: string;
                     };
                 };
@@ -60,13 +57,13 @@ export default class extends Instruction {
                     };
                     type: string;
                     title: string;
+                    description: string;
                     'x-decorator': string;
                     'x-decorator-props': {
                         labelAlign: string;
                         className: string;
                     };
                     'x-component': string;
-                    description: string;
                 };
             };
         };

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

@@ -5,31 +5,28 @@ export declare const collection: {
     'x-reactions': any[];
     'x-decorator': string;
     'x-component': string;
-    'x-component-props': {
-        className: string;
-    };
 };
 export declare const values: {
     type: string;
     title: string;
+    description: string;
     'x-decorator': string;
     'x-decorator-props': {
         labelAlign: string;
         className: string;
     };
     'x-component': string;
-    description: string;
 };
 export declare const filter: {
     type: string;
     title: string;
     'x-decorator': string;
     'x-component': string;
+    'x-use-component-props': () => {
+        options: any[];
+        className: string;
+    };
     'x-component-props': {
-        useProps(): {
-            options: any[];
-            className: string;
-        };
         dynamicComponent: string;
     };
 };

package/dist/client/triggers/collection.d.ts

@@ -1,20 +1,22 @@
 /// <reference types="react" />
 import { SchemaInitializerItemType, useCollectionDataSource } from '@nocobase/client';
+import { useWorkflowAnyExecuted } from '../hooks';
 import { Trigger } from '.';
 export default class extends Trigger {
     title: string;
     description: string;
     fieldset: {
         collection: {
+            'x-disabled': string;
+            'x-component-props': {
+                dataSourceFilter(item: any): any;
+            };
             "x-reactions": any[];
             type: string;
             title: string;
             required: boolean;
             'x-decorator': string;
             'x-component': string;
-            'x-component-props': {
-                className: string;
-            };
         };
         mode: {
             type: string;
@@ -62,12 +64,7 @@ export default class extends Trigger {
         };
         condition: {
             title: string;
-            'x-component-props': {
-                useProps: () => {
-                    options: any[];
-                    className: string;
-                };
-            };
+            'x-component-props': {};
             'x-reactions': {
                 dependencies: string[];
                 fulfill: {
@@ -79,6 +76,10 @@ export default class extends Trigger {
             type: string;
             'x-decorator': string;
             'x-component': string;
+            'x-use-component-props': () => {
+                options: any[];
+                className: string;
+            };
         };
         appends: {
             'x-reactions': {
@@ -103,6 +104,7 @@ export default class extends Trigger {
     };
     scope: {
         useCollectionDataSource: typeof useCollectionDataSource;
+        useWorkflowAnyExecuted: typeof useWorkflowAnyExecuted;
     };
     components: {
         FieldsSelect: import("react").MemoExoticComponent<import("@formily/reactive-react").ReactFC<Omit<any, "ref">>>;

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

@@ -1,5 +1,5 @@
 import React from 'react';
-export declare function OnField({ value, onChange }: {
+export declare function OnField({ value: propsValue, onChange }: {
     value: any;
     onChange: any;
 }): React.JSX.Element;

package/dist/client/utils.d.ts

@@ -1,3 +1,4 @@
 export declare function linkNodes(nodes: any): void;
-export declare function isValidFilter(condition: any): any;
 export declare function traverseSchema(schema: any, fn: any): void;
+export declare function getWorkflowDetailPath(id: string | number): string;
+export declare function getWorkflowExecutionsPath(id: string | number): string;

package/dist/externalVersion.js

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

package/dist/locale/zh-CN.json

@@ -46,8 +46,8 @@
   "Full form data": "完整表单数据",
   "Select context": "选择上下文",
   "Collection event": "数据表事件",
-  "Event will be triggered on collection data row created, updated or deleted.":
-    "当数据表中的数据被新增、更新或删除时触发。",
+  "Triggered when data changes in the collection, such as after adding, updating, or deleting a record. Unlike \"Post-action event\", Collection event listens for data changes rather than HTTP requests. Unless you understand the exact meaning, it is recommended to use \"Post-action event\".":
+    "当数据表中的数据发生变化时触发，比如新增、更新或删除一条数据后。与“操作后事件”不同，数据表事件监听数据变动而不是 HTTP 请求，除非你明白确切含义，否则推荐使用“操作后事件”。",
   "Trigger on": "触发时机",
   "After record added": "新增数据后",
   "After record updated": "更新数据后",
@@ -61,7 +61,7 @@
   "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.":
     "请选中需要在后续节点中被访问的关系字段。超过两层的对多关联可能会导致性能问题，请谨慎使用。",
   "Schedule event": "定时任务",
-  "Event will be scheduled and triggered base on time conditions.": "基于时间条件进行定时触发的事件。",
+  "Triggered according to preset time conditions. Suitable for one-time or periodic tasks, such as sending notifications and cleaning data on a schedule.": "按预设的时间条件定时触发。适用于一次性或周期性的任务，如定时发送通知、清理数据等。",
   "Trigger mode": "触发模式",
   "Based on certain date": "自定义时间",
   "Based on date field of collection": "根据数据表时间字段",

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-03-12T13:26:04.248Z"}
+{"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-04-03T15:43:08.830Z"}

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-03-12T13:26:03.924Z"}
+{"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-04-03T15:43:08.498Z"}

package/dist/server/Plugin.d.ts

@@ -12,6 +12,7 @@ export default class PluginWorkflowServer extends Plugin {
     instructions: Registry<InstructionInterface>;
     triggers: Registry<Trigger>;
     functions: Registry<CustomFunction>;
+    enabledCache: Map<number, WorkflowModel>;
     private ready;
     private executing;
     private pending;
@@ -21,7 +22,7 @@ export default class PluginWorkflowServer extends Plugin {
     private meter;
     getLogger(workflowId: ID): Logger;
     isWorkflowSync(workflow: WorkflowModel): boolean;
-    onBeforeSave: (instance: WorkflowModel, options: any) => Promise<void>;
+    private onBeforeSave;
     registerTrigger<T extends Trigger>(type: string, trigger: T | {
         new (p: Plugin): T;
     }): void;
@@ -42,5 +43,6 @@ export default class PluginWorkflowServer extends Plugin {
     private prepare;
     private dispatch;
     private process;
+    useDataSourceTransaction(dataSourceName: string, transaction: any, create?: boolean): any;
 }
 export {};

package/dist/server/Plugin.js

@@ -52,6 +52,7 @@ class PluginWorkflowServer extends import_server.Plugin {
   instructions = new import_utils.Registry();
   triggers = new import_utils.Registry();
   functions = new import_utils.Registry();
+  enabledCache = /* @__PURE__ */ new Map();
   ready = false;
   executing = null;
   pending = [];
@@ -247,8 +248,10 @@ class PluginWorkflowServer extends import_server.Plugin {
         trigger.off({ ...workflow.get(), ...prev });
       }
       trigger.on(workflow);
+      this.enabledCache.set(workflow.id, workflow);
     } else {
       trigger.off(workflow);
+      this.enabledCache.delete(workflow.id);
     }
   }
   trigger(workflow, context, options = {}) {
@@ -269,9 +272,7 @@ class PluginWorkflowServer extends import_server.Plugin {
     this.events.push([workflow, context, rest]);
     this.eventsCount = this.events.length;
     logger.info(`new event triggered, now events: ${this.events.length}`);
-    logger.debug(`event data:`, {
-      data: context
-    });
+    logger.debug(`event data:`, { context });
     if (this.events.length > 1) {
       return;
     }
@@ -419,19 +420,30 @@ class PluginWorkflowServer extends import_server.Plugin {
     if (execution.status === import_constants.EXECUTION_STATUS.QUEUEING) {
       await execution.update({ status: import_constants.EXECUTION_STATUS.STARTED }, { transaction: options.transaction });
     }
+    const logger = this.getLogger(execution.workflowId);
     const processor = this.createProcessor(execution, options);
-    this.getLogger(execution.workflowId).info(`execution (${execution.id}) ${job ? "resuming" : "starting"}...`);
+    logger.info(`execution (${execution.id}) ${job ? "resuming" : "starting"}...`);
     try {
       await (job ? processor.resume(job) : processor.start());
-      this.getLogger(execution.workflowId).info(
-        `execution (${execution.id}) finished with status: ${execution.status}`
-      );
+      logger.info(`execution (${execution.id}) finished with status: ${execution.status}`, { execution });
       if (execution.status && ((_b = (_a = execution.workflow.options) == null ? void 0 : _a.deleteExecutionOnStatus) == null ? void 0 : _b.includes(execution.status))) {
         await execution.destroy();
       }
     } catch (err) {
-      this.getLogger(execution.workflowId).error(`execution (${execution.id}) error: ${err.message}`, err);
+      logger.error(`execution (${execution.id}) error: ${err.message}`, err);
     }
     return processor;
   }
+  useDataSourceTransaction(dataSourceName = "main", transaction, create = false) {
+    const { db } = this.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager;
+    if (!db) {
+      return;
+    }
+    if (db.sequelize === (transaction == null ? void 0 : transaction.sequelize)) {
+      return transaction;
+    }
+    if (create) {
+      return db.sequelize.transaction();
+    }
+  }
 }

package/dist/server/collections/executions.js

@@ -32,7 +32,7 @@ var executions_default = {
       name: "workflow"
     },
     {
-      type: "uid",
+      type: "string",
       name: "key"
     },
     {

package/dist/server/instructions/CreateInstruction.js

@@ -21,20 +21,23 @@ __export(CreateInstruction_exports, {
   default: () => CreateInstruction_default
 });
 module.exports = __toCommonJS(CreateInstruction_exports);
+var import_data_source_manager = require("@nocobase/data-source-manager");
 var import_constants = require("../constants");
 var import_utils = require("../utils");
 var import__ = require(".");
 class CreateInstruction extends import__.Instruction {
   async run(node, input, processor) {
     const { collection, params: { appends = [], ...params } = {} } = node.config;
-    const { repository, model } = node.constructor.database.getCollection(collection);
+    const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(collection);
+    const { repository, filterTargetKey } = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(collectionName);
     const options = processor.getParsedValue(params, node.id);
+    const transaction = this.workflow.useDataSourceTransaction(dataSourceName, processor.transaction);
     const created = await repository.create({
       ...options,
       context: {
         stack: Array.from(new Set((processor.execution.context.stack ?? []).concat(processor.execution.id)))
       },
-      transaction: processor.transaction
+      transaction
     });
     let result = created;
     if (created && appends.length) {
@@ -44,9 +47,9 @@ class CreateInstruction extends import__.Instruction {
         return set;
       }, /* @__PURE__ */ new Set());
       result = await repository.findOne({
-        filterByTk: created[model.primaryKeyAttribute],
+        filterByTk: created[filterTargetKey],
         appends: Array.from(includeFields),
-        transaction: processor.transaction
+        transaction
       });
     }
     return {

package/dist/server/instructions/DestroyInstruction.js

@@ -21,19 +21,21 @@ __export(DestroyInstruction_exports, {
   default: () => DestroyInstruction_default
 });
 module.exports = __toCommonJS(DestroyInstruction_exports);
+var import_data_source_manager = require("@nocobase/data-source-manager");
 var import__ = require(".");
 var import_constants = require("../constants");
 class DestroyInstruction extends import__.Instruction {
   async run(node, input, processor) {
     const { collection, params = {} } = node.config;
-    const repo = node.constructor.database.getRepository(collection);
+    const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(collection);
+    const { repository } = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(collectionName);
     const options = processor.getParsedValue(params, node.id);
-    const result = await repo.destroy({
+    const result = await repository.destroy({
       ...options,
       context: {
         stack: Array.from(new Set((processor.execution.context.stack ?? []).concat(processor.execution.id)))
       },
-      transaction: processor.transaction
+      transaction: this.workflow.useDataSourceTransaction(dataSourceName, processor.transaction)
     });
     return {
       result,

package/dist/server/instructions/QueryInstruction.js

@@ -22,13 +22,15 @@ __export(QueryInstruction_exports, {
 });
 module.exports = __toCommonJS(QueryInstruction_exports);
 var import_actions = require("@nocobase/actions");
+var import_data_source_manager = require("@nocobase/data-source-manager");
 var import_constants = require("../constants");
 var import_utils = require("../utils");
 var import__ = require(".");
 class QueryInstruction extends import__.Instruction {
   async run(node, input, processor) {
     const { collection, multiple, params = {}, failOnEmpty = false } = node.config;
-    const repo = node.constructor.database.getRepository(collection);
+    const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(collection);
+    const { repository } = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(collectionName);
     const {
       page = import_actions.DEFAULT_PAGE,
       pageSize = import_actions.DEFAULT_PER_PAGE,
@@ -42,7 +44,7 @@ class QueryInstruction extends import__.Instruction {
         return set;
       }, /* @__PURE__ */ new Set())
     ) : options.appends;
-    const result = await (multiple ? repo.find : repo.findOne).call(repo, {
+    const result = await (multiple ? repository.find : repository.findOne).call(repository, {
       ...options,
       ...import_actions.utils.pageArgsToLimitArgs(page, pageSize),
       sort: sort.filter((item) => item.field).map((item) => {
@@ -50,7 +52,7 @@ class QueryInstruction extends import__.Instruction {
         return `${((_a = item.direction) == null ? void 0 : _a.toLowerCase()) === "desc" ? "-" : ""}${item.field}`;
       }),
       appends,
-      transaction: processor.transaction
+      transaction: this.workflow.useDataSourceTransaction(dataSourceName, processor.transaction)
     });
     if (failOnEmpty && (multiple ? !result.length : !result)) {
       return {

package/dist/server/instructions/UpdateInstruction.js

@@ -21,19 +21,21 @@ __export(UpdateInstruction_exports, {
   default: () => UpdateInstruction_default
 });
 module.exports = __toCommonJS(UpdateInstruction_exports);
+var import_data_source_manager = require("@nocobase/data-source-manager");
 var import_constants = require("../constants");
 var import__ = require(".");
 class UpdateInstruction extends import__.Instruction {
   async run(node, input, processor) {
     const { collection, params = {} } = node.config;
-    const repo = node.constructor.database.getRepository(collection);
+    const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(collection);
+    const { repository } = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(collectionName);
     const options = processor.getParsedValue(params, node.id);
-    const result = await repo.update({
+    const result = await repository.update({
       ...options,
       context: {
         stack: Array.from(new Set((processor.execution.context.stack ?? []).concat(processor.execution.id)))
       },
-      transaction: processor.transaction
+      transaction: this.workflow.useDataSourceTransaction(dataSourceName, processor.transaction)
     });
     return {
       result: result.length ?? result,

package/dist/server/migrations/20230411034722-manual-multi-form.js

@@ -112,12 +112,10 @@ function migrateConfig({ schema = {}, actions = [] }) {
     [formId]: {
       type: "void",
       "x-component": "FormV2",
-      "x-component-props": {
-        useProps: "{{ useFormBlockProps }}"
-      },
+      "x-use-component-props": "useFormBlockProps",
       properties: {
         grid: Object.assign(formBlock.properties.grid, {
-          "x-initializer": "AddCustomFormField"
+          "x-initializer": "workflowManual:customForm:configureFields"
         }),
         // 7.
         actions: {
@@ -130,7 +128,7 @@ function migrateConfig({ schema = {}, actions = [] }) {
               marginTop: "1.5em"
             }
           },
-          "x-initializer": "AddActionButton",
+          "x-initializer": "workflowManual:form:configureActions",
           properties: schema.actions
         }
       }

package/dist/server/migrations/20230612021134-manual-collection-block.js

@@ -67,15 +67,13 @@ function migrateSchema(schema = {}) {
           type: "void",
           name: id,
           "x-component": "FormV2",
-          "x-component-props": {
-            useProps: "{{useDetailsBlockProps}}"
-          },
+          "x-use-component-props": "useDetailsBlockProps",
           properties: {
             grid: {
               type: "void",
               name: "grid",
               "x-component": "Grid",
-              "x-initializer": "ReadPrettyFormItemInitializers",
+              "x-initializer": "details:configureFields",
               properties: grid.properties
             }
           }