echarts 3.6.1 → 3.7.2

package/src/component/timeline/TimelineAxis.js

@@ -64,7 +64,7 @@ define(function (require) {
                 labelInterval = this._autoLabelInterval = axisHelper.getAxisLabelInterval(
                     zrUtil.map(this.scale.getTicks(), this.dataToCoord, this),
                     axisHelper.getFormattedLabels(this, labelModel.get('formatter')),
-                    labelModel.getModel('textStyle').getFont(),
+                    labelModel.getFont(),
                     timelineModel.get('orient') === 'horizontal'
                 );
             }

package/src/component/timeline/TimelineModel.js

@@ -49,9 +49,7 @@ define(function(require) {
             },
             label: {
                 normal: {
-                    textStyle: {
-                        color: '#000'
-                    }
+                    color: '#000'
                 },
                 emphasis: {}
             },

package/src/component/title.js

@@ -95,11 +95,10 @@ define(function(require) {
             var textBaseline = titleModel.get('textBaseline');
 
             var textEl = new graphic.Text({
-                style: {
+                style: graphic.setTextStyle({}, textStyleModel, {
                     text: titleModel.get('text'),
-                    textFont: textStyleModel.getFont(),
-                    fill: textStyleModel.getTextColor()
-                },
+                    textFill: textStyleModel.getTextColor()
+                }, {disableBox: true}),
                 z2: 10
             });
 
@@ -107,13 +106,12 @@ define(function(require) {
 
             var subText = titleModel.get('subtext');
             var subTextEl = new graphic.Text({
-                style: {
+                style: graphic.setTextStyle({}, subtextStyleModel, {
                     text: subText,
-                    textFont: subtextStyleModel.getFont(),
-                    fill: subtextStyleModel.getTextColor(),
+                    textFill: subtextStyleModel.getTextColor(),
                     y: textRect.height + titleModel.get('itemGap'),
-                    textBaseline: 'top'
-                },
+                    textVerticalAlign: 'top'
+                }, {disableBox: true}),
                 z2: 10
             });
 
@@ -197,7 +195,8 @@ define(function(require) {
                     x: groupRect.x - padding[3],
                     y: groupRect.y - padding[0],
                     width: groupRect.width + padding[1] + padding[3],
-                    height: groupRect.height + padding[0] + padding[2]
+                    height: groupRect.height + padding[0] + padding[2],
+                    r: titleModel.get('borderRadius')
                 },
                 style: style,
                 silent: true

package/src/component/toolbox/ToolboxModel.js

@@ -42,6 +42,8 @@ define(function (require) {
 
             borderColor: '#ccc',
 
+            borderRadius: 0,
+
             borderWidth: 0,
 
             padding: 5,

package/src/component/toolbox/ToolboxView.js

@@ -124,31 +124,19 @@ define(function (require) {
                     titles[featureName] = title;
                 }
                 var iconPaths = featureModel.iconPaths = {};
-                zrUtil.each(icons, function (icon, iconName) {
-                    var normalStyle = iconStyleModel.getModel('normal').getItemStyle();
-                    var hoverStyle = iconStyleModel.getModel('emphasis').getItemStyle();
-
-                    var style = {
-                        x: -itemSize / 2,
-                        y: -itemSize / 2,
-                        width: itemSize,
-                        height: itemSize
-                    };
-                    var path = icon.indexOf('image://') === 0
-                        ? (
-                            style.image = icon.slice(8),
-                            new graphic.Image({style: style})
-                        )
-                        : graphic.makePath(
-                            icon.replace('path://', ''),
-                            {
-                                style: normalStyle,
-                                hoverStyle: hoverStyle,
-                                rectHover: true
-                            },
-                            style,
-                            'center'
-                        );
+                zrUtil.each(icons, function (iconStr, iconName) {
+                    var path = graphic.createIcon(
+                        iconStr,
+                        {},
+                        {
+                            x: -itemSize / 2,
+                            y: -itemSize / 2,
+                            width: itemSize,
+                            height: itemSize
+                        }
+                    );
+                    path.setStyle(iconStyleModel.getModel('normal').getItemStyle());
+                    path.hoverStyle = iconStyleModel.getModel('emphasis').getItemStyle();
 
                     graphic.setHoverStyle(path);
 
@@ -184,7 +172,7 @@ define(function (require) {
             listComponentHelper.layout(group, toolboxModel, api);
             // Render background after group is layout
             // FIXME
-            listComponentHelper.addBackground(group, toolboxModel);
+            group.add(listComponentHelper.makeBackground(group.getBoundingRect(), toolboxModel));
 
             // Adjust icon title positions to avoid them out of screen
             group.eachChild(function (icon) {
@@ -193,7 +181,7 @@ define(function (require) {
                 // May be background element
                 if (hoverStyle && titleText) {
                     var rect = textContain.getBoundingRect(
-                        titleText, hoverStyle.font
+                        titleText, textContain.makeFont(hoverStyle)
                     );
                     var offsetX = icon.position[0] + group.position[0];
                     var offsetY = icon.position[1] + group.position[1] + itemSize;

package/src/component/toolbox/feature/Brush.js

@@ -3,6 +3,7 @@ define(function(require) {
 
     var featureManager = require('../featureManager');
     var zrUtil = require('zrender/core/util');
+    var lang = require('../../../lang').toolbox.brush;
 
     function Brush(model, ecModel, api) {
         this.model = model;
@@ -33,14 +34,8 @@ define(function(require) {
             keep: 'M4,10.5V1h10.3 M20.7,1h6.1 M33,1h6.1 M55.4,10.5V1H45.2 M4,17.3v6.6 M55.6,17.3v6.6 M4,30.5V40h10.3 M20.7,40 h6.1 M33,40h6.1 M55.4,30.5V40H45.2 M21,18.9h62.9v48.6H21V18.9z', // jshint ignore:line
             clear: 'M22,14.7l30.9,31 M52.9,14.7L22,45.7 M4.7,16.8V4.2h13.1 M26,4.2h7.8 M41.6,4.2h7.8 M70.3,16.8V4.2H57.2 M4.7,25.9v8.6 M70.3,25.9v8.6 M4.7,43.2v12.6h13.1 M26,55.8h7.8 M41.6,55.8h7.8 M70.3,43.2v12.6H57.2' // jshint ignore:line
         },
-        title: {
-            rect: '矩形选择',
-            polygon: '圈选',
-            lineX: '横向选择',
-            lineY: '纵向选择',
-            keep: '保持选择',
-            clear: '清除选择'
-        }
+        // `rect`, `polygon`, `lineX`, `lineY`, `keep`, `clear`
+        title: zrUtil.clone(lang.title)
     };
 
     var proto = Brush.prototype;

package/src/component/toolbox/feature/DataView.js

@@ -6,7 +6,7 @@ define(function (require) {
 
     var zrUtil = require('zrender/core/util');
     var eventTool = require('zrender/core/event');
-
+    var lang = require('../../../lang').toolbox.dataView;
 
     var BLOCK_SPLITER = new Array(60).join('-');
     var ITEM_SPLITER = '\t';
@@ -120,7 +120,7 @@ define(function (require) {
 
     /**
      * @param {module:echarts/model/Global}
-     * @return {string}
+     * @return {Object}
      * @inner
      */
     function getContentFromModel(ecModel) {
@@ -157,7 +157,7 @@ define(function (require) {
     var itemSplitRegex = new RegExp('[' + ITEM_SPLITER + ']+', 'g');
     /**
      * @param {string} tsv
-     * @return {Array.<Object>}
+     * @return {Object}
      */
     function parseTSVContents(tsv) {
         var tsvLines = tsv.split(/\n+/g);
@@ -277,8 +277,8 @@ define(function (require) {
         contentToOption: null,
 
         icon: 'M17.5,17.3H33 M17.5,17.3H33 M45.4,29.5h-28 M11.5,2v56H51V14.8L38.4,2H11.5z M38.4,2.2v12.7H51 M45.4,41.7h-28',
-        title: '数据视图',
-        lang: ['数据视图', '关闭', '刷新'],
+        title: zrUtil.clone(lang.title),
+        lang: zrUtil.clone(lang.lang),
         backgroundColor: '#fff',
         textColor: '#000',
         textareaColor: '#fff',

package/src/component/toolbox/feature/DataZoom.js

@@ -6,6 +6,7 @@ define(function(require) {
     var BrushTargetManager = require('../../helper/BrushTargetManager');
     var history = require('../../dataZoom/history');
     var sliderMove = require('../../helper/sliderMove');
+    var lang = require('../../../lang').toolbox.dataZoom;
 
     var each = zrUtil.each;
 
@@ -39,10 +40,8 @@ define(function(require) {
             zoom: 'M0,13.5h26.9 M13.5,26.9V0 M32.1,13.5H58V58H13.5 V32.1',
             back: 'M22,1.4L9.9,13.5l12.3,12.3 M10.3,13.5H54.9v44.6 H10.3v-26'
         },
-        title: {
-            zoom: '区域缩放',
-            back: '区域缩放还原'
-        }
+        // `zoom`, `back`
+        title: zrUtil.clone(lang.title)
     };
 
     var proto = DataZoom.prototype;

package/src/component/toolbox/feature/MagicType.js

@@ -2,6 +2,7 @@ define(function(require) {
     'use strict';
 
     var zrUtil = require('zrender/core/util');
+    var lang = require('../../../lang').toolbox.magicType;
 
     function MagicType(model) {
         this.model = model;
@@ -17,12 +18,8 @@ define(function(require) {
             stack: 'M8.2,38.4l-8.4,4.1l30.6,15.3L60,42.5l-8.1-4.1l-21.5,11L8.2,38.4z M51.9,30l-8.1,4.2l-13.4,6.9l-13.9-6.9L8.2,30l-8.4,4.2l8.4,4.2l22.2,11l21.5-11l8.1-4.2L51.9,30z M51.9,21.7l-8.1,4.2L35.7,30l-5.3,2.8L24.9,30l-8.4-4.1l-8.3-4.2l-8.4,4.2L8.2,30l8.3,4.2l13.9,6.9l13.4-6.9l8.1-4.2l8.1-4.1L51.9,21.7zM30.4,2.2L-0.2,17.5l8.4,4.1l8.3,4.2l8.4,4.2l5.5,2.7l5.3-2.7l8.1-4.2l8.1-4.2l8.1-4.1L30.4,2.2z', // jshint ignore:line
             tiled: 'M2.3,2.2h22.8V25H2.3V2.2z M35,2.2h22.8V25H35V2.2zM2.3,35h22.8v22.8H2.3V35z M35,35h22.8v22.8H35V35z'
         },
-        title: {
-            line: '切换为折线图',
-            bar: '切换为柱状图',
-            stack: '切换为堆叠',
-            tiled: '切换为平铺'
-        },
+        // `line`, `bar`, `stack`, `tiled`
+        title: zrUtil.clone(lang.title),
         option: {},
         seriesIndex: {}
     };

package/src/component/toolbox/feature/Restore.js

@@ -2,6 +2,7 @@ define(function(require) {
     'use strict';
 
     var history = require('../../dataZoom/history');
+    var lang = require('../../../lang').toolbox.restore;
 
     function Restore(model) {
         this.model = model;
@@ -10,7 +11,7 @@ define(function(require) {
     Restore.defaultOption = {
         show: true,
         icon: 'M3.8,33.4 M47,18.9h9.8V8.7 M56.3,20.1 C52.1,9,40.5,0.6,26.8,2.1C12.6,3.7,1.6,16.2,2.1,30.6 M13,41.1H3.1v10.2 M3.7,39.9c4.2,11.1,15.8,19.5,29.5,18 c14.2-1.6,25.2-14.1,24.7-28.5',
-        title: '还原'
+        title: lang.title
     };
 
     var proto = Restore.prototype;

package/src/component/toolbox/feature/SaveAsImage.js

@@ -1,6 +1,7 @@
 define(function (require) {
 
     var env = require('zrender/core/env');
+    var lang = require('../../../lang').toolbox.saveAsImage;
 
     function SaveAsImage (model) {
         this.model = model;
@@ -9,14 +10,14 @@ define(function (require) {
     SaveAsImage.defaultOption = {
         show: true,
         icon: 'M4.7,22.9L29.3,45.5L54.7,23.4M4.6,43.6L4.6,58L53.8,58L53.8,43.6M29.2,45.1L29.2,0',
-        title: '保存为图片',
+        title: lang.title,
         type: 'png',
         // Default use option.backgroundColor
         // backgroundColor: '#fff',
         name: '',
         excludeComponents: ['toolbox'],
         pixelRatio: 1,
-        lang: ['右键另存为图片']
+        lang: lang.lang.slice()
     };
 
     SaveAsImage.prototype.unusable = !env.canvasSupported;
@@ -49,13 +50,25 @@ define(function (require) {
         }
         // IE
         else {
-            var lang = model.get('lang');
-            var html = ''
-                + '<body style="margin:0;">'
-                + '<img src="' + url + '" style="max-width:100%;" title="' + ((lang && lang[0]) || '') + '" />'
-                + '</body>';
-            var tab = window.open();
-            tab.document.write(html);
+            if (window.navigator.msSaveOrOpenBlob) {
+                var bstr = atob(url.split(',')[1]);
+                var n = bstr.length;
+                var u8arr = new Uint8Array(n);
+                while(n--) {
+                    u8arr[n] = bstr.charCodeAt(n);
+                }
+                var blob = new Blob([u8arr]);
+                window.navigator.msSaveOrOpenBlob(blob, title + '.' + type);
+            }
+            else {
+                var lang = model.get('lang');
+                var html = '' +
+                    '<body style="margin:0;">' +
+                    '<img src="' + url + '" style="max-width:100%;" title="' + ((lang && lang[0]) || '') + '" />' +
+                    '</body>';
+                var tab = window.open();
+                tab.document.write(html);
+            }
         }
     };
 
@@ -64,4 +77,4 @@ define(function (require) {
     );
 
     return SaveAsImage;
-});
+});

package/src/component/tooltip/TooltipContent.js

@@ -219,10 +219,10 @@ define(function (require) {
             // the sibling of canvas root. So padding of ec container
             // should be considered here.
             var zr = this._zr;
-            var viewportRoot;
-            if (zr && zr.painter && (viewportRoot = zr.painter.getViewportRoot())) {
-                x += viewportRoot.offsetLeft || 0;
-                y += viewportRoot.offsetTop || 0;
+            var viewportRootOffset;
+            if (zr && zr.painter && (viewportRootOffset = zr.painter.getViewportRootOffset())) {
+                x += viewportRootOffset.offsetLeft;
+                y += viewportRootOffset.offsetTop;
             }
 
             var style = this.el.style;

package/src/component/tooltip/TooltipView.js

@@ -265,7 +265,8 @@ define(function (require) {
             api.dispatchAction({
                 type: 'updateAxisPointer',
                 seriesIndex: seriesIndex,
-                dataIndex: dataIndex
+                dataIndex: dataIndex,
+                position: payload.position
             });
 
             return true;
@@ -531,7 +532,7 @@ define(function (require) {
         },
 
         /**
-         * @param  {string|Function|Array.<number>} positionExpr
+         * @param  {string|Function|Array.<number>|Object} positionExpr
          * @param  {number} x Mouse x
          * @param  {number} y Mouse y
          * @param  {boolean} confine Whether confine tooltip content in view rect.
@@ -698,8 +699,9 @@ define(function (require) {
     }
 
     function refixTooltipPosition(x, y, el, viewWidth, viewHeight, gapH, gapV) {
-        var width = el.clientWidth;
-        var height = el.clientHeight;
+        var size = getOuterSize(el);
+        var width = size.width;
+        var height = size.height;
 
         if (gapH != null) {
             if (x + width + gapH > viewWidth) {
@@ -721,8 +723,9 @@ define(function (require) {
     }
 
     function confineTooltipPosition(x, y, el, viewWidth, viewHeight) {
-        var width = el.clientWidth;
-        var height = el.clientHeight;
+        var size = getOuterSize(el);
+        var width = size.width;
+        var height = size.height;
 
         x = Math.min(x + width, viewWidth) - width;
         y = Math.min(y + height, viewHeight) - height;
@@ -732,6 +735,25 @@ define(function (require) {
         return [x, y];
     }
 
+    function getOuterSize(el) {
+        var width = el.clientWidth;
+        var height = el.clientHeight;
+
+        // Consider browser compatibility.
+        // IE8 does not support getComputedStyle.
+        if (document.defaultView && document.defaultView.getComputedStyle) {
+            var stl = document.defaultView.getComputedStyle(el);
+            if (stl) {
+                width += parseInt(stl.paddingLeft, 10) + parseInt(stl.paddingRight, 10)
+                    + parseInt(stl.borderLeftWidth, 10) + parseInt(stl.borderRightWidth, 10);
+                height += parseInt(stl.paddingTop, 10) + parseInt(stl.paddingBottom, 10)
+                    + parseInt(stl.borderTopWidth, 10) + parseInt(stl.borderBottomWidth, 10);
+            }
+        }
+
+        return {width: width, height: height};
+    }
+
     function calcTooltipPosition(position, rect, contentSize) {
         var domWidth = contentSize[0];
         var domHeight = contentSize[1];
@@ -768,4 +790,4 @@ define(function (require) {
         return align === 'center' || align === 'middle';
     }
 
-});
+});

package/src/component/visualMap/ContinuousModel.js

@@ -29,7 +29,8 @@ define(function(require) {
             itemWidth: null,        // The length of the other side.
             hoverLink: true,        // Enable hover highlight.
             hoverLinkDataSize: null,// The size of hovered data.
-            hoverLinkOnHandle: true // Whether trigger hoverLink when hover handle.
+            hoverLinkOnHandle: null // Whether trigger hoverLink when hover handle.
+                                    // If not specified, follow the value of `realtime`.
         },
 
         /**
@@ -38,7 +39,6 @@ define(function(require) {
         optionUpdated: function (newOption, isInit) {
             ContinuousModel.superApply(this, 'optionUpdated', arguments);
 
-            this.resetTargetSeries();
             this.resetExtent();
 
             this.resetVisual(function (mappingOption) {

package/src/component/visualMap/ContinuousView.js

@@ -164,7 +164,7 @@ define(function(require) {
                     textAlign: orient === 'horizontal' ? align : 'center',
                     text: text,
                     textFont: textStyleModel.getFont(),
-                    fill: textStyleModel.getTextColor()
+                    textFill: textStyleModel.getTextColor()
                 }
             }));
         },
@@ -185,7 +185,7 @@ define(function(require) {
             barGroup.add(shapes.outOfRange = createPolygon());
             barGroup.add(shapes.inRange = createPolygon(
                 null,
-                useHandle ? 'move' : null,
+                useHandle ? getCursor(this._orient) : null,
                 zrUtil.bind(this._dragHandle, this, 'all', false),
                 zrUtil.bind(this._dragHandle, this, 'all', true)
             ));
@@ -216,7 +216,7 @@ define(function(require) {
             var onDragEnd = zrUtil.bind(this._dragHandle, this, handleIndex, true);
             var handleThumb = createPolygon(
                 createHandlePoints(handleIndex, textSize),
-                'move',
+                getCursor(this._orient),
                 onDrift,
                 onDragEnd
             );
@@ -239,7 +239,7 @@ define(function(require) {
                 style: {
                     x: 0, y: 0, text: '',
                     textFont: textStyleModel.getFont(),
-                    fill: textStyleModel.getTextColor()
+                    textFill: textStyleModel.getTextColor()
                 }
             });
             this.group.add(handleLabel);
@@ -275,7 +275,7 @@ define(function(require) {
                 style: {
                     x: 0, y: 0, text: '',
                     textFont: textStyleModel.getFont(),
-                    fill: textStyleModel.getTextColor()
+                    textFill: textStyleModel.getTextColor()
                 }
             });
             this.group.add(indicatorLabel);
@@ -606,7 +606,6 @@ define(function(require) {
                         // For hover link show when hover handle, which might be
                         // below or upper than sizeExtent.
                         pos[1] = mathMin(mathMax(0, pos[1]), itemSize[1]);
-
                         self._doHoverLinkToSeries(
                             pos[1],
                             0 <= pos[0] && pos[0] <= itemSize[0]
@@ -693,6 +692,7 @@ define(function(require) {
             }
 
             var resultBatches = modelUtil.compressBatches(oldBatch, newBatch);
+
             this._dispatchHighDown('downplay', helper.convertDataIndex(resultBatches[0]));
             this._dispatchHighDown('highlight', helper.convertDataIndex(resultBatches[1]));
         },
@@ -739,7 +739,6 @@ define(function(require) {
             this._hideIndicator();
 
             var indices = this._hoverLinkDataIndices;
-
             this._dispatchHighDown('downplay', helper.convertDataIndex(indices));
 
             indices.length = 0;
@@ -837,7 +836,12 @@ define(function(require) {
     }
 
     function useHoverLinkOnHandle(visualMapModel) {
-        return !visualMapModel.get('realtime') && visualMapModel.get('hoverLinkOnHandle');
+        var hoverLinkOnHandle = visualMapModel.get('hoverLinkOnHandle');
+        return !!(hoverLinkOnHandle == null ? visualMapModel.get('realtime') : hoverLinkOnHandle);
+    }
+
+    function getCursor(orient) {
+        return orient === 'vertical' ? 'ns-resize' : 'ew-resize';
     }
 
     return ContinuousView;

package/src/component/visualMap/PiecewiseModel.js

@@ -81,7 +81,6 @@ define(function(require) {
              */
             this._pieceList = [];
 
-            this.resetTargetSeries();
             this.resetExtent();
 
             /**
@@ -367,7 +366,7 @@ define(function(require) {
         splitNumber: function () {
             var thisOption = this.option;
             var pieceList = this._pieceList;
-            var precision = thisOption.precision;
+            var precision = Math.min(thisOption.precision, 20);
             var dataExtent = this.getExtent();
             var splitNumber = thisOption.splitNumber;
             splitNumber = Math.max(parseInt(splitNumber, 10), 1);

package/src/component/visualMap/PiecewiseView.js

@@ -74,7 +74,7 @@ define(function(require) {
                             textVerticalAlign: 'middle',
                             textAlign: itemAlign,
                             textFont: textFont,
-                            fill: textFill,
+                            textFill: textFill,
                             opacity: visualState === 'outOfRange' ? 0.5 : 1
                         }
                     }));
@@ -144,7 +144,7 @@ define(function(require) {
                     textAlign: showLabel ? itemAlign : 'center',
                     text: text,
                     textFont: textStyleModel.getFont(),
-                    fill: textStyleModel.getTextColor()
+                    textFill: textStyleModel.getTextColor()
                 }
             }));
 

package/src/component/visualMap/VisualMapModel.js

@@ -64,7 +64,8 @@ define(function(require) {
             zlevel: 0,
             z: 4,
 
-            seriesIndex: null,       // 所控制的series indices，默认所有有value的series.
+            seriesIndex: 'all',     // 'all' or null/undefined: all series.
+                                    // A number or an array of number: the specified series.
 
                                     // set min: 0, max: 200, only for campatible with ec2.
                                     // In fact min max should not have default value.
@@ -181,26 +182,31 @@ define(function(require) {
             );
         },
 
-
         /**
          * @protected
+         * @return {Array.<number>} An array of series indices.
          */
-        resetTargetSeries: function () {
-            var thisOption = this.option;
-            var allSeriesIndex = thisOption.seriesIndex == null;
-            thisOption.seriesIndex = allSeriesIndex
-                ? [] : modelUtil.normalizeToArray(thisOption.seriesIndex);
+        getTargetSeriesIndices: function () {
+            var optionSeriesIndex = this.option.seriesIndex;
+            var seriesIndices = [];
+
+            if (optionSeriesIndex == null || optionSeriesIndex === 'all') {
+                this.ecModel.eachSeries(function (seriesModel, index) {
+                    seriesIndices.push(index);
+                });
+            }
+            else {
+                seriesIndices = modelUtil.normalizeToArray(optionSeriesIndex);
+            }
 
-            allSeriesIndex && this.ecModel.eachSeries(function (seriesModel, index) {
-                thisOption.seriesIndex.push(index);
-            });
+            return seriesIndices;
         },
 
         /**
          * @public
          */
         eachTargetSeries: function (callback, context) {
-            zrUtil.each(this.option.seriesIndex, function (seriesIndex) {
+            zrUtil.each(this.getTargetSeriesIndices(), function (seriesIndex) {
                 callback.call(context, this.ecModel.getSeriesByIndex(seriesIndex));
             }, this);
         },
@@ -282,7 +288,7 @@ define(function(require) {
                     ? 'min'
                     : val === dataBound[1]
                     ? 'max'
-                    : (+val).toFixed(precision);
+                    : (+val).toFixed(Math.min(precision, 20));
             }
         },
 

package/src/coord/Axis.js

@@ -249,7 +249,7 @@ define(function (require) {
                     labelInterval = axisHelper.getAxisLabelInterval(
                         zrUtil.map(this.scale.getTicks(), this.dataToCoord, this),
                         axisModel.getFormattedLabels(),
-                        labelModel.getModel('textStyle').getFont(),
+                        labelModel.getFont(),
                         this.isHorizontal()
                     );
                 }

package/src/coord/axisDefault.js

@@ -39,6 +39,7 @@ define(function (require) {
             // 默认显示，属性show控制显示与否
             show: true,
             onZero: true,
+            onZeroAxisIndex: null,
             // 属性lineStyle控制线条样式
             lineStyle: {
                 color: '#333',
@@ -70,9 +71,7 @@ define(function (require) {
             margin: 8,
             // formatter: null,
             // 其余属性默认使用全局文本样式，详见TEXTSTYLE
-            textStyle: {
-                fontSize: 12
-            }
+            fontSize: 12
         },
         // 分隔线
         splitLine: {
@@ -134,6 +133,7 @@ define(function (require) {
         splitNumber: 5
         // Minimum interval
         // minInterval: null
+        // maxInterval: null
     }, defaultOption);
 
     // FIXME