From fdef9df471becbe0c78e6a13c7d81bd925f85fc2 Mon Sep 17 00:00:00 2001
From: zhangxinjie <13416669291@163.com>
Date: Wed, 2 Aug 2023 11:30:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3merge=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E7=9A=84=E8=A1=8C=E4=B8=A2=E5=A4=B1=E6=97=B6=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/sheetmanage.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/controllers/sheetmanage.js b/src/controllers/sheetmanage.js
index ba874d4a..84e85674 100644
--- a/src/controllers/sheetmanage.js
+++ b/src/controllers/sheetmanage.js
@@ -1192,6 +1192,11 @@ const sheetmanage = {
             let r = parseInt(x.substr(0, x.indexOf("_")));
             let c = parseInt(x.substr(x.indexOf("_") + 1));
             let mcInfo = mergeConfig[x];
+
+            if (data[r] == void 0) {
+                continue
+            }
+            
             if (data[r][c] == null) {
                 data[r][c] = {};
             }