From a4556f7e7b3f909cf0484b8138640974b5b87abd 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 16:00:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DallowEdit=E4=B8=BAfals?=
 =?UTF-8?q?e=E6=97=B6=EF=BC=8C=E5=8F=AF=E4=BB=A5=E5=B1=95=E5=BC=80?=
 =?UTF-8?q?=E8=A1=8C=E5=88=97=E7=9A=84=E5=8F=B3=E9=94=AE=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E5=B9=B6=E4=B8=94=E8=BF=9B=E8=A1=8C=E6=93=8D=E4=BD=9C=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/rowColumnOperation.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/controllers/rowColumnOperation.js b/src/controllers/rowColumnOperation.js
index d881ae4..c091f69 100644
--- a/src/controllers/rowColumnOperation.js
+++ b/src/controllers/rowColumnOperation.js
@@ -21,7 +21,7 @@ import {
     colLocationByIndex, 
     mouseposition 
 } from '../global/location';
-import { isRealNull, isRealNum, hasPartMC, isEditMode } from '../global/validate';
+import { isRealNull, isRealNum, hasPartMC, isEditMode, checkIsAllowEdit } from '../global/validate';
 import { countfunc } from '../global/count';
 import formula from '../global/formula';
 import { luckysheetextendtable, luckysheetdeletetable, luckysheetDeleteCell } from '../global/extend';
@@ -381,6 +381,10 @@ export function rowColumnOperationInitial(){
         $("#luckysheet-rows-change-size").css("opacity", 0);
     }).mouseup(function (event) {
         if (event.which == 3) {
+            // *如果禁止前台编辑，则中止下一步操作
+            if (!checkIsAllowEdit()) {
+                return
+            }
             if(isEditMode()){ //非编辑模式下禁止右键功能框
                 return;
             }
@@ -815,6 +819,10 @@ export function rowColumnOperationInitial(){
         $("#luckysheet-cols-change-size").css("opacity", 0);
     }).mouseup(function (event) {
         if (event.which == 3) {
+            // *如果禁止前台编辑，则中止下一步操作
+            if (!checkIsAllowEdit()) {
+                return
+            }
             if(isEditMode()){ //非编辑模式下禁止右键功能框
                 return;
             }
@@ -996,6 +1004,11 @@ export function rowColumnOperationInitial(){
 
     // 列标题的下拉箭头
     $("#luckysheet-cols-menu-btn").click(function (event) {
+        // *如果禁止前台编辑，则中止下一步操作
+        if (!checkIsAllowEdit()) {
+            tooltip.info("", locale().pivotTable.errorNotAllowEdit);
+            return
+        }
         let $menu = $("#luckysheet-rightclick-menu");
         let offset = $(this).offset();
         $("#luckysheet-cols-rows-shift").show();