diff --git a/src/chart/bar/BarView.ts b/src/chart/bar/BarView.ts index 9fb9ce27962396269ad2c1787c30a8f6dbf5a714..191dc4758cebb62f38009d1a7c111c5f55ad3696 100644 --- a/src/chart/bar/BarView.ts +++ b/src/chart/bar/BarView.ts @@ -91,15 +91,15 @@ class BarView extends ChartView { static type = 'bar' as const; type = BarView.type; - _data: List; + private _data: List; - _isLargeDraw: boolean; + private _isLargeDraw: boolean; - _backgroundGroup: Group; + private _backgroundGroup: Group; - _backgroundEls: (Rect | Sector)[]; + private _backgroundEls: (Rect | Sector)[]; - render(seriesModel: BarSeriesModel, ecModel: GlobalModel, api: ExtensionAPI) { + render(seriesModel: BarSeriesModel, ecModel: GlobalModel, api: ExtensionAPI): void { this._updateDrawMode(seriesModel); const coordinateSystemType = seriesModel.get('coordinateSystem'); @@ -114,22 +114,19 @@ class BarView extends ChartView { else if (__DEV__) { console.warn('Only cartesian2d and polar supported for bar.'); } - - return this.group; } - incrementalPrepareRender(seriesModel: BarSeriesModel) { + incrementalPrepareRender(seriesModel: BarSeriesModel): void { this._clear(); this._updateDrawMode(seriesModel); } - incrementalRender( - params: StageHandlerProgressParams, seriesModel: BarSeriesModel) { + incrementalRender(params: StageHandlerProgressParams, seriesModel: BarSeriesModel): void { // Do not support progressive in normal mode. this._incrementalRenderLarge(params, seriesModel); } - _updateDrawMode(seriesModel: BarSeriesModel) { + private _updateDrawMode(seriesModel: BarSeriesModel): void { const isLargeDraw = seriesModel.pipelineContext.large; if (this._isLargeDraw == null || isLargeDraw !== this._isLargeDraw) { this._isLargeDraw = isLargeDraw; @@ -137,7 +134,7 @@ class BarView extends ChartView { } } - _renderNormal(seriesModel: BarSeriesModel, ecModel: GlobalModel, api: ExtensionAPI) { + private _renderNormal(seriesModel: BarSeriesModel, ecModel: GlobalModel, api: ExtensionAPI): void { const group = this.group; const data = seriesModel.getData(); const oldData = this._data; @@ -282,10 +279,9 @@ class BarView extends ChartView { this._data = data; } - _renderLarge(seriesModel: BarSeriesModel, ecModel: GlobalModel, api: ExtensionAPI) { + private _renderLarge(seriesModel: BarSeriesModel, ecModel: GlobalModel, api: ExtensionAPI): void { this._clear(); createLarge(seriesModel, this.group); - // Use clipPath in large mode. const clipPath = seriesModel.get('clip', true) ? createClipPath(seriesModel.coordinateSystem, false, seriesModel) @@ -298,16 +294,16 @@ class BarView extends ChartView { } } - _incrementalRenderLarge(params: StageHandlerProgressParams, seriesModel: BarSeriesModel) { + private _incrementalRenderLarge(params: StageHandlerProgressParams, seriesModel: BarSeriesModel): void { this._removeBackground(); createLarge(seriesModel, this.group, true); } - remove(ecModel?: GlobalModel) { + remove(ecModel?: GlobalModel): void { this._clear(ecModel); } - _clear(ecModel?: GlobalModel) { + private _clear(ecModel?: GlobalModel): void { const group = this.group; const data = this._data; if (ecModel && ecModel.get('animation') && data && !this._isLargeDraw) { @@ -329,7 +325,7 @@ class BarView extends ChartView { this._data = null; } - _removeBackground() { + private _removeBackground(): void { this.group.remove(this._backgroundGroup); this._backgroundGroup = null; } diff --git a/src/component/helper/MapDraw.ts b/src/component/helper/MapDraw.ts index 791df3b879e0c8d68d326fdafc0e2764c587ec1c..02fc336c8d591f96b29a558c01dd52466bfd295a 100644 --- a/src/component/helper/MapDraw.ts +++ b/src/component/helper/MapDraw.ts @@ -356,7 +356,7 @@ class MapDraw { } private _updateController( - mapOrGeoModel: GeoModel | MapSeries, ecModel: GlobalModel, api: ExtensionAPI + this: MapDraw, mapOrGeoModel: GeoModel | MapSeries, ecModel: GlobalModel, api: ExtensionAPI ): void { const geo = mapOrGeoModel.coordinateSystem; const controller = this._controller; @@ -380,8 +380,7 @@ class MapDraw { return action; } - // @ts-ignore FIXME:TS - controller.off('pan').on('pan', function (this: MapDraw, e) { + controller.off('pan').on('pan', function (e) { this._mouseDownFlag = false; roamHelper.updateViewOnPan(controllerHost, e.dx, e.dy); @@ -392,8 +391,7 @@ class MapDraw { })); }, this); - // @ts-ignore FIXME:TS - controller.off('zoom').on('zoom', function (this: MapDraw, e) { + controller.off('zoom').on('zoom', function (e) { this._mouseDownFlag = false; roamHelper.updateViewOnZoom(controllerHost, e.scale, e.originX, e.originY); @@ -415,7 +413,6 @@ class MapDraw { } }, this); - // @ts-ignore FIXME:TS controller.setPointerChecker(function (e, x, y) { return geo.getViewRectAfterRoam().contain(x, y) && !onIrrelevantElement(e, api, mapOrGeoModel);