Skip to content

I
incubator-echarts

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

从无法访问的项目Fork

通知 1
Star 0
Fork 0
I
incubator-echarts

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

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

fastmerge

上级 ac3005d1
隐藏空白更改
内联 并排
Showing with 268 addition and 297 deletion
doc/example/map4.html
浏览文件 @ 2bf50aee
......@@ -83,259 +83,189 @@ option = {
mapType: 'world',
selectedMode : 'single',
itemStyle:{
normal:{label:{show:true}},
normal:{label:{show:false}},
emphasis:{label:{show:true}}
},
data:[
{name:'CN',selected:true}
],
data:[],
// 自定义名称
nameMap : {
'Afghanistan':'AF',
'Andorra':'AD',
'United Arab Emirates':'AE',
'Antigua and Barbuda':'AG',
'Anguilla':'AI',
'Albania':'AL',
'Armenia':'AM',
'Netherlands Antilles':'AN',
'Angola':'AO',
'Antarctica':'AQ',
'Argentina':'AR',
'American Samoa':'AS',
'Austria':'AT',
'Australia':'AU',
'Aruba':'AW',
'Azerbaijan':'AZ',
'Bosnia and Herzegovina':'BA',
'Barbados':'BB',
'Bangladesh':'BD',
'Belgium':'BE',
'Burkina Faso':'BF',
'Bulgaria':'BG',
'Bahrain':'BH',
'Burundi':'BI',
'Benin':'BJ',
'Bermuda':'BM',
'Brunei':'BN',
'Bolivia':'BO',
'Brazil':'BR',
'The Bahamas':'BS',
'Bhutan':'BT',
'Bouvet Island':'BV',
'Botswana':'BW',
'Belarus':'BY',
'Belize':'BZ',
'Canada':'CA',
'Cocos Islands':'CC',
'Central African Republic':'CF',
'Democratic Republic of the Congo' : 'CD',
'Republic of the Congo' : 'CG',
'Switzerland':'CH',
'Ivory Coast':'CI',
'Cook Islands':'CK',
'Chile':'CL',
'Cameroon':'CM',
'China':'CN',
'Colombia':'CO',
'Equatorial Guinea':'CQ',
'Costa Rica':'CR',
'Cuba':'CU',
'Cape Verde':'CV',
'Christmas Island':'CX',
'Northern Cyprus':'CY',
'Czech Republic':'CZ',
'Germany':'DE',
'Djibouti':'DJ',
'Denmark':'DK',
'Dominica':'DM',
'Dominican Republic':'DO',
'Algeria':'DZ',
'Ecuador':'EC',
'Estonia':'EE',
'Egypt':'EG',
'Western Sahara':'EH',
'Spain':'ES',
'Ethiopia':'ET',
'El Salvador':'EV',
'Eritrea' : '?',
'Finland':'FI',
'Fiji':'FJ',
'Falkland Islands':'FK',
'Micronesia':'FM',
'Faroe Islands':'FO',
'France':'FR',
'Gabon':'GA',
'Great Britain (UK)':'GB',
'Grenada':'GD',
'Georgia':'GE',
'French Guiana':'GF',
'Ghana':'GH',
'Gibraltar':'GI',
'Greenland':'GL',
'Gambia':'GM',
'Guinea':'GN',
'Guadeloupe':'GP',
'Greece':'GR',
'Guatemala':'GT',
'Guam':'GU',
'Guinea Bissau':'GW',
'Guyana':'GY',
'Hong Kong':'HK',
'Heard and McDonald Is.':'HM',
'Honduras':'HN',
'Croatia':'HR',
'Haiti':'HT',
'Hungary':'HU',
'Indonesia':'ID',
'Ireland':'IE',
'Israel':'IL',
'India':'IN',
'British Indian Ocean Territory':'IO',
'Iraq':'IQ',
'Iran':'IR',
'Iceland':'IS',
'Italy':'IT',
'Jamaica':'JM',
'Jordan':'JO',
'Japan':'JP',
'Kenya':'KE',
'Kyrgyzstan':'KG',
'Kosovo' : '?',
'Cambodia':'KH',
'Kiribati':'KI',
'Comoros':'KM',
'St. Kitts & Nevis':'KN',
'North Korea':'KP',
'South Korea':'KR',
'Kuwait':'KW',
'Cayman Islands':'KY',
'Kazakhstan':'KZ',
"Laos":'LA',
'Lebanon':'LB',
'St. Lucia':'LC',
'Liechtenstein':'LI',
'Sri Lanka':'LK',
'Liberia':'LR',
'Lesotho':'LS',
'Lithuania':'LT',
'Luxembourg':'LU',
'Latvia':'LV',
'Libya':'LY',
'Morocco':'MA',
'Monaco':'MC',
'Moldova':'MD',
'Montenegro':'ME',
'Madagascar':'MG',
'Marshall Islands':'MH',
'Mali':'ML',
'Myanmar':'MM',
'Mongolia':'MN',
'Macau':'MO',
'Northern Mariana Islands':'MP',
'Martinique':'MQ',
'Mauritania':'MR',
'Montserrat':'MS',
'Malta':'MT',
'Maldives':'MV',
'Malawi':'MW',
'Mexico':'MX',
'Malaysia':'MY',
'Mozambique':'MZ',
'Macedonia' : 'MKD',
'Namibia':'NA',
'New Caledonia':'NC',
'Niger':'NE',
'Norfolk Island':'NF',
'Nigeria':'NG',
'Nicaragua':'NI',
'Netherlands':'NL',
'Norway':'NO',
'Nepal':'NP',
'Nauru':'NR',
'Neutral Zone':'NT',
'Niue':'NU',
'New Zealand':'NZ',
'Oman':'OM',
'Panama':'PA',
'Peru':'PE',
'French Polynesia':'PF',
'Papua New Guinea':'PG',
'Philippines':'PH',
'Pakistan':'PK',
'Poland':'PL',
'St. Pierre & Mequielon':'PM',
'Pitcairn Island':'PN',
'Puerto Rico':'PR',
'Portugal':'PT',
'Palau':'PW',
'Paraguay':'PY',
'Qatar':'QA',
'Reunion Island':'RE',
'Republic of Serbia' : 'SRB',
'Romania':'RO',
'Russia':'RU',
'Rwanda':'RW',
'Saudi Arabia':'SA',
'Solomon Islands':'SB',
'Seychelles':'SC',
'South Sudan':'SSP',
'Sudan' : 'SD',
'Sweden':'SE',
'Singapore':'SG',
'St. Helena':'SH',
'Slovenia':'SI',
'Svalbard & Jan Mayen':'SJ',
'Slovakia':'SK',
'Sierra Leone':'SL',
'San Marino':'SM',
'Senegal':'SN',
'Somaliland': '?',
'Somalia':'SO',
'Suriname':'SR',
'Sao Tome & Principe':'ST',
'USSR':'SU',
'Syria':'SY',
'Swaziland':'SZ',
'Turks & Caicos Islands':'TC',
'Chad':'TD',
'French Southern Territories':'TF',
'Togo':'TG',
'Thailand':'TH',
'Tajikistan':'TJ',
'tokelau':'TK',
'Turkmenistan':'TM',
'Tunisia':'TN',
'Tonga':'TO',
'East Timor':'TP',
'Turkey':'TR',
'Trinidad and Tobago':'TT',
'Tuvalu':'TV',
'Taiwan':'TW',
'United Republic of Tanzania':'TZ',
'Ukraine':'UA',
'Uganda':'UG',
'United Kingdom':'UK',
'United States of America':'US',
'Uruguay':'UY',
'Uzbekistan' : '?',
'Vatican City State':'VA',
'St. Vincent and the Grenadines':'VC',
'Venezuela':'VE',
'Virgin Islands':'VG',
'Vietnam':'VN',
'Vanuatu':'VU',
'Wallis and Fortuna Is.':'WF',
'Samoa':'WS',
'Yemen':'YE',
'Yugoslavia':'YU',
'South Africa':'ZA',
'Zambia':'ZM',
'Zaire':'ZR',
'Zimbabwe':'ZW',
'West Bank' : '?',
'French Southern and Antarctic Lands' : '?'
'Afghanistan':'阿富汗',
'Angola':'安哥拉',
'Albania':'阿尔巴尼亚',
'United Arab Emirates':'阿联酋',
'Argentina':'阿根廷',
'Armenia':'亚美尼亚',
'French Southern and Antarctic Lands':'法属南半球和南极领地',
'Australia':'澳大利亚',
'Austria':'奥地利',
'Azerbaijan':'阿塞拜疆',
'Burundi':'布隆迪',
'Belgium':'比利时',
'Benin':'贝宁',
'Burkina Faso':'布基纳法索',
'Bangladesh':'孟加拉国',
'Bulgaria':'保加利亚',
'The Bahamas':'巴哈马',
'Bosnia and Herzegovina':'波斯尼亚和黑塞哥维那',
'Belarus':'白俄罗斯',
'Belize':'伯利兹',
'Bermuda':'百慕大',
'Bolivia':'玻利维亚',
'Brazil':'巴西',
'Brunei':'文莱',
'Bhutan':'不丹',
'Botswana':'博茨瓦纳',
'Central African Republic':'中非共和国',
'Canada':'加拿大',
'Switzerland':'瑞士',
'Chile':'智利',
'China':'中国',
'Ivory Coast':'象牙海岸',
'Cameroon':'喀麦隆',
'Democratic Republic of the Congo':'刚果民主共和国',
'Republic of the Congo':'刚果共和国',
'Colombia':'哥伦比亚',
'Costa Rica':'哥斯达黎加',
'Cuba':'古巴',
'Northern Cyprus':'北塞浦路斯',
'Cyprus':'塞浦路斯',
'Czech Republic':'捷克共和国',
'Germany':'德国',
'Djibouti':'吉布提',
'Denmark':'丹麦',
'Dominican Republic':'多明尼加共和国',
'Algeria':'阿尔及利亚',
'Ecuador':'厄瓜多尔',
'Egypt':'埃及',
'Eritrea':'厄立特里亚',
'Spain':'西班牙',
'Estonia':'爱沙尼亚',
'Ethiopia':'埃塞俄比亚',
'Finland':'芬兰',
'Fiji':'斐',
'Falkland Islands':'福克兰群岛',
'France':'法国',
'Gabon':'加蓬',
'United Kingdom':'联合王国',
'Georgia':'格鲁吉亚',
'Ghana':'加纳',
'Guinea':'几内亚',
'Gambia':'冈比亚',
'Guinea Bissau':'几内亚比绍',
'Equatorial Guinea':'赤道几内亚',
'Greece':'希腊',
'Greenland':'格陵兰',
'Guatemala':'危地马拉',
'French Guiana':'法属圭亚那',
'Guyana':'圭亚那',
'Honduras':'洪都拉斯',
'Croatia':'克罗地亚',
'Haiti':'海地',
'Hungary':'匈牙利',
'Indonesia':'印尼',
'India':'印度',
'Ireland':'爱尔兰',
'Iran':'伊朗',
'Iraq':'伊拉克',
'Iceland':'冰岛',
'Israel':'以色列',
'Italy':'意大利',
'Jamaica':'牙买加',
'Jordan':'约旦',
'Japan':'日本',
'Kazakhstan':'哈萨克斯坦',
'Kenya':'肯尼亚',
'Kyrgyzstan':'吉尔吉斯斯坦',
'Cambodia':'柬埔寨',
'South Korea':'韩国',
'Kosovo':'科索沃',
'Kuwait':'科威特',
'Laos':'老挝',
'Lebanon':'黎巴嫩',
'Liberia':'利比里亚',
'Libya':'利比亚',
'Sri Lanka':'斯里兰卡',
'Lesotho':'莱索托',
'Lithuania':'立陶宛',
'Luxembourg':'卢森堡',
'Latvia':'拉脱维亚',
'Morocco':'摩洛哥',
'Moldova':'摩尔多瓦',
'Madagascar':'马达加斯加',
'Mexico':'墨西哥',
'Macedonia':'马其顿',
'Mali':'马里',
'Myanmar':'缅甸',
'Montenegro':'黑山',
'Mongolia':'蒙古',
'Mozambique':'莫桑比克',
'Mauritania':'毛里塔尼亚',
'Malawi':'马拉维',
'Malaysia':'马来西亚',
'Namibia':'纳米比亚',
'New Caledonia':'新喀里多尼亚',
'Niger':'尼日尔',
'Nigeria':'尼日利亚',
'Nicaragua':'尼加拉瓜',
'Netherlands':'荷兰',
'Norway':'挪威',
'Nepal':'尼泊尔',
'New Zealand':'新西兰',
'Oman':'阿曼',
'Pakistan':'巴基斯坦',
'Panama':'巴拿马',
'Peru':'秘鲁',
'Philippines':'菲律宾',
'Papua New Guinea':'巴布亚新几内亚',
'Poland':'波兰',
'Puerto Rico':'波多黎各',
'North Korea':'北朝鲜',
'Portugal':'葡萄牙',
'Paraguay':'巴拉圭',
'Qatar':'卡塔尔',
'Romania':'罗马尼亚',
'Russia':'俄国',
'Rwanda':'卢旺达',
'Western Sahara':'西撒哈拉',
'Saudi Arabia':'沙特阿拉伯',
'Sudan':'苏丹',
'South Sudan':'南苏丹',
'Senegal':'塞内加尔',
'Solomon Islands':'所罗门群岛',
'Sierra Leone':'塞拉利昂',
'El Salvador':'萨尔瓦多',
'Somaliland':'索马里兰',
'Somalia':'索马里',
'Republic of Serbia':'塞尔维亚共和国',
'Suriname':'苏里南',
'Slovakia':'斯洛伐克',
'Slovenia':'斯洛文尼亚',
'Sweden':'瑞典',
'Swaziland':'斯威士兰',
'Syria':'叙利亚',
'Chad':'乍得',
'Togo':'多哥',
'Thailand':'泰国',
'Tajikistan':'塔吉克斯坦',
'Turkmenistan':'土库曼斯坦',
'East Timor':'东帝汶',
'Trinidad and Tobago':'特里尼达和多巴哥',
'Tunisia':'突尼斯',
'Turkey':'土耳其',
'United Republic of Tanzania':'坦桑尼亚联合共和国',
'Uganda':'乌干达',
'Ukraine':'乌克兰',
'Uruguay':'乌拉圭',
'United States of America':'美国',
'Uzbekistan':'乌兹别克斯坦',
'Venezuela':'委内瑞拉',
'Vietnam':'越南',
'Vanuatu':'瓦努阿图',
'West Bank':'西岸',
'Yemen':'也门',
'South Africa':'南非',
'Zambia':'赞比亚',
'Zimbabwe':'津巴布韦'
}
}
]
......
src/chart/bar.js
浏览文件 @ 2bf50aee
......@@ -838,7 +838,8 @@ define(function(require) {
x : x + width,
width: 0
}
}
},
true
);
zr.animate(self.shapeList[i].id, 'style')
.when(
......@@ -857,7 +858,8 @@ define(function(require) {
style: {
width: 0
}
}
},
true
);
zr.animate(self.shapeList[i].id, 'style')
.when(
......@@ -880,7 +882,8 @@ define(function(require) {
style: {
height: 0
}
}
},
true
);
zr.animate(self.shapeList[i].id, 'style')
.when(
......@@ -899,7 +902,8 @@ define(function(require) {
y: y + height,
height: 0
}
}
},
true
);
zr.animate(self.shapeList[i].id, 'style')
.when(
......
src/chart/island.js
浏览文件 @ 2bf50aee
......@@ -106,7 +106,8 @@ define(function (require) {
x: Math.round(self.shapeList[i].style.x * xScale),
y: Math.round(self.shapeList[i].style.y * yScale)
}
}
},
true
);
}
}
......
src/chart/k.js
浏览文件 @ 2bf50aee
......@@ -460,9 +460,11 @@ define(function(require) {
serie = series[self.shapeList[i]._seriesIndex];
x = self.shapeList[i].style.x;
y = self.shapeList[i].style.y[0];
zr.modShape(self.shapeList[i].id, {
scale : [1, 0, x, y]
});
zr.modShape(
self.shapeList[i].id,
{ scale : [1, 0, x, y] },
true
);
zr.animate(self.shapeList[i].id, '')
.when(
(self.deepQuery([serie],'animationDuration')
......
src/chart/line.js
浏览文件 @ 2bf50aee
......@@ -904,11 +904,15 @@ define(function(require) {
}
isHorizontal ? (x = -dx, y = 0) : (x = 0, y = dy);
}
zr.modShape(self.shapeList[i].id, {
style : {
pointList : self.shapeList[i].style.pointList
}
});
zr.modShape(
self.shapeList[i].id,
{
style : {
pointList: self.shapeList[i].style.pointList
}
},
true
);
}
else {
// 拐点动画
......@@ -956,14 +960,22 @@ define(function(require) {
x = self.shapeList[i].style.pointList[0][0];
y = self.shapeList[i].style.pointList[0][1];
if (self.shapeList[i]._orient == 'horizontal') {
zr.modShape(self.shapeList[i].id, {
scale : [0, 1, x, y]
});
zr.modShape(
self.shapeList[i].id,
{
scale : [0, 1, x, y]
},
true
);
}
else {
zr.modShape(self.shapeList[i].id, {
scale : [1, 0, x, y]
});
zr.modShape(
self.shapeList[i].id,
{
scale : [1, 0, x, y]
},
true
);
}
zr.animate(self.shapeList[i].id, '')
.when(
......@@ -979,9 +991,13 @@ define(function(require) {
else {
x = self.shapeList[i]._x || 0;
y = self.shapeList[i]._y || 0;
zr.modShape(self.shapeList[i].id, {
scale : [0, 0, x, y]
});
zr.modShape(
self.shapeList[i].id,
{
scale : [0, 0, x, y]
},
true
);
zr.animate(self.shapeList[i].id, '')
.when(
duration,
......
src/chart/map.js
浏览文件 @ 2bf50aee
......@@ -65,15 +65,13 @@ define(function(require) {
|| _nameMap[mapType]
|| {};
if (series[i].textFixed) {
zrUtil.merge(
_textFixed, series[i].textFixed,
{ 'overwrite': true}
zrUtil.mergeFast(
_textFixed, series[i].textFixed, true, false
);
}
if (series[i].geoCoord) {
zrUtil.merge(
_geoCoord, series[i].geoCoord,
{ 'overwrite': true}
zrUtil.mergeFast(
_geoCoord, series[i].geoCoord, true, false
);
}
......@@ -122,7 +120,7 @@ define(function(require) {
valueData[mt][k].value =
valueData[mt][k].value
/ valueData[mt][k].seriesIndex.length;
// TODO:小数点精度可配
if (valueData[mt][k].value > 10) {
valueData[mt][k].value = Math.round(
valueData[mt][k].value
......
src/chart/pie.js
浏览文件 @ 2bf50aee
......@@ -891,13 +891,17 @@ define(function(require) {
r0 = self.shapeList[i].style.r0;
r = self.shapeList[i].style.r;
zr.modShape(self.shapeList[i].id, {
rotation : [Math.PI*2, x, y],
style : {
r0 : 0,
r : 0
}
});
zr.modShape(
self.shapeList[i].id,
{
rotation : [Math.PI*2, x, y],
style : {
r0 : 0,
r : 0
}
},
true
);
serie = ecData.get(self.shapeList[i], 'series');
dataIndex = ecData.get(self.shapeList[i], 'dataIndex');
......@@ -925,9 +929,13 @@ define(function(require) {
}
else {
dataIndex = self.shapeList[i]._dataIndex;
zr.modShape(self.shapeList[i].id, {
scale : [0, 0, x, y]
});
zr.modShape(
self.shapeList[i].id,
{
scale : [0, 0, x, y]
},
true
);
zr.animate(self.shapeList[i].id, '')
.when(
duration + dataIndex * 100,
......
src/chart/radar.js
浏览文件 @ 2bf50aee
......@@ -467,9 +467,13 @@
center = polar.getCenter(polarIndex);
x = center[0];
y = center[1];
zr.modShape(self.shapeList[i].id, {
scale : [0.1, 0.1, x, y]
});
zr.modShape(
self.shapeList[i].id,
{
scale : [0.1, 0.1, x, y]
},
true
);
zr.animate(item.id, '')
.when(
......@@ -485,9 +489,13 @@
else {
x = self.shapeList[i]._x || 0;
y = self.shapeList[i]._y || 0;
zr.modShape(self.shapeList[i].id, {
scale : [0, 0, x, y]
});
zr.modShape(
self.shapeList[i].id,
{
scale : [0, 0, x, y]
},
true
);
zr.animate(self.shapeList[i].id, '')
.when(
duration,
......
src/chart/scatter.js
浏览文件 @ 2bf50aee
......@@ -418,9 +418,13 @@ define(function(require) {
for (var i = 0, l = self.shapeList.length; i < l; i++) {
x = self.shapeList[i]._x || 0;
y = self.shapeList[i]._y || 0;
zr.modShape(self.shapeList[i].id, {
scale : [0, 0, x, y]
});
zr.modShape(
self.shapeList[i].id,
{
scale : [0, 0, x, y]
},
true
);
zr.animate(self.shapeList[i].id, '')
.when(
(self.deepQuery([serie],'animationDuration')
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或