Skip to content

Commit 99350dd

Browse files
100pah100pah
committed
release 3.5.4
1 parent c525176 commit 99350dd

File tree

8 files changed

+252
-104
lines changed

8 files changed

+252
-104
lines changed

‎dist/echarts.common.js‎

Lines changed: 69 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1620,9 +1620,9 @@ return /******/ (function(modules) { // webpackBootstrap
16201620
/**
16211621
* @type {number}
16221622
*/
1623-
version: '3.5.3',
1623+
version: '3.5.4',
16241624
dependencies: {
1625-
zrender: '3.4.3'
1625+
zrender: '3.4.4'
16261626
}
16271627
};
16281628

@@ -3433,6 +3433,50 @@ return /******/ (function(modules) { // webpackBootstrap
34333433
return obj[primitiveKey];
34343434
}
34353435

3436+
/**
3437+
* @constructor
3438+
*/
3439+
function HashMap(obj) {
3440+
obj && extend(this, obj);
3441+
}
3442+
3443+
// Add prefix to avoid conflict with Object.prototype.
3444+
var HASH_MAP_PREFIX = '_ec_';
3445+
var HASH_MAP_PREFIX_LENGTH = 4;
3446+
3447+
HashMap.prototype = {
3448+
constructor: HashMap,
3449+
// Do not provide `has` method to avoid defining what is `has`.
3450+
// (We usually treat `null` and `undefined` as the same, different
3451+
// from ES6 Map).
3452+
get: function (key) {
3453+
return this[HASH_MAP_PREFIX + key];
3454+
},
3455+
set: function (key, value) {
3456+
this[HASH_MAP_PREFIX + key] = value;
3457+
// Comparing with invocation chaining, `return value` is more commonly
3458+
// used in this case: `var someVal = map.set('a', genVal());`
3459+
return value;
3460+
},
3461+
// Although util.each can be performed on this hashMap directly, user
3462+
// should not use the exposed keys, who are prefixed.
3463+
each: function (cb, context) {
3464+
context !== void 0 && (cb = bind(cb, context));
3465+
for (var prefixedKey in this) {
3466+
this.hasOwnProperty(prefixedKey)
3467+
&& cb(this[prefixedKey], prefixedKey.slice(HASH_MAP_PREFIX_LENGTH));
3468+
}
3469+
},
3470+
// Do not use this method if performance sensitive.
3471+
removeKey: function (key) {
3472+
delete this[key];
3473+
}
3474+
};
3475+
3476+
function createHashMap() {
3477+
return new HashMap();
3478+
}
3479+
34363480
var util = {
34373481
inherits: inherits,
34383482
mixin: mixin,
@@ -3463,6 +3507,7 @@ return /******/ (function(modules) { // webpackBootstrap
34633507
retrieve: retrieve,
34643508
assert: assert,
34653509
setAsPrimitive: setAsPrimitive,
3510+
createHashMap: createHashMap,
34663511
noop: function () {}
34673512
};
34683513
module.exports = util;
@@ -4824,7 +4869,7 @@ return /******/ (function(modules) { // webpackBootstrap
48244869
break;
48254870
case 'insideTop':
48264871
x += width / 2;
4827-
y += distance;
4872+
y += distance + lineHeight;
48284873
textAlign = 'center';
48294874
break;
48304875
case 'insideBottom':
@@ -4834,12 +4879,12 @@ return /******/ (function(modules) { // webpackBootstrap
48344879
break;
48354880
case 'insideTopLeft':
48364881
x += distance;
4837-
y += distance;
4882+
y += distance + lineHeight;
48384883
textAlign = 'left';
48394884
break;
48404885
case 'insideTopRight':
48414886
x += width - distance;
4842-
y += distance;
4887+
y += distance + lineHeight;
48434888
textAlign = 'right';
48444889
break;
48454890
case 'insideBottomLeft':
@@ -12336,7 +12381,6 @@ return /******/ (function(modules) { // webpackBootstrap
1233612381
var Path = __webpack_require__(46);
1233712382
var PathProxy = __webpack_require__(50);
1233812383
var transformPath = __webpack_require__(61);
12339-
var matrix = __webpack_require__(11);
1234012384

1234112385
// command chars
1234212386
var cc = [
@@ -12661,23 +12705,25 @@ return /******/ (function(modules) { // webpackBootstrap
1266112705
// TODO Optimize double memory cost problem
1266212706
function createPathOptions(str, opts) {
1266312707
var pathProxy = createPathProxyFromString(str);
12664-
var transform;
1266512708
opts = opts || {};
1266612709
opts.buildPath = function (path) {
12667-
path.setData(pathProxy.data);
12668-
transform && transformPath(path, transform);
12669-
// Svg and vml renderer don't have context
12670-
var ctx = path.getContext();
12671-
if (ctx) {
12672-
path.rebuildPath(ctx);
12710+
if (path.setData) {
12711+
path.setData(pathProxy.data);
12712+
// Svg and vml renderer don't have context
12713+
var ctx = path.getContext();
12714+
if (ctx) {
12715+
path.rebuildPath(ctx);
12716+
}
12717+
}
12718+
else {
12719+
var ctx = path;
12720+
pathProxy.rebuildPath(ctx);
1267312721
}
1267412722
};
1267512723

1267612724
opts.applyTransform = function (m) {
12677-
if (!transform) {
12678-
transform = matrix.create();
12679-
}
12680-
matrix.mul(transform, m, transform);
12725+
transformPath(pathProxy, m);
12726+
1268112727
this.dirty(true);
1268212728
};
1268312729

@@ -16180,8 +16226,10 @@ return /******/ (function(modules) { // webpackBootstrap
1618016226
var sy = mathSqrt(m[2] * m[2] + m[3] * m[3]);
1618116227
var angle = mathAtan2(-m[1] / sy, m[0] / sx);
1618216228
// cx
16229+
data[i] *= sx;
1618316230
data[i++] += x;
1618416231
// cy
16232+
data[i] *= sy;
1618516233
data[i++] += y;
1618616234
// Scale rx and ry
1618716235
// FIXME Assume psi is 0 here
@@ -17816,7 +17864,7 @@ return /******/ (function(modules) { // webpackBootstrap
1781617864
/**
1781717865
* @type {string}
1781817866
*/
17819-
zrender.version = '3.4.3';
17867+
zrender.version = '3.4.4';
1782017868

1782117869
/**
1782217870
* Initializing a zrender instance
@@ -36311,7 +36359,9 @@ return /******/ (function(modules) { // webpackBootstrap
3631136359
shadowColor: labelModel.get('shadowColor'),
3631236360
shadowOffsetX: labelModel.get('shadowOffsetX'),
3631336361
shadowOffsetY: labelModel.get('shadowOffsetY')
36314-
}
36362+
},
36363+
// Lable should be over axisPointer.
36364+
z2: 10
3631536365
};
3631636366
};
3631736367

‎dist/echarts.common.min.js‎

Lines changed: 13 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: 69 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1649,9 +1649,9 @@ return /******/ (function(modules) { // webpackBootstrap
16491649
/**
16501650
* @type {number}
16511651
*/
1652-
version: '3.5.3',
1652+
version: '3.5.4',
16531653
dependencies: {
1654-
zrender: '3.4.3'
1654+
zrender: '3.4.4'
16551655
}
16561656
};
16571657

@@ -3462,6 +3462,50 @@ return /******/ (function(modules) { // webpackBootstrap
34623462
return obj[primitiveKey];
34633463
}
34643464

3465+
/**
3466+
* @constructor
3467+
*/
3468+
function HashMap(obj) {
3469+
obj && extend(this, obj);
3470+
}
3471+
3472+
// Add prefix to avoid conflict with Object.prototype.
3473+
var HASH_MAP_PREFIX = '_ec_';
3474+
var HASH_MAP_PREFIX_LENGTH = 4;
3475+
3476+
HashMap.prototype = {
3477+
constructor: HashMap,
3478+
// Do not provide `has` method to avoid defining what is `has`.
3479+
// (We usually treat `null` and `undefined` as the same, different
3480+
// from ES6 Map).
3481+
get: function (key) {
3482+
return this[HASH_MAP_PREFIX + key];
3483+
},
3484+
set: function (key, value) {
3485+
this[HASH_MAP_PREFIX + key] = value;
3486+
// Comparing with invocation chaining, `return value` is more commonly
3487+
// used in this case: `var someVal = map.set('a', genVal());`
3488+
return value;
3489+
},
3490+
// Although util.each can be performed on this hashMap directly, user
3491+
// should not use the exposed keys, who are prefixed.
3492+
each: function (cb, context) {
3493+
context !== void 0 && (cb = bind(cb, context));
3494+
for (var prefixedKey in this) {
3495+
this.hasOwnProperty(prefixedKey)
3496+
&& cb(this[prefixedKey], prefixedKey.slice(HASH_MAP_PREFIX_LENGTH));
3497+
}
3498+
},
3499+
// Do not use this method if performance sensitive.
3500+
removeKey: function (key) {
3501+
delete this[key];
3502+
}
3503+
};
3504+
3505+
function createHashMap() {
3506+
return new HashMap();
3507+
}
3508+
34653509
var util = {
34663510
inherits: inherits,
34673511
mixin: mixin,
@@ -3492,6 +3536,7 @@ return /******/ (function(modules) { // webpackBootstrap
34923536
retrieve: retrieve,
34933537
assert: assert,
34943538
setAsPrimitive: setAsPrimitive,
3539+
createHashMap: createHashMap,
34953540
noop: function () {}
34963541
};
34973542
module.exports = util;
@@ -4853,7 +4898,7 @@ return /******/ (function(modules) { // webpackBootstrap
48534898
break;
48544899
case 'insideTop':
48554900
x += width / 2;
4856-
y += distance;
4901+
y += distance + lineHeight;
48574902
textAlign = 'center';
48584903
break;
48594904
case 'insideBottom':
@@ -4863,12 +4908,12 @@ return /******/ (function(modules) { // webpackBootstrap
48634908
break;
48644909
case 'insideTopLeft':
48654910
x += distance;
4866-
y += distance;
4911+
y += distance + lineHeight;
48674912
textAlign = 'left';
48684913
break;
48694914
case 'insideTopRight':
48704915
x += width - distance;
4871-
y += distance;
4916+
y += distance + lineHeight;
48724917
textAlign = 'right';
48734918
break;
48744919
case 'insideBottomLeft':
@@ -12365,7 +12410,6 @@ return /******/ (function(modules) { // webpackBootstrap
1236512410
var Path = __webpack_require__(46);
1236612411
var PathProxy = __webpack_require__(50);
1236712412
var transformPath = __webpack_require__(61);
12368-
var matrix = __webpack_require__(11);
1236912413

1237012414
// command chars
1237112415
var cc = [
@@ -12690,23 +12734,25 @@ return /******/ (function(modules) { // webpackBootstrap
1269012734
// TODO Optimize double memory cost problem
1269112735
function createPathOptions(str, opts) {
1269212736
var pathProxy = createPathProxyFromString(str);
12693-
var transform;
1269412737
opts = opts || {};
1269512738
opts.buildPath = function (path) {
12696-
path.setData(pathProxy.data);
12697-
transform && transformPath(path, transform);
12698-
// Svg and vml renderer don't have context
12699-
var ctx = path.getContext();
12700-
if (ctx) {
12701-
path.rebuildPath(ctx);
12739+
if (path.setData) {
12740+
path.setData(pathProxy.data);
12741+
// Svg and vml renderer don't have context
12742+
var ctx = path.getContext();
12743+
if (ctx) {
12744+
path.rebuildPath(ctx);
12745+
}
12746+
}
12747+
else {
12748+
var ctx = path;
12749+
pathProxy.rebuildPath(ctx);
1270212750
}
1270312751
};
1270412752

1270512753
opts.applyTransform = function (m) {
12706-
if (!transform) {
12707-
transform = matrix.create();
12708-
}
12709-
matrix.mul(transform, m, transform);
12754+
transformPath(pathProxy, m);
12755+
1271012756
this.dirty(true);
1271112757
};
1271212758

@@ -16209,8 +16255,10 @@ return /******/ (function(modules) { // webpackBootstrap
1620916255
var sy = mathSqrt(m[2] * m[2] + m[3] * m[3]);
1621016256
var angle = mathAtan2(-m[1] / sy, m[0] / sx);
1621116257
// cx
16258+
data[i] *= sx;
1621216259
data[i++] += x;
1621316260
// cy
16261+
data[i] *= sy;
1621416262
data[i++] += y;
1621516263
// Scale rx and ry
1621616264
// FIXME Assume psi is 0 here
@@ -17845,7 +17893,7 @@ return /******/ (function(modules) { // webpackBootstrap
1784517893
/**
1784617894
* @type {string}
1784717895
*/
17848-
zrender.version = '3.4.3';
17896+
zrender.version = '3.4.4';
1784917897

1785017898
/**
1785117899
* Initializing a zrender instance
@@ -53965,7 +54013,9 @@ return /******/ (function(modules) { // webpackBootstrap
5396554013
shadowColor: labelModel.get('shadowColor'),
5396654014
shadowOffsetX: labelModel.get('shadowOffsetX'),
5396754015
shadowOffsetY: labelModel.get('shadowOffsetY')
53968-
}
54016+
},
54017+
// Lable should be over axisPointer.
54018+
z2: 10
5396954019
};
5397054020
};
5397154021

0 commit comments

Comments
 (0)