excanvas模块化，折线支持阴影

doc/asset/js/echartsExample.js

@@ -53,9 +53,6 @@ function refresh(isBtnRefresh){
 }
 
 require.config({
-    paths: {
-        'js': '../asset/js/esl/js'
-    },
     packages: [
         {
             name: 'echarts',

doc/changelog.html

@@ -62,6 +62,16 @@
     <div class="container">
         <h2>修改记录</h2>
         <div class="row-fluid">
+            <div>
+                <h3>undergoing</h3>
+                <ul>
+                    <li>[upgraded][折线图] 主线支持shadow，item描边与主线相等</li>
+                    <li>[upgraded] Retina视网屏优化</li>
+                    <li>[bug fixed][地图] 福建省hover</li>
+                    <li>[bug fixed][tooltip] 修正边界自动折行</li>
+                    <li>[bug fixed][island] 修正拖拽empty item生成白色孤岛数据</li>
+                </ul>
+            </div>
             <div>
                 <h3>1.1.0</h3>
                 <ul>

doc/doc.html

@@ -1749,6 +1749,26 @@ feature : {
                             <td> 各异 </td>
                             <td> 线宽 </td>
                         </tr>
+                        <tr>
+                            <td> {color=} shadowColor </td>
+                            <td> rgba(0,0,0,0) </td>
+                            <td> 折线主线(IE8+)有效，阴影色彩，支持rgba </td>
+                        </tr>
+                        <tr>
+                            <td> {number=} shadowBlur </td>
+                            <td> 5 </td>
+                            <td> 折线主线(IE8+)有效，阴影模糊度，大于0有效 </td>
+                        </tr>
+                        <tr>
+                            <td> {number=} shadowOffsetX </td>
+                            <td> 3 </td>
+                            <td> 折线主线(IE8+)有效，阴影横向偏移，正值往右，负值往左 </td>
+                        </tr>
+                        <tr>
+                            <td> {number=} shadowOffsetY </td>
+                            <td> 3 </td>
+                            <td> 折线主线(IE8+)有效，阴影纵向偏移，正值往下，负值往上 </td>
+                        </tr>
                     </table>
 
                     <h4>areaStyle<a name="AreaStyle"> </a></h4>

doc/example/demo.html

@@ -89,9 +89,6 @@
     <script src="../asset/js/esl/esl.js"></script>
     <script type="text/javascript">
         require.config({
-            paths: {
-                'js': '../asset/js/esl/js'
-            },
             packages: [
                 {
                     name: 'echarts',

doc/example/line.html

@@ -186,7 +186,11 @@ option = {
                                 0, 0, 1000, 0,
                                 [[0, 'rgba(255,0,0,0.8)'],[0.8, 'rgba(255,255,0,0.8)']]
                             )
-                        })()
+                        })(),
+                        shadowColor : 'rgba(0,0,0,0.5)',
+                        shadowBlur: 10,
+                        shadowOffsetX: 8,
+                        shadowOffsetY: 8
                     }
                 }
             },

doc/example/line1.html

@@ -104,11 +104,25 @@ option = {
         {
             name:'最高气温',
             type:'line',
+            itemStyle: {
+                normal: {
+                    lineStyle: {
+                        shadowColor : 'rgba(0,0,0,0.4)'
+                    }
+                }
+            },
             data:[11, 11, 15, 13, 12, 13, 10]
         },
         {
             name:'最低气温',
             type:'line',
+            itemStyle: {
+                normal: {
+                    lineStyle: {
+                        shadowColor : 'rgba(0,0,0,0.4)'
+                    }
+                }
+            },
             data:[-2, 1, 2, 5, 3, 2, 0]
         }
     ]

doc/example/loading.html

@@ -182,9 +182,6 @@ loadingTicket = setTimeout(function(){
         }
 
         require.config({
-            paths: {
-                'js': '../asset/js/esl/js'
-            },
             packages: [
                 {
                     name: 'echarts',
@@ -193,7 +190,8 @@ loadingTicket = setTimeout(function(){
                 },
                 {
                     name: 'zrender',
-                    location: '../../../zrender/src',
+                    location: 'http://ecomfe.github.io/zrender/src',
+                    //location: '../../../zrender/src',
                     main: 'zrender'
                 }
             ]

doc/slide/js/whyEcharts.js

 require.config({
-    paths: {
-        'js': '../asset/js/esl/js'
-    },
     packages: [
         {
             name: 'echarts',

src/chart/island.js

@@ -120,6 +120,9 @@ define(function (require) {
                 onmousewheel : self.shapeHandler.onmousewheel,
                 _type : 'island'
             };
+            if (islandShape.style.color == '#fff') {
+                islandShape.style.color = shape.style.strokeColor;
+            }
             self.setCalculable(islandShape);
             ecData.pack(
                 islandShape,

src/chart/line.js

@@ -531,7 +531,8 @@ define(function(require) {
                                         [data], 'itemStyle.emphasis.color'
                                     ) || emphasisColor
                                       || normalColor
-                                      || defaultColor
+                                      || defaultColor,
+                                    lineWidth
                                 ));
                             }
 
@@ -578,7 +579,23 @@ define(function(require) {
                                                   || normalColor
                                                   || defaultColor,
                                     lineWidth : lineWidth,
-                                    lineType : lineType
+                                    lineType : lineType,
+                                    shadowColor : self.deepQuery(
+                                      [serie],
+                                      'itemStyle.normal.lineStyle.shadowColor'
+                                    ),
+                                    shadowBlur: self.deepQuery(
+                                      [serie],
+                                      'itemStyle.normal.lineStyle.shadowBlur'
+                                    ),
+                                    shadowOffsetX: self.deepQuery(
+                                      [serie],
+                                      'itemStyle.normal.lineStyle.shadowOffsetX'
+                                    ),
+                                    shadowOffsetY: self.deepQuery(
+                                      [serie],
+                                      'itemStyle.normal.lineStyle.shadowOffsetY'
+                                    )
                                 },
                                 hoverable : false,
                                 _main : true,
@@ -602,7 +619,8 @@ define(function(require) {
                 seriesIndex, dataIndex, name,
                 x, y,
                 color,
-                _sIndex2ColorMap[seriesIndex]
+                _sIndex2ColorMap[seriesIndex],
+                2
             );
 
             itemShape.hoverable = false;
@@ -616,7 +634,8 @@ define(function(require) {
          * 生成折线图上的拐点图形
          */
         function _getSymbol(
-            seriesIndex, dataIndex, name, x, y, normalColor, emphasisColor
+            seriesIndex, dataIndex, name, x, y,
+            normalColor, emphasisColor, lineWidth
         ) {
             var serie = series[seriesIndex];
             var data = serie.data[dataIndex];
@@ -637,7 +656,7 @@ define(function(require) {
                     brushType : 'both',
                     color : symbol.match('empty') ? '#fff' : normalColor,
                     strokeColor : normalColor,
-                    lineWidth: 2
+                    lineWidth: lineWidth * 2
                 },
                 highlightStyle : {
                     color : emphasisColor,

src/component/tooltip.js

@@ -48,7 +48,8 @@ define(function (require) {
                         + '-moz-transition:left 1s,top 1s;'
                         + '-webkit-transition:left 1s,top 1s;'
                         + '-o-transition:left 1s,top 1s;'
-                        + 'border-style:solid;';
+                        + 'border-style:solid;'
+                        + 'white-space:nowrap;';
         // 默认样式
         var _defaultCssText;                    // css样式缓存
 

src/config.js

@@ -293,7 +293,11 @@ define(function() {
                     // color: 各异,
                     lineStyle: {
                         width: 1,
-                        style: 'solid'
+                        style: 'solid',
+                        shadowColor : 'rgba(0,0,0,0)', //默认透明
+                        shadowBlur: 5,
+                        shadowOffsetX: 3,
+                        shadowOffsetY: 3
                     }
                 },
                 emphasis: {