|
@@ -633,6 +633,7 @@ export default {
|
|
|
groups.push(curGroup);
|
|
|
curGroup = [];
|
|
|
}
|
|
|
+ // console.log(groups);
|
|
|
|
|
|
const getNextGroup = () => {
|
|
|
return groups.shift();
|
|
@@ -649,7 +650,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
let curGroupHeigth =
|
|
|
- groups.length === 1
|
|
|
+ curGroup.length === 1
|
|
|
? curGroup[0].h
|
|
|
: Math.max.apply(
|
|
|
null,
|
|
@@ -657,12 +658,17 @@ export default {
|
|
|
);
|
|
|
|
|
|
if (curGroupHeigth + curColumnHeight > this.maxColumnHeight) {
|
|
|
+ // 当前栏第一个元素就超过最大高度时,直接放当前栏
|
|
|
+ if (!curColumn.texts.length) {
|
|
|
+ curColumn.texts.push(...curGroup);
|
|
|
+ curGroup = getNextGroup();
|
|
|
+ }
|
|
|
// 当前栏满了
|
|
|
if (curColumnNo >= curPage.columnNumber) {
|
|
|
// 当前页满了
|
|
|
pages.push(curPage);
|
|
|
curPage = null;
|
|
|
- curColumnNo = null;
|
|
|
+ curColumnNo = 0;
|
|
|
}
|
|
|
curColumn = null;
|
|
|
curColumnHeight = 0;
|