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

Author: 黄书伟

README-CN.md

@@ -22,9 +22,9 @@
 - [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] [footer 汇总功能](http://doc.huangsw.com/vue-easytable/app.html#/table?anchor=table-footer-summary)
+- [x] [添加条件过滤功能](http://doc.huangsw.com/vue-easytable/app.html#/table?anchor=table-filters)  
 - [ ] 添加导出 excel 功能  
 - [ ] 添加导出 pdf 功能  
-- [ ] 添加条件过滤功能  
 - [ ] 添加行展开功能  
 - [ ] 纵向整列拖动
 

README.md

@@ -24,9 +24,9 @@ Based on vue2.x flexible table components.
 - [x] [Support cell merge (colSpan and rowSpan)](http://doc.huangsw.com/vue-easytable/app.html#/table?anchor=table-cell-merge)
 - [x] [Support checkbox selection](http://doc.huangsw.com/vue-easytable/app.html#/table?anchor=table-selection-advanced)  
 - [x] [Footer summary](http://doc.huangsw.com/vue-easytable/app.html#/table?anchor=table-footer-summary)
+- [x] [Conditional filter](http://doc.huangsw.com/vue-easytable/app.html#/table?anchor=table-filters)
 - [ ] Export excel
 - [ ] Export PDF
-- [ ] Conditional filter
 - [ ] Row expansion
 - [ ] Vertical column drag