From cb0a891f09573d715c1b876e6c252daec7671ed0 Mon Sep 17 00:00:00 2001 From: Hufe921 Date: Sun, 30 Jan 2022 12:48:42 +0800 Subject: [PATCH] fix:table paging --- src/editor/core/draw/Draw.ts | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/editor/core/draw/Draw.ts b/src/editor/core/draw/Draw.ts index 3712a58..a8cb3d5 100644 --- a/src/editor/core/draw/Draw.ts +++ b/src/editor/core/draw/Draw.ts @@ -470,19 +470,20 @@ export class Draw { let deleteStart = 0 let deleteCount = 0 let preTrHeight = 0 - for (let r = 0; r < trList.length; r++) { - const tr = trList[r] - if (tr.tdList.length < 2) break - if (curPagePreHeight + rowMarginHeight + preTrHeight + tr.height > height) { - // 暂时不考虑跨列 - if (element.colgroup?.length !== tr.tdList.length) { - deleteCount = 0 + if (trList.length > 1) { + for (let r = 0; r < trList.length; r++) { + const tr = trList[r] + if (curPagePreHeight + rowMarginHeight + preTrHeight + tr.height > height) { + // 是否跨列 + if (element.colgroup?.length !== tr.tdList.length) { + deleteCount = 0 + } + break + } else { + deleteStart = r + 1 + deleteCount = trList.length - deleteStart + preTrHeight += tr.height } - break - } else { - deleteStart = r + 1 - deleteCount = trList.length - deleteStart - preTrHeight += tr.height } } if (deleteCount) {