Skip to content

I
incubator-echarts

x649585723 / incubator-echarts
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
I
incubator-echarts

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 99350dd4 编写于 作者: P pah100
浏览文件
操作

release 3.5.4

上级 c5251760
展开全部 隐藏空白更改
内联 并排
Showing with 252 addition and 104 deletion
dist/echarts.common.js
浏览文件 @ 99350dd4
......@@ -1620,9 +1620,9 @@ return /******/ (function(modules) { // webpackBootstrap
/**
* @type {number}
*/
version: '3.5.3',
version: '3.5.4',
dependencies: {
zrender: '3.4.3'
zrender: '3.4.4'
}
};
......@@ -3433,6 +3433,50 @@ return /******/ (function(modules) { // webpackBootstrap
return obj[primitiveKey];
}
/**
* @constructor
*/
function HashMap(obj) {
obj && extend(this, obj);
}
// Add prefix to avoid conflict with Object.prototype.
var HASH_MAP_PREFIX = '_ec_';
var HASH_MAP_PREFIX_LENGTH = 4;
HashMap.prototype = {
constructor: HashMap,
// Do not provide `has` method to avoid defining what is `has`.
// (We usually treat `null` and `undefined` as the same, different
// from ES6 Map).
get: function (key) {
return this[HASH_MAP_PREFIX + key];
},
set: function (key, value) {
this[HASH_MAP_PREFIX + key] = value;
// Comparing with invocation chaining, `return value` is more commonly
// used in this case: `var someVal = map.set('a', genVal());`
return value;
},
// Although util.each can be performed on this hashMap directly, user
// should not use the exposed keys, who are prefixed.
each: function (cb, context) {
context !== void 0 && (cb = bind(cb, context));
for (var prefixedKey in this) {
this.hasOwnProperty(prefixedKey)
&& cb(this[prefixedKey], prefixedKey.slice(HASH_MAP_PREFIX_LENGTH));
}
},
// Do not use this method if performance sensitive.
removeKey: function (key) {
delete this[key];
}
};
function createHashMap() {
return new HashMap();
}
var util = {
inherits: inherits,
mixin: mixin,
......@@ -3463,6 +3507,7 @@ return /******/ (function(modules) { // webpackBootstrap
retrieve: retrieve,
assert: assert,
setAsPrimitive: setAsPrimitive,
createHashMap: createHashMap,
noop: function () {}
};
module.exports = util;
......@@ -4824,7 +4869,7 @@ return /******/ (function(modules) { // webpackBootstrap
break;
case 'insideTop':
x += width / 2;
y += distance;
y += distance + lineHeight;
textAlign = 'center';
break;
case 'insideBottom':
......@@ -4834,12 +4879,12 @@ return /******/ (function(modules) { // webpackBootstrap
break;
case 'insideTopLeft':
x += distance;
y += distance;
y += distance + lineHeight;
textAlign = 'left';
break;
case 'insideTopRight':
x += width - distance;
y += distance;
y += distance + lineHeight;
textAlign = 'right';
break;
case 'insideBottomLeft':
......@@ -12336,7 +12381,6 @@ return /******/ (function(modules) { // webpackBootstrap
var Path = __webpack_require__(46);
var PathProxy = __webpack_require__(50);
var transformPath = __webpack_require__(61);
var matrix = __webpack_require__(11);
// command chars
var cc = [
......@@ -12661,23 +12705,25 @@ return /******/ (function(modules) { // webpackBootstrap
// TODO Optimize double memory cost problem
function createPathOptions(str, opts) {
var pathProxy = createPathProxyFromString(str);
var transform;
opts = opts || {};
opts.buildPath = function (path) {
path.setData(pathProxy.data);
transform && transformPath(path, transform);
// Svg and vml renderer don't have context
var ctx = path.getContext();
if (ctx) {
path.rebuildPath(ctx);
if (path.setData) {
path.setData(pathProxy.data);
// Svg and vml renderer don't have context
var ctx = path.getContext();
if (ctx) {
path.rebuildPath(ctx);
}
}
else {
var ctx = path;
pathProxy.rebuildPath(ctx);
}
};
opts.applyTransform = function (m) {
if (!transform) {
transform = matrix.create();
}
matrix.mul(transform, m, transform);
transformPath(pathProxy, m);
this.dirty(true);
};
......@@ -16180,8 +16226,10 @@ return /******/ (function(modules) { // webpackBootstrap
var sy = mathSqrt(m[2] * m[2] + m[3] * m[3]);
var angle = mathAtan2(-m[1] / sy, m[0] / sx);
// cx
data[i] *= sx;
data[i++] += x;
// cy
data[i] *= sy;
data[i++] += y;
// Scale rx and ry
// FIXME Assume psi is 0 here
......@@ -17816,7 +17864,7 @@ return /******/ (function(modules) { // webpackBootstrap
/**
* @type {string}
*/
zrender.version = '3.4.3';
zrender.version = '3.4.4';
/**
* Initializing a zrender instance
......@@ -36311,7 +36359,9 @@ return /******/ (function(modules) { // webpackBootstrap
shadowColor: labelModel.get('shadowColor'),
shadowOffsetX: labelModel.get('shadowOffsetX'),
shadowOffsetY: labelModel.get('shadowOffsetY')
}
},
// Lable should be over axisPointer.
z2: 10
};
};
dist/echarts.common.min.js
浏览文件 @ 99350dd4
此差异已折叠。
dist/echarts.js
浏览文件 @ 99350dd4
......@@ -1649,9 +1649,9 @@ return /******/ (function(modules) { // webpackBootstrap
/**
* @type {number}
*/
version: '3.5.3',
version: '3.5.4',
dependencies: {
zrender: '3.4.3'
zrender: '3.4.4'
}
};
......@@ -3462,6 +3462,50 @@ return /******/ (function(modules) { // webpackBootstrap
return obj[primitiveKey];
}
/**
* @constructor
*/
function HashMap(obj) {
obj && extend(this, obj);
}
// Add prefix to avoid conflict with Object.prototype.
var HASH_MAP_PREFIX = '_ec_';
var HASH_MAP_PREFIX_LENGTH = 4;
HashMap.prototype = {
constructor: HashMap,
// Do not provide `has` method to avoid defining what is `has`.
// (We usually treat `null` and `undefined` as the same, different
// from ES6 Map).
get: function (key) {
return this[HASH_MAP_PREFIX + key];
},
set: function (key, value) {
this[HASH_MAP_PREFIX + key] = value;
// Comparing with invocation chaining, `return value` is more commonly
// used in this case: `var someVal = map.set('a', genVal());`
return value;
},
// Although util.each can be performed on this hashMap directly, user
// should not use the exposed keys, who are prefixed.
each: function (cb, context) {
context !== void 0 && (cb = bind(cb, context));
for (var prefixedKey in this) {
this.hasOwnProperty(prefixedKey)
&& cb(this[prefixedKey], prefixedKey.slice(HASH_MAP_PREFIX_LENGTH));
}
},
// Do not use this method if performance sensitive.
removeKey: function (key) {
delete this[key];
}
};
function createHashMap() {
return new HashMap();
}
var util = {
inherits: inherits,
mixin: mixin,
......@@ -3492,6 +3536,7 @@ return /******/ (function(modules) { // webpackBootstrap
retrieve: retrieve,
assert: assert,
setAsPrimitive: setAsPrimitive,
createHashMap: createHashMap,
noop: function () {}
};
module.exports = util;
......@@ -4853,7 +4898,7 @@ return /******/ (function(modules) { // webpackBootstrap
break;
case 'insideTop':
x += width / 2;
y += distance;
y += distance + lineHeight;
textAlign = 'center';
break;
case 'insideBottom':
......@@ -4863,12 +4908,12 @@ return /******/ (function(modules) { // webpackBootstrap
break;
case 'insideTopLeft':
x += distance;
y += distance;
y += distance + lineHeight;
textAlign = 'left';
break;
case 'insideTopRight':
x += width - distance;
y += distance;
y += distance + lineHeight;
textAlign = 'right';
break;
case 'insideBottomLeft':
......@@ -12365,7 +12410,6 @@ return /******/ (function(modules) { // webpackBootstrap
var Path = __webpack_require__(46);
var PathProxy = __webpack_require__(50);
var transformPath = __webpack_require__(61);
var matrix = __webpack_require__(11);
// command chars
var cc = [
......@@ -12690,23 +12734,25 @@ return /******/ (function(modules) { // webpackBootstrap
// TODO Optimize double memory cost problem
function createPathOptions(str, opts) {
var pathProxy = createPathProxyFromString(str);
var transform;
opts = opts || {};
opts.buildPath = function (path) {
path.setData(pathProxy.data);
transform && transformPath(path, transform);
// Svg and vml renderer don't have context
var ctx = path.getContext();
if (ctx) {
path.rebuildPath(ctx);
if (path.setData) {
path.setData(pathProxy.data);
// Svg and vml renderer don't have context
var ctx = path.getContext();
if (ctx) {
path.rebuildPath(ctx);
}
}
else {
var ctx = path;
pathProxy.rebuildPath(ctx);
}
};
opts.applyTransform = function (m) {
if (!transform) {
transform = matrix.create();
}
matrix.mul(transform, m, transform);
transformPath(pathProxy, m);
this.dirty(true);
};
......@@ -16209,8 +16255,10 @@ return /******/ (function(modules) { // webpackBootstrap
var sy = mathSqrt(m[2] * m[2] + m[3] * m[3]);
var angle = mathAtan2(-m[1] / sy, m[0] / sx);
// cx
data[i] *= sx;
data[i++] += x;
// cy
data[i] *= sy;
data[i++] += y;
// Scale rx and ry
// FIXME Assume psi is 0 here
......@@ -17845,7 +17893,7 @@ return /******/ (function(modules) { // webpackBootstrap
/**
* @type {string}
*/
zrender.version = '3.4.3';
zrender.version = '3.4.4';
/**
* Initializing a zrender instance
......@@ -53965,7 +54013,9 @@ return /******/ (function(modules) { // webpackBootstrap
shadowColor: labelModel.get('shadowColor'),
shadowOffsetX: labelModel.get('shadowOffsetX'),
shadowOffsetY: labelModel.get('shadowOffsetY')
}
},
// Lable should be over axisPointer.
z2: 10
};
};
dist/echarts.min.js
浏览文件 @ 99350dd4
此差异已折叠。
dist/echarts.simple.js
浏览文件 @ 99350dd4
......@@ -1605,9 +1605,9 @@ return /******/ (function(modules) { // webpackBootstrap
/**
* @type {number}
*/
version: '3.5.3',
version: '3.5.4',
dependencies: {
zrender: '3.4.3'
zrender: '3.4.4'
}
};
......@@ -3418,6 +3418,50 @@ return /******/ (function(modules) { // webpackBootstrap
return obj[primitiveKey];
}
/**
* @constructor
*/
function HashMap(obj) {
obj && extend(this, obj);
}
// Add prefix to avoid conflict with Object.prototype.
var HASH_MAP_PREFIX = '_ec_';
var HASH_MAP_PREFIX_LENGTH = 4;
HashMap.prototype = {
constructor: HashMap,
// Do not provide `has` method to avoid defining what is `has`.
// (We usually treat `null` and `undefined` as the same, different
// from ES6 Map).
get: function (key) {
return this[HASH_MAP_PREFIX + key];
},
set: function (key, value) {
this[HASH_MAP_PREFIX + key] = value;
// Comparing with invocation chaining, `return value` is more commonly
// used in this case: `var someVal = map.set('a', genVal());`
return value;
},
// Although util.each can be performed on this hashMap directly, user
// should not use the exposed keys, who are prefixed.
each: function (cb, context) {
context !== void 0 && (cb = bind(cb, context));
for (var prefixedKey in this) {
this.hasOwnProperty(prefixedKey)
&& cb(this[prefixedKey], prefixedKey.slice(HASH_MAP_PREFIX_LENGTH));
}
},
// Do not use this method if performance sensitive.
removeKey: function (key) {
delete this[key];
}
};
function createHashMap() {
return new HashMap();
}
var util = {
inherits: inherits,
mixin: mixin,
......@@ -3448,6 +3492,7 @@ return /******/ (function(modules) { // webpackBootstrap
retrieve: retrieve,
assert: assert,
setAsPrimitive: setAsPrimitive,
createHashMap: createHashMap,
noop: function () {}
};
module.exports = util;
......@@ -4809,7 +4854,7 @@ return /******/ (function(modules) { // webpackBootstrap
break;
case 'insideTop':
x += width / 2;
y += distance;
y += distance + lineHeight;
textAlign = 'center';
break;
case 'insideBottom':
......@@ -4819,12 +4864,12 @@ return /******/ (function(modules) { // webpackBootstrap
break;
case 'insideTopLeft':
x += distance;
y += distance;
y += distance + lineHeight;
textAlign = 'left';
break;
case 'insideTopRight':
x += width - distance;
y += distance;
y += distance + lineHeight;
textAlign = 'right';
break;
case 'insideBottomLeft':
......@@ -12321,7 +12366,6 @@ return /******/ (function(modules) { // webpackBootstrap
var Path = __webpack_require__(46);
var PathProxy = __webpack_require__(50);
var transformPath = __webpack_require__(61);
var matrix = __webpack_require__(11);
// command chars
var cc = [
......@@ -12646,23 +12690,25 @@ return /******/ (function(modules) { // webpackBootstrap
// TODO Optimize double memory cost problem
function createPathOptions(str, opts) {
var pathProxy = createPathProxyFromString(str);
var transform;
opts = opts || {};
opts.buildPath = function (path) {
path.setData(pathProxy.data);
transform && transformPath(path, transform);
// Svg and vml renderer don't have context
var ctx = path.getContext();
if (ctx) {
path.rebuildPath(ctx);
if (path.setData) {
path.setData(pathProxy.data);
// Svg and vml renderer don't have context
var ctx = path.getContext();
if (ctx) {
path.rebuildPath(ctx);
}
}
else {
var ctx = path;
pathProxy.rebuildPath(ctx);
}
};
opts.applyTransform = function (m) {
if (!transform) {
transform = matrix.create();
}
matrix.mul(transform, m, transform);
transformPath(pathProxy, m);
this.dirty(true);
};
......@@ -16165,8 +16211,10 @@ return /******/ (function(modules) { // webpackBootstrap
var sy = mathSqrt(m[2] * m[2] + m[3] * m[3]);
var angle = mathAtan2(-m[1] / sy, m[0] / sx);
// cx
data[i] *= sx;
data[i++] += x;
// cy
data[i] *= sy;
data[i++] += y;
// Scale rx and ry
// FIXME Assume psi is 0 here
......@@ -17801,7 +17849,7 @@ return /******/ (function(modules) { // webpackBootstrap
/**
* @type {string}
*/
zrender.version = '3.4.3';
zrender.version = '3.4.4';
/**
* Initializing a zrender instance
......
dist/echarts.simple.min.js
浏览文件 @ 99350dd4
因为 它太大了无法显示 source diff 。你可以改为 查看blob。
package.json
浏览文件 @ 99350dd4
{
"name": "echarts",
"version": "3.5.3",
"version": "3.5.4",
"description": "A powerful charting and visualization library for browser",
"keywords": [
"visualization",
......@@ -35,7 +35,7 @@
"prepublish": "node build/amd2common.js"
},
"dependencies": {
"zrender": "^3.4.3"
"zrender": "^3.4.4"
},
"devDependencies": {
"coordtransform": "^2.0.2",
......@@ -45,6 +45,6 @@
"fs-extra": "^0.26.5",
"glob": "^7.0.0",
"webpack": "^1.12.13",
"zrender": "^3.4.3"
"zrender": "^3.4.4"
}
}
src/echarts.js
浏览文件 @ 99350dd4
......@@ -1535,9 +1535,9 @@ define(function (require) {
/**
* @type {number}
*/
version: '3.5.3',
version: '3.5.4',
dependencies: {
zrender: '3.4.3'
zrender: '3.4.4'
}
};
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或