From e979f930804db1e3b04f5fe0e1714571b7802366 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=9C=E7=8C=AB=E5=AD=90neko?= <815743831@qq.com>
Date: Tue, 21 Dec 2021 17:22:55 +0800
Subject: [PATCH] =?UTF-8?q?fix(menuButton.js):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=E9=83=A8=E5=88=86=E5=90=88=E5=B9=B6=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=A0=BC=E6=97=B6=EF=BC=8C=E6=A0=BC=E5=BC=8F=E5=88=B7?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93=E9=94=99=E8=AF=AF=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/controllers/menuButton.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/controllers/menuButton.js b/src/controllers/menuButton.js
index 7c8a089..d1202eb 100644
--- a/src/controllers/menuButton.js
+++ b/src/controllers/menuButton.js
@@ -147,15 +147,38 @@ const menuButton = {
                 return;
             }
 
+            // *增加了对选区范围是否为部分合并单元格的校验，如果为部分合并单元格，就阻止格式刷的下一步
+            // TODO 这里也可以改为：判断到是合并单元格的一部分后，格式刷执行黏贴格式后删除范围单元格的 mc 值
+
+            let has_PartMC = false;
+
+            let r1 = Store.luckysheet_select_save[0].row[0], 
+                r2 = Store.luckysheet_select_save[0].row[1];
+
+            let c1 = Store.luckysheet_select_save[0].column[0], 
+                c2 = Store.luckysheet_select_save[0].column[1];
+
+            has_PartMC = hasPartMC(Store.config, r1, r2, c1, c2);
+
+            if(has_PartMC){
+                // *提示后中止下一步
+                tooltip.info('无法对部分合并单元格执行此操作', '');
+                return;
+            }
+
+
             tooltip.popover("<i class='fa fa-paint-brush'></i> "+locale_paint.start+"", "topCenter", true, null, locale_paint.end,function(){
                 _this.cancelPaintModel();
             });
+            
             $("#luckysheet-sheettable_0").addClass("luckysheetPaintCursor");
 
             Store.luckysheet_selection_range = [{ "row": Store.luckysheet_select_save[0].row, "column": Store.luckysheet_select_save[0].column }];
+
             selectionCopyShow();
 
             let RowlChange = false, HasMC = false;
+
             for(let r = Store.luckysheet_select_save[0].row[0]; r <= Store.luckysheet_select_save[0].row[1]; r++){
                 if (Store.config["rowhidden"] != null && Store.config["rowhidden"][r] != null) {
                     continue;