Merge pull request apache#12317 from apache/release

Release of 4.7.0 -> master

Author: 100pah

dist/echarts-en.common.js

@@ -1,6 +1,6 @@
 {
   "name": "echarts",
-  "version": "4.6.0",
+  "version": "4.7.0",
   "description": "A powerful charting and visualization library for browser",
   "license": "Apache-2.0",
   "keywords": [
@@ -27,7 +27,7 @@
     "lint:dist": "echo 'It might take a while. Please wait ...' && ./node_modules/.bin/jshint --config .jshintrc-dist dist/echarts.js"
   },
   "dependencies": {
-    "zrender": "4.2.0"
+    "zrender": "4.3.0"
   },
   "devDependencies": {
     "@babel/core": "7.3.4",

dist/echarts-en.common.min.js

@@ -145,6 +145,7 @@ export default echarts.extendChartView({
                     bgEls[dataIndex] = bgEl;
                 }
 
+                // If dataZoom in filteMode: 'empty', the baseValue can be set as NaN in "axisProxy".
                 if (!data.hasValue(dataIndex)) {
                     return;
                 }

dist/echarts-en.js

@@ -242,7 +242,8 @@ var GraphSeries = echarts.extendSeriesModel({
         edgeSymbol: ['none', 'none'],
         edgeSymbolSize: 10,
         edgeLabel: {
-            position: 'middle'
+            position: 'middle',
+            distance: 5
         },
 
         draggable: false,

dist/echarts-en.js.map

@@ -779,9 +779,10 @@ function renderNode(
             // If invisible, do not set visual, otherwise the element will
             // change immediately before animation. We think it is OK to
             // remain its origin color when moving out of the view window.
-            processInvisible(content);
+            processInvisible(bg);
         }
         else {
+            bg.invisible = false;
             var visualBorderColor = thisNode.getVisual('borderColor', true);
             var emphasisBorderColor = itemStyleEmphasisModel.get('borderColor');
             var normalStyle = getItemStyleNormal(itemStyleNormalModel);
@@ -832,6 +833,7 @@ function renderNode(
             processInvisible(content);
         }
         else {
+            content.invisible = false;
             var visualColor = thisNode.getVisual('color', true);
             var normalStyle = getItemStyleNormal(itemStyleNormalModel);
             normalStyle.fill = visualColor;

dist/echarts-en.min.js

@@ -195,6 +195,7 @@ Radar.prototype.update = function (ecModel, api) {
         var fixedMax = axisModel.getMax();
         var interval = scale.getInterval();
 
+
         if (fixedMin != null && fixedMax != null) {
             // User set min, max, divide to get new interval
             scale.setExtent(+fixedMin, +fixedMax);
@@ -230,13 +231,10 @@ Radar.prototype.update = function (ecModel, api) {
             if (nicedSplitNumber > splitNumber) {
                 interval = increaseInterval(interval);
             }
-            // PENDING
-            var center = Math.ceil((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)
-            );
+            // TODO
+            var max = Math.ceil(rawExtent[1] / interval) * interval;
+            var min = numberUtil.round(max - interval * splitNumber);
+            scale.setExtent(min, max);
             scale.setInterval(interval);
         }
     });

dist/echarts-en.simple.js

@@ -51,10 +51,10 @@ var isFunction = zrUtil.isFunction;
 var isObject = zrUtil.isObject;
 var parseClassType = ComponentModel.parseClassType;
 
-export var version = '4.6.0';
+export var version = '4.7.0';
 
 export var dependencies = {
-    zrender: '4.2.0'
+    zrender: '4.3.0'
 };
 
 var TEST_FRAME_REMAIN_TIME = 1;

dist/echarts-en.simple.min.js

@@ -452,7 +452,10 @@ export function layout(seriesType, ecModel) {
                 if (Math.abs(width) < barMinHeight) {
                     width = (width < 0 ? -1 : 1) * barMinHeight;
                 }
-                stacked && (lastStackCoords[stackId][baseValue][sign] += width);
+                // Ignore stack from NaN value
+                if (!isNaN(width)) {
+                    stacked && (lastStackCoords[stackId][baseValue][sign] += width);
+                }
             }
             else {
                 var coord = cartesian.dataToPoint([baseValue, value]);
@@ -465,7 +468,10 @@ export function layout(seriesType, ecModel) {
                     // Include zero to has a positive bar
                     height = (height <= 0 ? -1 : 1) * barMinHeight;
                 }
-                stacked && (lastStackCoords[stackId][baseValue][sign] += height);
+                // Ignore stack from NaN value
+                if (!isNaN(height)) {
+                    stacked && (lastStackCoords[stackId][baseValue][sign] += height);
+                }
             }
 
             data.setItemLayout(idx, {

dist/echarts.common.js

@@ -82,7 +82,7 @@
 
                 for (var i = 0; i < 10; i++) {
                     xAxisData.push('类目' + i);
-                    data1.push((Math.random() * 5).toFixed(2));
+                    data1.push(i === 0 ? '-' : (Math.random() * 5).toFixed(2));
                     data2.push(-Math.random().toFixed(2));
                     data3.push((Math.random() + 0.5).toFixed(2));
                     data4.push((Math.random() + 0.3).toFixed(2));

dist/echarts.common.min.js

@@ -0,0 +1,113 @@
+<!DOCTYPE html>
+<!--
+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.
+-->
+
+
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
+        <script src="lib/jquery.min.js"></script>
+        <script src="lib/facePrint.js"></script>
+        <script src="lib/testHelper.js"></script>
+        <!-- <script src="ut/lib/canteen.js"></script> -->
+        <link rel="stylesheet" href="lib/reset.css" />
+    </head>
+    <body>
+        <style>
+        </style>
+
+
+
+        <div id="main0"></div>
+
+
+        <script>
+        require(['echarts'], function (echarts) {
+            var option;
+
+            option = {
+                title: {
+                    text: '基础雷达图'
+                },
+                tooltip: {},
+                legend: {
+                    data: ['预算分配（Allocated Budget）', '实际开销（Actual Spending）']
+                },
+                radar: {
+                    // shape: 'circle',
+                    name: {
+                        textStyle: {
+                            color: '#fff',
+                            backgroundColor: '#999',
+                            borderRadius: 3,
+                            padding: [3, 5]
+                    }
+                    },
+                    indicator: [
+                    { name: '销售（sales）'},
+                    { name: '管理（Administration）'},
+                    { name: '信息技术（Information Techology）'},
+                    { name: '客服（Customer Support）'},
+                    { name: '研发（Development）'},
+                    { name: '市场（Marketing）'}
+                    ],
+                            axisLabel: {
+                                show: true,
+                                textStyle: {
+                                    color: 'red'
+                                }
+                            },
+                },
+                series: [{
+                    name: '预算 vs 开销（Budget vs spending）',
+                    type: 'radar',
+                    // areaStyle: {normal: {}},
+                    data : [
+                        {
+                            value : [4300, 10000, 28000, 35000, 50000, 19000],
+                            name : '预算分配（Allocated Budget）'
+                        },
+                        {
+                            value : [5000, 14000, 28000, 31000, 42000, 21000],
+                            name : '实际开销（Actual Spending）'
+                        }
+                    ]
+                }]
+            };
+
+            var chart = testHelper.create(echarts, 'main0', {
+                title: [
+                    'Should not exceed axis',
+                    'From case https://github.com/apache/incubator-echarts/pull/11841'
+                ],
+                option: option
+                // height: 300,
+                // buttons: [{text: 'btn-txt', onclick: function () {}}],
+                // recordCanvas: true,
+            });
+        });
+        </script>
+
+
+    </body>
+</html>
+

dist/echarts.js

@@ -31,12 +31,15 @@ module.exports = class Timeline {
         this._currentOpIndex = 0;
 
         this._client;
+
+        this._isLastOpMousewheel = false;
     }
 
     _reset() {
         this._currentOpIndex = 0;
         this._current = Date.now();
         this._elapsedTime = 0;
+        this._isLastOpMousewheel = false;
     }
 
 
@@ -102,6 +105,7 @@ module.exports = class Timeline {
         }
 
         let page = this._page;
+        let takenScreenshot = false;
         switch (op.type) {
             case 'mousedown':
                 await page.mouse.move(op.x, op.y);
@@ -130,7 +134,7 @@ module.exports = class Timeline {
 
                     element.dispatchEvent(event);
                 }, op.x, op.y, op.deltaX || 0, op.deltaY);
-
+                this._isLastOpMousewheel = true;
                 // console.log('mousewheel', op.x, op.y, op.deltaX, op.deltaY);
                 // await this._client.send('Input.dispatchMouseEvent', {
                 //     type: 'mouseWheel',
@@ -139,9 +143,10 @@ module.exports = class Timeline {
                 //     deltaX: op.deltaX,
                 //     deltaY: op.deltaY
                 // });
-                // break;
+                break;
             case 'screenshot':
                 await takeScreenshot();
+                takenScreenshot = true;
                 break;
             case 'valuechange':
                 if (op.target === 'select') {
@@ -159,7 +164,16 @@ module.exports = class Timeline {
             // TODO Configuration time
             await waitTime(delay / playbackSpeed);
             await takeScreenshot();
+            takenScreenshot = true;
             this._currentOpIndex++;
         }
+
+        if (this._isLastOpMousewheel && op.type !== 'mousewheel') {
+            // Only take screenshot after mousewheel finished
+            if (!takenScreenshot) {
+                takeScreenshot();
+            }
+            this._isLastOpMousewheel = false;
+        }
     }
 };

dist/echarts.js.map

@@ -1,4 +1,24 @@
 
+/*
+* 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.
+*/
+
+
 const utHelper = require('./utHelper');
 
 // Setup expectes