From de94e0c0bc9fd7623849b1f58b53f1c574823cd9 Mon Sep 17 00:00:00 2001
From: Leopoldthecoder <Leopoldthecuber@gmail.com>
Date: Fri, 9 Sep 2016 14:27:49 +0800
Subject: [PATCH] fix a slider bug

---
 CHANGELOG.md                               | 8 +++++++-
 examples/docs/slider.md                    | 6 +++---
 packages/input-number/src/input-number.vue | 4 ++++
 packages/slider/src/main.vue               | 2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35f858382..3ed02aa75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,14 @@
 ## 更新日志
 
+### 1.0.0-rc.3
+
+*2016-09-09*
+
+- 修复 Slider 存在输入框时，输入框与 Slider 的值不同步的问题
+
 ### 1.0.0-rc.2
 
-*2016-09-07*
+*2016-09-09*
 
 - 修复 Upload 上传的问题，并增加上传成功和失败的钩子函数
 - Button 组件增加 `nativeType` 属性，用于组件内 `<button>` 标签的原生 `type` 属性，默认值为 `button`
diff --git a/examples/docs/slider.md b/examples/docs/slider.md
index 76440aaa4..f083d8103 100644
--- a/examples/docs/slider.md
+++ b/examples/docs/slider.md
@@ -4,9 +4,9 @@
       return {
         value1: 0,
         value2: 50,
-        value3: null,
-        value4: null,
-        value5: null
+        value3: 0,
+        value4: 0,
+        value5: 0
       };
     }
   }
diff --git a/packages/input-number/src/input-number.vue b/packages/input-number/src/input-number.vue
index 79f5b76ee..18559dac8 100644
--- a/packages/input-number/src/input-number.vue
+++ b/packages/input-number/src/input-number.vue
@@ -95,6 +95,10 @@
       };
     },
     watch: {
+      value(val) {
+        this.currentValue = val;
+      },
+
       currentValue(newVal, oldVal) {
         if (!isNaN(newVal) && newVal <= this.max && newVal >= this.min) {
           this.$emit('change', newVal);
diff --git a/packages/slider/src/main.vue b/packages/slider/src/main.vue
index d36a3503c..b161f31cf 100644
--- a/packages/slider/src/main.vue
+++ b/packages/slider/src/main.vue
@@ -85,7 +85,7 @@
 
     watch: {
       inputValue(val) {
-        this.$emit('input', val);
+        this.$emit('input', Number(val));
       },
 
       showTip(val) {