Merge branch 'master' of https://github.com/ecomfe/echarts

jiaojinqian · Sep 5, 2014 · b9e6025 · b9e6025
2 parents bff0ce3 + 5399752
commit b9e6025
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 33 deletions.
diff --git a/build/echarts-map.js b/build/echarts-map.js
diff --git a/build/echarts-original-map.js b/build/echarts-original-map.js
@@ -16855,14 +16855,16 @@ define('echarts/chart/base',['require','zrender/shape/Image','../util/shape/Icon
 
                 serie[markType].data = markData.data;
                 this['_build' + markType.replace('m', 'M')](seriesIndex);
-                for (var i = lastLength, l = this.shapeList.length; i < l; i++) {
-                    this.zr.addShape(this.shapeList[i]);
-                }
-                this.zr.refresh();
-
                 if (this.option.animation && !this.option.renderAsImage) {
+                    // animationMark就会addShape
                     this.animationMark(duration, easing, this.shapeList.slice(lastLength));
                 }
+                else {
+                    for (var i = lastLength, l = this.shapeList.length; i < l; i++) {
+                        this.zr.addShape(this.shapeList[i]);
+                    }
+                    this.zr.refresh();
+                }
                 // 还原，复用_buildMarkX
                 serie[markType].data = oriMarkData;
             }

diff --git a/build/echarts-original.js b/build/echarts-original.js
@@ -16855,14 +16855,16 @@ define('echarts/chart/base',['require','zrender/shape/Image','../util/shape/Icon
 
                 serie[markType].data = markData.data;
                 this['_build' + markType.replace('m', 'M')](seriesIndex);
-                for (var i = lastLength, l = this.shapeList.length; i < l; i++) {
-                    this.zr.addShape(this.shapeList[i]);
-                }
-                this.zr.refresh();
-
                 if (this.option.animation && !this.option.renderAsImage) {
+                    // animationMark就会addShape
                     this.animationMark(duration, easing, this.shapeList.slice(lastLength));
                 }
+                else {
+                    for (var i = lastLength, l = this.shapeList.length; i < l; i++) {
+                        this.zr.addShape(this.shapeList[i]);
+                    }
+                    this.zr.refresh();
+                }
                 // 还原，复用_buildMarkX
                 serie[markType].data = oriMarkData;
             }

diff --git a/build/echarts-plain-map.js b/build/echarts-plain-map.js
diff --git a/build/echarts-plain-original-map.js b/build/echarts-plain-original-map.js
@@ -17262,14 +17262,16 @@ define('echarts/chart/base',['require','zrender/shape/Image','../util/shape/Icon
 
                 serie[markType].data = markData.data;
                 this['_build' + markType.replace('m', 'M')](seriesIndex);
-                for (var i = lastLength, l = this.shapeList.length; i < l; i++) {
-                    this.zr.addShape(this.shapeList[i]);
-                }
-                this.zr.refresh();
-
                 if (this.option.animation && !this.option.renderAsImage) {
+                    // animationMark就会addShape
                     this.animationMark(duration, easing, this.shapeList.slice(lastLength));
                 }
+                else {
+                    for (var i = lastLength, l = this.shapeList.length; i < l; i++) {
+                        this.zr.addShape(this.shapeList[i]);
+                    }
+                    this.zr.refresh();
+                }
                 // 还原，复用_buildMarkX
                 serie[markType].data = oriMarkData;
             }

diff --git a/build/echarts-plain-original.js b/build/echarts-plain-original.js
@@ -17262,14 +17262,16 @@ define('echarts/chart/base',['require','zrender/shape/Image','../util/shape/Icon
 
                 serie[markType].data = markData.data;
                 this['_build' + markType.replace('m', 'M')](seriesIndex);
-                for (var i = lastLength, l = this.shapeList.length; i < l; i++) {
-                    this.zr.addShape(this.shapeList[i]);
-                }
-                this.zr.refresh();
-
                 if (this.option.animation && !this.option.renderAsImage) {
+                    // animationMark就会addShape
                     this.animationMark(duration, easing, this.shapeList.slice(lastLength));
                 }
+                else {
+                    for (var i = lastLength, l = this.shapeList.length; i < l; i++) {
+                        this.zr.addShape(this.shapeList[i]);
+                    }
+                    this.zr.refresh();
+                }
                 // 还原，复用_buildMarkX
                 serie[markType].data = oriMarkData;
             }

diff --git a/build/echarts-plain.js b/build/echarts-plain.js
diff --git a/build/echarts.js b/build/echarts.js
diff --git a/doc/changelog.html b/doc/changelog.html
@@ -60,6 +60,7 @@ <h3>2.0.3<small>（2014-09-05）</small></h3>
                     <li>[#] showLoading文字全局居中，fix <a href="https://github.com/ecomfe/echarts/issues/638" target="_blank">#638 »</a></li>
                     <li>[#] [timeline]轴线节点虚线显示不完整</li>
                     <li>[#] 修复交互触发页面被选中的问题</li>
+                    <li>[#] [addMark*]动态添加无法delMark*问题</li>
                     <li>[#] 若干issues，fix
                         <a href="https://github.com/ecomfe/echarts/issues/540" target="_blank">#540（极坐标坐标轴显示）»</a>
                         <a href="https://github.com/ecomfe/echarts/issues/543" target="_blank">#543（多地图滚轮缩放错误）»</a>

diff --git a/doc/example/www/js/echarts-map.js b/doc/example/www/js/echarts-map.js
diff --git a/doc/example/www/js/echarts.js b/doc/example/www/js/echarts.js
diff --git a/doc/example/www2/js/echarts-plain-map.js b/doc/example/www2/js/echarts-plain-map.js
diff --git a/doc/example/www2/js/echarts-plain.js b/doc/example/www2/js/echarts-plain.js
diff --git a/src/chart/base.js b/src/chart/base.js
@@ -1291,14 +1291,16 @@ define(function (require) {
 
                 serie[markType].data = markData.data;
                 this['_build' + markType.replace('m', 'M')](seriesIndex);
-                for (var i = lastLength, l = this.shapeList.length; i < l; i++) {
-                    this.zr.addShape(this.shapeList[i]);
-                }
-                this.zr.refresh();
-
                 if (this.option.animation && !this.option.renderAsImage) {
+                    // animationMark就会addShape
                     this.animationMark(duration, easing, this.shapeList.slice(lastLength));
                 }
+                else {
+                    for (var i = lastLength, l = this.shapeList.length; i < l; i++) {
+                        this.zr.addShape(this.shapeList[i]);
+                    }
+                    this.zr.refresh();
+                }
                 // 还原，复用_buildMarkX
                 serie[markType].data = oriMarkData;
             }