Skip to content

Commit 9a20185

Browse files
committed
fix(visualMap): fix some text style can't work on visualMap
1 parent ef926fa commit 9a20185

File tree

3 files changed

+20
-14
lines changed

3 files changed

+20
-14
lines changed

src/component/visualMap/ContinuousView.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,10 @@ class ContinuousView extends VisualMapView {
191191
style: createTextStyle(textStyleModel, {
192192
x: position[0],
193193
y: position[1],
194-
verticalAlign: orient === 'horizontal' ? 'middle' : align as TextVerticalAlign,
195-
align: orient === 'horizontal' ? align as TextAlign : 'center',
194+
verticalAlign: textStyleModel.get('verticalAlign')
195+
|| (orient === 'horizontal' ? 'middle' : align as TextVerticalAlign),
196+
align: textStyleModel.get('align')
197+
|| (orient === 'horizontal' ? align as TextAlign : 'center'),
196198
text
197199
})
198200
}));

src/component/visualMap/PiecewiseView.ts

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ class PiecewiseVisualMapView extends VisualMapView {
4444
const visualMapModel = this.visualMapModel;
4545
const textGap = visualMapModel.get('textGap');
4646
const textStyleModel = visualMapModel.textStyleModel;
47-
const textFont = textStyleModel.getFont();
48-
const textFill = textStyleModel.getTextColor();
4947
const itemAlign = this._getItemAlign();
5048
const itemSize = visualMapModel.itemSize;
5149
const viewData = this._getViewData();
@@ -75,16 +73,17 @@ class PiecewiseVisualMapView extends VisualMapView {
7573
if (showLabel) {
7674
const visualState = this.visualMapModel.getValueState(representValue);
7775
itemGroup.add(new graphic.Text({
78-
style: {
76+
style: createTextStyle(textStyleModel, {
7977
x: itemAlign === 'right' ? -textGap : itemSize[0] + textGap,
8078
y: itemSize[1] / 2,
8179
text: piece.text,
82-
verticalAlign: 'middle',
83-
align: itemAlign as TextAlign,
84-
font: textFont,
85-
fill: textFill,
86-
opacity: visualState === 'outOfRange' ? 0.5 : 1,
87-
},
80+
verticalAlign: textStyleModel.get('verticalAlign') || 'middle',
81+
align: textStyleModel.get('align') || itemAlign as TextAlign,
82+
opacity: zrUtil.retrieve2(
83+
textStyleModel.get('opacity'),
84+
visualState === 'outOfRange' ? 0.5 : 1
85+
),
86+
}),
8887
silent
8988
}));
9089
}

test/visualMap-pieces.html

Lines changed: 8 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)