Browse Source

fix: 解决allowEdit为false时仍然可以进行单元格合并拆分的问题

master
菜猫子neko 4 years ago
parent
commit
a52626a7c5
  1. 6
      src/controllers/menuButton.js

6
src/controllers/menuButton.js

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

Loading…
Cancel
Save