提交 a499570c 编写于 作者: P pissang

fix(line): fix default formatter not apply value animation in endLabel

上级 c1e0f404
...@@ -52,11 +52,10 @@ import { setStatesStylesFromModel, setStatesFlag, enableHoverEmphasis } from '.. ...@@ -52,11 +52,10 @@ import { setStatesStylesFromModel, setStatesFlag, enableHoverEmphasis } from '..
import Displayable from 'zrender/src/graphic/Displayable'; import Displayable from 'zrender/src/graphic/Displayable';
import Model from '../../model/Model'; import Model from '../../model/Model';
import {setLabelStyle, getLabelStatesModels, labelInner} from '../../label/labelStyle'; import {setLabelStyle, getLabelStatesModels, labelInner} from '../../label/labelStyle';
import {getDefaultLabel} from '../helper/labelHelper'; import {getDefaultLabel, getDefaultInterpolatedLabel} from '../helper/labelHelper';
import { getECData } from '../../util/innerStore'; import { getECData } from '../../util/innerStore';
import { createFloat32Array } from '../../util/vendor'; import { createFloat32Array } from '../../util/vendor';
import Cartesian from '../../coord/cartesian/Cartesian';
type PolarArea = ReturnType<Polar['getArea']>; type PolarArea = ReturnType<Polar['getArea']>;
type Cartesian2DArea = ReturnType<Cartesian2D['getArea']>; type Cartesian2DArea = ReturnType<Cartesian2D['getArea']>;
...@@ -983,6 +982,7 @@ class LineView extends ChartView { ...@@ -983,6 +982,7 @@ class LineView extends ChartView {
const endLabelModel = seriesModel.getModel('endLabel'); const endLabelModel = seriesModel.getModel('endLabel');
if (endLabelModel.get('show')) { if (endLabelModel.get('show')) {
const data = seriesModel.getData();
const polyline = this._polyline; const polyline = this._polyline;
let endLabel = this._endLabel; let endLabel = this._endLabel;
if (!endLabel) { if (!endLabel) {
...@@ -1003,7 +1003,10 @@ class LineView extends ChartView { ...@@ -1003,7 +1003,10 @@ class LineView extends ChartView {
{ {
labelFetcher: seriesModel, labelFetcher: seriesModel,
labelDataIndex: dataIndex, labelDataIndex: dataIndex,
defaultText: getDefaultLabel(seriesModel.getData(), dataIndex), defaultText(dataIndex, opt, overrideValue) {
return overrideValue ? getDefaultInterpolatedLabel(data, overrideValue)
: getDefaultLabel(data, dataIndex);
},
enableTextSetter: true enableTextSetter: true
}, },
getEndLabelStateSpecified(endLabelModel, coordSys) getEndLabelStateSpecified(endLabelModel, coordSys)
...@@ -1083,7 +1086,7 @@ class LineView extends ChartView { ...@@ -1083,7 +1086,7 @@ class LineView extends ChartView {
endLabel.attr({ x: pt[0], y: pt[1] }); endLabel.attr({ x: pt[0], y: pt[1] });
} }
if (valueAnimation) { if (valueAnimation) {
labelInner(endLabel).setLabelText(value); labelInner(endLabel).setLabelText(value, );
} }
} }
} }
......
...@@ -42,7 +42,9 @@ type TextCommonParams = { ...@@ -42,7 +42,9 @@ type TextCommonParams = {
const EMPTY_OBJ = {}; const EMPTY_OBJ = {};
interface SetLabelStyleOpt<LDI> extends TextCommonParams { interface SetLabelStyleOpt<LDI> extends TextCommonParams {
defaultText?: string | ((labelDataIndex: LDI, opt: SetLabelStyleOpt<LDI>) => string); defaultText?: string | ((
labelDataIndex: LDI, opt: SetLabelStyleOpt<LDI>, overrideValue?: ParsedValue | ParsedValue[]
) => string);
// Fetch text by: // Fetch text by:
// opt.labelFetcher.getFormattedLabel( // opt.labelFetcher.getFormattedLabel(
// opt.labelDataIndex, 'normal'/'emphasis', null, opt.labelDimIndex, opt.labelProp // opt.labelDataIndex, 'normal'/'emphasis', null, opt.labelDimIndex, opt.labelProp
...@@ -115,7 +117,7 @@ export function getLabelText<LDI>( ...@@ -115,7 +117,7 @@ export function getLabelText<LDI>(
); );
} }
if (baseText == null) { if (baseText == null) {
baseText = isFunction(opt.defaultText) ? opt.defaultText(labelDataIndex, opt) : opt.defaultText; baseText = isFunction(opt.defaultText) ? opt.defaultText(labelDataIndex, opt, overrideValue) : opt.defaultText;
} }
const statesText = { const statesText = {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册