diff --git a/examples/docs/dialog.md b/examples/docs/dialog.md
index 262b8626c..8f5765797 100644
--- a/examples/docs/dialog.md
+++ b/examples/docs/dialog.md
@@ -162,10 +162,10 @@ Dialog 组件的正文标题可以是任意的，甚至可以是表格或表单
 <el-dialog title="收货地址" v-model="dialogFormVisible">
   <el-form :models="form">
     <el-form-item label="活动名称" :label-width="formLabelWidth">
-      <el-input :model.sync="form.name" auto-complete="off"></el-input>
+      <el-input v-model="form.name" auto-complete="off"></el-input>
     </el-form-item>
     <el-form-item label="活动区域" :label-width="formLabelWidth">
-      <el-select :value.sync="form.region" placeholder="请选择活动区域">
+      <el-select v-model="form.region" placeholder="请选择活动区域">
         <el-option label="区域一" value="shanghai"></el-option>
         <el-option label="区域二" value="beijing"></el-option>
       </el-select>
diff --git a/examples/docs/popover.md b/examples/docs/popover.md
index e911e8e9d..986f4a9f6 100644
--- a/examples/docs/popover.md
+++ b/examples/docs/popover.md
@@ -185,7 +185,7 @@ Popover 的属性与 Tooltip 很类似，它们都是基于`Vue-popper`开发的
   ref="popover5"
   placement="top"
   width="160"
-  :visible="visible2">
+  v-model="visible2">
   <p>这是一段内容这是一段内容确定删除吗？</p>
   <div style="text-align: right; margin: 0">
     <el-button size="mini" type="text" @click.native="visible2 = false">取消</el-button>
@@ -205,7 +205,7 @@ Popover 的属性与 Tooltip 很类似，它们都是基于`Vue-popper`开发的
 |  content        |  显示的内容，也可以通过 `slot` 传入 DOM   | String            | — | — |
 |  width        |  宽度  | String, Number            | — | 最小宽度 150px |
 |  placement        |  出现位置  | String | top/top-start/top-end/bottom/bottom-start/bottom-end/left/left-start/left-end/right/right-start/right-end |  bottom |
-|  visible        |  初始状态是否可见  | Boolean           | — |  false |
+|  value(v-model)        |  状态是否可见  | Boolean           | — |  false |
 |  offset        |  出现位置的偏移量  | Number           | — |  0 |
 |  transition     |  定义渐变动画      | String             | — | fade-in-linear |
 |  visible-arrow   |  是否显示 Tooltip 箭头，更多参数可见[Vue-popper](https://github.com/element-component/vue-popper) | Boolean | — | true |
diff --git a/examples/docs/tooltip.md b/examples/docs/tooltip.md
index bc9e5ed37..6549bc763 100644
--- a/examples/docs/tooltip.md
+++ b/examples/docs/tooltip.md
@@ -167,7 +167,7 @@ Tooltip 组件提供了两个不同的主题：`dark`和`light`。
 |  effect        |  默认提供的主题  | String            | `dark`, `light`  | dark  |
 |  content        |  显示的内容，也可以通过 `slot#content` 传入 DOM  | String            | — | — |
 |  placement        |  Tooltip 的出现位置  | String           |  `top`, `top-start`, `top-end`, `bottom`, `bottom-start`, `bottom-end`, `left`, `left-start`, `left-end`, `right`, `right-start`, `right-end` |  bottom |
-|  visible        |  初始状态是否可见  | Boolean           | — |  false |
+|  value(v-model)        |  状态是否可见  | Boolean           | — |  false |
 |  disabled       |  Tooltip 是否可用  | Boolean           | — |  false |
 |  offset        |  出现位置的偏移量  | Number           | — |  0 |
 |  transition     |  定义渐变动画      | String             | — | `fade-in-linear` |
diff --git a/packages/table/src/table-column.js b/packages/table/src/table-column.js
index 703ec36ad..a5504048f 100644
--- a/packages/table/src/table-column.js
+++ b/packages/table/src/table-column.js
@@ -90,9 +90,7 @@ export default {
     formatter: Function
   },
 
-  render(h) {
-    return <div />;
-  },
+  render() {},
 
   data() {
     return {
@@ -113,6 +111,9 @@ export default {
   },
 
   created() {
+    this.customRender = this.$options.render;
+    this.$options.render = (h) => h('div');
+
     let columnId = this.columnId = (this.$parent.gridId || (this.$parent.columnId + '_')) + 'column_' + columnIdSeed++;
 
     let parent = this.$parent;
@@ -173,8 +174,6 @@ export default {
 
     column.template = function(h, data) {
       if (_self.$vnode.data.inlineTemplate) {
-        let customRender = _self.$options.render;
-
         renderColumn = function() {
           data._staticTrees = _self._staticTrees;
           data.$options = {};
@@ -182,7 +181,7 @@ export default {
           data._renderProxy = _self._renderProxy;
           data._m = _self._m;
 
-          return customRender.call(data);
+          return _self.customRender.call(data);
         };
       };
 
diff --git a/packages/theme-default/src/table.css b/packages/theme-default/src/table.css
index 62ebca9ac..960bb393f 100644
--- a/packages/theme-default/src/table.css
+++ b/packages/theme-default/src/table.css
@@ -252,6 +252,10 @@
       & .el-table__body {
         & tr:nth-child(2n) {
           background: #FAFAFA;
+
+          &.current-row {
+            background: #EFF7FF;
+          }
         }
       }
     }
diff --git a/packages/upload/src/upload.vue b/packages/upload/src/upload.vue
index 27146df6b..2a544998b 100644
--- a/packages/upload/src/upload.vue
+++ b/packages/upload/src/upload.vue
@@ -34,6 +34,7 @@ export default {
       type: String,
       default: 'file'
     },
+    headers: Object,
     withCredentials: Boolean,
     multiple: Boolean,
     accept: String,
diff --git a/src/utils/vue-popper.js b/src/utils/vue-popper.js
index 8a6629d0a..70a961e93 100644
--- a/src/utils/vue-popper.js
+++ b/src/utils/vue-popper.js
@@ -23,7 +23,7 @@ export default {
     offset: {
       default: 0
     },
-    visible: Boolean,
+    value: Boolean,
     visibleArrow: Boolean,
     transition: String,
     options: {
@@ -41,15 +41,17 @@ export default {
   },
 
   watch: {
-    visible: {
+    value: {
       immediate: true,
       handler(val) {
         this.showPopper = val;
+        this.$emit('input', val);
       }
     },
 
     showPopper(val) {
       val ? this.updatePopper() : this.destroyPopper();
+      this.$emit('input', val);
     }
   },