From c3a80dda7e936261a40e9d9a421df909a40cd1a8 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, 6 May 2022 09:45:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=A0=BC=E4=B8=BA=E5=90=88=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC?=
 =?UTF-8?q?=E6=97=B6=E4=BB=8D=E7=84=B6=E8=A1=8C=E9=AB=98=E8=87=AA=E9=80=82?=
 =?UTF-8?q?=E5=BA=94=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/global/formula.js b/src/global/formula.js
index 9609910..cdb9d1d 100755
--- a/src/global/formula.js
+++ b/src/global/formula.js
@@ -1562,7 +1562,9 @@ const luckysheetformula = {
             cfg["rowlen"] = {};
         }
 
-        if ((d[r][c].tb == "2" && d[r][c].v != null) || isInlineStringCell(d[r][c])) {//自动换行
+        // 单元格行高自适应,只有在单元格不是合并单元格时才能生效
+        if ((d[r][c].tb == "2" && d[r][c].v != null) || isInlineStringCell(d[r][c]) && (typeof d[r][c]['mc'] == 'undefined')) {
+            //自动换行
             let defaultrowlen = Store.defaultrowlen;
 
             let canvas = $("#luckysheetTableContent").get(0).getContext("2d");