[release] release 1.9.1

plainheart · Feb 26, 2021 · b7722eb · b7722eb
1 parent 2a4b6c3
commit b7722eb
Show file tree

Hide file tree

Showing 13 changed files with 81 additions and 42 deletions.
diff --git a/dist/echarts-extension-amap.cjs.js b/dist/echarts-extension-amap.cjs.js
@@ -1,6 +1,6 @@
 /*!
  * echarts-extension-amap 
- * @version 1.9.0
+ * @version 1.9.1
  * @author plainheart
  * 
  * MIT License
@@ -127,11 +127,7 @@ AMapCoordSysProto.prepareCustoms = function () {
 
 AMapCoordSys.create = function (ecModel, api) {
   var amapCoordSys;
-  var root = api.getDom();
   ecModel.eachComponent('amap', function (amapModel) {
-    var painter = api.getZr().painter;
-    var viewportRoot = painter.getViewportRoot();
-
     if (typeof AMap === 'undefined') {
       throw new Error('AMap api is not loaded');
     }
@@ -144,7 +140,12 @@ AMapCoordSys.create = function (ecModel, api) {
     var echartsLayerInteractive = amapModel.get('echartsLayerInteractive');
 
     if (!amap) {
-      // Not support IE8
+      var root = api.getDom();
+      var painter = api.getZr().painter;
+      var viewportRoot = painter.getViewportRoot(); // PENDING not hidden?
+
+      viewportRoot.style.visibility = 'hidden'; // Not support IE8
+
       var amapRoot = root.querySelector('.ec-extension-amap');
 
       if (amapRoot) {
@@ -170,8 +171,13 @@ AMapCoordSys.create = function (ecModel, api) {
         delete options[key];
       });
       amap = new AMap.Map(amapRoot, options);
-      amapModel.setAMap(amap);
-      amapRoot.querySelector('.amap-maps').appendChild(viewportRoot);
+      amapModel.setAMap(amap); // use `complete` callback to avoid NPE when first load amap
+
+      amap.on('complete', function () {
+        amapRoot.querySelector('.amap-maps').appendChild(viewportRoot); // PENDING
+
+        viewportRoot.style.visibility = '';
+      });
       amapModel.setEChartsLayer(viewportRoot); // Override
 
       painter.getViewportRootOffset = function () {
@@ -182,7 +188,13 @@ AMapCoordSys.create = function (ecModel, api) {
       };
     }
 
-    amapModel.setEChartsLayerInteractive(echartsLayerInteractive);
+    var oldEChartsLayerInteractive = amapModel.__echartsLayerInteractive;
+
+    if (oldEChartsLayerInteractive !== echartsLayerInteractive) {
+      amapModel.setEChartsLayerInteractive(echartsLayerInteractive);
+      amapModel.__echartsLayerInteractive = echartsLayerInteractive;
+    }
+
     var center = amapModel.get('center');
     var zoom = amapModel.get('zoom');
 
@@ -256,6 +268,7 @@ var AMapModel = {
   },
   // FIXME: NOT SUPPORT <= IE 10
   setEChartsLayerInteractive: function setEChartsLayerInteractive(interactive) {
+    this.option.echartsLayerInteractive = !!interactive;
     this.__echartsLayer.style.pointerEvents = interactive ? 'auto' : 'none';
   },
   setCenterAndZoom: function setCenterAndZoom(center, zoom) {
@@ -824,7 +837,7 @@ var AMapView = {
 var AMapView$1 = isV5 ? echarts$1.ComponentView.extend(AMapView) : AMapView;
 
 var name = "echarts-extension-amap";
-var version = "1.9.0";
+var version = "1.9.1";
 
 /**
  * AMap component extension

diff --git a/dist/echarts-extension-amap.esm.js b/dist/echarts-extension-amap.esm.js
@@ -1,6 +1,6 @@
 /*!
  * echarts-extension-amap 
- * @version 1.9.0
+ * @version 1.9.1
  * @author plainheart
  * 
  * MIT License
@@ -124,11 +124,7 @@ AMapCoordSysProto.prepareCustoms = function () {
 
 AMapCoordSys.create = function (ecModel, api) {
   var amapCoordSys;
-  var root = api.getDom();
   ecModel.eachComponent('amap', function (amapModel) {
-    var painter = api.getZr().painter;
-    var viewportRoot = painter.getViewportRoot();
-
     if (typeof AMap === 'undefined') {
       throw new Error('AMap api is not loaded');
     }
@@ -141,7 +137,12 @@ AMapCoordSys.create = function (ecModel, api) {
     var echartsLayerInteractive = amapModel.get('echartsLayerInteractive');
 
     if (!amap) {
-      // Not support IE8
+      var root = api.getDom();
+      var painter = api.getZr().painter;
+      var viewportRoot = painter.getViewportRoot(); // PENDING not hidden?
+
+      viewportRoot.style.visibility = 'hidden'; // Not support IE8
+
       var amapRoot = root.querySelector('.ec-extension-amap');
 
       if (amapRoot) {
@@ -167,8 +168,13 @@ AMapCoordSys.create = function (ecModel, api) {
         delete options[key];
       });
       amap = new AMap.Map(amapRoot, options);
-      amapModel.setAMap(amap);
-      amapRoot.querySelector('.amap-maps').appendChild(viewportRoot);
+      amapModel.setAMap(amap); // use `complete` callback to avoid NPE when first load amap
+
+      amap.on('complete', function () {
+        amapRoot.querySelector('.amap-maps').appendChild(viewportRoot); // PENDING
+
+        viewportRoot.style.visibility = '';
+      });
       amapModel.setEChartsLayer(viewportRoot); // Override
 
       painter.getViewportRootOffset = function () {
@@ -179,7 +185,13 @@ AMapCoordSys.create = function (ecModel, api) {
       };
     }
 
-    amapModel.setEChartsLayerInteractive(echartsLayerInteractive);
+    var oldEChartsLayerInteractive = amapModel.__echartsLayerInteractive;
+
+    if (oldEChartsLayerInteractive !== echartsLayerInteractive) {
+      amapModel.setEChartsLayerInteractive(echartsLayerInteractive);
+      amapModel.__echartsLayerInteractive = echartsLayerInteractive;
+    }
+
     var center = amapModel.get('center');
     var zoom = amapModel.get('zoom');
 
@@ -253,6 +265,7 @@ var AMapModel = {
   },
   // FIXME: NOT SUPPORT <= IE 10
   setEChartsLayerInteractive: function setEChartsLayerInteractive(interactive) {
+    this.option.echartsLayerInteractive = !!interactive;
     this.__echartsLayer.style.pointerEvents = interactive ? 'auto' : 'none';
   },
   setCenterAndZoom: function setCenterAndZoom(center, zoom) {
@@ -821,7 +834,7 @@ var AMapView = {
 var AMapView$1 = isV5 ? ComponentView.extend(AMapView) : AMapView;
 
 var name = "echarts-extension-amap";
-var version = "1.9.0";
+var version = "1.9.1";
 
 /**
  * AMap component extension

diff --git a/dist/echarts-extension-amap.js b/dist/echarts-extension-amap.js
diff --git a/dist/echarts-extension-amap.js.map b/dist/echarts-extension-amap.js.map
diff --git a/dist/echarts-extension-amap.min.js b/dist/echarts-extension-amap.min.js
diff --git a/dist/echarts-extension-amap.min.js.map b/dist/echarts-extension-amap.min.js.map
diff --git a/examples/heatmap.html b/examples/heatmap.html
@@ -31,7 +31,7 @@
   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/echarts@5/dist/echarts.min.js"></script>
   <!-- echarts amap extension -->
   <!-- <script type="text/javascript" src="../dist/echarts-extension-amap.min.js"></script> -->
-  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].0/dist/echarts-extension-amap.min.js"></script>
+  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].1/dist/echarts-extension-amap.min.js"></script>
   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
   <style type="text/css">
     * {

diff --git a/examples/heatmap_zh_CN.html b/examples/heatmap_zh_CN.html
@@ -31,7 +31,7 @@
   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/echarts@5/dist/echarts.min.js"></script>
   <!-- 引入ECharts高德地图扩展 -->
   <!-- <script type="text/javascript" src="../dist/echarts-extension-amap.min.js"></script> -->
-  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].0/dist/echarts-extension-amap.min.js"></script>
+  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].1/dist/echarts-extension-amap.min.js"></script>
   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
   <style type="text/css">
     * {

diff --git a/examples/lines.html b/examples/lines.html
@@ -31,7 +31,7 @@
   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/echarts@5/dist/echarts.min.js"></script>
   <!-- echarts amap extension -->
   <!-- <script type="text/javascript" src="../dist/echarts-extension-amap.min.js"></script> -->
-  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].0/dist/echarts-extension-amap.min.js"></script>
+  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].1/dist/echarts-extension-amap.min.js"></script>
   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
   <style type="text/css">
     * {

diff --git a/examples/lines_zh_CN.html b/examples/lines_zh_CN.html
@@ -31,7 +31,7 @@
   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/echarts@5/dist/echarts.min.js"></script>
   <!-- 引入ECharts高德地图扩展 -->
   <!-- <script type="text/javascript" src="../dist/echarts-extension-amap.min.js"></script> -->
-  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].0/dist/echarts-extension-amap.min.js"></script>
+  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].1/dist/echarts-extension-amap.min.js"></script>
   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
   <style type="text/css">
     * {

diff --git a/examples/scatter.html b/examples/scatter.html
@@ -31,7 +31,7 @@
   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/echarts@5/dist/echarts.min.js"></script>
   <!-- echarts amap extension -->
   <!-- <script type="text/javascript" src="../dist/echarts-extension-amap.min.js"></script> -->
-  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].0/dist/echarts-extension-amap.min.js"></script>
+  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].1/dist/echarts-extension-amap.min.js"></script>
   <style type="text/css">
     * {
       margin: 0;

diff --git a/examples/scatter_zh_CN.html b/examples/scatter_zh_CN.html
@@ -31,7 +31,7 @@
   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/echarts@5/dist/echarts.min.js"></script>
   <!-- 引入ECharts高德地图扩展 -->
   <!-- <script type="text/javascript" src="../dist/echarts-extension-amap.min.js"></script> -->
-  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].0/dist/echarts-extension-amap.min.js"></script>
+  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].1/dist/echarts-extension-amap.min.js"></script>
   <style type="text/css">
     * {
       margin: 0;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "echarts-extension-amap",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "An AMap(https://lbs.amap.com) extension for Apache ECharts (https://github.com/apache/echarts)",
   "main": "dist/echarts-extension-amap.min.js",
   "module": "dist/echarts-extension-amap.esm.js",