diff --git a/components/table/filterDropdown.jsx b/components/table/filterDropdown.jsx index 5bfaea7309..2cb63d4e26 100644 --- a/components/table/filterDropdown.jsx +++ b/components/table/filterDropdown.jsx @@ -2,6 +2,7 @@ import React from 'react'; import Menu from 'rc-menu'; import Dropdown from '../dropdown'; import Icon from '../icon'; +import Checkbox from '../checkbox'; let FilterMenu = React.createClass({ getInitialState() { @@ -40,10 +41,16 @@ let FilterMenu = React.createClass({ this.setState({ visible: visible }); + if (!visible) { + this.props.confirmFilter(this.props.column, this.state.selectedKeys); + } }, renderMenus(items) { let menuItems = items.map((item) => { - return {item.text}; + return + = 0} /> + {item.text} + ; }); return menuItems; }, diff --git a/style/components/table.less b/style/components/table.less index 0efc471192..19d0f17c65 100644 --- a/style/components/table.less +++ b/style/components/table.less @@ -220,16 +220,9 @@ .@{table-prefix-cls}-filter-dropdown { min-width: 88px; margin-left: -8px; - margin-top: -6px; .ant-dropdown-menu-item { overflow: hidden; - padding: 7px 24px 8px 7px; - &.ant-dropdown-menu-item-selected { - .selected_icon(); - } - &.ant-dropdown-menu-item-selected:after { - padding-right: 8px; - } + padding: 7px 8px; } a&-link { @@ -245,7 +238,6 @@ } &.clear { float: right; - margin-right: -32px; } } }