fix chart show

xlorne · xlorne · commit eebafb6e5e33 · 2024-11-28T15:05:51.000+08:00
diff --git a/admin-ui/src/components/Flow/flow/FlowButtons.tsx b/admin-ui/src/components/Flow/flow/FlowButtons.tsx
@@ -13,7 +13,11 @@ interface FlowButtonsProps {
 const FlowButtons: React.FC<FlowButtonsProps> = (props) => {
     const flowData = props.flowData;
 
-    if (!flowData) {
+    if (!flowData ) {
+        return null;
+    }
+
+    if(flowData.hasData() && flowData.isDone()){
         return null;
     }
 
diff --git a/admin-ui/src/components/Flow/flow/FlowChart.tsx b/admin-ui/src/components/Flow/flow/FlowChart.tsx
@@ -21,8 +21,6 @@ const FlowChart: React.FC<FlowChartProps> = (props) => {
     const container = useRef<HTMLDivElement>(null);
     const lfRef = useRef<LogicFlow>(null);
 
-    console.log(flowData.getFlowSchema());
-
     useEffect(() => {
         const SilentConfig = {
             isSilentMode: true,
diff --git a/admin-ui/src/components/Flow/flow/FlowDetail.tsx b/admin-ui/src/components/Flow/flow/FlowDetail.tsx
@@ -27,7 +27,7 @@ const FlowDetail: React.FC<FlowDetailProps> = (props) => {
                             data={flowData.getFlowData()}
                             form={props.form}
                             visible={props.visible}
-                            editable={flowData.getFlowNodeEditable()}
+                            editable={!flowData.isDone() && flowData.getFlowNodeEditable()}
                             compare={!flowData.isStartFlow()}
                         />
                     </div>
@@ -42,7 +42,7 @@ const FlowDetail: React.FC<FlowDetailProps> = (props) => {
                 )}
 
                 {/*仅当非发起流程时再展示审批意见框*/}
-                {FlowFormView && !flowData.isStartFlow() && (
+                {FlowFormView && !flowData.isDone() && !flowData.isStartFlow() && (
                     <div className="opinionForm">
                         <div>
                             <Divider>
diff --git a/admin-ui/src/components/Flow/flow/data.ts b/admin-ui/src/components/Flow/flow/data.ts
@@ -97,6 +97,10 @@ export class FlowData extends FlowWorkData {
         this.formParams = formParams;
     }
 
+    canHandle = () => {
+        return this.data.canHandle;
+    }
+
     isStartFlow = () => {
         if (this.data) {
             return this.data.flowNode.startNode;
@@ -148,19 +152,26 @@ export class FlowData extends FlowWorkData {
     }
 
 
-    getNodeState = (code:string)=>{
+    getNodeState = (code: string) => {
         const historyRecords = this.data.historyRecords || [];
 
         const historyNodeCodes = historyRecords.map((record: any) => {
             return record.nodeCode;
         });
 
         const currentNodeCode = this.data.flowNode.code;
-        if(currentNodeCode === code) {
+        if (currentNodeCode === code) {
+            if (this.isFinished()) {
+                return "done";
+            }
             return "current";
         }
 
-        if(historyNodeCodes.indexOf(code) !== -1) {
+        if (historyNodeCodes.indexOf(code) !== -1) {
+            return "done";
+        }
+
+        if (this.isFinished()) {
             return "done";
         }
 
@@ -169,10 +180,10 @@ export class FlowData extends FlowWorkData {
 
     getFlowSchema = () => {
 
-        if(this.data.flowWork.schema) {
-            const schema =  JSON.parse(this.data.flowWork.schema);
+        if (this.data.flowWork.schema) {
+            const schema = JSON.parse(this.data.flowWork.schema);
 
-            for(const node of schema.nodes) {
+            for (const node of schema.nodes) {
                 node.properties.settingVisible = false;
                 node.properties.state = this.getNodeState(node.properties.code);
             }
@@ -193,5 +204,18 @@ export class FlowData extends FlowWorkData {
         return this.data.historyRecords;
     }
 
+    isDone() {
+        if (this.data.flowRecord) {
+            return this.data.flowRecord.flowStatus === 'FINISH' || this.data.flowRecord.flowType === 'DONE';
+        }
+        return false;
+    }
+
+    private isFinished() {
+        if (this.data.flowRecord) {
+            return this.data.flowRecord.flowStatus === 'FINISH';
+        }
+        return false;
+    }
 }
 
diff --git a/admin-ui/src/components/Flow/flow/events.tsx b/admin-ui/src/components/Flow/flow/events.tsx
@@ -5,7 +5,7 @@ import {custom, postponed, recall, saveFlow, startFlow, submitFlow, transfer, tr
 import {message} from "antd";
 import {useDispatch, useSelector} from "react-redux";
 import {
-    clearUserSelect,
+    clearUserSelect, closeUserSelect,
     FlowReduxState,
     setUserSelectModal,
     showPostponed,
@@ -126,7 +126,7 @@ export const registerEvents = (id: string,
     }
 
     // 提交流程
-    const handleSubmitFlow = (flowState: boolean, callback: (res: any) => void) => {
+    const handleSubmitFlow = (flowState: boolean, callback: (res: any) => void,operatorIds?:any[]) => {
         const advice = adviceForm.getFieldValue('advice');
         setRequestLoading(true);
 
@@ -135,6 +135,7 @@ export const registerEvents = (id: string,
             const body = {
                 recordId,
                 advice: advice,
+                operatorIds:operatorIds,
                 success: flowState,
                 formData: {
                     ...flowData,
@@ -290,6 +291,19 @@ export const registerEvents = (id: string,
             const currentUser = selectUsers[0];
             handlerTransferFlow(currentUser);
         }
+
+        if(selectUserType === 'flow' && selectUsers && selectUsers.length > 0){
+            handleSubmitFlow(true,(res)=>{
+                const flowSubmitResultBuilder = new FlowSubmitResultBuilder(res.data);
+                dispatch(closeUserSelect());
+                dispatch(showResult({
+                    closeFlow: true,
+                    result: flowSubmitResultBuilder.builder()
+                }));
+            },selectUsers.map((item:FlowUser)=> {
+                return item.id;
+            }));
+        }
     }, [selectUsers]);
 
 
@@ -301,7 +315,7 @@ export const registerEvents = (id: string,
                     handlerSaveFlow();
                 } else {
                     handlerStartFlow(() => {
-                        message.success('流程已保存至个人待办').then();
+                        message.success('流程已保存').then();
                     });
                 }
                 break;
@@ -314,18 +328,29 @@ export const registerEvents = (id: string,
                 break;
             }
             case 'SPECIFY_SUBMIT': {
-                handleTrySubmitFlow((res) => {
-                    const operators = res.data.operators;
-                    const userIds = operators.map((item: any) => {
-                        return item.userId;
+                const _trySubmitFlow = () => {
+                    handleTrySubmitFlow((res) => {
+                        const operators = res.data.operators;
+                        const userIds = operators.map((item: any) => {
+                            return item.userId;
+                        });
+                        const approvalType = res.data.flowNode.approvalType;
+                        dispatch(setUserSelectModal({
+                            mode: approvalType==='SIGN'?'single':'multiple',
+                            type: 'flow',
+                            visible: true,
+                            specifyUserIds: userIds
+                        }));
                     });
-                    dispatch(setUserSelectModal({
-                        mode: 'single',
-                        type: 'flow',
-                        visible: true,
-                        specifyUserIds: userIds
-                    }));
-                });
+                }
+                if(recordId){
+                    _trySubmitFlow();
+                }else{
+                    handlerStartFlow((id) => {
+                        recordId = id;
+                        _trySubmitFlow();
+                    });
+                }
                 break;
             }
             case 'SUBMIT': {
diff --git a/admin-ui/src/components/Flow/flow/index.tsx b/admin-ui/src/components/Flow/flow/index.tsx
@@ -21,7 +21,7 @@ import {Provider, useDispatch, useSelector} from "react-redux";
 import {
     clearPostponed,
     clearResult,
-    clearUserSelect,
+    clearUserSelect, closeUserSelect,
     FlowReduxState,
     flowStore,
     setSelectUsers,
@@ -208,7 +208,7 @@ const $FlowView: React.FC<FlowViewProps> = (props) => {
                 <UserSelectView
                     visible={userSelectVisible}
                     setVisible={() => {
-                        dispatch(clearUserSelect());
+                        dispatch(closeUserSelect());
                     }}
                     onFinish={(values) => {
                         dispatch(setSelectUsers(values));
diff --git a/admin-ui/src/components/Flow/flow/types.ts b/admin-ui/src/components/Flow/flow/types.ts
@@ -75,6 +75,7 @@ export interface FlowUser {
 }
 
 // 选人表单 【拓展视图】
+
 export interface UserSelectProps {
     visible: boolean;
     setVisible: (visible: boolean) => void;
diff --git a/admin-ui/src/components/Flow/store/FlowSlice.ts b/admin-ui/src/components/Flow/store/FlowSlice.ts
@@ -43,7 +43,8 @@ export type FlowStoreAction = {
         type: string,
         specifyUserIds: number[]
     }>) => void;
-    setSelectUsers: (state: FlowStore, action: PayloadAction<any[]>) => void;
+    setSelectUsers: (state: FlowStore, action: PayloadAction<FlowUser[]>) => void;
+    closeUserSelect: (state: FlowStore) => void;
     clearUserSelect: (state: FlowStore) => void;
 }
 
@@ -94,10 +95,13 @@ export const flowSlice = createSlice<FlowStore, FlowStoreAction, "flow", {}>({
 
         setSelectUsers: (state, action) => {
             state.userSelectVisible = false;
-            state.userSelectMode = 'single';
             state.currentUsers = action.payload;
         },
 
+        closeUserSelect: (state) => {
+            state.userSelectVisible = false;
+        },
+
         clearUserSelect: (state) => {
             state.userSelectVisible = false;
             state.userSelectMode = 'single';
@@ -117,6 +121,7 @@ export const {
     clearResult,
     clearUserSelect,
     setUserSelectModal,
+    closeUserSelect,
     setSelectUsers
 } = flowSlice.actions;
 export const flowStore = configureStore({
diff --git a/example/example-application/pom.xml b/example/example-application/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.22</version>
+        <version>3.3.23</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-domain/pom.xml b/example/example-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.22</version>
+        <version>3.3.23</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-flow/pom.xml b/example/example-infra-flow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.22</version>
+        <version>3.3.23</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-jpa/pom.xml b/example/example-infra-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.22</version>
+        <version>3.3.23</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-server/pom.xml b/example/example-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.22</version>
+        <version>3.3.23</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/pom.xml b/example/pom.xml
@@ -17,7 +17,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.3.22</version>
+    <version>3.3.23</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.3.22</version>
+    <version>3.3.23</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>
diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.22</version>
+        <version>3.3.23</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/springboot-starter-flow/pom.xml b/springboot-starter-flow/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.22</version>
+        <version>3.3.23</version>
     </parent>
 
     <name>springboot-starter-flow</name>
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/pojo/FlowDetail.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/pojo/FlowDetail.java
@@ -58,12 +58,18 @@ public class FlowDetail {
      */
     private final List<FlowOpinion> opinions;
 
+    /**
+     * 是否可以办理
+     */
+    private final boolean canHandle;
+
 
     public FlowDetail(FlowRecord flowRecord,
                       BindDataSnapshot snapshot,
                       FlowWork flowWork,
                       List<FlowRecord> historyRecords,
-                      List<? extends IFlowOperator> operators) {
+                      List<? extends IFlowOperator> operators,
+                      boolean canHandle) {
         this.operators = operators;
         this.flowRecord = flowRecord;
         this.flowWork = flowWork;
@@ -73,11 +79,13 @@ public FlowDetail(FlowRecord flowRecord,
         this.flowCreator = flowRecord.getCreateOperator();
         this.flowCreateTime = flowRecord.getCreateTime();
         this.flowNode = flowWork.getNodeByCode(flowRecord.getNodeCode());
+        this.canHandle = canHandle;
     }
 
     public FlowDetail(FlowWork flowWork,
                       FlowNode flowNode,
-                      List<? extends IFlowOperator> operators) {
+                      List<? extends IFlowOperator> operators,
+                        boolean canHandle) {
         this.flowWork = flowWork;
         this.flowNode = flowNode;
         this.operators = operators;
@@ -87,6 +95,7 @@ public FlowDetail(FlowWork flowWork,
         this.bindData = null;
         this.opinions = null;
         this.flowCreator = null;
+        this.canHandle = canHandle;
     }
 
     @Getter
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowDetailService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowDetailService.java
diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml
diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ export interface FlowUser {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`// 选人表单【拓展视图】`
	`78`	`+`
`78`	`79`	`export interface UserSelectProps {`
`79`	`80`	`visible: boolean;`
`80`	`81`	`setVisible: (visible: boolean) => void;`