[echarts] branch improve-types updated: fix(type): fix some type errors

[sh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

shenyi pushed a commit to branch improve-types
in repository https://gitbox.apache.org/repos/asf/echarts.git


The following commit(s) were added to refs/heads/improve-types by this push:
     new c789d3a  fix(type): fix some type errors
c789d3a is described below

commit c789d3aca27cb1863d4af6f74762ed1d873f2b26
Author: pissang <bm...@gmail.com>
AuthorDate: Thu Sep 9 11:16:45 2021 +0800

    fix(type): fix some type errors
---
 src/chart/lines/LinesSeries.ts       | 6 +++---
 src/chart/parallel/ParallelSeries.ts | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/chart/lines/LinesSeries.ts b/src/chart/lines/LinesSeries.ts
index b762fe1..7598626 100644
--- a/src/chart/lines/LinesSeries.ts
+++ b/src/chart/lines/LinesSeries.ts
@@ -89,7 +89,7 @@ interface LinesStatesMixin {
     emphasis?: DefaultStatesMixinEmpasis
 }
 export interface LinesStateOption<TCbParams = never> {
-    lineStyle?: LinesLineStyleOption<TCbParams extends never ? never : (params: TCbParams) => ZRColor>
+    lineStyle?: LinesLineStyleOption<(TCbParams extends never ? never : (params: TCbParams) => ZRColor) | ZRColor>
     label?: SeriesLineLabelOption
 }
 
@@ -108,8 +108,6 @@ export interface LinesDataItemOption extends LinesStateOption<CallbackDataParams
     value?: LinesValue
 
     effect?: LineDrawModelOption['effect']
-
-    dimensions?: DimensionDefinitionLoose
 }
 
 export interface LinesSeriesOption
@@ -141,6 +139,8 @@ export interface LinesSeriesOption
         // Stored as a flat array. In format
         // Points Count(2) | x | y | x | y | Points Count(3) | x |  y | x | y | x | y |
         | ArrayLike<number>
+
+    dimensions?: DimensionDefinitionLoose | DimensionDefinitionLoose[]
 }
 
 class LinesSeriesModel extends SeriesModel<LinesSeriesOption> {
diff --git a/src/chart/parallel/ParallelSeries.ts b/src/chart/parallel/ParallelSeries.ts
index 9a8f68e..0b727ee 100644
--- a/src/chart/parallel/ParallelSeries.ts
+++ b/src/chart/parallel/ParallelSeries.ts
@@ -49,7 +49,7 @@ interface ParallelStatesMixin {
     emphasis?: DefaultStatesMixinEmpasis
 }
 export interface ParallelStateOption<TCbParams = never> {
-    lineStyle?: LineStyleOption<TCbParams extends never ? never : (params: TCbParams) => ZRColor>
+    lineStyle?: LineStyleOption<(TCbParams extends never ? never : (params: TCbParams) => ZRColor) | ZRColor>
     label?: SeriesLabelOption
 }
 

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org