You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by ov...@apache.org on 2019/05/22 08:24:57 UTC
[incubator-echarts] branch master updated (f0d2204 -> 5938dc6)
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.
from f0d2204 fix: use a clearer warning message when initing dom without size #10478 (#10509)
new f34724e Fix stack in markline don't work
new 0d76897 Change weird dim name
new c264553 Add missing '_'
new ac7a384 Fix markLine in stack.
new 5938dc6 Tweak the last commit
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/component/marker/MarkLineView.js | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 02/05: Change weird dim name
Posted by ov...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 0d76897937b901cd18b3291ffe795d1e7bda489e
Author: susiwen <su...@gmail.com>
AuthorDate: Mon May 20 18:13:08 2019 +0800
Change weird dim name
---
src/component/marker/MarkLineView.js | Bin 13611 -> 13612 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/src/component/marker/MarkLineView.js b/src/component/marker/MarkLineView.js
index 7694e33..05783bc 100644
Binary files a/src/component/marker/MarkLineView.js and b/src/component/marker/MarkLineView.js differ
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 03/05: Add missing '_'
Posted by ov...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit c2645530a2bb87eb79f62d79295417d23761d87b
Author: susiwen <su...@gmail.com>
AuthorDate: Tue May 21 17:40:23 2019 +0800
Add missing '_'
---
src/component/marker/MarkLineView.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/component/marker/MarkLineView.js b/src/component/marker/MarkLineView.js
index 05783bc..f18f304 100644
--- a/src/component/marker/MarkLineView.js
+++ b/src/component/marker/MarkLineView.js
@@ -44,7 +44,7 @@ var markLineTransform = function (seriesModel, coordSys, mlModel, item) {
var value;
if (item.yAxis != null || item.xAxis != null) {
- valueDataDim = seriesModel.get('stack') != null ? '_\0ecstackresult' : item.yAxis != null ? 'y' : 'x';
+ valueDataDim = seriesModel.get('stack') != null ? '__\0ecstackresult' : item.yAxis != null ? 'y' : 'x';
valueAxis = coordSys.getAxis(valueDataDim);
value = zrUtil.retrieve(item.yAxis, item.xAxis);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 05/05: Tweak the last commit
Posted by ov...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 5938dc659e39e242dc527bd1353fb61d9a53c318
Author: sushuang <su...@gmail.com>
AuthorDate: Tue May 21 23:26:28 2019 +0800
Tweak the last commit
Tweak the last commit
---
src/component/marker/MarkLineView.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/component/marker/MarkLineView.js b/src/component/marker/MarkLineView.js
index 7aa9857..eb75ee7 100644
--- a/src/component/marker/MarkLineView.js
+++ b/src/component/marker/MarkLineView.js
@@ -41,7 +41,6 @@ var markLineTransform = function (seriesModel, coordSys, mlModel, item) {
)
) {
var valueAxis;
- var valueDataDim;
var value;
if (item.yAxis != null || item.xAxis != null) {
@@ -50,8 +49,8 @@ var markLineTransform = function (seriesModel, coordSys, mlModel, item) {
}
else {
var axisInfo = markerHelper.getAxisInfo(item, data, coordSys, seriesModel);
- valueDataDim = getStackedDimension(data, axisInfo.valueDataDim);
valueAxis = axisInfo.valueAxis;
+ var valueDataDim = getStackedDimension(data, axisInfo.valueDataDim);
value = markerHelper.numCalculate(data, valueDataDim, mlType);
}
var valueIndex = valueAxis.dim === 'x' ? 0 : 1;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 04/05: Fix markLine in stack.
Posted by ov...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit ac7a38449e1cfbadc6804e1a267b6a5d7dfcf6f3
Author: sushuang <su...@gmail.com>
AuthorDate: Tue May 21 23:24:43 2019 +0800
Fix markLine in stack.
Fix markLine in stack.
(1) when xAxis or yAxis is set, the markLine is layout only by the given xAxis or yAxis value but has nothing to do with data
(2) Stacked dimension should be retrieved by util `dataStackHelper` but not visit private props directly
(3) valueIndex fix.
---
src/component/marker/MarkLineView.js | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/component/marker/MarkLineView.js b/src/component/marker/MarkLineView.js
index f18f304..7aa9857 100644
--- a/src/component/marker/MarkLineView.js
+++ b/src/component/marker/MarkLineView.js
@@ -23,6 +23,7 @@ import * as numberUtil from '../../util/number';
import * as markerHelper from './markerHelper';
import LineDraw from '../../chart/helper/LineDraw';
import MarkerView from './MarkerView';
+import {getStackedDimension} from '../../data/helper/dataStackHelper';
var markLineTransform = function (seriesModel, coordSys, mlModel, item) {
var data = seriesModel.getData();
@@ -44,18 +45,16 @@ var markLineTransform = function (seriesModel, coordSys, mlModel, item) {
var value;
if (item.yAxis != null || item.xAxis != null) {
- valueDataDim = seriesModel.get('stack') != null ? '__\0ecstackresult' : item.yAxis != null ? 'y' : 'x';
- valueAxis = coordSys.getAxis(valueDataDim);
-
+ valueAxis = coordSys.getAxis(item.yAxis != null ? 'y' : 'x');
value = zrUtil.retrieve(item.yAxis, item.xAxis);
}
else {
var axisInfo = markerHelper.getAxisInfo(item, data, coordSys, seriesModel);
- valueDataDim = seriesModel.get('stack') == null ? axisInfo.valueDataDim : '__\0ecstackresult';
+ valueDataDim = getStackedDimension(data, axisInfo.valueDataDim);
valueAxis = axisInfo.valueAxis;
value = markerHelper.numCalculate(data, valueDataDim, mlType);
}
- var valueIndex = valueDataDim === 'x' ? 0 : 1;
+ var valueIndex = valueAxis.dim === 'x' ? 0 : 1;
var baseIndex = 1 - valueIndex;
var mlFrom = zrUtil.clone(item);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 01/05: Fix stack in markline don't work
Posted by ov...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit f34724ee5de8b82e8d085d9c04313b301e10ebfc
Author: susiwen <su...@gmail.com>
AuthorDate: Mon May 20 18:04:56 2019 +0800
Fix stack in markline don't work
---
src/component/marker/MarkLineView.js | Bin 13499 -> 13611 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/src/component/marker/MarkLineView.js b/src/component/marker/MarkLineView.js
index d08cf32..7694e33 100644
Binary files a/src/component/marker/MarkLineView.js and b/src/component/marker/MarkLineView.js differ
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org