提交 30fa2c17 编写于 作者: K kener

手欠!代码格式

上级 00e9c2ef
......@@ -571,7 +571,7 @@ require(
'echarts',
'echarts/chart/pie'
],
function(ec) {
function (ec) {
var myChart = ec.init(document.getElementById('main'));
myChart.setOption({...});
}
......@@ -591,7 +591,7 @@ myChart.setOption({...}); </pre>
<pre>
// 不习惯模块化的你当然可以
var ECharts;
require(['echarts'], function(ec){
require(['echarts'], function (ec){
ECharts = ec;
});
// 是的,把echarts加载后保存起来作为命名空间使用</pre>
......@@ -1852,7 +1852,7 @@ feature : {
<b>{Function}</b>,传递参数同模板变量:
<ul>
<li>
eg:function(value){return "星期" + "日一二三四五六".charAt(value);'}
eg:function (value){return "星期" + "日一二三四五六".charAt(value);'}
</li>
</ul>
......@@ -3091,14 +3091,14 @@ geoCoord : {
// step2: 在require('echarts/util/mapData/params').params中命名你的地图类型,如HK
// step3: 命名赋值为对象{}, 实现接口方法getGeoJson,通过callback返回目标地区geoJson数据文件
require('echarts/util/mapData/params').params.HK = {
getGeoJson: function(callback) {
getGeoJson: function (callback) {
$.getJSON('geoJson/HK_geo.json',callback);
}
}
// step3*: 对于数据地图类型,一般不需要特殊的投射算法,ECharts统一使用了简化的投射算法,因而对于个别地区可能需要人为调整,可以通过specialArea指定个别地区安的经纬度坐标和区间大小,如
require('echarts/util/mapData/params').params.USA = {
getGeoJson: function(callback) {
getGeoJson: function (callback) {
$.getJSON('geoJson/USA_geo.json', callback);
},
specialArea : {
......
......@@ -49,7 +49,7 @@ require(
//'echarts/chart/chord',
'echarts/chart/map'
],
function(ec) {
function (ec) {
EC_READY = true;
myChart0 = ec.init(document.getElementById('g0')).setOption(option0());
showTabContent(1);
......@@ -106,11 +106,11 @@ functionMap.chart3 = function (idx) {
myChart3 = require('echarts').init(document.getElementById('g' + idx));
myChart3.setOption(option1(curSelected));
// 图例状态保持
myChart3.on(require('echarts/config').EVENT.LEGEND_SELECTED, function(param){
myChart3.on(require('echarts/config').EVENT.LEGEND_SELECTED, function (param){
curSelected = param.selected;
});
}
functionMap.chart3dispose = function() {
functionMap.chart3dispose = function () {
if (myChart3) {
myChart3.dispose();
myChart3 = false;
......@@ -167,7 +167,7 @@ functionMap.chart1 = function (idx) {
//$('input:radio[name="optionsRadios"]:checked').val()
myChart1.setOption(option3(curEIndex));
// 值域状态保持
myChart1.on(require('echarts/config').EVENT.DATA_RANGE, function(param){
myChart1.on(require('echarts/config').EVENT.DATA_RANGE, function (param){
var max = dataMap['dataA' + curEIndex][curYear + 'max'];
curRange = {
start : param.range.start / 100 * max,
......@@ -176,17 +176,17 @@ functionMap.chart1 = function (idx) {
}
});
}
functionMap.chart1dispose = function() {
functionMap.chart1dispose = function () {
if (myChart1) {
myChart1.dispose();
myChart1 = false;
}
}
var resizeTicket;
window.onload = function() {
window.onresize = function() {
window.onload = function () {
window.onresize = function () {
clearTimeout(resizeTicket);
resizeTicket = setTimeout(function(){
resizeTicket = setTimeout(function (){
myChart0.resize();
if (curTabIdx == 1) {
myChart1.resize();
......
......@@ -109,7 +109,7 @@ function option0 () {
type: 'bar',
itemStyle : {
normal : {
color : (function(){
color : (function (){
var zrColor = require('zrender/tool/color');
return zrColor.getLinearGradient(
0, 80, 0, 500,
......
......@@ -131,7 +131,7 @@ body {
'echarts/chart/line',
'echarts/chart/map'
],
function(ec) {
function (ec) {
colorList = require('zrender/tool/color').getGradientColors(
['red','yellow','lightskyblue'], 10
);
......@@ -187,7 +187,7 @@ body {
}
var yearSelector = document.getElementById('year');
yearSelector.onchange = function(e){
yearSelector.onchange = function (e){
var curYear = yearSelector.selectedOptions[0].innerHTML;
option.title.text = '中国人口流动图示 (' + curYear + ')';
var max = dataPeople[curYear + 'max'];
......
......@@ -98,7 +98,7 @@ var option = {
{
type : 'category',
boundaryGap : false,
data : function(){
data : function (){
var list = [];
for (var i = 1987; i <= 2011; i++) {
list.push(i);
......
......@@ -40,7 +40,7 @@ var data = {
so2 : [], so2Min:0, so2Max:500,
geoCoord : {}
};
data.format = function(oriData) {
data.format = function (oriData) {
data.oriData = oriData;
var city;
var cityToData = {};
......
......@@ -54,7 +54,7 @@ require(
'echarts/chart/radar',
'echarts/chart/map'
],
function(ec) {
function (ec) {
EC_READY = true;
myChart0 = ec.init(document.getElementById('g0')).showLoading({effect:'bubble'});
myChart1 = ec.init(document.getElementById('g1')).showLoading({effect:'bubble'});
......@@ -249,10 +249,10 @@ functionMap.chart3 = function (type) {
}
var resizeTicket;
window.onload = function() {
window.onresize = function() {
window.onload = function () {
window.onresize = function () {
clearTimeout(resizeTicket);
resizeTicket = setTimeout(function(){
resizeTicket = setTimeout(function (){
myChart0.resize();
myChart1.resize();
myChart20.resize();
......
......@@ -24,7 +24,7 @@ function option1 (name) {
},
tooltip : {
trigger: 'axis',
formatter: function(v) {
formatter: function (v) {
var res = v[0][1] + '<br/>';
if (v.length < 5) {
for (var i = 0, l = v.length; i < l; i++) {
......@@ -98,7 +98,7 @@ function option1 (name) {
type: 'radar',
tooltip: {
trigger:'axis',
formatter: function(v) {
formatter: function (v) {
var res = v[0][3] + '<br/>';
if (v.length < 5) {
for (var i = 0, l = v.length; i < l; i++) {
......
......@@ -51,7 +51,7 @@ function option2 (idx, selected) {
name:'城市',
type:'scatter',
symbolSize: function(value){
symbolSize: function (value){
return Math.round(value[2] / sizeCtrl);
}
}
......@@ -64,7 +64,7 @@ function option2 (idx, selected) {
switch(idx+'') {
case '0':
sizeCtrl = 10;
tipFormatter = function(v) {
tipFormatter = function (v) {
return v[1] + '<br>'
+ 'GDP : ' + v[2][0] + '(亿元)<br/>'
+ '人口 : ' + v[2][1] + '(万人)<br/>'
......@@ -86,7 +86,7 @@ function option2 (idx, selected) {
break;
case '1':
sizeCtrl = 80;
tipFormatter = function(v) {
tipFormatter = function (v) {
return v[1] + '<br>'
+ 'PM2.5 : ' + v[2][0] + '<br/>'
+ 'GDP : ' + v[2][1] + '(亿元)<br/>'
......@@ -108,7 +108,7 @@ function option2 (idx, selected) {
break;
case '2':
sizeCtrl = 500;
tipFormatter = function(v) {
tipFormatter = function (v) {
return v[1] + '<br>'
+ 'PM2.5 : ' + v[2][0] + '<br/>'
+ '人口 : ' + v[2][1] + '(万人)<br/>'
......
......@@ -82,7 +82,7 @@ function option3 (name) {
max: 0,
axisLabel:{
show:false,
formatter: function(v){
formatter: function (v){
return -v;
}
}
......@@ -156,7 +156,7 @@ function option3 (name) {
type: 'bar',
itemStyle : {
normal : {
color : (function(){
color : (function (){
var zrColor = require('zrender/tool/color');
return zrColor.getLinearGradient(
0, 80, 0, 700,
......@@ -178,7 +178,7 @@ function option3 (name) {
type: 'bar',
tooltip:{
trigger: 'item',
formatter : function(v) {
formatter : function (v) {
return v[0] + '<br/>' + v[1] + ' : ' + (-v[2]);
}
},
......@@ -187,7 +187,7 @@ function option3 (name) {
barMinHeight: 5,
itemStyle : {
normal : {
color : (function(){
color : (function (){
var zrColor = require('zrender/tool/color');
return zrColor.getLinearGradient(
0, 80, 0, 700,
......@@ -198,7 +198,7 @@ function option3 (name) {
label : {
show : true,
position: 'left',
formatter: function(a,b,c) {
formatter: function (a,b,c) {
return b + ' : ' + (-c);
}
}
......
......@@ -66,7 +66,7 @@ var categories = [{
var nodesIdxMap = {};
data.forEach(function(item){
data.forEach(function (item){
if (item[0] == "Event" || item[0] == "EventListener" ) return;
if (item[1] == "Event" || item[1] == "EventListener" ) return;
......
......@@ -88,7 +88,7 @@ option = {
orient : 'vertical',
x : 'left'
},
series : (function(){
series : (function (){
// If data have been loaded
if (webkitDepData) {
//webkitDepData has been required and defined in webkit-dep.js
......@@ -143,7 +143,7 @@ option = {
<script src="../asset/js/bootstrap-typeahead.js"></script>
<script type="text/javascript">
var webkitDepData;
require(['webkit-dep'], function(wd) {
require(['webkit-dep'], function (wd) {
webkitDepData = wd;
//webkitDepData has been required and defined in webkit-dep.js
webkitDepData.minRadius = 5;
......
......@@ -68,7 +68,7 @@
<div class="nav-header"><a href="#" onclick="autoResize()" class="icon-resize-full" id ="icon-resize" ></a>option</div>
<textarea id="code" name="code">
option = {
color : (function(){
color : (function (){
var zrColor = require('zrender/tool/color');
return zrColor.getStepColors('yellow', 'red', 28);
})(),
......@@ -85,7 +85,7 @@ option = {
legend: {
// orient : 'vertical',
//x : 'center',
data: function(){
data: function (){
var list = [];
for (var i = 1; i <=28; i++) {
list.push(i + 2000);
......@@ -118,7 +118,7 @@ option = {
}
],
calculable : false,
series : (function(){
series : (function (){
var series = [];
for (var i = 1; i <= 28; i++) {
series.push({
......
......@@ -35,7 +35,7 @@
'echarts/chart/line',
'echarts/chart/map'
],
function(ec) {
function (ec) {
//--- 折柱 ---
var myChart = ec.init(document.getElementById('main'));
myChart.setOption({
......
......@@ -73,7 +73,7 @@ require(
'echarts/chart/chord',
'echarts/chart/map'
],
function(ec, wd) {
function (ec, wd) {
echarts = ec;
webkitDepData = wd;
webkitDepData.minRadius = 5;
......@@ -98,14 +98,14 @@ require(
var curEvent;
var showChartTimer;
Reveal.addEventListener( 'ready', function(event){
Reveal.addEventListener( 'ready', function (event){
clearTimeout(showChartTimer);
curEvent = event;
getCurParams();
showChartTimer = setTimeout(showChart, 800);
});
Reveal.addEventListener( 'slidechanged', function(event){
Reveal.addEventListener( 'slidechanged', function (event){
clearTimeout(showChartTimer);
curEvent = event;
getCurParams();
......@@ -334,7 +334,7 @@ var optionMap = {
axisLabel : {
rotate: 45
},
data : function(){
data : function (){
var list = [];
for (var i = 1; i <= 30; i++) {
list.push('11 - ' + i);
......@@ -552,7 +552,7 @@ var optionMap = {
dataZoom1 : {
tooltip : {
trigger: 'axis',
formatter: function(params) {
formatter: function (params) {
var res = params[1][1];
res += '<br/>' + params[1][0];
res += '<br/> 开盘 : ' + params[1][2][0] + ' 最高 : ' + params[1][2][3];
......@@ -604,7 +604,7 @@ var optionMap = {
splitNumber: 9,
boundaryGap: [0.05, 0.05],
axisLabel: {
formatter: function(v) {
formatter: function (v) {
return Math.round(v/10000) + ''
}
},
......@@ -650,7 +650,7 @@ var optionMap = {
label : {
show:true,
position:'top',
formatter: function(a,b,v) {
formatter: function (a,b,v) {
return Math.round(v/10000) + ''
}
}
......@@ -668,7 +668,7 @@ var optionMap = {
color:'#1e90ff',
label : {
show:true,
formatter: function(a,b,v) {
formatter: function (a,b,v) {
return Math.round(v/10000) + ''
}
}
......@@ -686,8 +686,8 @@ var optionMap = {
}
]
},
multiCharts : (function(){
functionMap.multiCharts = function(){
multiCharts : (function (){
functionMap.multiCharts = function (){
var option2 = {
tooltip : {
trigger: 'axis',
......@@ -739,7 +739,7 @@ var optionMap = {
splitNumber: 3,
boundaryGap: [0.05, 0.05],
axisLabel: {
formatter: function(v) {
formatter: function (v) {
return Math.round(v/10000) + ''
}
},
......@@ -829,7 +829,7 @@ var optionMap = {
splitNumber:3,
boundaryGap: [0.05, 0.05],
axisLabel: {
formatter: function(v) {
formatter: function (v) {
return Math.round(v/10000) + ''
}
},
......@@ -879,7 +879,7 @@ var optionMap = {
tooltip : {
trigger: 'axis',
showDelay: 0, // 显示延迟,添加显示延迟可以避免频繁切换,单位ms
formatter: function(params) {
formatter: function (params) {
var res = params[0][1];
res += '<br/>' + params[0][0];
res += '<br/> 开盘 : ' + params[0][2][0] + ' 最高 : ' + params[0][2][3];
......@@ -991,7 +991,7 @@ var optionMap = {
type:'scatter',
large: true,
symbol:'circle',
data: (function() {
data: (function () {
var d = [];
var len = 25000;
var x = 0;
......@@ -1011,7 +1011,7 @@ var optionMap = {
type:'scatter',
large: true,
symbol:'circle',
data: (function() {
data: (function () {
var d = [];
var len = 25000;
var x = 0;
......@@ -1028,8 +1028,8 @@ var optionMap = {
}
]
},
force : (function() {
functionMap.force = function() {
force : (function () {
functionMap.force = function () {
myChart.setOption({
tooltip : {
trigger: 'item',
......@@ -1134,7 +1134,7 @@ var optionMap = {
]
}, true);
}
functionMap.force2 = function() {
functionMap.force2 = function () {
myChart.setOption({
tooltip : {
trigger: 'item'
......@@ -1149,11 +1149,11 @@ var optionMap = {
}
return {};
})(),
dynamic : (function(){
functionMap.dynamic = function() {
dynamic : (function (){
functionMap.dynamic = function () {
var lastData = 11;
var axisData;
timeTicket = setInterval(function(){
timeTicket = setInterval(function (){
lastData += Math.random() * ((Math.round(Math.random() * 10) % 2) == 0 ? 1 : -1);
lastData = lastData.toFixed(1) - 0;
axisData = (new Date()).toLocaleTimeString().replace(/^\D*/,'');
......@@ -1207,7 +1207,7 @@ var optionMap = {
{
type : 'category',
boundaryGap : true,
data : (function(){
data : (function (){
var now = new Date();
var res = [];
var len = 10;
......@@ -1222,7 +1222,7 @@ var optionMap = {
type : 'category',
boundaryGap : true,
splitline : {show : false},
data : (function(){
data : (function (){
var res = [];
var len = 10;
while (len--) {
......@@ -1260,7 +1260,7 @@ var optionMap = {
color : 'rgba(135,206,205,0.4)'
}
},
data:(function(){
data:(function (){
var res = [];
var len = 10;
while (len--) {
......@@ -1280,7 +1280,7 @@ var optionMap = {
}
}
},
data:(function(){
data:(function (){
var res = [];
var len = 10;
while (len--) {
......@@ -1308,7 +1308,7 @@ var optionMap = {
},
tooltip : {
trigger: 'item',
formatter : function(params) {
formatter : function (params) {
var g1 = params[1];
var serie = params[0];
var g2 = params[3];
......@@ -1646,8 +1646,8 @@ var optionMap = {
}
]
},
mix2 : (function(){
var sData1 = (function() {
mix2 : (function (){
var sData1 = (function () {
var d = [];
var len = 40;
var value;
......@@ -1660,7 +1660,7 @@ var optionMap = {
}
return d;
})();
var sData2 = (function() {
var sData2 = (function () {
var d = [];
var len = sData1.length;
for (var i = 0; i < len; i++) {
......@@ -1854,10 +1854,10 @@ var optionMap = {
]
}
],
animation: (function() {
functionMap.mix3 = function() {
animation: (function () {
functionMap.mix3 = function () {
var ecConfig = require('echarts/config');
myChart.on(ecConfig.EVENT.MAP_SELECTED, function(param){
myChart.on(ecConfig.EVENT.MAP_SELECTED, function (param){
var selected = param.selected;
var option = optionMap.mix3;
var mapSeries = option.series[0];
......@@ -1883,8 +1883,8 @@ var optionMap = {
return false;
})()
},
lasagna : (function() {
functionMap.lasagna = function() {
lasagna : (function () {
functionMap.lasagna = function () {
myChart.setOption({
tooltip : {
trigger: 'item',
......@@ -1904,7 +1904,7 @@ var optionMap = {
saveAsImage : {show: true}
}
},
series : (function(){
series : (function (){
var series = [];
for (var i = 0; i < 30; i++) {
series.push({
......@@ -1932,8 +1932,8 @@ var optionMap = {
};
return series;
})(),
calculable : (function(){
setTimeout(function(){
calculable : (function (){
setTimeout(function (){
if (!myChart) {
return;
}
......@@ -1966,9 +1966,9 @@ var optionMap = {
})()
}, true);
}
functionMap.wormhole = function() {
functionMap.wormhole = function () {
myChart.setOption({
color : (function(){
color : (function (){
var zrColor = require('zrender/tool/color');
return zrColor.getStepColors('yellow', 'red', 28);
})(),
......@@ -1985,7 +1985,7 @@ var optionMap = {
legend: {
// orient : 'vertical',
//x : 'center',
data: function(){
data: function (){
var list = [];
for (var i = 1; i <=28; i++) {
list.push(i + 2000);
......@@ -2018,7 +2018,7 @@ var optionMap = {
}
],
calculable : false,
series : (function(){
series : (function (){
var series = [];
for (var i = 1; i <= 28; i++) {
series.push({
......@@ -2056,7 +2056,7 @@ var optionMap = {
}
return {};
})(),
effect : (function() {
effect : (function () {
var effect = {
show: true,
scaleSize: 1,
......@@ -2081,7 +2081,7 @@ var optionMap = {
}
}
};
functionMap.effect = function() {
functionMap.effect = function () {
myChart.setOption({
//ackgroundColor: '#1b1b1b',
color: ['rgba(30,144,255,1)','lime'],
......@@ -2096,7 +2096,7 @@ var optionMap = {
},
tooltip : {
trigger: 'item',
formatter: function(v) {
formatter: function (v) {
return v[1].replace(':', ' > ');
}
},
......@@ -2333,7 +2333,7 @@ var optionMap = {
]
}, true);
}
functionMap.effect2 = function() {
functionMap.effect2 = function () {
myChart.setOption({
dbackgroundColor: '#1b1b1b',
color: ['gold','aqua','lime'],
......@@ -2347,7 +2347,7 @@ var optionMap = {
},
tooltip : {
trigger: 'item',
formatter: function(v) {
formatter: function (v) {
return v[1].replace(':', ' > ');
}
},
......@@ -2715,7 +2715,7 @@ var optionMap = {
},
markPoint : {
symbol:'emptyCircle',
symbolSize : function(v){
symbolSize : function (v){
return 10 + v/10
},
effect : {
......@@ -2773,7 +2773,7 @@ var optionMap = {
},
markPoint : {
symbol:'emptyCircle',
symbolSize : function(v){
symbolSize : function (v){
return 10 + v/10
},
effect : {
......@@ -2831,7 +2831,7 @@ var optionMap = {
},
markPoint : {
symbol:'emptyCircle',
symbolSize : function(v){
symbolSize : function (v){
return 10 + v/10
},
effect : {
......
......@@ -623,14 +623,14 @@
// Optional libraries used to extend on reveal.js
dependencies: [
{ src: 'lib/js/classList.js', condition: function() { return !document.body.classList; } },
{ src: 'plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
{ src: 'plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
{ src: 'plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
//{ src: 'plugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } },
{ src: 'plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } }
// { src: 'plugin/search/search.js', async: true, condition: function() { return !!document.body.classList; } }
// { src: 'plugin/remotes/remotes.js', async: true, condition: function() { return !!document.body.classList; } }
{ src: 'lib/js/classList.js', condition: function () { return !document.body.classList; } },
{ src: 'plugin/markdown/marked.js', condition: function () { return !!document.querySelector( '[data-markdown]' ); } },
{ src: 'plugin/markdown/markdown.js', condition: function () { return !!document.querySelector( '[data-markdown]' ); } },
{ src: 'plugin/highlight/highlight.js', async: true, callback: function () { hljs.initHighlightingOnLoad(); } },
//{ src: 'plugin/zoom-js/zoom.js', async: true, condition: function () { return !!document.body.classList; } },
{ src: 'plugin/notes/notes.js', async: true, condition: function () { return !!document.body.classList; } }
// { src: 'plugin/search/search.js', async: true, condition: function () { return !!document.body.classList; } }
// { src: 'plugin/remotes/remotes.js', async: true, condition: function () { return !!document.body.classList; } }
]
});
......
......@@ -153,7 +153,7 @@
'echarts',
'echarts/chart/bar' // 使用柱状图就加载bar模块,按需加载
],
function(ec) {
function (ec) {
// 基于准备好的dom,初始化echarts图表
var myChart = ec.init(document.getElementById('main'));
......@@ -300,7 +300,7 @@
'echarts',
'echarts/chart/bar'
],
function(ec) {
function (ec) {
var myChart = ec.init(document.getElementById('main'));
myChart.setOption(option);
}
......
......@@ -315,7 +315,7 @@
<script src="doc/asset/js/bootstrap-typeahead.js"></script>
<script>
!function ($) {
$(function(){
$(function (){
// carousel demo
// $('#myCarousel').carousel()
})
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册