配图更新

jinhuaxiao · Jun 28, 2014 · 5a39e55 · 5a39e55
1 parent cfd862b
commit 5a39e55
Show file tree

Hide file tree

Showing 67 changed files with 59 additions and 109 deletions.
diff --git a/doc/asset/img/example/bar1.png b/doc/asset/img/example/bar1.png
diff --git a/doc/asset/img/example/bar10.png b/doc/asset/img/example/bar10.png
diff --git a/doc/asset/img/example/bar2.png b/doc/asset/img/example/bar2.png
diff --git a/doc/asset/img/example/bar3.png b/doc/asset/img/example/bar3.png
diff --git a/doc/asset/img/example/bar4.png b/doc/asset/img/example/bar4.png
diff --git a/doc/asset/img/example/bar5.png b/doc/asset/img/example/bar5.png
diff --git a/doc/asset/img/example/bar6.png b/doc/asset/img/example/bar6.png
diff --git a/doc/asset/img/example/bar7.png b/doc/asset/img/example/bar7.png
diff --git a/doc/asset/img/example/bar8.png b/doc/asset/img/example/bar8.png
diff --git a/doc/asset/img/example/bar9.png b/doc/asset/img/example/bar9.png
diff --git a/doc/asset/img/example/chord.png b/doc/asset/img/example/chord.png
diff --git a/doc/asset/img/example/chord1.png b/doc/asset/img/example/chord1.png
diff --git a/doc/asset/img/example/chord2.png b/doc/asset/img/example/chord2.png
diff --git a/doc/asset/img/example/dataZoom.png b/doc/asset/img/example/dataZoom.png
diff --git a/doc/asset/img/example/dataZoom1.png b/doc/asset/img/example/dataZoom1.png
diff --git a/doc/asset/img/example/dynamicLineBar.png b/doc/asset/img/example/dynamicLineBar.png
diff --git a/doc/asset/img/example/dynamicPieRadar.png b/doc/asset/img/example/dynamicPieRadar.png
diff --git a/doc/asset/img/example/dynamicScatterK.png b/doc/asset/img/example/dynamicScatterK.png
diff --git a/doc/asset/img/example/force1.png b/doc/asset/img/example/force1.png
diff --git a/doc/asset/img/example/force2.png b/doc/asset/img/example/force2.png
diff --git a/doc/asset/img/example/k.png b/doc/asset/img/example/k.png
diff --git a/doc/asset/img/example/k1.png b/doc/asset/img/example/k1.png
diff --git a/doc/asset/img/example/lasagna.png b/doc/asset/img/example/lasagna.png
diff --git a/doc/asset/img/example/line.png b/doc/asset/img/example/line.png
diff --git a/doc/asset/img/example/line1.png b/doc/asset/img/example/line1.png
diff --git a/doc/asset/img/example/line2.png b/doc/asset/img/example/line2.png
diff --git a/doc/asset/img/example/line3.png b/doc/asset/img/example/line3.png
diff --git a/doc/asset/img/example/line4.png b/doc/asset/img/example/line4.png
diff --git a/doc/asset/img/example/line5.png b/doc/asset/img/example/line5.png
diff --git a/doc/asset/img/example/map11.png b/doc/asset/img/example/map11.png
diff --git a/doc/asset/img/example/map9.png b/doc/asset/img/example/map9.png
diff --git a/doc/asset/img/example/mix1.png b/doc/asset/img/example/mix1.png
diff --git a/doc/asset/img/example/mix4.png b/doc/asset/img/example/mix4.png
diff --git a/doc/asset/img/example/mix6.png b/doc/asset/img/example/mix6.png
diff --git a/doc/asset/img/example/mix7.png b/doc/asset/img/example/mix7.png
diff --git a/doc/asset/img/example/pie1.png b/doc/asset/img/example/pie1.png
diff --git a/doc/asset/img/example/pie2.png b/doc/asset/img/example/pie2.png
diff --git a/doc/asset/img/example/pie3.png b/doc/asset/img/example/pie3.png
diff --git a/doc/asset/img/example/pie4.png b/doc/asset/img/example/pie4.png
diff --git a/doc/asset/img/example/pie5.png b/doc/asset/img/example/pie5.png
diff --git a/doc/asset/img/example/radar1.png b/doc/asset/img/example/radar1.png
diff --git a/doc/asset/img/example/radar2.png b/doc/asset/img/example/radar2.png
diff --git a/doc/asset/img/example/scatter1.png b/doc/asset/img/example/scatter1.png
diff --git a/doc/asset/img/example/scatter2.png b/doc/asset/img/example/scatter2.png
diff --git a/doc/asset/img/example/scatter3.png b/doc/asset/img/example/scatter3.png
diff --git a/doc/asset/img/example/webkit-dep.png b/doc/asset/img/example/webkit-dep.png
diff --git a/doc/example/force2.html b/doc/example/force2.html
@@ -110,6 +110,13 @@
         trigger: 'item',
         formatter: '{a} : {b}'
     },
+    toolbox: {
+        show : true,
+        feature : {
+            restore : {show: true},
+            saveAsImage : {show: true}
+        }
+    },
     legend: {
         x: 'left',
         data:['叶子节点','非叶子节点', '根节点']
@@ -120,28 +127,13 @@
             name : "Force tree",
             categories : [
                 {
-                    name: '叶子节点',
-                    itemStyle: {
-                        normal: {
-                            color : '#ff7f50'
-                        }
-                    }
+                    name: '叶子节点'
                 },
                 {
-                    name: '非叶子节点',
-                    itemStyle: {
-                        normal: {
-                            color : '#6f57bc'
-                        }
-                    }
+                    name: '非叶子节点'
                 },
                 {
-                    name: '根节点',
-                    itemStyle: {
-                        normal: {
-                            color : '#af0000'
-                        }
-                    }
+                    name: '根节点'
                 }
             ],
             itemStyle: {

diff --git a/doc/example/force3.html b/doc/example/force3.html
@@ -118,28 +118,13 @@
             name : "Force tree",
             categories : [
                 {
-                    name: '叶子节点',
-                    itemStyle: {
-                        normal: {
-                            color : '#ff7f50'
-                        }
-                    }
+                    name: '叶子节点'
                 },
                 {
-                    name: '非叶子节点',
-                    itemStyle: {
-                        normal: {
-                            color : '#6f57bc'
-                        }
-                    }
+                    name: '非叶子节点'
                 },
                 {
-                    name: '根节点',
-                    itemStyle: {
-                        normal: {
-                            color : '#af0000'
-                        }
-                    }
+                    name: '根节点'
                 }
             ],
             itemStyle: {

diff --git a/doc/example/force4.html b/doc/example/force4.html
@@ -59,12 +59,7 @@
             name : "模块关系",
             categories : [
                 {
-                    name: '模块',
-                    itemStyle: {
-                        normal: {
-                            color : '#ff7f50'
-                        }
-                    }
+                    name: '模块'
                 }
             ],
             itemStyle: {

diff --git a/doc/example/force5.html b/doc/example/force5.html
@@ -110,6 +110,13 @@
         trigger: 'item',
         formatter: '{a} : {b}'
     },
+    toolbox: {
+        show : true,
+        feature : {
+            restore : {show: true},
+            saveAsImage : {show: true}
+        }
+    },
     legend: {
         x: 'left',
         data:['叶子节点','非叶子节点', '根节点']

diff --git a/doc/example/gauge.html b/doc/example/gauge.html
@@ -139,7 +139,7 @@
 clearInterval(timeTicket);
 timeTicket = setInterval(function (){
     option.series[0].data[0].value = (Math.random()*100).toFixed(2) - 0;
-    myChart.setOption(option);
+    myChart.setOption(option, true);
 },2000)
                     </textarea>
               </div><!--/.well -->
@@ -165,6 +165,7 @@
     <script src="../asset/js/jquery.min.js"></script>
     <script type="text/javascript" src="../asset/js/echartsHome.js"></script>
     <script src="../asset/js/bootstrap.min.js"></script>
+    <script type="text/javascript">var timeTicket;</script>
     <script src="../asset/js/echartsExample.js"></script>
 </body>
 </html>
diff --git a/doc/example/gauge1.html b/doc/example/gauge1.html
@@ -64,8 +64,8 @@
 clearInterval(timeTicket);
 timeTicket = setInterval(function (){
     option.series[0].data[0].value = (Math.random()*100).toFixed(2) - 0;
-    myChart.setOption(option);
-},2000)
+    myChart.setOption(option, true);
+},2000);
                     </textarea>
               </div><!--/.well -->
             </div><!--/span-->
@@ -90,6 +90,7 @@
     <script src="../asset/js/jquery.min.js"></script>
     <script type="text/javascript" src="../asset/js/echartsHome.js"></script>
     <script src="../asset/js/bootstrap.min.js"></script>
+    <script type="text/javascript">var timeTicket;</script>
     <script src="../asset/js/echartsExample.js"></script>
 </body>
 </html>
diff --git a/doc/example/gauge2.html b/doc/example/gauge2.html
@@ -106,7 +106,7 @@
 clearInterval(timeTicket);
 timeTicket = setInterval(function (){
     option.series[0].data[0].value = (Math.random()*100).toFixed(2) - 0;
-    myChart.setOption(option);
+    myChart.setOption(option,true);
 },2000)
                     </textarea>
               </div><!--/.well -->
@@ -132,6 +132,7 @@
     <script src="../asset/js/jquery.min.js"></script>
     <script type="text/javascript" src="../asset/js/echartsHome.js"></script>
     <script src="../asset/js/bootstrap.min.js"></script>
+    <script type="text/javascript">var timeTicket;</script>
     <script src="../asset/js/echartsExample.js"></script>
 </body>
 </html>
diff --git a/doc/example/gauge3.html b/doc/example/gauge3.html
@@ -117,7 +117,7 @@
 clearInterval(timeTicket);
 timeTicket = setInterval(function (){
     option.series[0].data[0].value = (Math.random()*100).toFixed(2) - 0;
-    myChart.setOption(option);
+    myChart.setOption(option,true);
 },2000)
                     </textarea>
               </div><!--/.well -->
@@ -143,6 +143,7 @@
     <script src="../asset/js/jquery.min.js"></script>
     <script type="text/javascript" src="../asset/js/echartsHome.js"></script>
     <script src="../asset/js/bootstrap.min.js"></script>
+    <script type="text/javascript">var timeTicket;</script>
     <script src="../asset/js/echartsExample.js"></script>
 </body>
 </html>
diff --git a/doc/example/gauge4.html b/doc/example/gauge4.html
@@ -231,7 +231,7 @@
     option.series[1].data[0].value = (Math.random()*7).toFixed(2) - 0;
     option.series[2].data[0].value = (Math.random()*2).toFixed(2) - 0;
     option.series[3].data[0].value = (Math.random()*2).toFixed(2) - 0;
-    myChart.setOption(option);
+    myChart.setOption(option,true);
 },2000)
                     </textarea>
               </div><!--/.well -->
@@ -240,9 +240,6 @@
                 <div id="main" class="main"></div>
                 <div>
                     <button type="button" class="btn btn-sm btn-success" onclick="refresh(true)">刷 新</button>
-                    <span class="text-primary">切换主题</span>
-                    <select id="theme-select"></select>
-
                     <span id='wrong-message' style="color:red"></span>
                 </div>
             </div><!--/span-->
@@ -257,6 +254,7 @@
     <script src="../asset/js/jquery.min.js"></script>
     <script type="text/javascript" src="../asset/js/echartsHome.js"></script>
     <script src="../asset/js/bootstrap.min.js"></script>
+    <script type="text/javascript">var timeTicket;</script>
     <script src="../asset/js/echartsExample.js"></script>
 </body>
 </html>
diff --git a/doc/example/gauge5.html b/doc/example/gauge5.html
@@ -323,7 +323,7 @@
     option.series[1].data[0].value = (Math.random()*7).toFixed(2) - 0;
     option.series[2].data[0].value = (Math.random()*2).toFixed(2) - 0;
     option.series[3].data[0].value = (Math.random()*2).toFixed(2) - 0;
-    myChart.setOption(option);
+    myChart.setOption(option,true);
 },2000)
                     </textarea>
               </div><!--/.well -->
@@ -332,9 +332,6 @@
                 <div id="main" class="main"></div>
                 <div>
                     <button type="button" class="btn btn-sm btn-success" onclick="refresh(true)">刷 新</button>
-                    <span class="text-primary">切换主题</span>
-                    <select id="theme-select"></select>
-
                     <span id='wrong-message' style="color:red"></span>
                 </div>
             </div><!--/span-->
@@ -349,6 +346,7 @@
     <script src="../asset/js/jquery.min.js"></script>
     <script type="text/javascript" src="../asset/js/echartsHome.js"></script>
     <script src="../asset/js/bootstrap.min.js"></script>
+    <script type="text/javascript">var timeTicket;</script>
     <script src="../asset/js/echartsExample.js"></script>
 </body>
 </html>
diff --git a/doc/example/line1.html b/doc/example/line1.html
@@ -73,24 +73,13 @@
             type : 'value',
             axisLabel : {
                 formatter: '{value} °C'
-            },
-            splitArea : {show : true}
+            }
         }
     ],
     series : [
         {
             name:'最高气温',
             type:'line',
-            itemStyle: {
-                normal: {
-                    lineStyle: {
-                        shadowColor : 'rgba(0,0,0,0.4)',
-                        shadowBlur: 5,
-                        shadowOffsetX: 3,
-                        shadowOffsetY: 3
-                    }
-                }
-            },
             data:[11, 11, 15, 13, 12, 13, 10],
             markPoint : {
                 data : [
@@ -107,16 +96,6 @@
         {
             name:'最低气温',
             type:'line',
-            itemStyle: {
-                normal: {
-                    lineStyle: {
-                        shadowColor : 'rgba(0,0,0,0.4)',
-                        shadowBlur: 5,
-                        shadowOffsetX: 3,
-                        shadowOffsetY: 3
-                    }
-                }
-            },
             data:[1, -2, 2, 5, 3, 2, 0],
             markPoint : {
                 data : [

diff --git a/doc/example/line2.html b/doc/example/line2.html
@@ -66,8 +66,7 @@
     ],
     yAxis : [
         {
-            type : 'value',
-            splitArea : {show : true}
+            type : 'value'
         }
     ],
     series : [

diff --git a/doc/example/line4.html b/doc/example/line4.html
@@ -74,45 +74,35 @@
             name:'邮件营销',
             type:'line',
             stack: '总量',
-            itemStyle: {normal: {areaStyle: {
-                color: 'rgba(255, 69, 0, 0.7)'
-            }}},
+            itemStyle: {normal: {areaStyle: {type: 'default'}}},
             data:[120, 132, 101, 134, 90, 230, 210]
         },
         {
             name:'联盟广告',
             type:'line',
             stack: '总量',
-            itemStyle: {normal: {areaStyle: {
-                color: 'rgba(30, 144, 255, 0.6)'
-            }}},
+            itemStyle: {normal: {areaStyle: {type: 'default'}}},
             data:[220, 182, 191, 234, 290, 330, 310]
         },
         {
             name:'视频广告',
             type:'line',
             stack: '总量',
-            itemStyle: {normal: {areaStyle: {
-                color: 'rgba(138, 43, 226, 0.5)'
-            }}},
+            itemStyle: {normal: {areaStyle: {type: 'default'}}},
             data:[150, 232, 201, 154, 190, 330, 410]
         },
         {
             name:'直接访问',
             type:'line',
             stack: '总量',
-            itemStyle: {normal: {areaStyle: {
-                color: 'rgba(34, 139, 34, 0.4)'
-            }}},
+            itemStyle: {normal: {areaStyle: {type: 'default'}}},
             data:[320, 332, 301, 334, 390, 330, 320]
         },
         {
             name:'搜索引擎',
             type:'line',
             stack: '总量',
-            itemStyle: {normal: {areaStyle: {
-                color: 'rgba(220, 20, 60, 0.3)'
-            }}},
+            itemStyle: {normal: {areaStyle: {type: 'default'}}},
             data:[820, 932, 901, 934, 1290, 1330, 1320]
         }
     ]

diff --git a/doc/example/map1.html b/doc/example/map1.html
@@ -61,6 +61,8 @@
     dataRange: {
         min: 0,
         max: 2500,
+        x: 'left',
+        y: 'bottom',
         text:['高','低'],           // 文本，默认为数值文本
         calculable : true
     },

diff --git a/doc/example/mix1.html b/doc/example/mix1.html
@@ -69,16 +69,14 @@
             name : '水量',
             axisLabel : {
                 formatter: '{value} ml'
-            },
-            splitArea : {show : true}
+            }
         },
         {
             type : 'value',
             name : '温度',
             axisLabel : {
                 formatter: '{value} °C'
-            },
-            splitLine : {show : false}
+            }
         }
     ],
     series : [

diff --git a/doc/example/mix4.html b/doc/example/mix4.html
@@ -83,8 +83,7 @@
     ],
     yAxis : [
         {
-            type : 'value',
-            splitArea : {show : true}
+            type : 'value'
         },
         {
             type : 'value'

diff --git a/doc/example/mix6.html b/doc/example/mix6.html
@@ -78,8 +78,7 @@
         {
             type : 'value',
             min : 200,
-            max : 450,
-            splitArea : {show : true}
+            max : 450
         }
     ],
     series : [

diff --git a/doc/example/pie1.html b/doc/example/pie1.html
@@ -69,7 +69,7 @@
             name:'访问来源',
             type:'pie',
             radius : '55%',
-            center: ['50%', 225],
+            center: ['50%', '60%'],
             data:[
                 {value:335, name:'直接访问'},
                 {value:310, name:'邮件营销'},