Merge branch 'volodalexey-group-header-fix'

AllenFang · AllenFang · commit f6bece0123c3 · 2017-06-11T14:38:26.000+08:00
diff --git a/src/BootstrapTable.js b/src/BootstrapTable.js
@@ -1271,13 +1271,17 @@ class BootstrapTable extends Component {
         }
       }
     } else {
-      // debugger;
-      React.Children.forEach(this.props.children, (child, i) => {
-        if (child && child.props.width) {
-          header[i].style.width = `${child.props.width}px`;
-          header[i].style.minWidth = `${child.props.width}px`;
+      for (const i in bodyHeader) {
+        if (bodyHeader.hasOwnProperty(i)) {
+          const child = bodyHeader[i];
+          if (child.style.width) {
+            header[i].style.width = child.style.width;
+          }
+          if (child.style.minWidth) {
+            header[i].style.minWidth = child.style.minWidth;
+          }
         }
-      });
+      }
     }
     this.isVerticalScroll = isScroll;
   }

Original file line number	Diff line number	Diff line change
`@@ -1271,13 +1271,17 @@ class BootstrapTable extends Component {`
`1271`	`1271`	`}`
`1272`	`1272`	`}`
`1273`	`1273`	`} else {`
`1274`		`- // debugger;`
`1275`		`- React.Children.forEach(this.props.children, (child, i) => {`
`1276`		`- if (child && child.props.width) {`
`1277`		- header[i].style.width = `${child.props.width}px`;
`1278`		- header[i].style.minWidth = `${child.props.width}px`;
	`1274`	`+ for (const i in bodyHeader) {`
	`1275`	`+ if (bodyHeader.hasOwnProperty(i)) {`
	`1276`	`+ const child = bodyHeader[i];`
	`1277`	`+ if (child.style.width) {`
	`1278`	`+ header[i].style.width = child.style.width;`
	`1279`	`+ }`
	`1280`	`+ if (child.style.minWidth) {`
	`1281`	`+ header[i].style.minWidth = child.style.minWidth;`
	`1282`	`+ }`
`1279`	`1283`	`}`
`1280`		`- });`
	`1284`	`+ }`
`1281`	`1285`	`}`
`1282`	`1286`	`this.isVerticalScroll = isScroll;`
`1283`	`1287`	`}`