@nocobase/plugin-workflow-aggregate 0.18.0-alpha.1 → 0.18.0-alpha.8

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,n,s,S,h,c,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,n)=>t in e?H(e,t,{enumerable:!0,configurable:!0,writable:!0,value:n}):e[t]=n,O=(e,t)=>{for(var n in t||(t={}))A.call(t,n)&&$(e,n,t[n]);if(I)for(var n of I(t))D.call(t,n)&&$(e,n,t[n]);return e},V=(e,t)=>J(e,W(t));var G=(e,t)=>{var n={};for(var s in e)A.call(e,s)&&t.indexOf(s)<0&&(n[s]=e[s]);if(e!=null&&I)for(var s of I(e))t.indexOf(s)<0&&D.call(e,s)&&(n[s]=e[s]);return n};var g=(e,t,n)=>($(e,typeof t!="symbol"?t+"":t,n),n);var x=(e,t,n)=>new Promise((s,S)=>{var h=i=>{try{C(n.next(i))}catch(b){S(b)}},c=i=>{try{C(n.throw(i))}catch(b){S(b)}},C=i=>i.done?s(i.value):Promise.resolve(i.value).then(h,c);C((n=n.apply(e,t)).next())});const i="workflow-aggregate";function b(l,r={}){const{t:o}=B(r);return o(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[c.nodesOptions,c.triggerOptions].map(r=>{var p;const o=(p=r.useOptions({types:[N],appends:null,depth:4}))==null?void 0:p.filter(Boolean);return{label:l(r.label),value:r.value,key:r.value,children:l(o),disabled:o&&!o.length}})}function K(p){var f=p,{value:l,onChange:r}=f,o=G(f,["value","onChange"]);const{setValuesIn:v}=s.useForm(),{getCollection:T}=t.useCollectionManager(),M=P(),[F,q]=h.useState(M),{associatedKey:L="",name:z}=l!=null?l:{};let w=[];const j=L.match(/^{{(.*)}}$/);j&&(w=[...j[1].trim().split(".").slice(0,-1),z]);const U=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 k=w[d];try{d===0?a=F.find(y=>y.value===k):(a.loadChildren&&!((u=a.children)!=null&&u.length)&&(yield a.loadChildren(a)),a=a.children.find(y=>y.value===k))}catch(y){console.error(y)}}q([...F])})},[l,F.length]);const _=h.useCallback((m,a)=>{if(!(m!=null&&m.length)){v("collection",null),r({});return}const{field:u}=a.pop();if(!u||!["hasMany","belongsToMany"].includes(u.type))return;const{collectionName:d,target:k,name:y}=u,Q=T(d).fields.find(X=>X.primaryKey);v("collection",k),r({name:y,associatedKey:`{{${m.slice(0,-1).join(".")}.${Q.name}}}`,associatedCollection:d})},[r]);return n.jsx(S.Cascader,V(O({},o),{value:w,options:F,onChange:_,loadData:U}))}class R extends c.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(o){return!o.hidden&&o.interface&&!["belongsTo","hasOne","hasMany","belongsToMany"].includes(o.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:o}=s.useForm();return{options:t.useCollectionFilterOptions(o==null?void 0:o.collection),className:t.css`
+(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(),M=P(),[F,q]=h.useState(M),{associatedKey:L="",name:z}=l!=null?l:{};let w=[];const j=L.match(/^{{(.*)}}$/);j&&(w=[...j[1].trim().split(".").slice(0,-1),z]);const U=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 _=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:_,loadData:U}))}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:c.FilterDynamicComponent,FieldsSelect:c.FieldsSelect,ValueBlock:c.ValueBlock,AssociatedConfig:K})}useVariables({key:o,title:p},{types:f,fieldNames:v=c.defaultFieldNames}){return f&&!f.some(T=>T in c.BaseTypeSets||Object.values(c.BaseTypeSets).some(M=>M.has(T)))?null:{[v.value]:o,[v.label]:p}}useInitializers(o){var f;const p=b("Query result");return o.config.collection?{name:`#${o.id}`,type:"item",title:(f=o.title)!=null?f:`#${o.id}`,Component:c.ValueBlock.Initializer,node:o,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*(){const r=this.app.pm.get("workflow"),o=new R;r.instructions.register(o.type,o)})}}e.default=E,Object.defineProperties(e,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});
+                `}},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"}})});

package/dist/externalVersion.js

@@ -2,9 +2,12 @@ module.exports = {
   "@formily/react": "2.3.0",
   "antd": "5.12.2",
   "react": "18.2.0",
-  "@nocobase/client": "0.18.0-alpha.1",
-  "@nocobase/plugin-workflow": "0.18.0-alpha.1",
+  "@nocobase/client": "0.18.0-alpha.8",
+  "@nocobase/plugin-workflow": "0.18.0-alpha.8",
   "react-i18next": "11.18.6",
-  "@nocobase/database": "0.18.0-alpha.1",
-  "@nocobase/server": "0.18.0-alpha.1"
+  "@nocobase/database": "0.18.0-alpha.8",
+  "@nocobase/server": "0.18.0-alpha.8",
+  "@nocobase/plugin-workflow-test": "0.18.0-alpha.8",
+  "@nocobase/test": "0.18.0-alpha.8",
+  "@nocobase/utils": "0.18.0-alpha.8"
 };

package/dist/server/AggregateInstruction.d.ts

@@ -2,6 +2,6 @@ import { Processor, Instruction, FlowNodeModel } from '@nocobase/plugin-workflow
 export default class extends Instruction {
     run(node: FlowNodeModel, input: any, processor: Processor): Promise<{
         result: any;
-        status: number;
+        status: 1;
     }>;
 }

package/dist/server/AggregateInstruction.js

@@ -43,8 +43,8 @@ class AggregateInstruction_default extends import_plugin_workflow.Instruction {
     }
     const result = await repo.aggregate({
       ...options,
-      method: aggregators[aggregator],
-      transaction: processor.transaction
+      method: aggregators[aggregator]
+      // transaction: processor.transaction,
     });
     return {
       result: options.dataType === import_database.DataTypes.DOUBLE ? Number(result) : result,

package/dist/server/Plugin.d.ts

@@ -1,6 +1,4 @@
 import { Plugin } from '@nocobase/server';
-import WorkflowPlugin from '@nocobase/plugin-workflow';
 export default class extends Plugin {
-    workflow: WorkflowPlugin;
     load(): Promise<void>;
 }

package/dist/server/Plugin.js

@@ -30,13 +30,12 @@ __export(Plugin_exports, {
   default: () => Plugin_default
 });
 module.exports = __toCommonJS(Plugin_exports);
+var import_plugin_workflow = __toESM(require("@nocobase/plugin-workflow"));
 var import_server = require("@nocobase/server");
 var import_AggregateInstruction = __toESM(require("./AggregateInstruction"));
 class Plugin_default extends import_server.Plugin {
-  workflow;
   async load() {
-    const workflowPlugin = this.app.getPlugin("workflow");
-    this.workflow = workflowPlugin;
-    workflowPlugin.instructions.register("aggregate", new import_AggregateInstruction.default(workflowPlugin));
+    const workflowPlugin = this.app.getPlugin(import_plugin_workflow.default);
+    workflowPlugin.registerInstruction("aggregate", import_AggregateInstruction.default);
   }
 }

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.18.0-alpha.1",
+  "version": "0.18.0-alpha.8",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
@@ -16,9 +16,8 @@
     "@nocobase/client": "0.x",
     "@nocobase/database": "0.x",
     "@nocobase/plugin-workflow": ">=0.17.0-alpha.3",
-    "@nocobase/plugin-workflow-test": ">=0.17.0-alpha.3",
     "@nocobase/server": "0.x",
     "@nocobase/test": "0.x"
   },
-  "gitHead": "0f5f1c0a37dc397a9dc4c8eec0c4ec20fd8107b0"
+  "gitHead": "727d42f6f14e5f863831da3dbf3255ba1165b567"
 }

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

@@ -0,0 +1,519 @@
+import { faker } from '@faker-js/faker';
+import {
+  AggregateNode,
+  CollectionTriggerNode,
+  apiCreateWorkflow,
+  apiDeleteWorkflow,
+  apiGetWorkflow,
+  apiGetWorkflowNodeExecutions,
+  apiUpdateWorkflowTrigger,
+  appendJsonCollectionName,
+  generalWithNoRelationalFields,
+} from '@nocobase/plugin-workflow-test/e2e';
+import { expect, test } from '@nocobase/test/e2e';
+import { dayjs } from '@nocobase/utils';
+
+test('Collection event add data trigger, aggregated data table, no filtering, normal table integer fields not de-emphasised COUNT', async ({
+  page,
+  mockCollections,
+  mockRecords,
+}) => {
+  //数据表后缀标识
+  const triggerNodeAppendText = 'a' + faker.string.alphanumeric(4);
+  const aggregateNodeAppendText = 'b' + faker.string.alphanumeric(4);
+  //创建触发器节点数据表
+  const triggerNodeCollectionDisplayName = `自动>组织[普通表]${triggerNodeAppendText}`;
+  const triggerNodeCollectionName = `tt_amt_org${triggerNodeAppendText}`;
+  const triggerNodeFieldName = 'orgname';
+  const triggerNodeFieldDisplayName = '公司名称(单行文本)';
+  await mockCollections(
+    appendJsonCollectionName(JSON.parse(JSON.stringify(generalWithNoRelationalFields)), triggerNodeAppendText)
+      .collections,
+  );
+
+  // 创建聚合节点数据表
+  const aggregateNodeCollectionDisplayName = `自动>组织[普通表]${aggregateNodeAppendText}`;
+  const aggregateNodeCollectionName = `tt_amt_org${aggregateNodeAppendText}`;
+  const aggregateNodeFieldName = 'staffnum';
+  const aggregateNodeFieldDisplayName = '员工人数(整数)';
+  await mockCollections(
+    appendJsonCollectionName(JSON.parse(JSON.stringify(generalWithNoRelationalFields)), aggregateNodeAppendText)
+      .collections,
+  );
+  const aggregateNodeCollectionData = [
+    { staffnum: 3, regcapital: 3.12 },
+    { staffnum: 3, regcapital: 3.6 },
+    { staffnum: 4, regcapital: 4.6 },
+    { staffnum: 4, regcapital: 4.6 },
+    { staffnum: 5, regcapital: 5.6 },
+  ];
+  const aggregateNodeCollectionRecords = await mockRecords(aggregateNodeCollectionName, aggregateNodeCollectionData);
+
+  //添加工作流
+  const workFlowName = faker.string.alphanumeric(5) + triggerNodeAppendText;
+  const workflowData = {
+    current: true,
+    options: { deleteExecutionOnStatus: [] },
+    title: workFlowName,
+    type: 'collection',
+    enabled: true,
+  };
+  const workflow = await apiCreateWorkflow(workflowData);
+  const workflowObj = JSON.parse(JSON.stringify(workflow));
+  const workflowId = workflowObj.id;
+  //配置工作流触发器
+  const triggerNodeData = {
+    config: { appends: [], collection: triggerNodeCollectionName, changed: [], condition: { $and: [] }, mode: 1 },
+  };
+  const triggerNode = await apiUpdateWorkflowTrigger(workflowId, triggerNodeData);
+  const triggerNodeObj = JSON.parse(JSON.stringify(triggerNode));
+
+  //配置聚合数据节点
+  await page.goto(`admin/workflow/workflows/${workflowId}`);
+  await page.waitForLoadState('networkidle');
+  const collectionTriggerNode = new CollectionTriggerNode(page, workFlowName, triggerNodeCollectionName);
+  await collectionTriggerNode.addNodeButton.click();
+  await page.getByRole('button', { name: 'aggregate', exact: true }).click();
+  const aggregateRecordNodeName = 'Aggregate' + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
+  await page.getByLabel('Aggregate-Aggregate', { exact: true }).getByRole('textbox').fill(aggregateRecordNodeName);
+  const aggregateRecordNode = new AggregateNode(page, aggregateRecordNodeName);
+  const aggregateRecordNodeId = await aggregateRecordNode.node.locator('.workflow-node-id').innerText();
+  await aggregateRecordNode.nodeConfigure.click();
+  await aggregateRecordNode.collectionDropDown.click();
+  await page.getByText(aggregateNodeCollectionDisplayName).click();
+  await aggregateRecordNode.aggregatedFieldDropDown.click();
+  await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
+  await aggregateRecordNode.submitButton.click();
+
+  // 2、测试步骤：添加数据触发工作流
+  const triggerNodeCollectionRecordOne = triggerNodeFieldDisplayName + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
+  const triggerNodeCollectionRecords = await mockRecords(triggerNodeCollectionName, [
+    { orgname: triggerNodeCollectionRecordOne },
+  ]);
+  await page.waitForTimeout(1000);
+
+  // 3、预期结果：工作流成功触发,数据查询成功
+  const getWorkflow = await apiGetWorkflow(workflowId);
+  const getWorkflowObj = JSON.parse(JSON.stringify(getWorkflow));
+  const getWorkflowExecuted = getWorkflowObj.executed;
+  expect(getWorkflowExecuted).toBe(1);
+  const getWorkflowNodeExecutions = await apiGetWorkflowNodeExecutions(workflowId);
+  const getWorkflowNodeExecutionsObj = JSON.parse(JSON.stringify(getWorkflowNodeExecutions));
+  getWorkflowNodeExecutionsObj.sort(function (a: { id: number }, b: { id: number }) {
+    return b.id - a.id;
+  });
+  const jobs = getWorkflowNodeExecutionsObj[0].jobs;
+  const queryRecordNodeJob = jobs.find((job) => job.nodeId.toString() === aggregateRecordNodeId);
+  const queryRecordNodeJobResult = queryRecordNodeJob.result;
+  expect(queryRecordNodeJobResult).toBe(aggregateNodeCollectionData.length);
+  // 4、后置处理：删除工作流
+  await apiDeleteWorkflow(workflowId);
+});
+
+test('Collection event add data trigger, aggregated data table, no filtering, normal table integer fields not de-emphasised SUM', async ({
+  page,
+  mockCollections,
+  mockRecords,
+}) => {
+  //数据表后缀标识
+  const triggerNodeAppendText = 'a' + faker.string.alphanumeric(4);
+  const aggregateNodeAppendText = 'b' + faker.string.alphanumeric(4);
+  //创建触发器节点数据表
+  const triggerNodeCollectionDisplayName = `自动>组织[普通表]${triggerNodeAppendText}`;
+  const triggerNodeCollectionName = `tt_amt_org${triggerNodeAppendText}`;
+  const triggerNodeFieldName = 'orgname';
+  const triggerNodeFieldDisplayName = '公司名称(单行文本)';
+  await mockCollections(
+    appendJsonCollectionName(JSON.parse(JSON.stringify(generalWithNoRelationalFields)), triggerNodeAppendText)
+      .collections,
+  );
+
+  // 创建聚合节点数据表
+  const aggregateNodeCollectionDisplayName = `自动>组织[普通表]${aggregateNodeAppendText}`;
+  const aggregateNodeCollectionName = `tt_amt_org${aggregateNodeAppendText}`;
+  const aggregateNodeFieldName = 'staffnum';
+  const aggregateNodeFieldDisplayName = '员工人数(整数)';
+  await mockCollections(
+    appendJsonCollectionName(JSON.parse(JSON.stringify(generalWithNoRelationalFields)), aggregateNodeAppendText)
+      .collections,
+  );
+  const aggregateNodeCollectionData = [
+    { staffnum: 3, regcapital: 3.12 },
+    { staffnum: 3, regcapital: 3.6 },
+    { staffnum: 4, regcapital: 4.6 },
+    { staffnum: 4, regcapital: 4.6 },
+    { staffnum: 5, regcapital: 5.6 },
+  ];
+  const aggregateNodeCollectionRecords = await mockRecords(aggregateNodeCollectionName, aggregateNodeCollectionData);
+
+  //添加工作流
+  const workFlowName = faker.string.alphanumeric(5) + triggerNodeAppendText;
+  const workflowData = {
+    current: true,
+    options: { deleteExecutionOnStatus: [] },
+    title: workFlowName,
+    type: 'collection',
+    enabled: true,
+  };
+  const workflow = await apiCreateWorkflow(workflowData);
+  const workflowObj = JSON.parse(JSON.stringify(workflow));
+  const workflowId = workflowObj.id;
+  //配置工作流触发器
+  const triggerNodeData = {
+    config: { appends: [], collection: triggerNodeCollectionName, changed: [], condition: { $and: [] }, mode: 1 },
+  };
+  const triggerNode = await apiUpdateWorkflowTrigger(workflowId, triggerNodeData);
+  const triggerNodeObj = JSON.parse(JSON.stringify(triggerNode));
+
+  //配置聚合数据节点
+  await page.goto(`admin/workflow/workflows/${workflowId}`);
+  await page.waitForLoadState('networkidle');
+  const collectionTriggerNode = new CollectionTriggerNode(page, workFlowName, triggerNodeCollectionName);
+  await collectionTriggerNode.addNodeButton.click();
+  await page.getByRole('button', { name: 'aggregate', exact: true }).click();
+  const aggregateRecordNodeName = 'Aggregate' + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
+  await page.getByLabel('Aggregate-Aggregate', { exact: true }).getByRole('textbox').fill(aggregateRecordNodeName);
+  const aggregateRecordNode = new AggregateNode(page, aggregateRecordNodeName);
+  const aggregateRecordNodeId = await aggregateRecordNode.node.locator('.workflow-node-id').innerText();
+  await aggregateRecordNode.nodeConfigure.click();
+  await aggregateRecordNode.sumRadio.click();
+  await aggregateRecordNode.collectionDropDown.click();
+  await page.getByText(aggregateNodeCollectionDisplayName).click();
+  await aggregateRecordNode.aggregatedFieldDropDown.click();
+  await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
+  await aggregateRecordNode.submitButton.click();
+
+  // 2、测试步骤：添加数据触发工作流
+  const triggerNodeCollectionRecordOne = triggerNodeFieldDisplayName + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
+  const triggerNodeCollectionRecords = await mockRecords(triggerNodeCollectionName, [
+    { orgname: triggerNodeCollectionRecordOne },
+  ]);
+  await page.waitForTimeout(1000);
+
+  // 3、预期结果：工作流成功触发,数据查询成功
+  const getWorkflow = await apiGetWorkflow(workflowId);
+  const getWorkflowObj = JSON.parse(JSON.stringify(getWorkflow));
+  const getWorkflowExecuted = getWorkflowObj.executed;
+  expect(getWorkflowExecuted).toBe(1);
+  const getWorkflowNodeExecutions = await apiGetWorkflowNodeExecutions(workflowId);
+  const getWorkflowNodeExecutionsObj = JSON.parse(JSON.stringify(getWorkflowNodeExecutions));
+  getWorkflowNodeExecutionsObj.sort(function (a: { id: number }, b: { id: number }) {
+    return b.id - a.id;
+  });
+  const jobs = getWorkflowNodeExecutionsObj[0].jobs;
+  const queryRecordNodeJob = jobs.find((job) => job.nodeId.toString() === aggregateRecordNodeId);
+  const queryRecordNodeJobResult = queryRecordNodeJob.result;
+  // aggregateNodeCollectionData中staffnum字段值总和
+  const aggregateNodeCollectionDataSum = aggregateNodeCollectionData.reduce((total, currentValue) => {
+    return total + currentValue.staffnum;
+  }, 0);
+  expect(queryRecordNodeJobResult).toBe(aggregateNodeCollectionDataSum);
+  // 4、后置处理：删除工作流
+  await apiDeleteWorkflow(workflowId);
+});
+
+test('Collection event add data trigger, aggregated data table, no filtering, normal table integer fields not de-emphasised AVG', async ({
+  page,
+  mockCollections,
+  mockRecords,
+}) => {
+  //数据表后缀标识
+  const triggerNodeAppendText = 'a' + faker.string.alphanumeric(4);
+  const aggregateNodeAppendText = 'b' + faker.string.alphanumeric(4);
+  //创建触发器节点数据表
+  const triggerNodeCollectionDisplayName = `自动>组织[普通表]${triggerNodeAppendText}`;
+  const triggerNodeCollectionName = `tt_amt_org${triggerNodeAppendText}`;
+  const triggerNodeFieldName = 'orgname';
+  const triggerNodeFieldDisplayName = '公司名称(单行文本)';
+  await mockCollections(
+    appendJsonCollectionName(JSON.parse(JSON.stringify(generalWithNoRelationalFields)), triggerNodeAppendText)
+      .collections,
+  );
+
+  // 创建聚合节点数据表
+  const aggregateNodeCollectionDisplayName = `自动>组织[普通表]${aggregateNodeAppendText}`;
+  const aggregateNodeCollectionName = `tt_amt_org${aggregateNodeAppendText}`;
+  const aggregateNodeFieldName = 'staffnum';
+  const aggregateNodeFieldDisplayName = '员工人数(整数)';
+  await mockCollections(
+    appendJsonCollectionName(JSON.parse(JSON.stringify(generalWithNoRelationalFields)), aggregateNodeAppendText)
+      .collections,
+  );
+  const aggregateNodeCollectionData = [
+    { staffnum: 3, regcapital: 3.12 },
+    { staffnum: 3, regcapital: 3.6 },
+    { staffnum: 4, regcapital: 4.6 },
+    { staffnum: 4, regcapital: 4.6 },
+    { staffnum: 5, regcapital: 5.6 },
+  ];
+  const aggregateNodeCollectionRecords = await mockRecords(aggregateNodeCollectionName, aggregateNodeCollectionData);
+
+  //添加工作流
+  const workFlowName = faker.string.alphanumeric(5) + triggerNodeAppendText;
+  const workflowData = {
+    current: true,
+    options: { deleteExecutionOnStatus: [] },
+    title: workFlowName,
+    type: 'collection',
+    enabled: true,
+  };
+  const workflow = await apiCreateWorkflow(workflowData);
+  const workflowObj = JSON.parse(JSON.stringify(workflow));
+  const workflowId = workflowObj.id;
+  //配置工作流触发器
+  const triggerNodeData = {
+    config: { appends: [], collection: triggerNodeCollectionName, changed: [], condition: { $and: [] }, mode: 1 },
+  };
+  const triggerNode = await apiUpdateWorkflowTrigger(workflowId, triggerNodeData);
+  const triggerNodeObj = JSON.parse(JSON.stringify(triggerNode));
+  //配置聚合数据节点
+  await page.goto(`admin/workflow/workflows/${workflowId}`);
+  await page.waitForLoadState('networkidle');
+  const collectionTriggerNode = new CollectionTriggerNode(page, workFlowName, triggerNodeCollectionName);
+  await collectionTriggerNode.addNodeButton.click();
+  await page.getByRole('button', { name: 'aggregate', exact: true }).click();
+  const aggregateRecordNodeName = 'Aggregate' + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
+  await page.getByLabel('Aggregate-Aggregate', { exact: true }).getByRole('textbox').fill(aggregateRecordNodeName);
+  const aggregateRecordNode = new AggregateNode(page, aggregateRecordNodeName);
+  const aggregateRecordNodeId = await aggregateRecordNode.node.locator('.workflow-node-id').innerText();
+  await aggregateRecordNode.nodeConfigure.click();
+  await aggregateRecordNode.avgRadio.click();
+  await aggregateRecordNode.collectionDropDown.click();
+  await page.getByText(aggregateNodeCollectionDisplayName).click();
+  await aggregateRecordNode.aggregatedFieldDropDown.click();
+  await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
+  await aggregateRecordNode.submitButton.click();
+
+  // 2、测试步骤：添加数据触发工作流
+  const triggerNodeCollectionRecordOne = triggerNodeFieldDisplayName + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
+  const triggerNodeCollectionRecords = await mockRecords(triggerNodeCollectionName, [
+    { orgname: triggerNodeCollectionRecordOne },
+  ]);
+  await page.waitForTimeout(1000);
+
+  // 3、预期结果：工作流成功触发,数据查询成功
+  const getWorkflow = await apiGetWorkflow(workflowId);
+  const getWorkflowObj = JSON.parse(JSON.stringify(getWorkflow));
+  const getWorkflowExecuted = getWorkflowObj.executed;
+  expect(getWorkflowExecuted).toBe(1);
+  const getWorkflowNodeExecutions = await apiGetWorkflowNodeExecutions(workflowId);
+  const getWorkflowNodeExecutionsObj = JSON.parse(JSON.stringify(getWorkflowNodeExecutions));
+  getWorkflowNodeExecutionsObj.sort(function (a: { id: number }, b: { id: number }) {
+    return b.id - a.id;
+  });
+  const jobs = getWorkflowNodeExecutionsObj[0].jobs;
+  const queryRecordNodeJob = jobs.find((job) => job.nodeId.toString() === aggregateRecordNodeId);
+  const queryRecordNodeJobResult = queryRecordNodeJob.result;
+  // aggregateNodeCollectionData中staffnum字段值平均值
+  const aggregateNodeCollectionDataAvg =
+    aggregateNodeCollectionData.reduce((total, currentValue) => {
+      return total + currentValue.staffnum;
+    }, 0) / aggregateNodeCollectionData.length;
+  expect(queryRecordNodeJobResult).toBe(aggregateNodeCollectionDataAvg);
+  // 4、后置处理：删除工作流
+  await apiDeleteWorkflow(workflowId);
+});
+
+test('Collection event add data trigger, aggregated data table, no filtering, normal table integer fields not de-emphasised MIN', async ({
+  page,
+  mockCollections,
+  mockRecords,
+}) => {
+  //数据表后缀标识
+  const triggerNodeAppendText = 'a' + faker.string.alphanumeric(4);
+  const aggregateNodeAppendText = 'b' + faker.string.alphanumeric(4);
+  //创建触发器节点数据表
+  const triggerNodeCollectionDisplayName = `自动>组织[普通表]${triggerNodeAppendText}`;
+  const triggerNodeCollectionName = `tt_amt_org${triggerNodeAppendText}`;
+  const triggerNodeFieldName = 'orgname';
+  const triggerNodeFieldDisplayName = '公司名称(单行文本)';
+  await mockCollections(
+    appendJsonCollectionName(JSON.parse(JSON.stringify(generalWithNoRelationalFields)), triggerNodeAppendText)
+      .collections,
+  );
+
+  // 创建聚合节点数据表
+  const aggregateNodeCollectionDisplayName = `自动>组织[普通表]${aggregateNodeAppendText}`;
+  const aggregateNodeCollectionName = `tt_amt_org${aggregateNodeAppendText}`;
+  const aggregateNodeFieldName = 'staffnum';
+  const aggregateNodeFieldDisplayName = '员工人数(整数)';
+  await mockCollections(
+    appendJsonCollectionName(JSON.parse(JSON.stringify(generalWithNoRelationalFields)), aggregateNodeAppendText)
+      .collections,
+  );
+  const aggregateNodeCollectionData = [
+    { staffnum: 3, regcapital: 3.12 },
+    { staffnum: 3, regcapital: 3.6 },
+    { staffnum: 4, regcapital: 4.6 },
+    { staffnum: 4, regcapital: 4.6 },
+    { staffnum: 5, regcapital: 5.6 },
+  ];
+  const aggregateNodeCollectionRecords = await mockRecords(aggregateNodeCollectionName, aggregateNodeCollectionData);
+
+  //添加工作流
+  const workFlowName = faker.string.alphanumeric(5) + triggerNodeAppendText;
+  const workflowData = {
+    current: true,
+    options: { deleteExecutionOnStatus: [] },
+    title: workFlowName,
+    type: 'collection',
+    enabled: true,
+  };
+  const workflow = await apiCreateWorkflow(workflowData);
+  const workflowObj = JSON.parse(JSON.stringify(workflow));
+  const workflowId = workflowObj.id;
+  //配置工作流触发器
+  const triggerNodeData = {
+    config: { appends: [], collection: triggerNodeCollectionName, changed: [], condition: { $and: [] }, mode: 1 },
+  };
+  const triggerNode = await apiUpdateWorkflowTrigger(workflowId, triggerNodeData);
+  const triggerNodeObj = JSON.parse(JSON.stringify(triggerNode));
+
+  //配置聚合数据节点
+  await page.goto(`admin/workflow/workflows/${workflowId}`);
+  await page.waitForLoadState('networkidle');
+  const collectionTriggerNode = new CollectionTriggerNode(page, workFlowName, triggerNodeCollectionName);
+  await collectionTriggerNode.addNodeButton.click();
+  await page.getByRole('button', { name: 'aggregate', exact: true }).click();
+  const aggregateRecordNodeName = 'Aggregate' + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
+  await page.getByLabel('Aggregate-Aggregate', { exact: true }).getByRole('textbox').fill(aggregateRecordNodeName);
+  const aggregateRecordNode = new AggregateNode(page, aggregateRecordNodeName);
+  const aggregateRecordNodeId = await aggregateRecordNode.node.locator('.workflow-node-id').innerText();
+  await aggregateRecordNode.nodeConfigure.click();
+  await aggregateRecordNode.minRadio.click();
+  await aggregateRecordNode.collectionDropDown.click();
+  await page.getByText(aggregateNodeCollectionDisplayName).click();
+  await aggregateRecordNode.aggregatedFieldDropDown.click();
+  await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
+  await aggregateRecordNode.submitButton.click();
+
+  // 2、测试步骤：添加数据触发工作流
+  const triggerNodeCollectionRecordOne = triggerNodeFieldDisplayName + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
+  const triggerNodeCollectionRecords = await mockRecords(triggerNodeCollectionName, [
+    { orgname: triggerNodeCollectionRecordOne },
+  ]);
+  await page.waitForTimeout(1000);
+
+  // 3、预期结果：工作流成功触发,数据查询成功
+  const getWorkflow = await apiGetWorkflow(workflowId);
+  const getWorkflowObj = JSON.parse(JSON.stringify(getWorkflow));
+  const getWorkflowExecuted = getWorkflowObj.executed;
+  expect(getWorkflowExecuted).toBe(1);
+  const getWorkflowNodeExecutions = await apiGetWorkflowNodeExecutions(workflowId);
+  const getWorkflowNodeExecutionsObj = JSON.parse(JSON.stringify(getWorkflowNodeExecutions));
+  getWorkflowNodeExecutionsObj.sort(function (a: { id: number }, b: { id: number }) {
+    return b.id - a.id;
+  });
+  const jobs = getWorkflowNodeExecutionsObj[0].jobs;
+  const queryRecordNodeJob = jobs.find((job) => job.nodeId.toString() === aggregateRecordNodeId);
+  const queryRecordNodeJobResult = queryRecordNodeJob.result;
+  // aggregateNodeCollectionData中staffnum字段值最小值
+  const aggregateNodeCollectionDataMin = aggregateNodeCollectionData.reduce((min, currentValue) => {
+    return currentValue.staffnum < min ? currentValue.staffnum : min;
+  }, aggregateNodeCollectionData[0].staffnum);
+  expect(queryRecordNodeJobResult).toBe(aggregateNodeCollectionDataMin);
+  // 4、后置处理：删除工作流
+  await apiDeleteWorkflow(workflowId);
+});
+
+test('Collection event add data trigger, aggregated data table, no filtering, normal table integer fields not de-emphasised MAX', async ({
+  page,
+  mockCollections,
+  mockRecords,
+}) => {
+  //数据表后缀标识
+  const triggerNodeAppendText = 'a' + faker.string.alphanumeric(4);
+  const aggregateNodeAppendText = 'b' + faker.string.alphanumeric(4);
+  //创建触发器节点数据表
+  const triggerNodeCollectionDisplayName = `自动>组织[普通表]${triggerNodeAppendText}`;
+  const triggerNodeCollectionName = `tt_amt_org${triggerNodeAppendText}`;
+  const triggerNodeFieldName = 'orgname';
+  const triggerNodeFieldDisplayName = '公司名称(单行文本)';
+  await mockCollections(
+    appendJsonCollectionName(JSON.parse(JSON.stringify(generalWithNoRelationalFields)), triggerNodeAppendText)
+      .collections,
+  );
+
+  // 创建聚合节点数据表
+  const aggregateNodeCollectionDisplayName = `自动>组织[普通表]${aggregateNodeAppendText}`;
+  const aggregateNodeCollectionName = `tt_amt_org${aggregateNodeAppendText}`;
+  const aggregateNodeFieldName = 'staffnum';
+  const aggregateNodeFieldDisplayName = '员工人数(整数)';
+  await mockCollections(
+    appendJsonCollectionName(JSON.parse(JSON.stringify(generalWithNoRelationalFields)), aggregateNodeAppendText)
+      .collections,
+  );
+  const aggregateNodeCollectionData = [
+    { staffnum: 3, regcapital: 3.12 },
+    { staffnum: 3, regcapital: 3.6 },
+    { staffnum: 4, regcapital: 4.6 },
+    { staffnum: 4, regcapital: 4.6 },
+    { staffnum: 5, regcapital: 5.6 },
+  ];
+  const aggregateNodeCollectionRecords = await mockRecords(aggregateNodeCollectionName, aggregateNodeCollectionData);
+
+  //添加工作流
+  const workFlowName = faker.string.alphanumeric(5) + triggerNodeAppendText;
+  const workflowData = {
+    current: true,
+    options: { deleteExecutionOnStatus: [] },
+    title: workFlowName,
+    type: 'collection',
+    enabled: true,
+  };
+  const workflow = await apiCreateWorkflow(workflowData);
+  const workflowObj = JSON.parse(JSON.stringify(workflow));
+  const workflowId = workflowObj.id;
+  //配置工作流触发器
+  const triggerNodeData = {
+    config: { appends: [], collection: triggerNodeCollectionName, changed: [], condition: { $and: [] }, mode: 1 },
+  };
+  const triggerNode = await apiUpdateWorkflowTrigger(workflowId, triggerNodeData);
+  const triggerNodeObj = JSON.parse(JSON.stringify(triggerNode));
+
+  //配置聚合数据节点
+  await page.goto(`admin/workflow/workflows/${workflowId}`);
+  await page.waitForLoadState('networkidle');
+  const collectionTriggerNode = new CollectionTriggerNode(page, workFlowName, triggerNodeCollectionName);
+  await collectionTriggerNode.addNodeButton.click();
+  await page.getByRole('button', { name: 'aggregate', exact: true }).click();
+  const aggregateRecordNodeName = 'Aggregate' + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
+  await page.getByLabel('Aggregate-Aggregate', { exact: true }).getByRole('textbox').fill(aggregateRecordNodeName);
+  const aggregateRecordNode = new AggregateNode(page, aggregateRecordNodeName);
+  const aggregateRecordNodeId = await aggregateRecordNode.node.locator('.workflow-node-id').innerText();
+  await aggregateRecordNode.nodeConfigure.click();
+  await aggregateRecordNode.maxRadio.click();
+  await aggregateRecordNode.collectionDropDown.click();
+  await page.getByText(aggregateNodeCollectionDisplayName).click();
+  await aggregateRecordNode.aggregatedFieldDropDown.click();
+  await page.getByRole('option', { name: aggregateNodeFieldDisplayName }).click();
+  await aggregateRecordNode.submitButton.click();
+
+  // 2、测试步骤：添加数据触发工作流
+  const triggerNodeCollectionRecordOne = triggerNodeFieldDisplayName + dayjs().format('YYYYMMDDHHmmss.SSS').toString();
+  const triggerNodeCollectionRecords = await mockRecords(triggerNodeCollectionName, [
+    { orgname: triggerNodeCollectionRecordOne },
+  ]);
+  await page.waitForTimeout(1000);
+
+  // 3、预期结果：工作流成功触发,数据查询成功
+  const getWorkflow = await apiGetWorkflow(workflowId);
+  const getWorkflowObj = JSON.parse(JSON.stringify(getWorkflow));
+  const getWorkflowExecuted = getWorkflowObj.executed;
+  expect(getWorkflowExecuted).toBe(1);
+  const getWorkflowNodeExecutions = await apiGetWorkflowNodeExecutions(workflowId);
+  const getWorkflowNodeExecutionsObj = JSON.parse(JSON.stringify(getWorkflowNodeExecutions));
+  getWorkflowNodeExecutionsObj.sort(function (a: { id: number }, b: { id: number }) {
+    return b.id - a.id;
+  });
+  const jobs = getWorkflowNodeExecutionsObj[0].jobs;
+  const queryRecordNodeJob = jobs.find((job) => job.nodeId.toString() === aggregateRecordNodeId);
+  const queryRecordNodeJobResult = queryRecordNodeJob.result;
+  // aggregateNodeCollectionData中staffnum字段值最大值
+  const aggregateNodeCollectionDataMax = aggregateNodeCollectionData.reduce((max, currentValue) => {
+    return currentValue.staffnum > max ? currentValue.staffnum : max;
+  }, aggregateNodeCollectionData[0].staffnum);
+  expect(queryRecordNodeJobResult).toBe(aggregateNodeCollectionDataMax);
+  // 4、后置处理：删除工作流
+  await apiDeleteWorkflow(workflowId);
+});

package/src/client/index.ts

@@ -13,7 +13,6 @@ export default class extends Plugin {
   // You can get and modify the app instance here
   async load() {
     const workflow = this.app.pm.get('workflow') as WorkflowPlugin;
-    const aggregateInstruction = new AggregateInstruction();
-    workflow.instructions.register(aggregateInstruction.type, aggregateInstruction);
+    workflow.registerInstruction('aggregate', AggregateInstruction);
   }
 }

package/src/server/AggregateInstruction.ts

@@ -28,7 +28,7 @@ export default class extends Instruction {
     const result = await repo.aggregate({
       ...options,
       method: aggregators[aggregator],
-      transaction: processor.transaction,
+      // transaction: processor.transaction,
     });
 
     return {

package/src/server/Plugin.ts

@@ -1,14 +1,11 @@
-import { Plugin } from '@nocobase/server';
 import WorkflowPlugin from '@nocobase/plugin-workflow';
+import { Plugin } from '@nocobase/server';
 
 import AggregateInstruction from './AggregateInstruction';
 
 export default class extends Plugin {
-  workflow: WorkflowPlugin;
-
   async load() {
-    const workflowPlugin = this.app.getPlugin('workflow') as WorkflowPlugin;
-    this.workflow = workflowPlugin;
-    workflowPlugin.instructions.register('aggregate', new AggregateInstruction(workflowPlugin));
+    const workflowPlugin = this.app.getPlugin<WorkflowPlugin>(WorkflowPlugin);
+    workflowPlugin.registerInstruction('aggregate', AggregateInstruction);
   }
 }