diff --git a/doc/asset/js/echartsTheme.js b/doc/asset/js/echartsTheme.js
index 5fa6a401b2..2869df24d7 100644
--- a/doc/asset/js/echartsTheme.js
+++ b/doc/asset/js/echartsTheme.js
@@ -5,14 +5,22 @@ var theme = 'erik';
$('[name=theme-select]').on('change', function(){selectChange(this.value);});
function selectChange(value){
- window.location.hash = value;
+
theme = value;
showLoading();
$('[name=theme-select]').val(theme);
- require(['theme/' + theme], function(curTheme){
- theme = curTheme;
+ if (theme != 'default') {
+ window.location.hash = value;
+ require(['theme/' + theme], function(curTheme){
+ theme = curTheme;
+ setTimeout(refreshAll, 500);
+ })
+ }
+ else {
+ window.location.hash = '';
+ theme = {};
setTimeout(refreshAll, 500);
- })
+ }
}
function showLoading() {
@@ -65,7 +73,7 @@ else {
});
}
-var hash = window.location.hash.replace('#','') || 'default';
+var hash = window.location.hash.replace('#','') || 'erik';
if ($('[name=theme-select]').val(hash).val() != hash) {
$('[name=theme-select]').val('erik');
hash = 'erik';
diff --git a/doc/example/map1.html b/doc/example/map1.html
index ea776811ab..d9d180b520 100644
--- a/doc/example/map1.html
+++ b/doc/example/map1.html
@@ -112,7 +112,7 @@
type: 'map',
mapType: 'china',
itemStyle:{
- normal:{label:{show:true}, color:'#ffd700'},// for legend
+ normal:{label:{show:true}},
emphasis:{label:{show:true}}
},
data:[
@@ -157,7 +157,7 @@
type: 'map',
mapType: 'china',
itemStyle:{
- normal:{label:{show:true}, color:'#ff8c00'},// for legend
+ normal:{label:{show:true}},
emphasis:{label:{show:true}}
},
data:[
@@ -187,7 +187,7 @@
type: 'map',
mapType: 'china',
itemStyle:{
- normal:{label:{show:true}, color:'#da70d6'},// for legend
+ normal:{label:{show:true}},
emphasis:{label:{show:true}}
},
data:[
diff --git a/doc/example/map4.html b/doc/example/map4.html
index 335d7c6ed9..cc2da758a3 100644
--- a/doc/example/map4.html
+++ b/doc/example/map4.html
@@ -106,6 +106,7 @@
min: 0,
max: 1000000,
text:['High','Low'],
+ realtime: false,
calculable : true,
color: ['orangered','yellow','lightskyblue']
},
diff --git a/doc/example/map6.html b/doc/example/map6.html
index 7afd602de5..961cd32f27 100644
--- a/doc/example/map6.html
+++ b/doc/example/map6.html
@@ -103,6 +103,7 @@
min: 800,
max: 50000,
text:['High','Low'],
+ realtime: false,
calculable : true,
color: ['orangered','yellow','lightskyblue']
},
diff --git a/doc/example/theme.html b/doc/example/theme.html
index 2efcc5319b..1d9df4930f 100644
--- a/doc/example/theme.html
+++ b/doc/example/theme.html
@@ -77,6 +77,7 @@
+
@@ -133,6 +134,7 @@
+