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/07/07 10:06:19 UTC
[echarts] 01/01: Merge pull request #14737 from apache/fix-marker
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit cc473b8ece42c0c7a6c1b7a40d0f0d51dd38c84e
Merge: 8c08634 8de1db2
Author: Yi Shen <bm...@gmail.com>
AuthorDate: Wed Jul 7 18:05:37 2021 +0800
Merge pull request #14737 from apache/fix-marker
fix(marker): add missing type for symbolOffset, fix symbolOffset & symbolKeepAspect doesn't work in markPoint.
src/chart/bar/PictorialBarView.ts | 13 +++--------
src/chart/helper/EffectSymbol.ts | 20 ++++-------------
src/chart/helper/Line.ts | 16 +++++---------
src/chart/helper/Symbol.ts | 20 ++++++-----------
src/chart/radar/RadarView.ts | 11 ++--------
src/component/axis/AxisBuilder.ts | 15 ++++++-------
src/component/marker/MarkLineView.ts | 8 ++++++-
src/component/marker/MarkPointView.ts | 12 +++++++++--
src/component/timeline/SliderTimelineView.ts | 17 ++++++---------
src/coord/axisCommonTypes.ts | 4 ++--
src/util/symbol.ts | 32 ++++++++++++++++++++++++----
src/util/types.ts | 4 ++--
src/visual/symbol.ts | 2 +-
13 files changed, 82 insertions(+), 92 deletions(-)
diff --cc src/chart/helper/Symbol.ts
index d4556b9,1ac9ffd..222776f
--- a/src/chart/helper/Symbol.ts
+++ b/src/chart/helper/Symbol.ts
@@@ -28,10 -27,9 +27,10 @@@ import { ColorString, BlurScope, Animat
import SeriesModel from '../../model/Series';
import { PathProps } from 'zrender/src/graphic/Path';
import { SymbolDrawSeriesScope, SymbolDrawItemModelOption } from './SymbolDraw';
- import { extend, isArray, retrieve2 } from 'zrender/src/core/util';
+ import { extend } from 'zrender/src/core/util';
import { setLabelStyle, getLabelStatesModels } from '../../label/labelStyle';
import ZRImage from 'zrender/src/graphic/Image';
+import { saveOldStyle } from '../../animation/basicTrasition';
type ECSymbol = ReturnType<typeof createSymbol>;
diff --cc src/chart/radar/RadarView.ts
index 0f8112c,148fa9d..c4e28d0
--- a/src/chart/radar/RadarView.ts
+++ b/src/chart/radar/RadarView.ts
@@@ -30,15 -30,7 +30,8 @@@ import GlobalModel from '../../model/Gl
import { VectorArray } from 'zrender/src/core/vector';
import { setLabelStyle, getLabelStatesModels } from '../../label/labelStyle';
import ZRImage from 'zrender/src/graphic/Image';
+import { saveOldStyle } from '../../animation/basicTrasition';
- function normalizeSymbolSize(symbolSize: number | number[]) {
- if (!zrUtil.isArray(symbolSize)) {
- symbolSize = [+symbolSize, +symbolSize];
- }
- return symbolSize;
- }
-
type RadarSymbol = ReturnType<typeof symbolUtil.createSymbol> & {
__dimIdx: number
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org