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

package/dist/client/AggregateInstruction.d.ts

@@ -161,11 +161,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;
                     };
                     'x-reactions': {
@@ -190,6 +190,7 @@ export default class extends Instruction {
         ValueBlock: (() => JSX.Element) & {
             Initializer: () => JSX.Element;
             Result: (props: any) => JSX.Element;
+            Designer: () => JSX.Element;
         };
         AssociatedConfig: typeof AssociatedConfig;
     };

package/dist/client/index.js

@@ -1,4 +1,4 @@
-(function(e,t){typeof exports=="object"&&typeof module!="undefined"?t(exports,require("@nocobase/client"),require("react/jsx-runtime"),require("@formily/react"),require("antd"),require("react"),require("@nocobase/plugin-workflow/client"),require("react-i18next")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client","react/jsx-runtime","@formily/react","antd","react","@nocobase/plugin-workflow/client","react-i18next"],t):(e=typeof globalThis!="undefined"?globalThis:e||self,t(e["@nocobase/plugin-workflow-aggregate"]={},e["@nocobase/client"],e.jsxRuntime,e["@formily/react"],e.antd,e.react,e["@nocobase/plugin-workflow"],e["react-i18next"]))})(this,function(e,t,o,s,S,h,r,C){"use strict";var H=Object.defineProperty,J=Object.defineProperties;var W=Object.getOwnPropertyDescriptors;var I=Object.getOwnPropertySymbols;var A=Object.prototype.hasOwnProperty,D=Object.prototype.propertyIsEnumerable;var $=(e,t,o)=>t in e?H(e,t,{enumerable:!0,configurable:!0,writable:!0,value:o}):e[t]=o,O=(e,t)=>{for(var o in t||(t={}))A.call(t,o)&&$(e,o,t[o]);if(I)for(var o of I(t))D.call(t,o)&&$(e,o,t[o]);return e},V=(e,t)=>J(e,W(t));var G=(e,t)=>{var o={};for(var s in e)A.call(e,s)&&t.indexOf(s)<0&&(o[s]=e[s]);if(e!=null&&I)for(var s of I(e))t.indexOf(s)<0&&D.call(e,s)&&(o[s]=e[s]);return o};var g=(e,t,o)=>($(e,typeof t!="symbol"?t+"":t,o),o);var x=(e,t,o)=>new Promise((s,S)=>{var h=i=>{try{C(o.next(i))}catch(b){S(b)}},r=i=>{try{C(o.throw(i))}catch(b){S(b)}},C=i=>i.done?s(i.value):Promise.resolve(i.value).then(h,r);C((o=o.apply(e,t)).next())});const i="workflow-aggregate";function b(l,c={}){const{t:n}=B(c);return n(l)}function B(l){return C.useTranslation(i,l)}function N(l){return["hasMany","belongsToMany"].includes(l.type)}function P(){const l=t.useCompile();return[r.nodesOptions,r.triggerOptions].map(c=>{var p;const n=(p=c.useOptions({types:[N],appends:null,depth:4}))==null?void 0:p.filter(Boolean);return{label:l(c.label),value:c.value,key:c.value,children:l(n),disabled:n&&!n.length}})}function K(p){var f=p,{value:l,onChange:c}=f,n=G(f,["value","onChange"]);const{setValuesIn:v}=s.useForm(),{getCollection:k}=t.useCollectionManager_deprecated(),M=P(),[F,q]=h.useState(M),{associatedKey:L="",name:_}=l!=null?l:{};let w=[];const j=L.match(/^{{(.*)}}$/);j&&(w=[...j[1].trim().split(".").slice(0,-1),_]);const z=m=>x(this,null,function*(){var u;const a=m[m.length-1];!((u=a.children)!=null&&u.length)&&!a.isLeaf&&a.loadChildren&&(yield a.loadChildren(a),q(d=>[...d]))});h.useEffect(()=>{x(this,null,function*(){var u;if(!w||F.length<=1)return;let a=null;for(let d=0;d<w.length;d++){const T=w[d];try{d===0?a=F.find(y=>y.value===T):(a.loadChildren&&!((u=a.children)!=null&&u.length)&&(yield a.loadChildren(a)),a=a.children.find(y=>y.value===T))}catch(y){console.error(y)}}q([...F])})},[l,F.length]);const U=h.useCallback((m,a)=>{if(!(m!=null&&m.length)){v("collection",null),c({});return}const{field:u}=a.pop();if(!u||!["hasMany","belongsToMany"].includes(u.type))return;const{collectionName:d,target:T,name:y}=u,Q=k(d).fields.find(X=>X.primaryKey);v("collection",T),c({name:y,associatedKey:`{{${m.slice(0,-1).join(".")}.${Q.name}}}`,associatedCollection:d})},[c]);return o.jsx(S.Cascader,V(O({},n),{value:w,options:F,onChange:U,loadData:z}))}class R extends r.Instruction{constructor(){super(...arguments);g(this,"title",`{{t("Aggregate", { ns: "${i}" })}}`);g(this,"type","aggregate");g(this,"group","collection");g(this,"description",`{{t("Counting, summing, finding maximum, minimum, and average values for multiple records of a collection or associated data of a record.", { ns: "${i}" })}}`);g(this,"fieldset",{aggregator:{type:"string",title:`{{t("Aggregator function", { ns: "${i}" })}}`,"x-decorator":"FormItem","x-component":"Radio.Group",enum:[{label:"COUNT",value:"count"},{label:"SUM",value:"sum"},{label:"AVG",value:"avg"},{label:"MIN",value:"min"},{label:"MAX",value:"max"}],required:!0,default:"count"},associated:{type:"boolean",title:`{{t("Target type", { ns: "${i}" })}}`,"x-decorator":"FormItem","x-component":"Radio.Group",enum:[{label:`{{t("Data of collection", { ns: "${i}" })}}`,value:!1},{label:`{{t("Data of associated collection", { ns: "${i}" })}}`,value:!0}],required:!0,default:!1,"x-reactions":[{target:"collection",effects:["onFieldValueChange"],fulfill:{state:{value:null}}},{target:"association",effects:["onFieldValueChange"],fulfill:{state:{value:null}}}]},collectionField:{type:"void","x-decorator":"SchemaComponentContext.Provider","x-decorator-props":{value:{designable:!1}},"x-component":"Grid",properties:{row:{type:"void","x-component":"Grid.Row",properties:{target:{type:"void","x-component":"Grid.Col",properties:{collection:{type:"string",required:!0,"x-decorator":"FormItem","x-component":"CollectionSelect",title:`{{t("Data of collection", { ns: "${i}" })}}`,"x-reactions":[{dependencies:["associated"],fulfill:{state:{display:'{{$deps[0] ? "hidden" : "visible"}}'}}},{target:"params.field",effects:["onFieldValueChange"],fulfill:{state:{value:null}}},{target:"params.filter",effects:["onFieldValueChange"],fulfill:{state:{value:null}}}]},association:{type:"object",title:`{{t("Data of associated collection", { ns: "${i}" })}}`,"x-decorator":"FormItem","x-component":"AssociatedConfig","x-component-props":{changeOnSelect:!0},"x-reactions":[{dependencies:["associated"],fulfill:{state:{visible:"{{!!$deps[0]}}"}}}],required:!0}}},field:{type:"void","x-component":"Grid.Col",properties:{"params.field":{type:"string",title:`{{t("Field to aggregate", { ns: "${i}" })}}`,"x-decorator":"FormItem","x-component":"FieldsSelect","x-component-props":{filter(n){return!n.hidden&&n.interface&&!["belongsTo","hasOne","hasMany","belongsToMany"].includes(n.type)}},required:!0,"x-reactions":[{dependencies:["collection"],fulfill:{state:{visible:"{{!!$deps[0]}}"}}}]}}}}}}},params:{type:"object",properties:{distinct:{type:"boolean",title:`{{t("Distinct", { ns: "${i}" })}}`,"x-decorator":"FormItem","x-component":"Checkbox","x-reactions":[{dependencies:["collection","aggregator"],fulfill:{state:{visible:'{{!!$deps[0] && ["count"].includes($deps[1])}}'}}}]},filter:{type:"object",title:'{{t("Filter")}}',"x-decorator":"FormItem","x-component":"Filter","x-component-props":{useProps(){const{values:n}=s.useForm();return{options:t.useCollectionFilterOptions(n==null?void 0:n.collection),className:t.css`
-                  position: relative;
-                  width: 100%;
-                `}},dynamicComponent:"FilterDynamicComponent"},"x-reactions":[{dependencies:["collection"],fulfill:{state:{visible:"{{!!$deps[0]}}"}}}]}}}});g(this,"scope",{useCollectionDataSource:t.useCollectionDataSource});g(this,"components",{SchemaComponentContext:t.SchemaComponentContext,FilterDynamicComponent:r.FilterDynamicComponent,FieldsSelect:r.FieldsSelect,ValueBlock:r.ValueBlock,AssociatedConfig:K})}useVariables({key:n,title:p},{types:f,fieldNames:v=r.defaultFieldNames}){return f&&!f.some(k=>k in r.BaseTypeSets||Object.values(r.BaseTypeSets).some(M=>M.has(k)))?null:{[v.value]:n,[v.label]:p}}useInitializers(n){var f;const p=b("Query result");return n.config.collection?{name:`#${n.id}`,type:"item",title:(f=n.title)!=null?f:`#${n.id}`,Component:r.ValueBlock.Initializer,node:n,resultTitle:p}:null}}class E extends t.Plugin{afterAdd(){return x(this,null,function*(){})}beforeLoad(){return x(this,null,function*(){})}load(){return x(this,null,function*(){this.app.pm.get("workflow").registerInstruction("aggregate",R)})}}e.default=E,Object.defineProperties(e,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});
+(function(e,t){typeof exports=="object"&&typeof module!="undefined"?t(exports,require("@nocobase/client"),require("react/jsx-runtime"),require("@formily/react"),require("antd"),require("react"),require("@nocobase/plugin-workflow/client"),require("react-i18next")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client","react/jsx-runtime","@formily/react","antd","react","@nocobase/plugin-workflow/client","react-i18next"],t):(e=typeof globalThis!="undefined"?globalThis:e||self,t(e["@nocobase/plugin-workflow-aggregate"]={},e["@nocobase/client"],e.jsxRuntime,e["@formily/react"],e.antd,e.react,e["@nocobase/plugin-workflow"],e["react-i18next"]))})(this,function(e,t,o,r,S,h,s,b){"use strict";var J=Object.defineProperty,W=Object.defineProperties;var Y=Object.getOwnPropertyDescriptors;var I=Object.getOwnPropertySymbols;var O=Object.prototype.hasOwnProperty,A=Object.prototype.propertyIsEnumerable;var j=(e,t,o)=>t in e?J(e,t,{enumerable:!0,configurable:!0,writable:!0,value:o}):e[t]=o,N=(e,t)=>{for(var o in t||(t={}))O.call(t,o)&&j(e,o,t[o]);if(I)for(var o of I(t))A.call(t,o)&&j(e,o,t[o]);return e},V=(e,t)=>W(e,Y(t));var G=(e,t)=>{var o={};for(var r in e)O.call(e,r)&&t.indexOf(r)<0&&(o[r]=e[r]);if(e!=null&&I)for(var r of I(e))t.indexOf(r)<0&&A.call(e,r)&&(o[r]=e[r]);return o};var g=(e,t,o)=>(j(e,typeof t!="symbol"?t+"":t,o),o);var C=(e,t,o)=>new Promise((r,S)=>{var h=i=>{try{b(o.next(i))}catch(v){S(v)}},s=i=>{try{b(o.throw(i))}catch(v){S(v)}},b=i=>i.done?r(i.value):Promise.resolve(i.value).then(h,s);b((o=o.apply(e,t)).next())});const i="workflow-aggregate";function v(l,c={}){const{t:n}=B(c);return n(l)}function B(l){return b.useTranslation(i,l)}function K(l){return["hasMany","belongsToMany"].includes(l.type)}function P(){const l=t.useCompile();return[s.nodesOptions,s.triggerOptions].map(c=>{var d;const n=(d=c.useOptions({types:[K],appends:null,depth:4}))==null?void 0:d.filter(Boolean);return{label:l(c.label),value:c.value,key:c.value,children:l(n),disabled:n&&!n.length}})}function R(d){var u=d,{value:l,onChange:c}=u,n=G(u,["value","onChange"]);const{setValuesIn:x}=r.useForm(),{getCollection:k}=t.useCollectionManager_deprecated(),M=P(),[F,q]=h.useState(M),{associatedKey:_="",name:z}=l!=null?l:{};let w=[];const D=_.match(/^{{(.*)}}$/);D&&(w=[...D[1].trim().split(".").slice(0,-1),z]);const U=m=>C(this,null,function*(){var p;const a=m[m.length-1];!((p=a.children)!=null&&p.length)&&!a.isLeaf&&a.loadChildren&&(yield a.loadChildren(a),q(f=>[...f]))});h.useEffect(()=>{C(this,null,function*(){var p;if(!w||F.length<=1)return;let a=null;for(let f=0;f<w.length;f++){const T=w[f];try{f===0?a=F.find(y=>y.value===T):(a.loadChildren&&!((p=a.children)!=null&&p.length)&&(yield a.loadChildren(a)),a=a.children.find(y=>y.value===T))}catch(y){console.error(y)}}q([...F])})},[l,F.length]);const Q=h.useCallback((m,a)=>{if(!(m!=null&&m.length)){x("collection",null),c({});return}const{field:p}=a.pop();if(!p||!["hasMany","belongsToMany"].includes(p.type))return;const{collectionName:f,target:T,name:y,dataSourceKey:$}=p,X=k(f,$).fields.find(H=>H.primaryKey);x("collection",`${$}:${T}`),c({name:y,associatedKey:`{{${m.slice(0,-1).join(".")}.${X.name}}}`,associatedCollection:t.joinCollectionName($,f)})},[c]);return o.jsx(S.Cascader,V(N({},n),{value:w,options:F,changeOnSelect:!0,onChange:Q,loadData:U}))}class E extends s.Instruction{constructor(){super(...arguments);g(this,"title",`{{t("Aggregate", { ns: "${i}" })}}`);g(this,"type","aggregate");g(this,"group","collection");g(this,"description",`{{t("Counting, summing, finding maximum, minimum, and average values for multiple records of a collection or associated data of a record.", { ns: "${i}" })}}`);g(this,"fieldset",{aggregator:{type:"string",title:`{{t("Aggregator function", { ns: "${i}" })}}`,"x-decorator":"FormItem","x-component":"Radio.Group",enum:[{label:"COUNT",value:"count"},{label:"SUM",value:"sum"},{label:"AVG",value:"avg"},{label:"MIN",value:"min"},{label:"MAX",value:"max"}],required:!0,default:"count"},associated:{type:"boolean",title:`{{t("Target type", { ns: "${i}" })}}`,"x-decorator":"FormItem","x-component":"Radio.Group",enum:[{label:`{{t("Data of collection", { ns: "${i}" })}}`,value:!1},{label:`{{t("Data of associated collection", { ns: "${i}" })}}`,value:!0}],required:!0,default:!1,"x-reactions":[{target:"collection",effects:["onFieldValueChange"],fulfill:{state:{value:null}}},{target:"association",effects:["onFieldValueChange"],fulfill:{state:{value:null}}}]},collectionField:{type:"void","x-decorator":"SchemaComponentContext.Provider","x-decorator-props":{value:{designable:!1}},"x-component":"Grid",properties:{row:{type:"void","x-component":"Grid.Row",properties:{target:{type:"void","x-component":"Grid.Col",properties:{collection:{type:"string",required:!0,"x-decorator":"FormItem","x-component":"DataSourceCollectionCascader",title:`{{t("Data of collection", { ns: "${i}" })}}`,"x-reactions":[{dependencies:["associated"],fulfill:{state:{display:'{{$deps[0] ? "hidden" : "visible"}}'}}},{target:"params.field",effects:["onFieldValueChange"],fulfill:{state:{value:null}}},{target:"params.filter",effects:["onFieldValueChange"],fulfill:{state:{value:null}}}]},association:{type:"object",title:`{{t("Data of associated collection", { ns: "${i}" })}}`,"x-decorator":"FormItem","x-component":"AssociatedConfig","x-component-props":{changeOnSelect:!0},"x-reactions":[{dependencies:["associated"],fulfill:{state:{visible:"{{!!$deps[0]}}"}}}],required:!0}}},field:{type:"void","x-component":"Grid.Col",properties:{"params.field":{type:"string",title:`{{t("Field to aggregate", { ns: "${i}" })}}`,"x-decorator":"FormItem","x-component":"FieldsSelect","x-component-props":{filter(n){return!n.hidden&&n.interface&&!["belongsTo","hasOne","hasMany","belongsToMany"].includes(n.type)}},required:!0,"x-reactions":[{dependencies:["collection"],fulfill:{state:{visible:"{{!!$deps[0]}}"}}}]}}}}}}},params:{type:"object",properties:{distinct:{type:"boolean",title:`{{t("Distinct", { ns: "${i}" })}}`,"x-decorator":"FormItem","x-component":"Checkbox","x-reactions":[{dependencies:["collection","aggregator"],fulfill:{state:{visible:'{{!!$deps[0] && ["count"].includes($deps[1])}}'}}}]},filter:{type:"object",title:'{{t("Filter")}}',"x-decorator":"FormItem","x-component":"Filter","x-use-component-props":()=>{const{values:n}=r.useForm(),[d,u]=t.parseCollectionName(n==null?void 0:n.collection);return{options:t.useCollectionFilterOptions(u,d),className:t.css`
+                position: relative;
+                width: 100%;
+              `}},"x-component-props":{dynamicComponent:"FilterDynamicComponent"},"x-reactions":[{dependencies:["collection"],fulfill:{state:{visible:"{{!!$deps[0]}}"}}}]}}}});g(this,"scope",{useCollectionDataSource:t.useCollectionDataSource});g(this,"components",{SchemaComponentContext:t.SchemaComponentContext,FilterDynamicComponent:s.FilterDynamicComponent,FieldsSelect:s.FieldsSelect,ValueBlock:s.ValueBlock,AssociatedConfig:R})}useVariables({key:n,title:d},{types:u,fieldNames:x=s.defaultFieldNames}){return u&&!u.some(k=>k in s.BaseTypeSets||Object.values(s.BaseTypeSets).some(M=>M.has(k)))?null:{[x.value]:n,[x.label]:d}}useInitializers(n){var u;const d=v("Query result");return n.config.collection?{name:`#${n.id}`,type:"item",title:(u=n.title)!=null?u:`#${n.id}`,Component:s.ValueBlock.Initializer,node:n,resultTitle:d}:null}}class L extends t.Plugin{afterAdd(){return C(this,null,function*(){})}beforeLoad(){return C(this,null,function*(){})}load(){return C(this,null,function*(){this.app.pm.get("workflow").registerInstruction("aggregate",E)})}}e.default=L,Object.defineProperties(e,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});

package/dist/externalVersion.js

@@ -2,12 +2,13 @@ module.exports = {
   "@formily/react": "2.3.0",
   "antd": "5.12.8",
   "react": "18.2.0",
-  "@nocobase/client": "0.20.0-alpha.9",
-  "@nocobase/plugin-workflow": "0.20.0-alpha.9",
+  "@nocobase/client": "0.21.0-alpha.2",
+  "@nocobase/plugin-workflow": "0.21.0-alpha.2",
   "react-i18next": "11.18.6",
-  "@nocobase/database": "0.20.0-alpha.9",
-  "@nocobase/server": "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/data-source-manager": "0.21.0-alpha.2",
+  "@nocobase/database": "0.21.0-alpha.2",
+  "@nocobase/server": "0.21.0-alpha.2",
+  "@nocobase/plugin-workflow-test": "0.21.0-alpha.2",
+  "@nocobase/test": "0.21.0-alpha.2",
+  "@nocobase/utils": "0.21.0-alpha.2"
 };

package/dist/server/AggregateInstruction.js

@@ -20,6 +20,7 @@ __export(AggregateInstruction_exports, {
   default: () => AggregateInstruction_default
 });
 module.exports = __toCommonJS(AggregateInstruction_exports);
+var import_data_source_manager = require("@nocobase/data-source-manager");
 var import_database = require("@nocobase/database");
 var import_plugin_workflow = require("@nocobase/plugin-workflow");
 const aggregators = {
@@ -33,11 +34,12 @@ class AggregateInstruction_default extends import_plugin_workflow.Instruction {
   async run(node, input, processor) {
     const { aggregator, associated, collection, association = {}, params = {} } = node.config;
     const options = processor.getParsedValue(params, node.id);
-    const { database } = node.constructor;
-    const repo = associated ? database.getRepository(
+    const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(collection);
+    const { collectionManager } = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName);
+    const repo = associated ? collectionManager.getRepository(
       `${association == null ? void 0 : association.associatedCollection}.${association.name}`,
       processor.getParsedValue(association == null ? void 0 : association.associatedKey, node.id)
-    ) : database.getRepository(collection);
+    ) : collectionManager.getRepository(collectionName);
     if (!options.dataType && aggregator === "avg") {
       options.dataType = import_database.DataTypes.DOUBLE;
     }

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：聚合查询节点",
   "description": "Used to aggregate data against the database in workflow, such as: statistics, sum, average, etc.",
   "description.zh-CN": "可用于在工作流中对数据库进行聚合查询，如：统计数量、求和、平均值等。",
-  "version": "0.20.0-alpha.9",
+  "version": "0.21.0-alpha.2",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-aggregate",
@@ -21,7 +21,7 @@
     "@nocobase/server": "0.x",
     "@nocobase/test": "0.x"
   },
-  "gitHead": "5473d9039cfdb649a8c8c625edefc9a3ac464be5",
+  "gitHead": "90628f2e2da846208fb2d7966ddb4e467d187ffb",
   "keywords": [
     "Workflow"
   ]

package/src/client/AggregateInstruction.tsx

@@ -6,6 +6,8 @@ import {
   SchemaComponentContext,
   SchemaInitializerItemType,
   css,
+  joinCollectionName,
+  parseCollectionName,
   useCollectionDataSource,
   useCollectionFilterOptions,
   useCollectionManager_deprecated,
@@ -116,25 +118,34 @@ function AssociatedConfig({ value, onChange, ...props }): JSX.Element {
       // need to get:
       // * source collection (from node.config)
       // * target collection (from field name)
-      const { collectionName, target, name } = field;
+      const { collectionName, target, name, dataSourceKey } = field;
 
-      const collection = getCollection(collectionName);
+      const collection = getCollection(collectionName, dataSourceKey);
       const primaryKeyField = collection.fields.find((f) => f.primaryKey);
 
-      setValuesIn('collection', target);
+      setValuesIn('collection', `${dataSourceKey}:${target}`);
 
       onChange({
         name,
         // primary key data path
         associatedKey: `{{${path.slice(0, -1).join('.')}.${primaryKeyField.name}}}`,
         // data associated collection name
-        associatedCollection: collectionName,
+        associatedCollection: joinCollectionName(dataSourceKey, collectionName),
       });
     },
     [onChange],
   );
 
-  return <Cascader {...props} value={p} options={options} onChange={onSelectChange} loadData={loadData as any} />;
+  return (
+    <Cascader
+      {...props}
+      value={p}
+      options={options}
+      changeOnSelect
+      onChange={onSelectChange}
+      loadData={loadData as any}
+    />
+  );
 }
 
 // based on collection:
@@ -217,7 +228,7 @@ export default class extends Instruction {
                   type: 'string',
                   required: true,
                   'x-decorator': 'FormItem',
-                  'x-component': 'CollectionSelect',
+                  'x-component': 'DataSourceCollectionCascader',
                   title: `{{t("Data of collection", { ns: "${NAMESPACE}" })}}`,
                   'x-reactions': [
                     {
@@ -330,18 +341,21 @@ export default class extends Instruction {
           title: '{{t("Filter")}}',
           'x-decorator': 'FormItem',
           'x-component': 'Filter',
+          'x-use-component-props': () => {
+            // eslint-disable-next-line react-hooks/rules-of-hooks
+            const { values } = useForm();
+            const [dataSourceName, collectionName] = parseCollectionName(values?.collection);
+            // eslint-disable-next-line react-hooks/rules-of-hooks
+            const options = useCollectionFilterOptions(collectionName, dataSourceName);
+            return {
+              options,
+              className: css`
+                position: relative;
+                width: 100%;
+              `,
+            };
+          },
           'x-component-props': {
-            useProps() {
-              const { values } = useForm();
-              const options = useCollectionFilterOptions(values?.collection);
-              return {
-                options,
-                className: css`
-                  position: relative;
-                  width: 100%;
-                `,
-              };
-            },
             dynamicComponent: 'FilterDynamicComponent',
           },
           'x-reactions': [

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

@@ -80,7 +80,8 @@ test.describe('no filter', () => {
     const aggregateRecordNodeId = await aggregateRecordNode.node.locator('.workflow-node-id').innerText();
     await aggregateRecordNode.nodeConfigure.click();
     await aggregateRecordNode.collectionDropDown.click();
-    await page.getByText(aggregateNodeCollectionDisplayName).click();
+    await page.getByRole('menuitemcheckbox', { name: 'Main right' }).click();
+    await page.getByRole('menuitemcheckbox', { name: aggregateNodeCollectionDisplayName }).click();
     await aggregateRecordNode.aggregatedFieldDropDown.click();
     await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
     await aggregateRecordNode.submitButton.click();
@@ -179,7 +180,8 @@ test.describe('no filter', () => {
     await aggregateRecordNode.nodeConfigure.click();
     await aggregateRecordNode.sumRadio.click();
     await aggregateRecordNode.collectionDropDown.click();
-    await page.getByText(aggregateNodeCollectionDisplayName).click();
+    await page.getByRole('menuitemcheckbox', { name: 'Main right' }).click();
+    await page.getByRole('menuitemcheckbox', { name: aggregateNodeCollectionDisplayName }).click();
     await aggregateRecordNode.aggregatedFieldDropDown.click();
     await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
     await aggregateRecordNode.submitButton.click();
@@ -281,7 +283,8 @@ test.describe('no filter', () => {
     await aggregateRecordNode.nodeConfigure.click();
     await aggregateRecordNode.avgRadio.click();
     await aggregateRecordNode.collectionDropDown.click();
-    await page.getByText(aggregateNodeCollectionDisplayName).click();
+    await page.getByRole('menuitemcheckbox', { name: 'Main right' }).click();
+    await page.getByRole('menuitemcheckbox', { name: aggregateNodeCollectionDisplayName }).click();
     await aggregateRecordNode.aggregatedFieldDropDown.click();
     await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
     await aggregateRecordNode.submitButton.click();
@@ -385,7 +388,8 @@ test.describe('no filter', () => {
     await aggregateRecordNode.nodeConfigure.click();
     await aggregateRecordNode.minRadio.click();
     await aggregateRecordNode.collectionDropDown.click();
-    await page.getByText(aggregateNodeCollectionDisplayName).click();
+    await page.getByRole('menuitemcheckbox', { name: 'Main right' }).click();
+    await page.getByRole('menuitemcheckbox', { name: aggregateNodeCollectionDisplayName }).click();
     await aggregateRecordNode.aggregatedFieldDropDown.click();
     await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
     await aggregateRecordNode.submitButton.click();
@@ -488,7 +492,8 @@ test.describe('no filter', () => {
     await aggregateRecordNode.nodeConfigure.click();
     await aggregateRecordNode.maxRadio.click();
     await aggregateRecordNode.collectionDropDown.click();
-    await page.getByText(aggregateNodeCollectionDisplayName).click();
+    await page.getByRole('menuitemcheckbox', { name: 'Main right' }).click();
+    await page.getByRole('menuitemcheckbox', { name: aggregateNodeCollectionDisplayName }).click();
     await aggregateRecordNode.aggregatedFieldDropDown.click();
     await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
     await aggregateRecordNode.submitButton.click();
@@ -590,7 +595,8 @@ test.describe('no filter', () => {
     const aggregateRecordNodeId = await aggregateRecordNode.node.locator('.workflow-node-id').innerText();
     await aggregateRecordNode.nodeConfigure.click();
     await aggregateRecordNode.collectionDropDown.click();
-    await page.getByText(aggregateNodeCollectionDisplayName).click();
+    await page.getByRole('menuitemcheckbox', { name: 'Main right' }).click();
+    await page.getByRole('menuitemcheckbox', { name: aggregateNodeCollectionDisplayName }).click();
     await aggregateRecordNode.aggregatedFieldDropDown.click();
     await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
     await aggregateRecordNode.distinctCheckBox.click();
@@ -690,7 +696,8 @@ test.describe('no filter', () => {
     await aggregateRecordNode.nodeConfigure.click();
     await aggregateRecordNode.sumRadio.click();
     await aggregateRecordNode.collectionDropDown.click();
-    await page.getByText(aggregateNodeCollectionDisplayName).click();
+    await page.getByRole('menuitemcheckbox', { name: 'Main right' }).click();
+    await page.getByRole('menuitemcheckbox', { name: aggregateNodeCollectionDisplayName }).click();
     await aggregateRecordNode.aggregatedFieldDropDown.click();
     await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
     await aggregateRecordNode.distinctCheckBox.click();
@@ -795,7 +802,8 @@ test.describe('no filter', () => {
     await aggregateRecordNode.nodeConfigure.click();
     await aggregateRecordNode.avgRadio.click();
     await aggregateRecordNode.collectionDropDown.click();
-    await page.getByText(aggregateNodeCollectionDisplayName).click();
+    await page.getByRole('menuitemcheckbox', { name: 'Main right' }).click();
+    await page.getByRole('menuitemcheckbox', { name: aggregateNodeCollectionDisplayName }).click();
     await aggregateRecordNode.aggregatedFieldDropDown.click();
     await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
     await aggregateRecordNode.distinctCheckBox.click();
@@ -902,7 +910,8 @@ test.describe('no filter', () => {
     await aggregateRecordNode.nodeConfigure.click();
     await aggregateRecordNode.minRadio.click();
     await aggregateRecordNode.collectionDropDown.click();
-    await page.getByText(aggregateNodeCollectionDisplayName).click();
+    await page.getByRole('menuitemcheckbox', { name: 'Main right' }).click();
+    await page.getByRole('menuitemcheckbox', { name: aggregateNodeCollectionDisplayName }).click();
     await aggregateRecordNode.aggregatedFieldDropDown.click();
     await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
     await aggregateRecordNode.distinctCheckBox.click();
@@ -1006,7 +1015,8 @@ test.describe('no filter', () => {
     await aggregateRecordNode.nodeConfigure.click();
     await aggregateRecordNode.maxRadio.click();
     await aggregateRecordNode.collectionDropDown.click();
-    await page.getByText(aggregateNodeCollectionDisplayName).click();
+    await page.getByRole('menuitemcheckbox', { name: 'Main right' }).click();
+    await page.getByRole('menuitemcheckbox', { name: aggregateNodeCollectionDisplayName }).click();
     await aggregateRecordNode.aggregatedFieldDropDown.click();
     await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
     await aggregateRecordNode.distinctCheckBox.click();
@@ -1111,7 +1121,8 @@ test.describe('filter', () => {
     const aggregateRecordNodeId = await aggregateRecordNode.node.locator('.workflow-node-id').innerText();
     await aggregateRecordNode.nodeConfigure.click();
     await aggregateRecordNode.collectionDropDown.click();
-    await page.getByText(aggregateNodeCollectionDisplayName).click();
+    await page.getByRole('menuitemcheckbox', { name: 'Main right' }).click();
+    await page.getByRole('menuitemcheckbox', { name: aggregateNodeCollectionDisplayName }).click();
     await aggregateRecordNode.aggregatedFieldDropDown.click();
     await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
     // 过滤条件
@@ -1217,7 +1228,8 @@ test.describe('filter', () => {
     await aggregateRecordNode.nodeConfigure.click();
     await aggregateRecordNode.sumRadio.click();
     await aggregateRecordNode.collectionDropDown.click();
-    await page.getByText(aggregateNodeCollectionDisplayName).click();
+    await page.getByRole('menuitemcheckbox', { name: 'Main right' }).click();
+    await page.getByRole('menuitemcheckbox', { name: aggregateNodeCollectionDisplayName }).click();
     await aggregateRecordNode.aggregatedFieldDropDown.click();
     await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
     // 过滤条件
@@ -1327,7 +1339,8 @@ test.describe('filter', () => {
     await aggregateRecordNode.nodeConfigure.click();
     await aggregateRecordNode.avgRadio.click();
     await aggregateRecordNode.collectionDropDown.click();
-    await page.getByText(aggregateNodeCollectionDisplayName).click();
+    await page.getByRole('menuitemcheckbox', { name: 'Main right' }).click();
+    await page.getByRole('menuitemcheckbox', { name: aggregateNodeCollectionDisplayName }).click();
     await aggregateRecordNode.aggregatedFieldDropDown.click();
     await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
     // 过滤条件
@@ -1442,7 +1455,8 @@ test.describe('filter', () => {
     await aggregateRecordNode.nodeConfigure.click();
     await aggregateRecordNode.minRadio.click();
     await aggregateRecordNode.collectionDropDown.click();
-    await page.getByText(aggregateNodeCollectionDisplayName).click();
+    await page.getByRole('menuitemcheckbox', { name: 'Main right' }).click();
+    await page.getByRole('menuitemcheckbox', { name: aggregateNodeCollectionDisplayName }).click();
     await aggregateRecordNode.aggregatedFieldDropDown.click();
     await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
     // 过滤条件
@@ -1553,7 +1567,8 @@ test.describe('filter', () => {
     await aggregateRecordNode.nodeConfigure.click();
     await aggregateRecordNode.maxRadio.click();
     await aggregateRecordNode.collectionDropDown.click();
-    await page.getByText(aggregateNodeCollectionDisplayName).click();
+    await page.getByRole('menuitemcheckbox', { name: 'Main right' }).click();
+    await page.getByRole('menuitemcheckbox', { name: aggregateNodeCollectionDisplayName }).click();
     await aggregateRecordNode.aggregatedFieldDropDown.click();
     await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
     // 过滤条件
@@ -1663,7 +1678,8 @@ test.describe('filter', () => {
     const aggregateRecordNodeId = await aggregateRecordNode.node.locator('.workflow-node-id').innerText();
     await aggregateRecordNode.nodeConfigure.click();
     await aggregateRecordNode.collectionDropDown.click();
-    await page.getByText(aggregateNodeCollectionDisplayName).click();
+    await page.getByRole('menuitemcheckbox', { name: 'Main right' }).click();
+    await page.getByRole('menuitemcheckbox', { name: aggregateNodeCollectionDisplayName }).click();
     await aggregateRecordNode.aggregatedFieldDropDown.click();
     await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
     await aggregateRecordNode.distinctCheckBox.click();
@@ -1770,7 +1786,8 @@ test.describe('filter', () => {
     await aggregateRecordNode.nodeConfigure.click();
     await aggregateRecordNode.sumRadio.click();
     await aggregateRecordNode.collectionDropDown.click();
-    await page.getByText(aggregateNodeCollectionDisplayName).click();
+    await page.getByRole('menuitemcheckbox', { name: 'Main right' }).click();
+    await page.getByRole('menuitemcheckbox', { name: aggregateNodeCollectionDisplayName }).click();
     await aggregateRecordNode.aggregatedFieldDropDown.click();
     await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
     await aggregateRecordNode.distinctCheckBox.click();
@@ -1885,7 +1902,8 @@ test.describe('filter', () => {
     await aggregateRecordNode.nodeConfigure.click();
     await aggregateRecordNode.avgRadio.click();
     await aggregateRecordNode.collectionDropDown.click();
-    await page.getByText(aggregateNodeCollectionDisplayName).click();
+    await page.getByRole('menuitemcheckbox', { name: 'Main right' }).click();
+    await page.getByRole('menuitemcheckbox', { name: aggregateNodeCollectionDisplayName }).click();
     await aggregateRecordNode.aggregatedFieldDropDown.click();
     await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
     await aggregateRecordNode.distinctCheckBox.click();
@@ -2009,7 +2027,8 @@ test.describe('filter', () => {
     await aggregateRecordNode.nodeConfigure.click();
     await aggregateRecordNode.minRadio.click();
     await aggregateRecordNode.collectionDropDown.click();
-    await page.getByText(aggregateNodeCollectionDisplayName).click();
+    await page.getByRole('menuitemcheckbox', { name: 'Main right' }).click();
+    await page.getByRole('menuitemcheckbox', { name: aggregateNodeCollectionDisplayName }).click();
     await aggregateRecordNode.aggregatedFieldDropDown.click();
     await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
     await aggregateRecordNode.distinctCheckBox.click();
@@ -2121,7 +2140,8 @@ test.describe('filter', () => {
     await aggregateRecordNode.nodeConfigure.click();
     await aggregateRecordNode.maxRadio.click();
     await aggregateRecordNode.collectionDropDown.click();
-    await page.getByText(aggregateNodeCollectionDisplayName).click();
+    await page.getByRole('menuitemcheckbox', { name: 'Main right' }).click();
+    await page.getByRole('menuitemcheckbox', { name: aggregateNodeCollectionDisplayName }).click();
     await aggregateRecordNode.aggregatedFieldDropDown.click();
     await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
     await aggregateRecordNode.distinctCheckBox.click();

package/src/server/AggregateInstruction.ts

@@ -1,4 +1,5 @@
-import { BelongsToManyRepository, DataTypes, HasManyRepository } from '@nocobase/database';
+import { parseCollectionName } from '@nocobase/data-source-manager';
+import { DataTypes } from '@nocobase/database';
 import { Processor, Instruction, JOB_STATUS, FlowNodeModel } from '@nocobase/plugin-workflow';
 
 const aggregators = {
@@ -13,13 +14,14 @@ export default class extends Instruction {
   async run(node: FlowNodeModel, input, processor: Processor) {
     const { aggregator, associated, collection, association = {}, params = {} } = node.config;
     const options = processor.getParsedValue(params, node.id);
-    const { database } = <typeof FlowNodeModel>node.constructor;
+    const [dataSourceName, collectionName] = parseCollectionName(collection);
+    const { collectionManager } = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName);
     const repo = associated
-      ? database.getRepository<HasManyRepository | BelongsToManyRepository>(
+      ? collectionManager.getRepository(
           `${association?.associatedCollection}.${association.name}`,
           processor.getParsedValue(association?.associatedKey, node.id),
         )
-      : database.getRepository(collection);
+      : collectionManager.getRepository(collectionName);
 
     if (!options.dataType && aggregator === 'avg') {
       options.dataType = DataTypes.DOUBLE;

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

@@ -3,6 +3,7 @@ import { Application } from '@nocobase/server';
 import { getApp, sleep } from '@nocobase/plugin-workflow-test';
 
 import Plugin from '..';
+import { EXECUTION_STATUS } from '@nocobase/plugin-workflow';
 
 describe('workflow > instructions > aggregate', () => {
   let app: Application;
@@ -295,4 +296,33 @@ describe('workflow > instructions > aggregate', () => {
       expect(j3.result).toBe(1);
     });
   });
+
+  describe('multiple data source', () => {
+    it('query on another data source', async () => {
+      const AnotherPostRepo = app.dataSourceManager.dataSources.get('another').collectionManager.getRepository('posts');
+      const post = await AnotherPostRepo.create({ values: { title: 't1' } });
+      const p1s = await AnotherPostRepo.find();
+      expect(p1s.length).toBe(1);
+
+      const n1 = await workflow.createNode({
+        type: 'aggregate',
+        config: {
+          collection: 'another:posts',
+          aggregator: 'count',
+          params: {
+            field: 'id',
+          },
+        },
+      });
+
+      await PostRepo.create({ values: { title: 't1' } });
+
+      await sleep(500);
+
+      const [execution] = await workflow.getExecutions();
+      expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
+      const [job] = await execution.getJobs();
+      expect(job.result).toBe(1);
+    });
+  });
 });