This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git

commit 1afda1b24cd23aeb48a2be895390d28a6fe39f06
Author: SHUANG SU <[email protected]>
AuthorDate: Fri Sep 27 20:23:57 2019 +0800

    fix: add muti-lang for legend selector and little tweak.
---
 src/component/legend/LegendModel.js |  6 +++---
 src/lang.js                         |  7 +++++--
 src/langEN.js                       |  7 +++++--
 src/langES.js                       |  9 +++++++++
 src/langFI.js                       |  9 +++++++++
 src/langTH.js                       | 10 ++++++++++
 test/bar2.html                      |  8 +++++++-
 7 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/src/component/legend/LegendModel.js 
b/src/component/legend/LegendModel.js
index ceeb39b..bdb189b 100644
--- a/src/component/legend/LegendModel.js
+++ b/src/component/legend/LegendModel.js
@@ -23,16 +23,16 @@ import Model from '../../model/Model';
 import {isNameSpecified} from '../../util/model';
 import lang from '../../lang';
 
-var langTitle = lang.legendSelector.title;
+var langSelector = lang.legend.selector;
 
 var defaultSelectorOption = {
     all: {
         type: 'all',
-        title: zrUtil.clone(langTitle.all)
+        title: zrUtil.clone(langSelector.all)
     },
     inverse: {
         type: 'inverse',
-        title: zrUtil.clone(langTitle.inverse)
+        title: zrUtil.clone(langSelector.inverse)
     }
 };
 
diff --git a/src/lang.js b/src/lang.js
index 778f93d..b369139 100644
--- a/src/lang.js
+++ b/src/lang.js
@@ -17,10 +17,13 @@
 * under the License.
 */
 
+/**
+ * Language: (Simplified) Chinese.
+ */
 
 export default {
-    legendSelector: {
-        title: {
+    legend: {
+        selector: {
             all: '全选',
             inverse: '反选'
         }
diff --git a/src/langEN.js b/src/langEN.js
index c904a11..dea29d7 100644
--- a/src/langEN.js
+++ b/src/langEN.js
@@ -17,10 +17,13 @@
 * under the License.
 */
 
+/**
+ * Language: English.
+ */
 
 export default {
-    legendSelector: {
-        title: {
+    legend: {
+        selector: {
             all: 'All',
             inverse: 'Inv'
         }
diff --git a/src/langES.js b/src/langES.js
index 0d8ba3b..2fba545 100644
--- a/src/langES.js
+++ b/src/langES.js
@@ -17,8 +17,17 @@
 * under the License.
 */
 
+/**
+ * Language: Spanish
+ */
 
 export default {
+    legend: {
+        selector: {
+            all: 'Todas',
+            inverse: 'Inversa'
+        }
+    },
     toolbox: {
         brush: {
             title: {
diff --git a/src/langFI.js b/src/langFI.js
index 93a34d3..bdeffe4 100644
--- a/src/langFI.js
+++ b/src/langFI.js
@@ -17,8 +17,17 @@
 * under the License.
 */
 
+/**
+ * Language: Finnish
+ */
 
 export default {
+    legend: {
+        selector: {
+            all: 'Kaikki',
+            inverse: 'Käänteinen'
+        }
+    },
     toolbox: {
         brush: {
             title: {
diff --git a/src/langTH.js b/src/langTH.js
index 1a82776..0ae102d 100644
--- a/src/langTH.js
+++ b/src/langTH.js
@@ -17,7 +17,17 @@
 * under the License.
 */
 
+/**
+ * Language: Thai
+ */
+
 export default {
+    legend: {
+        selector: {
+            all: 'ทั้งหมด',
+            inverse: 'ผกผัน'
+        }
+    },
     toolbox: {
         brush: {
             title: {
diff --git a/test/bar2.html b/test/bar2.html
index 9692cb7..06100d1 100644
--- a/test/bar2.html
+++ b/test/bar2.html
@@ -358,7 +358,7 @@ under the License.
 
                 function makeSeriesData() {
                     var result = [];
-                    var date = 100;
+                    var date = 0;
                     for (var i = 0; i < dataCount; i++) {
                         result.push([+date, Math.random() * 1000]);
                         date += 5;
@@ -372,6 +372,7 @@ under the License.
                 option = {
                     xAxis: {
                         scale: true,
+                        // boundaryGap: ['0.5%', .1],
                         splitLine: {show: false}
                     },
                     yAxis: {
@@ -382,6 +383,11 @@ under the License.
                         axisTick: {show: false},
                         splitLine: {show: false}
                     },
+                    dataZoom: [{
+                        type: 'slider'
+                    }, {
+                        type: 'inside'
+                    }],
                     legend: {},
                     series: [{
                         name: 'barA',


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to