Skip to content

Commit

Permalink
Merge pull request #12574 from apache/release-dev
Browse files Browse the repository at this point in the history
Release 4.8.0
  • Loading branch information
100pah authored May 6, 2020
2 parents 043ff9e + a74ce97 commit 3b61add
Show file tree
Hide file tree
Showing 21 changed files with 2,662 additions and 1,026 deletions.
520 changes: 370 additions & 150 deletions dist/echarts-en.common.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/echarts-en.common.min.js

Large diffs are not rendered by default.

737 changes: 508 additions & 229 deletions dist/echarts-en.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/echarts-en.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/echarts-en.min.js

Large diffs are not rendered by default.

435 changes: 312 additions & 123 deletions dist/echarts-en.simple.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/echarts-en.simple.min.js

Large diffs are not rendered by default.

494 changes: 344 additions & 150 deletions dist/echarts.common.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/echarts.common.min.js

Large diffs are not rendered by default.

711 changes: 482 additions & 229 deletions dist/echarts.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/echarts.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/echarts.min.js

Large diffs are not rendered by default.

409 changes: 286 additions & 123 deletions dist/echarts.simple.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/echarts.simple.min.js

Large diffs are not rendered by default.

338 changes: 336 additions & 2 deletions dist/extension/bmap.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/extension/bmap.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/extension/bmap.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions extension/bmap/BMapView.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down
Loading

0 comments on commit 3b61add

Please sign in to comment.