From 1ff551864c8f30e1ee791955824ca4f2d3fe0947 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Mon, 16 Jan 2017 20:34:52 +0800
Subject: [PATCH] optimize InputNumber when input a number than keydown

---
 src/components/input-number/input-number.vue | 44 ++++++++++++++++++++++++++++++++------------
 test/routers/input.vue                       |  2 ++
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/components/input-number/input-number.vue b/src/components/input-number/input-number.vue
index f4171c2..48316d3 100644
--- a/src/components/input-number/input-number.vue
+++ b/src/components/input-number/input-number.vue
@@ -144,32 +144,52 @@
             preventDefault (e) {
                 e.preventDefault();
             },
-            up () {
-                if (this.upDisabled) {
+            up (e) {
+                const targetVal = Number(e.target.value);
+                if (this.upDisabled && isNaN(targetVal)) {
                     return false;
                 }
-                this.changeStep('up');
+                this.changeStep('up', e);
             },
-            down () {
-                if (this.downDisabled) {
+            down (e) {
+                const targetVal = Number(e.target.value);
+                if (this.downDisabled && isNaN(targetVal)) {
                     return false;
                 }
-                this.changeStep('down');
+                this.changeStep('down', e);
             },
-            changeStep (type) {
+            changeStep (type, e) {
                 if (this.disabled) {
                     return false;
                 }
 
+                const targetVal = Number(e.target.value);
                 let val = Number(this.value);
                 const step = Number(this.step);
                 if (isNaN(val)) {
                     return false;
                 }
 
-                if (type == 'up') {
+                // input a number, and key up or down
+                if (!isNaN(targetVal)) {
+                    if (type === 'up') {
+                        if (addNum(targetVal, step) <= this.max) {
+                            val = targetVal;
+                        } else {
+                            return false;
+                        }
+                    } else if (type === 'down') {
+                        if (addNum(targetVal, -step) >= this.min) {
+                            val = targetVal;
+                        } else {
+                            return false;
+                        }
+                    }
+                }
+
+                if (type === 'up') {
                     val = addNum(val, step);
-                } else if (type == 'down') {
+                } else if (type === 'down') {
                     val = addNum(val, -step);
                 }
                 this.setValue(val);
@@ -190,10 +210,10 @@
             keyDown (e) {
                 if (e.keyCode === 38) {
                     e.preventDefault();
-                    this.up();
+                    this.up(e);
                 } else if (e.keyCode === 40) {
                     e.preventDefault();
-                    this.down();
+                    this.down(e);
                 }
             },
             change (event) {
@@ -230,7 +250,7 @@
                 }
             }
         },
-        ready () {
+        compiled () {
             this.changeVal(this.value);
         },
         watch: {
diff --git a/test/routers/input.vue b/test/routers/input.vue
index efbfdd0..1d0bb21 100644
--- a/test/routers/input.vue
+++ b/test/routers/input.vue
@@ -1,4 +1,6 @@
 <template>
+    <Input-number :max="10" :min="1" :value="1"></Input-number>
+    <br><br>
     <i-input type="textarea" :autosize="true" placeholder="请输入..."></i-input>
     <i-input type="textarea" :autosize="{minRows: 2,maxRows: 5}" placeholder="请输入..."></i-input>
     <i-input name="a" icon="ios-clock-outline" @on-focus="focus" @on-blur="blur" readonly style="width:200px;" :value.sync="v" @on-enter="enter" @on-click="iconclick" size="large" placeholder="请输入"></i-input>
--
libgit2 0.21.4