update custom

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/pojo/response/FlowContent.java

@@ -87,7 +87,7 @@ public class FlowContent {
     /**
      * 流程按钮
      */
-    private List<IFlowAction> actions;
+    private List<Map<String,Object>> actions;
 
     /**
      * 是否可合并
@@ -128,7 +128,7 @@ public class FlowContent {
     public void pushCurrentNode(IFlowNode currentNode) {
         ActionManager actionManager = currentNode.actionManager();
         NodeStrategyManager strategyManager = currentNode.strategyManager();
-        this.actions = actionManager.getActions();
+        this.actions = actionManager.getActions().stream().map(IFlowAction::toMap).toList();
         this.adviceRequired = strategyManager.isAdviceRequired();
         this.signRequired = strategyManager.isSignRequired();
         this.nodeId = currentNode.getId();

frontend/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/action/custom.tsx

@@ -2,6 +2,8 @@ import React from "react";
 import {FlowActionProps} from "./type";
 import {Button, message} from "antd";
 import {useApprovalContext} from "@/components/flow-approval/hooks/use-approval-context";
+import {GroovyScriptConvertorUtil} from "@flow-engine/flow-core";
+import {ActionFactory} from "@/components/flow-approval/components/action/factory";
 
 /**
  * 自定义
@@ -14,6 +16,20 @@ export const CustomAction: React.FC<FlowActionProps> = (props) => {
     const {context} = useApprovalContext()
     const actionPresenter = context.getPresenter().getFlowActionPresenter();
 
+    const script = action.script || '';
+    const returnData = GroovyScriptConvertorUtil.getReturnScript(script);
+    const triggerType = returnData.replaceAll('\'', '');
+
+
+    const ActionView = ActionFactory.getInstance().render({
+        ...props.action,
+        type: triggerType,
+    });
+
+    if (ActionView) {
+        return ActionView
+    }
+
     return (
         <Button
             onClick={() => {

frontend/packages/flow-pc/flow-pc-approval/src/components/flow-approval/presenters/action.ts

@@ -1,15 +1,16 @@
 import {FlowApprovalApi, State} from "@/components/flow-approval/typings";
 import {FormActionContext} from "@flow-engine/flow-types";
+import {GroovyScriptConvertorUtil} from "@flow-engine/flow-core";
 
 export class FlowActionPresenter {
 
     private readonly api: FlowApprovalApi;
-    private readonly formActionContext:FormActionContext;
+    private readonly formActionContext: FormActionContext;
     private state: State;
 
     constructor(state: State,
                 api: FlowApprovalApi,
-                formActionContext:FormActionContext) {
+                formActionContext: FormActionContext) {
         this.state = state;
         this.api = api;
         this.formActionContext = formActionContext;
@@ -19,7 +20,7 @@ export class FlowActionPresenter {
         this.state = state;
     }
 
-    public async processNodes(){
+    public async processNodes() {
         const formData = this.formActionContext.save();
         const id = this.state.flow?.recordId || this.state.flow?.workId || '';
         return await this.api.processNodes({
@@ -34,38 +35,40 @@ export class FlowActionPresenter {
      * @param actionId
      * @private
      */
-    private isPassAction(actionId:string){
+    private isPassAction(actionId: string) {
         const actions = this.state.flow?.actions || [];
-        for(const action of actions){
-            if(action.id === actionId){
-                if(action.type ==='PASS'){
+        for (const action of actions) {
+            if (action.id === actionId) {
+                if (action.type === 'PASS') {
                     return true;
                 }
-                if(action.type === 'CUSTOM'){
+                if (action.type === 'CUSTOM') {
                     const script = action.script || '';
-
-
+                    const returnData = GroovyScriptConvertorUtil.getReturnScript(script);
+                    if (returnData.includes('PASS')) {
+                        return true;
+                    }
                 }
             }
         }
         return false;
     }
 
 
-    private async submitAction(actionId:string,formData:any,params?:any){
+    private async submitAction(actionId: string, formData: any, params?: any) {
         const recordId = this.state.flow?.recordId;
         const workId = this.state.flow?.workId;
-        if(recordId){
+        if (recordId) {
             const request = {
                 formData,
                 recordId,
-                advice:{
+                advice: {
                     actionId,
                     ...params
                 }
             }
             return await this.api.action(request);
-        }else {
+        } else {
             const createRequest = {
                 workId,
                 formData,
@@ -75,7 +78,7 @@ export class FlowActionPresenter {
             const actionRequest = {
                 formData,
                 recordId,
-                advice:{
+                advice: {
                     actionId,
                     ...params
                 }
@@ -85,14 +88,14 @@ export class FlowActionPresenter {
     }
 
 
-    public async action(actionId:string,params?:any) {
+    public async action(actionId: string, params?: any) {
         let formData;
-        if(this.isPassAction(actionId)){
+        if (this.isPassAction(actionId)) {
             formData = await this.formActionContext.validate();
-        }else {
+        } else {
             formData = this.formActionContext.save();
         }
-        return await this.submitAction(actionId, formData,params);
+        return await this.submitAction(actionId, formData, params);
     }
 
 }