add approval action

Author: xlorne

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

@@ -119,6 +119,11 @@ public class FlowContent {
      */
     private List<History> histories;
 
+    /**
+     * 所有节点
+     */
+    private List<NodeOption> nodes;
+
 
     public void pushCurrentNode(IFlowNode currentNode) {
         ActionManager actionManager = currentNode.actionManager();
@@ -137,6 +142,7 @@ public void pushWorkflow(Workflow workflow) {
         this.form = workflow.getForm();
         this.workCode = workflow.getCode();
         this.workId = workflow.getId();
+        this.nodes = workflow.getNodes().stream().map(NodeOption::new).toList();
     }
 
     public void pushRecords(FlowRecord record, List<FlowRecord> mergeRecords) {

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

@@ -0,0 +1,23 @@
+package com.codingapi.flow.pojo.response;
+
+import com.codingapi.flow.node.IDisplayNode;
+import com.codingapi.flow.node.IFlowNode;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class NodeOption {
+
+    private String id;
+    private String name;
+    private String type;
+    private boolean display;
+
+    public NodeOption(IFlowNode node) {
+        this.id = node.getId();
+        this.name = node.getName();
+        this.type = node.getType();
+        this.display = node instanceof IDisplayNode;
+    }
+}

flow-engine-starter-api/src/main/java/com/codingapi/flow/api/controller/FlowRecordController.java

@@ -37,7 +37,6 @@ public MultiResponse<ProcessNode> processNodes(@RequestBody FlowProcessNodeReque
         return MultiResponse.of(flowService.processNodes(request));
     }
 
-
     @PostMapping("/create")
     public SingleResponse<Long> create(@RequestBody FlowCreateRequest request) {
         IFlowOperator current = (IFlowOperator) UserContext.getInstance().current();

flow-engine-starter-api/src/main/java/com/codingapi/flow/api/pojo/SelectOption.java

@@ -4,6 +4,11 @@ import {Button, Form, message, Modal} from "antd";
 import {useApprovalContext} from "@/components/flow-approval/hooks/use-approval-context";
 import {AddAuditView} from "@/components/flow-approval/plugins/view/add-audit-view";
 
+/**
+ * 加签
+ * @param props
+ * @constructor
+ */
 export const AddAuditAction: React.FC<FlowActionProps> = (props) => {
 
     const action = props.action;

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

@@ -3,6 +3,11 @@ import {FlowActionProps} from "./type";
 import {Button, message} from "antd";
 import {useApprovalContext} from "@/components/flow-approval/hooks/use-approval-context";
 
+/**
+ * 自定义
+ * @param props
+ * @constructor
+ */
 export const CustomAction: React.FC<FlowActionProps> = (props) => {
 
     const action = props.action;

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

@@ -1,27 +1,74 @@
 import React from "react";
 import {FlowActionProps} from "./type";
-import {Button, message} from "antd";
+import {Button, Form, message, Modal} from "antd";
 import {useApprovalContext} from "@/components/flow-approval/hooks/use-approval-context";
+import {DelegateView} from "@/components/flow-approval/plugins/view/delegate-view";
 
+/**
+ * 委派
+ * @param props
+ * @constructor
+ */
 export const DelegateAction: React.FC<FlowActionProps> = (props) => {
 
     const action = props.action;
-    const {context} = useApprovalContext()
+    const {context} = useApprovalContext();
+    const [form] = Form.useForm();
+
     const actionPresenter = context.getPresenter().getFlowActionPresenter();
 
+    const [modalVisible, setModalVisible] = React.useState(false);
+
+    const handleSubmit = (params?: any) => {
+        actionPresenter.action(action.id, params).then((res) => {
+            if (res.success) {
+                message.success("操作成功");
+                setModalVisible(false);
+                context.close();
+            }
+        });
+    }
     return (
-        <Button
-            danger={action.type === 'REJECT'}
-            onClick={() => {
-                actionPresenter.action(action.id).then((res) => {
-                    if (res.success) {
-                        message.success("操作成功");
-                        context.close();
-                    }
-                });
-            }}
-        >
-            {action.title}
-        </Button>
+        <>
+            <Button
+                onClick={() => {
+                    form.resetFields();
+                    setModalVisible(true);
+                }}
+            >
+                {action.title}
+            </Button>
+
+            <Modal
+                title={"委派审批"}
+                open={modalVisible}
+                onCancel={() => setModalVisible(false)}
+                onOk={() => {
+                    form.submit();
+                }}
+            >
+                <Form
+                    form={form}
+                    layout="vertical"
+                    onFinish={(values) => {
+                        handleSubmit(values);
+                    }}
+                >
+                    <Form.Item
+                        name={"forwardOperatorIds"}
+                        label={"委派人员"}
+                        required={true}
+                        rules={[
+                            {
+                                required: true,
+                                message:'委派人员不能为空'
+                            }
+                        ]}
+                    >
+                        <DelegateView/>
+                    </Form.Item>
+                </Form>
+            </Modal>
+        </>
     )
 }

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

@@ -6,6 +6,11 @@ import {SignKeyView} from "@/components/flow-approval/plugins/view/sign-key-view
 
 const {TextArea} = Input;
 
+/**
+ * 通过
+ * @param props
+ * @constructor
+ */
 export const PassAction: React.FC<FlowActionProps> = (props) => {
 
     const action = props.action;

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

@@ -5,6 +5,11 @@ import {useApprovalContext} from "@/components/flow-approval/hooks/use-approval-
 
 const {TextArea} = Input;
 
+/**
+ * 拒绝
+ * @param props
+ * @constructor
+ */
 export const RejectAction: React.FC<FlowActionProps> = (props) => {
 
     const action = props.action;

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

@@ -1,27 +1,74 @@
 import React from "react";
 import {FlowActionProps} from "./type";
-import {Button, message} from "antd";
+import {Button, Form, message, Modal} from "antd";
 import {useApprovalContext} from "@/components/flow-approval/hooks/use-approval-context";
+import {ReturnView} from "@/components/flow-approval/plugins/view/return-view";
 
+/**
+ * 退回
+ * @param props
+ * @constructor
+ */
 export const ReturnAction: React.FC<FlowActionProps> = (props) => {
 
     const action = props.action;
-    const {context} = useApprovalContext()
+    const {context} = useApprovalContext();
+    const [form] = Form.useForm();
+
     const actionPresenter = context.getPresenter().getFlowActionPresenter();
 
+    const [modalVisible, setModalVisible] = React.useState(false);
+
+    const handleSubmit = (params?: any) => {
+        actionPresenter.action(action.id, params).then((res) => {
+            if (res.success) {
+                message.success("操作成功");
+                setModalVisible(false);
+                context.close();
+            }
+        });
+    }
     return (
-        <Button
-            danger={action.type === 'REJECT'}
-            onClick={() => {
-                actionPresenter.action(action.id).then((res) => {
-                    if (res.success) {
-                        message.success("操作成功");
-                        context.close();
-                    }
-                });
-            }}
-        >
-            {action.title}
-        </Button>
+        <>
+            <Button
+                onClick={() => {
+                    form.resetFields();
+                    setModalVisible(true);
+                }}
+            >
+                {action.title}
+            </Button>
+
+            <Modal
+                title={"退回审批"}
+                open={modalVisible}
+                onCancel={() => setModalVisible(false)}
+                onOk={() => {
+                    form.submit();
+                }}
+            >
+                <Form
+                    form={form}
+                    layout="vertical"
+                    onFinish={(values) => {
+                        handleSubmit(values);
+                    }}
+                >
+                    <Form.Item
+                        name={"backNodeId"}
+                        label={"退回节点"}
+                        required={true}
+                        rules={[
+                            {
+                                required: true,
+                                message: '退回节点不能为空'
+                            }
+                        ]}
+                    >
+                        <ReturnView/>
+                    </Form.Item>
+                </Form>
+            </Modal>
+        </>
     )
 }