From 9eac6a9c93faaf16015fc0dcb753c9f7ed7736ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Fri, 3 Dec 2021 15:38:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BD=93=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC=E5=8F=AA=E6=9C=89=E4=B8=80?=
 =?UTF-8?q?=E8=A1=8C=E9=AB=98=E6=97=B6=EF=BC=8C=E5=90=91=E4=B8=8B=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=A1=8C=E4=BC=9A=E8=AE=A9=E8=BF=99=E4=B8=AA=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC=E5=8A=A0=E9=AB=98=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/global/extend.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/global/extend.js b/src/global/extend.js
index bf69544..f8829f9 100644
--- a/src/global/extend.js
+++ b/src/global/extend.js
@@ -55,7 +55,8 @@ function luckysheetextendtable(type, index, value, direction, sheetIndex) {
             if(index < r){
                 merge_new[(r + value) + "_" + c] = { "r": r + value, "c": c, "rs": rs, "cs": cs };
             }
-            else if(index == r){
+            // *这里要判断一下rs是否等于1,因为如果这个合并单元格的行数只有一行时r = r+ rs-1,这种情况不应该进行单元格的加高
+            else if (index == r && rs != 1) {
                 if(direction == "lefttop"){
                     merge_new[(r + value) + "_" + c] = { "r": r + value, "c": c, "rs": rs, "cs": cs };
                 }