From a52626a7c56a05406ce88ef577d51f1b4dcba2ad 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, 19 Nov 2021 15:06:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3allowEdit=E4=B8=BAfals?=
 =?UTF-8?q?e=E6=97=B6=E4=BB=8D=E7=84=B6=E5=8F=AF=E4=BB=A5=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E5=8D=95=E5=85=83=E6=A0=BC=E5=90=88=E5=B9=B6=E6=8B=86?=
 =?UTF-8?q?=E5=88=86=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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/controllers/menuButton.js b/src/controllers/menuButton.js
index aabc918..018a71f 100644
--- a/src/controllers/menuButton.js
+++ b/src/controllers/menuButton.js
@@ -1250,7 +1250,6 @@ const menuButton = {
 
         //合并单元格
         $("#luckysheet-icon-merge-button").click(function(){
-
             if(!checkProtectionNotEnable(Store.currentSheetIndex)){
                 return;
             }
@@ -3201,6 +3200,11 @@ const menuButton = {
         jfrefreshgrid(d, Store.luckysheet_select_save, allParam, false);
     },
     updateFormat_mc: function(d, foucsStatus){
+        // *如果禁止前台编辑，则中止下一步操作
+        if (!checkIsAllowEdit()) {
+            tooltip.info("", locale().pivotTable.errorNotAllowEdit);
+            return
+        }
         let cfg = $.extend(true, {}, Store.config);
         if(cfg["merge"] == null){
             cfg["merge"] = {};