Merge pull request #12574 from apache/release-dev

Release 4.8.0
apache · May 6, 2020 · 3b61add · 3b61add
2 parents 043ff9e + a74ce97
commit 3b61add
Show file tree

Hide file tree

Showing 21 changed files with 2,662 additions and 1,026 deletions.
diff --git a/dist/echarts-en.common.js b/dist/echarts-en.common.js
diff --git a/dist/echarts-en.common.min.js b/dist/echarts-en.common.min.js
diff --git a/dist/echarts-en.js b/dist/echarts-en.js
diff --git a/dist/echarts-en.js.map b/dist/echarts-en.js.map
diff --git a/dist/echarts-en.min.js b/dist/echarts-en.min.js
diff --git a/dist/echarts-en.simple.js b/dist/echarts-en.simple.js
diff --git a/dist/echarts-en.simple.min.js b/dist/echarts-en.simple.min.js
diff --git a/dist/echarts.common.js b/dist/echarts.common.js
diff --git a/dist/echarts.common.min.js b/dist/echarts.common.min.js
diff --git a/dist/echarts.js b/dist/echarts.js
diff --git a/dist/echarts.js.map b/dist/echarts.js.map
diff --git a/dist/echarts.min.js b/dist/echarts.min.js
diff --git a/dist/echarts.simple.js b/dist/echarts.simple.js
diff --git a/dist/echarts.simple.min.js b/dist/echarts.simple.min.js
diff --git a/dist/extension/bmap.js b/dist/extension/bmap.js
diff --git a/dist/extension/bmap.js.map b/dist/extension/bmap.js.map
diff --git a/dist/extension/bmap.min.js b/dist/extension/bmap.min.js
diff --git a/extension/bmap/BMapView.js b/extension/bmap/BMapView.js
@@ -20,6 +20,10 @@
 
 var echarts = require("echarts");
 
+var _util = require("zrender/lib/core/util");
+
+var clone = _util.clone;
+
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
@@ -110,7 +114,7 @@ var _default = echarts.extendComponentView({
     if (JSON.stringify(originalStyle) !== mapStyleStr) {
       // FIXME May have blank tile when dragging if setMapStyle
       if (Object.keys(newMapStyle).length) {
-        bmap.setMapStyle(newMapStyle);
+        bmap.setMapStyle(clone(newMapStyle));
       }
 
       bMapModel.__mapStyle = JSON.parse(mapStyleStr);
@@ -126,7 +130,7 @@ var _default = echarts.extendComponentView({
     if (JSON.stringify(originalStyle2) !== mapStyleStr2) {
       // FIXME May have blank tile when dragging if setMapStyle
       if (Object.keys(newMapStyle2).length) {
-        bmap.setMapStyleV2(newMapStyle2);
+        bmap.setMapStyleV2(clone(newMapStyle2));
       }
 
       bMapModel.__mapStyle2 = JSON.parse(mapStyleStr2);