fix code

Author: xlorne

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

@@ -175,20 +175,23 @@ export class FlowData extends FlowWorkData {
     getNodeState = (code: string) => {
         const historyRecords = this.data.historyRecords || [];
 
-
-        if (this.isFinished()) {
+        if (code==='over' && this.isFinished()) {
             return "done";
         }
 
         for (const record of historyRecords) {
             if (record.nodeCode === code) {
                 if (record.flowType === 'TODO') {
-                    return "wait";
+                    return "current";
                 }
                 return "done";
             }
         }
 
+        if(this.isFinished()){
+            return "undone";
+        }
+
         return "wait";
     }
 
@@ -231,9 +234,14 @@ export class FlowData extends FlowWorkData {
     // 获取历史审批意见
     getOpinions() {
         if(this.data.opinions){
-            return this.data.opinions.filter((item:any)=>item.opinion.result!==0);
+            return this.data.opinions.filter((item:any)=>{
+                if(!item.opinion){
+                    return false;
+                }
+                return item.opinion.result!==0;
+            });
         }
-        return this.data.opinions;
+        return [];
     }
 
     // 获取历史记录

admin-ui/src/components/Flow/nodes/StateLabel.tsx

@@ -12,8 +12,10 @@ const StateLabel:React.FC<StateLabelProps> = (props)=>{
         switch (state) {
             case "done":
                 return "success";
-            case "current":
+            case "undone":
                 return "processing";
+            case "current":
+                return "warning";
             default:
                 return "default";
         }
@@ -23,6 +25,8 @@ const StateLabel:React.FC<StateLabelProps> = (props)=>{
         switch (state) {
             case "done":
                 return "已执行";
+            case "undone":
+                return "未执行";
             case "current":
                 return "当前节点";
             default:

admin-ui/src/components/Flow/nodes/states.ts

@@ -1,2 +1,2 @@
-export type NodeState =  "done" | "wait" | "current";
+export type NodeState = "done" | "wait" | "undone" | "current";