From 59e180ec0791cf946ecdef330ed9445a22f6c5b9 Mon Sep 17 00:00:00 2001 From: plainheart Date: Mon, 1 Aug 2022 16:22:06 +0800 Subject: [PATCH 1/2] chore: fix wrong imports from `echarts.all` --- src/chart/custom/CustomView.ts | 2 +- src/coord/geo/geoCreator.ts | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/chart/custom/CustomView.ts b/src/chart/custom/CustomView.ts index ad282ed9b0..e0ad444a36 100644 --- a/src/chart/custom/CustomView.ts +++ b/src/chart/custom/CustomView.ts @@ -99,7 +99,7 @@ import { applyKeyframeAnimation, stopPreviousKeyframeAnimationAndRestore } from '../../animation/customGraphicKeyframeAnimation'; -import { SeriesModel } from '../../echarts.all'; +import type SeriesModel from '../../model/Series'; const EMPHASIS = 'emphasis' as const; const NORMAL = 'normal' as const; diff --git a/src/coord/geo/geoCreator.ts b/src/coord/geo/geoCreator.ts index 1d4bd3730e..f51700ae0b 100644 --- a/src/coord/geo/geoCreator.ts +++ b/src/coord/geo/geoCreator.ts @@ -27,15 +27,14 @@ import MapSeries, { MapSeriesOption } from '../../chart/map/MapSeries'; import ExtensionAPI from '../../core/ExtensionAPI'; import { CoordinateSystemCreator } from '../CoordinateSystem'; import { NameMap } from './geoTypes'; -import SeriesModel from '../../model/Series'; import { SeriesOption, SeriesOnGeoOptionMixin } from '../../util/types'; import { Dictionary } from 'zrender/src/core/types'; -import GlobalModel from '../../model/Global'; -import ComponentModel from '../../model/Component'; -import { Model } from '../../echarts.all'; +import type Model from '../../model/Model'; +import type GlobalModel from '../../model/Global'; +import type SeriesModel from '../../model/Series'; +import type ComponentModel from '../../model/Component'; import * as vector from 'zrender/src/core/vector'; - export type resizeGeoType = typeof resizeGeo; /** From e3c8e3ceaf04b70e72a23281c23ed53356666205 Mon Sep 17 00:00:00 2001 From: plainheart Date: Mon, 1 Aug 2022 16:31:16 +0800 Subject: [PATCH 2/2] chore: fix wrong imports from `echarts.all` --- src/animation/customGraphicKeyframeAnimation.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/animation/customGraphicKeyframeAnimation.ts b/src/animation/customGraphicKeyframeAnimation.ts index 196c5fcb37..36dd9ecb1c 100644 --- a/src/animation/customGraphicKeyframeAnimation.ts +++ b/src/animation/customGraphicKeyframeAnimation.ts @@ -22,7 +22,7 @@ import Element from 'zrender/src/Element'; import { keys, filter, each, isArray, indexOf } from 'zrender/src/core/util'; import { ELEMENT_ANIMATABLE_PROPS } from './customGraphicTransition'; import { AnimationOption, AnimationOptionMixin, Dictionary } from '../util/types'; -import { Model } from '../echarts.all'; +import type Model from '../model/Model'; import { getAnimationConfig } from './basicTransition'; import { warn } from '../util/log'; import { makeInner } from '../util/model'; @@ -159,4 +159,4 @@ export function applyKeyframeAnimation>( .duration(duration) .start(animationOpts.easing); }); -} \ No newline at end of file +}