From 3f364e680158e6d85076e84e68560e0a5c0f98e5 Mon Sep 17 00:00:00 2001
From: pipipi-pikachu <pipipi_pikachu@163.com>
Date: Sat, 28 Aug 2021 01:08:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A1=A8=E6=A0=BC=E6=8F=92=E5=85=A5exc?=
 =?UTF-8?q?el=E6=95=B0=E6=8D=AE=E6=97=B6=E8=87=AA=E5=8A=A8=E8=A1=A5?=
 =?UTF-8?q?=E8=B6=B3=E8=A1=8C=E5=88=97=EF=BC=88#42=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../element/TableElement/EditableTable.vue    | 74 ++++++++++++++-----
 1 file changed, 56 insertions(+), 18 deletions(-)

diff --git a/src/views/components/element/TableElement/EditableTable.vue b/src/views/components/element/TableElement/EditableTable.vue
index ad80a960..7e099f55 100644
--- a/src/views/components/element/TableElement/EditableTable.vue
+++ b/src/views/components/element/TableElement/EditableTable.vue
@@ -8,9 +8,7 @@
         class="drag-line" 
         v-for="(pos, index) in dragLinePosition" 
         :key="index"
-        :style="{
-          left: pos + 'px',
-        }"
+        :style="{ left: pos + 'px' }"
         @mousedown="$event => handleMousedownColHandler($event, index)"
       ></div>
     </div>
@@ -28,10 +26,7 @@
         <col span="1" v-for="(width, index) in colSizeList" :key="index" :width="width">
       </colgroup>
       <tbody>
-        <tr
-          v-for="(rowCells, rowIndex) in tableCells" 
-          :key="rowIndex"
-        >
+        <tr v-for="(rowCells, rowIndex) in tableCells" :key="rowIndex">
           <td 
             class="cell"
             :class="{
@@ -360,6 +355,44 @@ export default defineComponent({
       colSizeList.value.splice(colIndex, 0, 100)
       emit('changeColWidths', colSizeList.value)
     }
+
+    // 填充指定的行/列数
+    const fillTable = (rowCount: number, colCount: number) => {
+      let _tableCells: TableCell[][] = JSON.parse(JSON.stringify(tableCells.value))
+      const defaultCell = { colspan: 1, rowspan: 1, text: '' }
+      
+      if (rowCount) {
+        const newRows = []
+        for (let i = 0; i < rowCount; i++) {
+          const rowCells: TableCell[] = []
+          for (let j = 0; j < _tableCells[0].length; j++) {
+            rowCells.push({
+              ...defaultCell,
+              id: createRandomCode(),
+            })
+          }
+          newRows.push(rowCells)
+        }
+        _tableCells = [..._tableCells, ...newRows]
+      }
+      if (colCount) {
+        _tableCells = _tableCells.map(item => {
+          const cells: TableCell[] = []
+          for (let i = 0; i < colCount; i++) {
+            const cell = {
+              ...defaultCell,
+              id: createRandomCode(),
+            }
+            cells.push(cell)
+          }
+          return [...item, ...cells]
+        })
+        colSizeList.value = [...colSizeList.value, ...new Array(colCount).fill(100)]
+        emit('changeColWidths', colSizeList.value)
+      }
+
+      tableCells.value = _tableCells
+    }
     
     // 合并单元格
     const mergeCells = () => {
@@ -511,22 +544,27 @@ export default defineComponent({
       emit('change', tableCells.value)
     }, 300, { trailing: true })
 
-    // 插入来自Excel的数据
+    // 插入来自Excel的数据，表格的行/列数不够时自动补足
     const insertExcelData = (data: string[][], rowIndex: number, colIndex: number) => {
-      let maxRow = data.length
-      let maxCol = data[0].length
+      const maxRow = data.length
+      const maxCol = data[0].length
 
-      if (rowIndex + maxRow > tableCells.value.length) maxRow = tableCells.value.length - rowIndex
-      if (colIndex + maxCol > tableCells.value[0].length) maxCol = tableCells.value[0].length - colIndex
+      let fillRowCount = 0
+      let fillColCount = 0
+      if (rowIndex + maxRow > tableCells.value.length) fillRowCount = rowIndex + maxRow - tableCells.value.length
+      if (colIndex + maxCol > tableCells.value[0].length) fillColCount = colIndex + maxCol - tableCells.value[0].length
+      if (fillRowCount || fillColCount) fillTable(fillRowCount, fillColCount)
 
-      for (let i = 0; i < maxRow; i++) {
-        for (let j = 0; j < maxCol; j++) {
-          if (tableCells.value[rowIndex + i][colIndex + j]) {
-            tableCells.value[rowIndex + i][colIndex + j].text = data[i][j]
+      nextTick(() => {
+        for (let i = 0; i < maxRow; i++) {
+          for (let j = 0; j < maxCol; j++) {
+            if (tableCells.value[rowIndex + i][colIndex + j]) {
+              tableCells.value[rowIndex + i][colIndex + j].text = data[i][j]
+            }
           }
         }
-      }
-      emit('change', tableCells.value)
+        emit('change', tableCells.value)
+      })
     }
 
     // 获取有效的单元格（排除掉被合并的单元格）