Skip to content

I
incubator-echarts

半栈学徒 / incubator-echarts
与 Fork 源项目一致

从无法访问的项目Fork

通知 5
Star 0
Fork 0
I
incubator-echarts

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

提交 b40e2923 编写于 作者: K kener
浏览文件
操作

1.4.1 release 

bug fixed release
上级 b663d2c9
展开全部 隐藏空白更改
内联 并排
Showing with 423 addition and 349 deletion
.npmignore
浏览文件 @ b40e2923
/build /build
/doc /doc
/index.html
npm-debug.log npm-debug.log
......
build/echarts-map.js
浏览文件 @ b40e2923
此差异已折叠。
build/echarts-original-map.js
浏览文件 @ b40e2923
...@@ -10530,7 +10530,7 @@ define( ...@@ -10530,7 +10530,7 @@ define(
var _idx = 0; //ZRender instance's id var _idx = 0; //ZRender instance's id
var _instances = {}; //ZRender实例map索引 var _instances = {}; //ZRender实例map索引
self.version = '1.1.1'; self.version = '1.1.2';
/** /**
* zrender初始化 * zrender初始化
...@@ -11437,18 +11437,18 @@ define( ...@@ -11437,18 +11437,18 @@ define(
var stl = root.currentStyle var stl = root.currentStyle
|| document.defaultView.getComputedStyle(root); || document.defaultView.getComputedStyle(root);
return (root.clientWidth || (stl.style.width.replace(/\D/g,''))) return ((root.clientWidth || parseInt(stl.width, 10))
- stl.paddingLeft.replace(/\D/g,'') // 请原谅我这比较粗暴 - parseInt(stl.paddingLeft, 10) // 请原谅我这比较粗暴
- stl.paddingRight.replace(/\D/g,''); - parseInt(stl.paddingRight, 10)).toFixed(0) - 0;
} }
function _getHeight(){ function _getHeight(){
var stl = root.currentStyle var stl = root.currentStyle
|| document.defaultView.getComputedStyle(root); || document.defaultView.getComputedStyle(root);
return (root.clientHeight || (stl.style.height.replace(/\D/g,''))) return ((root.clientHeight || parseInt(stl.height, 10))
- stl.paddingTop.replace(/\D/g,'') // 请原谅我这比较粗暴 - parseInt(stl.paddingTop, 10) // 请原谅我这比较粗暴
- stl.paddingBottom.replace(/\D/g,''); - parseInt(stl.paddingBottom, 10)).toFixed(0) - 0;
} }
function _init() { function _init() {
...@@ -14408,7 +14408,8 @@ define('echarts/component/base',['require','../util/ecData','../util/ecQuery','. ...@@ -14408,7 +14408,8 @@ define('echarts/component/base',['require','../util/ecData','../util/ecQuery','.
} }
// 标准化一些参数 // 标准化一些参数
data[i].tooltip = {trigger:'item'}; // tooltip.trigger指定为item data[i].tooltip = data[i].tooltip
|| {trigger:'item'}; // tooltip.trigger指定为item
data[i].name = typeof data[i].name != 'undefined' data[i].name = typeof data[i].name != 'undefined'
? data[i].name : ''; ? data[i].name : '';
data[i].value = typeof data[i].value != 'undefined' data[i].value = typeof data[i].value != 'undefined'
...@@ -18487,8 +18488,8 @@ define('echarts/component/dataZoom',['require','./base','../component','zrender/ ...@@ -18487,8 +18488,8 @@ define('echarts/component/dataZoom',['require','./base','../component','zrender/
} }
var pointList = []; var pointList = [];
var x = _location.width / maxLength; var x = _location.width / (maxLength - (maxLength > 1 ? 1 : 0));
var y = _location.height / maxLength; var y = _location.height / (maxLength - (maxLength > 1 ? 1 : 0));
for (var i = 0, l = maxLength; i < l; i++) { for (var i = 0, l = maxLength; i < l; i++) {
value = typeof data[i] != 'undefined' value = typeof data[i] != 'undefined'
? (typeof data[i].value != 'undefined' ? (typeof data[i].value != 'undefined'
...@@ -23308,7 +23309,7 @@ define('echarts/component/toolbox',['require','./base','zrender/config','zrender ...@@ -23308,7 +23309,7 @@ define('echarts/component/toolbox',['require','./base','zrender/config','zrender
lineWidth : 2, lineWidth : 2,
text : toolboxOption.showTitle text : toolboxOption.showTitle
? _featureTitle[_iconList[i]] ? _featureTitle[_iconList[i]]
: false, : undefined,
textFont : textFont, textFont : textFont,
textPosition : textPosition, textPosition : textPosition,
strokeColor : _featureColor[_iconList[i]] || color[i % color.length] strokeColor : _featureColor[_iconList[i]] || color[i % color.length]
...@@ -25689,9 +25690,9 @@ define('echarts/echarts',['require','zrender/tool/env','./config','zrender/tool/ ...@@ -25689,9 +25690,9 @@ define('echarts/echarts',['require','zrender/tool/env','./config','zrender/tool/
var _instances = {}; // ECharts实例map索引 var _instances = {}; // ECharts实例map索引
var DOM_ATTRIBUTE_KEY = '_echarts_instance_'; var DOM_ATTRIBUTE_KEY = '_echarts_instance_';
self.version = '1.4.0'; self.version = '1.4.1';
self.dependencies = { self.dependencies = {
zrender : '1.1.1' zrender : '1.1.2'
}; };
/** /**
* 入口方法 * 入口方法
...@@ -35828,6 +35829,14 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -35828,6 +35829,14 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
: data) : data)
: '-'; : '-';
curPLMap[seriesIndex] = curPLMap[seriesIndex] || []; curPLMap[seriesIndex] = curPLMap[seriesIndex] || [];
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (value == '-') { if (value == '-') {
// 空数据则把正在记录的curPLMap添加到finalPLMap中 // 空数据则把正在记录的curPLMap添加到finalPLMap中
if (curPLMap[seriesIndex].length > 0) { if (curPLMap[seriesIndex].length > 0) {
...@@ -35861,14 +35870,6 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -35861,14 +35870,6 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
[x, y, i, categoryAxis.getNameByIndex(i), x, baseYP] [x, y, i, categoryAxis.getNameByIndex(i), x, baseYP]
); );
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (xMarkMap[seriesIndex].min > value) { if (xMarkMap[seriesIndex].min > value) {
xMarkMap[seriesIndex].min = value; xMarkMap[seriesIndex].min = value;
xMarkMap[seriesIndex].minY = y; xMarkMap[seriesIndex].minY = y;
...@@ -35931,16 +35932,18 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -35931,16 +35932,18 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
for (var j = 0, k = locationMap.length; j < k; j++) { for (var j = 0, k = locationMap.length; j < k; j++) {
for (var m = 0, n = locationMap[j].length; m < n; m++) { for (var m = 0, n = locationMap[j].length; m < n; m++) {
seriesIndex = locationMap[j][m]; seriesIndex = locationMap[j][m];
xMarkMap[seriesIndex].average = if (xMarkMap[seriesIndex].counter > 0) {
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2) - 0; xMarkMap[seriesIndex].average =
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2)
- 0;
}
y = component.yAxis.getAxis(series[seriesIndex].yAxisIndex || 0) y = component.yAxis.getAxis(series[seriesIndex].yAxisIndex || 0)
.getCoord(xMarkMap[seriesIndex].average); .getCoord(xMarkMap[seriesIndex].average);
xMarkMap[seriesIndex].averageLine = [ xMarkMap[seriesIndex].averageLine = [
[component.grid.getX(), y], [component.grid.getX(), y],
[component.grid.getXend(), y] [component.grid.getXend(), y]
]; ];
xMarkMap[seriesIndex].minLine = [ xMarkMap[seriesIndex].minLine = [
[component.grid.getX(), xMarkMap[seriesIndex].minY], [component.grid.getX(), xMarkMap[seriesIndex].minY],
[component.grid.getXend(), xMarkMap[seriesIndex].minY] [component.grid.getXend(), xMarkMap[seriesIndex].minY]
...@@ -35998,6 +36001,14 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -35998,6 +36001,14 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
: data) : data)
: '-'; : '-';
curPLMap[seriesIndex] = curPLMap[seriesIndex] || []; curPLMap[seriesIndex] = curPLMap[seriesIndex] || [];
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (value == '-') { if (value == '-') {
// 空数据则把正在记录的curPLMap添加到finalPLMap中 // 空数据则把正在记录的curPLMap添加到finalPLMap中
if (curPLMap[seriesIndex].length > 0) { if (curPLMap[seriesIndex].length > 0) {
...@@ -36031,14 +36042,6 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -36031,14 +36042,6 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
[x, y, i, categoryAxis.getNameByIndex(i), baseXP, y] [x, y, i, categoryAxis.getNameByIndex(i), baseXP, y]
); );
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (xMarkMap[seriesIndex].min > value) { if (xMarkMap[seriesIndex].min > value) {
xMarkMap[seriesIndex].min = value; xMarkMap[seriesIndex].min = value;
xMarkMap[seriesIndex].minX = x; xMarkMap[seriesIndex].minX = x;
...@@ -36101,9 +36104,12 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -36101,9 +36104,12 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
for (var j = 0, k = locationMap.length; j < k; j++) { for (var j = 0, k = locationMap.length; j < k; j++) {
for (var m = 0, n = locationMap[j].length; m < n; m++) { for (var m = 0, n = locationMap[j].length; m < n; m++) {
seriesIndex = locationMap[j][m]; seriesIndex = locationMap[j][m];
xMarkMap[seriesIndex].average = if (xMarkMap[seriesIndex].counter > 0) {
xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter; xMarkMap[seriesIndex].average =
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2)
- 0;
}
x = component.xAxis.getAxis(series[seriesIndex].xAxisIndex || 0) x = component.xAxis.getAxis(series[seriesIndex].xAxisIndex || 0)
.getCoord(xMarkMap[seriesIndex].average); .getCoord(xMarkMap[seriesIndex].average);
...@@ -36898,6 +36904,14 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -36898,6 +36904,14 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
? data.value ? data.value
: data) : data)
: '-'; : '-';
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (value == '-') { if (value == '-') {
// 空数据在做完后补充拖拽提示框 // 空数据在做完后补充拖拽提示框
continue; continue;
...@@ -36950,14 +36964,6 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -36950,14 +36964,6 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
'vertical' 'vertical'
); );
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
xMarkMap[seriesIndex][i] = xMarkMap[seriesIndex][i] =
x + (barWidthMap[seriesIndex] || barWidth) / 2; x + (barWidthMap[seriesIndex] || barWidth) / 2;
if (xMarkMap[seriesIndex].min > value) { if (xMarkMap[seriesIndex].min > value) {
...@@ -37024,9 +37030,12 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -37024,9 +37030,12 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
for (var j = 0, k = locationMap.length; j < k; j++) { for (var j = 0, k = locationMap.length; j < k; j++) {
for (var m = 0, n = locationMap[j].length; m < n; m++) { for (var m = 0, n = locationMap[j].length; m < n; m++) {
seriesIndex = locationMap[j][m]; seriesIndex = locationMap[j][m];
xMarkMap[seriesIndex].average = if (xMarkMap[seriesIndex].counter > 0) {
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2) - 0; xMarkMap[seriesIndex].average =
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2)
- 0;
}
y = component.yAxis.getAxis(series[seriesIndex].yAxisIndex || 0) y = component.yAxis.getAxis(series[seriesIndex].yAxisIndex || 0)
.getCoord(xMarkMap[seriesIndex].average); .getCoord(xMarkMap[seriesIndex].average);
...@@ -37098,6 +37107,14 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -37098,6 +37107,14 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
? data.value ? data.value
: data) : data)
: '-'; : '-';
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (value == '-') { if (value == '-') {
// 空数据在做完后补充拖拽提示框 // 空数据在做完后补充拖拽提示框
continue; continue;
...@@ -37150,14 +37167,6 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -37150,14 +37167,6 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
'horizontal' 'horizontal'
); );
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
xMarkMap[seriesIndex][i] = xMarkMap[seriesIndex][i] =
y - (barWidthMap[seriesIndex] || barWidth) / 2; y - (barWidthMap[seriesIndex] || barWidth) / 2;
if (xMarkMap[seriesIndex].min > value) { if (xMarkMap[seriesIndex].min > value) {
...@@ -37225,9 +37234,12 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -37225,9 +37234,12 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
for (var j = 0, k = locationMap.length; j < k; j++) { for (var j = 0, k = locationMap.length; j < k; j++) {
for (var m = 0, n = locationMap[j].length; m < n; m++) { for (var m = 0, n = locationMap[j].length; m < n; m++) {
seriesIndex = locationMap[j][m]; seriesIndex = locationMap[j][m];
xMarkMap[seriesIndex].average = if (xMarkMap[seriesIndex].counter > 0) {
xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter; xMarkMap[seriesIndex].average =
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2)
- 0;
}
x = component.xAxis.getAxis(series[seriesIndex].xAxisIndex || 0) x = component.xAxis.getAxis(series[seriesIndex].xAxisIndex || 0)
.getCoord(xMarkMap[seriesIndex].average); .getCoord(xMarkMap[seriesIndex].average);
...@@ -37346,7 +37358,7 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -37346,7 +37358,7 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
); );
} }
// 无法满足用户定义的宽度设计，忽略用户宽度，打回重做 // 无法满足用户定义的宽度设计，忽略用户宽度，打回重做
if (barWidth < 0) { if (barWidth <= 0) {
return _mapSize(categoryAxis, locationMap, true); return _mapSize(categoryAxis, locationMap, true);
} }
} }
...@@ -37356,7 +37368,7 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -37356,7 +37368,7 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
barGap = 0; barGap = 0;
barWidth = Math.floor(gap / locationMap.length); barWidth = Math.floor(gap / locationMap.length);
// 已经忽略用户定义的宽度设定依然还无法满足显示，只能硬来了; // 已经忽略用户定义的宽度设定依然还无法满足显示，只能硬来了;
if (barWidth < 0) { if (barWidth <= 0) {
barWidth = 1; barWidth = 1;
} }
} }
build/echarts-original.js
浏览文件 @ b40e2923
...@@ -10530,7 +10530,7 @@ define( ...@@ -10530,7 +10530,7 @@ define(
var _idx = 0; //ZRender instance's id var _idx = 0; //ZRender instance's id
var _instances = {}; //ZRender实例map索引 var _instances = {}; //ZRender实例map索引
self.version = '1.1.1'; self.version = '1.1.2';
/** /**
* zrender初始化 * zrender初始化
...@@ -11437,18 +11437,18 @@ define( ...@@ -11437,18 +11437,18 @@ define(
var stl = root.currentStyle var stl = root.currentStyle
|| document.defaultView.getComputedStyle(root); || document.defaultView.getComputedStyle(root);
return (root.clientWidth || (stl.style.width.replace(/\D/g,''))) return ((root.clientWidth || parseInt(stl.width, 10))
- stl.paddingLeft.replace(/\D/g,'') // 请原谅我这比较粗暴 - parseInt(stl.paddingLeft, 10) // 请原谅我这比较粗暴
- stl.paddingRight.replace(/\D/g,''); - parseInt(stl.paddingRight, 10)).toFixed(0) - 0;
} }
function _getHeight(){ function _getHeight(){
var stl = root.currentStyle var stl = root.currentStyle
|| document.defaultView.getComputedStyle(root); || document.defaultView.getComputedStyle(root);
return (root.clientHeight || (stl.style.height.replace(/\D/g,''))) return ((root.clientHeight || parseInt(stl.height, 10))
- stl.paddingTop.replace(/\D/g,'') // 请原谅我这比较粗暴 - parseInt(stl.paddingTop, 10) // 请原谅我这比较粗暴
- stl.paddingBottom.replace(/\D/g,''); - parseInt(stl.paddingBottom, 10)).toFixed(0) - 0;
} }
function _init() { function _init() {
...@@ -14408,7 +14408,8 @@ define('echarts/component/base',['require','../util/ecData','../util/ecQuery','. ...@@ -14408,7 +14408,8 @@ define('echarts/component/base',['require','../util/ecData','../util/ecQuery','.
} }
// 标准化一些参数 // 标准化一些参数
data[i].tooltip = {trigger:'item'}; // tooltip.trigger指定为item data[i].tooltip = data[i].tooltip
|| {trigger:'item'}; // tooltip.trigger指定为item
data[i].name = typeof data[i].name != 'undefined' data[i].name = typeof data[i].name != 'undefined'
? data[i].name : ''; ? data[i].name : '';
data[i].value = typeof data[i].value != 'undefined' data[i].value = typeof data[i].value != 'undefined'
...@@ -18487,8 +18488,8 @@ define('echarts/component/dataZoom',['require','./base','../component','zrender/ ...@@ -18487,8 +18488,8 @@ define('echarts/component/dataZoom',['require','./base','../component','zrender/
} }
var pointList = []; var pointList = [];
var x = _location.width / maxLength; var x = _location.width / (maxLength - (maxLength > 1 ? 1 : 0));
var y = _location.height / maxLength; var y = _location.height / (maxLength - (maxLength > 1 ? 1 : 0));
for (var i = 0, l = maxLength; i < l; i++) { for (var i = 0, l = maxLength; i < l; i++) {
value = typeof data[i] != 'undefined' value = typeof data[i] != 'undefined'
? (typeof data[i].value != 'undefined' ? (typeof data[i].value != 'undefined'
...@@ -23308,7 +23309,7 @@ define('echarts/component/toolbox',['require','./base','zrender/config','zrender ...@@ -23308,7 +23309,7 @@ define('echarts/component/toolbox',['require','./base','zrender/config','zrender
lineWidth : 2, lineWidth : 2,
text : toolboxOption.showTitle text : toolboxOption.showTitle
? _featureTitle[_iconList[i]] ? _featureTitle[_iconList[i]]
: false, : undefined,
textFont : textFont, textFont : textFont,
textPosition : textPosition, textPosition : textPosition,
strokeColor : _featureColor[_iconList[i]] || color[i % color.length] strokeColor : _featureColor[_iconList[i]] || color[i % color.length]
...@@ -25689,9 +25690,9 @@ define('echarts/echarts',['require','zrender/tool/env','./config','zrender/tool/ ...@@ -25689,9 +25690,9 @@ define('echarts/echarts',['require','zrender/tool/env','./config','zrender/tool/
var _instances = {}; // ECharts实例map索引 var _instances = {}; // ECharts实例map索引
var DOM_ATTRIBUTE_KEY = '_echarts_instance_'; var DOM_ATTRIBUTE_KEY = '_echarts_instance_';
self.version = '1.4.0'; self.version = '1.4.1';
self.dependencies = { self.dependencies = {
zrender : '1.1.1' zrender : '1.1.2'
}; };
/** /**
* 入口方法 * 入口方法
...@@ -33697,6 +33698,14 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -33697,6 +33698,14 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
: data) : data)
: '-'; : '-';
curPLMap[seriesIndex] = curPLMap[seriesIndex] || []; curPLMap[seriesIndex] = curPLMap[seriesIndex] || [];
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (value == '-') { if (value == '-') {
// 空数据则把正在记录的curPLMap添加到finalPLMap中 // 空数据则把正在记录的curPLMap添加到finalPLMap中
if (curPLMap[seriesIndex].length > 0) { if (curPLMap[seriesIndex].length > 0) {
...@@ -33730,14 +33739,6 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -33730,14 +33739,6 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
[x, y, i, categoryAxis.getNameByIndex(i), x, baseYP] [x, y, i, categoryAxis.getNameByIndex(i), x, baseYP]
); );
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (xMarkMap[seriesIndex].min > value) { if (xMarkMap[seriesIndex].min > value) {
xMarkMap[seriesIndex].min = value; xMarkMap[seriesIndex].min = value;
xMarkMap[seriesIndex].minY = y; xMarkMap[seriesIndex].minY = y;
...@@ -33800,16 +33801,18 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -33800,16 +33801,18 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
for (var j = 0, k = locationMap.length; j < k; j++) { for (var j = 0, k = locationMap.length; j < k; j++) {
for (var m = 0, n = locationMap[j].length; m < n; m++) { for (var m = 0, n = locationMap[j].length; m < n; m++) {
seriesIndex = locationMap[j][m]; seriesIndex = locationMap[j][m];
xMarkMap[seriesIndex].average = if (xMarkMap[seriesIndex].counter > 0) {
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2) - 0; xMarkMap[seriesIndex].average =
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2)
- 0;
}
y = component.yAxis.getAxis(series[seriesIndex].yAxisIndex || 0) y = component.yAxis.getAxis(series[seriesIndex].yAxisIndex || 0)
.getCoord(xMarkMap[seriesIndex].average); .getCoord(xMarkMap[seriesIndex].average);
xMarkMap[seriesIndex].averageLine = [ xMarkMap[seriesIndex].averageLine = [
[component.grid.getX(), y], [component.grid.getX(), y],
[component.grid.getXend(), y] [component.grid.getXend(), y]
]; ];
xMarkMap[seriesIndex].minLine = [ xMarkMap[seriesIndex].minLine = [
[component.grid.getX(), xMarkMap[seriesIndex].minY], [component.grid.getX(), xMarkMap[seriesIndex].minY],
[component.grid.getXend(), xMarkMap[seriesIndex].minY] [component.grid.getXend(), xMarkMap[seriesIndex].minY]
...@@ -33867,6 +33870,14 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -33867,6 +33870,14 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
: data) : data)
: '-'; : '-';
curPLMap[seriesIndex] = curPLMap[seriesIndex] || []; curPLMap[seriesIndex] = curPLMap[seriesIndex] || [];
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (value == '-') { if (value == '-') {
// 空数据则把正在记录的curPLMap添加到finalPLMap中 // 空数据则把正在记录的curPLMap添加到finalPLMap中
if (curPLMap[seriesIndex].length > 0) { if (curPLMap[seriesIndex].length > 0) {
...@@ -33900,14 +33911,6 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -33900,14 +33911,6 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
[x, y, i, categoryAxis.getNameByIndex(i), baseXP, y] [x, y, i, categoryAxis.getNameByIndex(i), baseXP, y]
); );
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (xMarkMap[seriesIndex].min > value) { if (xMarkMap[seriesIndex].min > value) {
xMarkMap[seriesIndex].min = value; xMarkMap[seriesIndex].min = value;
xMarkMap[seriesIndex].minX = x; xMarkMap[seriesIndex].minX = x;
...@@ -33970,9 +33973,12 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -33970,9 +33973,12 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
for (var j = 0, k = locationMap.length; j < k; j++) { for (var j = 0, k = locationMap.length; j < k; j++) {
for (var m = 0, n = locationMap[j].length; m < n; m++) { for (var m = 0, n = locationMap[j].length; m < n; m++) {
seriesIndex = locationMap[j][m]; seriesIndex = locationMap[j][m];
xMarkMap[seriesIndex].average = if (xMarkMap[seriesIndex].counter > 0) {
xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter; xMarkMap[seriesIndex].average =
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2)
- 0;
}
x = component.xAxis.getAxis(series[seriesIndex].xAxisIndex || 0) x = component.xAxis.getAxis(series[seriesIndex].xAxisIndex || 0)
.getCoord(xMarkMap[seriesIndex].average); .getCoord(xMarkMap[seriesIndex].average);
...@@ -34767,6 +34773,14 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -34767,6 +34773,14 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
? data.value ? data.value
: data) : data)
: '-'; : '-';
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (value == '-') { if (value == '-') {
// 空数据在做完后补充拖拽提示框 // 空数据在做完后补充拖拽提示框
continue; continue;
...@@ -34819,14 +34833,6 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -34819,14 +34833,6 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
'vertical' 'vertical'
); );
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
xMarkMap[seriesIndex][i] = xMarkMap[seriesIndex][i] =
x + (barWidthMap[seriesIndex] || barWidth) / 2; x + (barWidthMap[seriesIndex] || barWidth) / 2;
if (xMarkMap[seriesIndex].min > value) { if (xMarkMap[seriesIndex].min > value) {
...@@ -34893,9 +34899,12 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -34893,9 +34899,12 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
for (var j = 0, k = locationMap.length; j < k; j++) { for (var j = 0, k = locationMap.length; j < k; j++) {
for (var m = 0, n = locationMap[j].length; m < n; m++) { for (var m = 0, n = locationMap[j].length; m < n; m++) {
seriesIndex = locationMap[j][m]; seriesIndex = locationMap[j][m];
xMarkMap[seriesIndex].average = if (xMarkMap[seriesIndex].counter > 0) {
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2) - 0; xMarkMap[seriesIndex].average =
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2)
- 0;
}
y = component.yAxis.getAxis(series[seriesIndex].yAxisIndex || 0) y = component.yAxis.getAxis(series[seriesIndex].yAxisIndex || 0)
.getCoord(xMarkMap[seriesIndex].average); .getCoord(xMarkMap[seriesIndex].average);
...@@ -34967,6 +34976,14 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -34967,6 +34976,14 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
? data.value ? data.value
: data) : data)
: '-'; : '-';
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (value == '-') { if (value == '-') {
// 空数据在做完后补充拖拽提示框 // 空数据在做完后补充拖拽提示框
continue; continue;
...@@ -35019,14 +35036,6 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -35019,14 +35036,6 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
'horizontal' 'horizontal'
); );
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
xMarkMap[seriesIndex][i] = xMarkMap[seriesIndex][i] =
y - (barWidthMap[seriesIndex] || barWidth) / 2; y - (barWidthMap[seriesIndex] || barWidth) / 2;
if (xMarkMap[seriesIndex].min > value) { if (xMarkMap[seriesIndex].min > value) {
...@@ -35094,9 +35103,12 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -35094,9 +35103,12 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
for (var j = 0, k = locationMap.length; j < k; j++) { for (var j = 0, k = locationMap.length; j < k; j++) {
for (var m = 0, n = locationMap[j].length; m < n; m++) { for (var m = 0, n = locationMap[j].length; m < n; m++) {
seriesIndex = locationMap[j][m]; seriesIndex = locationMap[j][m];
xMarkMap[seriesIndex].average = if (xMarkMap[seriesIndex].counter > 0) {
xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter; xMarkMap[seriesIndex].average =
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2)
- 0;
}
x = component.xAxis.getAxis(series[seriesIndex].xAxisIndex || 0) x = component.xAxis.getAxis(series[seriesIndex].xAxisIndex || 0)
.getCoord(xMarkMap[seriesIndex].average); .getCoord(xMarkMap[seriesIndex].average);
...@@ -35215,7 +35227,7 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -35215,7 +35227,7 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
); );
} }
// 无法满足用户定义的宽度设计，忽略用户宽度，打回重做 // 无法满足用户定义的宽度设计，忽略用户宽度，打回重做
if (barWidth < 0) { if (barWidth <= 0) {
return _mapSize(categoryAxis, locationMap, true); return _mapSize(categoryAxis, locationMap, true);
} }
} }
...@@ -35225,7 +35237,7 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -35225,7 +35237,7 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
barGap = 0; barGap = 0;
barWidth = Math.floor(gap / locationMap.length); barWidth = Math.floor(gap / locationMap.length);
// 已经忽略用户定义的宽度设定依然还无法满足显示，只能硬来了; // 已经忽略用户定义的宽度设定依然还无法满足显示，只能硬来了;
if (barWidth < 0) { if (barWidth <= 0) {
barWidth = 1; barWidth = 1;
} }
} }
build/echarts-plain-map.js
浏览文件 @ b40e2923
此差异已折叠。
build/echarts-plain-original-map.js
浏览文件 @ b40e2923
...@@ -10937,7 +10937,7 @@ define( ...@@ -10937,7 +10937,7 @@ define(
var _idx = 0; //ZRender instance's id var _idx = 0; //ZRender instance's id
var _instances = {}; //ZRender实例map索引 var _instances = {}; //ZRender实例map索引
self.version = '1.1.1'; self.version = '1.1.2';
/** /**
* zrender初始化 * zrender初始化
...@@ -11844,18 +11844,18 @@ define( ...@@ -11844,18 +11844,18 @@ define(
var stl = root.currentStyle var stl = root.currentStyle
|| document.defaultView.getComputedStyle(root); || document.defaultView.getComputedStyle(root);
return (root.clientWidth || (stl.style.width.replace(/\D/g,''))) return ((root.clientWidth || parseInt(stl.width, 10))
- stl.paddingLeft.replace(/\D/g,'') // 请原谅我这比较粗暴 - parseInt(stl.paddingLeft, 10) // 请原谅我这比较粗暴
- stl.paddingRight.replace(/\D/g,''); - parseInt(stl.paddingRight, 10)).toFixed(0) - 0;
} }
function _getHeight(){ function _getHeight(){
var stl = root.currentStyle var stl = root.currentStyle
|| document.defaultView.getComputedStyle(root); || document.defaultView.getComputedStyle(root);
return (root.clientHeight || (stl.style.height.replace(/\D/g,''))) return ((root.clientHeight || parseInt(stl.height, 10))
- stl.paddingTop.replace(/\D/g,'') // 请原谅我这比较粗暴 - parseInt(stl.paddingTop, 10) // 请原谅我这比较粗暴
- stl.paddingBottom.replace(/\D/g,''); - parseInt(stl.paddingBottom, 10)).toFixed(0) - 0;
} }
function _init() { function _init() {
...@@ -14815,7 +14815,8 @@ define('echarts/component/base',['require','../util/ecData','../util/ecQuery','. ...@@ -14815,7 +14815,8 @@ define('echarts/component/base',['require','../util/ecData','../util/ecQuery','.
} }
// 标准化一些参数 // 标准化一些参数
data[i].tooltip = {trigger:'item'}; // tooltip.trigger指定为item data[i].tooltip = data[i].tooltip
|| {trigger:'item'}; // tooltip.trigger指定为item
data[i].name = typeof data[i].name != 'undefined' data[i].name = typeof data[i].name != 'undefined'
? data[i].name : ''; ? data[i].name : '';
data[i].value = typeof data[i].value != 'undefined' data[i].value = typeof data[i].value != 'undefined'
...@@ -18894,8 +18895,8 @@ define('echarts/component/dataZoom',['require','./base','../component','zrender/ ...@@ -18894,8 +18895,8 @@ define('echarts/component/dataZoom',['require','./base','../component','zrender/
} }
var pointList = []; var pointList = [];
var x = _location.width / maxLength; var x = _location.width / (maxLength - (maxLength > 1 ? 1 : 0));
var y = _location.height / maxLength; var y = _location.height / (maxLength - (maxLength > 1 ? 1 : 0));
for (var i = 0, l = maxLength; i < l; i++) { for (var i = 0, l = maxLength; i < l; i++) {
value = typeof data[i] != 'undefined' value = typeof data[i] != 'undefined'
? (typeof data[i].value != 'undefined' ? (typeof data[i].value != 'undefined'
...@@ -23715,7 +23716,7 @@ define('echarts/component/toolbox',['require','./base','zrender/config','zrender ...@@ -23715,7 +23716,7 @@ define('echarts/component/toolbox',['require','./base','zrender/config','zrender
lineWidth : 2, lineWidth : 2,
text : toolboxOption.showTitle text : toolboxOption.showTitle
? _featureTitle[_iconList[i]] ? _featureTitle[_iconList[i]]
: false, : undefined,
textFont : textFont, textFont : textFont,
textPosition : textPosition, textPosition : textPosition,
strokeColor : _featureColor[_iconList[i]] || color[i % color.length] strokeColor : _featureColor[_iconList[i]] || color[i % color.length]
...@@ -26096,9 +26097,9 @@ define('echarts/echarts',['require','zrender/tool/env','./config','zrender/tool/ ...@@ -26096,9 +26097,9 @@ define('echarts/echarts',['require','zrender/tool/env','./config','zrender/tool/
var _instances = {}; // ECharts实例map索引 var _instances = {}; // ECharts实例map索引
var DOM_ATTRIBUTE_KEY = '_echarts_instance_'; var DOM_ATTRIBUTE_KEY = '_echarts_instance_';
self.version = '1.4.0'; self.version = '1.4.1';
self.dependencies = { self.dependencies = {
zrender : '1.1.1' zrender : '1.1.2'
}; };
/** /**
* 入口方法 * 入口方法
...@@ -36235,6 +36236,14 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -36235,6 +36236,14 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
: data) : data)
: '-'; : '-';
curPLMap[seriesIndex] = curPLMap[seriesIndex] || []; curPLMap[seriesIndex] = curPLMap[seriesIndex] || [];
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (value == '-') { if (value == '-') {
// 空数据则把正在记录的curPLMap添加到finalPLMap中 // 空数据则把正在记录的curPLMap添加到finalPLMap中
if (curPLMap[seriesIndex].length > 0) { if (curPLMap[seriesIndex].length > 0) {
...@@ -36268,14 +36277,6 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -36268,14 +36277,6 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
[x, y, i, categoryAxis.getNameByIndex(i), x, baseYP] [x, y, i, categoryAxis.getNameByIndex(i), x, baseYP]
); );
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (xMarkMap[seriesIndex].min > value) { if (xMarkMap[seriesIndex].min > value) {
xMarkMap[seriesIndex].min = value; xMarkMap[seriesIndex].min = value;
xMarkMap[seriesIndex].minY = y; xMarkMap[seriesIndex].minY = y;
...@@ -36338,16 +36339,18 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -36338,16 +36339,18 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
for (var j = 0, k = locationMap.length; j < k; j++) { for (var j = 0, k = locationMap.length; j < k; j++) {
for (var m = 0, n = locationMap[j].length; m < n; m++) { for (var m = 0, n = locationMap[j].length; m < n; m++) {
seriesIndex = locationMap[j][m]; seriesIndex = locationMap[j][m];
xMarkMap[seriesIndex].average = if (xMarkMap[seriesIndex].counter > 0) {
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2) - 0; xMarkMap[seriesIndex].average =
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2)
- 0;
}
y = component.yAxis.getAxis(series[seriesIndex].yAxisIndex || 0) y = component.yAxis.getAxis(series[seriesIndex].yAxisIndex || 0)
.getCoord(xMarkMap[seriesIndex].average); .getCoord(xMarkMap[seriesIndex].average);
xMarkMap[seriesIndex].averageLine = [ xMarkMap[seriesIndex].averageLine = [
[component.grid.getX(), y], [component.grid.getX(), y],
[component.grid.getXend(), y] [component.grid.getXend(), y]
]; ];
xMarkMap[seriesIndex].minLine = [ xMarkMap[seriesIndex].minLine = [
[component.grid.getX(), xMarkMap[seriesIndex].minY], [component.grid.getX(), xMarkMap[seriesIndex].minY],
[component.grid.getXend(), xMarkMap[seriesIndex].minY] [component.grid.getXend(), xMarkMap[seriesIndex].minY]
...@@ -36405,6 +36408,14 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -36405,6 +36408,14 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
: data) : data)
: '-'; : '-';
curPLMap[seriesIndex] = curPLMap[seriesIndex] || []; curPLMap[seriesIndex] = curPLMap[seriesIndex] || [];
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (value == '-') { if (value == '-') {
// 空数据则把正在记录的curPLMap添加到finalPLMap中 // 空数据则把正在记录的curPLMap添加到finalPLMap中
if (curPLMap[seriesIndex].length > 0) { if (curPLMap[seriesIndex].length > 0) {
...@@ -36438,14 +36449,6 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -36438,14 +36449,6 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
[x, y, i, categoryAxis.getNameByIndex(i), baseXP, y] [x, y, i, categoryAxis.getNameByIndex(i), baseXP, y]
); );
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (xMarkMap[seriesIndex].min > value) { if (xMarkMap[seriesIndex].min > value) {
xMarkMap[seriesIndex].min = value; xMarkMap[seriesIndex].min = value;
xMarkMap[seriesIndex].minX = x; xMarkMap[seriesIndex].minX = x;
...@@ -36508,9 +36511,12 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -36508,9 +36511,12 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
for (var j = 0, k = locationMap.length; j < k; j++) { for (var j = 0, k = locationMap.length; j < k; j++) {
for (var m = 0, n = locationMap[j].length; m < n; m++) { for (var m = 0, n = locationMap[j].length; m < n; m++) {
seriesIndex = locationMap[j][m]; seriesIndex = locationMap[j][m];
xMarkMap[seriesIndex].average = if (xMarkMap[seriesIndex].counter > 0) {
xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter; xMarkMap[seriesIndex].average =
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2)
- 0;
}
x = component.xAxis.getAxis(series[seriesIndex].xAxisIndex || 0) x = component.xAxis.getAxis(series[seriesIndex].xAxisIndex || 0)
.getCoord(xMarkMap[seriesIndex].average); .getCoord(xMarkMap[seriesIndex].average);
...@@ -37305,6 +37311,14 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -37305,6 +37311,14 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
? data.value ? data.value
: data) : data)
: '-'; : '-';
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (value == '-') { if (value == '-') {
// 空数据在做完后补充拖拽提示框 // 空数据在做完后补充拖拽提示框
continue; continue;
...@@ -37357,14 +37371,6 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -37357,14 +37371,6 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
'vertical' 'vertical'
); );
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
xMarkMap[seriesIndex][i] = xMarkMap[seriesIndex][i] =
x + (barWidthMap[seriesIndex] || barWidth) / 2; x + (barWidthMap[seriesIndex] || barWidth) / 2;
if (xMarkMap[seriesIndex].min > value) { if (xMarkMap[seriesIndex].min > value) {
...@@ -37431,9 +37437,12 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -37431,9 +37437,12 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
for (var j = 0, k = locationMap.length; j < k; j++) { for (var j = 0, k = locationMap.length; j < k; j++) {
for (var m = 0, n = locationMap[j].length; m < n; m++) { for (var m = 0, n = locationMap[j].length; m < n; m++) {
seriesIndex = locationMap[j][m]; seriesIndex = locationMap[j][m];
xMarkMap[seriesIndex].average = if (xMarkMap[seriesIndex].counter > 0) {
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2) - 0; xMarkMap[seriesIndex].average =
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2)
- 0;
}
y = component.yAxis.getAxis(series[seriesIndex].yAxisIndex || 0) y = component.yAxis.getAxis(series[seriesIndex].yAxisIndex || 0)
.getCoord(xMarkMap[seriesIndex].average); .getCoord(xMarkMap[seriesIndex].average);
...@@ -37505,6 +37514,14 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -37505,6 +37514,14 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
? data.value ? data.value
: data) : data)
: '-'; : '-';
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (value == '-') { if (value == '-') {
// 空数据在做完后补充拖拽提示框 // 空数据在做完后补充拖拽提示框
continue; continue;
...@@ -37557,14 +37574,6 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -37557,14 +37574,6 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
'horizontal' 'horizontal'
); );
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
xMarkMap[seriesIndex][i] = xMarkMap[seriesIndex][i] =
y - (barWidthMap[seriesIndex] || barWidth) / 2; y - (barWidthMap[seriesIndex] || barWidth) / 2;
if (xMarkMap[seriesIndex].min > value) { if (xMarkMap[seriesIndex].min > value) {
...@@ -37632,9 +37641,12 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -37632,9 +37641,12 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
for (var j = 0, k = locationMap.length; j < k; j++) { for (var j = 0, k = locationMap.length; j < k; j++) {
for (var m = 0, n = locationMap[j].length; m < n; m++) { for (var m = 0, n = locationMap[j].length; m < n; m++) {
seriesIndex = locationMap[j][m]; seriesIndex = locationMap[j][m];
xMarkMap[seriesIndex].average = if (xMarkMap[seriesIndex].counter > 0) {
xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter; xMarkMap[seriesIndex].average =
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2)
- 0;
}
x = component.xAxis.getAxis(series[seriesIndex].xAxisIndex || 0) x = component.xAxis.getAxis(series[seriesIndex].xAxisIndex || 0)
.getCoord(xMarkMap[seriesIndex].average); .getCoord(xMarkMap[seriesIndex].average);
...@@ -37753,7 +37765,7 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -37753,7 +37765,7 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
); );
} }
// 无法满足用户定义的宽度设计，忽略用户宽度，打回重做 // 无法满足用户定义的宽度设计，忽略用户宽度，打回重做
if (barWidth < 0) { if (barWidth <= 0) {
return _mapSize(categoryAxis, locationMap, true); return _mapSize(categoryAxis, locationMap, true);
} }
} }
...@@ -37763,7 +37775,7 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -37763,7 +37775,7 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
barGap = 0; barGap = 0;
barWidth = Math.floor(gap / locationMap.length); barWidth = Math.floor(gap / locationMap.length);
// 已经忽略用户定义的宽度设定依然还无法满足显示，只能硬来了; // 已经忽略用户定义的宽度设定依然还无法满足显示，只能硬来了;
if (barWidth < 0) { if (barWidth <= 0) {
barWidth = 1; barWidth = 1;
} }
} }
build/echarts-plain-original.js
浏览文件 @ b40e2923
...@@ -10937,7 +10937,7 @@ define( ...@@ -10937,7 +10937,7 @@ define(
var _idx = 0; //ZRender instance's id var _idx = 0; //ZRender instance's id
var _instances = {}; //ZRender实例map索引 var _instances = {}; //ZRender实例map索引
self.version = '1.1.1'; self.version = '1.1.2';
/** /**
* zrender初始化 * zrender初始化
...@@ -11844,18 +11844,18 @@ define( ...@@ -11844,18 +11844,18 @@ define(
var stl = root.currentStyle var stl = root.currentStyle
|| document.defaultView.getComputedStyle(root); || document.defaultView.getComputedStyle(root);
return (root.clientWidth || (stl.style.width.replace(/\D/g,''))) return ((root.clientWidth || parseInt(stl.width, 10))
- stl.paddingLeft.replace(/\D/g,'') // 请原谅我这比较粗暴 - parseInt(stl.paddingLeft, 10) // 请原谅我这比较粗暴
- stl.paddingRight.replace(/\D/g,''); - parseInt(stl.paddingRight, 10)).toFixed(0) - 0;
} }
function _getHeight(){ function _getHeight(){
var stl = root.currentStyle var stl = root.currentStyle
|| document.defaultView.getComputedStyle(root); || document.defaultView.getComputedStyle(root);
return (root.clientHeight || (stl.style.height.replace(/\D/g,''))) return ((root.clientHeight || parseInt(stl.height, 10))
- stl.paddingTop.replace(/\D/g,'') // 请原谅我这比较粗暴 - parseInt(stl.paddingTop, 10) // 请原谅我这比较粗暴
- stl.paddingBottom.replace(/\D/g,''); - parseInt(stl.paddingBottom, 10)).toFixed(0) - 0;
} }
function _init() { function _init() {
...@@ -14815,7 +14815,8 @@ define('echarts/component/base',['require','../util/ecData','../util/ecQuery','. ...@@ -14815,7 +14815,8 @@ define('echarts/component/base',['require','../util/ecData','../util/ecQuery','.
} }
// 标准化一些参数 // 标准化一些参数
data[i].tooltip = {trigger:'item'}; // tooltip.trigger指定为item data[i].tooltip = data[i].tooltip
|| {trigger:'item'}; // tooltip.trigger指定为item
data[i].name = typeof data[i].name != 'undefined' data[i].name = typeof data[i].name != 'undefined'
? data[i].name : ''; ? data[i].name : '';
data[i].value = typeof data[i].value != 'undefined' data[i].value = typeof data[i].value != 'undefined'
...@@ -18894,8 +18895,8 @@ define('echarts/component/dataZoom',['require','./base','../component','zrender/ ...@@ -18894,8 +18895,8 @@ define('echarts/component/dataZoom',['require','./base','../component','zrender/
} }
var pointList = []; var pointList = [];
var x = _location.width / maxLength; var x = _location.width / (maxLength - (maxLength > 1 ? 1 : 0));
var y = _location.height / maxLength; var y = _location.height / (maxLength - (maxLength > 1 ? 1 : 0));
for (var i = 0, l = maxLength; i < l; i++) { for (var i = 0, l = maxLength; i < l; i++) {
value = typeof data[i] != 'undefined' value = typeof data[i] != 'undefined'
? (typeof data[i].value != 'undefined' ? (typeof data[i].value != 'undefined'
...@@ -23715,7 +23716,7 @@ define('echarts/component/toolbox',['require','./base','zrender/config','zrender ...@@ -23715,7 +23716,7 @@ define('echarts/component/toolbox',['require','./base','zrender/config','zrender
lineWidth : 2, lineWidth : 2,
text : toolboxOption.showTitle text : toolboxOption.showTitle
? _featureTitle[_iconList[i]] ? _featureTitle[_iconList[i]]
: false, : undefined,
textFont : textFont, textFont : textFont,
textPosition : textPosition, textPosition : textPosition,
strokeColor : _featureColor[_iconList[i]] || color[i % color.length] strokeColor : _featureColor[_iconList[i]] || color[i % color.length]
...@@ -26096,9 +26097,9 @@ define('echarts/echarts',['require','zrender/tool/env','./config','zrender/tool/ ...@@ -26096,9 +26097,9 @@ define('echarts/echarts',['require','zrender/tool/env','./config','zrender/tool/
var _instances = {}; // ECharts实例map索引 var _instances = {}; // ECharts实例map索引
var DOM_ATTRIBUTE_KEY = '_echarts_instance_'; var DOM_ATTRIBUTE_KEY = '_echarts_instance_';
self.version = '1.4.0'; self.version = '1.4.1';
self.dependencies = { self.dependencies = {
zrender : '1.1.1' zrender : '1.1.2'
}; };
/** /**
* 入口方法 * 入口方法
...@@ -34104,6 +34105,14 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -34104,6 +34105,14 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
: data) : data)
: '-'; : '-';
curPLMap[seriesIndex] = curPLMap[seriesIndex] || []; curPLMap[seriesIndex] = curPLMap[seriesIndex] || [];
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (value == '-') { if (value == '-') {
// 空数据则把正在记录的curPLMap添加到finalPLMap中 // 空数据则把正在记录的curPLMap添加到finalPLMap中
if (curPLMap[seriesIndex].length > 0) { if (curPLMap[seriesIndex].length > 0) {
...@@ -34137,14 +34146,6 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -34137,14 +34146,6 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
[x, y, i, categoryAxis.getNameByIndex(i), x, baseYP] [x, y, i, categoryAxis.getNameByIndex(i), x, baseYP]
); );
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (xMarkMap[seriesIndex].min > value) { if (xMarkMap[seriesIndex].min > value) {
xMarkMap[seriesIndex].min = value; xMarkMap[seriesIndex].min = value;
xMarkMap[seriesIndex].minY = y; xMarkMap[seriesIndex].minY = y;
...@@ -34207,16 +34208,18 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -34207,16 +34208,18 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
for (var j = 0, k = locationMap.length; j < k; j++) { for (var j = 0, k = locationMap.length; j < k; j++) {
for (var m = 0, n = locationMap[j].length; m < n; m++) { for (var m = 0, n = locationMap[j].length; m < n; m++) {
seriesIndex = locationMap[j][m]; seriesIndex = locationMap[j][m];
xMarkMap[seriesIndex].average = if (xMarkMap[seriesIndex].counter > 0) {
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2) - 0; xMarkMap[seriesIndex].average =
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2)
- 0;
}
y = component.yAxis.getAxis(series[seriesIndex].yAxisIndex || 0) y = component.yAxis.getAxis(series[seriesIndex].yAxisIndex || 0)
.getCoord(xMarkMap[seriesIndex].average); .getCoord(xMarkMap[seriesIndex].average);
xMarkMap[seriesIndex].averageLine = [ xMarkMap[seriesIndex].averageLine = [
[component.grid.getX(), y], [component.grid.getX(), y],
[component.grid.getXend(), y] [component.grid.getXend(), y]
]; ];
xMarkMap[seriesIndex].minLine = [ xMarkMap[seriesIndex].minLine = [
[component.grid.getX(), xMarkMap[seriesIndex].minY], [component.grid.getX(), xMarkMap[seriesIndex].minY],
[component.grid.getXend(), xMarkMap[seriesIndex].minY] [component.grid.getXend(), xMarkMap[seriesIndex].minY]
...@@ -34274,6 +34277,14 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -34274,6 +34277,14 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
: data) : data)
: '-'; : '-';
curPLMap[seriesIndex] = curPLMap[seriesIndex] || []; curPLMap[seriesIndex] = curPLMap[seriesIndex] || [];
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (value == '-') { if (value == '-') {
// 空数据则把正在记录的curPLMap添加到finalPLMap中 // 空数据则把正在记录的curPLMap添加到finalPLMap中
if (curPLMap[seriesIndex].length > 0) { if (curPLMap[seriesIndex].length > 0) {
...@@ -34307,14 +34318,6 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -34307,14 +34318,6 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
[x, y, i, categoryAxis.getNameByIndex(i), baseXP, y] [x, y, i, categoryAxis.getNameByIndex(i), baseXP, y]
); );
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (xMarkMap[seriesIndex].min > value) { if (xMarkMap[seriesIndex].min > value) {
xMarkMap[seriesIndex].min = value; xMarkMap[seriesIndex].min = value;
xMarkMap[seriesIndex].minX = x; xMarkMap[seriesIndex].minX = x;
...@@ -34377,9 +34380,12 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z ...@@ -34377,9 +34380,12 @@ define('echarts/chart/line',['require','../component/base','./calculableBase','z
for (var j = 0, k = locationMap.length; j < k; j++) { for (var j = 0, k = locationMap.length; j < k; j++) {
for (var m = 0, n = locationMap[j].length; m < n; m++) { for (var m = 0, n = locationMap[j].length; m < n; m++) {
seriesIndex = locationMap[j][m]; seriesIndex = locationMap[j][m];
xMarkMap[seriesIndex].average = if (xMarkMap[seriesIndex].counter > 0) {
xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter; xMarkMap[seriesIndex].average =
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2)
- 0;
}
x = component.xAxis.getAxis(series[seriesIndex].xAxisIndex || 0) x = component.xAxis.getAxis(series[seriesIndex].xAxisIndex || 0)
.getCoord(xMarkMap[seriesIndex].average); .getCoord(xMarkMap[seriesIndex].average);
...@@ -35174,6 +35180,14 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -35174,6 +35180,14 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
? data.value ? data.value
: data) : data)
: '-'; : '-';
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (value == '-') { if (value == '-') {
// 空数据在做完后补充拖拽提示框 // 空数据在做完后补充拖拽提示框
continue; continue;
...@@ -35226,14 +35240,6 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -35226,14 +35240,6 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
'vertical' 'vertical'
); );
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
xMarkMap[seriesIndex][i] = xMarkMap[seriesIndex][i] =
x + (barWidthMap[seriesIndex] || barWidth) / 2; x + (barWidthMap[seriesIndex] || barWidth) / 2;
if (xMarkMap[seriesIndex].min > value) { if (xMarkMap[seriesIndex].min > value) {
...@@ -35300,9 +35306,12 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -35300,9 +35306,12 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
for (var j = 0, k = locationMap.length; j < k; j++) { for (var j = 0, k = locationMap.length; j < k; j++) {
for (var m = 0, n = locationMap[j].length; m < n; m++) { for (var m = 0, n = locationMap[j].length; m < n; m++) {
seriesIndex = locationMap[j][m]; seriesIndex = locationMap[j][m];
xMarkMap[seriesIndex].average = if (xMarkMap[seriesIndex].counter > 0) {
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2) - 0; xMarkMap[seriesIndex].average =
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2)
- 0;
}
y = component.yAxis.getAxis(series[seriesIndex].yAxisIndex || 0) y = component.yAxis.getAxis(series[seriesIndex].yAxisIndex || 0)
.getCoord(xMarkMap[seriesIndex].average); .getCoord(xMarkMap[seriesIndex].average);
...@@ -35374,6 +35383,14 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -35374,6 +35383,14 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
? data.value ? data.value
: data) : data)
: '-'; : '-';
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
if (value == '-') { if (value == '-') {
// 空数据在做完后补充拖拽提示框 // 空数据在做完后补充拖拽提示框
continue; continue;
...@@ -35426,14 +35443,6 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -35426,14 +35443,6 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
'horizontal' 'horizontal'
); );
xMarkMap[seriesIndex] = xMarkMap[seriesIndex]
|| {
min : Number.POSITIVE_INFINITY,
max : Number.NEGATIVE_INFINITY,
sum : 0,
counter : 0,
average : 0
};
xMarkMap[seriesIndex][i] = xMarkMap[seriesIndex][i] =
y - (barWidthMap[seriesIndex] || barWidth) / 2; y - (barWidthMap[seriesIndex] || barWidth) / 2;
if (xMarkMap[seriesIndex].min > value) { if (xMarkMap[seriesIndex].min > value) {
...@@ -35501,9 +35510,12 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -35501,9 +35510,12 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
for (var j = 0, k = locationMap.length; j < k; j++) { for (var j = 0, k = locationMap.length; j < k; j++) {
for (var m = 0, n = locationMap[j].length; m < n; m++) { for (var m = 0, n = locationMap[j].length; m < n; m++) {
seriesIndex = locationMap[j][m]; seriesIndex = locationMap[j][m];
xMarkMap[seriesIndex].average = if (xMarkMap[seriesIndex].counter > 0) {
xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter; xMarkMap[seriesIndex].average =
(xMarkMap[seriesIndex].sum / xMarkMap[seriesIndex].counter).toFixed(2)
- 0;
}
x = component.xAxis.getAxis(series[seriesIndex].xAxisIndex || 0) x = component.xAxis.getAxis(series[seriesIndex].xAxisIndex || 0)
.getCoord(xMarkMap[seriesIndex].average); .getCoord(xMarkMap[seriesIndex].average);
...@@ -35622,7 +35634,7 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -35622,7 +35634,7 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
); );
} }
// 无法满足用户定义的宽度设计，忽略用户宽度，打回重做 // 无法满足用户定义的宽度设计，忽略用户宽度，打回重做
if (barWidth < 0) { if (barWidth <= 0) {
return _mapSize(categoryAxis, locationMap, true); return _mapSize(categoryAxis, locationMap, true);
} }
} }
...@@ -35632,7 +35644,7 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','.. ...@@ -35632,7 +35644,7 @@ define('echarts/chart/bar',['require','../component/base','./calculableBase','..
barGap = 0; barGap = 0;
barWidth = Math.floor(gap / locationMap.length); barWidth = Math.floor(gap / locationMap.length);
// 已经忽略用户定义的宽度设定依然还无法满足显示，只能硬来了; // 已经忽略用户定义的宽度设定依然还无法满足显示，只能硬来了;
if (barWidth < 0) { if (barWidth <= 0) {
barWidth = 1; barWidth = 1;
} }
} }
build/echarts-plain.js
浏览文件 @ b40e2923
此差异已折叠。
build/echarts.js
浏览文件 @ b40e2923
此差异已折叠。
doc/asset/js/bootstrap-transition.js
浏览文件 @ b40e2923
...@@ -66,6 +66,6 @@ if (document.location.href.indexOf('local') == -1) { ...@@ -66,6 +66,6 @@ if (document.location.href.indexOf('local') == -1) {
var lrl = document.getElementById('last-release-link'); var lrl = document.getElementById('last-release-link');
if (lrl) { if (lrl) {
lrl.href = 'https://github.com/ecomfe/echarts/archive/1.4.0.zip'; lrl.href = 'https://github.com/ecomfe/echarts/archive/1.4.1.zip';
lrl.innerHTML = 'ZIP (1.4.0)'; lrl.innerHTML = 'ZIP (1.4.1)';
} }
doc/changelog.html
浏览文件 @ b40e2923
...@@ -80,6 +80,17 @@ ...@@ -80,6 +80,17 @@
<h2>修改记录</h2> <h2>修改记录</h2>
<span>[+]新增 [-]删除 [^]升级 [#]修复 【】重要</span> <span>[+]新增 [-]删除 [^]升级 [#]修复 【】重要</span>
<div class="row-fluid"> <div class="row-fluid">
<div>
<h3>1.4.1<small>（2014-04-14）</small></h3>
<ul>
<li>[#] [bar][line]空值数据计算特殊值错误</li>
<li>[#] [dataZoom]数据阴影长度计算错误</li>
<li>[#] [bar]修正计算宽度为0时改为1px</li>
<li>[#] [toolbox]修复showTitle显示为false fix <a href="https://github.com/ecomfe/echarts/issues/269" target="_blank">#269 »</a></li>
<li>[#] dom隐藏下初始化读取style错误，padding为小数是计算错误</li>
<li>[?] 依赖升级，<a href="http://ecomfe.github.io/zrender/" target="_blank">ZRender</a> 1.1.1+</li>
</ul>
</div>
<div> <div>
<h3>1.4.0<small>（2014-04-02）</small></h3> <h3>1.4.0<small>（2014-04-02）</small></h3>
<ul> <ul>
......
doc/example/www/js/echarts-map.js
浏览文件 @ b40e2923
此差异已折叠。
doc/example/www/js/echarts.js
浏览文件 @ b40e2923
此差异已折叠。
doc/slide/js/whyEcharts.js
浏览文件 @ b40e2923
var developMode = false; var developMode = false;
if (developMode) { if (developMode) {
// for develop // for develop
...@@ -296,6 +296,7 @@ var optionMap = { ...@@ -296,6 +296,7 @@ var optionMap = {
{ {
name:'浏览器占比', name:'浏览器占比',
type:'pie', type:'pie',
radius : ['30%', '70%'],
data:[ data:[
{value:535, name:'Chrome'}, {value:535, name:'Chrome'},
{value:310, name:'Firefox'}, {value:310, name:'Firefox'},
...@@ -397,7 +398,10 @@ var optionMap = { ...@@ -397,7 +398,10 @@ var optionMap = {
{ {
name:'利润', name:'利润',
type:'bar', type:'bar',
itemStyle : { normal: {label : {show: true, position: 'inside'}}}, itemStyle : { normal: {
color: 'rgba(248, 83, 0, 1)',
label : {show: true, position: 'inside'}}
},
data:[200, 170, 240, 244, 200, 220, 210] data:[200, 170, 240, 244, 200, 220, 210]
}, },
{ {
...@@ -406,7 +410,7 @@ var optionMap = { ...@@ -406,7 +410,7 @@ var optionMap = {
stack: '总量', stack: '总量',
barWidth : 5, barWidth : 5,
itemStyle: {normal: { itemStyle: {normal: {
color: 'rgba(138, 43, 226, 0.5)', color: 'rgba(255, 160, 0, 0.8)',//'rgba(138, 43, 226, 0.6)',
label : {show: true} label : {show: true}
}}, }},
data:[320, 302, 341, 374, 390, 450, 420] data:[320, 302, 341, 374, 390, 450, 420]
...@@ -416,7 +420,7 @@ var optionMap = { ...@@ -416,7 +420,7 @@ var optionMap = {
type:'bar', type:'bar',
stack: '总量', stack: '总量',
itemStyle: {normal: { itemStyle: {normal: {
color: 'rgba(30, 144, 255, 0.5)', color: 'rgba(30, 144, 255, 0.6)',
label : {show: true, position: 'left'} label : {show: true, position: 'left'}
}}, }},
data:[-120, -132, -101, -134, -190, -230, -210] data:[-120, -132, -101, -134, -190, -230, -210]
...@@ -428,7 +432,7 @@ var optionMap = { ...@@ -428,7 +432,7 @@ var optionMap = {
trigger: 'axis' trigger: 'axis'
}, },
legend: { legend: {
data:['成交','预购','意向'] data:['意向','预购','成交']
}, },
toolbox: { toolbox: {
show : true, show : true,
...@@ -455,11 +459,11 @@ var optionMap = { ...@@ -455,11 +459,11 @@ var optionMap = {
], ],
series : [ series : [
{ {
name:'成交', name:'意向',
type:'bar', type:'bar',
smooth:true, smooth:true,
itemStyle: {normal: {areaStyle: {type: 'default'}}}, itemStyle: {normal: {areaStyle: {type: 'default'}}},
data:[10, 12, 21, 54, 260, 830, 710] data:[1320, 1132, 601, 234, 120, 90, 20]
}, },
{ {
name:'预购', name:'预购',
...@@ -469,21 +473,25 @@ var optionMap = { ...@@ -469,21 +473,25 @@ var optionMap = {
data:[30, 182, 434, 791, 390, 30, 10] data:[30, 182, 434, 791, 390, 30, 10]
}, },
{ {
name:'意向', name:'成交',
type:'bar', type:'bar',
smooth:true, smooth:true,
itemStyle: {normal: {areaStyle: {type: 'default'}}}, itemStyle: {normal: {areaStyle: {type: 'default'}}},
data:[1320, 1132, 601, 234, 120, 90, 20] data:[10, 12, 21, 54, 260, 830, 710]
} }
] ]
}, },
dataRange1 : { dataRange1 : {
title : {
text: '2011全国GDP（亿元）',
subtext: '数据来自国家统计局'
},
tooltip : { tooltip : {
trigger: 'item' trigger: 'item'
}, },
dataRange: { dataRange: {
min: 0, min: 0,
max: 1000, max: 55000,
text:['高','低'], // 文本，默认为数值文本 text:['高','低'], // 文本，默认为数值文本
color:[ 'red', 'yellow'],//颜色 color:[ 'red', 'yellow'],//颜色
calculable : true calculable : true
...@@ -499,45 +507,44 @@ var optionMap = { ...@@ -499,45 +507,44 @@ var optionMap = {
}, },
series : [ series : [
{ {
name: '销售量', name: '2011全国GDP',
type: 'map', type: 'map',
mapType: 'china', mapType: 'china',
height: 400, itemStyle:{
normal:{label:{show:true}}
},
data:[ data:[
{name: '北京',value: Math.round(Math.random()*1000)}, {name:'西藏', value:605.83},
{name: '天津',value: Math.round(Math.random()*1000)}, {name:'青海', value:1670.44},
{name: '上海',value: Math.round(Math.random()*1000)}, {name:'宁夏', value:2102.21},
{name: '重庆',value: Math.round(Math.random()*1000)}, {name:'海南', value:2522.66},
{name: '河北',value: Math.round(Math.random()*1000)}, {name:'甘肃', value:5020.37},
{name: '河南',value: Math.round(Math.random()*1000)}, {name:'贵州', value:5701.84},
{name: '云南',value: Math.round(Math.random()*1000)}, {name:'新疆', value:6610.05},
{name: '辽宁',value: Math.round(Math.random()*1000)}, {name:'云南', value:8893.12},
{name: '黑龙江',value: Math.round(Math.random()*1000)}, {name:'重庆', value:10011.37},
{name: '湖南',value: Math.round(Math.random()*1000)}, {name:'吉林', value:10568.83},
{name: '安徽',value: Math.round(Math.random()*1000)}, {name:'山西', value:11237.55},
{name: '山东',value: Math.round(Math.random()*1000)}, {name:'天津', value:11307.28},
{name: '新疆',value: Math.round(Math.random()*1000)}, {name:'江西', value:11702.82},
{name: '江苏',value: Math.round(Math.random()*1000)}, {name:'广西', value:11720.87},
{name: '浙江',value: Math.round(Math.random()*1000)}, {name:'陕西', value:12512.3},
{name: '江西',value: Math.round(Math.random()*1000)}, {name:'黑龙江', value:12582},
{name: '湖北',value: Math.round(Math.random()*1000)}, {name:'内蒙古', value:14359.88},
{name: '广西',value: Math.round(Math.random()*1000)}, {name:'安徽', value:15300.65},
{name: '甘肃',value: Math.round(Math.random()*1000)}, {name:'北京', value:16251.93},
{name: '山西',value: Math.round(Math.random()*1000)}, {name:'福建', value:17560.18},
{name: '内蒙古',value: Math.round(Math.random()*1000)}, {name:'上海', value:19195.69},
{name: '陕西',value: Math.round(Math.random()*1000)}, {name:'湖北', value:19632.26},
{name: '吉林',value: Math.round(Math.random()*1000)}, {name:'湖南', value:19669.56},
{name: '福建',value: Math.round(Math.random()*1000)}, {name:'四川', value:21026.68},
{name: '贵州',value: Math.round(Math.random()*1000)}, {name:'辽宁', value:22226.7},
{name: '广东',value: Math.round(Math.random()*1000)}, {name:'河北', value:24515.76},
{name: '青海',value: Math.round(Math.random()*1000)}, {name:'河南', value:26931.03},
{name: '西藏',value: Math.round(Math.random()*1000)}, {name:'浙江', value:32318.85},
{name: '四川',value: Math.round(Math.random()*1000)}, {name:'山东', value:45361.85},
{name: '宁夏',value: Math.round(Math.random()*1000)}, {name:'江苏', value:49110.27},
{name: '海南',value: Math.round(Math.random()*1000)}, {name:'广东', value:53210.28}
{name: '台湾',value: Math.round(Math.random()*1000)},
{name: '香港',value: Math.round(Math.random()*1000)},
{name: '澳门',value: Math.round(Math.random()*1000)}
] ]
} }
] ]
...@@ -546,12 +553,12 @@ var optionMap = { ...@@ -546,12 +553,12 @@ var optionMap = {
tooltip : { tooltip : {
trigger: 'axis', trigger: 'axis',
formatter: function(params) { formatter: function(params) {
var res = params[0][1]; var res = params[1][1];
res += '<br/>' + params[0][0];
res += '<br/> 开盘 : ' + params[0][2][0] + ' 最高 : ' + params[0][2][3];
res += '<br/> 收盘 : ' + params[0][2][1] + ' 最低 : ' + params[0][2][2];
res += '<br/>' + params[1][0]; res += '<br/>' + params[1][0];
res += ' : ' + params[1][2]; res += '<br/> 开盘 : ' + params[1][2][0] + ' 最高 : ' + params[1][2][3];
res += '<br/> 收盘 : ' + params[1][2][1] + ' 最低 : ' + params[1][2][2];
res += '<br/>' + params[0][0];
res += ' : ' + params[0][2];
return res; return res;
} }
}, },
...@@ -610,6 +617,11 @@ var optionMap = { ...@@ -610,6 +617,11 @@ var optionMap = {
type:'line', type:'line',
yAxisIndex: 1, yAxisIndex: 1,
symbol: 'none', symbol: 'none',
itemStyle:{
normal:{
color:'#1e90ff'
}
},
data:[ data:[
13560434, 8026738.5, 11691637, 12491697, 12485603, 13560434, 8026738.5, 11691637, 12491697, 12485603,
11620504, 12555496, 15253370, 12709611, 10458354, 11620504, 12555496, 15253370, 12709611, 10458354,
...@@ -978,9 +990,10 @@ var optionMap = { ...@@ -978,9 +990,10 @@ var optionMap = {
name:'sin', name:'sin',
type:'scatter', type:'scatter',
large: true, large: true,
symbol:'circle',
data: (function() { data: (function() {
var d = []; var d = [];
var len = 10000; var len = 25000;
var x = 0; var x = 0;
while (len--) { while (len--) {
x = (Math.random() * 10).toFixed(3) - 0; x = (Math.random() * 10).toFixed(3) - 0;
...@@ -997,9 +1010,10 @@ var optionMap = { ...@@ -997,9 +1010,10 @@ var optionMap = {
name:'cos', name:'cos',
type:'scatter', type:'scatter',
large: true, large: true,
symbol:'circle',
data: (function() { data: (function() {
var d = []; var d = [];
var len = 10000; var len = 25000;
var x = 0; var x = 0;
while (len--) { while (len--) {
x = (Math.random() * 10).toFixed(3) - 0; x = (Math.random() * 10).toFixed(3) - 0;
...@@ -1458,7 +1472,10 @@ var optionMap = { ...@@ -1458,7 +1472,10 @@ var optionMap = {
}, },
stack : { stack : {
tooltip : { tooltip : {
trigger: 'axis' trigger: 'axis',
axisPointer:{
type:'shadow'
}
}, },
legend: { legend: {
data:['直接访问','邮件营销','联盟广告','视频广告','搜索引擎','百度','谷歌','必应','其他'] data:['直接访问','邮件营销','联盟广告','视频广告','搜索引擎','百度','谷歌','必应','其他']
...@@ -1759,7 +1776,7 @@ var optionMap = { ...@@ -1759,7 +1776,7 @@ var optionMap = {
dataRange: { dataRange: {
orient: 'horizontal', orient: 'horizontal',
min: 0, min: 0,
max: 1000, max: 55000,
text:['高','低'], // 文本，默认为数值文本 text:['高','低'], // 文本，默认为数值文本
splitNumber:0 splitNumber:0
}, },
...@@ -1787,40 +1804,37 @@ var optionMap = { ...@@ -1787,40 +1804,37 @@ var optionMap = {
emphasis:{label:{show:true}} emphasis:{label:{show:true}}
}, },
data:[ data:[
{name: '北京',value: 790,selected:true}, {name:'西藏', value:605.83},
{name: '天津',value: Math.round(Math.random()*1000)}, {name:'青海', value:1670.44},
{name: '上海',value: 940,selected:true}, {name:'宁夏', value:2102.21},
{name: '重庆',value: Math.round(Math.random()*1000)}, {name:'海南', value:2522.66},
{name: '河北',value: Math.round(Math.random()*1000)}, {name:'甘肃', value:5020.37},
{name: '河南',value: Math.round(Math.random()*1000)}, {name:'贵州', value:5701.84},
{name: '云南',value: Math.round(Math.random()*1000)}, {name:'新疆', value:6610.05},
{name: '辽宁',value: Math.round(Math.random()*1000)}, {name:'云南', value:8893.12},
{name: '黑龙江',value: Math.round(Math.random()*1000)}, {name:'重庆', value:10011.37},
{name: '湖南',value: Math.round(Math.random()*1000)}, {name:'吉林', value:10568.83},
{name: '安徽',value: Math.round(Math.random()*1000)}, {name:'山西', value:11237.55},
{name: '山东',value: Math.round(Math.random()*1000)}, {name:'天津', value:11307.28},
{name: '新疆',value: Math.round(Math.random()*1000)}, {name:'江西', value:11702.82},
{name: '江苏',value: Math.round(Math.random()*1000)}, {name:'广西', value:11720.87},
{name: '浙江',value: Math.round(Math.random()*1000)}, {name:'陕西', value:12512.3},
{name: '江西',value: Math.round(Math.random()*1000)}, {name:'黑龙江', value:12582},
{name: '湖北',value: Math.round(Math.random()*1000)}, {name:'内蒙古', value:14359.88},
{name: '广西',value: Math.round(Math.random()*1000)}, {name:'安徽', value:15300.65},
{name: '甘肃',value: Math.round(Math.random()*1000)}, {name:'北京', value:16251.93, selected:true},
{name: '山西',value: Math.round(Math.random()*1000)}, {name:'福建', value:17560.18},
{name: '内蒙古',value: Math.round(Math.random()*1000)}, {name:'上海', value:19195.69, selected:true},
{name: '陕西',value: Math.round(Math.random()*1000)}, {name:'湖北', value:19632.26},
{name: '吉林',value: Math.round(Math.random()*1000)}, {name:'湖南', value:19669.56},
{name: '福建',value: Math.round(Math.random()*1000)}, {name:'四川', value:21026.68},
{name: '贵州',value: Math.round(Math.random()*1000)}, {name:'辽宁', value:22226.7},
{name: '广东',value: 978,selected:true}, {name:'河北', value:24515.76},
{name: '青海',value: Math.round(Math.random()*1000)}, {name:'河南', value:26931.03},
{name: '西藏',value: Math.round(Math.random()*1000)}, {name:'浙江', value:32318.85},
{name: '四川',value: Math.round(Math.random()*1000)}, {name:'山东', value:45361.85},
{name: '宁夏',value: Math.round(Math.random()*1000)}, {name:'江苏', value:49110.27},
{name: '海南',value: Math.round(Math.random()*1000)}, {name:'广东', value:53210.28, selected:true}
{name: '台湾',value: Math.round(Math.random()*1000)},
{name: '香港',value: Math.round(Math.random()*1000)},
{name: '澳门',value: Math.round(Math.random()*1000)}
] ]
}, },
{ {
...@@ -1832,11 +1846,11 @@ var optionMap = { ...@@ -1832,11 +1846,11 @@ var optionMap = {
formatter: "{a} <br/>{b} : {c} ({d}%)" formatter: "{a} <br/>{b} : {c} ({d}%)"
}, },
center: [700, 225], center: [700, 225],
radius: [40, 120], radius: [30, 120],
data:[ data:[
{name: '北京', value: 790}, {name: '北京', value: 16251.93},
{name: '上海', value: 940}, {name: '上海', value: 19195.69},
{name: '广东', value: 978} {name: '广东', value: 53210.28}
] ]
} }
], ],
...@@ -2089,8 +2103,8 @@ var optionMap = { ...@@ -2089,8 +2103,8 @@ var optionMap = {
}, },
legend: { legend: {
orient: 'vertical', orient: 'vertical',
x:'left',
selectedMode:'single', selectedMode:'single',
x:'left',
data:['八纵通道', '八横通道'], data:['八纵通道', '八横通道'],
textStyle : { textStyle : {
color: '#fff' color: '#fff'
......
index.html
浏览文件 @ b40e2923
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<div class="container"> <div class="container">
<div class="carousel-caption"> <div class="carousel-caption">
<h1>ECharts</h1> <h1>ECharts</h1>
<h6>（1.4.0 <a href="doc/changelog.html" target="_blank" class="link">Changelog</a>）</h6> <h6>（1.4.1 <a href="doc/changelog.html" target="_blank" class="link">Changelog</a>）</h6>
<p>基于Canvas，纯Javascript图表库，提供直观，生动，可交互，可个性化定制的数据可视化图表。创新的拖拽重计算、数据视图、值域漫游等特性大大增强了用户体验，赋予了用户对数据进行挖掘、整合的能力。</p> <p>基于Canvas，纯Javascript图表库，提供直观，生动，可交互，可个性化定制的数据可视化图表。创新的拖拽重计算、数据视图、值域漫游等特性大大增强了用户体验，赋予了用户对数据进行挖掘、整合的能力。</p>
<p style="text-align: right;"><strong>———— 大数据时代，重新定义数据图表的时候到了</strong></p> <p style="text-align: right;"><strong>———— 大数据时代，重新定义数据图表的时候到了</strong></p>
</div> </div>
......
package.json
浏览文件 @ b40e2923
{ {
"name": "echarts", "name": "echarts",
"description": "Enterprise Charts，基于Canvas，纯Javascript图表库，提供直观，生动，可交互，可个性化定制的数据可视化表。", "description": "Enterprise Charts，基于Canvas，纯Javascript图表库，提供直观，生动，可交互，可个性化定制的数据可视化表。",
"version": "1.4.0", "version": "1.4.1",
"maintainers": [ "maintainers": [
{ "name": "Kener", "email": "linzhifeng@baidu.com" }, { "name": "Kener", "email": "linzhifeng@baidu.com" },
{ "name": "Pissang", "email": "shenyi01@baidu.com" }, { "name": "Pissang", "email": "shenyi01@baidu.com" },
{ "name": "Yangji", "email": "yangji01@baidu.com" } { "name": "Yangji", "email": "yangji01@baidu.com" }
], ],
"dependencies": { "dependencies": {
"zrender": "~1.1.1" "zrender": "~1.1.2"
}, },
"repository": "git://github.com/ecomfe/echarts", "repository": "git://github.com/ecomfe/echarts",
"main": "echarts", "main": "echarts",
......
src/echarts.js
浏览文件 @ b40e2923
...@@ -24,9 +24,9 @@ define(function(require) { ...@@ -24,9 +24,9 @@ define(function(require) {
var _instances = {}; // ECharts实例map索引 var _instances = {}; // ECharts实例map索引
var DOM_ATTRIBUTE_KEY = '_echarts_instance_'; var DOM_ATTRIBUTE_KEY = '_echarts_instance_';
self.version = '1.4.0'; self.version = '1.4.1';
self.dependencies = { self.dependencies = {
zrender : '1.1.1' zrender : '1.1.2'
}; };
/** /**
* 入口方法 * 入口方法
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或