chore: fix review

antvis · Apr 26, 2020 · e1cbfda · e1cbfda
1 parent ec67cbb
commit e1cbfda
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/docs/manual/tutorial/slider.en.md b/docs/manual/tutorial/slider.en.md
@@ -96,7 +96,7 @@ export interface SliderOption {
   readonly start?: number;
   readonly end?: number;
   /** 格式化 Mask */
-  mask?: (val: any) => string;
+  readonly mask?: (options: {val: string, datum: Datum, idx: number}) => string;
 }
 ```
 

diff --git a/docs/manual/tutorial/slider.zh.md b/docs/manual/tutorial/slider.zh.md
@@ -96,7 +96,7 @@ export interface SliderOption {
   readonly start?: number;
   readonly end?: number;
   /** 格式化 Mask */
-  mask?: (val: any) => string;
+  readonly mask?: (options: {val: string, datum: Datum, idx: number}) => string;
 }
 ```
 

diff --git a/src/chart/controller/slider.ts b/src/chart/controller/slider.ts
@@ -8,6 +8,7 @@ import { isBetween, omit } from '../../util/helper';
 import View from '../view';
 import { Controller } from './base';
 
+export type SliderMaskType = (options: {val: string, datum: Datum, idx: number}) => string;
 /** Slider 配置 */
 export interface SliderOption {
   /** slider 高度 */
@@ -32,7 +33,7 @@ export interface SliderOption {
   /** 滑块初始化的结束位置 */
   readonly end?: number;
   /** 格式化 Mask */
-  mask?: (val: any) => string;
+  readonly mask?: SliderMaskType;
 }
 
 type Option = SliderOption | boolean;
@@ -228,10 +229,10 @@ export default class Slider extends Controller<Option> {
     let minText = get(xData, [minIndex]);
     let maxText = get(xData, [maxIndex]);
 
-    const mask = this.getSliderCfg().mask as ((val: any) => string);
-    if (typeof mask === 'function') {
-      minText = mask(minText);
-      maxText = mask(maxText);
+    const mask = this.getSliderCfg().mask as SliderMaskType;
+    if (mask) {
+      minText = mask({ val: minText, datum: data[minIndex], idx: minIndex });
+      maxText = mask({ val: maxText, datum: data[maxIndex], idx: maxIndex });
     }
 
     // 更新文本