echarts 4.6.0 → 4.7.0

package/lib/component/axis/SingleAxisView.js

@@ -28,6 +28,11 @@ var singleAxisHelper = require("../../coord/single/singleAxisHelper");
 
 var AxisView = require("./AxisView");
 
+var _axisSplitHelper = require("./axisSplitHelper");
+
+var rectCoordAxisBuildSplitArea = _axisSplitHelper.rectCoordAxisBuildSplitArea;
+var rectCoordAxisHandleRemove = _axisSplitHelper.rectCoordAxisHandleRemove;
+
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
@@ -47,24 +52,31 @@ var AxisView = require("./AxisView");
 * under the License.
 */
 var axisBuilderAttrs = ['axisLine', 'axisTickLabel', 'axisName'];
-var selfBuilderAttr = 'splitLine';
+var selfBuilderAttrs = ['splitArea', 'splitLine'];
 var SingleAxisView = AxisView.extend({
   type: 'singleAxis',
   axisPointerClass: 'SingleAxisPointer',
   render: function (axisModel, ecModel, api, payload) {
     var group = this.group;
     group.removeAll();
+    var oldAxisGroup = this._axisGroup;
+    this._axisGroup = new graphic.Group();
     var layout = singleAxisHelper.layout(axisModel);
     var axisBuilder = new AxisBuilder(axisModel, layout);
     zrUtil.each(axisBuilderAttrs, axisBuilder.add, axisBuilder);
+    group.add(this._axisGroup);
     group.add(axisBuilder.getGroup());
-
-    if (axisModel.get(selfBuilderAttr + '.show')) {
-      this['_' + selfBuilderAttr](axisModel);
-    }
-
+    zrUtil.each(selfBuilderAttrs, function (name) {
+      if (axisModel.get(name + '.show')) {
+        this['_' + name](axisModel);
+      }
+    }, this);
+    graphic.groupTransition(oldAxisGroup, this._axisGroup, axisModel);
     SingleAxisView.superCall(this, 'render', axisModel, ecModel, api, payload);
   },
+  remove: function () {
+    rectCoordAxisHandleRemove(this);
+  },
   _splitLine: function (axisModel) {
     var axis = axisModel.axis;
 
@@ -129,6 +141,9 @@ var SingleAxisView = AxisView.extend({
         silent: true
       }));
     }
+  },
+  _splitArea: function (axisModel) {
+    rectCoordAxisBuildSplitArea(this, this._axisGroup, axisModel, axisModel);
   }
 });
 var _default = SingleAxisView;

package/lib/component/axis/axisSplitHelper.js

@@ -0,0 +1,132 @@
+
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+var zrUtil = require("zrender/lib/core/util");
+
+var graphic = require("../../util/graphic");
+
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+function rectCoordAxisBuildSplitArea(axisView, axisGroup, axisModel, gridModel) {
+  var axis = axisModel.axis;
+
+  if (axis.scale.isBlank()) {
+    return;
+  }
+
+  var splitAreaModel = axisModel.getModel('splitArea');
+  var areaStyleModel = splitAreaModel.getModel('areaStyle');
+  var areaColors = areaStyleModel.get('color');
+  var gridRect = gridModel.coordinateSystem.getRect();
+  var ticksCoords = axis.getTicksCoords({
+    tickModel: splitAreaModel,
+    clamp: true
+  });
+
+  if (!ticksCoords.length) {
+    return;
+  } // For Making appropriate splitArea animation, the color and anid
+  // should be corresponding to previous one if possible.
+
+
+  var areaColorsLen = areaColors.length;
+  var lastSplitAreaColors = axisView.__splitAreaColors;
+  var newSplitAreaColors = zrUtil.createHashMap();
+  var colorIndex = 0;
+
+  if (lastSplitAreaColors) {
+    for (var i = 0; i < ticksCoords.length; i++) {
+      var cIndex = lastSplitAreaColors.get(ticksCoords[i].tickValue);
+
+      if (cIndex != null) {
+        colorIndex = (cIndex + (areaColorsLen - 1) * i) % areaColorsLen;
+        break;
+      }
+    }
+  }
+
+  var prev = axis.toGlobalCoord(ticksCoords[0].coord);
+  var areaStyle = areaStyleModel.getAreaStyle();
+  areaColors = zrUtil.isArray(areaColors) ? areaColors : [areaColors];
+
+  for (var i = 1; i < ticksCoords.length; i++) {
+    var tickCoord = axis.toGlobalCoord(ticksCoords[i].coord);
+    var x;
+    var y;
+    var width;
+    var height;
+
+    if (axis.isHorizontal()) {
+      x = prev;
+      y = gridRect.y;
+      width = tickCoord - x;
+      height = gridRect.height;
+      prev = x + width;
+    } else {
+      x = gridRect.x;
+      y = prev;
+      width = gridRect.width;
+      height = tickCoord - y;
+      prev = y + height;
+    }
+
+    var tickValue = ticksCoords[i - 1].tickValue;
+    tickValue != null && newSplitAreaColors.set(tickValue, colorIndex);
+    axisGroup.add(new graphic.Rect({
+      anid: tickValue != null ? 'area_' + tickValue : null,
+      shape: {
+        x: x,
+        y: y,
+        width: width,
+        height: height
+      },
+      style: zrUtil.defaults({
+        fill: areaColors[colorIndex]
+      }, areaStyle),
+      silent: true
+    }));
+    colorIndex = (colorIndex + 1) % areaColorsLen;
+  }
+
+  axisView.__splitAreaColors = newSplitAreaColors;
+}
+
+function rectCoordAxisHandleRemove(axisView) {
+  axisView.__splitAreaColors = null;
+}
+
+exports.rectCoordAxisBuildSplitArea = rectCoordAxisBuildSplitArea;
+exports.rectCoordAxisHandleRemove = rectCoordAxisHandleRemove;

package/lib/component/brush/BrushView.js

@@ -24,6 +24,10 @@ var zrUtil = require("zrender/lib/core/util");
 
 var BrushController = require("../helper/BrushController");
 
+var _visualEncoding = require("./visualEncoding");
+
+var layoutCovers = _visualEncoding.layoutCovers;
+
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
@@ -81,7 +85,13 @@ var _default = echarts.extendComponentView({
   /**
    * @override
    */
-  updateTransform: updateController,
+  updateTransform: function (brushModel, ecModel) {
+    // PENDING: `updateTransform` is a little tricky, whose layout need
+    // to be calculate mandatorily and other stages will not be performed.
+    // Take care the correctness of the logic. See #11754 .
+    layoutCovers(ecModel);
+    return updateController.apply(this, arguments);
+  },
 
   /**
    * @override

package/lib/component/brush/visualEncoding.js

@@ -65,14 +65,23 @@ echarts.registerLayout(PRIORITY_BRUSH, function (ecModel, api, payload) {
     payload && payload.type === 'takeGlobalCursor' && brushModel.setBrushOption(payload.key === 'brush' ? payload.brushOption : {
       brushType: false
     });
+  });
+  layoutCovers(ecModel);
+});
+
+function layoutCovers(ecModel) {
+  ecModel.eachComponent({
+    mainType: 'brush'
+  }, function (brushModel) {
     var brushTargetManager = brushModel.brushTargetManager = new BrushTargetManager(brushModel.option, ecModel);
     brushTargetManager.setInputRanges(brushModel.areas, ecModel);
   });
-});
+}
 /**
  * Register the visual encoding if this modules required.
  */
 
+
 echarts.registerVisual(PRIORITY_BRUSH, function (ecModel, api, payload) {
   var brushSelected = [];
   var throttleType;
@@ -314,4 +323,6 @@ var boundingRectBuilders = {
 
 function getBoundingRectFromMinMax(minMax) {
   return new BoundingRect(minMax[0][0], minMax[1][0], minMax[0][1] - minMax[0][0], minMax[1][1] - minMax[1][0]);
-}
+}
+
+exports.layoutCovers = layoutCovers;

package/lib/component/helper/MapDraw.js

@@ -206,14 +206,12 @@ MapDraw.prototype = {
 
     var regionsGroup = this._regionsGroup;
     var group = this.group;
-
-    if (geo._roamTransformable.transform) {
-      group.transform = geo._roamTransformable.transform.slice();
-      group.decomposeTransform();
-    }
-
-    var scale = geo._rawTransformable.scale;
-    var position = geo._rawTransformable.position;
+    var transformInfo = geo.getTransformInfo();
+    group.transform = transformInfo.roamTransform;
+    group.decomposeTransform();
+    group.dirty();
+    var scale = transformInfo.rawScale;
+    var position = transformInfo.rawPosition;
     regionsGroup.removeAll();
     var itemStyleAccessPath = ['itemStyle'];
     var hoverItemStyleAccessPath = ['emphasis', 'itemStyle'];

package/lib/component/legend/ScrollableLegendView.js

@@ -418,28 +418,28 @@ var ScrollableLegendView = LegendView.extend({
     }
   },
   _findTargetItemIndex: function (targetDataIndex) {
+    if (!this._showController) {
+      return 0;
+    }
+
     var index;
     var contentGroup = this.getContentGroup();
     var defaultIndex;
+    contentGroup.eachChild(function (child, idx) {
+      var legendDataIdx = child.__legendDataIndex; // FIXME
+      // If the given targetDataIndex (from model) is illegal,
+      // we use defualtIndex. But the index on the legend model and
+      // action payload is still illegal. That case will not be
+      // changed until some scenario requires.
+
+      if (defaultIndex == null && legendDataIdx != null) {
+        defaultIndex = idx;
+      }
 
-    if (this._showController) {
-      contentGroup.eachChild(function (child, idx) {
-        var legendDataIdx = child.__legendDataIndex; // FIXME
-        // If the given targetDataIndex (from model) is illegal,
-        // we use defualtIndex. But the index on the legend model and
-        // action payload is still illegal. That case will not be
-        // changed until some scenario requires.
-
-        if (defaultIndex == null && legendDataIdx != null) {
-          defaultIndex = idx;
-        }
-
-        if (legendDataIdx === targetDataIndex) {
-          index = idx;
-        }
-      });
-    }
-
+      if (legendDataIdx === targetDataIndex) {
+        index = idx;
+      }
+    });
     return index != null ? index : defaultIndex;
   }
 });

package/lib/component/marker/MarkLineModel.js

@@ -52,7 +52,8 @@ var _default = MarkerModel.extend({
     },
     label: {
       show: true,
-      position: 'end'
+      position: 'end',
+      distance: 5
     },
     lineStyle: {
       type: 'dashed'

package/lib/component/marker/markerHelper.js

@@ -85,7 +85,8 @@ function markerTypeCalculatorWithExtent(mlType, data, otherDataDim, targetDataDi
   var value = numCalculate(data, calcDataDim, mlType);
   var dataIndex = data.indicesOfNearest(calcDataDim, value)[0];
   coordArr[otherCoordIndex] = data.get(otherDataDim, dataIndex);
-  coordArr[targetCoordIndex] = data.get(targetDataDim, dataIndex); // Make it simple, do not visit all stacked value to count precision.
+  coordArr[targetCoordIndex] = data.get(calcDataDim, dataIndex);
+  var coordArrValue = data.get(targetDataDim, dataIndex); // Make it simple, do not visit all stacked value to count precision.
 
   var precision = numberUtil.getPrecision(data.get(targetDataDim, dataIndex));
   precision = Math.min(precision, 20);
@@ -94,7 +95,7 @@ function markerTypeCalculatorWithExtent(mlType, data, otherDataDim, targetDataDi
     coordArr[targetCoordIndex] = +coordArr[targetCoordIndex].toFixed(precision);
   }
 
-  return coordArr;
+  return [coordArr, coordArrValue];
 }
 
 var curry = zrUtil.curry; // TODO Specified percent
@@ -151,9 +152,11 @@ function dataTransform(seriesModel, item) {
     if (item.type && markerTypeCalculator[item.type] && axisInfo.baseAxis && axisInfo.valueAxis) {
       var otherCoordIndex = indexOf(dims, axisInfo.baseAxis.dim);
       var targetCoordIndex = indexOf(dims, axisInfo.valueAxis.dim);
-      item.coord = markerTypeCalculator[item.type](data, axisInfo.baseDataDim, axisInfo.valueDataDim, otherCoordIndex, targetCoordIndex); // Force to use the value of calculated value.
+      var coordInfo = markerTypeCalculator[item.type](data, axisInfo.baseDataDim, axisInfo.valueDataDim, otherCoordIndex, targetCoordIndex);
+      item.coord = coordInfo[0]; // Force to use the value of calculated value.
+      // let item use the value without stack.
 
-      item.value = item.coord[targetCoordIndex];
+      item.value = coordInfo[1];
     } else {
       // FIXME Only has one of xAxis and yAxis.
       var coord = [item.xAxis != null ? item.xAxis : item.radiusAxis, item.yAxis != null ? item.yAxis : item.angleAxis]; // Each coord support max, min, average

package/lib/component/tooltip/TooltipContent.js

@@ -24,6 +24,8 @@ var zrColor = require("zrender/lib/tool/color");
 
 var eventUtil = require("zrender/lib/core/event");
 
+var domUtil = require("zrender/lib/core/dom");
+
 var env = require("zrender/lib/core/env");
 
 var formatUtil = require("../../util/format");
@@ -124,24 +126,65 @@ function assembleCssText(tooltipModel) {
   }
 
   return cssText.join(';') + ';';
+} // If not able to make, do not modify the input `out`.
+
+
+function makeStyleCoord(out, zr, appendToBody, zrX, zrY) {
+  var zrPainter = zr && zr.painter;
+
+  if (appendToBody) {
+    var zrViewportRoot = zrPainter && zrPainter.getViewportRoot();
+
+    if (zrViewportRoot) {
+      // Some APPs might use scale on body, so we support CSS transform here.
+      domUtil.transformLocalCoord(out, zrViewportRoot, document.body, zrX, zrY);
+    }
+  } else {
+    out[0] = zrX;
+    out[1] = zrY; // xy should be based on canvas root. But tooltipContent is
+    // the sibling of canvas root. So padding of ec container
+    // should be considered here.
+
+    var viewportRootOffset = zrPainter && zrPainter.getViewportRootOffset();
+
+    if (viewportRootOffset) {
+      out[0] += viewportRootOffset.offsetLeft;
+      out[1] += viewportRootOffset.offsetTop;
+    }
+  }
 }
 /**
  * @alias module:echarts/component/tooltip/TooltipContent
+ * @param {HTMLElement} container
+ * @param {ExtensionAPI} api
+ * @param {Object} [opt]
+ * @param {boolean} [opt.appendToBody]
+ *        `false`: the DOM element will be inside the container. Default value.
+ *        `true`: the DOM element will be appended to HTML body, which avoid
+ *                some overflow clip but intrude outside of the container.
  * @constructor
  */
 
 
-function TooltipContent(container, api) {
+function TooltipContent(container, api, opt) {
   if (env.wxa) {
     return null;
   }
 
   var el = document.createElement('div');
-  var zr = this._zr = api.getZr();
+  el.domBelongToZr = true;
   this.el = el;
-  this._x = api.getWidth() / 2;
-  this._y = api.getHeight() / 2;
-  container.appendChild(el);
+  var zr = this._zr = api.getZr();
+  var appendToBody = this._appendToBody = opt && opt.appendToBody;
+  this._styleCoord = [0, 0];
+  makeStyleCoord(this._styleCoord, zr, appendToBody, api.getWidth() / 2, api.getHeight() / 2);
+
+  if (appendToBody) {
+    document.body.appendChild(el);
+  } else {
+    container.appendChild(el);
+  }
+
   this._container = container;
   this._show = false;
   /**
@@ -175,7 +218,8 @@ function TooltipContent(container, api) {
       // Try trigger zrender event to avoid mouse
       // in and out shape too frequently
       var handler = zr.handler;
-      eventUtil.normalizeEvent(container, e, true);
+      var zrViewportRoot = zr.painter.getViewportRoot();
+      eventUtil.normalizeEvent(zrViewportRoot, e, true);
       handler.dispatch('mousemove', e);
     }
   };
@@ -220,10 +264,11 @@ TooltipContent.prototype = {
   show: function (tooltipModel) {
     clearTimeout(this._hideTimeout);
     var el = this.el;
+    var styleCoord = this._styleCoord;
     el.style.cssText = gCssText + assembleCssText(tooltipModel) // Because of the reason described in:
     // http://stackoverflow.com/questions/21125587/css3-transition-not-working-in-chrome-anymore
     // we should set initial value to `left` and `top`.
-    + ';left:' + this._x + 'px;top:' + this._y + 'px;' + (tooltipModel.get('extraCssText') || '');
+    + ';left:' + styleCoord[0] + 'px;top:' + styleCoord[1] + 'px;' + (tooltipModel.get('extraCssText') || '');
     el.style.display = el.innerHTML ? 'block' : 'none'; // If mouse occsionally move over the tooltip, a mouseout event will be
     // triggered by canvas, and cuase some unexpectable result like dragging
     // stop, "unfocusAdjacency". Here `pointer-events: none` is used to solve
@@ -243,23 +288,12 @@ TooltipContent.prototype = {
     var el = this.el;
     return [el.clientWidth, el.clientHeight];
   },
-  moveTo: function (x, y) {
-    // xy should be based on canvas root. But tooltipContent is
-    // the sibling of canvas root. So padding of ec container
-    // should be considered here.
-    var zr = this._zr;
-    var viewportRootOffset;
-
-    if (zr && zr.painter && (viewportRootOffset = zr.painter.getViewportRootOffset())) {
-      x += viewportRootOffset.offsetLeft;
-      y += viewportRootOffset.offsetTop;
-    }
-
+  moveTo: function (zrX, zrY) {
+    var styleCoord = this._styleCoord;
+    makeStyleCoord(styleCoord, this._zr, this._appendToBody, zrX, zrY);
     var style = this.el.style;
-    style.left = x + 'px';
-    style.top = y + 'px';
-    this._x = x;
-    this._y = y;
+    style.left = styleCoord[0] + 'px';
+    style.top = styleCoord[1] + 'px';
   },
   hide: function () {
     this.el.style.display = 'none';
@@ -280,6 +314,9 @@ TooltipContent.prototype = {
   isShow: function () {
     return this._show;
   },
+  dispose: function () {
+    this.el.parentNode.removeChild(this.el);
+  },
   getOuterSize: function () {
     var width = this.el.clientWidth;
     var height = this.el.clientHeight; // Consider browser compatibility.

package/lib/component/tooltip/TooltipView.js

@@ -93,7 +93,9 @@ var _default = echarts.extendComponentView({
     var tooltipContent;
 
     if (this._renderMode === 'html') {
-      tooltipContent = new TooltipContent(api.getDom(), api);
+      tooltipContent = new TooltipContent(api.getDom(), api, {
+        appendToBody: tooltipModel.get('appendToBody', true)
+      });
       this._newLine = '<br/>';
     } else {
       tooltipContent = new TooltipRichContent(api);
@@ -228,7 +230,6 @@ var _default = echarts.extendComponentView({
         offsetX: payload.x,
         offsetY: payload.y,
         position: payload.position,
-        event: {},
         dataByCoordSys: payload.dataByCoordSys,
         tooltipOption: payload.tooltipOption
       }, dispatchAction);
@@ -246,8 +247,7 @@ var _default = echarts.extendComponentView({
           offsetX: cx,
           offsetY: cy,
           position: payload.position,
-          target: pointInfo.el,
-          event: {}
+          target: pointInfo.el
         }, dispatchAction);
       }
     } else if (payload.x != null && payload.y != null) {
@@ -263,8 +263,7 @@ var _default = echarts.extendComponentView({
         offsetX: payload.x,
         offsetY: payload.y,
         position: payload.position,
-        target: api.getZr().findHover(payload.x, payload.y).target,
-        event: {}
+        target: api.getZr().findHover(payload.x, payload.y).target
       }, dispatchAction);
     }
   },
@@ -658,7 +657,7 @@ var _default = echarts.extendComponentView({
       return;
     }
 
-    this._tooltipContent.hide();
+    this._tooltipContent.dispose();
 
     globalListener.unregister('itemTooltip', api);
   }

package/lib/coord/View.js

@@ -230,6 +230,15 @@ View.prototype = {
     matrix.invert(this.invTransform, this.transform);
     this.decomposeTransform();
   },
+  getTransformInfo: function () {
+    var roamTransform = this._roamTransformable.transform;
+    var rawTransformable = this._rawTransformable;
+    return {
+      roamTransform: roamTransform ? zrUtil.slice(roamTransform) : matrix.create(),
+      rawScale: zrUtil.slice(rawTransformable.scale),
+      rawPosition: zrUtil.slice(rawTransformable.position)
+    };
+  },
 
   /**
    * @return {module:zrender/core/BoundingRect}

package/lib/coord/radar/Radar.js

@@ -247,12 +247,12 @@ Radar.prototype.update = function (ecModel, api) {
 
       if (nicedSplitNumber > splitNumber) {
         interval = increaseInterval(interval);
-      } // PENDING
+      } // TODO
 
 
-      var center = Math.round((rawExtent[0] + rawExtent[1]) / 2 / interval) * interval;
-      var halfSplitNumber = Math.round(splitNumber / 2);
-      scale.setExtent(numberUtil.round(center - halfSplitNumber * interval), numberUtil.round(center + (splitNumber - halfSplitNumber) * interval));
+      var max = Math.ceil(rawExtent[1] / interval) * interval;
+      var min = numberUtil.round(max - interval * splitNumber);
+      scale.setExtent(min, max);
       scale.setInterval(interval);
     }
   });

package/lib/echarts.js

@@ -101,9 +101,9 @@ var each = zrUtil.each;
 var isFunction = zrUtil.isFunction;
 var isObject = zrUtil.isObject;
 var parseClassType = ComponentModel.parseClassType;
-var version = '4.6.0';
+var version = '4.7.0';
 var dependencies = {
-  zrender: '4.2.0'
+  zrender: '4.3.0'
 };
 var TEST_FRAME_REMAIN_TIME = 1;
 var PRIORITY_PROCESSOR_FILTER = 1000;