From 183e253a637e12d3afb082181fcdc02b98a2d97e Mon Sep 17 00:00:00 2001
From: liaoxuezhi <liaoxuezhi@baidu.com>
Date: Tue, 14 May 2019 16:29:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20autoCombineCount=20?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=AF=94=E5=AE=9E=E9=99=85=20columns=20?=
 =?UTF-8?q?=E5=A4=9A=E6=97=B6=E7=9A=84=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/table.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/store/table.ts b/src/store/table.ts
index e9efd9ba..26d9de55 100644
--- a/src/store/table.ts
+++ b/src/store/table.ts
@@ -427,6 +427,11 @@ export const TableStore = iRendererStore
             for (let i = 0; i < maxCount; i++) {
                 const column = columns[i];
 
+                // maxCount 可能比实际配置的 columns 还有多。
+                if (!column) {
+                    break;
+                }
+
                 if ('__' === column.type.substring(0, 2)) {
                     maxCount++;
                     continue;