update action

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/action/actions/RejectAction.java

@@ -35,7 +35,7 @@ public RejectAction() {
         this.enable = true;
         this.type = ActionType.REJECT.name();
         this.display = new ActionDisplay(this.title);
-        this.script = RejectActionScript.startScript();
+        this.script = RejectActionScript.defaultScript();
     }
 
     @Override

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

@@ -5,6 +5,27 @@
  */
 public class ScriptDefaultConstants {
 
+    /**
+     *  默认自定义动作脚本
+     */
+    public static final String SCRIPT_DEFAULT_ACTION_CUSTOM = """
+            // @SCRIPT_TITLE 默认条件 触发通过
+            def run(request){
+                return 'PASS';
+            }
+            """;
+
+
+    /**
+     *  默认拒绝动作脚本
+     */
+    public static final String SCRIPT_DEFAULT_ACTION_REJECT = """
+            // @SCRIPT_TITLE 返回开始节点
+            def run(request){
+                return request.getStartNode().getId();
+            }
+            """;
+
     /**
      *  默认条件脚本
      */

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

@@ -1,5 +1,6 @@
 package com.codingapi.flow.script.action;
 
+import com.codingapi.flow.script.ScriptDefaultConstants;
 import com.codingapi.flow.script.runtime.ScriptRuntimeContext;
 import com.codingapi.flow.session.FlowSession;
 import lombok.AllArgsConstructor;
@@ -12,28 +13,22 @@
 @AllArgsConstructor
 public class RejectActionScript {
 
-    public static final String SCRIPT_START = "def run(session){return new com.codingapi.flow.script.action.RejectActionScript.RejectResult(session.getStartNode().getId())}";
-    public static final String SCRIPT_TERMINATE = "def run(session){return new com.codingapi.flow.script.action.RejectActionScript.RejectResult(\"TERMINATE\")}";
+    public static final String TYPE_TERMINATE = "TERMINATE";
+
 
     @Getter
     private final String script;
 
     public RejectResult execute(FlowSession session) {
-        return ScriptRuntimeContext.getInstance().run(script, RejectResult.class, session);
+        String result =  ScriptRuntimeContext.getInstance().run(script, String.class, session);
+        return new RejectResult(result);
     }
 
     /**
      * 退回至发起节点
      */
-    public static RejectActionScript startScript() {
-        return new RejectActionScript(SCRIPT_START);
-    }
-
-    /**
-     * 终止流程
-     */
-    public static RejectActionScript terminateScript() {
-        return new RejectActionScript(SCRIPT_TERMINATE);
+    public static RejectActionScript defaultScript() {
+        return new RejectActionScript(ScriptDefaultConstants.SCRIPT_DEFAULT_ACTION_REJECT);
     }
 
 
@@ -58,7 +53,7 @@ public boolean isTerminate() {
         }
 
         public RejectResult(String result) {
-            if (result.equals("TERMINATE")) {
+            if (result.equals(TYPE_TERMINATE)) {
                 this.type = RejectType.TERMINATE;
             } else {
                 this.type = RejectType.RETURN_NODE;

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

@@ -5,6 +5,7 @@ import {useApprovalContext} from "@/components/flow-approval/hooks/use-approval-
 import {GroovyScriptConvertorUtil} from "@flow-engine/flow-core";
 import {ActionFactory} from "@/components/flow-approval/components/action/factory";
 import {ActionButton} from "@/components/flow-approval/components/action-button";
+import {ActionType} from "@flow-engine/flow-types";
 
 /**
  * 自定义
@@ -24,7 +25,7 @@ export const CustomAction: React.FC<FlowActionProps> = (props) => {
 
     const ActionView = ActionFactory.getInstance().render({
         ...props.action,
-        type: triggerType,
+        type: triggerType as ActionType,
     });
 
     if (ActionView) {

frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/components/branch-adder/index.tsx

@@ -6,7 +6,7 @@ import {Button} from "antd";
 import {nodeFormPanelFactory} from "@/components/design-editor/components/sidebar";
 import {usePanelManager} from "@flowgram.ai/panel-manager-plugin";
 import {useDesignContext} from "@/components/design-panel/hooks/use-design-context";
-import {NodeType} from "@/components/design-editor/typings/node-type";
+import {NodeType} from "@flow-engine/flow-types";
 
 interface BranchAdderPropsType {
     activated?: boolean;

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

@@ -1,9 +1,20 @@
 import React from "react";
-import {NodeType} from "@/components/design-editor/typings/node-type";
-import {Button, Flex, Space,Input,theme} from "antd";
-import {ApiOutlined, AuditOutlined, BellOutlined, BranchesOutlined, ClockCircleOutlined, CloseOutlined, EditOutlined,
+import {NodeType} from "@flow-engine/flow-types";
+import {theme} from "antd";
+import {
+    ApiOutlined,
+    AuditOutlined,
+    BellOutlined,
+    BranchesOutlined,
+    ClockCircleOutlined,
+    EditOutlined,
     MergeOutlined,
-    NodeExpandOutlined, PoweroffOutlined, PullRequestOutlined, ShareAltOutlined, UserOutlined} from "@ant-design/icons";
+    NodeExpandOutlined,
+    PoweroffOutlined,
+    PullRequestOutlined,
+    ShareAltOutlined,
+    UserOutlined
+} from "@ant-design/icons";
 
 
 interface NodeIconProps {

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

@@ -4,7 +4,7 @@ import {FlowNodeRegistry} from "@/components/design-editor/typings";
 import styled from 'styled-components';
 import {FlowNodeRegistries} from "@/components/design-editor/nodes";
 import {NodeIcon} from "@/components/design-editor/components/node-icon";
-import {NodeType} from "@/components/design-editor/typings/node-type";
+import {NodeType} from "@flow-engine/flow-types";
 import {useDesignContext} from "@/components/design-panel/hooks/use-design-context";
 
 const NodesWrap = styled.div`

…-editor/node-components/action/table.tsx …-editor/node-components/action/index.tsxfrontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/action/table.tsx renamed to frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/action/index.tsx frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/action/table.tsx renamed to frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/action/index.tsx

@@ -1,11 +1,11 @@
 import React from "react";
-import {Button, Form, Space, Switch,Popconfirm} from "antd";
+import {Button, Form, Popconfirm, Space, Switch} from "antd";
 import {Table} from "@flow-engine/flow-pc-ui";
-import {ActionManager} from "@/components/design-editor/node-components/action/index";
 import {useNodeRenderContext} from "@/components/design-editor/hooks/use-node-render-context";
 import {PlusOutlined} from "@ant-design/icons";
-import {ActionModal} from "@/components/design-editor/node-components/action/modal";
-import {GroovyScriptConvertorUtil} from "@flow-engine/flow-core";
+import {actionOptions} from "@flow-engine/flow-types";
+import {ActionConfigModal} from "@/components/script/modal/action-config-modal";
+import {FlowActionListPresenter} from "./presenter";
 
 interface ActionTableProps {
     value: any[];
@@ -15,11 +15,11 @@ interface ActionTableProps {
 export const ActionTable: React.FC<ActionTableProps> = (props) => {
     const {node} = useNodeRenderContext();
     const actions = node.getNodeRegistry()?.meta.actions || [];
-    const actionManager = new ActionManager(props.value, props.onChange);
-    const datasource = actionManager.getDatasource(actions);
+    const presenter = new FlowActionListPresenter(props.value, props.onChange);
+    const datasource = presenter.getDatasource(actions);
     const [visible, setVisible] = React.useState(false);
-    const [customVisible, setCustomVisible] = React.useState(false);
     const [form] = Form.useForm();
+
     const columns = React.useCallback(() => {
         return [
             {
@@ -33,6 +33,15 @@ export const ActionTable: React.FC<ActionTableProps> = (props) => {
                 dataIndex: 'title',
                 key: 'title',
             },
+            {
+                title: '类型',
+                dataIndex: 'type',
+                key: 'type',
+                render:(value:string) => {
+                    const type = actionOptions.find(item=>item.value === value);
+                    return type?.label
+                }
+            },
             {
                 title: '启用',
                 dataIndex: 'enable',
@@ -43,7 +52,7 @@ export const ActionTable: React.FC<ActionTableProps> = (props) => {
                             size="small"
                             value={record.enable}
                             onChange={(value) => {
-                                actionManager.enable(record.id, value);
+                                presenter.enable(record.id, value);
                             }}
                         />
                     )
@@ -59,21 +68,7 @@ export const ActionTable: React.FC<ActionTableProps> = (props) => {
                             <Space>
                                 <a
                                     onClick={() => {
-                                        const custom = record.type==='CUSTOM';
-                                        let trigger = {};
-                                        if(custom){
-                                            const meta = GroovyScriptConvertorUtil.getScriptMeta(record.script);
-                                            trigger = JSON.parse(meta);
-                                        }
-                                        const data = {
-                                            ...record,
-                                            ...record.display,
-                                            ...trigger,
-                                            title: record.title,
-                                            id: record.id,
-                                        }
-                                        form.setFieldsValue(data);
-                                        setCustomVisible(custom);
+                                        form.setFieldsValue(record);
                                         setVisible(true);
                                     }}
                                 >
@@ -83,7 +78,7 @@ export const ActionTable: React.FC<ActionTableProps> = (props) => {
                                     <Popconfirm
                                         title={"确认删除吗？"}
                                         onConfirm={()=>{
-                                            actionManager.delete(record.id);
+                                            presenter.delete(record.id);
                                         }}
                                     >
                                         <a>
@@ -107,10 +102,9 @@ export const ActionTable: React.FC<ActionTableProps> = (props) => {
                         icon={<PlusOutlined/>}
                         onClick={() => {
                             form.resetFields();
-                            setCustomVisible(true);
                             setVisible(true);
                         }}
-                    >添加按钮</Button>
+                    >自定义按钮</Button>
                 ]}
                 columns={columns()}
                 dataSource={datasource}
@@ -119,17 +113,15 @@ export const ActionTable: React.FC<ActionTableProps> = (props) => {
                 }}
                 pagination={false}
             />
-
-            <ActionModal
+            <ActionConfigModal
                 open={visible}
+                manager={presenter.getFlowActionManager()}
                 form={form}
-                options={actionManager.getActionOptions()}
-                custom={customVisible}
                 onCancel={() => {
                     setVisible(false);
                 }}
                 onFinish={(values) => {
-                    actionManager.update(values);
+                    presenter.update(values);
                 }}
             />
         </>

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

@@ -0,0 +1,23 @@
+import {actionOptions, FlowAction} from "@flow-engine/flow-types";
+
+export class FlowActionManager {
+    private readonly data: FlowAction[];
+
+    public constructor(data: FlowAction[]) {
+        this.data = data;
+    }
+
+    public getCurrentNodeActionOptions() {
+        const actions = this.data.filter(item => item.type !== "CUSTOM");
+        const options: {label: string; value: string}[] = [];
+        for (const action of actions) {
+            const type = action.type;
+            const option = actionOptions.find(item => item.value === type);
+            if (option) {
+                options.push(option);
+            }
+        }
+        return options;
+    }
+
+}