修复

src/controllers/freezen.js

@@ -262,7 +262,6 @@ const luckysheetFreezen = {
             let column_px = Store.visibledatacolumn[column], freezen_px = Store.visibledatacolumn[freezen_colindex];
 
             if (column_px <= freezen_px+top) {
-                console.log(1111);
                 setTimeout(function () { $("#luckysheet-scrollbar-x").scrollLeft(0); }, 100);
             }
         }

src/controllers/handler.js

@@ -5386,7 +5386,6 @@ export default function luckysheetHandler() {
                             let $td = $(this);
                             let cell = {};
                             let txt = $td.text();
-
                             if ($.trim(txt).length == 0) {
                                 cell.v = null;
                                 cell.m = "";
@@ -5599,6 +5598,7 @@ export default function luckysheetHandler() {
             }
         }
         else if($(e.target).closest('#luckysheet-rich-text-editor').length > 0) {
+            
             // 阻止默认粘贴
             e.preventDefault();
 
@@ -5607,7 +5607,6 @@ export default function luckysheetHandler() {
                 clipboardData = e.originalEvent.clipboardData;
             }
             let text =  clipboardData.getData('text/plain');
-            
             // 插入
             document.execCommand("insertText", false, text);
         }

src/controllers/protection.js

@@ -723,7 +723,7 @@ export function closeProtectionModal(){
 
 
 
-function checkProtectionLockedSqref(r, c, aut, local_protection, isOpenAlert=true){
+function checkProtectionLockedSqref(r, c, aut, local_protection, isOpenAlert=true, isLock=true){
     let isPass = false;
     let rangeAut = aut.allowRangeList;
     if(rangeAut!=null && rangeAut.length>0){
@@ -763,7 +763,7 @@ function checkProtectionLockedSqref(r, c, aut, local_protection, isOpenAlert=tru
             }
         }
     }
-
+    if (!isPass && !isLock) isPass = true
     if(!isPass && isOpenAlert){
         let ht;
         if(aut.hintText != null && aut.hintText.length>0){
@@ -909,7 +909,7 @@ export function checkProtectionLocked(r, c, sheetIndex){
         return true;
     }
 
-    if(cell && !cell.lo){
+    if(cell && cell.lo === 0){
         return true;
     }
 
@@ -947,13 +947,10 @@ export function checkProtectionCellHidden(r, c, sheetIndex){
 export function checkProtectionLockedRangeList(rangeList, sheetIndex){
     //EPM-BUDGET-START
     if (rangeList[0].column[0] !== rangeList[0].column[1]) return true;
-    let cell = sheetFile.data[rangeList[0].row[0]][rangeList[0].column[0]];
-    if(cell&& !cell.lo){
-        return true;
-    }
     //EPM-BUDGET-END
 
     let sheetFile = sheetmanage.getSheetByIndex(sheetIndex);
+
     if(sheetFile==null){
         return true;
     }
@@ -981,8 +978,9 @@ export function checkProtectionLockedRangeList(rangeList, sheetIndex){
 
         for(let r=r1;r<=r2;r++){
             for(let c=c1;c<=c2;c++){
-                let isPass = checkProtectionLockedSqref(r, c , aut, local_protection);
-                if(isPass==false){
+                let isLock = sheetFile.data[r][c].lo === undefined || sheetFile.data[r][c].lo === 1,
+                    isPass = checkProtectionLockedSqref(r, c , aut, local_protection, true, isLock);
+                if(!isPass){
                     return false;
                 }
             }
@@ -1011,7 +1009,7 @@ export function checkProtectionSelectLockedOrUnLockedCells(r, c, sheetIndex){
         return true;
     }
 
-    if(cell && !cell.lo){//unlocked
+    if(cell && cell.lo === 0){//unlocked
         if(aut.selectunLockedCells==1 || aut.selectunLockedCells==null){
             return true;
         }

src/global/format.js

@@ -1787,22 +1787,25 @@ export function genarate(value) {//万 单位格式增加！！！
         ct = { "fa": "@", "t": "s" };
     }
     else if(isRealNum(value) && Math.abs(parseFloat(value)) > 0 && (Math.abs(parseFloat(value)) >= 1e+11 || Math.abs(parseFloat(value)) < 1e-9)){
-        v = numeral(value).value();
-
-        var str = v.toExponential();
-        if(str.indexOf(".") > -1){
-            var strlen = str.split(".")[1].split("e")[0].length;
-            if(strlen > 5){
-                strlen = 5;
-            }
-
-            ct = { "fa": "#0."+ new Array(strlen + 1).join("0") +"E+00", "t": "n" }; 
-        }
-        else{
-            ct = { "fa": "#0.E+00", "t": "n" };
-        }
-
-        m = SSF.format(ct.fa, v);
+        v = value
+        m = value
+        ct= {"fa": '@', "t": "n"}
+
+        // v = numeral(value).value();
+        // var str = v.toExponential();
+        // if(str.indexOf(".") > -1){
+        //     var strlen = str.split(".")[1].split("e")[0].length;
+        //     if(strlen > 5){
+        //         strlen = 5;
+        //     }
+
+        //     ct = { "fa": "#0."+ new Array(strlen + 1).join("0") +"E+00", "t": "n" }; 
+        // }
+        // else{
+        //     ct = { "fa": "#0.E+00", "t": "n" };
+        // }
+
+        // m = SSF.format(ct.fa, v);
     }
     else if(value.toString().indexOf("%") > -1){
         var index = value.toString().indexOf("%");

src/global/refresh.js

@@ -100,7 +100,7 @@ function jfrefreshgrid(data, range, allParam, isRunExecFunction = true, isRefres
         Store.jfredo.push({ 
             "type": "datachange", 
             "data": Store.flowdata, 
-            "curdata": data, 
+            "curData": data, 
             "sheetIndex": Store.currentSheetIndex, 
             "range": range, 
             "config": $.extend(true, {}, Store.config), 
@@ -112,7 +112,7 @@ function jfrefreshgrid(data, range, allParam, isRunExecFunction = true, isRefres
             "curDataVerification": curDataVerification,
             "dynamicArray": $.extend(true, [], file["dynamicArray"]),
             "curDynamicArray": curDynamicArray,
-            "dataRange": [...file.luckysheet_select_save]
+            "dataRange": [...file.luckysheet_select_save]// 保留操作时的选区
         });
     }
 
@@ -451,7 +451,8 @@ function jfrefreshgrid_adRC(data, cfg, ctrlType, ctrlValue, calc, filterObj, cf,
             "curDataVerification": dataVerification,
             "hyperlink": $.extend(true, {}, file.hyperlink),
             "curHyperlink": hyperlink,
-            "dataRange": [...file.luckysheet_select_save]
+            "range": file.luckysheet_select_save,
+            "dataRange": [...file.luckysheet_select_save]// 保留操作时的选区
         });
     }
 
@@ -687,7 +688,8 @@ function jfrefreshgrid_deleteCell(data, cfg, ctrl, calc, filterObj, cf, dataVeri
             "curDataVerification": dataVerification,
             "hyperlink": $.extend(true, {}, file.hyperlink),
             "curHyperlink": hyperlink,
-            "dataRange": [...file.luckysheet_select_save]
+            "range": file.luckysheet_select_save,
+            "dataRange": [...file.luckysheet_select_save] // 保留操作时的选区
         });
     }