echarts 3.7.1 → 3.7.2

package/lib/component/axis/AxisBuilder.js

@@ -49,7 +49,7 @@
      * @param {Object} opt Standard axis parameters.
      * @param {Array.<number>} opt.position [x, y]
      * @param {number} opt.rotation by radian
-     * @param {number} [opt.nameDirection=1] 1 or -1 Used when nameLocation is 'middle'.
+     * @param {number} [opt.nameDirection=1] 1 or -1 Used when nameLocation is 'middle' or 'center'.
      * @param {number} [opt.tickDirection=1] 1 or -1
      * @param {number} [opt.labelDirection=1] 1 or -1
      * @param {number} [opt.labelOffset=0] Usefull when onZero.
@@ -171,173 +171,14 @@
         /**
          * @private
          */
-        axisTick: function () {
+        axisTickLabel: function () {
             var axisModel = this.axisModel;
-            var axis = axisModel.axis;
-
-            if (!axisModel.get('axisTick.show') || axis.scale.isBlank()) {
-                return;
-            }
-
-            var tickModel = axisModel.getModel('axisTick');
             var opt = this.opt;
 
-            var lineStyleModel = tickModel.getModel('lineStyle');
-            var tickLen = tickModel.get('length');
-
-            var tickInterval = getInterval(tickModel, opt.labelInterval);
-            var ticksCoords = axis.getTicksCoords(tickModel.get('alignWithLabel'));
-            var ticks = axis.scale.getTicks();
-
-            var pt1 = [];
-            var pt2 = [];
-            var matrix = this._transform;
-
-            for (var i = 0; i < ticksCoords.length; i++) {
-                // Only ordinal scale support tick interval
-                if (ifIgnoreOnTick(axis, i, tickInterval)) {
-                     continue;
-                }
-
-                var tickCoord = ticksCoords[i];
-
-                pt1[0] = tickCoord;
-                pt1[1] = 0;
-                pt2[0] = tickCoord;
-                pt2[1] = opt.tickDirection * tickLen;
-
-                if (matrix) {
-                    v2ApplyTransform(pt1, pt1, matrix);
-                    v2ApplyTransform(pt2, pt2, matrix);
-                }
-                // Tick line, Not use group transform to have better line draw
-                this.group.add(new graphic.Line(graphic.subPixelOptimizeLine({
-
-                    // Id for animation
-                    anid: 'tick_' + ticks[i],
-
-                    shape: {
-                        x1: pt1[0],
-                        y1: pt1[1],
-                        x2: pt2[0],
-                        y2: pt2[1]
-                    },
-                    style: zrUtil.defaults(
-                        lineStyleModel.getLineStyle(),
-                        {
-                            stroke: axisModel.get('axisLine.lineStyle.color')
-                        }
-                    ),
-                    z2: 2,
-                    silent: true
-                })));
-            }
-        },
-
-        /**
-         * @param {module:echarts/coord/cartesian/AxisModel} axisModel
-         * @param {module:echarts/coord/cartesian/GridModel} gridModel
-         * @private
-         */
-        axisLabel: function () {
-            var opt = this.opt;
-            var axisModel = this.axisModel;
-            var axis = axisModel.axis;
-            var show = retrieve(opt.axisLabelShow, axisModel.get('axisLabel.show'));
-
-            if (!show || axis.scale.isBlank()) {
-                return;
-            }
-
-            var labelModel = axisModel.getModel('axisLabel');
-            var labelMargin = labelModel.get('margin');
-            var ticks = axis.scale.getTicks();
-            var labels = axisModel.getFormattedLabels();
-
-            // Special label rotate.
-            var labelRotation = (
-                retrieve(opt.labelRotate, labelModel.get('rotate')) || 0
-            ) * PI / 180;
-
-            var labelLayout = innerTextLayout(opt.rotation, labelRotation, opt.labelDirection);
-            var categoryData = axisModel.get('data');
-
-            var textEls = [];
-            var silent = isSilent(axisModel);
-            var triggerEvent = axisModel.get('triggerEvent');
-
-            zrUtil.each(ticks, function (tickVal, index) {
-                if (ifIgnoreOnTick(axis, index, opt.labelInterval)) {
-                     return;
-                }
-
-                var itemLabelModel = labelModel;
-                if (categoryData && categoryData[tickVal] && categoryData[tickVal].textStyle) {
-                    itemLabelModel = new Model(
-                        categoryData[tickVal].textStyle, labelModel, axisModel.ecModel
-                    );
-                }
-
-                var textColor = itemLabelModel.getTextColor()
-                    || axisModel.get('axisLine.lineStyle.color');
-
-                var tickCoord = axis.dataToCoord(tickVal);
-                var pos = [
-                    tickCoord,
-                    opt.labelOffset + opt.labelDirection * labelMargin
-                ];
-                var labelStr = axis.scale.getLabel(tickVal);
-
-                var textEl = new graphic.Text({
-                    // Id for animation
-                    anid: 'label_' + tickVal,
-                    position: pos,
-                    rotation: labelLayout.rotation,
-                    silent: silent,
-                    z2: 10
-                });
-
-                graphic.setTextStyle(textEl.style, itemLabelModel, {
-                    text: labels[index],
-                    textAlign: itemLabelModel.getShallow('align', true)
-                        || labelLayout.textAlign,
-                    textVerticalAlign: itemLabelModel.getShallow('verticalAlign', true)
-                        || itemLabelModel.getShallow('baseline', true)
-                        || labelLayout.textVerticalAlign,
-                    textFill: typeof textColor === 'function'
-                        ? textColor(
-                            // (1) In category axis with data zoom, tick is not the original
-                            // index of axis.data. So tick should not be exposed to user
-                            // in category axis.
-                            // (2) Compatible with previous version, which always returns labelStr.
-                            // But in interval scale labelStr is like '223,445', which maked
-                            // user repalce ','. So we modify it to return original val but remain
-                            // it as 'string' to avoid error in replacing.
-                            axis.type === 'category' ? labelStr : axis.type === 'value' ? tickVal + '' : tickVal,
-                            index
-                        )
-                        : textColor
-                });
-
-                // Pack data for mouse event
-                if (triggerEvent) {
-                    textEl.eventData = makeAxisEventDataBase(axisModel);
-                    textEl.eventData.targetType = 'axisLabel';
-                    textEl.eventData.value = labelStr;
-                }
-
-                // FIXME
-                this._dumbGroup.add(textEl);
-                textEl.updateTransform();
-
-                textEls.push(textEl);
-                this.group.add(textEl);
-
-                textEl.decomposeTransform();
+            var tickEls = buildAxisTick(this, axisModel, opt);
+            var labelEls = buildAxisLabel(this, axisModel, opt);
 
-            }, this);
-
-            fixMinMaxLabelShow(axisModel, textEls);
+            fixMinMaxLabelShow(axisModel, labelEls, tickEls);
         },
 
         /**
@@ -366,7 +207,7 @@
                     ? extent[1] + gapSignal * gap
                     : (extent[0] + extent[1]) / 2, // 'middle'
                 // Reuse labelOffset.
-                nameLocation === 'middle' ? opt.labelOffset + nameDirection * gap : 0
+                isNameLocationCenter(nameLocation) ? opt.labelOffset + nameDirection * gap : 0
             ];
 
             var labelLayout;
@@ -378,7 +219,7 @@
 
             var axisNameAvailableWidth;
 
-            if (nameLocation === 'middle') {
+            if (isNameLocationCenter(nameLocation)) {
                 labelLayout = innerTextLayout(
                     opt.rotation,
                     nameRotation != null ? nameRotation : opt.rotation, // Adapt to axis.
@@ -559,32 +400,64 @@
             );
     }
 
-    function fixMinMaxLabelShow(axisModel, textEls) {
+    function fixMinMaxLabelShow(axisModel, labelEls, tickEls) {
         // If min or max are user set, we need to check
         // If the tick on min(max) are overlap on their neighbour tick
         // If they are overlapped, we need to hide the min(max) tick label
         var showMinLabel = axisModel.get('axisLabel.showMinLabel');
         var showMaxLabel = axisModel.get('axisLabel.showMaxLabel');
-        var firstLabel = textEls[0];
-        var nextLabel = textEls[1];
-        var lastLabel = textEls[textEls.length - 1];
-        var prevLabel = textEls[textEls.length - 2];
+
+        // FIXME
+        // Have not consider onBand yet, where tick els is more than label els.
+
+        labelEls = labelEls || [];
+        tickEls = tickEls || [];
+
+        var firstLabel = labelEls[0];
+        var nextLabel = labelEls[1];
+        var lastLabel = labelEls[labelEls.length - 1];
+        var prevLabel = labelEls[labelEls.length - 2];
+
+        var firstTick = tickEls[0];
+        var nextTick = tickEls[1];
+        var lastTick = tickEls[tickEls.length - 1];
+        var prevTick = tickEls[tickEls.length - 2];
 
         if (showMinLabel === false) {
-            firstLabel.ignore = true;
+            ignoreEl(firstLabel);
+            ignoreEl(firstTick);
         }
-        else if (axisModel.getMin() != null && isTwoLabelOverlapped(firstLabel, nextLabel)) {
-            showMinLabel ? (nextLabel.ignore = true) : (firstLabel.ignore = true);
+        else if (isTwoLabelOverlapped(firstLabel, nextLabel)) {
+            if (showMinLabel) {
+                ignoreEl(nextLabel);
+                ignoreEl(nextTick);
+            }
+            else {
+                ignoreEl(firstLabel);
+                ignoreEl(firstTick);
+            }
         }
 
         if (showMaxLabel === false) {
-            lastLabel.ignore = true;
+            ignoreEl(lastLabel);
+            ignoreEl(lastTick);
         }
-        else if (axisModel.getMax() != null && isTwoLabelOverlapped(prevLabel, lastLabel)) {
-            showMaxLabel ? (prevLabel.ignore = true) : (lastLabel.ignore = true);
+        else if (isTwoLabelOverlapped(prevLabel, lastLabel)) {
+            if (showMaxLabel) {
+                ignoreEl(prevLabel);
+                ignoreEl(prevTick);
+            }
+            else {
+                ignoreEl(lastLabel);
+                ignoreEl(lastTick);
+            }
         }
     }
 
+    function ignoreEl(el) {
+        el && (el.ignore = true);
+    }
+
     function isTwoLabelOverlapped(current, next, labelLayout) {
         // current and next has the same rotation.
         var firstRect = current && current.getBoundingRect().clone();
@@ -605,11 +478,28 @@
         return firstRect.intersect(nextRect);
     }
 
+    function isNameLocationCenter(nameLocation) {
+        return nameLocation === 'middle' || nameLocation === 'center';
+    }
 
     /**
      * @static
      */
-    var ifIgnoreOnTick = AxisBuilder.ifIgnoreOnTick = function (axis, i, interval) {
+    var ifIgnoreOnTick = AxisBuilder.ifIgnoreOnTick = function (
+        axis,
+        i,
+        interval,
+        ticksCnt,
+        showMinLabel,
+        showMaxLabel
+    ) {
+        if (i === 0 && showMinLabel || i === ticksCnt - 1 && showMaxLabel) {
+            return false;
+        }
+
+        // FIXME
+        // Have not consider label overlap (if label is too long) yet.
+
         var rawTick;
         var scale = axis.scale;
         return scale.type === 'ordinal'
@@ -634,5 +524,186 @@
         return interval;
     };
 
+    function buildAxisTick(axisBuilder, axisModel, opt) {
+        var axis = axisModel.axis;
+
+        if (!axisModel.get('axisTick.show') || axis.scale.isBlank()) {
+            return;
+        }
+
+        var tickModel = axisModel.getModel('axisTick');
+
+        var lineStyleModel = tickModel.getModel('lineStyle');
+        var tickLen = tickModel.get('length');
+
+        var tickInterval = getInterval(tickModel, opt.labelInterval);
+        var ticksCoords = axis.getTicksCoords(tickModel.get('alignWithLabel'));
+        // FIXME
+        // Corresponds to ticksCoords ?
+        var ticks = axis.scale.getTicks();
+
+        var showMinLabel = axisModel.get('axisLabel.showMinLabel');
+        var showMaxLabel = axisModel.get('axisLabel.showMaxLabel');
+
+        var pt1 = [];
+        var pt2 = [];
+        var matrix = axisBuilder._transform;
+
+        var tickEls = [];
+
+        var ticksCnt = ticksCoords.length;
+        for (var i = 0; i < ticksCnt; i++) {
+            // Only ordinal scale support tick interval
+            if (ifIgnoreOnTick(
+                axis, i, tickInterval, ticksCnt,
+                showMinLabel, showMaxLabel
+            )) {
+                continue;
+            }
+
+            var tickCoord = ticksCoords[i];
+
+            pt1[0] = tickCoord;
+            pt1[1] = 0;
+            pt2[0] = tickCoord;
+            pt2[1] = opt.tickDirection * tickLen;
+
+            if (matrix) {
+                v2ApplyTransform(pt1, pt1, matrix);
+                v2ApplyTransform(pt2, pt2, matrix);
+            }
+            // Tick line, Not use group transform to have better line draw
+            var tickEl = new graphic.Line(graphic.subPixelOptimizeLine({
+                // Id for animation
+                anid: 'tick_' + ticks[i],
+
+                shape: {
+                    x1: pt1[0],
+                    y1: pt1[1],
+                    x2: pt2[0],
+                    y2: pt2[1]
+                },
+                style: zrUtil.defaults(
+                    lineStyleModel.getLineStyle(),
+                    {
+                        stroke: axisModel.get('axisLine.lineStyle.color')
+                    }
+                ),
+                z2: 2,
+                silent: true
+            }));
+            axisBuilder.group.add(tickEl);
+            tickEls.push(tickEl);
+        }
+
+        return tickEls;
+    }
+
+    function buildAxisLabel(axisBuilder, axisModel, opt) {
+        var axis = axisModel.axis;
+        var show = retrieve(opt.axisLabelShow, axisModel.get('axisLabel.show'));
+
+        if (!show || axis.scale.isBlank()) {
+            return;
+        }
+
+        var labelModel = axisModel.getModel('axisLabel');
+        var labelMargin = labelModel.get('margin');
+        var ticks = axis.scale.getTicks();
+        var labels = axisModel.getFormattedLabels();
+
+        // Special label rotate.
+        var labelRotation = (
+            retrieve(opt.labelRotate, labelModel.get('rotate')) || 0
+        ) * PI / 180;
+
+        var labelLayout = innerTextLayout(opt.rotation, labelRotation, opt.labelDirection);
+        var categoryData = axisModel.get('data');
+
+        var labelEls = [];
+        var silent = isSilent(axisModel);
+        var triggerEvent = axisModel.get('triggerEvent');
+
+        var showMinLabel = axisModel.get('axisLabel.showMinLabel');
+        var showMaxLabel = axisModel.get('axisLabel.showMaxLabel');
+
+        zrUtil.each(ticks, function (tickVal, index) {
+            if (ifIgnoreOnTick(
+                axis, index, opt.labelInterval, ticks.length,
+                showMinLabel, showMaxLabel
+            )) {
+                    return;
+            }
+
+            var itemLabelModel = labelModel;
+            if (categoryData && categoryData[tickVal] && categoryData[tickVal].textStyle) {
+                itemLabelModel = new Model(
+                    categoryData[tickVal].textStyle, labelModel, axisModel.ecModel
+                );
+            }
+
+            var textColor = itemLabelModel.getTextColor()
+                || axisModel.get('axisLine.lineStyle.color');
+
+            var tickCoord = axis.dataToCoord(tickVal);
+            var pos = [
+                tickCoord,
+                opt.labelOffset + opt.labelDirection * labelMargin
+            ];
+            var labelStr = axis.scale.getLabel(tickVal);
+
+            var textEl = new graphic.Text({
+                // Id for animation
+                anid: 'label_' + tickVal,
+                position: pos,
+                rotation: labelLayout.rotation,
+                silent: silent,
+                z2: 10
+            });
+
+            graphic.setTextStyle(textEl.style, itemLabelModel, {
+                text: labels[index],
+                textAlign: itemLabelModel.getShallow('align', true)
+                    || labelLayout.textAlign,
+                textVerticalAlign: itemLabelModel.getShallow('verticalAlign', true)
+                    || itemLabelModel.getShallow('baseline', true)
+                    || labelLayout.textVerticalAlign,
+                textFill: typeof textColor === 'function'
+                    ? textColor(
+                        // (1) In category axis with data zoom, tick is not the original
+                        // index of axis.data. So tick should not be exposed to user
+                        // in category axis.
+                        // (2) Compatible with previous version, which always returns labelStr.
+                        // But in interval scale labelStr is like '223,445', which maked
+                        // user repalce ','. So we modify it to return original val but remain
+                        // it as 'string' to avoid error in replacing.
+                        axis.type === 'category' ? labelStr : axis.type === 'value' ? tickVal + '' : tickVal,
+                        index
+                    )
+                    : textColor
+            });
+
+            // Pack data for mouse event
+            if (triggerEvent) {
+                textEl.eventData = makeAxisEventDataBase(axisModel);
+                textEl.eventData.targetType = 'axisLabel';
+                textEl.eventData.value = labelStr;
+            }
+
+            // FIXME
+            axisBuilder._dumbGroup.add(textEl);
+            textEl.updateTransform();
+
+            labelEls.push(textEl);
+            axisBuilder.group.add(textEl);
+
+            textEl.decomposeTransform();
+
+        });
+
+        return labelEls;
+    }
+
+
     module.exports = AxisBuilder;
 

package/lib/component/axis/CartesianAxisView.js

@@ -9,7 +9,7 @@
     var getInterval = AxisBuilder.getInterval;
 
     var axisBuilderAttrs = [
-        'axisLine', 'axisLabel', 'axisTick', 'axisName'
+        'axisLine', 'axisTickLabel', 'axisName'
     ];
     var selfBuilderAttrs = [
         'splitArea', 'splitLine'
@@ -97,13 +97,19 @@
             );
             var ticks = axis.scale.getTicks();
 
+            var showMinLabel = axisModel.get('axisLabel.showMinLabel');
+            var showMaxLabel = axisModel.get('axisLabel.showMaxLabel');
+
             var p1 = [];
             var p2 = [];
             // Simple optimization
             // Batching the lines if color are the same
             var lineStyle = lineStyleModel.getLineStyle();
             for (var i = 0; i < ticksCoords.length; i++) {
-                if (ifIgnoreOnTick(axis, i, lineInterval)) {
+                if (ifIgnoreOnTick(
+                    axis, i, lineInterval, ticksCoords.length,
+                    showMinLabel, showMaxLabel
+                )) {
                     continue;
                 }
 
@@ -174,8 +180,14 @@
             var areaStyle = areaStyleModel.getAreaStyle();
             areaColors = zrUtil.isArray(areaColors) ? areaColors : [areaColors];
 
+            var showMinLabel = axisModel.get('axisLabel.showMinLabel');
+            var showMaxLabel = axisModel.get('axisLabel.showMaxLabel');
+
             for (var i = 1; i < ticksCoords.length; i++) {
-                if (ifIgnoreOnTick(axis, i, areaInterval)) {
+                if (ifIgnoreOnTick(
+                    axis, i, areaInterval, ticksCoords.length,
+                    showMinLabel, showMaxLabel
+                )) {
                     continue;
                 }
 

package/lib/component/axis/ParallelAxisView.js

@@ -6,7 +6,7 @@
     var brushHelper = require('../helper/brushHelper');
     var graphic = require('../../util/graphic');
 
-    var elementList = ['axisLine', 'axisLabel', 'axisTick', 'axisName'];
+    var elementList = ['axisLine', 'axisTickLabel', 'axisName'];
 
     var AxisView = require('../../echarts').extendComponentView({
 

package/lib/component/axis/RadiusAxisView.js

@@ -6,7 +6,7 @@
     var AxisBuilder = require('./AxisBuilder');
 
     var axisBuilderAttrs = [
-        'axisLine', 'axisLabel', 'axisTick', 'axisName'
+        'axisLine', 'axisTickLabel', 'axisName'
     ];
     var selfBuilderAttrs = [
         'splitLine', 'splitArea'

package/lib/component/axis/SingleAxisView.js

@@ -8,7 +8,7 @@
     var ifIgnoreOnTick = AxisBuilder.ifIgnoreOnTick;
 
     var axisBuilderAttrs = [
-        'axisLine', 'axisLabel', 'axisTick', 'axisName'
+        'axisLine', 'axisTickLabel', 'axisName'
     ];
 
     var selfBuilderAttr = 'splitLine';
@@ -66,8 +66,14 @@
             var p1 = [];
             var p2 = [];
 
+            var showMinLabel = axisModel.get('axisLabel.showMinLabel');
+            var showMaxLabel = axisModel.get('axisLabel.showMaxLabel');
+
             for (var i = 0; i < ticksCoords.length; ++i) {
-                if (ifIgnoreOnTick(axis, i, lineInterval)) {
+                if (ifIgnoreOnTick(
+                    axis, i, lineInterval, ticksCoords.length,
+                    showMinLabel, showMaxLabel
+                )) {
                     continue;
                 }
                 var tickCoord = axis.toGlobalCoord(ticksCoords[i]);

package/lib/component/helper/RoamController.js

@@ -113,7 +113,9 @@
 
 
     function mousedown(e) {
-        if (e.target && e.target.draggable) {
+        if (eventTool.notLeftMouse(e)
+            || (e.target && e.target.draggable)
+        ) {
             return;
         }
 
@@ -130,15 +132,12 @@
     }
 
     function mousemove(e) {
-        if (!checkKeyBinding(this, 'moveOnMouseMove', e) || !this._dragging) {
-            return;
-        }
-
-        if (e.gestureEvent === 'pinch') {
-            return;
-        }
-
-        if (interactionMutex.isTaken(this._zr, 'globalPan')) {
+        if (eventTool.notLeftMouse(e)
+            || !checkKeyBinding(this, 'moveOnMouseMove', e)
+            || !this._dragging
+            || e.gestureEvent === 'pinch'
+            || interactionMutex.isTaken(this._zr, 'globalPan')
+        ) {
             return;
         }
 
@@ -160,7 +159,9 @@
     }
 
     function mouseup(e) {
-        this._dragging = false;
+        if (!eventTool.notLeftMouse(e)) {
+            this._dragging = false;
+        }
     }
 
     function mousewheel(e) {

package/lib/component/marker/MarkAreaView.js

@@ -221,7 +221,7 @@
                     )
                 );
 
-                polygon.hoverStyle = itemModel.getModel('itemStyle.normal').getItemStyle();
+                polygon.hoverStyle = itemModel.getModel('itemStyle.emphasis').getItemStyle();
 
                 graphic.setLabelStyle(
                     polygon.style, polygon.hoverStyle, labelModel, labelHoverModel,

package/lib/component/radar/RadarView.js

@@ -5,7 +5,7 @@
     var graphic = require('../../util/graphic');
 
     var axisBuilderAttrs = [
-        'axisLine', 'axisLabel', 'axisTick', 'axisName'
+        'axisLine', 'axisTickLabel', 'axisName'
     ];
 
     module.exports = require('../../echarts').extendComponentView({

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

@@ -3,6 +3,7 @@
 
     var featureManager = require('../featureManager');
     var zrUtil = require('zrender/lib/core/util');
+    var lang = require('../../../lang').toolbox.brush;
 
     function Brush(model, ecModel, api) {
         this.model = model;
@@ -33,14 +34,8 @@
             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;