@nocobase/plugin-workflow-action-trigger 1.6.0-alpha.2 → 1.6.0-alpha.20

package/dist/client/ActionTrigger.d.ts

@@ -7,7 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { SchemaInitializerItemType, useCollectionDataSource } from '@nocobase/client';
-import { Trigger, useWorkflowAnyExecuted, CheckboxGroupWithTooltip, RadioWithTooltip, TriggerCollectionRecordSelect } from '@nocobase/plugin-workflow/client';
+import { Trigger, useWorkflowAnyExecuted, CheckboxGroupWithTooltip, RadioWithTooltip, TriggerCollectionRecordSelect, WorkflowVariableWrapper } from '@nocobase/plugin-workflow/client';
+import React from 'react';
 declare function useVariables(config: any, options: any): import("@nocobase/plugin-workflow/client").VariableOption[];
 export default class extends Trigger {
     title: string;
@@ -113,14 +114,12 @@ export default class extends Trigger {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
-                fieldNames: {
-                    label: string;
-                    value: string;
-                };
-                service: {
-                    resource: string;
+                nullable: boolean;
+                changeOnSelect: boolean;
+                variableOptions: {
+                    types: ((field: any) => boolean)[];
                 };
-                manual: boolean;
+                render(props: any): React.JSX.Element;
             };
             default: any;
             required: boolean;
@@ -131,14 +130,12 @@ export default class extends Trigger {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
-                fieldNames: {
-                    label: string;
-                    value: string;
-                };
-                service: {
-                    resource: string;
+                nullable: boolean;
+                changeOnSelect: boolean;
+                variableOptions: {
+                    types: ((field: any) => boolean)[];
                 };
-                manual: boolean;
+                render(props: any): React.JSX.Element;
             };
             default: any;
         };
@@ -152,6 +149,7 @@ export default class extends Trigger {
         RadioWithTooltip: typeof RadioWithTooltip;
         CheckboxGroupWithTooltip: typeof CheckboxGroupWithTooltip;
         TriggerCollectionRecordSelect: typeof TriggerCollectionRecordSelect;
+        WorkflowVariableWrapper: typeof WorkflowVariableWrapper;
     };
     isActionTriggerable: (config: any, context: any) => boolean;
     useVariables: typeof useVariables;

package/dist/client/index.js

@@ -7,4 +7,4 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("react-i18next"),require("@formily/react"),require("@nocobase/client"),require("@nocobase/plugin-workflow/client")):"function"==typeof define&&define.amd?define("@nocobase/plugin-workflow-action-trigger",["react-i18next","@formily/react","@nocobase/client","@nocobase/plugin-workflow/client"],t):"object"==typeof exports?exports["@nocobase/plugin-workflow-action-trigger"]=t(require("react-i18next"),require("@formily/react"),require("@nocobase/client"),require("@nocobase/plugin-workflow/client")):e["@nocobase/plugin-workflow-action-trigger"]=t(e["react-i18next"],e["@formily/react"],e["@nocobase/client"],e["@nocobase/plugin-workflow/client"])}(self,function(e,t,o,r){return function(){"use strict";var n={505:function(e){e.exports=t},772:function(e){e.exports=o},433:function(e){e.exports=r},238:function(t){t.exports=e}},i={};function c(e){var t=i[e];if(void 0!==t)return t.exports;var o=i[e]={exports:{}};return n[e](o,o.exports,c),o.exports}c.d=function(e,t){for(var o in t)c.o(t,o)&&!c.o(e,o)&&Object.defineProperty(e,o,{enumerable:!0,get:t[o]})},c.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},c.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};var l={};c.r(l),c.d(l,{default:function(){return q}});var a=c("772"),u=c("433"),s=c("505"),f=c("238"),p="workflow-action-trigger";function d(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return(0,function(e){return(0,f.useTranslation)(p,e)}(t).t)(e)}function b(e,t){(null==t||t>e.length)&&(t=e.length);for(var o=0,r=Array(t);o<t;o++)r[o]=e[o];return r}function y(e,t){for(var o=0;o<t.length;o++){var r=t[o];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function m(e,t,o){return t in e?Object.defineProperty(e,t,{value:o,enumerable:!0,configurable:!0,writable:!0}):e[t]=o,e}function g(e){return(g=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function h(e){for(var t=1;t<arguments.length;t++){var o=null!=arguments[t]?arguments[t]:{},r=Object.keys(o);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(o).filter(function(e){return Object.getOwnPropertyDescriptor(o,e).enumerable}))),r.forEach(function(t){m(e,t,o[t])})}return e}function v(e,t){return t=null!=t?t:{},Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):(function(e,t){var o=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);o.push.apply(o,r)}return o})(Object(t)).forEach(function(o){Object.defineProperty(e,o,Object.getOwnPropertyDescriptor(t,o))}),e}function w(e,t){return(w=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function x(e){return function(e){if(Array.isArray(e))return b(e)}(e)||function(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}(e)||O(e)||function(){throw TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function O(e,t){if(e){if("string"==typeof e)return b(e,t);var o=Object.prototype.toString.call(e).slice(8,-1);if("Object"===o&&e.constructor&&(o=e.constructor.name),"Map"===o||"Set"===o)return Array.from(o);if("Arguments"===o||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(o))return b(e,t)}}function S(){try{var e=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}))}catch(e){}return(S=function(){return!!e})()}var j="create",k="update";function P(e,t){var o,r,n,i=(o=(0,a.parseCollectionName)(e.collection),r=2,function(e){if(Array.isArray(e))return e}(o)||function(e,t){var o,r,n=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=n){var i=[],c=!0,l=!1;try{for(n=n.call(e);!(c=(o=n.next()).done)&&(i.push(o.value),!t||i.length!==t);c=!0);}catch(e){l=!0,r=e}finally{try{!c&&null!=n.return&&n.return()}finally{if(l)throw r}}return i}}(o,2)||O(o,r)||function(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()),c=i[0],l=i[1],s=(0,a.useCompile)(),f=(0,u.useGetCollectionFields)(c),p=(0,u.useGetCollectionFields)(),b=d("Trigger data"),y=d("User submitted action"),m=d("Role of user submitted action");return x((0,u.getCollectionFieldOptions)(v(h({appends:["data"].concat(x((null===(n=e.appends)||void 0===n?void 0:n.map(function(e){return"data.".concat(e)}))||[]))},t),{fields:[{collectionName:l,name:"data",type:"hasOne",target:l,uiSchema:{title:b}}],compile:s,getCollectionFields:f}))).concat(x((0,u.getCollectionFieldOptions)(v(h({appends:["user"]},t),{fields:[{collectionName:"users",name:"user",type:"hasOne",target:"users",uiSchema:{title:y}},{name:"roleName",uiSchema:{title:m}}],compile:s,getCollectionFields:p}))))}var T=function(e){var t,o,r;function n(){var e,t,o,r;return!function(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}(this,n),t=this,o=n,r=arguments,o=g(o),m(e=function(e,t){return t&&("object"===function(e){return e&&"undefined"!=typeof Symbol&&e.constructor===Symbol?"symbol":typeof e}(t)||"function"==typeof t)?t:function(e){if(void 0===e)throw ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e)}(t,S()?Reflect.construct(o,r||[],g(t).constructor):o.apply(t,r)),"title",'{{t("Post-action event", { ns: "'.concat(p,'" })}}')),m(e,"description","{{t('Triggered after the completion of a request initiated through an action button or API, such as after adding or updating data. Suitable for data processing, sending notifications, etc., after actions are completed.', { ns: \"".concat(p,'" })}}')),m(e,"fieldset",{collection:{type:"string",required:!0,"x-decorator":"FormItem","x-decorator-props":{tooltip:'{{t("The collection to which the triggered data belongs.", { ns: "'.concat(p,'" })}}')},"x-component":"DataSourceCollectionCascader","x-disabled":"{{ useWorkflowAnyExecuted() }}",title:'{{t("Collection", { ns: "'.concat(p,'" })}}'),"x-reactions":[{target:"appends",effects:["onFieldValueChange"],fulfill:{state:{value:[]}}}]},global:{type:"boolean",title:'{{t("Trigger mode", { ns: "'.concat(p,'" })}}'),"x-decorator":"FormItem","x-component":"RadioWithTooltip","x-component-props":{direction:"vertical",options:[{label:'{{t("Local mode, triggered after the completion of actions bound to this workflow", { ns: "'.concat(p,'" })}}'),value:!1},{label:'{{t("Global mode, triggered after the completion of the following actions", { ns: "'.concat(p,'" })}}'),value:!0}]},default:!1,"x-reactions":[{dependencies:["collection"],fulfill:{state:{visible:"{{!!$deps[0]}}"}}}]},actions:{type:"number",title:'{{t("Select actions", { ns: "'.concat(p,'" })}}'),"x-decorator":"FormItem","x-component":"CheckboxGroupWithTooltip","x-component-props":{direction:"vertical",options:[{label:'{{t("Create record action", { ns: "'.concat(p,'" })}}'),value:j},{label:'{{t("Update record action", { ns: "'.concat(p,'" })}}'),value:k}]},required:!0,"x-reactions":[{dependencies:["collection","global"],fulfill:{state:{visible:"{{!!$deps[0] && !!$deps[1]}}"}}}]},appends:{type:"array",title:'{{t("Associations to use", { ns: "'.concat(p,'" })}}'),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":{multiple:!0,useCollection:function(){var e=(0,s.useForm)().values;return null==e?void 0:e.collection}},"x-reactions":[{dependencies:["collection"],fulfill:{state:{visible:"{{!!$deps[0]}}"}}}]}}),m(e,"triggerFieldset",{data:{type:"object",title:'{{t("Trigger data", { ns: "'.concat(p,'" })}}'),description:'{{t("Choose a record of the collection to trigger.", { ns: "workflow" })}}',"x-decorator":"FormItem","x-component":"TriggerCollectionRecordSelect",default:null,required:!0},userId:{type:"number",title:'{{t("User submitted action", { ns: "'.concat(p,'" })}}'),"x-decorator":"FormItem","x-component":"RemoteSelect","x-component-props":{fieldNames:{label:"nickname",value:"id"},service:{resource:"users"},manual:!1},default:null,required:!0},roleName:{type:"string",title:'{{t("Role of user submitted action", { ns: "'.concat(p,'" })}}'),"x-decorator":"FormItem","x-component":"RemoteSelect","x-component-props":{fieldNames:{label:"title",value:"name"},service:{resource:"roles"},manual:!1},default:null}}),m(e,"scope",{useCollectionDataSource:a.useCollectionDataSource,useWorkflowAnyExecuted:u.useWorkflowAnyExecuted}),m(e,"components",{RadioWithTooltip:u.RadioWithTooltip,CheckboxGroupWithTooltip:u.CheckboxGroupWithTooltip,TriggerCollectionRecordSelect:u.TriggerCollectionRecordSelect}),m(e,"isActionTriggerable",function(e,t){return!e.global&&["submit","customize:save","customize:update"].includes(t.buttonAction)}),m(e,"useVariables",P),e}return!function(e,t){if("function"!=typeof t&&null!==t)throw TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&w(e,t)}(n,e),t=n,o=[{key:"validate",value:function(e){return e.collection}},{key:"useInitializers",value:function(e){return e.collection?{name:"triggerData",type:"item",key:"triggerData",title:'{{t("Trigger data", { ns: "'.concat(p,'" })}}'),Component:u.CollectionBlockInitializer,collection:e.collection,dataPath:"$context.data"}:null}}],y(t.prototype,o),n}(u.Trigger);function C(e,t,o,r,n,i,c){try{var l=e[i](c),a=l.value}catch(e){o(e);return}l.done?t(a):Promise.resolve(a).then(r,n)}function A(e,t,o){return(A=E()?Reflect.construct:function(e,t,o){var r=[null];r.push.apply(r,t);var n=new(Function.bind.apply(e,r));return o&&_(n,o.prototype),n}).apply(null,arguments)}function R(e,t){for(var o=0;o<t.length;o++){var r=t[o];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function F(e){return(F=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function _(e,t){return(_=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function I(e){var t="function"==typeof Map?new Map:void 0;return(I=function(e){var o;if(null===e||(o=e,-1===Function.toString.call(o).indexOf("[native code]")))return e;if("function"!=typeof e)throw TypeError("Super expression must either be null or a function");if(void 0!==t){if(t.has(e))return t.get(e);t.set(e,r)}function r(){return A(e,arguments,F(this).constructor)}return r.prototype=Object.create(e.prototype,{constructor:{value:r,enumerable:!1,writable:!0,configurable:!0}}),_(r,e)})(e)}function E(){try{var e=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}))}catch(e){}return(E=function(){return!!e})()}var q=function(e){var t,o,r;function n(){var e,t,o;return!function(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}(this,n),e=this,t=n,o=arguments,t=F(t),function(e,t){return t&&("object"===function(e){return e&&"undefined"!=typeof Symbol&&e.constructor===Symbol?"symbol":typeof e}(t)||"function"==typeof t)?t:function(e){if(void 0===e)throw ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e)}(e,E()?Reflect.construct(t,o||[],F(e).constructor):t.apply(e,o))}return!function(e,t){if("function"!=typeof t&&null!==t)throw TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&_(e,t)}(n,e),t=n,o=[{key:"load",value:function(){var e,t=this;return(e=function(){return function(e,t){var o,r,n,i,c={label:0,sent:function(){if(1&n[0])throw n[1];return n[1]},trys:[],ops:[]};return i={next:l(0),throw:l(1),return:l(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function l(i){return function(l){return function(i){if(o)throw TypeError("Generator is already executing.");for(;c;)try{if(o=1,r&&(n=2&i[0]?r.return:i[0]?r.throw||((n=r.return)&&n.call(r),0):r.next)&&!(n=n.call(r,i[1])).done)return n;switch(r=0,n&&(i=[2&i[0],n.value]),i[0]){case 0:case 1:n=i;break;case 4:return c.label++,{value:i[1],done:!1};case 5:c.label++,r=i[1],i=[0];continue;case 7:i=c.ops.pop(),c.trys.pop();continue;default:if(!(n=(n=c.trys).length>0&&n[n.length-1])&&(6===i[0]||2===i[0])){c=0;continue}if(3===i[0]&&(!n||i[1]>n[0]&&i[1]<n[3])){c.label=i[1];break}if(6===i[0]&&c.label<n[1]){c.label=n[1],n=i;break}if(n&&c.label<n[2]){c.label=n[2],c.ops.push(i);break}n[2]&&c.ops.pop(),c.trys.pop();continue}i=t.call(e,c)}catch(e){i=[6,e],r=0}finally{o=n=0}if(5&i[0])throw i[1];return{value:i[0]?i[1]:void 0,done:!0}}([i,l])}}}(this,function(e){return t.app.pm.get("workflow").registerTrigger("action",T),t.app.addScopes({useTriggerWorkflowsActionProps:u.useTriggerWorkflowsActionProps,useRecordTriggerWorkflowsActionProps:u.useRecordTriggerWorkflowsActionProps}),[2]})},function(){var t=this,o=arguments;return new Promise(function(r,n){var i=e.apply(t,o);function c(e){C(i,r,n,c,l,"next",e)}function l(e){C(i,r,n,c,l,"throw",e)}c(void 0)})})()}}],R(t.prototype,o),n}(I(a.Plugin));return l}()});
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("react-i18next"),require("@formily/react"),require("@nocobase/client"),require("@nocobase/plugin-workflow/client"),require("react")):"function"==typeof define&&define.amd?define("@nocobase/plugin-workflow-action-trigger",["react-i18next","@formily/react","@nocobase/client","@nocobase/plugin-workflow/client","react"],t):"object"==typeof exports?exports["@nocobase/plugin-workflow-action-trigger"]=t(require("react-i18next"),require("@formily/react"),require("@nocobase/client"),require("@nocobase/plugin-workflow/client"),require("react")):e["@nocobase/plugin-workflow-action-trigger"]=t(e["react-i18next"],e["@formily/react"],e["@nocobase/client"],e["@nocobase/plugin-workflow/client"],e.react)}(self,function(e,t,o,r,n){return function(){"use strict";var i={505:function(e){e.exports=t},772:function(e){e.exports=o},433:function(e){e.exports=r},156:function(e){e.exports=n},238:function(t){t.exports=e}},c={};function a(e){var t=c[e];if(void 0!==t)return t.exports;var o=c[e]={exports:{}};return i[e](o,o.exports,a),o.exports}a.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(t,{a:t}),t},a.d=function(e,t){for(var o in t)a.o(t,o)&&!a.o(e,o)&&Object.defineProperty(e,o,{enumerable:!0,get:t[o]})},a.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};var l={};a.r(l),a.d(l,{default:function(){return N}});var u=a("772"),s=a("433"),f=a("505"),p=a("238"),d="workflow-action-trigger";function b(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return(0,function(e){return(0,p.useTranslation)(d,e)}(t).t)(e)}var y=a("156"),m=a.n(y);function g(e,t){(null==t||t>e.length)&&(t=e.length);for(var o=0,r=Array(t);o<t;o++)r[o]=e[o];return r}function h(e,t){for(var o=0;o<t.length;o++){var r=t[o];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function v(e,t,o){return t in e?Object.defineProperty(e,t,{value:o,enumerable:!0,configurable:!0,writable:!0}):e[t]=o,e}function w(e){return(w=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function O(e){for(var t=1;t<arguments.length;t++){var o=null!=arguments[t]?arguments[t]:{},r=Object.keys(o);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(o).filter(function(e){return Object.getOwnPropertyDescriptor(o,e).enumerable}))),r.forEach(function(t){v(e,t,o[t])})}return e}function x(e,t){return t=null!=t?t:{},Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):(function(e,t){var o=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);o.push.apply(o,r)}return o})(Object(t)).forEach(function(o){Object.defineProperty(e,o,Object.getOwnPropertyDescriptor(t,o))}),e}function S(e,t){return(S=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function k(e){return function(e){if(Array.isArray(e))return g(e)}(e)||function(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}(e)||j(e)||function(){throw TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function j(e,t){if(e){if("string"==typeof e)return g(e,t);var o=Object.prototype.toString.call(e).slice(8,-1);if("Object"===o&&e.constructor&&(o=e.constructor.name),"Map"===o||"Set"===o)return Array.from(o);if("Arguments"===o||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(o))return g(e,t)}}function P(){try{var e=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}))}catch(e){}return(P=function(){return!!e})()}var T="create",C="update";function W(e,t){var o,r,n,i=(o=(0,u.parseCollectionName)(e.collection),r=2,function(e){if(Array.isArray(e))return e}(o)||function(e,t){var o,r,n=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=n){var i=[],c=!0,a=!1;try{for(n=n.call(e);!(c=(o=n.next()).done)&&(i.push(o.value),!t||i.length!==t);c=!0);}catch(e){a=!0,r=e}finally{try{!c&&null!=n.return&&n.return()}finally{if(a)throw r}}return i}}(o,2)||j(o,r)||function(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()),c=i[0],a=i[1],l=(0,u.useCompile)(),f=(0,s.useGetCollectionFields)(c),p=(0,s.useGetCollectionFields)(),d=b("Trigger data"),y=b("User acted"),m=b("Role of user acted");return k((0,s.getCollectionFieldOptions)(x(O({appends:["data"].concat(k((null===(n=e.appends)||void 0===n?void 0:n.map(function(e){return"data.".concat(e)}))||[]))},t),{fields:[{collectionName:a,name:"data",type:"hasOne",target:a,uiSchema:{title:d}}],compile:l,getCollectionFields:f}))).concat(k((0,s.getCollectionFieldOptions)(x(O({appends:["user"]},t),{fields:[{collectionName:"users",name:"user",type:"hasOne",target:"users",uiSchema:{title:y}},{name:"roleName",uiSchema:{title:m}}],compile:l,getCollectionFields:p}))))}var A=function(e){var t,o,r;function n(){var e,t,o,r;return!function(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}(this,n),t=this,o=n,r=arguments,o=w(o),v(e=function(e,t){return t&&("object"===function(e){return e&&"undefined"!=typeof Symbol&&e.constructor===Symbol?"symbol":typeof e}(t)||"function"==typeof t)?t:function(e){if(void 0===e)throw ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e)}(t,P()?Reflect.construct(o,r||[],w(t).constructor):o.apply(t,r)),"title",'{{t("Post-action event", { ns: "'.concat(d,'" })}}')),v(e,"description","{{t('Triggered after the completion of a request initiated through an action button or API, such as after adding or updating data. Suitable for data processing, sending notifications, etc., after actions are completed.', { ns: \"".concat(d,'" })}}')),v(e,"fieldset",{collection:{type:"string",required:!0,"x-decorator":"FormItem","x-decorator-props":{tooltip:'{{t("The collection to which the triggered data belongs.", { ns: "'.concat(d,'" })}}')},"x-component":"DataSourceCollectionCascader","x-disabled":"{{ useWorkflowAnyExecuted() }}",title:'{{t("Collection", { ns: "'.concat(d,'" })}}'),"x-reactions":[{target:"appends",effects:["onFieldValueChange"],fulfill:{state:{value:[]}}}]},global:{type:"boolean",title:'{{t("Trigger mode", { ns: "'.concat(d,'" })}}'),"x-decorator":"FormItem","x-component":"RadioWithTooltip","x-component-props":{direction:"vertical",options:[{label:'{{t("Local mode, triggered after the completion of actions bound to this workflow", { ns: "'.concat(d,'" })}}'),value:!1},{label:'{{t("Global mode, triggered after the completion of the following actions", { ns: "'.concat(d,'" })}}'),value:!0}]},default:!1,"x-reactions":[{dependencies:["collection"],fulfill:{state:{visible:"{{!!$deps[0]}}"}}}]},actions:{type:"number",title:'{{t("Select actions", { ns: "'.concat(d,'" })}}'),"x-decorator":"FormItem","x-component":"CheckboxGroupWithTooltip","x-component-props":{direction:"vertical",options:[{label:'{{t("Create record action", { ns: "'.concat(d,'" })}}'),value:T},{label:'{{t("Update record action", { ns: "'.concat(d,'" })}}'),value:C}]},required:!0,"x-reactions":[{dependencies:["collection","global"],fulfill:{state:{visible:"{{!!$deps[0] && !!$deps[1]}}"}}}]},appends:{type:"array",title:'{{t("Associations to use", { ns: "'.concat(d,'" })}}'),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":{multiple:!0,useCollection:function(){var e=(0,f.useForm)().values;return null==e?void 0:e.collection}},"x-reactions":[{dependencies:["collection"],fulfill:{state:{visible:"{{!!$deps[0]}}"}}}]}}),v(e,"triggerFieldset",{data:{type:"object",title:'{{t("Trigger data", { ns: "workflow" })}}',description:'{{t("Choose a record or primary key of a record in the collection to trigger.", { ns: "workflow" })}}',"x-decorator":"FormItem","x-component":"TriggerCollectionRecordSelect",default:null,required:!0},userId:{type:"number",title:'{{t("User acted", { ns: "'.concat(d,'" })}}'),"x-decorator":"FormItem","x-component":"WorkflowVariableWrapper","x-component-props":{nullable:!1,changeOnSelect:!0,variableOptions:{types:[function(e){return e.isForeignKey||"context"===e.type?"users"===e.target:"users"===e.collectionName&&"id"===e.name}]},render:function(e){return m().createElement(u.RemoteSelect,O({fieldNames:{label:"nickname",value:"id"},service:{resource:"users"},manual:!1},e))}},default:null,required:!0},roleName:{type:"string",title:'{{t("Role of user acted", { ns: "'.concat(d,'" })}}'),"x-decorator":"FormItem","x-component":"WorkflowVariableWrapper","x-component-props":{nullable:!1,changeOnSelect:!0,variableOptions:{types:[function(e){return e.isForeignKey?"roles"===e.target:"roles"===e.collectionName&&"name"===e.name}]},render:function(e){return m().createElement(u.RemoteSelect,O({fieldNames:{label:"title",value:"name"},service:{resource:"roles"},manual:!1},e))}},default:null}}),v(e,"scope",{useCollectionDataSource:u.useCollectionDataSource,useWorkflowAnyExecuted:s.useWorkflowAnyExecuted}),v(e,"components",{RadioWithTooltip:s.RadioWithTooltip,CheckboxGroupWithTooltip:s.CheckboxGroupWithTooltip,TriggerCollectionRecordSelect:s.TriggerCollectionRecordSelect,WorkflowVariableWrapper:s.WorkflowVariableWrapper}),v(e,"isActionTriggerable",function(e,t){return!e.global&&["submit","customize:save","customize:update"].includes(t.buttonAction)}),v(e,"useVariables",W),e}return!function(e,t){if("function"!=typeof t&&null!==t)throw TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&S(e,t)}(n,e),t=n,o=[{key:"validate",value:function(e){return e.collection}},{key:"useInitializers",value:function(e){return e.collection?{name:"triggerData",type:"item",key:"triggerData",title:'{{t("Trigger data", { ns: "'.concat(d,'" })}}'),Component:s.CollectionBlockInitializer,collection:e.collection,dataPath:"$context.data"}:null}}],h(t.prototype,o),n}(s.Trigger);function F(e,t,o,r,n,i,c){try{var a=e[i](c),l=a.value}catch(e){o(e);return}a.done?t(l):Promise.resolve(l).then(r,n)}function _(e,t,o){return(_=D()?Reflect.construct:function(e,t,o){var r=[null];r.push.apply(r,t);var n=new(Function.bind.apply(e,r));return o&&q(n,o.prototype),n}).apply(null,arguments)}function R(e,t){for(var o=0;o<t.length;o++){var r=t[o];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function E(e){return(E=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function q(e,t){return(q=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function I(e){var t="function"==typeof Map?new Map:void 0;return(I=function(e){var o;if(null===e||(o=e,-1===Function.toString.call(o).indexOf("[native code]")))return e;if("function"!=typeof e)throw TypeError("Super expression must either be null or a function");if(void 0!==t){if(t.has(e))return t.get(e);t.set(e,r)}function r(){return _(e,arguments,E(this).constructor)}return r.prototype=Object.create(e.prototype,{constructor:{value:r,enumerable:!1,writable:!0,configurable:!0}}),q(r,e)})(e)}function D(){try{var e=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}))}catch(e){}return(D=function(){return!!e})()}var N=function(e){var t,o,r;function n(){var e,t,o;return!function(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}(this,n),e=this,t=n,o=arguments,t=E(t),function(e,t){return t&&("object"===function(e){return e&&"undefined"!=typeof Symbol&&e.constructor===Symbol?"symbol":typeof e}(t)||"function"==typeof t)?t:function(e){if(void 0===e)throw ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e)}(e,D()?Reflect.construct(t,o||[],E(e).constructor):t.apply(e,o))}return!function(e,t){if("function"!=typeof t&&null!==t)throw TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&q(e,t)}(n,e),t=n,o=[{key:"load",value:function(){var e,t=this;return(e=function(){return function(e,t){var o,r,n,i,c={label:0,sent:function(){if(1&n[0])throw n[1];return n[1]},trys:[],ops:[]};return i={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function a(i){return function(a){return function(i){if(o)throw TypeError("Generator is already executing.");for(;c;)try{if(o=1,r&&(n=2&i[0]?r.return:i[0]?r.throw||((n=r.return)&&n.call(r),0):r.next)&&!(n=n.call(r,i[1])).done)return n;switch(r=0,n&&(i=[2&i[0],n.value]),i[0]){case 0:case 1:n=i;break;case 4:return c.label++,{value:i[1],done:!1};case 5:c.label++,r=i[1],i=[0];continue;case 7:i=c.ops.pop(),c.trys.pop();continue;default:if(!(n=(n=c.trys).length>0&&n[n.length-1])&&(6===i[0]||2===i[0])){c=0;continue}if(3===i[0]&&(!n||i[1]>n[0]&&i[1]<n[3])){c.label=i[1];break}if(6===i[0]&&c.label<n[1]){c.label=n[1],n=i;break}if(n&&c.label<n[2]){c.label=n[2],c.ops.push(i);break}n[2]&&c.ops.pop(),c.trys.pop();continue}i=t.call(e,c)}catch(e){i=[6,e],r=0}finally{o=n=0}if(5&i[0])throw i[1];return{value:i[0]?i[1]:void 0,done:!0}}([i,a])}}}(this,function(e){return t.app.pm.get("workflow").registerTrigger("action",A),t.app.addScopes({useTriggerWorkflowsActionProps:s.useTriggerWorkflowsActionProps,useRecordTriggerWorkflowsActionProps:s.useRecordTriggerWorkflowsActionProps}),[2]})},function(){var t=this,o=arguments;return new Promise(function(r,n){var i=e.apply(t,o);function c(e){F(i,r,n,c,a,"next",e)}function a(e){F(i,r,n,c,a,"throw",e)}c(void 0)})})()}}],R(t.prototype,o),n}(I(u.Plugin));return l}()});

package/dist/externalVersion.js

@@ -9,16 +9,17 @@
 
 module.exports = {
   "@formily/react": "2.3.0",
-  "@nocobase/client": "1.6.0-alpha.2",
-  "@nocobase/plugin-workflow": "1.6.0-alpha.2",
+  "@nocobase/client": "1.6.0-alpha.20",
+  "@nocobase/plugin-workflow": "1.6.0-alpha.20",
+  "react": "18.2.0",
   "react-i18next": "11.18.6",
   "lodash": "4.17.21",
   "sequelize": "6.35.2",
-  "@nocobase/database": "1.6.0-alpha.2",
-  "@nocobase/server": "1.6.0-alpha.2",
-  "@nocobase/actions": "1.6.0-alpha.2",
-  "@nocobase/data-source-manager": "1.6.0-alpha.2",
-  "@nocobase/plugin-workflow-test": "1.6.0-alpha.2",
-  "@nocobase/test": "1.6.0-alpha.2",
-  "@nocobase/utils": "1.6.0-alpha.2"
+  "@nocobase/database": "1.6.0-alpha.20",
+  "@nocobase/server": "1.6.0-alpha.20",
+  "@nocobase/actions": "1.6.0-alpha.20",
+  "@nocobase/data-source-manager": "1.6.0-alpha.20",
+  "@nocobase/plugin-workflow-test": "1.6.0-alpha.20",
+  "@nocobase/test": "1.6.0-alpha.20",
+  "@nocobase/utils": "1.6.0-alpha.20"
 };

package/dist/locale/zh-CN.json

@@ -12,6 +12,6 @@
   "Update record action": "更新记录操作",
   "Associations to use": "待使用的关系数据",
   "Trigger data": "触发器数据",
-  "User submitted action": "提交操作的用户",
-  "Role of user submitted action": "提交操作用户的角色"
+  "User acted": "操作者",
+  "Role of user acted": "操作者角色"
 }

package/dist/server/ActionTrigger.d.ts

@@ -19,6 +19,13 @@ export default class extends Trigger {
      */
     workflowTriggerAction(context: Context, next: Next): Promise<void>;
     private collectionTriggerAction;
-    execute(workflow: WorkflowModel, context: Context, options: EventOptions): Promise<void | import("@nocobase/plugin-workflow").Processor>;
+    execute(workflow: WorkflowModel, values: any, options: EventOptions): Promise<void | import("@nocobase/plugin-workflow").Processor>;
+    validateContext(values: any): {
+        data: string;
+        userId?: undefined;
+    } | {
+        userId: string;
+        data?: undefined;
+    };
 }
 export {};

package/dist/server/ActionTrigger.js

@@ -172,23 +172,30 @@ class ActionTrigger_default extends import_plugin_workflow.Trigger {
       (workflow.sync ? syncGroup : asyncGroup).push(event);
     }
     for (const event of syncGroup) {
-      await this.workflow.trigger(event[0], event[1], { httpContext: context });
+      await this.workflow.trigger(event[0], event[1]);
     }
     for (const event of asyncGroup) {
       this.workflow.trigger(event[0], event[1]);
     }
   }
-  async execute(workflow, context, options) {
+  async execute(workflow, values, options) {
     var _a, _b;
-    const { values } = context.action.params;
     const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(workflow.config.collection);
     const { collectionManager } = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName);
     const { filterTargetKey, repository } = collectionManager.getCollection(collectionName);
-    const filterByTk = Array.isArray(filterTargetKey) ? (0, import_lodash.pick)(
-      values.data,
-      filterTargetKey.sort((a, b) => a.localeCompare(b))
-    ) : values.data[filterTargetKey];
-    const UserRepo = context.app.db.getRepository("users");
+    let { data } = values;
+    let filterByTk;
+    let loadNeeded = false;
+    if (data && typeof data === "object") {
+      filterByTk = Array.isArray(filterTargetKey) ? (0, import_lodash.pick)(
+        data,
+        filterTargetKey.sort((a, b) => a.localeCompare(b))
+      ) : data[filterTargetKey];
+    } else {
+      filterByTk = data;
+      loadNeeded = true;
+    }
+    const UserRepo = this.workflow.app.db.getRepository("users");
     const actor = await UserRepo.findOne({
       filterByTk: values.userId,
       appends: ["roles"]
@@ -198,8 +205,7 @@ class ActionTrigger_default extends import_plugin_workflow.Trigger {
     }
     const { roles, ...user } = actor.desensitize().get();
     const roleName = values.roleName || ((_a = roles == null ? void 0 : roles[0]) == null ? void 0 : _a.name);
-    let { data } = values;
-    if ((_b = workflow.config.appends) == null ? void 0 : _b.length) {
+    if (loadNeeded || ((_b = workflow.config.appends) == null ? void 0 : _b.length)) {
       data = await repository.findOne({
         filterByTk,
         appends: workflow.config.appends
@@ -212,10 +218,20 @@ class ActionTrigger_default extends import_plugin_workflow.Trigger {
         user,
         roleName
       },
-      {
-        ...options,
-        httpContext: context
-      }
+      options
     );
   }
+  validateContext(values) {
+    if (!values.data) {
+      return {
+        data: "Data is required"
+      };
+    }
+    if (!values.userId) {
+      return {
+        userId: "UserId is required"
+      };
+    }
+    return null;
+  }
 }

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：操作后事件",
   "description": "Triggered after the completion of a request initiated through an action button or API, such as after adding, updating, deleting data, or \"submit to workflow\". Suitable for data processing, sending notifications, etc., after actions are completed.",
   "description.zh-CN": "通过操作按钮或 API 发起请求并在执行完成后触发，比如新增、更新、删除数据或者“提交至工作流”之后。适用于在操作完成后进行数据处理、发送通知等。",
-  "version": "1.6.0-alpha.2",
+  "version": "1.6.0-alpha.20",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/plugins/workflow-action-trigger",
@@ -21,7 +21,7 @@
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x"
   },
-  "gitHead": "08bbc34c21727fc0ad0880f397a42bf7741091ee",
+  "gitHead": "c127664eb2b900edd5c18c9344046cd663a06c3b",
   "keywords": [
     "Workflow"
   ]