Merge branch 'v2' of https://github.com/jdf2e/nutui into v2

src/packages/stepper/demo.vue

@@ -4,7 +4,7 @@
     <div>
       <nut-cell>
         <span slot="title">
-          <nut-stepper :value.sync="val1"></nut-stepper>
+          <nut-stepper :value.sync="val1" :max="12"></nut-stepper>
         </span>
         <span slot="desc">
           value: {{val1}} <button @click="reduce">-</button> <button @click="add">+</button> 
@@ -47,7 +47,7 @@
     <div>
       <nut-cell>
         <span slot="title">
-          <nut-stepper :value.sync="val6" :transition="false" :simple="false"></nut-stepper>
+          <nut-stepper :value.sync="val6" :transition="false" :simple="false" :max="999"></nut-stepper>
         </span>
       </nut-cell>
     </div>

src/packages/stepper/stepper.scss

@@ -84,6 +84,8 @@
     }
     .nut-stepper-grey{
         color: #ececee;
-        fill: #cecece;
+        svg{
+            fill: #cecece!important;
+        }
     }
 }

src/packages/stepper/stepper.vue

@@ -2,10 +2,20 @@
     <div :class="{'nut-stepper': !simple, 'nut-stepper-simple': simple}">
         <span 
             @click="reduce()" 
-            :class="{'nut-stepper-grey': num - step < min}"
+            :class="{'nut-stepper-grey': isGray}"
             v-html="require('../../assets/svg/minus.svg')">
         </span>
-        <input type="number" :value="num | maxv(min)" @input="numchange" :min="min" :max="max" :readonly="readonly" :style="{visibility:showNum? 'visible': 'hidden'}" />
+        <input 
+         type="number" 
+         :min="minNum" 
+         :max="max" 
+         :readonly="readonly" 
+         :value="num | maxv(minNum, max)" 
+         :style="{visibility:showNum? 'visible': 'hidden'}"
+         @input="numchange" 
+         @keyup="checknum"
+         @focus="focus"
+         @blur="blur" />
         <div 
             :class="['nut-stepper-fake', showAddAnim? 'nut-stepper-transition': 'nut-stepper-none-transition']"
             :style="{
@@ -74,7 +84,10 @@ export default {
     },
     data() {
         return {
+            tempNum: '',
+            focusing: false,
             num: this.value,
+            minNum: this.min,
             showNum: true,
             showAddAnim: false,
             showReduceAnim: false,
@@ -84,28 +97,71 @@ export default {
         }
     },
     filters: {
-        maxv(v, min) {
-            return Math.max(v, min);
+        maxv(v, min, max) {
+            let val = v;
+            if(val > max) val = max;
+            if(val < min) val = min;
+            return val;
         }
     },
     watch: {
         value(v, ov) {
+            if(v > this.max) v = this.max;
+            if(v < this.minNum) v = this.minNum;
             this.num = v;
             this.$emit('change', this.num);
         }
     },
+    computed: {
+        isGray() {
+            return (this.focusing? this.tempNum: this.num) - this.step < this.min;
+        }
+    },
     methods: {
+        focus(e) {
+            if(this.readonly) return;
+            // clear val temporary when focus, e...s
+            const v = this.num;
+            this.tempNum = v;
+            this.minNum = '';
+            this.num = '';
+            this.focusing = true;
+        },
+        blur(e) {
+            if(this.readonly) return;
+            let v = e.target.value;
+            this.minNum = this.min;
+            this.focusing = false;
+            if(v) {
+                if(v > this.max) v = this.max;
+                if(v < this.minNum) v = this.minNum;
+                this.num = v;
+            }else{
+                this.num = this.tempNum;
+            }
+        },
+        checknum(e) {
+            let v = e.target.value;
+            this.minNum = this.min;
+            this.focusing = false;
+            if(v > this.max) v = this.max;
+            if(v < this.minNum) v = this.minNum;
+            e.target.value = v;
+            this.num = v;
+        },
         numchange(e) {
             let v = e.target.value;
+            
             if(v > this.max) v = this.max;
-            if(v < this.min) v = this.min;
+            if(v < this.minNum) v = this.minNum;
+            e.target.value = v;
             this.num = v;
             this.$emit('update:value', this.num);
             this.$emit('change', this.num);
         },
         add() {
             this.num = Number(this.num);
-            if(this.num <= this.max - this.step && this.max > this.min) {
+            if(this.num <= this.max - this.step && this.max > this.minNum) {
                 let [n1, n2] = this.num.toString().split('.');
                 let fixedLen = n2? n2.length: 0;
                 this.num = parseFloat((Number(n1) + Number(this.step)) + (n2? '.'+n2: '')).toFixed(fixedLen);
@@ -132,7 +188,7 @@ export default {
             this.showNum = true;
         },
         reduce(){
-            if(this.num - this.step >= this.min) {
+            if(this.num - this.step >= this.minNum) {
                 let [n1, n2] = this.num.toString().split('.');
                 let fixedLen = n2? n2.length: 0;
                 this.num = parseFloat((Number(n1) - this.step) + (n2? '.'+n2: '')).toFixed(fixedLen);