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

package/dist/client/ActionTrigger.d.ts

@@ -1,5 +1,5 @@
 import { SchemaInitializerItemType, useCollectionDataSource } from '@nocobase/client';
-import { Trigger } from '@nocobase/plugin-workflow/client';
+import { Trigger, useWorkflowAnyExecuted } from '@nocobase/plugin-workflow/client';
 export default class extends Trigger {
     title: string;
     description: string;
@@ -9,9 +9,7 @@ export default class extends Trigger {
             required: boolean;
             'x-decorator': string;
             'x-component': string;
-            'x-component-props': {
-                className: string;
-            };
+            'x-disabled': string;
             title: string;
             description: string;
             'x-reactions': {
@@ -47,6 +45,7 @@ export default class extends Trigger {
     };
     scope: {
         useCollectionDataSource: typeof useCollectionDataSource;
+        useWorkflowAnyExecuted: typeof useWorkflowAnyExecuted;
     };
     isActionTriggerable: (config: any, context: any) => boolean;
     useVariables(config: any, options: any): import("@nocobase/plugin-workflow/client").VariableOption[];

package/dist/client/index.js

@@ -1 +1 @@
-(function(t,e){typeof exports=="object"&&typeof module!="undefined"?e(exports,require("@nocobase/client"),require("@nocobase/plugin-workflow/client"),require("@formily/react"),require("react-i18next")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client","@nocobase/plugin-workflow/client","@formily/react","react-i18next"],e):(t=typeof globalThis!="undefined"?globalThis:t||self,e(t["@nocobase/plugin-workflow-action-trigger"]={},t["@nocobase/client"],t["@nocobase/plugin-workflow"],t["@formily/react"],t["react-i18next"]))})(this,function(t,e,i,w,m){"use strict";var M=Object.defineProperty,D=Object.defineProperties;var R=Object.getOwnPropertyDescriptors;var y=Object.getOwnPropertySymbols;var q=Object.prototype.hasOwnProperty,L=Object.prototype.propertyIsEnumerable;var A=(t,e,i)=>e in t?M(t,e,{enumerable:!0,configurable:!0,writable:!0,value:i}):t[e]=i,g=(t,e)=>{for(var i in e||(e={}))q.call(e,i)&&A(t,i,e[i]);if(y)for(var i of y(e))L.call(e,i)&&A(t,i,e[i]);return t},f=(t,e)=>D(t,R(e));var a=(t,e,i)=>(A(t,typeof e!="symbol"?e+"":e,i),i);var S=(t,e,i)=>new Promise((w,m)=>{var s=r=>{try{l(i.next(r))}catch(n){m(n)}},c=r=>{try{l(i.throw(r))}catch(n){m(n)}},l=r=>r.done?w(r.value):Promise.resolve(r.value).then(s,c);l((i=i.apply(t,e)).next())});const s="workflow-action-trigger";function c(u,k={}){const{t:o}=l(k);return o(u)}function l(u){return m.useTranslation(s,u)}class r extends i.Trigger{constructor(){super(...arguments);a(this,"title",`{{t("Action event", { ns: "${s}" })}}`);a(this,"description",`{{t("Triggers after specific operations on data are submitted, such as create, update, delete, etc., or directly submitting a record to the workflow.", { ns: "${s}" })}}`);a(this,"fieldset",{collection:{type:"string",required:!0,"x-decorator":"FormItem","x-component":"CollectionSelect","x-component-props":{className:"auto-width"},title:`{{t("Collection", { ns: "${s}" })}}`,description:`{{t("Which collection record belongs to.", { ns: "${s}" })}}`,"x-reactions":[{target:"appends",effects:["onFieldValueChange"],fulfill:{state:{value:[]}}}]},appends:{type:"array",title:`{{t("Associations to use", { ns: "${s}" })}}`,description:'{{t("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.", { ns: "workflow" })}}',"x-decorator":"FormItem","x-component":"AppendsTreeSelect","x-component-props":{title:"Preload associations",multiple:!0,useCollection(){const{values:o}=w.useForm();return o==null?void 0:o.collection}},"x-reactions":[{dependencies:["collection"],fulfill:{state:{visible:"{{!!$deps[0]}}"}}}]}});a(this,"scope",{useCollectionDataSource:e.useCollectionDataSource});a(this,"isActionTriggerable",(o,p)=>["create","update","customize:update","customize:triggerWorkflows"].includes(p.action))}useVariables(o,p){var W;const I=e.useCompile(),{getCollectionFields:h}=e.useCollectionManager_deprecated(),b=c("Trigger data"),T=c("User submitted action"),x=c("Role of user submitted action"),C=[{collectionName:o.collection,name:"data",type:"hasOne",target:o.collection,uiSchema:{title:b}},{collectionName:"users",name:"user",type:"hasOne",target:"users",uiSchema:{title:T}},{name:"roleName",uiSchema:{title:x}}];return i.getCollectionFieldOptions(f(g({appends:["data","user",...((W=o.appends)==null?void 0:W.map(P=>`data.${P}`))||[]]},p),{fields:C,compile:I,getCollectionFields:h}))}useInitializers(o){return o.collection?{name:"triggerData",type:"item",key:"triggerData",title:`{{t("Trigger data", { ns: "${s}" })}}`,Component:i.CollectionBlockInitializer,collection:o.collection,dataSource:"{{$context.data}}"}:null}}const n={name:"submitToWorkflow",title:'{{t("Submit to workflow", { ns: "workflow" })}}',Component:"CustomizeActionInitializer",schema:{title:'{{t("Submit to workflow", { ns: "workflow" })}}',"x-component":"Action","x-component-props":{useProps:"{{ useTriggerWorkflowsActionProps }}"},"x-designer":"Action.Designer","x-action-settings":{skipValidator:!1,onSuccess:{manualClose:!0,redirecting:!1,successMessage:'{{t("Submitted successfully")}}'},triggerWorkflows:[]},"x-action":"customize:triggerWorkflows"}},d={name:"submitToWorkflow",title:'{{t("Submit to workflow", { ns: "workflow" })}}',Component:"CustomizeActionInitializer",schema:{title:'{{t("Submit to workflow", { ns: "workflow" })}}',"x-component":"Action","x-component-props":{useProps:"{{ useRecordTriggerWorkflowsActionProps }}"},"x-designer":"Action.Designer","x-action-settings":{onSuccess:{manualClose:!0,redirecting:!1,successMessage:'{{t("Submitted successfully")}}'},triggerWorkflows:[]},"x-action":"customize:triggerWorkflows"}},z=f(g({},d),{schema:f(g({},d.schema),{"x-component":"Action.Link"})});class F extends e.Plugin{load(){return S(this,null,function*(){this.app.pm.get("workflow").registerTrigger("action",r),this.app.addScopes({useTriggerWorkflowsActionProps:i.useTriggerWorkflowsActionProps,useRecordTriggerWorkflowsActionProps:i.useRecordTriggerWorkflowsActionProps}),this.app.schemaInitializerManager.get("FormActionInitializers").add("customize.submitToWorkflow",n),this.app.schemaInitializerManager.get("CreateFormActionInitializers").add("customize.submitToWorkflow",n),this.app.schemaInitializerManager.get("UpdateFormActionInitializers").add("customize.submitToWorkflow",n),this.app.schemaInitializerManager.get("DetailsActionInitializers").add("customize.submitToWorkflow",d),this.app.schemaInitializerManager.get("ReadPrettyFormActionInitializers").add("customize.submitToWorkflow",d),this.app.schemaInitializerManager.get("TableActionColumnInitializers").add("customize.submitToWorkflow",z),this.app.schemaInitializerManager.get("GridCardItemActionInitializers").add("customize.submitToWorkflow",z),this.app.schemaInitializerManager.get("ListItemActionInitializers").add("customize.submitToWorkflow",z)})}}t.default=F,Object.defineProperties(t,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});
+(function(o,e){typeof exports=="object"&&typeof module!="undefined"?e(exports,require("@nocobase/client"),require("@nocobase/plugin-workflow/client"),require("@formily/react"),require("react-i18next")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client","@nocobase/plugin-workflow/client","@formily/react","react-i18next"],e):(o=typeof globalThis!="undefined"?globalThis:o||self,e(o["@nocobase/plugin-workflow-action-trigger"]={},o["@nocobase/client"],o["@nocobase/plugin-workflow"],o["@formily/react"],o["react-i18next"]))})(this,function(o,e,t,w,m){"use strict";var M=Object.defineProperty,D=Object.defineProperties;var R=Object.getOwnPropertyDescriptors;var y=Object.getOwnPropertySymbols;var q=Object.prototype.hasOwnProperty,$=Object.prototype.propertyIsEnumerable;var z=(o,e,t)=>e in o?M(o,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):o[e]=t,p=(o,e)=>{for(var t in e||(e={}))q.call(e,t)&&z(o,t,e[t]);if(y)for(var t of y(e))$.call(e,t)&&z(o,t,e[t]);return o},f=(o,e)=>D(o,R(e));var a=(o,e,t)=>(z(o,typeof e!="symbol"?e+"":e,t),t);var S=(o,e,t)=>new Promise((w,m)=>{var s=r=>{try{l(t.next(r))}catch(n){m(n)}},c=r=>{try{l(t.throw(r))}catch(n){m(n)}},l=r=>r.done?w(r.value):Promise.resolve(r.value).then(s,c);l((t=t.apply(o,e)).next())});const s="workflow-action-trigger";function c(u,A={}){const{t:i}=l(A);return i(u)}function l(u){return m.useTranslation(s,u)}class r extends t.Trigger{constructor(){super(...arguments);a(this,"title",`{{t("Action event", { ns: "${s}" })}}`);a(this,"description",`{{t("Triggers after specific operations on data are submitted, such as create, update, delete, etc., or directly submitting a record to the workflow.", { ns: "${s}" })}}`);a(this,"fieldset",{collection:{type:"string",required:!0,"x-decorator":"FormItem","x-component":"DataSourceCollectionCascader","x-disabled":"{{ useWorkflowAnyExecuted() }}",title:`{{t("Collection", { ns: "${s}" })}}`,description:`{{t("Which collection record belongs to.", { ns: "${s}" })}}`,"x-reactions":[{target:"appends",effects:["onFieldValueChange"],fulfill:{state:{value:[]}}}]},appends:{type:"array",title:`{{t("Associations to use", { ns: "${s}" })}}`,description:'{{t("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.", { ns: "workflow" })}}',"x-decorator":"FormItem","x-component":"AppendsTreeSelect","x-component-props":{title:"Preload associations",multiple:!0,useCollection(){const{values:i}=w.useForm();return i==null?void 0:i.collection}},"x-reactions":[{dependencies:["collection"],fulfill:{state:{visible:"{{!!$deps[0]}}"}}}]}});a(this,"scope",{useCollectionDataSource:e.useCollectionDataSource,useWorkflowAnyExecuted:t.useWorkflowAnyExecuted});a(this,"isActionTriggerable",(i,g)=>["create","update","customize:update","customize:triggerWorkflows"].includes(g.action))}useVariables(i,g){var C;const h=e.useCompile(),{getCollectionFields:I}=e.useCollectionManager_deprecated(),b=c("Trigger data"),T=c("User submitted action"),x=c("Role of user submitted action"),W=[{collectionName:i.collection,name:"data",type:"hasOne",target:i.collection,uiSchema:{title:b}},{collectionName:"users",name:"user",type:"hasOne",target:"users",uiSchema:{title:T}},{name:"roleName",uiSchema:{title:x}}];return t.getCollectionFieldOptions(f(p({appends:["data","user",...((C=i.appends)==null?void 0:C.map(P=>`data.${P}`))||[]]},g),{fields:W,compile:h,getCollectionFields:I}))}useInitializers(i){return i.collection?{name:"triggerData",type:"item",key:"triggerData",title:`{{t("Trigger data", { ns: "${s}" })}}`,Component:t.CollectionBlockInitializer,collection:i.collection,dataPath:"$context.data"}:null}}const n={name:"submitToWorkflow",title:'{{t("Submit to workflow", { ns: "workflow" })}}',Component:"CustomizeActionInitializer",schema:{title:'{{t("Submit to workflow", { ns: "workflow" })}}',"x-component":"Action","x-component-props":{useProps:"{{ useTriggerWorkflowsActionProps }}"},"x-designer":"Action.Designer","x-action-settings":{skipValidator:!1,onSuccess:{manualClose:!0,redirecting:!1,successMessage:'{{t("Submitted successfully")}}'},triggerWorkflows:[]},"x-action":"customize:triggerWorkflows"}},d={name:"submitToWorkflow",title:'{{t("Submit to workflow", { ns: "workflow" })}}',Component:"CustomizeActionInitializer",schema:{title:'{{t("Submit to workflow", { ns: "workflow" })}}',"x-component":"Action","x-component-props":{useProps:"{{ useRecordTriggerWorkflowsActionProps }}"},"x-designer":"Action.Designer","x-action-settings":{onSuccess:{manualClose:!0,redirecting:!1,successMessage:'{{t("Submitted successfully")}}'},triggerWorkflows:[]},"x-action":"customize:triggerWorkflows"}},k=f(p({},d),{schema:f(p({},d.schema),{"x-component":"Action.Link"})});class F extends e.Plugin{load(){return S(this,null,function*(){this.app.pm.get("workflow").registerTrigger("action",r),this.app.addScopes({useTriggerWorkflowsActionProps:t.useTriggerWorkflowsActionProps,useRecordTriggerWorkflowsActionProps:t.useRecordTriggerWorkflowsActionProps}),this.app.schemaInitializerManager.get("FormActionInitializers").add("customize.submitToWorkflow",n),this.app.schemaInitializerManager.get("createForm:configureActions").add("customize.submitToWorkflow",n),this.app.schemaInitializerManager.get("editForm:configureActions").add("customize.submitToWorkflow",n),this.app.schemaInitializerManager.get("detailsWithPaging:configureActions").add("customize.submitToWorkflow",d),this.app.schemaInitializerManager.get("details:configureActions").add("customize.submitToWorkflow",d),this.app.schemaInitializerManager.get("table:configureItemActions").add("customize.submitToWorkflow",k),this.app.schemaInitializerManager.get("gridCard:configureItemActions").add("customize.submitToWorkflow",k),this.app.schemaInitializerManager.get("list:configureItemActions").add("customize.submitToWorkflow",k)})}}o.default=F,Object.defineProperties(o,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});

package/dist/externalVersion.js

@@ -1,15 +1,15 @@
 module.exports = {
   "@formily/react": "2.3.0",
-  "@nocobase/client": "0.20.0-alpha.9",
-  "@nocobase/plugin-workflow": "0.20.0-alpha.9",
+  "@nocobase/client": "0.21.0-alpha.1",
+  "@nocobase/plugin-workflow": "0.21.0-alpha.1",
   "react-i18next": "11.18.6",
   "lodash": "4.17.21",
   "sequelize": "6.35.2",
-  "@nocobase/database": "0.20.0-alpha.9",
-  "@nocobase/server": "0.20.0-alpha.9",
-  "@nocobase/resourcer": "0.20.0-alpha.9",
-  "@nocobase/actions": "0.20.0-alpha.9",
-  "@nocobase/plugin-workflow-test": "0.20.0-alpha.9",
-  "@nocobase/test": "0.20.0-alpha.9",
-  "@nocobase/utils": "0.20.0-alpha.9"
+  "@nocobase/database": "0.21.0-alpha.1",
+  "@nocobase/server": "0.21.0-alpha.1",
+  "@nocobase/actions": "0.21.0-alpha.1",
+  "@nocobase/data-source-manager": "0.21.0-alpha.1",
+  "@nocobase/plugin-workflow-test": "0.21.0-alpha.1",
+  "@nocobase/test": "0.21.0-alpha.1",
+  "@nocobase/utils": "0.21.0-alpha.1"
 };

package/dist/server/ActionTrigger.d.ts

@@ -1,13 +1,12 @@
 import { DefaultContext } from '@nocobase/server';
-import { ActionContext } from '@nocobase/resourcer';
-import { Next } from '@nocobase/actions';
+import { Context as ActionContext, Next } from '@nocobase/actions';
 import WorkflowPlugin, { Trigger, WorkflowModel } from '@nocobase/plugin-workflow';
 interface Context extends ActionContext, DefaultContext {
 }
 export default class extends Trigger {
     constructor(workflow: WorkflowPlugin);
-    triggerAction(context: Context, next: Next): Promise<any>;
-    middleware: (context: Context, next: Next) => Promise<any>;
+    triggerAction(context: Context, next: Next): Promise<never>;
+    middleware: (context: Context, next: Next) => Promise<void>;
     private trigger;
     on(workflow: WorkflowModel): void;
     off(workflow: WorkflowModel): void;

package/dist/server/ActionTrigger.js

@@ -23,10 +23,11 @@ module.exports = __toCommonJS(ActionTrigger_exports);
 var import_lodash = require("lodash");
 var import_database = require("@nocobase/database");
 var import_plugin_workflow = require("@nocobase/plugin-workflow");
+var import_data_source_manager = require("@nocobase/data-source-manager");
 class ActionTrigger_default extends import_plugin_workflow.Trigger {
   constructor(workflow) {
     super(workflow);
-    workflow.app.resourcer.use(this.middleware);
+    workflow.app.use(this.middleware, { after: "dataSource" });
   }
   async triggerAction(context, next) {
     const { triggerWorkflows } = context.action.params;
@@ -57,9 +58,11 @@ class ActionTrigger_default extends import_plugin_workflow.Trigger {
   };
   async trigger(context) {
     const { triggerWorkflows = "", values } = context.action.params;
+    const dataSourceHeader = context.get("x-data-source") || "main";
     const { currentUser, currentRole } = context.state;
+    const { model: UserModel } = this.workflow.db.getCollection("users");
     const userInfo = {
-      user: (0, import_plugin_workflow.toJSON)(currentUser),
+      user: UserModel.build(currentUser).desensitize(),
       roleName: currentRole
     };
     const triggers = triggerWorkflows.split(",").map((trigger) => trigger.split("!"));
@@ -76,12 +79,16 @@ class ActionTrigger_default extends import_plugin_workflow.Trigger {
     const asyncGroup = [];
     for (const workflow of workflows) {
       const { collection, appends = [] } = workflow.config;
+      const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(collection);
       const trigger = triggers.find((trigger2) => trigger2[0] == workflow.key);
       const event = [workflow];
       if (context.action.resourceName !== "workflows") {
         if (!context.body) {
           continue;
         }
+        if (dataSourceName !== dataSourceHeader) {
+          continue;
+        }
         const { body: data } = context;
         for (const row of Array.isArray(data) ? data : [data]) {
           let payload = row;
@@ -98,7 +105,7 @@ class ActionTrigger_default extends import_plugin_workflow.Trigger {
           }
           const model = payload.constructor;
           if (payload instanceof import_database.Model) {
-            if (collection !== model.collection.name) {
+            if (collectionName !== model.collection.name) {
               continue;
             }
             if (appends.length) {
@@ -111,7 +118,7 @@ class ActionTrigger_default extends import_plugin_workflow.Trigger {
           event.push({ data: (0, import_plugin_workflow.toJSON)(payload), ...userInfo });
         }
       } else {
-        const { model, repository } = context.db.getCollection(collection);
+        const { model, repository } = context.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(collectionName);
         let data = trigger[1] ? (0, import_lodash.get)(values, trigger[1]) : values;
         const pk = (0, import_lodash.get)(data, model.primaryKeyAttribute);
         if (appends.length && pk != null) {

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：数据操作触发器",
   "description": "Bind action buttons to trigger workflow events when clicked.",
   "description.zh-CN": "可对数据操作按钮绑定，在点击后触发对应的工作流事件。",
-  "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/plugins/workflow-action-trigger",
@@ -21,7 +21,7 @@
     "@nocobase/server": "0.x",
     "@nocobase/test": "0.x"
   },
-  "gitHead": "5473d9039cfdb649a8c8c625edefc9a3ac464be5",
+  "gitHead": "afd2f3d1341b85ea9daa7b2667dd4ace1fafb7ff",
   "keywords": [
     "Workflow"
   ]

package/src/client/ActionTrigger.tsx

@@ -6,7 +6,12 @@ import {
   useCollectionManager_deprecated,
   useCompile,
 } from '@nocobase/client';
-import { Trigger, CollectionBlockInitializer, getCollectionFieldOptions } from '@nocobase/plugin-workflow/client';
+import {
+  Trigger,
+  CollectionBlockInitializer,
+  getCollectionFieldOptions,
+  useWorkflowAnyExecuted,
+} from '@nocobase/plugin-workflow/client';
 import { NAMESPACE, useLang } from '../locale';
 
 export default class extends Trigger {
@@ -17,10 +22,8 @@ export default class extends Trigger {
       type: 'string',
       required: true,
       'x-decorator': 'FormItem',
-      'x-component': 'CollectionSelect',
-      'x-component-props': {
-        className: 'auto-width',
-      },
+      'x-component': 'DataSourceCollectionCascader',
+      'x-disabled': '{{ useWorkflowAnyExecuted() }}',
       title: `{{t("Collection", { ns: "${NAMESPACE}" })}}`,
       description: `{{t("Which collection record belongs to.", { ns: "${NAMESPACE}" })}}`,
       'x-reactions': [
@@ -63,6 +66,7 @@ export default class extends Trigger {
   };
   scope = {
     useCollectionDataSource,
+    useWorkflowAnyExecuted,
   };
   isActionTriggerable = (config, context) => {
     return ['create', 'update', 'customize:update', 'customize:triggerWorkflows'].includes(context.action);
@@ -126,7 +130,7 @@ export default class extends Trigger {
       title: `{{t("Trigger data", { ns: "${NAMESPACE}" })}}`,
       Component: CollectionBlockInitializer,
       collection: config.collection,
-      dataSource: '{{$context.data}}',
+      dataPath: '$context.data',
     };
   }
 }

package/src/client/__e2e__/configuration.test.ts

@@ -9,6 +9,7 @@ import {
   apiUpdateWorkflowTrigger,
   appendJsonCollectionName,
   generalWithNoRelationalFields,
+  apiGetDataSourceCount,
 } from '@nocobase/plugin-workflow-test/e2e';
 import { expect, test } from '@nocobase/test/e2e';
 import { dayjs } from '@nocobase/utils';
@@ -51,15 +52,20 @@ test.describe('Configuration page to configure the Trigger node', () => {
     const formEventTriggerNode = new FormEventTriggerNode(page, workFlowName, triggerNodeCollectionName);
     await formEventTriggerNode.nodeConfigure.click();
     await formEventTriggerNode.collectionDropDown.click();
-    await page.getByRole('option', { name: triggerNodeCollectionDisplayName }).click();
+    await page.getByRole('menuitemcheckbox', { name: 'Main right' }).click();
+    await page.getByRole('menuitemcheckbox', { name: triggerNodeCollectionDisplayName }).click();
     await formEventTriggerNode.submitButton.click();
 
     //配置录入数据区块
     const newPage = mockPage();
     await newPage.goto();
     await page.waitForLoadState('networkidle');
-    await page.getByLabel('schema-initializer-Grid-BlockInitializers').hover();
+    await page.getByLabel('schema-initializer-Grid-page:addBlock').hover();
     await page.getByRole('menuitem', { name: 'table Table' }).hover();
+    const dataSourcesCount = await apiGetDataSourceCount();
+    if (dataSourcesCount > 1) {
+      await page.getByRole('menuitem', { name: 'Main right' }).hover();
+    }
     await page.getByRole('menuitem', { name: `${triggerNodeCollectionDisplayName}` }).click();
 
     // 移开鼠标，关闭菜单
@@ -71,16 +77,16 @@ test.describe('Configuration page to configure the Trigger node', () => {
     await page.getByRole('menuitem', { name: 'Add new' }).getByRole('switch').click();
     await expect(page.getByRole('menuitem', { name: 'Add new' }).getByRole('switch')).toBeEnabled();
     await page.getByLabel(`action-Action-Add new-create-${triggerNodeCollectionName}-table`).click();
-    await page.getByLabel(`schema-initializer-Grid-CreateFormBlockInitializers-${triggerNodeCollectionName}`).hover();
+    await page.getByLabel(`schema-initializer-Grid-popup:addNew:addBlock-${triggerNodeCollectionName}`).hover();
     await page.getByRole('menuitem', { name: 'form Form' }).click();
     // 移开鼠标，关闭菜单
     await page.mouse.move(300, 0);
     await page
-      .getByLabel(`schema-initializer-ActionBar-CreateFormActionInitializers-${triggerNodeCollectionName}`)
+      .getByLabel(`schema-initializer-ActionBar-createForm:configureActions-${triggerNodeCollectionName}`)
       .hover();
     await page.getByRole('menuitem', { name: 'Submit' }).click();
     // 绑定工作流
-    await page.getByLabel(`schema-initializer-Grid-FormItemInitializers-${triggerNodeCollectionName}`).hover();
+    await page.getByLabel(`schema-initializer-Grid-form:configureFields-${triggerNodeCollectionName}`).hover();
     await page.getByRole('menuitem', { name: `${triggerNodeFieldDisplayName}` }).click();
     await page.mouse.move(300, 0);
     await page.getByLabel(`action-Action-Submit-submit-${triggerNodeCollectionName}-form`).hover();
@@ -143,15 +149,20 @@ test.describe('Configuration page to configure the Trigger node', () => {
     const formEventTriggerNode = new FormEventTriggerNode(page, workFlowName, triggerNodeCollectionName);
     await formEventTriggerNode.nodeConfigure.click();
     await formEventTriggerNode.collectionDropDown.click();
-    await page.getByRole('option', { name: triggerNodeCollectionDisplayName }).click();
+    await page.getByRole('menuitemcheckbox', { name: 'Main right' }).click();
+    await page.getByRole('menuitemcheckbox', { name: triggerNodeCollectionDisplayName }).click();
     await formEventTriggerNode.submitButton.click();
 
     //配置录入数据区块
     const newPage = mockPage();
     await newPage.goto();
     await page.waitForLoadState('networkidle');
-    await page.getByLabel('schema-initializer-Grid-BlockInitializers').hover();
+    await page.getByLabel('schema-initializer-Grid-page:addBlock').hover();
     await page.getByRole('menuitem', { name: 'table Table' }).hover();
+    const dataSourcesCount = await apiGetDataSourceCount();
+    if (dataSourcesCount > 1) {
+      await page.getByRole('menuitem', { name: 'Main right' }).hover();
+    }
     await page.getByRole('menuitem', { name: `${triggerNodeCollectionDisplayName}` }).click();
 
     // 移开鼠标，关闭菜单
@@ -164,7 +175,7 @@ test.describe('Configuration page to configure the Trigger node', () => {
     await expect(page.getByRole('menuitem', { name: 'Add new' }).getByRole('switch')).toBeEnabled();
 
     await page.getByLabel(`action-Action-Add new-create-${triggerNodeCollectionName}-table`).click();
-    await page.getByLabel(`schema-initializer-Grid-CreateFormBlockInitializers-${triggerNodeCollectionName}`).hover();
+    await page.getByLabel(`schema-initializer-Grid-popup:addNew:addBlock-${triggerNodeCollectionName}`).hover();
     await page.getByRole('menuitem', { name: 'form Form' }).click();
 
     // 移开鼠标，关闭菜单
@@ -172,11 +183,11 @@ test.describe('Configuration page to configure the Trigger node', () => {
 
     // 绑定工作流
     await page
-      .getByLabel(`schema-initializer-ActionBar-CreateFormActionInitializers-${triggerNodeCollectionName}`)
+      .getByLabel(`schema-initializer-ActionBar-createForm:configureActions-${triggerNodeCollectionName}`)
       .hover();
     await page.getByRole('menuitem', { name: 'Customize' }).hover();
     await page.getByRole('menuitem', { name: 'Submit to workflow' }).click();
-    await page.getByLabel(`schema-initializer-Grid-FormItemInitializers-${triggerNodeCollectionName}`).hover();
+    await page.getByLabel(`schema-initializer-Grid-form:configureFields-${triggerNodeCollectionName}`).hover();
     await page.getByRole('menuitem', { name: `${triggerNodeFieldDisplayName}` }).click();
     await page.mouse.move(300, 0);
     await page.getByRole('button', { name: 'Submit to workflow' }).hover();
@@ -649,8 +660,11 @@ test.describe('Configuration page copy to new version', () => {
     // 3、预期结果：新版本工作流配置内容同旧版本一样
     const formEventTriggerNode = new FormEventTriggerNode(page, workFlowName, triggerNodeCollectionName);
     await formEventTriggerNode.nodeConfigure.click();
-    await expect(page.getByRole('button', { name: triggerNodeCollectionDisplayName })).toBeVisible();
-
+    await expect(
+      page
+        .getByLabel('block-item-DataSourceCollectionCascader-workflows-Collection')
+        .getByText(`Main / ${triggerNodeCollectionDisplayName}`),
+    ).toBeVisible();
     // 4、后置处理：删除工作流
     await apiDeleteWorkflow(workflowId);
   });

package/src/client/index.ts

@@ -1,7 +1,7 @@
 import { Plugin, SchemaInitializerItemType } from '@nocobase/client';
 import WorkflowPlugin, {
-  useTriggerWorkflowsActionProps,
   useRecordTriggerWorkflowsActionProps,
+  useTriggerWorkflowsActionProps,
 } from '@nocobase/plugin-workflow/client';
 
 import ActionTrigger from './ActionTrigger';
@@ -76,25 +76,25 @@ export default class extends Plugin {
     const FormActionInitializers = this.app.schemaInitializerManager.get('FormActionInitializers');
     FormActionInitializers.add('customize.submitToWorkflow', submitToWorkflowActionInitializer);
 
-    const CreateFormActionInitializers = this.app.schemaInitializerManager.get('CreateFormActionInitializers');
+    const CreateFormActionInitializers = this.app.schemaInitializerManager.get('createForm:configureActions');
     CreateFormActionInitializers.add('customize.submitToWorkflow', submitToWorkflowActionInitializer);
 
-    const UpdateFormActionInitializers = this.app.schemaInitializerManager.get('UpdateFormActionInitializers');
+    const UpdateFormActionInitializers = this.app.schemaInitializerManager.get('editForm:configureActions');
     UpdateFormActionInitializers.add('customize.submitToWorkflow', submitToWorkflowActionInitializer);
 
-    const DetailsActionInitializers = this.app.schemaInitializerManager.get('DetailsActionInitializers');
+    const DetailsActionInitializers = this.app.schemaInitializerManager.get('detailsWithPaging:configureActions');
     DetailsActionInitializers.add('customize.submitToWorkflow', recordTriggerWorkflowActionInitializer);
 
-    const ReadPrettyFormActionInitializers = this.app.schemaInitializerManager.get('ReadPrettyFormActionInitializers');
+    const ReadPrettyFormActionInitializers = this.app.schemaInitializerManager.get('details:configureActions');
     ReadPrettyFormActionInitializers.add('customize.submitToWorkflow', recordTriggerWorkflowActionInitializer);
 
-    const TableActionColumnInitializers = this.app.schemaInitializerManager.get('TableActionColumnInitializers');
+    const TableActionColumnInitializers = this.app.schemaInitializerManager.get('table:configureItemActions');
     TableActionColumnInitializers.add('customize.submitToWorkflow', recordTriggerWorkflowActionLinkInitializer);
 
-    const GridCardItemActionInitializers = this.app.schemaInitializerManager.get('GridCardItemActionInitializers');
+    const GridCardItemActionInitializers = this.app.schemaInitializerManager.get('gridCard:configureItemActions');
     GridCardItemActionInitializers.add('customize.submitToWorkflow', recordTriggerWorkflowActionLinkInitializer);
 
-    const ListItemActionInitializers = this.app.schemaInitializerManager.get('ListItemActionInitializers');
+    const ListItemActionInitializers = this.app.schemaInitializerManager.get('list:configureItemActions');
     ListItemActionInitializers.add('customize.submitToWorkflow', recordTriggerWorkflowActionLinkInitializer);
   }
 }

package/src/server/ActionTrigger.ts

@@ -1,11 +1,11 @@
 import { get } from 'lodash';
 import { BelongsTo, HasOne } from 'sequelize';
 import { Model, modelAssociationByKey } from '@nocobase/database';
-import { DefaultContext } from '@nocobase/server';
-import { ActionContext } from '@nocobase/resourcer';
-import { Next } from '@nocobase/actions';
+import Application, { DefaultContext } from '@nocobase/server';
+import { Context as ActionContext, Next } from '@nocobase/actions';
 
 import WorkflowPlugin, { Trigger, WorkflowModel, toJSON } from '@nocobase/plugin-workflow';
+import { parseCollectionName } from '@nocobase/data-source-manager';
 
 interface Context extends ActionContext, DefaultContext {}
 
@@ -13,7 +13,7 @@ export default class extends Trigger {
   constructor(workflow: WorkflowPlugin) {
     super(workflow);
 
-    workflow.app.resourcer.use(this.middleware);
+    workflow.app.use(this.middleware, { after: 'dataSource' });
   }
 
   async triggerAction(context: Context, next: Next) {
@@ -55,10 +55,12 @@ export default class extends Trigger {
 
   private async trigger(context: Context) {
     const { triggerWorkflows = '', values } = context.action.params;
+    const dataSourceHeader = context.get('x-data-source') || 'main';
 
     const { currentUser, currentRole } = context.state;
+    const { model: UserModel } = this.workflow.db.getCollection('users');
     const userInfo = {
-      user: toJSON(currentUser),
+      user: UserModel.build(currentUser).desensitize(),
       roleName: currentRole,
     };
 
@@ -78,12 +80,16 @@ export default class extends Trigger {
     const asyncGroup = [];
     for (const workflow of workflows) {
       const { collection, appends = [] } = workflow.config;
+      const [dataSourceName, collectionName] = parseCollectionName(collection);
       const trigger = triggers.find((trigger) => trigger[0] == workflow.key);
       const event = [workflow];
       if (context.action.resourceName !== 'workflows') {
         if (!context.body) {
           continue;
         }
+        if (dataSourceName !== dataSourceHeader) {
+          continue;
+        }
         const { body: data } = context;
         for (const row of Array.isArray(data) ? data : [data]) {
           let payload = row;
@@ -100,7 +106,7 @@ export default class extends Trigger {
           }
           const model = payload.constructor;
           if (payload instanceof Model) {
-            if (collection !== model.collection.name) {
+            if (collectionName !== model.collection.name) {
               continue;
             }
             if (appends.length) {
@@ -114,7 +120,9 @@ export default class extends Trigger {
           event.push({ data: toJSON(payload), ...userInfo });
         }
       } else {
-        const { model, repository } = context.db.getCollection(collection);
+        const { model, repository } = (<Application>context.app).dataSourceManager.dataSources
+          .get(dataSourceName)
+          .collectionManager.getCollection(collectionName);
         let data = trigger[1] ? get(values, trigger[1]) : values;
         const pk = get(data, model.primaryKeyAttribute);
         if (appends.length && pk != null) {

package/src/server/__tests__/trigger.test.ts

@@ -12,7 +12,7 @@ describe('workflow > action-trigger', () => {
   let PostRepo;
   let CommentRepo;
   let WorkflowModel;
-  let UserModel;
+  let UserRepo;
   let users;
   let userAgents;
 
@@ -26,12 +26,14 @@ describe('workflow > action-trigger', () => {
     WorkflowModel = db.getCollection('workflows').model;
     PostRepo = db.getCollection('posts').repository;
     CommentRepo = db.getCollection('comments').repository;
-    UserModel = db.getCollection('users').model;
+    UserRepo = db.getCollection('users').repository;
 
-    users = await UserModel.bulkCreate([
-      { id: 2, nickname: 'a' },
-      { id: 3, nickname: 'b' },
-    ]);
+    users = await UserRepo.create({
+      values: [
+        { id: 2, nickname: 'a', roles: [{ name: 'root' }] },
+        { id: 3, nickname: 'b' },
+      ],
+    });
 
     userAgents = users.map((user) => app.agent().login(user));
   });
@@ -569,4 +571,49 @@ describe('workflow > action-trigger', () => {
       expect(e3s[0].status).toBe(EXECUTION_STATUS.RESOLVED);
     });
   });
+
+  describe('multiple data source', () => {
+    it('trigger on different data source', async () => {
+      const workflow = await WorkflowModel.create({
+        enabled: true,
+        type: 'action',
+        config: {
+          collection: 'another:posts',
+        },
+      });
+
+      const res1 = await userAgents[0].resource('posts').create({
+        values: { title: 't1' },
+        triggerWorkflows: `${workflow.key}`,
+      });
+      expect(res1.status).toBe(200);
+
+      await sleep(500);
+
+      const e1s = await workflow.getExecutions();
+      expect(e1s.length).toBe(0);
+
+      // const res2 = await userAgents[0]
+      //   .set('x-data-source', 'another')
+      //   .resource('posts')
+      //   .create({
+      //     values: { title: 't2' },
+      //     triggerWorkflows: `${workflow.key}`,
+      //   });
+      const res2 = await agent
+        .login(users[0])
+        .set('x-data-source', 'another')
+        .post('/api/posts:create')
+        .query({ triggerWorkflows: `${workflow.key}` })
+        .send({ title: 't2' });
+
+      expect(res2.status).toBe(200);
+
+      await sleep(500);
+
+      const e2s = await workflow.getExecutions();
+      expect(e2s.length).toBe(1);
+      expect(e2s[0].status).toBe(EXECUTION_STATUS.RESOLVED);
+    });
+  });
 });