Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
x649585723
incubator-echarts
提交
59758db5
I
incubator-echarts
项目概览
x649585723
/
incubator-echarts
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
incubator-echarts
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
59758db5
编写于
12月 11, 2014
作者:
K
kener
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
2.1.10
上级
6f9fd7a6
变更
12
展开全部
隐藏空白更改
内联
并排
Showing
12 changed file
with
78 addition
and
68 deletion
+78
-68
bower.json
bower.json
+1
-1
build/dist/echarts-all.js
build/dist/echarts-all.js
+13
-13
build/dist/echarts.js
build/dist/echarts.js
+5
-5
build/source/echarts-all.js
build/source/echarts-all.js
+17
-13
build/source/echarts.js
build/source/echarts.js
+17
-13
doc/asset/js/echartsHome.js
doc/asset/js/echartsHome.js
+1
-1
doc/example/eventRiver1.html
doc/example/eventRiver1.html
+2
-1
doc/example/eventRiver2.html
doc/example/eventRiver2.html
+2
-1
doc/example/www/js/echarts.js
doc/example/www/js/echarts.js
+5
-5
doc/example/www2/js/echarts-all.js
doc/example/www2/js/echarts-all.js
+13
-13
package.json
package.json
+1
-1
src/echarts.js
src/echarts.js
+1
-1
未找到文件。
bower.json
浏览文件 @
59758db5
{
"name"
:
"echarts"
,
"version"
:
"2.1.
9
"
,
"version"
:
"2.1.
10
"
,
"homepage"
:
"http://echarts.baidu.com"
,
"repository"
:
"git://github.com/ecomfe/echarts"
,
"authors"
:
[
...
...
build/dist/echarts-all.js
浏览文件 @
59758db5
此差异已折叠。
点击以展开。
build/dist/echarts.js
浏览文件 @
59758db5
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
build/source/echarts-all.js
浏览文件 @
59758db5
...
...
@@ -162,7 +162,7 @@ define('echarts/echarts', [
var _idBase = new Date() - 0;
var _instances = {};
var DOM_ATTRIBUTE_KEY = '_echarts_instance_';
self.version = '2.1.
9
';
self.version = '2.1.
10
';
self.dependencies = { zrender: '2.0.6' };
self.init = function (dom, theme) {
var zrender = require('zrender');
...
...
@@ -1368,7 +1368,7 @@ define('echarts/echarts', [
showDelay: 20,
hideDelay: 100,
transitionDuration: 0.4,
enterable:
tru
e,
enterable:
fals
e,
backgroundColor: 'rgba(0,0,0,0.7)',
borderColor: '#333',
borderRadius: 4,
...
...
@@ -4066,6 +4066,7 @@ define('zrender/zrender', [
__hide: function () {
this._lastDataIndex = -1;
this._lastSeriesIndex = -1;
this._lastItemTriggerId = -1;
if (this._tDom) {
this._tDom.style.display = 'none';
}
...
...
@@ -4568,8 +4569,7 @@ define('zrender/zrender', [
position = this.query(data, 'tooltip.position') || position;
specialCssText += this._style(this.query(data, 'tooltip'));
} else {
this._lastDataIndex = NaN;
this._lastSeriesIndex = NaN;
this._lastItemTriggerId = NaN;
showContent = this.deepQuery([
data,
serie,
...
...
@@ -4586,9 +4586,8 @@ define('zrender/zrender', [
this.option
], 'tooltip.islandPosition');
}
if (this._lastDataIndex != dataIndex || this._lastSeriesIndex != seriesIndex) {
this._lastDataIndex = dataIndex;
this._lastSeriesIndex = seriesIndex;
if (this._lastItemTriggerId !== this._curTarget.id) {
this._lastItemTriggerId = this._curTarget.id;
if (typeof formatter === 'function') {
this._curTicket = (serie.name || '') + ':' + dataIndex;
this._tDom.innerHTML = formatter.call(this.myChart, {
...
...
@@ -4626,7 +4625,7 @@ define('zrender/zrender', [
} else if (serie.type === ecConfig.CHART_TYPE_EVENTRIVER) {
this._tDom.innerHTML = this._itemFormatter.eventRiver.call(this, serie, name, value, data);
} else {
this._tDom.innerHTML = '' + (serie.name != null ? this._encodeHTML(serie.name) + '<br/>' : '') + (name === '' ? '' : this._encodeHTML(name) + ' : ') + (value instanceof Array ? value : this.numAddCommas(value))
+ (special == null ? '' : ' (' + special + ')')
;
this._tDom.innerHTML = '' + (serie.name != null ? this._encodeHTML(serie.name) + '<br/>' : '') + (name === '' ? '' : this._encodeHTML(name) + ' : ') + (value instanceof Array ? value : this.numAddCommas(value));
}
}
}
...
...
@@ -4798,7 +4797,7 @@ define('zrender/zrender', [
__onmousemove: function (param) {
clearTimeout(this._hidingTicket);
clearTimeout(this._showingTicket);
if (this._mousein && this.enterable) {
if (this._mousein && this.
_
enterable) {
return;
}
var target = param.target;
...
...
@@ -5077,6 +5076,7 @@ define('zrender/zrender', [
this.shapeList.length = 2;
this._lastDataIndex = -1;
this._lastSeriesIndex = -1;
this._lastItemTriggerId = -1;
if (newOption) {
this.option = newOption;
this.option.tooltip = this.reformOption(this.option.tooltip);
...
...
@@ -5097,6 +5097,7 @@ define('zrender/zrender', [
this._defaultCssText = this._style(this.option.tooltip);
this._setSelectedMap();
this._axisLineWidth = this.option.tooltip.axisPointer.lineStyle.width;
this._enterable = this.option.tooltip.enterable;
}
if (this.showing) {
var self = this;
...
...
@@ -8968,7 +8969,10 @@ define('zrender/zrender', [
}
var doc = this.element_.ownerDocument;
this.textMeasureEl_.innerHTML = '';
this.textMeasureEl_.style.font = this.font;
try {
this.textMeasureEl_.style.font = this.font;
} catch (ex) {
}
this.textMeasureEl_.appendChild(doc.createTextNode(text));
return { width: this.textMeasureEl_.offsetWidth };
};
...
...
@@ -15202,7 +15206,7 @@ define('zrender/zrender', [
this.setTransform(ctx);
ctx.save();
ctx.beginPath();
this.buildLinePath(ctx, style);
this.buildLinePath(ctx, style
, this.style.lineWidth || 1
);
ctx.stroke();
ctx.restore();
this.brushSymbol(ctx, style, 0);
...
...
@@ -15210,7 +15214,7 @@ define('zrender/zrender', [
this.drawText(ctx, style, this.style);
ctx.restore();
},
buildLinePath: function (ctx, style) {
buildLinePath: function (ctx, style
, lineWidth
) {
var pointList = style.pointList || this.getPointList(style);
style.pointList = pointList;
var len = Math.min(style.pointList.length, Math.round(style.pointListLength || style.pointList.length));
...
...
@@ -15221,7 +15225,7 @@ define('zrender/zrender', [
}
} else if (style.lineType == 'dashed' || style.lineType == 'dotted') {
if (style.smooth !== 'spline') {
var dashLength =
(style.lineWidth || 1)
* (style.lineType == 'dashed' ? 5 : 1);
var dashLength =
lineWidth
* (style.lineType == 'dashed' ? 5 : 1);
ctx.moveTo(pointList[0][0], pointList[0][1]);
for (var i = 1; i < len; i++) {
dashedLineTo(ctx, pointList[i - 1][0], pointList[i - 1][1], pointList[i][0], pointList[i][1], dashLength);
build/source/echarts.js
浏览文件 @
59758db5
...
...
@@ -1700,7 +1700,7 @@ define('echarts/echarts', [
var _idBase = new Date() - 0;
var _instances = {};
var DOM_ATTRIBUTE_KEY = '_echarts_instance_';
self.version = '2.1.
9
';
self.version = '2.1.
10
';
self.dependencies = { zrender: '2.0.6' };
self.init = function (dom, theme) {
var zrender = require('zrender');
...
...
@@ -2906,7 +2906,7 @@ define('echarts/echarts', [
showDelay: 20,
hideDelay: 100,
transitionDuration: 0.4,
enterable:
tru
e,
enterable:
fals
e,
backgroundColor: 'rgba(0,0,0,0.7)',
borderColor: '#333',
borderRadius: 4,
...
...
@@ -5604,6 +5604,7 @@ define('zrender/zrender', [
__hide: function () {
this._lastDataIndex = -1;
this._lastSeriesIndex = -1;
this._lastItemTriggerId = -1;
if (this._tDom) {
this._tDom.style.display = 'none';
}
...
...
@@ -6106,8 +6107,7 @@ define('zrender/zrender', [
position = this.query(data, 'tooltip.position') || position;
specialCssText += this._style(this.query(data, 'tooltip'));
} else {
this._lastDataIndex = NaN;
this._lastSeriesIndex = NaN;
this._lastItemTriggerId = NaN;
showContent = this.deepQuery([
data,
serie,
...
...
@@ -6124,9 +6124,8 @@ define('zrender/zrender', [
this.option
], 'tooltip.islandPosition');
}
if (this._lastDataIndex != dataIndex || this._lastSeriesIndex != seriesIndex) {
this._lastDataIndex = dataIndex;
this._lastSeriesIndex = seriesIndex;
if (this._lastItemTriggerId !== this._curTarget.id) {
this._lastItemTriggerId = this._curTarget.id;
if (typeof formatter === 'function') {
this._curTicket = (serie.name || '') + ':' + dataIndex;
this._tDom.innerHTML = formatter.call(this.myChart, {
...
...
@@ -6164,7 +6163,7 @@ define('zrender/zrender', [
} else if (serie.type === ecConfig.CHART_TYPE_EVENTRIVER) {
this._tDom.innerHTML = this._itemFormatter.eventRiver.call(this, serie, name, value, data);
} else {
this._tDom.innerHTML = '' + (serie.name != null ? this._encodeHTML(serie.name) + '<br/>' : '') + (name === '' ? '' : this._encodeHTML(name) + ' : ') + (value instanceof Array ? value : this.numAddCommas(value))
+ (special == null ? '' : ' (' + special + ')')
;
this._tDom.innerHTML = '' + (serie.name != null ? this._encodeHTML(serie.name) + '<br/>' : '') + (name === '' ? '' : this._encodeHTML(name) + ' : ') + (value instanceof Array ? value : this.numAddCommas(value));
}
}
}
...
...
@@ -6336,7 +6335,7 @@ define('zrender/zrender', [
__onmousemove: function (param) {
clearTimeout(this._hidingTicket);
clearTimeout(this._showingTicket);
if (this._mousein && this.enterable) {
if (this._mousein && this.
_
enterable) {
return;
}
var target = param.target;
...
...
@@ -6615,6 +6614,7 @@ define('zrender/zrender', [
this.shapeList.length = 2;
this._lastDataIndex = -1;
this._lastSeriesIndex = -1;
this._lastItemTriggerId = -1;
if (newOption) {
this.option = newOption;
this.option.tooltip = this.reformOption(this.option.tooltip);
...
...
@@ -6635,6 +6635,7 @@ define('zrender/zrender', [
this._defaultCssText = this._style(this.option.tooltip);
this._setSelectedMap();
this._axisLineWidth = this.option.tooltip.axisPointer.lineStyle.width;
this._enterable = this.option.tooltip.enterable;
}
if (this.showing) {
var self = this;
...
...
@@ -10506,7 +10507,10 @@ define('zrender/zrender', [
}
var doc = this.element_.ownerDocument;
this.textMeasureEl_.innerHTML = '';
this.textMeasureEl_.style.font = this.font;
try {
this.textMeasureEl_.style.font = this.font;
} catch (ex) {
}
this.textMeasureEl_.appendChild(doc.createTextNode(text));
return { width: this.textMeasureEl_.offsetWidth };
};
...
...
@@ -16740,7 +16744,7 @@ define('zrender/zrender', [
this.setTransform(ctx);
ctx.save();
ctx.beginPath();
this.buildLinePath(ctx, style);
this.buildLinePath(ctx, style
, this.style.lineWidth || 1
);
ctx.stroke();
ctx.restore();
this.brushSymbol(ctx, style, 0);
...
...
@@ -16748,7 +16752,7 @@ define('zrender/zrender', [
this.drawText(ctx, style, this.style);
ctx.restore();
},
buildLinePath: function (ctx, style) {
buildLinePath: function (ctx, style
, lineWidth
) {
var pointList = style.pointList || this.getPointList(style);
style.pointList = pointList;
var len = Math.min(style.pointList.length, Math.round(style.pointListLength || style.pointList.length));
...
...
@@ -16759,7 +16763,7 @@ define('zrender/zrender', [
}
} else if (style.lineType == 'dashed' || style.lineType == 'dotted') {
if (style.smooth !== 'spline') {
var dashLength =
(style.lineWidth || 1)
* (style.lineType == 'dashed' ? 5 : 1);
var dashLength =
lineWidth
* (style.lineType == 'dashed' ? 5 : 1);
ctx.moveTo(pointList[0][0], pointList[0][1]);
for (var i = 1; i < len; i++) {
dashedLineTo(ctx, pointList[i - 1][0], pointList[i - 1][1], pointList[i][0], pointList[i][1], dashLength);
...
...
doc/asset/js/echartsHome.js
浏览文件 @
59758db5
var
version
=
'
2.1.
9
'
;
var
version
=
'
2.1.
10
'
;
var
sp
=
location
.
href
.
lastIndexOf
(
'
/
'
);
var
ep
=
location
.
href
.
lastIndexOf
(
'
.html
'
);
var
curPage
=
sp
<
ep
?
location
.
href
.
slice
(
sp
+
1
,
ep
)
:
'
index
'
;
...
...
doc/example/eventRiver1.html
浏览文件 @
59758db5
...
...
@@ -45,7 +45,8 @@ option = {
subtext: '纯属虚构'
},
tooltip : {
trigger: 'item'
trigger: 'item',
enterable: true
},
legend: {
data:['财经事件', '政治事件']
...
...
doc/example/eventRiver2.html
浏览文件 @
59758db5
...
...
@@ -67,7 +67,8 @@ option = {
subtext:
'
纯属虚构
'
},
tooltip
:
{
trigger:
'
item
'
trigger:
'
item
',
enterable:
true
},
legend:
{
data:
legendName
...
...
doc/example/www/js/echarts.js
浏览文件 @
59758db5
此差异已折叠。
点击以展开。
doc/example/www2/js/echarts-all.js
浏览文件 @
59758db5
此差异已折叠。
点击以展开。
package.json
浏览文件 @
59758db5
{
"name"
:
"echarts"
,
"description"
:
"Enterprise Charts,基于Canvas,纯Javascript图表库,提供直观,生动,可交互,可个性化定制的数据可视化表。"
,
"version"
:
"2.1.
9
"
,
"version"
:
"2.1.
10
"
,
"maintainers"
:
[
{
"name"
:
"Kener"
,
"email"
:
"kener.linfeng@gmail.com"
},
{
"name"
:
"Pissang"
,
"email"
:
"shenyi.914@gmail.com"
},
...
...
src/echarts.js
浏览文件 @
59758db5
...
...
@@ -27,7 +27,7 @@ define(function (require) {
var
_instances
=
{};
// ECharts实例map索引
var
DOM_ATTRIBUTE_KEY
=
'
_echarts_instance_
'
;
self
.
version
=
'
2.1.
9
'
;
self
.
version
=
'
2.1.
10
'
;
self
.
dependencies
=
{
zrender
:
'
2.0.6
'
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录