Skip to content

Commit 31c3521

Browse files
committed
release 3.6.2
1 parent 8c7637d commit 31c3521

File tree

10 files changed

+1642
-1047
lines changed

10 files changed

+1642
-1047
lines changed

dist/echarts.common.js

Lines changed: 411 additions & 266 deletions
Large diffs are not rendered by default.

dist/echarts.common.min.js

Lines changed: 14 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/echarts.js

Lines changed: 1005 additions & 704 deletions
Large diffs are not rendered by default.

dist/echarts.min.js

Lines changed: 22 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/echarts.simple.js

Lines changed: 141 additions & 27 deletions
Large diffs are not rendered by default.

dist/echarts.simple.min.js

Lines changed: 10 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/extension/bmap.js

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
9696
var __WEBPACK_AMD_DEFINE_RESULT__;!(__WEBPACK_AMD_DEFINE_RESULT__ = function (require) {
9797

9898
var echarts = __webpack_require__(1);
99+
var zrUtil = echarts.util;
99100

100101
function BMapCoordSys(bmap, api) {
101102
this._bmap = bmap;
@@ -160,6 +161,38 @@ return /******/ (function(modules) { // webpackBootstrap
160161
return echarts.matrix.create();
161162
};
162163

164+
BMapCoordSys.prototype.prepareCustoms = function (data) {
165+
var rect = this.getViewRect();
166+
return {
167+
coordSys: {
168+
// The name exposed to user is always 'cartesian2d' but not 'grid'.
169+
type: 'bmap',
170+
x: rect.x,
171+
y: rect.y,
172+
width: rect.width,
173+
height: rect.height
174+
},
175+
api: {
176+
coord: zrUtil.bind(this.dataToPoint, this),
177+
size: zrUtil.bind(dataToCoordSize, this)
178+
}
179+
};
180+
};
181+
182+
function dataToCoordSize(dataSize, dataItem) {
183+
dataItem = dataItem || [0, 0];
184+
return zrUtil.map([0, 1], function (dimIdx) {
185+
var val = dataItem[dimIdx];
186+
var halfSize = dataSize[dimIdx] / 2;
187+
var p1 = [];
188+
var p2 = [];
189+
p1[dimIdx] = val - halfSize;
190+
p2[dimIdx] = val + halfSize;
191+
p1[1 - dimIdx] = p2[1 - dimIdx] = dataItem[1 - dimIdx];
192+
return Math.abs(this.dataToPoint(p1)[dimIdx] - this.dataToPoint(p2)[dimIdx]);
193+
}, this);
194+
}
195+
163196
var Overlay;
164197

165198
// For deciding which dimensions to use when creating list data

dist/extension/bmap.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "echarts",
3-
"version": "3.6.1",
3+
"version": "3.6.2",
44
"description": "A powerful charting and visualization library for browser",
55
"keywords": [
66
"visualization",
@@ -35,7 +35,7 @@
3535
"prepublish": "node build/amd2common.js"
3636
},
3737
"dependencies": {
38-
"zrender": "^3.5.1"
38+
"zrender": "^3.5.2"
3939
},
4040
"devDependencies": {
4141
"coordtransform": "^2.0.2",
@@ -45,6 +45,6 @@
4545
"fs-extra": "^0.26.5",
4646
"glob": "^7.0.0",
4747
"webpack": "^1.12.13",
48-
"zrender": "^3.5.1"
48+
"zrender": "^3.5.2"
4949
}
5050
}

src/echarts.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1516,9 +1516,9 @@ define(function (require) {
15161516
/**
15171517
* @type {number}
15181518
*/
1519-
version: '3.6.1',
1519+
version: '3.6.2',
15201520
dependencies: {
1521-
zrender: '3.5.1'
1521+
zrender: '3.5.2'
15221522
}
15231523
};
15241524

0 commit comments

Comments
 (0)