This is an automated email from the ASF dual-hosted git repository. shenyi 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 11890ca fix(types): fix some issues on type 11890ca is described below commit 11890ca34d3a12fb950c3b76f3c41734030f68d3 Author: pissang <bm2736...@gmail.com> AuthorDate: Fri Aug 14 17:26:13 2020 +0800 fix(types): fix some issues on type --- build/pre-publish.js | 6 +++++- src/coord/cartesian/AxisModel.ts | 2 +- src/echarts.ts | 2 +- src/option.ts | 6 ++++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/build/pre-publish.js b/build/pre-publish.js index 795ace9..ca6b9cc 100644 --- a/build/pre-publish.js +++ b/build/pre-publish.js @@ -152,6 +152,7 @@ const compileWorkList = [ transformRootFolderInEntry(nodePath.resolve(ecDir, 'echarts.simple.js'), 'esm'); await transformZRRootFolder(nodePath.resolve(ecDir, 'esm'), 'esm'); + await transformZRRootFolder(nodePath.resolve(ecDir, 'types'), 'esm'); fsExtra.removeSync(tmpDir); } @@ -298,7 +299,10 @@ function transformRootFolderInEntry(entryFile, replacement) { * Transform `zrender/src` to `zrender/esm` in all files */ async function transformZRRootFolder(rooltFolder, replacement) { - const files = await globby([rooltFolder + '/**/*.js']); + const files = await globby([ + rooltFolder + '/**/*.js', + rooltFolder + '/**/*.d.ts', + ]); // Simple regex replacement // TODO More robust way? for (let fileName of files) { diff --git a/src/coord/cartesian/AxisModel.ts b/src/coord/cartesian/AxisModel.ts index a61112a..033eef0 100644 --- a/src/coord/cartesian/AxisModel.ts +++ b/src/coord/cartesian/AxisModel.ts @@ -31,7 +31,7 @@ import { SINGLE_REFERRING } from '../../util/model'; export type CartesianAxisPosition = 'top' | 'bottom' | 'left' | 'right'; -interface CartesianAxisOption extends AxisBaseOption { +export interface CartesianAxisOption extends AxisBaseOption { gridIndex?: number; gridId?: string; position?: CartesianAxisPosition; diff --git a/src/echarts.ts b/src/echarts.ts index 7317abd..aab2083 100644 --- a/src/echarts.ts +++ b/src/echarts.ts @@ -1003,7 +1003,7 @@ class ECharts extends Eventful { disposedWarning(this.id); return; } - this.setOption({ series: [] }, true); + this.setOption({ series: [] } as EChartsFullOption, true); } dispose(): void { diff --git a/src/option.ts b/src/option.ts index 7ce89f7..79179b7 100644 --- a/src/option.ts +++ b/src/option.ts @@ -20,6 +20,8 @@ import type {GridOption} from './coord/cartesian/GridModel'; import type {PolarOption} from './coord/polar/PolarModel'; import type {GeoOption} from './coord/geo/GeoModel'; +import type {RadiusAxisOption, AngleAxisOption} from './coord/polar/AxisModel'; +import type {CartesianAxisOption} from './coord/cartesian/AxisModel'; import type {SingleAxisOption} from './coord/single/AxisModel'; import type {ParallelAxisOption} from './coord/parallel/AxisModel'; import type {ParallelCoordinateSystemOption} from './coord/parallel/ParallelModel'; @@ -72,6 +74,10 @@ export interface EChartsFullOption extends ECOption { grid?: GridOption | GridOption[] polar?: PolarOption | PolarOption[] geo?: GeoOption | GeoOption[] + angleAxis?: AngleAxisOption | AngleAxisOption[] + radiusAxis?: RadiusAxisOption | RadiusAxisOption[] + xAxis?: CartesianAxisOption | CartesianAxisOption[] + yAxis?: CartesianAxisOption | CartesianAxisOption[] singleAxis?: SingleAxisOption | SingleAxisOption[] parallel?: ParallelCoordinateSystemOption | ParallelCoordinateSystemOption[] parallelAxis?: ParallelAxisOption | ParallelAxisOption[] --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org