You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by sh...@apache.org on 2020/08/04 06:22:12 UTC
[incubator-echarts] branch master updated: fix(lines): lines series
shouldn't disappear after `setOption({})`, fix apache#12836.
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
The following commit(s) were added to refs/heads/master by this push:
new 42ba17f fix(lines): lines series shouldn't disappear after `setOption({})`, fix apache#12836.
new 419336e Merge pull request #12850 from plainheart/fix-lines-mergeOption-12836
42ba17f is described below
commit 42ba17f8b01ef39a1afc29b8422a4bd0b9b584f0
Author: plainheart <yh...@all-my-life.cn>
AuthorDate: Tue Jun 23 11:35:01 2020 +0800
fix(lines): lines series shouldn't disappear after `setOption({})`, fix apache#12836.
---
src/chart/lines/LinesSeries.js | 4 +-
test/lines-mergeOption.html | 103 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 104 insertions(+), 3 deletions(-)
diff --git a/src/chart/lines/LinesSeries.js b/src/chart/lines/LinesSeries.js
index 047f0b6..e66098f 100644
--- a/src/chart/lines/LinesSeries.js
+++ b/src/chart/lines/LinesSeries.js
@@ -80,8 +80,6 @@ var LinesSeries = SeriesModel.extend({
},
mergeOption: function (option) {
- // The input data may be null/undefined.
- option.data = option.data || [];
compatEc2(option);
@@ -333,4 +331,4 @@ var LinesSeries = SeriesModel.extend({
}
});
-export default LinesSeries;
\ No newline at end of file
+export default LinesSeries;
diff --git a/test/lines-mergeOption.html b/test/lines-mergeOption.html
new file mode 100644
index 0000000..67aaabd
--- /dev/null
+++ b/test/lines-mergeOption.html
@@ -0,0 +1,103 @@
+<!DOCTYPE html>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+
+<html>
+ <head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1" />
+ <script src="lib/esl.js"></script>
+ <script src="lib/config.js"></script>
+ <script src="lib/facePrint.js"></script>
+ <script src="lib/testHelper.js"></script>
+ <link rel="stylesheet" href="lib/reset.css" />
+ </head>
+ <body>
+ <style>
+ .test-title {
+ background: #146402;
+ color: #fff;
+ }
+ </style>
+
+
+ <div id="main0"></div>
+
+ <script>
+
+ // See <https://github.com/apache/incubator-echarts/issues/12836>
+
+ var chart;
+ var myChart;
+ var option;
+
+ require([
+ 'echarts'
+ ], function (echarts) {
+ option = {
+ xAxis: {
+ type: 'category',
+ data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+ },
+ yAxis: [
+ {
+ scale: true,
+ },
+ ],
+ series: [
+ {
+ data: [1320, 1800],
+ type: 'line'
+ },
+ {
+ type: 'lines',
+ coordinateSystem: 'cartesian2d',
+ data: [{
+ coords: [
+ ['Tue', 1500],
+ ['Thu', 1800]
+ ]
+ }, {
+ coords: [
+ ['Fri', 1600],
+ ['Sat', 1400]
+ ]
+ }]
+ }
+ ]
+ };
+
+ chart = myChart = testHelper.create(echarts, 'main0', {
+ title: ['lines series should not disappear after `chart.setOption({})`'],
+ option: option,
+ info: option,
+ button: {
+ text: 'Click to setOption({})',
+ onClick: function () {
+ myChart.setOption({});
+ }
+ }
+ });
+ });
+
+ </script>
+
+ </body>
+</html>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org