Merge pull request apache#12915 from liunana1230/patch-1

pissang · web-flow · commit 491d30b779d2 · 2020-07-07T12:16:55.000+08:00
fix(tree) The chart line color is not updated when updating a node's lineStyle
diff --git a/src/chart/tree/TreeView.js b/src/chart/tree/TreeView.js
@@ -469,7 +469,7 @@ function drawEdge(
 
             graphic.updateProps(edge, {
                 shape: getEdgeShape(seriesScope, sourceLayout, targetLayout),
-                style: {opacity: 1}
+                style: zrUtil.defaults({opacity: 1}, seriesScope.lineStyle)
             }, seriesModel);
         }
     }
@@ -499,7 +499,7 @@ function drawEdge(
                         parentPoint: [targetLayout.x, targetLayout.y],
                         childPoints: childPoints
                     },
-                    style: {opacity: 1}
+                    style: zrUtil.defaults({opacity: 1}, seriesScope.lineStyle)
                 }, seriesModel);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -469,7 +469,7 @@ function drawEdge(`
`469`	`469`
`470`	`470`	`graphic.updateProps(edge, {`
`471`	`471`	`shape: getEdgeShape(seriesScope, sourceLayout, targetLayout),`
`472`		`- style: {opacity: 1}`
	`472`	`+ style: zrUtil.defaults({opacity: 1}, seriesScope.lineStyle)`
`473`	`473`	`}, seriesModel);`
`474`	`474`	`}`
`475`	`475`	`}`
`@@ -499,7 +499,7 @@ function drawEdge(`
`499`	`499`	`parentPoint: [targetLayout.x, targetLayout.y],`
`500`	`500`	`childPoints: childPoints`
`501`	`501`	`},`
`502`		`- style: {opacity: 1}`
	`502`	`+ style: zrUtil.defaults({opacity: 1}, seriesScope.lineStyle)`
`503`	`503`	`}, seriesModel);`
`504`	`504`	`}`
`505`	`505`	`}`