From 02fbc2126ac1cb950adf5c4255a5c3b920c15250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Thu, 30 Jan 2020 10:13:41 +0800
Subject: [PATCH] =?UTF-8?q?feat(Slider):=20min=E3=80=81max=E3=80=81step=20?=
 =?UTF-8?q?can=20be=20string?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/slider/README.md       | 6 +++---
 src/slider/README.zh-CN.md | 6 +++---
 src/slider/index.js        | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/slider/README.md b/src/slider/README.md
index 15f0ebc2b..f733c58c0 100644
--- a/src/slider/README.md
+++ b/src/slider/README.md
@@ -99,9 +99,9 @@ export default {
 | Attribute | Description | Type | Default |
 |------|------|------|------|
 | value | Current value | *number* | `0` |
-| max | Max value | *number* | `100` |
-| min | Min value | *number* | `0` |
-| step | Step size | *number* | `1` |
+| max | Max value | *number \| string* | `100` |
+| min | Min value | *number \| string* | `0` |
+| step | Step size | *number \| string* | `1` |
 | bar-height | Height of bar | *number \| string* | `2px` |
 | button-size `v2.4.5` | Button size | *number \| string* | `24px` |
 | active-color | Active color of bar | *string* | `#1989fa` |
diff --git a/src/slider/README.zh-CN.md b/src/slider/README.zh-CN.md
index 4ca36b7dc..9127b91a2 100644
--- a/src/slider/README.zh-CN.md
+++ b/src/slider/README.zh-CN.md
@@ -101,9 +101,9 @@ Slider 垂直展示时，高度为 100% 父元素高度
 | 参数 | 说明 | 类型 | 默认值 |
 |------|------|------|------|
 | value | 当前进度百分比 | *number* | `0` |
-| max | 最大值 | *number* | `100` |
-| min | 最小值 | *number* | `0` |
-| step | 步长 | *number* | `1` |
+| max | 最大值 | *number \| string* | `100` |
+| min | 最小值 | *number \| string* | `0` |
+| step | 步长 | *number \| string* | `1` |
 | bar-height | 进度条高度，默认单位为`px` | *number \| string* | `2px` |
 | button-size `v2.4.5` | 滑块按钮大小，默认单位为`px` | *number \| string* | `24px` |
 | active-color | 进度条激活态颜色 | *string* | `#1989fa` |
diff --git a/src/slider/index.js b/src/slider/index.js
index 6affa0e30..1aeeb38df 100644
--- a/src/slider/index.js
+++ b/src/slider/index.js
@@ -15,15 +15,15 @@ export default createComponent({
     activeColor: String,
     inactiveColor: String,
     min: {
-      type: Number,
+      type: [Number, String],
       default: 0,
     },
     max: {
-      type: Number,
+      type: [Number, String],
       default: 100,
     },
     step: {
-      type: Number,
+      type: [Number, String],
       default: 1,
     },
     value: {
@@ -119,7 +119,7 @@ export default createComponent({
         ? event.clientY - rect.top
         : event.clientX - rect.left;
       const total = this.vertical ? rect.height : rect.width;
-      const value = (delta / total) * this.range + this.min;
+      const value = +this.min + (delta / total) * this.range;
 
       this.startValue = this.value;
       this.updateValue(value, true);