From 8ff0d01dde6f66a5ecdabb89703618f16b86ac75 Mon Sep 17 00:00:00 2001
From: Hufe921 <huangyunfeihufe@hotmail.com>
Date: Sat, 4 Feb 2023 13:58:04 +0800
Subject: [PATCH] fix:paste table data format judgment

---
 src/editor/utils/clipboard.ts | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/editor/utils/clipboard.ts b/src/editor/utils/clipboard.ts
index aaf65fb..8d31ea3 100644
--- a/src/editor/utils/clipboard.ts
+++ b/src/editor/utils/clipboard.ts
@@ -196,41 +196,37 @@ export function getElementListByHTML(htmlText: string, options: IGetElementListB
             colgroup: [],
             trList: []
           }
-          let tdCount = 0
           // 基础数据
-          tableElement.querySelectorAll('tr').forEach((trElement, trIndex) => {
+          tableElement.querySelectorAll('tr').forEach(trElement => {
             const trHeightStr = window.getComputedStyle(trElement).height.replace('px', '')
             const tr: ITr = {
               height: Number(trHeightStr),
               tdList: []
             }
-            trElement.querySelectorAll('td').forEach(tdElement => {
-              const colspan = tdElement.colSpan
-              const rowspan = tdElement.rowSpan
-              if (trIndex === 0) {
-                tdCount += colspan
-              }
+            trElement.querySelectorAll('th,td').forEach(tdElement => {
+              const tableCell = <HTMLTableCellElement>tdElement
               const td: ITd = {
-                colspan,
-                rowspan,
+                colspan: tableCell.colSpan,
+                rowspan: tableCell.rowSpan,
                 value: [{
-                  value: tdElement.innerText
+                  value: tableCell.innerText
                 }]
               }
               tr.tdList.push(td)
             })
-            element.trList!.push(tr)
+            if (tr.tdList.length) {
+              element.trList!.push(tr)
+            }
           })
-          // 列选项数据
-          if (tdCount) {
+          if (element.trList!.length) {
+            // 列选项数据
+            const tdCount = element.trList![0].tdList.reduce((pre, cur) => pre + cur.colspan, 0)
             const width = Math.ceil(options.innerWidth / tdCount)
             for (let i = 0; i < tdCount; i++) {
               element.colgroup!.push({
                 width
               })
             }
-          }
-          if (element.colgroup) {
             elementList.push(element)
           }
         } else if (node.nodeName === 'INPUT' && (<HTMLInputElement>node).type === ControlComponent.CHECKBOX) {