From 9857a5a8159dd9646fbce0536bbf7eec60468fe8 Mon Sep 17 00:00:00 2001
From: tong <huoyt@csdn.net>
Date: Wed, 28 Jul 2021 18:01:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(options):=20=E4=BF=AE=E5=A4=8Dshowtoolb?=
 =?UTF-8?q?arConfig=E9=85=8D=E7=BD=AEfont:false=E6=97=B6=E7=9A=84=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复showtollbarConfig配置font:false时的报错，导致页面渲染不出来
---
 src/controllers/resize.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/controllers/resize.js b/src/controllers/resize.js
index 3811f7b..f3eed0e 100644
--- a/src/controllers/resize.js
+++ b/src/controllers/resize.js
@@ -402,6 +402,9 @@ export function menuToolBarWidth() {
             for (let i = 0; i<defaultToolbar.length; i++) {
                 current = defaultToolbar[i];
                 next = defaultToolbar[i + 1];
+                if (config[current] === false) {
+                    continue;
+                }
                 if (current !== '|' && config[current]) {
 
                     obj[current] = {

From 02f3eb9aea9d887f86dea303d22be6cf015ae884 Mon Sep 17 00:00:00 2001
From: tong <huoyt@csdn.net>
Date: Fri, 30 Jul 2021 22:15:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(updatecell.js):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=8F=8C=E5=87=BB=E5=92=8CEnter=E9=94=AE=E6=BF=80=E6=B4=BB?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=EF=BC=8C=E8=BE=93=E5=85=A5=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87=E6=97=B6=E7=9A=84=E9=A6=96=E5=AD=97=E6=AF=8D=E5=8F=98?=
 =?UTF-8?q?=E6=88=90=E6=8B=BC=E9=9F=B3=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复双击和Enter键激活单元格，输入中文时的首字母变成拼音的bug

fix #726
---
 src/controllers/updateCell.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/controllers/updateCell.js b/src/controllers/updateCell.js
index ec81914..ad088dc 100644
--- a/src/controllers/updateCell.js
+++ b/src/controllers/updateCell.js
@@ -214,9 +214,9 @@ export function luckysheetupdateCell(row_index1, col_index1, d, cover, isnotfocu
         input_postition["min-width"] = input_postition["max-width"];
     }
    
-    if((value == null || value.toString() == "") && !cover){
-        value = "<br/>";
-    }
+    // if((value == null || value.toString() == "") && !cover){
+    //     value = "<br/>";
+    // }
     value = formula.xssDeal(value);
     if(!checkProtectionCellHidden(row_index, col_index, Store.currentSheetIndex) && value.length>0 && value.substr(0, 63)=='<span dir="auto" class="luckysheet-formula-text-color">=</span>'){
         $("#luckysheet-rich-text-editor").html("");