|
|
@@ -112,18 +112,22 @@ export default class Form extends React.Component {
|
|
|
let arr = [];
|
|
|
inner:
|
|
|
for (let j = 0; j < (columns < 0 ? 1 : columns) && i < data.length; j++) {
|
|
|
- let w = data[i].width || 0;
|
|
|
+ let w1 = data[i].width || 0;
|
|
|
arr.push(data[i]);
|
|
|
- if (w >= 100) {
|
|
|
+ i++;
|
|
|
+ if (w1 >= 100) {
|
|
|
break inner;
|
|
|
}
|
|
|
}
|
|
|
- i++;
|
|
|
- arr.map((a, i) => {
|
|
|
+ if(arr.length == 0) {
|
|
|
+ i++;
|
|
|
+ }
|
|
|
+ arr.map((a, x) => {
|
|
|
a.colSpan = `${100 / arr.length}%`
|
|
|
});
|
|
|
columnsData.push(arr);
|
|
|
}
|
|
|
+ console.log(columnsData);
|
|
|
return columnsData;
|
|
|
}
|
|
|
|