From 1822053ea5bf2206023c7b17af42d6b1b5a4e6e8 Mon Sep 17 00:00:00 2001 From: plainheart Date: Mon, 18 Jul 2022 12:33:54 +0800 Subject: [PATCH 1/2] fix(type): add missing type `number` to `emphasis.scale` of scatter/line/graph series. --- src/chart/graph/GraphSeries.ts | 4 ++-- src/chart/line/LineSeries.ts | 2 +- src/chart/scatter/ScatterSeries.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chart/graph/GraphSeries.ts b/src/chart/graph/GraphSeries.ts index 299b9a44d9..e1b85bead6 100644 --- a/src/chart/graph/GraphSeries.ts +++ b/src/chart/graph/GraphSeries.ts @@ -184,7 +184,7 @@ export interface GraphSeriesOption emphasis?: { focus?: Exclude['focus'] - scale?: boolean + scale?: boolean | number label?: SeriesLabelOption edgeLabel?: SeriesLabelOption itemStyle?: ItemStyleOption @@ -513,4 +513,4 @@ class GraphSeriesModel extends SeriesModel { }; } -export default GraphSeriesModel; \ No newline at end of file +export default GraphSeriesModel; diff --git a/src/chart/line/LineSeries.ts b/src/chart/line/LineSeries.ts index d46640bbc3..9faf5c5175 100644 --- a/src/chart/line/LineSeries.ts +++ b/src/chart/line/LineSeries.ts @@ -48,7 +48,7 @@ type LineDataValue = OptionDataValue | OptionDataValue[]; interface LineStateOptionMixin { emphasis?: { focus?: DefaultEmphasisFocus - scale?: boolean + scale?: boolean | number } } diff --git a/src/chart/scatter/ScatterSeries.ts b/src/chart/scatter/ScatterSeries.ts index 129b88cc63..5e2995ecad 100644 --- a/src/chart/scatter/ScatterSeries.ts +++ b/src/chart/scatter/ScatterSeries.ts @@ -50,7 +50,7 @@ interface ScatterStateOption { interface ScatterStatesOptionMixin { emphasis?: { focus?: DefaultEmphasisFocus - scale?: boolean + scale?: boolean | number } } @@ -163,4 +163,4 @@ class ScatterSeriesModel extends SeriesModel { } -export default ScatterSeriesModel; \ No newline at end of file +export default ScatterSeriesModel; From 6e3efd8fba0b0eeed878bca4954b470b5de31cab Mon Sep 17 00:00:00 2001 From: plainheart Date: Mon, 18 Jul 2022 12:37:32 +0800 Subject: [PATCH 2/2] style: fix typo of `RoamPayload`. --- src/action/roamHelper.ts | 4 ++-- src/chart/graph/install.ts | 4 ++-- src/chart/tree/treeAction.ts | 6 +++--- src/component/geo/install.ts | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/action/roamHelper.ts b/src/action/roamHelper.ts index d1721a93c3..f14c8ccfbe 100644 --- a/src/action/roamHelper.ts +++ b/src/action/roamHelper.ts @@ -22,7 +22,7 @@ import type View from '../coord/View'; import type ExtensionAPI from '../core/ExtensionAPI'; import type { Payload } from '../util/types'; -export interface RoamPaylod extends Payload { +export interface RoamPayload extends Payload { dx: number dy: number zoom: number @@ -39,7 +39,7 @@ function getCenterCoord(view: View, point: number[]) { export function updateCenterAndZoom( view: View, - payload: RoamPaylod, + payload: RoamPayload, zoomLimit?: { min?: number, max?: number diff --git a/src/chart/graph/install.ts b/src/chart/graph/install.ts index b917be00ef..2ffec7b035 100644 --- a/src/chart/graph/install.ts +++ b/src/chart/graph/install.ts @@ -29,7 +29,7 @@ import createView from './createView'; import View from '../../coord/View'; import GraphView from './GraphView'; import GraphSeriesModel from './GraphSeries'; -import { RoamPaylod, updateCenterAndZoom } from '../../action/roamHelper'; +import { RoamPayload, updateCenterAndZoom } from '../../action/roamHelper'; import GlobalModel from '../../model/Global'; import { noop } from 'zrender/src/core/util'; import type ExtensionAPI from '../../core/ExtensionAPI'; @@ -73,7 +73,7 @@ export function install(registers: EChartsExtensionInstallRegisters) { }, noop); // Register roam action. - registers.registerAction(actionInfo, function (payload: RoamPaylod, ecModel: GlobalModel, api: ExtensionAPI) { + registers.registerAction(actionInfo, function (payload: RoamPayload, ecModel: GlobalModel, api: ExtensionAPI) { ecModel.eachComponent({ mainType: 'series', query: payload }, function (seriesModel: GraphSeriesModel) { diff --git a/src/chart/tree/treeAction.ts b/src/chart/tree/treeAction.ts index 2589d3ef75..358779919c 100644 --- a/src/chart/tree/treeAction.ts +++ b/src/chart/tree/treeAction.ts @@ -17,7 +17,7 @@ * under the License. */ -import {updateCenterAndZoom, RoamPaylod} from '../../action/roamHelper'; +import {updateCenterAndZoom, RoamPayload} from '../../action/roamHelper'; import { Payload } from '../../util/types'; import TreeSeriesModel from './TreeSeries'; import GlobalModel from '../../model/Global'; @@ -52,7 +52,7 @@ export function installTreeAction(registers: EChartsExtensionInstallRegisters) { // the layout. So don't need to go through the whole update process, such // as 'dataPrcocess', 'coordSystemUpdate', 'layout' and so on. update: 'none' - }, function (payload: RoamPaylod, ecModel: GlobalModel, api: ExtensionAPI) { + }, function (payload: RoamPayload, ecModel: GlobalModel, api: ExtensionAPI) { ecModel.eachComponent({ mainType: 'series', subType: 'tree', query: payload }, function (seriesModel: TreeSeriesModel) { @@ -67,4 +67,4 @@ export function installTreeAction(registers: EChartsExtensionInstallRegisters) { }); }); -} \ No newline at end of file +} diff --git a/src/component/geo/install.ts b/src/component/geo/install.ts index d18aa18376..3bf9e3e2b9 100644 --- a/src/component/geo/install.ts +++ b/src/component/geo/install.ts @@ -23,7 +23,7 @@ import geoCreator from '../../coord/geo/geoCreator'; import { ActionInfo } from '../../util/types'; import { each } from 'zrender/src/core/util'; import GlobalModel from '../../model/Global'; -import { updateCenterAndZoom, RoamPaylod } from '../../action/roamHelper'; +import { updateCenterAndZoom, RoamPayload } from '../../action/roamHelper'; import MapSeries from '../../chart/map/MapSeries'; import GeoView from './GeoView'; import geoSourceManager from '../../coord/geo/geoSourceManager'; @@ -115,7 +115,7 @@ export function install(registers: EChartsExtensionInstallRegisters) { type: 'geoRoam', event: 'geoRoam', update: 'updateTransform' - }, function (payload: RoamPaylod, ecModel: GlobalModel, api: ExtensionAPI) { + }, function (payload: RoamPayload, ecModel: GlobalModel, api: ExtensionAPI) { const componentType = payload.componentType || 'series'; ecModel.eachComponent( @@ -147,4 +147,4 @@ export function install(registers: EChartsExtensionInstallRegisters) { } ); }); -} \ No newline at end of file +}