custom control opinionEditorVisible

Author: xlorne

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

@@ -1,4 +1,4 @@
-import React from "react";
+import React, {useEffect} from "react";
 import {Divider, Result} from "antd";
 import {ProForm, ProFormTextArea} from "@ant-design/pro-components";
 import {CustomButtonType, FlowFormView, FlowFormViewProps} from "@/components/Flow/flow/types";
@@ -10,12 +10,13 @@ import {
     hideOpinionEditor,
     showOpinionEditor
 } from "@/components/Flow/store/FlowSlice";
+import {FormInstance} from "antd/es/form/hooks/useForm";
 
 interface FlowDetailProps {
     view: React.ComponentType<FlowFormViewProps> | FlowFormView;
     visible: boolean;
     form: any;
-    adviceForm: any;
+    adviceForm: FormInstance<any>;
     review?: boolean;
     flowData: FlowData;
     // 流程交互操作
@@ -39,6 +40,15 @@ const FlowDetail: React.FC<FlowDetailProps> = (props) => {
     // flow store redux
     const dispatch = useDispatch();
 
+    useEffect(() => {
+        if(props.visible){
+            const advice = flowData.getOpinionAdvice();
+            props.adviceForm.setFieldsValue({
+                advice: advice
+            });
+        }
+    }, [props.visible]);
+
     return (
         <>
             <div className="flowApprovalViewBox">
@@ -51,6 +61,7 @@ const FlowDetail: React.FC<FlowDetailProps> = (props) => {
                             form={props.form}
                             flowData={flowData}
                             visible={props.visible}
+                            opinions={flowData.getOpinions()}
                             editable={!flowData.isDone() && flowData.getFlowNodeEditable()}
                             compare={!flowData.isStartFlow()}
                             triggerClickVisible={triggerClickVisible}
@@ -90,7 +101,6 @@ const FlowDetail: React.FC<FlowDetailProps> = (props) => {
                             >
                                 <ProFormTextArea
                                     disabled={props.review}
-                                    label={""}
                                     placeholder={'请输入审批意见'}
                                     name={"advice"}
                                 />

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

@@ -217,6 +217,22 @@ export class FlowData extends FlowWorkData {
         return this.data.flowRecord;
     }
 
+    // 获取审批意见
+    getOpinionAdvice = () => {
+        if(this.data.flowRecord){
+            if(this.data.flowRecord.opinion){
+                return this.data.flowRecord.opinion.advice;
+            }
+        }
+        return null;
+    }
+
+
+    // 获取历史审批意见
+    getOpinions() {
+        return this.data.opinions;
+    }
+
     // 获取历史记录
     getHistoryRecords = () => {
         return this.data.historyRecords;
@@ -250,5 +266,6 @@ export class FlowData extends FlowWorkData {
     showOpinion() {
         return this.canHandle() && !this.isStartFlow();
     }
+
 }
 

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

@@ -90,13 +90,15 @@ const $FlowView: React.FC<FlowViewProps> = (props) => {
         if (props.id) {
             detail(props.id, null).then(res => {
                 if (res.success) {
+                    adviceForm.resetFields();
                     setData(res.data);
                 }
             });
         }
         if (props.workCode) {
             detail(null, props.workCode).then(res => {
                 if (res.success) {
+                    adviceForm.resetFields();
                     setData(res.data);
                 }
             });

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/content/FlowSession.java

@@ -65,6 +65,18 @@ public Object getBean(String beanName) {
         return provider.getBean(beanName);
     }
 
+
+    /**
+     *  获取审批意见
+     */
+    public String getAdvice() {
+        if (opinion != null) {
+            return opinion.getAdvice();
+        } else {
+            return null;
+        }
+    }
+
     /**
      * 创建节点结果
      *