From 588e6102b28f5012ceb33a1a5797a3f9ca84197e Mon Sep 17 00:00:00 2001
From: yangyong8650 <yangyong8650@cvte.com>
Date: Thu, 1 Apr 2021 14:18:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=88=B7=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93=E5=8F=98=E5=8C=96=E5=90=8E=E9=87=8D=E6=96=B0=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E8=A1=8C=E9=AB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/selection.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/controllers/selection.js b/src/controllers/selection.js
index 021f0c4..1e28a39 100644
--- a/src/controllers/selection.js
+++ b/src/controllers/selection.js
@@ -1857,8 +1857,14 @@ const selection = {
             jfrefreshgrid(d, Store.luckysheet_select_save, allParam);
         }
         else{
+            // 选区格式刷存在超出边界的情况
+             if(maxh >= d.length){
+                maxh = d.length - 1;
+            }
+            cfg = rowlenByRange(d, minh, maxh, cfg); //更新行高
             let allParam = {
                 "cfg": cfg,
+                "RowlChange": true,
                 "cdformat": cdformat,
                 "dataVerification": dataVerification
             }

From 4426e5d23edcf49b9594b2ef45a45c63ff931507 Mon Sep 17 00:00:00 2001
From: flowerField <wendingding_ios@126.com>
Date: Thu, 1 Apr 2021 15:00:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=A0=8F=E4=B8=8D=E4=BF=9D=E7=95=99=E6=A0=BC=E5=BC=8F=E5=88=B7?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/handler.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/controllers/handler.js b/src/controllers/handler.js
index a56f224..0c96b6b 100644
--- a/src/controllers/handler.js
+++ b/src/controllers/handler.js
@@ -5016,7 +5016,7 @@ export default function luckysheetHandler() {
 
         //点击功能栏时 如果是单元格编辑模式 则退出编辑模式 
         if ($(event.target).closest("#luckysheet-wa-editor").length > 0 && parseInt($("#luckysheet-input-box").css("top")) > 0) {
-            console.log(event);
+            
             formula.updatecell(Store.luckysheetCellUpdate[0], Store.luckysheetCellUpdate[1]);
             luckysheetMoveHighlightCell("down", 0, "rangeOfSelect");
         }
@@ -5092,14 +5092,11 @@ export default function luckysheetHandler() {
         luckysheetContainerFocus();
     });
 
-
-
     //左上角返回按钮
     $("#luckysheet_info_detail_title").click(function () {
         window.open(luckysheetConfigsetting.myFolderUrl, "_self");
     });
 
-
     //图表选区mousedown
     $("#luckysheet-chart-rangeShow").on("mousedown.chartRangeShowMove", ".luckysheet-chart-rangeShow-move", function (event) {
         Store.chart_selection.rangeMove = true;
@@ -5686,6 +5683,13 @@ export default function luckysheetHandler() {
     }).mousedown(function (e) {
         e.stopPropagation();
     });
+
+    $('#luckysheet-wa-editor,#luckysheet-icon-morebtn-div,.luckysheet-toolbar-button').click(function(e){
+        // 取消格式刷状态
+        if(menuButton.luckysheetPaintModelOn){
+            menuButton.cancelPaintModel();
+        }
+    })
 }
 
 // 协同编辑其他用户不在操作的时候，且已经展示了用户名10秒，则用户名框隐藏