Merge branch 'input-number' of https://github.com/huanghong1125/iview into input-number

huanghong
2 parents bfee4bfd 886aeeb0
Showing 2 changed files with 16 additions and 19 deletions Show diff stats
examples/routers/input-number.vue
src/components/input-number/input-number.vue
@@ -54,7 +54,8 @@
         <InputNumber v-model="value3" style="width: 200px" placeholder="Enter something..."></InputNumber> -->
-        <InputNumber v-model="valueNull" style="width: 200px" :min='0' :max='10000'  :precision='2' ></InputNumber>
+        <InputNumber v-model="valueNull" style="width: 200px" :min='-1000' :max='10000'  :precision='2' ></InputNumber>
+        <InputNumber v-model="valueNull" style="width: 200px" ></InputNumber>
     </div>
 </template>
 <script>
@@ -253,6 +253,12 @@
                 // 如果 step 是小数，且没有设置 precision，是有问题的
                 if (val && !isNaN(this.precision)) val = Number(Number(val).toFixed(this.precision));
+                const {min, max} = this;
+                if (val > max) {
+                    val = max;
+                } else if (val < min) {
+                    val = min;
+                } 
                 this.$nextTick(() => {
                     this.currentValue = val;
                     this.$emit('input', val);
@@ -278,42 +284,32 @@
                 }
             },
             change (event) {
+                if (event.type == 'input') return; 
                 let val = event.target.value.trim();
                 if (this.parser) {
                     val = this.parser(val);
                 }
-
-                if (event.type == 'input' && val.match(/^\-?\.?$|\.$/)) return; // prevent fire early if decimal. If no more input the change event will fire later
-
+                
                 const {min, max} = this;
                 const isEmptyString = val.length === 0;
-                val = Number(val);
-
                 if(isEmptyString){
                     this.setValue(null);
                     return;
                 }
-                if (event.type == 'change'){
-                    if (val === this.currentValue && val > min && val < max) return; // already fired change for input event
-                }
+                //if (event.type == 'input' && val.match(/^\-?\.?$|\.$/)) return; // prevent fire early if decimal. If no more input the change event will fire later 
+                
+                val = Number(val);
-                if (!isNaN(val) && !isEmptyString) {
+                if (!isNaN(val)) {
                     this.currentValue = val;
-
-                    if (event.type == 'input' && val < min) return; // prevent fire early in case user is typing a bigger number. Change will handle this otherwise.
-                    if (val > max) {
-                        this.setValue(max);
-                    } else if (val < min) {
-                        this.setValue(min);
-                    } else {
-                        this.setValue(val);
-                    }
+                    this.setValue(val);
                 } else {
                     event.target.value = this.currentValue;
                 }
             },
             changeVal (val) {
                 val = Number(val);
+                //this.setValue(val);
                 if (!isNaN(val)) {
                     const step = this.step;