Merge branch 'master' of https://github.com/huangshuwei/vue-easytable

Author: 黄书伟

README-CN.md

@@ -20,7 +20,7 @@
 - [x] [自带分页组件](http://doc.huangsw.com/vue-easytable/app.html#/pagination)  
 - [x] [单元格编辑](http://doc.huangsw.com/vue-easytable/app.html#/table?anchor=table-cell-edit)
 - [x] [支持单元格合并 (colSpan and rowSpan)](http://doc.huangsw.com/vue-easytable/app.html#/table?anchor=table-cell-merge)
-- [x] [添加 checkbox 多选功能](http://doc.huangsw.com/vue-easytable/app.html#/table?anchor=table-selection-advanced)
+- [x] [支持 checkbox 多选功能](http://doc.huangsw.com/vue-easytable/app.html#/table?anchor=table-selection-advanced)
 - [ ] 添加 footer 功能  
 - [ ] 添加导出 excel 功能  
 - [ ] 添加导出 pdf 功能  
@@ -51,8 +51,18 @@ Vue.component(VPagination.name, VPagination)
 ```
 
 ## 效果（不是全部）
+**自适应、固定列，表头固定、支持列宽拖动、排序、分页**
 ![vue-easytable](./examples/images/vue-easytable.gif)
 
+**支持单元格合并**
+![vue-easytable](./examples/images/rowspan.png)
+
+**单元格编辑**
+![vue-easytable](./examples/images/edit.gif)
+
+**支持 checkbox 多选功能**
+![vue-easytable](./examples/images/selection.gif)
+
 
 ## License
 http://www.opensource.org/licenses/mit-license.php

README.md

@@ -53,16 +53,16 @@ Vue.component(VPagination.name, VPagination)
 ```
 
 ## Effect
-Adaptive、Fixed column, header fixed、Support column width drag、Custom columns, custom cell styles、Own paging component
+**Adaptive、Fixed column, header fixed、Support column width drag、Custom columns, custom cell styles、Own paging component**
 ![vue-easytable](./examples/images/vue-easytable.gif)
 
-Support cell merge
+**Support cell merge**
 ![vue-easytable](./examples/images/rowspan.png)
 
-Cell Editing
+**Cell Editing**
 ![vue-easytable](./examples/images/edit.gif)
 
-Support checkbox selection
+**Support checkbox selection**
 ![vue-easytable](./examples/images/selection.gif)
 
 ## License