@@ -339,7 +339,8 @@ function initSheet(sheet, cellAuthority, authority) {
// 只能禁止整体编辑,设置例外区域
sheet.config.authority = {
sheet: 1,
- hintText: "第一列禁止编辑!",
+ hintText: "列禁止编辑!",
+ insertColumns: 0,
allowRangeList: [
// 第一列以外都能编辑
{
@@ -46,10 +46,10 @@ function luckysheetextendtable(type, index, value, direction, sheetIndex) {
for(let m in cfg["merge"]){
let mc = cfg["merge"][m];
- let r = mc.r,
- c = mc.c,
- rs = mc.rs,
- cs = mc.cs;
+ let r = mc.r || 0,
+ c = mc.c || 0,
+ rs = mc.rs || 0,
+ cs = mc.cs || 0;
if(type == "row"){
if(index < r){
@@ -111,7 +111,7 @@ function jfrefreshgrid(data, range, allParam, isRunExecFunction = true, isRefres
"dynamicArray": $.extend(true, [], file["dynamicArray"]),
"curDynamicArray": curDynamicArray,
"range": range,
- "dataRange": [...file.luckysheet_select_save]// 保留操作时的选区
+ "dataRange": file.luckysheet_select_save ? [...file.luckysheet_select_save] : []// 保留操作时的选区
});
}