1. 权限改动

2. 框选时取消滚动条移动

src/controllers/freezen.js

@@ -301,7 +301,9 @@ const luckysheetFreezen = {
             let column_px = Store.visibledatacolumn[column], freezen_px = Store.visibledatacolumn[freezen_colindex];
 
             if (column_px <= freezen_px+top) {
-                setTimeout(function () { $("#luckysheet-scrollbar-x").scrollLeft(0); }, 100);
+                console.log(column_px,freezen_px+top)
+                // 双击单元格容易触发框选事件,现金流表中会导致经常移动滚动条,注释此功能
+                // setTimeout(function () { $("#luckysheet-scrollbar-x").scrollLeft(0); }, 100);
             }
         }
 
@@ -325,7 +327,8 @@ const luckysheetFreezen = {
             let row_px = Store.visibledatarow[row], freezen_px = Store.visibledatarow[freezen_rowindex];
 
             if (row_px <= freezen_px+left) {
-                setTimeout(function () {$("#luckysheet-scrollbar-y").scrollTop(0);}, 100);
+                // 双击单元格容易触发框选事件,现金流表中会导致经常移动滚动条,注释此功能
+                // setTimeout(function () {$("#luckysheet-scrollbar-y").scrollTop(0);}, 100);
             }
         }
     },

src/core.js

@@ -379,28 +379,48 @@ function initSheet(sheet, authority, permissions) {
     if (permissions["func-psr-05"]) {
       canEditRangeList.push({
         hintText: "",
-        sqref: "$C$6:$C$89",
+        sqref: "$C$6:$C$35",
+      });
+      canEditRangeList.push({
+        hintText: "",
+        sqref: "$C$43:$C$89",
       });
     }
     // 实际支出列编辑权限
     if (permissions["func-psr-06"]) {
       canEditRangeList.push({
         hintText: "",
-        sqref: "$D$6:$D$89",
+        sqref: "$D$6:$D$35",
+      });
+      canEditRangeList.push({
+        hintText: "",
+        sqref: "$D$43:$D$89",
       });
     }
     // 预测费用列编辑权限
     if (permissions["func-psr-07"]) {
       canEditRangeList.push({
         hintText: "",
-        sqref: "$F$6:$F$89",
+        sqref: "$F$6:$F$35",
+      });
+      canEditRangeList.push({
+        hintText: "",
+        sqref: "$F$37:$F$37",
+      });
+      canEditRangeList.push({
+        hintText: "",
+        sqref: "$F$40:$F$89",
       });
     }
     // 当月发生额列编辑权限
     if (permissions["func-psr-08"]) {
       canEditRangeList.push({
         hintText: "",
-        sqref: "$H$6:$H$89",
+        sqref: "$H$6:$H$35",
+      });
+      canEditRangeList.push({
+        hintText: "",
+        sqref: "$H$43:$H$89",
       });
     }
   } else if (sheet.name == "现金流") {
@@ -490,16 +510,16 @@ function initSheet(sheet, authority, permissions) {
     };
   }
 
-  if (sheet.config.colhidden) {
-    sheet.config.colhidden = { ...colhidden, ...sheet.config.colhidden };
-  } else {
-    sheet.config.colhidden = colhidden;
-  }
-  if (sheet.config.rowhidden) {
-    sheet.config.rowhidden = { ...rowhidden, ...sheet.config.rowhidden };
-  } else {
-    sheet.config.rowhidden = rowhidden;
-  }
+  // if (sheet.config.colhidden) {
+  //   sheet.config.colhidden = { ...colhidden, ...sheet.config.colhidden };
+  // } else {
+  sheet.config.colhidden = colhidden;
+  // }
+  // if (sheet.config.rowhidden) {
+  //   sheet.config.rowhidden = { ...rowhidden, ...sheet.config.rowhidden };
+  // } else {
+  sheet.config.rowhidden = rowhidden;
+  // }
   initCalcChain(sheet);
 }
 
@@ -507,7 +527,7 @@ function initCalcChain(sheet) {
   // 公式计算
   let calcChain = [];
   let index = sheet.index;
-  sheet.celldata.forEach((item) => {
+  sheet.celldata?.forEach((item) => {
     if (typeof item.v.f !== "undefined") {
       calcChain.push({
         r: item.r,