add action plugin

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/script/ScriptDefaultConstants.java

@@ -21,6 +21,7 @@ def run(request){
      */
     public static final String SCRIPT_DEFAULT_ACTION_REJECT = """
             // @SCRIPT_TITLE 返回开始节点
+            // @SCRIPT_META {"type":"START"}
             def run(request){
                 return request.getStartNode().getId();
             }

frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/action/index.tsx

@@ -68,6 +68,7 @@ export const ActionTable: React.FC<ActionTableProps> = (props) => {
                             <Space>
                                 <a
                                     onClick={() => {
+                                        form.resetFields();
                                         form.setFieldsValue(record);
                                         setVisible(true);
                                     }}
@@ -113,7 +114,9 @@ export const ActionTable: React.FC<ActionTableProps> = (props) => {
                 }}
                 pagination={false}
             />
+
             <ActionConfigModal
+                nodeId={node.id}
                 open={visible}
                 manager={presenter.getFlowActionManager()}
                 form={form}

frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/action/presenter.ts

@@ -45,9 +45,10 @@ export class FlowActionListPresenter {
                 if (item.id === actionId) {
                     return {
                         ...item,
-                        title: action.title,
+                        ...action,
                         display: {
-                            ...action
+                            ...item.display,
+                            ...action.display,
                         }
                     }
                 }

frontend/packages/flow-pc/flow-pc-design/src/components/design-panel/manager/node.ts

@@ -25,6 +25,7 @@ export class NodeConvertorManager {
                 actions: node.actions,
                 script: node.script,
                 view: node.view,
+                display: node.display,
                 ...this.toStrategyRender(node),
             },
             blocks: blocks.map(item => this.toItemRender(item))
@@ -50,6 +51,7 @@ export class NodeConvertorManager {
             actions: data?.actions || [],
             strategies: this.toStrategyData(data),
             script: data?.script,
+            display: data?.display,
             blocks: blocks.map(item => {
                 return this.toDataItem(item)
             }),
@@ -98,11 +100,11 @@ interface MappingData {
 }
 
 
-export class NodeManger{
+export class NodeManger {
+    // 设计时最新的数据
     private readonly nodes: FlowNode[];
     private readonly nodeList: FlowNode[];
 
-
     constructor(nodes: FlowNode[]) {
         this.nodes = nodes;
         this.nodeList = [];
@@ -119,12 +121,43 @@ export class NodeManger{
         }
     }
 
+    /**
+     * 获取可以退回的节点
+     * @param nodeId
+     */
+    public getBackNodes(nodeId: string) {
+        const list: FlowNode[] = [];
+        for (const node of this.nodeList) {
+            if (node.id === nodeId) {
+                break;
+            }
+            if (node.display) {
+                list.push(node);
+            }
+        }
+        return list;
+    }
+
+
+    public getSize() {
+        return this.nodes.length;
+    }
+
+    public getNodeByType(type:string){
+        for (const node of this.nodeList) {
+            if (node.type === type) {
+                return node;
+            }
+        }
+        return null;
+    }
+
 
     /**
      * 获取节点
      * @param id 节点id
      */
-    public getNode(id:string){
+    public getNode(id: string) {
         for (const node of this.nodeList) {
             if (node.id === id) {
                 return node;
@@ -231,15 +264,15 @@ export class NodeRouterManager {
     public mapping(data: MappingData) {
         const nodeId = data.node;
         let matchNode = null;
-        for(const node of this.nodeList) {
-            if(matchNode) {
-               break;
+        for (const node of this.nodeList) {
+            if (matchNode) {
+                break;
             }
-            if(node.type === nodeId){
+            if (node.type === nodeId) {
                 matchNode = node;
             }
         }
-        if(matchNode){
+        if (matchNode) {
             return {
                 ...data,
                 node: matchNode.id

frontend/packages/flow-pc/flow-pc-design/src/components/design-panel/presenters/index.ts

@@ -142,6 +142,10 @@ export class Presenter {
         console.log('save latest:', apiData);
     }
 
+    public getNodeManager(){
+        return new NodeManger(this.state.workflow.nodes || []);
+    }
+
     public async createNode(form: string, type: string) {
         const flowNode = await this.api.createNode(type);
         const nodeManager = new NodeConvertorManager();

frontend/packages/flow-pc/flow-pc-design/src/components/script/components/action/components/reject.tsx

@@ -13,8 +13,11 @@ export const RejectActionForm:React.FC<ActionFormProps> = (props)=>{
                 <Form.Item
                     name={"script"}
                     label={"拒绝策略"}
+                    help={"配置拒绝时跳转的节点"}
                 >
-                    <ConditionRejectView/>
+                    <ConditionRejectView
+                        nodeId={props.nodeId}
+                    />
                 </Form.Item>
             </Col>
         </Row>

frontend/packages/flow-pc/flow-pc-design/src/components/script/modal/action-config-modal.tsx

@@ -17,6 +17,7 @@ export const ActionConfigModal: React.FC<ActionModalProps> = (props) => {
             }}
         >
             <ActionForm
+                nodeId={props.nodeId}
                 form={props.form}
                 manager={props.manager}
                 onFinish={(values) => {

frontend/packages/flow-pc/flow-pc-design/src/components/script/plugins/action-reject-view-type.ts

@@ -1,6 +1,8 @@
 export const VIEW_KEY = 'ConditionRejectViewPlugin';
 
 export interface ConditionRejectViewPlugin {
+    // 当前节点id
+    nodeId:string;
     // 当前的脚本
     value?: string;
     // 脚本更改回掉

frontend/packages/flow-pc/flow-pc-design/src/components/script/plugins/view/action-reject-view.tsx

@@ -2,19 +2,19 @@ import React from "react";
 import {ConditionRejectViewPlugin, VIEW_KEY} from "@/components/script/plugins/action-reject-view-type";
 import {ViewBindPlugin} from "@flow-engine/flow-core";
 import {useDesignContext} from "@/components/design-panel/hooks/use-design-context";
-import {RejectNodeManager} from "@/components/script/services/action-reject";
+import {ActionRejectService} from "@/components/script/services/action-reject";
+import {Select} from "antd";
 
 
-const useActionRejectManager = () => {
-    const {state} = useDesignContext();
-    const nodes = state.workflow.nodes || [];
-    return new RejectNodeManager(nodes);
+const useActionRejectService = (nodeId: string) => {
+    const {context} = useDesignContext();
+    const nodeManager = context.getPresenter().getNodeManager();
+    return new ActionRejectService(nodeManager);
 }
 
-
 export const ConditionRejectView: React.FC<ConditionRejectViewPlugin> = (props) => {
 
-    const rejectNodeManager = useActionRejectManager();
+    const rejectService = useActionRejectService(props.nodeId);
     const ConditionRejectViewComponent = ViewBindPlugin.getInstance().get(VIEW_KEY);
 
     if (ConditionRejectViewComponent) {
@@ -23,15 +23,21 @@ export const ConditionRejectView: React.FC<ConditionRejectViewPlugin> = (props)
         );
     }
 
+    const handleChange = (option: any) => {
+        const script = rejectService.getScript(option);
+        props.onChange?.(script);
+    }
+
     return (
-        <div
-            style={{
-                marginTop: "8px",
-                padding: "8px",
-            }}
-        >
-            reject
-            {rejectNodeManager.getSize()}
-        </div>
+       <>
+           <Select
+               options={rejectService.getOptions(props.nodeId)}
+               value={rejectService.getValue(props.value)}
+               onChange={(value, option) => {
+                   handleChange(option);
+               }}
+               placeholder={"请选择拒绝退回到的节点"}
+           />
+       </>
     )
 }

frontend/packages/flow-pc/flow-pc-design/src/components/script/services/action-reject.ts

@@ -1,45 +1,69 @@
 import {GroovyScriptConvertorUtil} from "@flow-engine/flow-core";
-import {FlowNode} from "@/components/design-panel/types";
+import {ActionSelectOption} from "@/components/script/typings";
+import {NodeManger} from "@/components/design-panel/manager/node";
 
+export class ActionRejectService {
 
-export class RejectNodeManager {
+    private readonly nodeManger: NodeManger;
 
-    private readonly nodes:FlowNode[];
+    public constructor(nodeManger: NodeManger) {
+        this.nodeManger = nodeManger;
+    }
 
-    constructor(nodes: FlowNode[]) {
-        this.nodes = nodes;
+    public getOptions(nodeId: string) {
+        const options: ActionSelectOption[] = [];
+        const backNodes = this.nodeManger.getBackNodes(nodeId);
+        for (const node of backNodes) {
+            options.push({
+                label: node.name,
+                value: node.id,
+            })
+        }
+        options.push({
+            label: '终止流程',
+            value: 'TERMINATE',
+            danger: true,
+        })
+        return options;
+    }
+
+    public getValue(script?: string) {
+        const type = ActionRejectScriptUtils.getType(script);
+        const node = this.nodeManger.getNodeByType(type);
+        if (node) {
+            return node.id;
+        }
+        return type;
     }
 
-    public getSize(){
-        return this.nodes.length;
+    public getScript(option: ActionSelectOption) {
+        return ActionRejectScriptUtils.update(option);
     }
+
 }
 
 export class ActionRejectScriptUtils {
 
-    public static update(type: string, script: string) {
-        let groovy;
-        if (script) {
-            const returnData = GroovyScriptConvertorUtil.getReturnScript(script).trim();
-            groovy = script.replace(returnData, `'${type}'`);
-            groovy = GroovyScriptConvertorUtil.updateScriptMeta(groovy, `{"type":"${type}"}`);
-        } else {
-            groovy = `// @CUSTOM_SCRIPT 自定义脚本，返回的数据为动作类型
-            // @SCRIPT_META {"type":"${type}"}
+    public static update(option: ActionSelectOption) {
+        const groovy = `// @CUSTOM_SCRIPT 跳转到 ${option.label}  
+            // @SCRIPT_META {"type":"${option.value}"}
             def run(request){
-                return '${type}';
+                return '${option.value}';
             }
             `
-        }
         return GroovyScriptConvertorUtil.formatScript(groovy);
     }
 
 
-    public static getType(script:string){
-        const meta = GroovyScriptConvertorUtil.getScriptMeta(script);
-        const data = JSON.parse(meta);
-        if(data){
-            return data.type;
+    public static getType(script?: string) {
+        if (script) {
+            const meta = GroovyScriptConvertorUtil.getScriptMeta(script);
+            if (meta) {
+                const data = JSON.parse(meta);
+                if (data) {
+                    return data.type;
+                }
+            }
         }
         return undefined;
     }