Skip to content

Commit

Permalink
toolbox option重新设计 例子更新
Browse files Browse the repository at this point in the history
  • Loading branch information
@kener
kener committed Mar 18, 2014
1 parent 7fcfa3d commit c2dd45e
Show file tree
Hide file tree
Showing 89 changed files with 4,340 additions and 1,924 deletions.
2 changes: 1 addition & 1 deletion build/echarts-map.js
View file

Large diffs are not rendered by default.

1,397 changes: 992 additions & 405 deletions build/echarts-original-map.js
View file

Large diffs are not rendered by default.

1,203 changes: 897 additions & 306 deletions build/echarts-original.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/echarts-plain-map.js
View file

Large diffs are not rendered by default.

1,397 changes: 992 additions & 405 deletions build/echarts-plain-original-map.js
View file

Large diffs are not rendered by default.

1,203 changes: 897 additions & 306 deletions build/echarts-plain-original.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/echarts-plain.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/echarts.js
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions doc/asset/js/dataDancing.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ require(
toolbox: {
show : true,
feature : {
mark : true,
magicType:['line', 'bar', 'stack', 'tiled'],
restore : true,
saveAsImage : true
mark : {show: true},
magicType: {show: true, type: ['line', 'bar', 'stack', 'tiled']},
restore : {show: true},
saveAsImage : {show: true}
}
},
xAxis : [
Expand Down
156 changes: 108 additions & 48 deletions doc/asset/js/echartsConfig.js
View file

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions doc/asset/js/echartsThemeDesigner.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,9 @@ var option = {
toolbox: {
show : true,
feature : {
magicType:['line', 'bar'],
dataView : {readOnly: false},
restore : true
magicType: {show: true, type: ['line', 'bar']},
dataView : {show: true, readOnly: false},
restore : {show: true}
}
},
legend: {
Expand Down Expand Up @@ -305,8 +305,8 @@ var option = {
x : 'right',
y : 'center',
feature : {
magicType:['line', 'bar'],
restore : true
magicType: {show: true, type: ['line', 'bar']},
restore : {show: true}
}
},
tooltip : {
Expand Down Expand Up @@ -388,8 +388,8 @@ var option = {
x : 'right',
y : 'center',
feature : {
magicType:['line', 'bar'],
restore : true
magicType: {show: true, type: ['line', 'bar']},
restore : {show: true}
}
},
grid : {
Expand Down Expand Up @@ -465,11 +465,11 @@ var option = {
toolbox: {
show : true,
feature : {
mark : true,
dataZoom : true,
magicType:['line', 'bar'],
dataView : {readOnly: false},
restore : true
mark : {show: true},
dataZoom : {show: true},
magicType: {show: true, type: ['line', 'bar']},
dataView : {show: true, readOnly: false},
restore : {show: true}
}
},
dataZoom : {
Expand Down Expand Up @@ -668,8 +668,8 @@ var option = {
x : 'right',
y : 'center',
feature : {
dataZoom : true,
restore : true
dataZoom : {show: true},
restore : {show: true}
}
},
grid : {
Expand Down Expand Up @@ -833,8 +833,8 @@ var option = {
x : 'right',
y : 'center',
feature : {
dataZoom : true,
restore : true
dataZoom : {show: true},
restore : {show: true}
}
},
grid : {
Expand Down Expand Up @@ -920,9 +920,9 @@ var option = {
x: 'right',
y: 'center',
feature : {
mark : true,
dataView : {readOnly: false},
restore : true
mark : {show: true},
dataView : {show: true, readOnly: false},
restore : {show: true}
}
},
series : [
Expand Down
10 changes: 5 additions & 5 deletions doc/example/axis.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@
toolbox: {
show : true,
feature : {
mark : true,
dataView : true,
magicType:['line', 'bar'],
restore : true,
saveAsImage : true
mark : {show: true},
dataView : {show: true},
magicType : {show: true, type: ['line', 'bar']},
restore : {show: true},
saveAsImage : {show: true}
}
},
xAxis : [
Expand Down
10 changes: 5 additions & 5 deletions doc/example/bar.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@
toolbox: {
show : true,
feature : {
mark : true,
dataView : {readOnly: false},
magicType:['line', 'bar', 'stack', 'tiled'],
restore : true,
saveAsImage : true
mark : {show: true},
dataView : {show: true, readOnly: false},
magicType : {show: true, type: ['line', 'bar', 'stack', 'tiled']},
restore : {show: true},
saveAsImage : {show: true}
}
},
calculable : true,
Expand Down
10 changes: 5 additions & 5 deletions doc/example/bar1.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@
toolbox: {
show : true,
feature : {
mark : true,
dataView : {readOnly: false},
magicType:['line', 'bar'],
restore : true,
saveAsImage : true
mark : {show: true},
dataView : {show: true, readOnly: false},
magicType : {show: true, type: ['line', 'bar']},
restore : {show: true},
saveAsImage : {show: true}
}
},
calculable : true,
Expand Down
8 changes: 4 additions & 4 deletions doc/example/bar10.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@
toolbox: {
show : true,
feature : {
mark : true,
dataView : {readOnly: false},
restore : true,
saveAsImage : true
mark : {show: true},
dataView : {show: true, readOnly: false},
restore : {show: true},
saveAsImage : {show: true}
}
},
calculable : true,
Expand Down
10 changes: 5 additions & 5 deletions doc/example/bar2.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@
x: 'right',
y: 'center',
feature : {
mark : true,
dataView : {readOnly: false},
magicType:['line', 'bar', 'stack', 'tiled'],
restore : true,
saveAsImage : true
mark : {show: true},
dataView : {show: true, readOnly: false},
magicType : {show: true, type: ['line', 'bar', 'stack', 'tiled']},
restore : {show: true},
saveAsImage : {show: true}
}
},
calculable : true,
Expand Down
10 changes: 5 additions & 5 deletions doc/example/bar3.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@
toolbox: {
show : true,
feature : {
mark : true,
dataView : {readOnly: false},
magicType:['line', 'bar'],
restore : true,
saveAsImage : true
mark : {show: true},
dataView : {show: true, readOnly: false},
magicType: {show: true, type: ['line', 'bar']},
restore : {show: true},
saveAsImage : {show: true}
}
},
calculable : true,
Expand Down
10 changes: 5 additions & 5 deletions doc/example/bar4.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@
toolbox: {
show : true,
feature : {
mark : true,
dataView : {readOnly: false},
magicType:['line', 'bar', 'stack', 'tiled'],
restore : true,
saveAsImage : true
mark : {show: true},
dataView : {show: true, readOnly: false},
magicType : {show: true, type: ['line', 'bar', 'stack', 'tiled']},
restore : {show: true},
saveAsImage : {show: true}
}
},
calculable : true,
Expand Down
10 changes: 5 additions & 5 deletions doc/example/bar5.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@
toolbox: {
show : true,
feature : {
mark : true,
dataView : {readOnly: false},
magicType:['line', 'bar'],
restore : true,
saveAsImage : true
mark : {show: true},
dataView : {show: true, readOnly: false},
magicType : {show: true, type: ['line', 'bar']},
restore : {show: true},
saveAsImage : {show: true}
}
},
calculable : true,
Expand Down
8 changes: 4 additions & 4 deletions doc/example/bar6.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@
toolbox: {
show : true,
feature : {
mark : true,
dataView : {readOnly: false},
restore : true,
saveAsImage : true
mark : {show: true},
dataView : {show: true, readOnly: false},
restore : {show: true},
saveAsImage : {show: true}
}
},
xAxis : [
Expand Down
8 changes: 4 additions & 4 deletions doc/example/bar7.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@
toolbox: {
show : true,
feature : {
mark : true,
dataView : {readOnly: false},
restore : true,
saveAsImage : true
mark : {show: true},
dataView : {show: true, readOnly: false},
restore : {show: true},
saveAsImage : {show: true}
}
},
xAxis : [
Expand Down
10 changes: 5 additions & 5 deletions doc/example/bar8.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@
toolbox: {
show : true,
feature : {
mark : true,
dataView : {readOnly: false},
magicType:['line', 'bar'],
restore : true,
saveAsImage : true
mark : {show: true},
dataView : {show: true, readOnly: false},
magicType : {show: true, type: ['line', 'bar']},
restore : {show: true},
saveAsImage : {show: true}
}
},
grid: {
Expand Down
8 changes: 4 additions & 4 deletions doc/example/bar9.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@
toolbox: {
show : true,
feature : {
mark : true,
dataView : {readOnly: false},
restore : true,
saveAsImage : true
mark : {show: true},
dataView : {show: true, readOnly: false},
restore : {show: true},
saveAsImage : {show: true}
}
},
grid: {
Expand Down
10 changes: 5 additions & 5 deletions doc/example/dataRange1.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@
toolbox: {
show : true,
feature : {
mark : true,
dataZoom: true,
dataView : {readOnly: false},
restore : true,
saveAsImage : true
mark : {show: true},
dataZoom : {show: true},
dataView : {show: true, readOnly: false},
restore : {show: true},
saveAsImage : {show: true}
}
},
dataRange: {
Expand Down
12 changes: 6 additions & 6 deletions doc/example/dataZoom.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@
toolbox: {
show : true,
feature : {
mark : true,
dataZoom : true,
dataView : true,
magicType:['line', 'bar'],
restore : true,
saveAsImage : true
mark : {show: true},
dataZoom : {show: true},
dataView : {show: true},
magicType : {show: true, type: ['line', 'bar']},
restore : {show: true},
saveAsImage : {show: true}
}
},
calculable : true,
Expand Down
12 changes: 6 additions & 6 deletions doc/example/dataZoom1.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@
toolbox: {
show : true,
feature : {
mark : true,
dataZoom : true,
dataView : true,
magicType:['line', 'bar', 'stack', 'tiled'],
restore : true,
saveAsImage : true
mark : {show: true},
dataZoom : {show: true},
dataView : {show: true},
magicType : {show: true, type: ['line', 'bar', 'stack', 'tiled']},
restore : {show: true},
saveAsImage : {show: true}
}
},
calculable : true,
Expand Down
10 changes: 5 additions & 5 deletions doc/example/demo.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,11 @@
toolbox: {
show : true,
feature : {
mark : true,
dataView : {readOnly: false},
magicType:['line', 'bar'],
restore : true,
saveAsImage : true
mark : {show: true},
dataView : {show: true, readOnly: false},
magicType : {show: true, type: ['line', 'bar']},
restore : {show: true},
saveAsImage : {show: true}
}
},
calculable : true,
Expand Down
10 changes: 5 additions & 5 deletions doc/example/dynamicLineBar.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@
toolbox: {
show : true,
feature : {
mark : true,
dataView : {readOnly: false},
magicType:['line', 'bar'],
restore : true,
saveAsImage : true
mark : {show: true},
dataView : {show: true, readOnly: false},
magicType : {show: true, type: ['line', 'bar']},
restore : {show: true},
saveAsImage : {show: true}
}
},
dataZoom : {
Expand Down
Loading

0 comments on commit c2dd45e

Please sign in to comment.