Merge pull request #88 from codingapi/dev

Dev

Author: xlorne

admin-ui/src/api/flow.ts

@@ -42,6 +42,15 @@ export async function startFlow(body:any) {
     return post('/api/cmd/flowRecord/startFlow', body);
 }
 
+export async function getFlowStep(body:any) {
+    return post('/api/cmd/flowRecord/getFlowStep', body);
+}
+
+export async function removeFlow(body:any) {
+    return post('/api/cmd/flowRecord/remove', body);
+}
+
+
 export async function detail(id?:any,workCode?:any) {
     return get('/api/query/flowRecord/detail', {id,workCode});
 }
@@ -92,6 +101,17 @@ export async function flowRecordList(params: any,
 }
 
 
+export async function findAllByOperatorId(params: any,
+                                     sort: any,
+                                     filter: any,
+                                     match: {
+                                         key: string,
+                                         type: string
+                                     }[]) {
+    return page('/api/query/flowRecord/findAllByOperatorId', params, sort, filter, match);
+}
+
+
 export async function findTodoByOperatorId(params: any,
                                      sort: any,
                                      filter: any,

admin-ui/src/components/Flow/flow/FlowDetail.tsx

@@ -102,6 +102,12 @@ const FlowDetail: React.FC<FlowDetailProps> = (props) => {
                                 <ProFormTextArea
                                     disabled={props.review}
                                     placeholder={'请输入审批意见'}
+                                    rules={[
+                                        {
+                                            required: true,
+                                            message: '请输入审批意见'
+                                        }
+                                    ]}
                                     name={"advice"}
                                 />
                             </ProForm>

admin-ui/src/components/Flow/flow/data.ts

@@ -91,12 +91,22 @@ export class FlowTrySubmitResultBuilder {
 
 export class FlowData extends FlowWorkData {
     private readonly formParams?: FlowFormParams;
+    private recordId:string;
 
-    constructor(data: any, formParams?: FlowFormParams) {
+    constructor(recordId:string,data: any, formParams?: FlowFormParams) {
         super(data);
+        this.recordId = recordId;
         this.formParams = formParams;
     }
 
+    setRecordId = (recordId:string)=>{
+        this.recordId = recordId;
+    }
+
+    getRecordId = ()=>{
+        return this.recordId;
+    }
+
     // 是否可以审批
     canHandle = () => {
         return this.data.canHandle;

admin-ui/src/components/Flow/flow/events.tsx

@@ -1,7 +1,18 @@
 import {useEffect} from "react";
 import {FormInstance} from "antd/es/form/hooks/useForm";
 import {FlowData, FlowSubmitResultBuilder, FlowTrySubmitResultBuilder} from "@/components/Flow/flow/data";
-import {custom, postponed, recall, saveFlow, startFlow, submitFlow, transfer, trySubmitFlow, urge} from "@/api/flow";
+import {
+    custom,
+    postponed,
+    recall,
+    removeFlow,
+    saveFlow,
+    startFlow,
+    submitFlow,
+    transfer,
+    trySubmitFlow,
+    urge
+} from "@/api/flow";
 import {message} from "antd";
 import {useDispatch, useSelector} from "react-redux";
 import {
@@ -132,59 +143,62 @@ export const registerEvents = (id: string,
 
     // 提交流程
     const handleSubmitFlow = (flowState: boolean, callback: (res: any) => void, operatorIds?: any[]) => {
-        const advice = adviceForm.getFieldValue('advice');
-        setRequestLoading(true);
+        adviceForm.validateFields().then((adviceData)=>{
+            const advice = adviceData.advice;
+            setRequestLoading(true);
+            form.validateFields().then((formData) => {
+                const flowData = data.getFlowData();
+                const body = {
+                    recordId,
+                    advice: advice,
+                    operatorIds: operatorIds,
+                    success: flowState,
+                    formData: {
+                        ...flowData,
+                        ...formData,
+                    }
+                }
 
-        form.validateFields().then((formData) => {
+                submitFlow(body).then(res => {
+                    if (res.success) {
+                        message.success('流程已提交').then();
+                        callback(res);
+                    }
+                }).finally(() => {
+                    setRequestLoading(false)
+                })
+            }).catch(e => {
+                console.log(e);
+                setRequestLoading(false);
+            })
+        }).catch((e)=>{});
+    }
+
+    // 自定义流程
+    const handleCustomFlow = (buttonId: string) => {
+        adviceForm.validateFields().then((adviceData)=> {
+            const advice = adviceData.advice;
+            const formData = form.getFieldsValue();
             const flowData = data.getFlowData();
             const body = {
                 recordId,
+                buttonId,
                 advice: advice,
-                operatorIds: operatorIds,
-                success: flowState,
                 formData: {
                     ...flowData,
                     ...formData,
                 }
             }
-
-            submitFlow(body).then(res => {
+            custom(body).then(res => {
                 if (res.success) {
-                    message.success('流程已提交').then();
-                    callback(res);
+                    const flowResult = res.data;
+                    dispatch(showResult({
+                        closeFlow: flowResult.closeable,
+                        result: flowResult
+                    }));
                 }
-            }).finally(() => {
-                setRequestLoading(false)
-            })
-        }).catch(e => {
-            console.log(e);
-            setRequestLoading(false);
-        })
-    }
-
-    // 自定义流程
-    const handleCustomFlow = (buttonId: string) => {
-        const advice = adviceForm.getFieldValue('advice');
-        const formData = form.getFieldsValue();
-        const flowData = data.getFlowData();
-        const body = {
-            recordId,
-            buttonId,
-            advice: advice,
-            formData: {
-                ...flowData,
-                ...formData,
-            }
-        }
-        custom(body).then(res => {
-            if (res.success) {
-                const flowResult = res.data;
-                dispatch(showResult({
-                    closeFlow: flowResult.closeable,
-                    result: flowResult
-                }));
-            }
-        })
+            });
+        }).catch((e)=>{});
     }
 
     // 预提交
@@ -231,6 +245,24 @@ export const registerEvents = (id: string,
         })
     }
 
+
+    // 删除流程
+    const handleRemoveFlow = () => {
+        const body = {
+            recordId,
+        }
+        setRequestLoading(true);
+        removeFlow(body).then(res => {
+            if (res.success) {
+                message.success('流程已删除').then();
+                closeFlow();
+            }
+        }).finally(() => {
+            setRequestLoading(false)
+        })
+    }
+
+
     // 延期流程
     const handlePostponedFlow = () => {
         const body = {
@@ -418,6 +450,10 @@ export const registerEvents = (id: string,
                 handleRecallFlow();
                 break;
             }
+            case 'REMOVE': {
+                handleRemoveFlow();
+                break;
+            }
             case 'URGE': {
                 handlerUrgeFlow();
                 break;

admin-ui/src/components/Flow/flow/index.tsx

@@ -158,11 +158,14 @@ const $FlowView: React.FC<FlowViewProps> = (props) => {
     }, [flowViewVisible]);
 
 
+    // 流程数据
+    const flowData = new FlowData(props.id,data, props.formParams);
+
     // 注册事件
     const handlerClicks = registerEvents(
         recordId,
         setRecordId,
-        new FlowData(data, props.formParams),
+        flowData,
         viewForm,
         adviceForm,
         setRequestLoading,
@@ -172,10 +175,19 @@ const $FlowView: React.FC<FlowViewProps> = (props) => {
         }
     );
 
+
+    useEffect(() => {
+        if(recordId){
+            flowData.setRecordId(recordId);
+        }
+    }, [recordId]);
+
+
     if (!props.visible) {
         return null;
     }
 
+
     // 延期表单视图
     const PostponedFormView = getComponent(PostponedFormViewKey) as React.ComponentType<PostponedFormProps>;
 
@@ -185,8 +197,7 @@ const $FlowView: React.FC<FlowViewProps> = (props) => {
     // 用户选人视图
     const UserSelectView = getComponent(UserSelectViewKey) as React.ComponentType<UserSelectProps>;
 
-    // 流程数据
-    const flowData = new FlowData(data, props.formParams);
+
 
     return (
         <Modal

admin-ui/src/components/Flow/flow/types.ts

@@ -16,7 +16,8 @@ export type CustomButtonType =
     | 'POSTPONED'
     | 'URGE'
     | 'CUSTOM'
-    | 'VIEW';
+    | 'VIEW'
+    | 'REMOVE';
 
 // 流程图中线的类型
 export type EdgeType = 'line' | 'polyline' | 'bezier';

admin-ui/src/components/Flow/panel/ButtonPanel.tsx

@@ -69,6 +69,10 @@ const buttonEventOptions = [
         label: "自定义事件",
         value: "VIEW"
     },
+    {
+        label: "删除",
+        value: "REMOVE"
+    },
 ] as {
     label: string;
     value: CustomButtonType;
@@ -231,15 +235,15 @@ const ButtonPanel: React.FC<ButtonPanelProps> = (props) => {
                             />
                         </Space>
                     )}
-                    normalize={(value) => {
+                    normalize={(value:any) => {
                         if (value) {
                             return {
                                 background: value.toHexString()
                             };
                         }
                         return value;
                     }}
-                    getValueProps={(value) => {
+                    getValueProps={(value:any) => {
                         const color = value?.background;
                         if (color) {
                             return {

admin-ui/src/pages/flow/leave/LeaveForm.tsx

@@ -31,25 +31,32 @@ const LeaveForm: React.FC<FlowFormViewProps> = (props) => {
     const [visible, setVisible] = React.useState(false);
 
     useEffect(() => {
-        if (eventKey ==='test') {
+        if (eventKey === 'test') {
             console.log("点击了自定义事件", eventKey);
             setVisible(true);
         }
 
         // 当流程审批反馈结果关闭时，重新加载数据
-        if (eventKey==EVENT_CLOSE_RESULT_VIEW && props.flowData?.getNodeCode() ==='start') {
+        if (eventKey == EVENT_CLOSE_RESULT_VIEW && props.flowData?.getNodeCode() === 'start') {
             // 重新加载数据
             console.log("重新加载数据");
             props.handlerClick && props.handlerClick({type: "RELOAD"});
         }
 
-        if (eventKey==EVENT_RELOAD_DATA) {
+        if (eventKey == EVENT_RELOAD_DATA) {
             props.form.resetFields();
             props.form.setFieldsValue(props.data);
         }
     }, [eventKey]);
 
 
+    useEffect(() => {
+        setTimeout(() => {
+            console.log('flowData recordId', props.flowData?.getRecordId());
+        }, 100)
+    }, [props.flowData]);
+
+
     return (
         <ProForm
             form={props.form}
@@ -111,6 +118,14 @@ const LeaveForm: React.FC<FlowFormViewProps> = (props) => {
                 >点击了自定义事件</Button>
             )}
 
+            <Button
+                onClick={() => {
+                    const recordId = props.flowData?.getRecordId();
+                    alert(recordId);
+                }}
+            >getRecordId</Button>
+
+
         </ProForm>
     )
 }

admin-ui/src/pages/flow/record/index.tsx

@@ -1,12 +1,12 @@
 import React, {useEffect} from "react";
 import {ActionType, PageContainer, ProTable} from "@ant-design/pro-components";
 import {
+    findAllByOperatorId,
     findDoneByOperatorId,
     findInitiatedByOperatorId,
     findPostponedTodoByOperatorId,
     findTimeoutTodoByOperatorId,
     findTodoByOperatorId,
-    flowRecordList,
     urge
 } from "@/api/flow";
 import moment from "moment";
@@ -302,7 +302,7 @@ const FlowRecordPage = () => {
                                     return record.read?"record-read":"record-unread";
                                 }}
                                 request={async (params, sort, filter) => {
-                                    return flowRecordList(params, sort, filter, []);
+                                    return findAllByOperatorId(params, sort, filter, []);
                                 }}
                             />
                         )

example/example-application/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.55</version>
+       <version>3.3.65</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>