Merge branch 'release' into merge-release-to-next

# Conflicts: # src/chart/bar/BarView.js # src/chart/helper/EffectSymbol.js # src/chart/helper/LineDraw.js # src/chart/helper/Symbol.js # src/chart/helper/createClipPathFromCoordSys.ts # src/chart/line/LineView.ts # src/chart/map/MapSeries.ts # src/chart/pie/PieView.js # src/chart/sankey/sankeyLayout.ts # src/chart/sunburst/SunburstPiece.js # src/chart/sunburst/SunburstSeries.js # src/chart/sunburst/SunburstView.ts # src/chart/tree/TreeSeries.js # src/chart/treemap/TreemapSeries.ts # src/chart/treemap/TreemapView.ts # src/component/helper/MapDraw.js # src/component/title.ts # src/component/toolbox/ToolboxView.js # src/component/toolbox/feature/MagicType.js # src/component/toolbox/feature/SaveAsImage.js # src/component/tooltip/TooltipView.ts # src/component/visualMap/PiecewiseModel.ts # src/coord/axisHelper.ts # src/coord/calendar/Calendar.js # src/coord/geo/geoJSONLoader.ts # src/coord/geo/geoSourceManager.ts # src/coord/geo/parseGeoJson.ts # src/coord/radar/Radar.js # src/data/Tree.js # src/echarts.js # src/layout/barGrid.ts # src/loading/default.ts # src/model/Series.js # src/util/format.ts # src/util/graphic.js # src/visual/symbol.js
apache · May 26, 2020 · dd3d83c · dd3d83c
2 parents 9db5c3e + 3b61add
commit dd3d83c
Show file tree

Hide file tree

Showing 82 changed files with 4,706 additions and 1,295 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-src/bmap/BMapView.ts b/extension-src/bmap/BMapView.ts
@@ -19,6 +19,7 @@
 
 // @ts-nocheck
 import * as echarts from 'echarts';
+import { clone } from 'zrender/src/core/util';
 
 export default echarts.extendComponentView({
     type: 'bmap',
@@ -97,7 +98,7 @@ export 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);
         }
@@ -111,7 +112,7 @@ export 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);
         }