Skip to content

Commit

Permalink
Dump 3.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@pissang
pissang committed Jul 4, 2016
1 parent 26175ac commit 17da804
Show file tree
Hide file tree
Showing 10 changed files with 60 additions and 62 deletions.
19 changes: 8 additions & 11 deletions dist/echarts.common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1234,7 +1234,7 @@ return /******/ (function(modules) { // webpackBootstrap
/**
* @type {number}
*/
version: '3.2.0',
version: '3.2.1',
dependencies: {
zrender: '3.1.1'
}
Expand Down Expand Up @@ -22946,11 +22946,10 @@ return /******/ (function(modules) { // webpackBootstrap
]);
}

symbolPath.setStyle(itemStyle);
// PENDING setColor before setStyle
symbolPath.setColor(color);

symbolPath.setStyle(itemStyle);

var opacity = data.getItemVisual(idx, 'opacity');
if (opacity != null) {
elStyle.opacity = opacity;
Expand Down Expand Up @@ -23299,7 +23298,7 @@ return /******/ (function(modules) { // webpackBootstrap
}
},

buildPath: function (ctx, shape) {
buildPath: function (ctx, shape, inBundle) {
var symbolType = shape.symbolType;
var proxySymbol = symbolBuildProxies[symbolType];
if (shape.symbolType !== 'none') {
Expand All @@ -23311,7 +23310,7 @@ return /******/ (function(modules) { // webpackBootstrap
symbolShapeMakers[symbolType](
shape.x, shape.y, shape.width, shape.height, proxySymbol.shape
);
proxySymbol.buildPath(ctx, proxySymbol.shape);
proxySymbol.buildPath(ctx, proxySymbol.shape, inBundle);
}
}
});
Expand Down Expand Up @@ -27446,11 +27445,7 @@ return /******/ (function(modules) { // webpackBootstrap
// },
itemStyle: {
normal: {
// color: '各异',
// 柱条边线
borderColor: '#fff',
// 柱条边线线宽，单位px，默认为1
borderWidth: 0
// color: '各异'
},
emphasis: {}
}
Expand Down Expand Up @@ -29170,6 +29165,7 @@ return /******/ (function(modules) { // webpackBootstrap
var symbolUtil = __webpack_require__(105);

var LargeSymbolPath = graphic.extendShape({

shape: {
points: null,
sizes: null
Expand Down Expand Up @@ -34668,7 +34664,8 @@ return /******/ (function(modules) { // webpackBootstrap
var seriesModels = [];

this.ecModel.eachSeries(function (seriesModel) {
if (this._axisIndex === seriesModel.get(this._dimName + 'AxisIndex')) {
// Legacy problem: some one wrote xAxisIndex as [0] following the wrong way in example.
if (this._axisIndex === +seriesModel.get(this._dimName + 'AxisIndex')) {
seriesModels.push(seriesModel);
}
}, this);
Expand Down
20 changes: 10 additions & 10 deletions dist/echarts.common.min.js
View file

Large diffs are not rendered by default.

31 changes: 18 additions & 13 deletions dist/echarts.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1260,7 +1260,7 @@ return /******/ (function(modules) { // webpackBootstrap
/**
* @type {number}
*/
version: '3.2.0',
version: '3.2.1',
dependencies: {
zrender: '3.1.1'
}
Expand Down Expand Up @@ -22972,11 +22972,10 @@ return /******/ (function(modules) { // webpackBootstrap
]);
}

symbolPath.setStyle(itemStyle);
// PENDING setColor before setStyle
symbolPath.setColor(color);

symbolPath.setStyle(itemStyle);

var opacity = data.getItemVisual(idx, 'opacity');
if (opacity != null) {
elStyle.opacity = opacity;
Expand Down Expand Up @@ -23325,7 +23324,7 @@ return /******/ (function(modules) { // webpackBootstrap
}
},

buildPath: function (ctx, shape) {
buildPath: function (ctx, shape, inBundle) {
var symbolType = shape.symbolType;
var proxySymbol = symbolBuildProxies[symbolType];
if (shape.symbolType !== 'none') {
Expand All @@ -23337,7 +23336,7 @@ return /******/ (function(modules) { // webpackBootstrap
symbolShapeMakers[symbolType](
shape.x, shape.y, shape.width, shape.height, proxySymbol.shape
);
proxySymbol.buildPath(ctx, proxySymbol.shape);
proxySymbol.buildPath(ctx, proxySymbol.shape, inBundle);
}
}
});
Expand Down Expand Up @@ -27472,11 +27471,7 @@ return /******/ (function(modules) { // webpackBootstrap
// },
itemStyle: {
normal: {
// color: '各异',
// 柱条边线
borderColor: '#fff',
// 柱条边线线宽，单位px，默认为1
borderWidth: 0
// color: '各异'
},
emphasis: {}
}
Expand Down Expand Up @@ -29196,6 +29191,7 @@ return /******/ (function(modules) { // webpackBootstrap
var symbolUtil = __webpack_require__(105);

var LargeSymbolPath = graphic.extendShape({

shape: {
points: null,
sizes: null
Expand Down Expand Up @@ -32879,8 +32875,16 @@ return /******/ (function(modules) { // webpackBootstrap

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

this.ecModel.eachSeries(function (seriesModel) {
if (this._axisIndex === seriesModel.get(this._dimName + 'AxisIndex')) {
// Legacy problem: some one wrote xAxisIndex as [0] following the wrong way in example.
if (this._axisIndex === +seriesModel.get(this._dimName + 'AxisIndex')) {
seriesModels.push(seriesModel);
}
}, this);
Expand Down
22 changes: 11 additions & 11 deletions dist/echarts.min.js
View file

Large diffs are not rendered by default.

15 changes: 5 additions & 10 deletions dist/echarts.simple.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1221,7 +1221,7 @@ return /******/ (function(modules) { // webpackBootstrap
/**
* @type {number}
*/
version: '3.2.0',
version: '3.2.1',
dependencies: {
zrender: '3.1.1'
}
Expand Down Expand Up @@ -22933,11 +22933,10 @@ return /******/ (function(modules) { // webpackBootstrap
]);
}

symbolPath.setStyle(itemStyle);
// PENDING setColor before setStyle
symbolPath.setColor(color);

symbolPath.setStyle(itemStyle);

var opacity = data.getItemVisual(idx, 'opacity');
if (opacity != null) {
elStyle.opacity = opacity;
Expand Down Expand Up @@ -23286,7 +23285,7 @@ return /******/ (function(modules) { // webpackBootstrap
}
},

buildPath: function (ctx, shape) {
buildPath: function (ctx, shape, inBundle) {
var symbolType = shape.symbolType;
var proxySymbol = symbolBuildProxies[symbolType];
if (shape.symbolType !== 'none') {
Expand All @@ -23298,7 +23297,7 @@ return /******/ (function(modules) { // webpackBootstrap
symbolShapeMakers[symbolType](
shape.x, shape.y, shape.width, shape.height, proxySymbol.shape
);
proxySymbol.buildPath(ctx, proxySymbol.shape);
proxySymbol.buildPath(ctx, proxySymbol.shape, inBundle);
}
}
});
Expand Down Expand Up @@ -27433,11 +27432,7 @@ return /******/ (function(modules) { // webpackBootstrap
// },
itemStyle: {
normal: {
// color: '各异',
// 柱条边线
borderColor: '#fff',
// 柱条边线线宽，单位px，默认为1
borderWidth: 0
// color: '各异'
},
emphasis: {}
}
Expand Down
8 changes: 4 additions & 4 deletions dist/echarts.simple.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion extension/bmap/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## 百度地图扩展

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) 等可视化。
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) 等可视化。


### 示例
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "echarts",
"version": "3.2.0",
"version": "3.2.1",
"description": "A powerful charting and visualization library for browser",
"keywords": [
"visualization",
Expand Down
1 change: 1 addition & 0 deletions src/chart/helper/LargeSymbolDraw.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ define(function (require) {
var symbolUtil = require('../../util/symbol');

var LargeSymbolPath = graphic.extendShape({

shape: {
points: null,
sizes: null
Expand Down
2 changes: 1 addition & 1 deletion src/echarts.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1151,7 +1151,7 @@ define(function (require) {
/**
* @type {number}
*/
version: '3.2.0',
version: '3.2.1',
dependencies: {
zrender: '3.1.1'
}
Expand Down

0 comments on commit 17da804

Please sign in to comment.