From c4bf05eb2ca726fc1c674a9168ec19618d522d9c Mon Sep 17 00:00:00 2001
From: lang <bm2736892@gmail.com>
Date: Sun, 31 Jul 2016 18:59:42 +0800
Subject: [PATCH] Fix symbol opacity in markLine, graph edge and lines

---
 src/chart/graph/edgeVisual.js | 10 ++++++++--
 src/chart/helper/Line.js      | 19 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/chart/graph/edgeVisual.js b/src/chart/graph/edgeVisual.js
index 37b7a1377..8539e4ad7 100644
--- a/src/chart/graph/edgeVisual.js
+++ b/src/chart/graph/edgeVisual.js
@@ -13,11 +13,15 @@ define(function (require) {
             var symbolType = normalize(seriesModel.get('edgeSymbol'));
             var symbolSize = normalize(seriesModel.get('edgeSymbolSize'));
 
+            var colorQuery = 'lineStyle.normal.color'.split('.');
+            var opacityQuery = 'lineStyle.normal.opacity'.split('.');
+
             edgeData.setVisual('fromSymbol', symbolType && symbolType[0]);
             edgeData.setVisual('toSymbol', symbolType && symbolType[1]);
             edgeData.setVisual('fromSymbolSize', symbolSize && symbolSize[0]);
             edgeData.setVisual('toSymbolSize', symbolSize && symbolSize[1]);
-            edgeData.setVisual('color', seriesModel.get('lineStyle.normal.color'));
+            edgeData.setVisual('color', seriesModel.get(colorQuery));
+            edgeData.setVisual('opacity', seriesModel.get(opacityQuery));
 
             edgeData.each(function (idx) {
                 var itemModel = edgeData.getItemModel(idx);
@@ -25,7 +29,8 @@ define(function (require) {
                 var symbolType = normalize(itemModel.getShallow('symbol', true));
                 var symbolSize = normalize(itemModel.getShallow('symbolSize', true));
                 // Edge visual must after node visual
-                var color = itemModel.get('lineStyle.normal.color');
+                var color = itemModel.get(colorQuery);
+                var opacity = itemModel.get(opacityQuery);
                 switch (color) {
                     case 'source':
                         color = edge.node1.getVisual('color');
@@ -41,6 +46,7 @@ define(function (require) {
                 symbolSize[1] && edge.setVisual('toSymbolSize', symbolSize[1]);
 
                 edge.setVisual('color', color);
+                edge.setVisual('opacity', opacity);
             });
         });
     };
diff --git a/src/chart/helper/Line.js b/src/chart/helper/Line.js
index 8b684b0c5..f11d33dbb 100644
--- a/src/chart/helper/Line.js
+++ b/src/chart/helper/Line.js
@@ -259,6 +259,11 @@ define(function (require) {
         }
 
         var visualColor = lineData.getItemVisual(idx, 'color');
+        var visualOpacity = zrUtil.retrieve(
+            lineData.getItemVisual(idx, 'opacity'),
+            lineStyle.opacity,
+            1
+        );
         if (isNaN(defaultText)) {
             // Use name
             defaultText = lineData.getName(idx);
@@ -267,12 +272,24 @@ define(function (require) {
             {
                 strokeNoScale: true,
                 fill: 'none',
-                stroke: visualColor
+                stroke: visualColor,
+                opacity: visualOpacity
             },
             lineStyle
         ));
         line.hoverStyle = hoverLineStyle;
 
+        // Update symbol
+        zrUtil.each(SYMBOL_CATEGORIES, function (symbolCategory) {
+            var symbol = this.childOfName(symbolCategory);
+            if (symbol) {
+                symbol.setColor(visualColor);
+                symbol.setStyle({
+                    opacity: visualOpacity
+                });
+            }
+        }, this);
+
         var showLabel = labelModel.getShallow('show');
         var hoverShowLabel = hoverLabelModel.getShallow('show');
         var defaultText;
-- 
GitLab