Merge branch 'dev'

Author: levy

src/el-number-range.vue

@@ -1,8 +1,20 @@
 <template>
   <div class="el-number-range">
-    <el-input :style="{width}" type="number" v-model.number="minValue"/>
+    <el-input
+      :style="{width}"
+      type="number"
+      v-model.number="minValue"
+      @blur="clampMin($event)"
+      @focus="handleFocus($event, 'min')"
+    />
     <span class="separator">{{ separator }}</span>
-    <el-input :style="{width}" type="number" v-model.number="maxValue"/>
+    <el-input
+      :style="{width}"
+      type="number"
+      v-model.number="maxValue"
+      @blur="clampMax($event)"
+      @focus="handleFocus($event, 'max')"
+    />
   </div>
 </template>
 <script>
@@ -52,12 +64,7 @@ export default {
         return this.value[0]
       },
       set(val) {
-        if (this.isNum(val)) {
-          val = this.clamp(val)
-          if (this.isNum(this.maxValue)) val = Math.min(val, this.maxValue)
-        } else {
-          val = undefined
-        }
+        if (val === '') val = undefined
         this.$emit('input', [val, this.maxValue])
       }
     },
@@ -66,24 +73,32 @@ export default {
         return this.value[1]
       },
       set(val) {
-        if (this.isNum(val)) {
-          val = this.clamp(val)
-          if (this.isNum(this.minValue)) val = Math.max(val, this.minValue)
-        } else {
-          val = undefined
-        }
-        /**
-         * 配合v-model使用
-         */
+        if (val === '') val = undefined
         this.$emit('input', [this.minValue, val])
       }
     }
   },
   methods: {
+    clampMin(event) {
+      this.$emit('blur', event, 'min')
+      if (this.minValue === undefined) return
+      let val = this.clamp(this.minValue)
+      if (this.maxValue !== undefined) val = Math.min(val, this.maxValue)
+      this.$emit('input', [val, this.maxValue])
+    },
+    clampMax(event) {
+      this.$emit('blur', event, 'max')
+      if (this.maxValue === undefined) return
+      let val = this.clamp(this.maxValue)
+      if (this.minValue !== undefined) val = Math.max(val, this.minValue)
+      this.$emit('input', [this.minValue, val])
+    },
+    handleFocus(event, position) {
+      this.$emit('focus', event, position)
+    },
     clamp(val) {
       return Math.max(this.min, Math.min(this.max, val))
-    },
-    isNum: n => typeof n === 'number'
+    }
   }
 }
 </script>

yarn.lock

@@ -5871,9 +5871,10 @@ lodash._createset@~4.0.0:
   version "4.0.3"
   resolved "https://registry.npm.taobao.org/lodash._createset/download/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
 
-lodash._reinterpolate@~3.0.0:
+lodash._reinterpolate@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npm.taobao.org/lodash._reinterpolate/download/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
 
 lodash._root@~3.0.0:
   version "3.0.1"
@@ -5897,17 +5898,19 @@ lodash.sortby@^4.7.0:
   integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
 lodash.template@^4.0.2:
-  version "4.4.0"
-  resolved "https://registry.npm.taobao.org/lodash.template/download/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
+  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
   dependencies:
-    lodash._reinterpolate "~3.0.0"
+    lodash._reinterpolate "^3.0.0"
     lodash.templatesettings "^4.0.0"
 
 lodash.templatesettings@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.npm.taobao.org/lodash.templatesettings/download/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
+  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
   dependencies:
-    lodash._reinterpolate "~3.0.0"
+    lodash._reinterpolate "^3.0.0"
 
 lodash.union@~4.6.0:
   version "4.6.0"
@@ -5922,8 +5925,9 @@ lodash.without@~4.4.0:
   resolved "https://registry.npm.taobao.org/lodash.without/download/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac"
 
 lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0:
-  version "4.17.11"
-  resolved "http://registry.npm.taobao.org/lodash/download/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+  version "4.17.14"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba"
+  integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==
 
 log-symbols@^2.1.0, log-symbols@^2.2.0:
   version "2.2.0"