Merge branch 'master' of https://github.com/apache/incubator-echarts

.eslintrc.yaml

@@ -14,7 +14,6 @@ rules:
         -
             allow:
                 - "warn"
-                - "log"
                 - "error"
     no-constant-condition: 0
     comma-dangle: 2

src/component/tooltip/TooltipRichContent.js

@@ -155,7 +155,9 @@ TooltipRichContent.prototype = {
     },
 
     hide: function () {
-        this.el.hide();
+        if (this.el) {
+            this.el.hide();
+        }
         this._show = false;
     },
 
@@ -178,7 +180,11 @@ TooltipRichContent.prototype = {
     },
 
     getOuterSize: function () {
-        return this.getSize();
+        const size = this.getSize();
+        return {
+            width: size[0],
+            height: size[1]
+        };
     }
 };