特效优化

apache · Jun 10, 2014 · 6fedd9c · 6fedd9c
1 parent 46b9ce2
commit 6fedd9c
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 12 deletions.
diff --git a/doc/example/map11.html b/doc/example/map11.html
@@ -117,7 +117,7 @@
         min : 0,
         max : 100,
         calculable : true,
-        color: ['red','orange','yellow','lightgreen'],
+        color: ['#ff3333', 'orange', 'yellow','lime','aqua'],
         textStyle:{
             color:'#fff'
         }
@@ -429,12 +429,18 @@
                 smooth:true,
                 effect : {
                     show: true,
-                    size: 3,
-                    shadowColor: 'yellow'
+                    scaleSize: 1,
+                    period: 30,
+                    color: '#fff',
+                    shadowBlur: 10
                 },
                 itemStyle : {
                     normal: {
-                        borderWidth:1
+                        borderWidth:1,
+                        lineStyle: {
+                            type: 'solid',
+                            shadowBlur: 10
+                        }
                     }
                 },
                 data : [
@@ -487,12 +493,18 @@
                 smooth:true,
                 effect : {
                     show: true,
-                    size: 3,
-                    shadowColor: 'aqua'
+                    scaleSize: 1,
+                    period: 30,
+                    color: '#fff',
+                    shadowBlur: 10
                 },
                 itemStyle : {
                     normal: {
-                        borderWidth:1
+                        borderWidth:1,
+                        lineStyle: {
+                            type: 'solid',
+                            shadowBlur: 10
+                        }
                     }
                 },
                 data : [
@@ -545,12 +557,18 @@
                 smooth:true,
                 effect : {
                     show: true,
-                    size: 3,
-                    shadowColor: 'lime'
+                    scaleSize: 1,
+                    period: 30,
+                    color: '#fff',
+                    shadowBlur: 10
                 },
                 itemStyle : {
                     normal: {
-                        borderWidth:1
+                        borderWidth:1,
+                        lineStyle: {
+                            type: 'solid',
+                            shadowBlur: 10
+                        }
                     }
                 },
                 data : [

diff --git a/src/chart/base.js b/src/chart/base.js
@@ -838,7 +838,11 @@ define(function (require) {
                     yEnd : yEnd,             // 坐标
                     brushType : 'both',
                     lineType : nlineStyle.type,
-                    shadowColor : nlineStyle.shadowColor,
+                    shadowColor : nlineStyle.shadowColor
+                                  || nlineStyle.color
+                                  || normal.borderColor
+                                  || normal.color
+                                  || color,
                     shadowBlur: nlineStyle.shadowBlur,
                     shadowOffsetX: nlineStyle.shadowOffsetX,
                     shadowOffsetY: nlineStyle.shadowOffsetY,

diff --git a/src/util/ecEffect.js b/src/util/ecEffect.js
@@ -157,7 +157,7 @@ define(function (require) {
     function line(zr, effectList, shape, zlevel) {
         var effect = shape.effect;
         var color = effect.color || shape.style.strokeColor || shape.style.color;
-        var shadowColor = effect.shadowColor || color;
+        var shadowColor = effect.shadowColor || shape.style.strokeColor || color;
         var size = shape.style.lineWidth * effect.scaleSize;
         var shadowBlur = typeof effect.shadowBlur != 'undefined'
                          ? effect.shadowBlur : size;