Skip to content

Commit 4a340c7

Browse files
committed
fix #1168
1 parent 6d13a86 commit 4a340c7

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

packages/react-bootstrap-table2/src/props-resolver/column-resolver.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
export default ExtendBase =>
22
class ColumnResolver extends ExtendBase {
33
visibleColumnSize(includeSelectColumn = true) {
4-
let columnLen = this.props.columns.filter(c => !c.hidden).length;
4+
let columnLen;
5+
if (this.props.columnToggle && this.props.columnToggle.toggles) {
6+
const columns = this.props.columnToggle.toggles;
7+
columnLen = Object.keys(columns).filter(name => columns[name]).length;
8+
} else {
9+
columnLen = this.props.columns.filter(c => !c.hidden).length;
10+
}
511
if (!includeSelectColumn) return columnLen;
612
if (this.props.selectRow && !this.props.selectRow.hideSelectColumn) {
713
columnLen += 1;

0 commit comments

Comments
 (0)