diff --git a/src/controllers/inlineString.js b/src/controllers/inlineString.js
index 7a093aa..cfd00c8 100644
--- a/src/controllers/inlineString.js
+++ b/src/controllers/inlineString.js
@@ -72,7 +72,7 @@ export function updateInlineStringFormat(cell, attr, value, $input){
         if(startContainer===endContainer){
             let span = startContainer.parentNode, spanIndex, inherit=false;
             
-            let content = span.innerHTML;
+            let content = span.innerText;
 
             let fullContent = $textEditor.html();
             if(fullContent.substr(0,5) != "<span"){
@@ -303,8 +303,11 @@ export function enterKeyControll(cell){
             $(startSpan).replaceWith(cont);
         }
         else{
+            // 这里不能取整个单元格的样式，因为如果设置了部分样式的话就会出问题
+            // let cssText = getFontStyleByCell(cell);
             
-            let cssText = getFontStyleByCell(cell);
+            let cssText = startSpan.style.cssText;
+
             if(sright==""){
                 cont = "<span style='"+ cssText +"'>" + sleft + "\n\n" + "</span>";
             }
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");