Merge pull request #14775 from dileepyelleti/fix-14412

fix(dataZoom): type fix for startValue and endValue. close #14412
apache · May 12, 2021 · f97b7fa · f97b7fa
2 parents 0ac6f31 + 23a2f7f
commit f97b7fa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/component/dataZoom/AxisProxy.ts b/src/component/dataZoom/AxisProxy.ts
@@ -139,8 +139,8 @@ class AxisProxy {
     calculateDataWindow(opt?: {
         start?: number
         end?: number
-        startValue?: number
-        endValue?: number
+        startValue?: number | string | Date
+        endValue?: number | string | Date
     }) {
         const dataExtent = this._dataExtent;
         const axisModel = this.getAxisModel();

diff --git a/src/component/dataZoom/DataZoomModel.ts b/src/component/dataZoom/DataZoomModel.ts
@@ -101,11 +101,11 @@ export interface DataZoomOption extends ComponentOption {
     /**
      * Start value. If startValue specified, start is ignored
      */
-    startValue?: number
+    startValue?: number | string | Date
     /**
      * End value. If endValue specified, end is ignored.
      */
-    endValue?: number
+    endValue?: number | string | Date
     /**
      * Min span percent, 0 - 100
      * The range of dataZoom can not be smaller than that.
@@ -507,7 +507,7 @@ class DataZoomModel<Opts extends DataZoomOption = DataZoomOption> extends Compon
     setCalculatedRange(opt: RangeOption): void {
         const option = this.option;
         each(['start', 'startValue', 'end', 'endValue'] as const, function (name) {
-            option[name] = opt[name];
+            (option as any)[name] = opt[name];
         });
     }
 
@@ -590,7 +590,7 @@ function retrieveRawOption<T extends DataZoomOption>(option: T) {
     each(
         ['start', 'end', 'startValue', 'endValue', 'throttle'] as const,
         function (name) {
-            option.hasOwnProperty(name) && (ret[name] = option[name]);
+            option.hasOwnProperty(name) && ((ret as any)[name] = option[name]);
         }
     );
     return ret;