Skip to content

Commit 17da804

Browse files
pissangpissang
committed
Dump 3.2.1
1 parent 26175ac commit 17da804

File tree

10 files changed

+60
-62
lines changed

10 files changed

+60
-62
lines changed

‎dist/echarts.common.js

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1234,7 +1234,7 @@ return /******/ (function(modules) { // webpackBootstrap
12341234
/**
12351235
* @type {number}
12361236
*/
1237-
version: '3.2.0',
1237+
version: '3.2.1',
12381238
dependencies: {
12391239
zrender: '3.1.1'
12401240
}
@@ -22946,11 +22946,10 @@ return /******/ (function(modules) { // webpackBootstrap
2294622946
]);
2294722947
}
2294822948

22949+
symbolPath.setStyle(itemStyle);
2294922950
// PENDING setColor before setStyle
2295022951
symbolPath.setColor(color);
2295122952

22952-
symbolPath.setStyle(itemStyle);
22953-
2295422953
var opacity = data.getItemVisual(idx, 'opacity');
2295522954
if (opacity != null) {
2295622955
elStyle.opacity = opacity;
@@ -23299,7 +23298,7 @@ return /******/ (function(modules) { // webpackBootstrap
2329923298
}
2330023299
},
2330123300

23302-
buildPath: function (ctx, shape) {
23301+
buildPath: function (ctx, shape, inBundle) {
2330323302
var symbolType = shape.symbolType;
2330423303
var proxySymbol = symbolBuildProxies[symbolType];
2330523304
if (shape.symbolType !== 'none') {
@@ -23311,7 +23310,7 @@ return /******/ (function(modules) { // webpackBootstrap
2331123310
symbolShapeMakers[symbolType](
2331223311
shape.x, shape.y, shape.width, shape.height, proxySymbol.shape
2331323312
);
23314-
proxySymbol.buildPath(ctx, proxySymbol.shape);
23313+
proxySymbol.buildPath(ctx, proxySymbol.shape, inBundle);
2331523314
}
2331623315
}
2331723316
});
@@ -27446,11 +27445,7 @@ return /******/ (function(modules) { // webpackBootstrap
2744627445
// },
2744727446
itemStyle: {
2744827447
normal: {
27449-
// color: '各异',
27450-
// 柱条边线
27451-
borderColor: '#fff',
27452-
// 柱条边线线宽，单位px，默认为1
27453-
borderWidth: 0
27448+
// color: '各异'
2745427449
},
2745527450
emphasis: {}
2745627451
}
@@ -29170,6 +29165,7 @@ return /******/ (function(modules) { // webpackBootstrap
2917029165
var symbolUtil = __webpack_require__(105);
2917129166

2917229167
var LargeSymbolPath = graphic.extendShape({
29168+
2917329169
shape: {
2917429170
points: null,
2917529171
sizes: null
@@ -34668,7 +34664,8 @@ return /******/ (function(modules) { // webpackBootstrap
3466834664
var seriesModels = [];
3466934665

3467034666
this.ecModel.eachSeries(function (seriesModel) {
34671-
if (this._axisIndex === seriesModel.get(this._dimName + 'AxisIndex')) {
34667+
// Legacy problem: some one wrote xAxisIndex as [0] following the wrong way in example.
34668+
if (this._axisIndex === +seriesModel.get(this._dimName + 'AxisIndex')) {
3467234669
seriesModels.push(seriesModel);
3467334670
}
3467434671
}, this);

‎dist/echarts.common.min.js

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

‎dist/echarts.js

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,7 +1260,7 @@ return /******/ (function(modules) { // webpackBootstrap
12601260
/**
12611261
* @type {number}
12621262
*/
1263-
version: '3.2.0',
1263+
version: '3.2.1',
12641264
dependencies: {
12651265
zrender: '3.1.1'
12661266
}
@@ -22972,11 +22972,10 @@ return /******/ (function(modules) { // webpackBootstrap
2297222972
]);
2297322973
}
2297422974

22975+
symbolPath.setStyle(itemStyle);
2297522976
// PENDING setColor before setStyle
2297622977
symbolPath.setColor(color);
2297722978

22978-
symbolPath.setStyle(itemStyle);
22979-
2298022979
var opacity = data.getItemVisual(idx, 'opacity');
2298122980
if (opacity != null) {
2298222981
elStyle.opacity = opacity;
@@ -23325,7 +23324,7 @@ return /******/ (function(modules) { // webpackBootstrap
2332523324
}
2332623325
},
2332723326

23328-
buildPath: function (ctx, shape) {
23327+
buildPath: function (ctx, shape, inBundle) {
2332923328
var symbolType = shape.symbolType;
2333023329
var proxySymbol = symbolBuildProxies[symbolType];
2333123330
if (shape.symbolType !== 'none') {
@@ -23337,7 +23336,7 @@ return /******/ (function(modules) { // webpackBootstrap
2333723336
symbolShapeMakers[symbolType](
2333823337
shape.x, shape.y, shape.width, shape.height, proxySymbol.shape
2333923338
);
23340-
proxySymbol.buildPath(ctx, proxySymbol.shape);
23339+
proxySymbol.buildPath(ctx, proxySymbol.shape, inBundle);
2334123340
}
2334223341
}
2334323342
});
@@ -27472,11 +27471,7 @@ return /******/ (function(modules) { // webpackBootstrap
2747227471
// },
2747327472
itemStyle: {
2747427473
normal: {
27475-
// color: '各异',
27476-
// 柱条边线
27477-
borderColor: '#fff',
27478-
// 柱条边线线宽，单位px，默认为1
27479-
borderWidth: 0
27474+
// color: '各异'
2748027475
},
2748127476
emphasis: {}
2748227477
}
@@ -29196,6 +29191,7 @@ return /******/ (function(modules) { // webpackBootstrap
2919629191
var symbolUtil = __webpack_require__(105);
2919729192

2919829193
var LargeSymbolPath = graphic.extendShape({
29194+
2919929195
shape: {
2920029196
points: null,
2920129197
sizes: null
@@ -32879,8 +32875,16 @@ return /******/ (function(modules) { // webpackBootstrap
3287932875

3288032876
}
3288132877
},
32882-
color: [], // Array. Specify color list of each level.
32883-
// level[0].color would be global color list.
32878+
color: [], // + treemapSeries.color should not be modified. Please only modified
32879+
// level[n].color (if necessary).
32880+
// + Specify color list of each level. level[0].color would be global
32881+
// color list if not specified. (see method `setDefault`).
32882+
// + But set as a empty array to forbid fetch color from global palette
32883+
// when using nodeModel.get('color'), otherwise nodes on deep level
32884+
// will always has color palette set and are not able to inherit color
32885+
// from parent node.
32886+
// + TreemapSeries.color can not be set as 'none', otherwise effect
32887+
// legend color fetching (see seriesColor.js).
3288432888
colorAlpha: null, // Array. Specify color alpha range of each level, like [0.2, 0.8]
3288532889
colorSaturation: null, // Array. Specify color saturation of each level, like [0.2, 0.5]
3288632890
colorMappingBy: 'index', // 'value' or 'index' or 'id'.
@@ -52685,7 +52689,8 @@ return /******/ (function(modules) { // webpackBootstrap
5268552689
var seriesModels = [];
5268652690

5268752691
this.ecModel.eachSeries(function (seriesModel) {
52688-
if (this._axisIndex === seriesModel.get(this._dimName + 'AxisIndex')) {
52692+
// Legacy problem: some one wrote xAxisIndex as [0] following the wrong way in example.
52693+
if (this._axisIndex === +seriesModel.get(this._dimName + 'AxisIndex')) {
5268952694
seriesModels.push(seriesModel);
5269052695
}
5269152696
}, this);

‎dist/echarts.min.js

Lines changed: 11 additions & 11 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: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,7 +1221,7 @@ return /******/ (function(modules) { // webpackBootstrap
12211221
/**
12221222
* @type {number}
12231223
*/
1224-
version: '3.2.0',
1224+
version: '3.2.1',
12251225
dependencies: {
12261226
zrender: '3.1.1'
12271227
}
@@ -22933,11 +22933,10 @@ return /******/ (function(modules) { // webpackBootstrap
2293322933
]);
2293422934
}
2293522935

22936+
symbolPath.setStyle(itemStyle);
2293622937
// PENDING setColor before setStyle
2293722938
symbolPath.setColor(color);
2293822939

22939-
symbolPath.setStyle(itemStyle);
22940-
2294122940
var opacity = data.getItemVisual(idx, 'opacity');
2294222941
if (opacity != null) {
2294322942
elStyle.opacity = opacity;
@@ -23286,7 +23285,7 @@ return /******/ (function(modules) { // webpackBootstrap
2328623285
}
2328723286
},
2328823287

23289-
buildPath: function (ctx, shape) {
23288+
buildPath: function (ctx, shape, inBundle) {
2329023289
var symbolType = shape.symbolType;
2329123290
var proxySymbol = symbolBuildProxies[symbolType];
2329223291
if (shape.symbolType !== 'none') {
@@ -23298,7 +23297,7 @@ return /******/ (function(modules) { // webpackBootstrap
2329823297
symbolShapeMakers[symbolType](
2329923298
shape.x, shape.y, shape.width, shape.height, proxySymbol.shape
2330023299
);
23301-
proxySymbol.buildPath(ctx, proxySymbol.shape);
23300+
proxySymbol.buildPath(ctx, proxySymbol.shape, inBundle);
2330223301
}
2330323302
}
2330423303
});
@@ -27433,11 +27432,7 @@ return /******/ (function(modules) { // webpackBootstrap
2743327432
// },
2743427433
itemStyle: {
2743527434
normal: {
27436-
// color: '各异',
27437-
// 柱条边线
27438-
borderColor: '#fff',
27439-
// 柱条边线线宽，单位px，默认为1
27440-
borderWidth: 0
27435+
// color: '各异'
2744127436
},
2744227437
emphasis: {}
2744327438
}

‎dist/echarts.simple.min.js

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

‎extension/bmap/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## 百度地图扩展
22

3-
ECharts 百度地图扩展，可以在百度地图上展现 [点图](http://echarts.baidu.com/option.html#series-scatter)，[线图](http://echarts.baidu.com/option.html#series-line) [热力图](http://echarts.baidu.com/option.html#series-heatmap) 等可视化。
3+
ECharts 百度地图扩展，可以在百度地图上展现 [点图](http://echarts.baidu.com/option.html#series-scatter)，[线图](http://echarts.baidu.com/option.html#series-line)，[热力图](http://echarts.baidu.com/option.html#series-heatmap) 等可视化。
44

55

66
### 示例

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "echarts",
3-
"version": "3.2.0",
3+
"version": "3.2.1",
44
"description": "A powerful charting and visualization library for browser",
55
"keywords": [
66
"visualization",

‎src/chart/helper/LargeSymbolDraw.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ define(function (require) {
66
var symbolUtil = require('../../util/symbol');
77

88
var LargeSymbolPath = graphic.extendShape({
9+
910
shape: {
1011
points: null,
1112
sizes: null

‎src/echarts.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1151,7 +1151,7 @@ define(function (require) {
11511151
/**
11521152
* @type {number}
11531153
*/
1154-
version: '3.2.0',
1154+
version: '3.2.1',
11551155
dependencies: {
11561156
zrender: '3.1.1'
11571157
}

0 commit comments

Comments
 (0)