toolbox refresh功能改名为restore

68f5db81 · kener · 29809d42 · 68f5db81 · 68f5db81 · 68f5db81
36 changed file
--- a/doc/doc.html
+++ b/doc/doc.html
@@ -364,7 +364,7 @@ myChart.setOption(option);
                        <tr>
                            <td>{void} on</td>
                            <td>{string} eventName, <br/>{Function} eventListener</td>
-                            <td>事件绑定，支持事件有：<br/>REFRESH，CLICK，HOVER，<br/>DATA_CHANGED，DATA_ZOOM，LEGEND_SELECTED，MAGIC_TYPE_CHANGED </td>
+                            <td>事件绑定，支持事件有：<br/>REFRESH，RESTORE，CLICK，HOVER，<br/>DATA_CHANGED，MAGIC_TYPE_CHANGED，DATA_VIEW_CHANGED，<br/>DATA_ZOOM，DATA_RANGE，LEGEND_SELECTED，MAP_SELECTED</td>
                        </tr>
                        <tr>
                            <td>{void} un</td>
@@ -718,6 +718,7 @@ myChart.setOption(option);
                    <pre>
 feature : {
    mark : true,                    // 辅助线标志
+    dataZoom : true,                // 框选区域缩放，自动与存在的dataZoom控件同步
    dataView : true,                // 数据视图
    magicType:['line', 'bar'],      // 图表类型切换，当前仅支持直角系下的折线图、柱状图转换
    restore : true                  // 还原，复位原始图表

--- a/doc/example/axis.html
+++ b/doc/example/axis.html
@@ -80,7 +80,7 @@ option = {
            mark : true,
            dataView : true,
            magicType:['line', 'bar'],
-            refresh : true
+            restore : true
        }
    },
    xAxis : [

--- a/doc/example/bar.html
+++ b/doc/example/bar.html
@@ -81,7 +81,7 @@ option = {
            mark : true,
            dataView : {readOnly: false},
            magicType:['line', 'bar'],
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/bar1.html
+++ b/doc/example/bar1.html
@@ -80,7 +80,7 @@ option = {
            mark : true,
            dataView : {readOnly: false},
            magicType:['line', 'bar'],
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/bar2.html
+++ b/doc/example/bar2.html
@@ -83,7 +83,7 @@ option = {
            mark : true,
            dataView : {readOnly: false},
            magicType:['line', 'bar'],
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/bar3.html
+++ b/doc/example/bar3.html
@@ -80,7 +80,7 @@ option = {
            mark : true,
            dataView : {readOnly: false},
            magicType:['line', 'bar'],
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/bar4.html
+++ b/doc/example/bar4.html
@@ -80,7 +80,7 @@ option = {
            mark : true,
            dataView : {readOnly: false},
            magicType:['line', 'bar'],
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/bar5.html
+++ b/doc/example/bar5.html
@@ -80,7 +80,7 @@ option = {
            mark : true,
            dataView : {readOnly: false},
            magicType:['line', 'bar'],
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/dataZoom.html
+++ b/doc/example/dataZoom.html
@@ -77,7 +77,7 @@ option = {
            mark : true,
            dataView : true,
            magicType:['line', 'bar'],
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/dataZoom1.html
+++ b/doc/example/dataZoom1.html
@@ -80,7 +80,7 @@ option = {
            mark : true,
            dataView : true,
            magicType:['line', 'bar'],
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/event.html
+++ b/doc/example/event.html
@@ -80,7 +80,7 @@ option = {
            mark : true,
            dataView : {readOnly:false},
            magicType:['line', 'bar'],
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/k.html
+++ b/doc/example/k.html
@@ -88,7 +88,7 @@ option = {
        feature : {
            mark : true,
            dataView : {readOnly: false},
-            refresh : true
+            restore : true
        }
    },
    dataZoom : {

--- a/doc/example/k1.html
+++ b/doc/example/k1.html
@@ -88,7 +88,7 @@ option = {
        feature : {
            mark : true,
            dataView : {readOnly: false},
-            refresh : true
+            restore : true
        }
    },
    dataZoom : {

--- a/doc/example/lasagna.html
+++ b/doc/example/lasagna.html
@@ -82,7 +82,7 @@ option = {
        feature : {
            mark : true,
            dataView : {readOnly: false},
-            refresh : true
+            restore : true
        }
    },
    calculable : false,
@@ -135,7 +135,7 @@ setTimeout(function(){
            textFont:'normal 20px 微软雅黑'
        }
    });
-    _ZR.refresh();
+    _ZR.restore();
 }, 2000);

                    </textarea>

--- a/doc/example/line.html
+++ b/doc/example/line.html
@@ -80,7 +80,7 @@ option = {
            mark : true,
            dataView : {readOnly: false},
            magicType:['line', 'bar'],
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/line1.html
+++ b/doc/example/line1.html
@@ -80,7 +80,7 @@ option = {
            mark : true,
            dataView : {readOnly: false},
            magicType:['line', 'bar'],
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/line2.html
+++ b/doc/example/line2.html
@@ -80,7 +80,7 @@ option = {
            mark : true,
            dataView : {readOnly: false},
            magicType:['line', 'bar'],
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/line3.html
+++ b/doc/example/line3.html
@@ -80,7 +80,7 @@ option = {
            mark : true,
            dataView : {readOnly: false},
            magicType:['line', 'bar'],
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/line4.html
+++ b/doc/example/line4.html
@@ -80,7 +80,7 @@ option = {
            mark : true,
            dataView : {readOnly: false},
            magicType:['line', 'bar'],
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/line5.html
+++ b/doc/example/line5.html
@@ -77,7 +77,7 @@ option = {
            mark : true,
            dataView : {readOnly: false},
            magicType:['line', 'bar'],
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/loading.html
+++ b/doc/example/loading.html
@@ -78,7 +78,7 @@ myChart.showLoading({
 });
 clearTimeout(loadingTicket);
 loadingTicket = setTimeout(function(){
-    refreshing = false;
+    restoreing = false;
    myChart.setSeries([
        {
            name:'蒸发量',
@@ -153,7 +153,7 @@ loadingTicket = setTimeout(function(){
        function focusGraphic() {
            domCode.className = 'span4 ani';
            domGraphic.className = 'span8 ani';
-            refresh()
+            restore()
        }

        var editor = CodeMirror.fromTextArea(
@@ -166,7 +166,7 @@ loadingTicket = setTimeout(function(){
        editor.on('change', function(){needRefresh = true;});

        var effectIndex = -1;
-        function refresh(isBtnRefresh){
+        function restore(isBtnRefresh){
            if (isBtnRefresh) {
                needRefresh = true;
                focusGraphic();
@@ -216,7 +216,7 @@ loadingTicket = setTimeout(function(){
                            mark : true,
                            dataView : {readOnly: false},
                            magicType:['line', 'bar'],
-                            refresh : true
+                            restore : true
                        }
                    },
                    legend: {
@@ -236,7 +236,7 @@ loadingTicket = setTimeout(function(){
                    ]},
                    true
                );
-                refresh();
+                restore();
            }
        )
    </script>

--- a/doc/example/map1.html
+++ b/doc/example/map1.html
@@ -96,7 +96,7 @@ option = {
        feature : {
            mark : true,
            dataView : {readOnly: false},
-            refresh : true
+            restore : true
        }
    },
    series : [

--- a/doc/example/mix1.html
+++ b/doc/example/mix1.html
@@ -77,7 +77,7 @@ option = {
            mark : true,
            dataView : {readOnly: false},
            magicType:['line', 'bar'],
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/mix2.html
+++ b/doc/example/mix2.html
@@ -78,7 +78,7 @@ option = {
            mark : true,
            dataView : {readOnly: false},
            magicType:['line', 'bar'],
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/mix3.html
+++ b/doc/example/mix3.html
@@ -90,7 +90,7 @@ option = {
        feature : {
            mark : true,
            dataView : {readOnly: false},
-            refresh : true
+            restore : true
        }
    },
    series : [

--- a/doc/example/pie.html
+++ b/doc/example/pie.html
@@ -82,7 +82,7 @@ option = {
        feature : {
            mark : true,
            dataView : {readOnly: false},
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/pie1.html
+++ b/doc/example/pie1.html
@@ -82,7 +82,7 @@ option = {
        feature : {
            mark : true,
            dataView : {readOnly: false},
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/pie2.html
+++ b/doc/example/pie2.html
@@ -82,7 +82,7 @@ option = {
        feature : {
            mark : true,
            dataView : {readOnly: false},
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/pie3.html
+++ b/doc/example/pie3.html
@@ -82,7 +82,7 @@ option = {
        feature : {
            mark : true,
            dataView : {readOnly: false},
-            refresh : true
+            restore : true
        }
    },
    calculable : false,

--- a/doc/example/scatter.html
+++ b/doc/example/scatter.html
@@ -79,7 +79,7 @@ option = {
        feature : {
            mark : true,
            dataView : {readOnly: false},
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/scatter1.html
+++ b/doc/example/scatter1.html
@@ -79,7 +79,7 @@ option = {
        feature : {
            mark : true,
            dataView : {readOnly: false},
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/scatter2.html
+++ b/doc/example/scatter2.html
@@ -79,7 +79,7 @@ option = {
        feature : {
            mark : true,
            dataView : {readOnly: false},
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/scatter3.html
+++ b/doc/example/scatter3.html
@@ -79,7 +79,7 @@ option = {
        feature : {
            mark : true,
            dataView : {readOnly: false},
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/doc/example/tooltip.html
+++ b/doc/example/tooltip.html
@@ -103,7 +103,7 @@ option = {
            mark : true,
            dataView : {readOnly: false},
            magicType:['line', 'bar'],
-            refresh : true
+            restore : true
        }
    },
    calculable : true,

--- a/src/component/toolbox.js
+++ b/src/component/toolbox.js
@@ -152,8 +152,8 @@ define(function (require) {
                        }
                        itemShape.onclick = _onDataView;
                        break;
-                    case 'refresh':
-                        itemShape.onclick = _onRefresh;
+                    case 'restore':
+                        itemShape.onclick = _onRestore;
                        break;
                    default:
                        if (_iconList[i].match('Chart')) {
@@ -419,7 +419,7 @@ define(function (require) {
            return true;
        }

-        function _onRefresh(){
+        function _onRestore(){
            _resetMark();
            messageCenter.dispatch(ecConfig.EVENT.RESTORE);
            return true;

--- a/src/util/shape/icon.js
+++ b/src/util/shape/icon.js
@@ -85,7 +85,7 @@ define(
                mark : _iconMark,
                markUndo : _iconMarkUndo,
                markClear : _iconMarkClear,
-                refresh : _iconRefresh,
+                restore : _iconRestore,
                lineChart : _iconLineChart,
                barChart : _iconBarChart,
                dataView : _iconDataView,
@@ -160,7 +160,7 @@ define(
            ctx.lineTo(style.x + style.width,        style.y + 5 * dy);
        }

-        function _iconRefresh(ctx, style) {
+        function _iconRestore(ctx, style) {
            var dx = style.width / 16;
            var dy = style.height / 16;
            var r = style.width / 2;