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 2021/04/09 09:00:47 UTC
[echarts] 01/01: fix(bar): fix bar layout with borderWidth but no
borderColor
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch fix-bar-border-layout
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 1a4463230983d3f46d610e6b62deb23291e43082
Author: pissang <bm...@gmail.com>
AuthorDate: Fri Apr 9 16:56:08 2021 +0800
fix(bar): fix bar layout with borderWidth but no borderColor
---
src/chart/bar/BarView.ts | 13 ++++++++-----
src/chart/line/LineSeries.ts | 6 ++----
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/chart/bar/BarView.ts b/src/chart/bar/BarView.ts
index e190653..470c6f6 100644
--- a/src/chart/bar/BarView.ts
+++ b/src/chart/bar/BarView.ts
@@ -61,8 +61,6 @@ import {LayoutRect} from '../../util/layout';
import {EventCallback} from 'zrender/src/core/Eventful';
import { warn } from '../../util/log';
-const BAR_BORDER_WIDTH_QUERY = ['itemStyle', 'borderWidth'] as const;
-const BAR_BORDER_RADIUS_QUERY = ['itemStyle', 'borderRadius'] as const;
const _eventPos = [0, 0];
const mathMax = Math.max;
@@ -314,7 +312,7 @@ class BarView extends ChartView {
}
const bgLayout = getLayout[coord.type](data, newIndex);
const shape = createBackgroundShape(isHorizontalOrRadial, bgLayout, coord);
- updateProps(bgEl, { shape: shape }, animationModel, newIndex);
+ updateProps(bgEl, { shape }, animationModel, newIndex);
}
let el = oldData.getItemGraphicEl(oldIndex) as BarPossiblePath;
@@ -905,7 +903,7 @@ function updateStyle(
const style = data.getItemVisual(dataIndex, 'style');
if (!isPolar) {
- (el as Rect).setShape('r', itemModel.get(BAR_BORDER_RADIUS_QUERY) || 0);
+ (el as Rect).setShape('r', itemModel.get(['itemStyle', 'borderRadius']) || 0);
}
el.useStyle(style);
@@ -961,7 +959,12 @@ function getLineWidth(
itemModel: Model<BarDataItemOption>,
rawLayout: RectLayout
) {
- const lineWidth = itemModel.get(BAR_BORDER_WIDTH_QUERY) || 0;
+ // Has no border.
+ const borderColor = itemModel.get(['itemStyle', 'borderColor']);
+ if (!borderColor || borderColor === 'none') {
+ return 0;
+ }
+ const lineWidth = itemModel.get(['itemStyle', 'borderWidth']) || 0;
// width or height may be NaN for empty data
const width = isNaN(rawLayout.width) ? Number.MAX_VALUE : Math.abs(rawLayout.width);
const height = isNaN(rawLayout.height) ? Number.MAX_VALUE : Math.abs(rawLayout.height);
diff --git a/src/chart/line/LineSeries.ts b/src/chart/line/LineSeries.ts
index bd8ae19..b0a3f28 100644
--- a/src/chart/line/LineSeries.ts
+++ b/src/chart/line/LineSeries.ts
@@ -153,10 +153,8 @@ class LineSeriesModel extends SeriesModel<LineSeriesOption> {
position: 'top'
},
- itemStyle: {
- color: 'auto',
- borderWidth: 2
- },
+ // itemStyle: {
+ // },
endLabel: {
show: false,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org