Merge remote-tracking branch 'origin/master'

wms_pro/qd/src/views/wms/flow_manage/act/execution/ViewCurrentFlowDesigner.vue

@@ -121,7 +121,7 @@ export default {
           strokeWidth: 1
         },
         polyline: {
-          stroke: '#000000',
+          // stroke: '#000000',
           hoverStroke: '#000000',
           selectedStroke: '#000000',
           outlineColor: '#88f',
@@ -178,8 +178,16 @@ export default {
       curdExecution.queryHisActivityId(proc_inst_id).then(res => {
         res.forEach((activity_id) => {
           const nodeModel = this.lf.getNodeModelById(activity_id);
-          nodeModel.setStyle("stroke", "red")
-          nodeModel.setStyle("stroke-width", "1")
+          if (nodeModel !== undefined) {
+            nodeModel.setStyle("stroke", "red")
+            nodeModel.setStyle("stroke-width", "1")
+          } else {
+            const edgeModel = this.lf.getEdgeModelById(activity_id);
+            if (edgeModel !== undefined) {
+              edgeModel.setStyle("stroke", "red")
+              edgeModel.setStyle("stroke-width", "1");
+            }
+          }
         });
       })
     },

wms_pro/qd/src/views/wms/flow_manage/view_flow/registerNode/sequence.js

@@ -23,7 +23,7 @@ class SequenceModel extends PolylineEdgeModel {
     if (properties.isActived) {
       style.strokeDasharray = "4 4";
     }
-    style.stroke = "black";
+    // style.stroke = "black";
     return style;
   }
   getTextStyle() {