You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by wa...@apache.org on 2023/06/08 12:03:23 UTC
[echarts] branch fix/sankey-label-formatter updated (8df887b15 -> 9ee9b91ca)
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a change to branch fix/sankey-label-formatter
in repository https://gitbox.apache.org/repos/asf/echarts.git
discard 8df887b15 fix(sankey): prevent `edgeLabel` formatter from inheriting `label.formatter`.
new 9ee9b91ca fix(sankey): prevent `edgeLabel` formatter from inheriting `label.formatter`.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (8df887b15)
\
N -- N -- N refs/heads/fix/sankey-label-formatter (9ee9b91ca)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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/chart/sankey/SankeyView.ts | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[echarts] 01/01: fix(sankey): prevent `edgeLabel` formatter from inheriting `label.formatter`.
Posted by wa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch fix/sankey-label-formatter
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 9ee9b91ca6a0625e0d07a3c9e8f766950e2ed94f
Author: plainheart <yh...@all-my-life.cn>
AuthorDate: Thu Jun 8 19:29:08 2023 +0800
fix(sankey): prevent `edgeLabel` formatter from inheriting `label.formatter`.
---
src/chart/sankey/SankeyView.ts | 20 ++++++++++++++++----
test/sankey-labelValue.html | 7 ++++++-
2 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/chart/sankey/SankeyView.ts b/src/chart/sankey/SankeyView.ts
index 573e12fe3..260790ced 100644
--- a/src/chart/sankey/SankeyView.ts
+++ b/src/chart/sankey/SankeyView.ts
@@ -29,7 +29,7 @@ import SeriesData from '../../data/SeriesData';
import { RectLike } from 'zrender/src/core/BoundingRect';
import { setLabelStyle, getLabelStatesModels } from '../../label/labelStyle';
import { getECData } from '../../util/innerStore';
-import { isString } from 'zrender/src/core/util';
+import { isString, retrieve3 } from 'zrender/src/core/util';
class SankeyPathShape {
x1 = 0;
@@ -220,18 +220,30 @@ class SankeyView extends ChartView {
}
}
+ const defaultEdgeLabelText = `${edgeModel.get('value')}`;
+ const edgeLabelStateModels = getLabelStatesModels(edgeModel, 'edgeLabel');
+
setLabelStyle(
- curve, getLabelStatesModels(edgeModel, 'edgeLabel'),
+ curve, edgeLabelStateModels,
{
labelFetcher: {
getFormattedLabel(dataIndex, stateName, dataType, labelDimIndex, formatter, extendParams) {
return seriesModel.getFormattedLabel(
- dataIndex, stateName, 'edge', labelDimIndex, formatter, extendParams
+ dataIndex, stateName, 'edge',
+ labelDimIndex,
+ // ensure edgeLabel formatter is provided
+ // to prevent the inheritance from `label.formatter` of the series
+ retrieve3(
+ formatter,
+ edgeLabelStateModels.normal && edgeLabelStateModels.normal.get('formatter'),
+ defaultEdgeLabelText
+ ),
+ extendParams
);
}
},
labelDataIndex: edge.dataIndex,
- defaultText: `${edgeModel.get('value')}`
+ defaultText: defaultEdgeLabelText
}
);
curve.setTextConfig({ position: 'inside' });
diff --git a/test/sankey-labelValue.html b/test/sankey-labelValue.html
index 2b2b67332..272c1198e 100644
--- a/test/sankey-labelValue.html
+++ b/test/sankey-labelValue.html
@@ -80,7 +80,12 @@ under the License.
formatter: (params) => {
return params.name + ': ' + params.value;
},
- // formatter: '{c}'
+ // formatter: 'value: {c}'
+ },
+ emphasis: {
+ edgeLabel: {
+ // formatter: 'emphasis----{c}'
+ }
}
}],
tooltip: {trigger: 'item', triggerOn: 'mousemove'}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org