diff --git a/examples/docs/en-US/table.md b/examples/docs/en-US/table.md
index 52de82b2a..e26a3f554 100644
--- a/examples/docs/en-US/table.md
+++ b/examples/docs/en-US/table.md
@@ -1760,7 +1760,7 @@ For table of numbers, you can add an extra row at the table footer displaying ea
 | sortable | whether column can be sorted. Remote sorting can be done by setting this attribute to 'custom' and listening to the `sort-change` event of Table | boolean, string | true, false, custom | false |
 | sort-method | sorting method, works when `sortable` is `true`. Should return a boolean. | Function(a, b) | — | — |
 | resizable | whether column width can be resized, works when `border` of `el-table` is `true` | boolean | — | false |
-| formatter | function that formats content | Function(row, column) | — | — |
+| formatter | function that formats cell content | Function(row, column, cellValue) | — | — |
 | show-overflow-tooltip | whether to hide extra content and show them in a tooltip when hovering on the cell | boolean | — | false |
 | align | alignment | string | left/center/right | left |
 | header-align | alignment of the table header. If omitted, the value of the above `align` attribute will be applied | String | left/center/right | — |
diff --git a/examples/docs/zh-CN/popover.md b/examples/docs/zh-CN/popover.md
index 449c94e56..449874882 100644
--- a/examples/docs/zh-CN/popover.md
+++ b/examples/docs/zh-CN/popover.md
@@ -246,9 +246,10 @@ Popover 的属性与 Tooltip 很类似，它们都是基于`Vue-popper`开发的
 |  visible-arrow   |  是否显示 Tooltip 箭头，更多参数可见[Vue-popper](https://github.com/element-component/vue-popper) | Boolean | — | true |
 |  popper-options        | [popper.js](https://popper.js.org/documentation.html) 的参数 | Object            | 参考 [popper.js](https://popper.js.org/documentation.html) 文档 | `{ boundariesElement: 'body', gpuAcceleration: false }` |
 | popper-class | 为 popper 添加类名 | String | — | — |
+| open-delay | 触发方式为 hover 时的显示延迟，单位为毫秒 | Number | — | — |
 
 ### Slot
-| 参数               | 说明                                                     |
+| 参数 | 说明 |
 |--- | ---|
 | — | Popover 内嵌 HTML 文本 |
 | reference | 触发 Popover 显示的 HTML 元素 |
diff --git a/examples/docs/zh-CN/table.md b/examples/docs/zh-CN/table.md
index 4ad0e02fc..8ad9d6c55 100644
--- a/examples/docs/zh-CN/table.md
+++ b/examples/docs/zh-CN/table.md
@@ -1821,7 +1821,7 @@
 | sortable | 对应列是否可以排序，如果设置为 'custom'，则代表用户希望远程排序，需要监听 Table 的 sort-change 事件 | boolean, string | true, false, 'custom' | false |
 | sort-method | 对数据进行排序的时候使用的方法，仅当 sortable 设置为 true 的时候有效，需返回一个布尔值 | Function(a, b) | — | — |
 | resizable | 对应列是否可以通过拖动改变宽度（需要在 el-table 上设置 border 属性为真） | boolean | — | true |
-| formatter | 用来格式化内容 | Function(row, column) | — | — |
+| formatter | 用来格式化内容 | Function(row, column, cellValue) | — | — |
 | show-overflow-tooltip | 当内容过长被隐藏时显示 tooltip | Boolean | — | false |
 | align | 对齐方式 | String | left/center/right | left |
 | header-align | 表头对齐方式，若不设置该项，则使用表格的对齐方式 | String | left/center/right | — |
diff --git a/packages/upload/src/upload-list.vue b/packages/upload/src/upload-list.vue
index 568c118fb..493c2e7f7 100644
--- a/packages/upload/src/upload-list.vue
+++ b/packages/upload/src/upload-list.vue
@@ -5,9 +5,9 @@
     name="el-list"
   >
     <li
-      v-for="file in files"
+      v-for="(file, index) in files"
       :class="['el-upload-list__item', 'is-' + file.status]"
-      :key="file"
+      :key="index"
     >
       <img
         class="el-upload-list__item-thumbnail"
diff --git a/test/unit/specs/menu.spec.js b/test/unit/specs/menu.spec.js
index 4a3bad141..8c403bb0e 100644
--- a/test/unit/specs/menu.spec.js
+++ b/test/unit/specs/menu.spec.js
@@ -288,12 +288,9 @@ describe('Menu', () => {
     setTimeout(_ => {
       expect(submenu.$el.querySelector('.el-menu').style.display).to.not.ok;
       triggerEvent(submenu.$el, 'mouseleave');
-      setTimeout(_ => {
-        expect(submenu.$el.querySelector('.el-menu').style.display).to.be.equal('none');
-        done();
-      }, 1000);
+      done();
     }, 500);
-  }).timeout(3000);
+  });
   it('menu trigger click', done => {
     vm = createVue({
       template: `