[release] 1.0.0-rc.7

examples/docs/zh-cn/input.md

@@ -200,6 +200,7 @@
 ```html
 <el-input
   placeholder="请输入内容"
+  :number="true"
   v-model="input">
 </el-input>
 ```

package.json

@@ -1,6 +1,6 @@
 {
   "name": "element-ui",
-  "version": "1.0.0-rc.6",
+  "version": "1.0.0-rc.7",
   "description": "A Component Library for Vue.js.",
   "main": "lib/element-ui.common.js",
   "files": [

packages/input/src/input.vue

@@ -13,6 +13,7 @@
         <slot name="prepend"></slot>
       </div>
       <input
+        v-if="type === 'text'"
         class="el-input__inner"
         v-model="currentValue"
         type="text"
@@ -25,7 +26,24 @@
         :minlength="minlength"
         :autocomplete="autoComplete"
         ref="input"
-        @focus="$emit('focus', currentValue)"
+        @focus="handleFocus"
+        @blur="handleBlur"
+      >
+      <input
+        v-if="type === 'password'"
+        class="el-input__inner"
+        v-model="currentValue"
+        type="password"
+        :name="name"
+        :placeholder="placeholder"
+        :disabled="disabled"
+        :readonly="readonly"
+        :number="number"
+        :maxlength="maxlength"
+        :minlength="minlength"
+        :autocomplete="autoComplete"
+        ref="input"
+        @focus="handleFocus"
         @blur="handleBlur"
       >
       <!-- input 图标 -->
@@ -49,7 +67,7 @@
       :rows="rows"
       :maxlength="maxlength"
       :minlength="minlength"
-      @focus="$emit('focus', currentValue)"
+      @focus="handleFocus"
       @blur="handleBlur">
     </textarea>
   </div>
@@ -130,6 +148,9 @@
         const minRows = autosize ? autosize.minRows : null;
         const maxRows = autosize ? autosize.maxRows : null;
         this.textareaStyle = calcTextareaHeight(this.$refs.textarea, minRows, maxRows);
+      },
+      handleFocus(ev) {
+        this.$emit('focus', ev);
       }
     },
 

src/index.js

@@ -127,7 +127,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 };
 
 module.exports = {
-  version: '1.0.0-rc.6',
+  version: '1.0.0-rc.7',
   install,
   SelectDropdown,
   Pagination,