This is an automated email from the ASF dual-hosted git repository. sushuang pushed a commit to branch next in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
The following commit(s) were added to refs/heads/next by this push: new fe1666d fix: resolve the circular dependency. fe1666d is described below commit fe1666df3e02dd18dba60388603745f515e33724 Author: 100pah <sushuang0...@gmail.com> AuthorDate: Mon Jun 22 15:05:08 2020 +0800 fix: resolve the circular dependency. --- src/coord/axisHelper.ts | 6 ------ src/coord/radar/Radar.ts | 4 ++-- src/coord/scaleRawExtentInfo.ts | 7 ++++++- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/coord/axisHelper.ts b/src/coord/axisHelper.ts index 425335a..2caa4bf 100644 --- a/src/coord/axisHelper.ts +++ b/src/coord/axisHelper.ts @@ -366,9 +366,3 @@ export function unionAxisExtentFromData(dataExtent: number[], data: List, axisDi }); } } - -export function parseAxisModelMinMax(scale: Scale, minMax: ScaleDataValue): number { - return minMax == null ? null - : zrUtil.eqNaN(minMax) ? NaN - : scale.parse(minMax); -} diff --git a/src/coord/radar/Radar.ts b/src/coord/radar/Radar.ts index c825d1e..5347cd9 100644 --- a/src/coord/radar/Radar.ts +++ b/src/coord/radar/Radar.ts @@ -25,8 +25,7 @@ import IntervalScale from '../../scale/Interval'; import * as numberUtil from '../../util/number'; import { getScaleExtent, - niceScaleExtent, - parseAxisModelMinMax + niceScaleExtent } from '../axisHelper'; import CoordinateSystemManager from '../../CoordinateSystem'; import { CoordinateSystemMaster, CoordinateSystem } from '../CoordinateSystem'; @@ -35,6 +34,7 @@ import GlobalModel from '../../model/Global'; import ExtensionAPI from '../../ExtensionAPI'; import { ScaleDataValue } from '../../util/types'; import { ParsedModelFinder } from '../../util/model'; +import { parseAxisModelMinMax } from '../scaleRawExtentInfo'; class Radar implements CoordinateSystem, CoordinateSystemMaster { diff --git a/src/coord/scaleRawExtentInfo.ts b/src/coord/scaleRawExtentInfo.ts index 7eb59cb..ebd7d00 100644 --- a/src/coord/scaleRawExtentInfo.ts +++ b/src/coord/scaleRawExtentInfo.ts @@ -22,8 +22,8 @@ import { __DEV__ } from '../config'; import Scale from '../scale/Scale'; import { AxisBaseModel } from './AxisBaseModel'; import { parsePercent } from 'zrender/src/contain/text'; -import { parseAxisModelMinMax } from './axisHelper'; import { AxisBaseOption } from './axisCommonTypes'; +import { ScaleDataValue } from '../util/types'; export interface ScaleRawExtentResult { @@ -314,3 +314,8 @@ export function ensureScaleRawExtentInfo( return rawExtentInfo; } +export function parseAxisModelMinMax(scale: Scale, minMax: ScaleDataValue): number { + return minMax == null ? null + : eqNaN(minMax) ? NaN + : scale.parse(minMax); +} --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org