From 5ece780d09aa0aa2ce3ad73d42ff906b757dae1d Mon Sep 17 00:00:00 2001
From: "mo.duan" <mo.duan@tendcloud.com>
Date: Mon, 2 Sep 2019 12:07:10 +0800
Subject: [PATCH] optimize the inputNumber

fixed bug
1. when setting the precision, inputNumer cannot input '.' bug
2. when setting  the precision, the cursor positoning bug
---
 examples/routers/input-number.vue            |  4 +++
 src/components/input-number/input-number.vue | 26 +++++++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/examples/routers/input-number.vue b/examples/routers/input-number.vue
index 6a62b9163e..735f10f306 100644
--- a/examples/routers/input-number.vue
+++ b/examples/routers/input-number.vue
@@ -72,6 +72,9 @@
                 :formatter="value => `${value}%`"
                 :parser="value => value.replace('%', '')"></InputNumber>
         </div>
+        <div style="margin-top: 10px">
+            <InputNumber v-model="value4" style="width: 200px"  :precision='2' ></InputNumber>
+        </div>
     </div>
 </template>
 <script>
@@ -81,6 +84,7 @@
                 value1: 1800000,
                 value2: 55,
                 value3: 100,
+                value4 : null,
                 valueNull:null,
                 formatter: (value) => `$ ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ','),
                 parser: (value) => value.replace(/\$\s?|(,*)/g, ''),
diff --git a/src/components/input-number/input-number.vue b/src/components/input-number/input-number.vue
index 0d3b16ab8c..b0e8e10701 100644
--- a/src/components/input-number/input-number.vue
+++ b/src/components/input-number/input-number.vue
@@ -24,6 +24,7 @@
                 @blur="blur"
                 @keydown.stop="keyDown"
                 @input="change"
+                ref="precisionCursor"
                 @mouseup="preventDefault"
                 @change="change"
                 :readonly="readonly || !editable"
@@ -305,15 +306,24 @@
                     this.setValue(null);
                     return;
                 }
-                if (event.type == 'input' && val.match(/^\-?\.?$|\.$/)) return; // prevent fire early if decimal. If no more input the change event will fire later
+                if (event.type == 'input' && val.match(/^\-?\.?$|\.$/g)) return; // prevent fire early if decimal. If no more input the change event will fire later
 
-                val = Number(val);
+                //#fixed when setting the precision val, input point cannot show problem
+                const precision = this.precision;
+                let cacheVal = this.currentValue;
+                if( precision ){
+                    const valMatchPointArr = (val+'').match(/\./g);
+                    if( valMatchPointArr && valMatchPointArr.length >= 2 ){
+                        cacheVal = this.currentValue + '.';
+                    }
+                }
 
-                if (!isNaN(val)) {
+                val = Number(val);
+                if (!isNaN(val) ) {
                     this.currentValue = val;
                     this.setValue(val);
                 } else {
-                    event.target.value = this.currentValue;
+                    event.target.value = cacheVal;
                 }
             },
             changeVal (val) {
@@ -338,6 +348,14 @@
             },
             currentValue (val) {
                 this.changeVal(val);
+                //optimization - Solve the problem of cursor positioning inaccuracy
+                this.$nextTick(()=>{
+                    if( this.precision ){
+                        const currentValueLength = ( this.currentValue || 0 ).toString().length;
+                        const precisionCursor = this.$refs.precisionCursor;
+                        precisionCursor.selectionStart = precisionCursor.selectionEnd = currentValueLength;
+                    }
+                });
             },
             min () {
                 this.changeVal(this.currentValue);