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

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

@@ -33,6 +33,7 @@ module.exports = __toCommonJS(DateFieldScheduleTrigger_exports);
 var import_database = require("@nocobase/database");
 var import_cron_parser = __toESM(require("cron-parser"));
 var import_utils = require("./utils");
+var import_data_source_manager = require("@nocobase/data-source-manager");
 function getOnTimestampWithOffset({ field, offset = 0, unit = 1e3 }, now) {
   if (!field) {
     return null;
@@ -303,7 +304,9 @@ class ScheduleTrigger {
   on(workflow) {
     this.inspect([workflow]);
     const { collection } = workflow.config;
-    const event = `${collection}.afterSaveWithAssociations`;
+    const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(collection);
+    const event = `${collectionName}.afterSaveWithAssociations`;
+    const eventKey = `${collection}.afterSaveWithAssociations`;
     const name = getHookId(workflow, event);
     if (this.events.has(name)) {
       return;
@@ -313,7 +316,7 @@ class ScheduleTrigger {
       return this.schedule(workflow, data, nextTime, Boolean(nextTime), { transaction });
     };
     this.events.set(name, listener);
-    this.workflow.app.db.on(event, listener);
+    this.workflow.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.db.on(event, listener);
   }
   off(workflow) {
     for (const [key, timer] of this.cache.entries()) {
@@ -323,12 +326,15 @@ class ScheduleTrigger {
       }
     }
     const { collection } = workflow.config;
-    const event = `${collection}.afterSave`;
+    const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(collection);
+    const event = `${collectionName}.afterSaveWithAssociations`;
+    const eventKey = `${collection}.afterSaveWithAssociations`;
     const name = getHookId(workflow, event);
-    if (this.events.has(name)) {
+    if (this.events.has(eventKey)) {
       const listener = this.events.get(name);
-      this.events.delete(name);
-      this.workflow.app.db.off(event, listener);
+      const { db } = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager;
+      db.off(event, listener);
+      this.events.delete(eventKey);
     }
   }
 }

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": "0.20.0-alpha.9",
+  "version": "0.21.0-alpha.1",
   "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": "0.20.0-alpha.9"
+    "@nocobase/plugin-workflow-test": "0.21.0-alpha.1"
   },
   "devDependencies": {
     "@ant-design/icons": "5.x",
@@ -45,7 +45,7 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "5473d9039cfdb649a8c8c625edefc9a3ac464be5",
+  "gitHead": "afd2f3d1341b85ea9daa7b2667dd4ace1fafb7ff",
   "keywords": [
     "Workflow"
   ]

package/dist/client/constant.d.ts

@@ -1,2 +0,0 @@
-export declare const getWorkflowDetailPath: (id: string | number) => string;
-export declare const getWorkflowExecutionsPath: (id: string | number) => string;