Browse Source

fix(fix allowedit): fix allowEdit attribute

master
liuyang 5 years ago
parent
commit
35820b3c2e
  1. 4
      src/controllers/dropCell.js
  2. 4
      src/controllers/handler.js
  3. 4
      src/controllers/menuButton.js
  4. 3
      src/controllers/pivotTable.js
  5. 12
      src/controllers/selection.js
  6. 9
      src/controllers/sheetBar.js
  7. 8
      src/controllers/sheetmanage.js
  8. 2
      src/controllers/updateCell.js
  9. 5
      src/core.js
  10. 2
      src/global/validate.js
  11. 1
      src/index.html

4
src/controllers/dropCell.js

@ -441,6 +441,10 @@ const luckysheetDropCell = {
update: function(){ update: function(){
let _this = this; let _this = this;
if(Store.allowEdit===false){
return;
}
let d = editor.deepCopyFlowData(Store.flowdata); let d = editor.deepCopyFlowData(Store.flowdata);
let file = Store.luckysheetfile[getSheetIndex(Store.currentSheetIndex)]; let file = Store.luckysheetfile[getSheetIndex(Store.currentSheetIndex)];

4
src/controllers/handler.js

@ -2667,7 +2667,7 @@ export default function luckysheetHandler() {
//选区拖动替换 //选区拖动替换
$("#luckysheet-cell-main div.luckysheet-cs-draghandle").mousedown(function (event) { $("#luckysheet-cell-main div.luckysheet-cs-draghandle").mousedown(function (event) {
if(isEditMode()){//此模式下禁用选区拖动 if(isEditMode() || Store.allowEdit===false){//此模式下禁用选区拖动
return; return;
} }
@ -2709,7 +2709,7 @@ export default function luckysheetHandler() {
//选区下拉 //选区下拉
$("#luckysheet-cell-main div.luckysheet-cs-fillhandle").mousedown(function (event) { $("#luckysheet-cell-main div.luckysheet-cs-fillhandle").mousedown(function (event) {
if(isEditMode()){//此模式下禁用选区下拉 if(isEditMode() || Store.allowEdit===false){//此模式下禁用选区下拉
return; return;
} }

4
src/controllers/menuButton.js

@ -2781,6 +2781,10 @@ const menuButton = {
updateFormat: function(d, attr, foucsStatus){ updateFormat: function(d, attr, foucsStatus){
let _this = this; let _this = this;
if(Store.allowEdit===false){
return;
}
let canvasElement = document.createElement('canvas'); let canvasElement = document.createElement('canvas');
let canvas = canvasElement.getContext("2d"); let canvas = canvasElement.getContext("2d");

3
src/controllers/pivotTable.js

@ -617,6 +617,9 @@ const pivotTable = {
} }
}, },
createPivotTable: function (e) { createPivotTable: function (e) {
if(isEditMode() || Store.allowEdit===false){
return;
}
let _this = this; let _this = this;
let datasheetindex = Store.currentSheetIndex; let datasheetindex = Store.currentSheetIndex;

12
src/controllers/selection.js

@ -98,6 +98,8 @@ const selection = {
clipboardData = e.originalEvent.clipboardData; clipboardData = e.originalEvent.clipboardData;
} }
Store.luckysheet_selection_range = []; Store.luckysheet_selection_range = [];
//copy范围 //copy范围
let minR = Store.luckysheet_select_save[0].row[0], let minR = Store.luckysheet_select_save[0].row[0],
@ -549,6 +551,10 @@ const selection = {
paste: function (e, triggerType) {//paste事件 paste: function (e, triggerType) {//paste事件
let _this = this; let _this = this;
if(Store.allowEdit===false){
return;
}
let textarea = $("#luckysheet-copy-content"); let textarea = $("#luckysheet-copy-content");
textarea.focus(); textarea.focus();
textarea.select(); textarea.select();
@ -581,6 +587,9 @@ const selection = {
}, 10); }, 10);
}, },
pasteHandler: function (data, borderInfo) { pasteHandler: function (data, borderInfo) {
if(Store.allowEdit===false){
return;
}
if(Store.luckysheet_select_save.length > 1){ if(Store.luckysheet_select_save.length > 1){
if(isEditMode()){ if(isEditMode()){
alert("不能对多重选择区域执行此操作,请选择单个区域,然后再试"); alert("不能对多重选择区域执行此操作,请选择单个区域,然后再试");
@ -791,6 +800,9 @@ const selection = {
} }
}, },
pasteHandlerOfCutPaste: function(copyRange){ pasteHandlerOfCutPaste: function(copyRange){
if(Store.allowEdit===false){
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"] = {};

9
src/controllers/sheetBar.js

@ -200,6 +200,9 @@ export function initialSheetBar(){
}); });
let luckysheetsheetnameeditor = function ($t) { let luckysheetsheetnameeditor = function ($t) {
if(Store.allowEdit===false){
return;
}
$t.attr("contenteditable", "true").addClass("luckysheet-mousedown-cancel").data("oldtxt", $t.text()); $t.attr("contenteditable", "true").addClass("luckysheet-mousedown-cancel").data("oldtxt", $t.text());
setTimeout(function () { setTimeout(function () {
@ -221,6 +224,9 @@ export function initialSheetBar(){
}); });
$("#luckysheet-sheet-area").on("blur", "span.luckysheet-sheets-item-name", function (e) { $("#luckysheet-sheet-area").on("blur", "span.luckysheet-sheets-item-name", function (e) {
if(Store.allowEdit===false){
return;
}
let $t = $(this); let $t = $(this);
let txt = $t.text(), oldtxt = $t.data("oldtxt"); let txt = $t.text(), oldtxt = $t.data("oldtxt");
@ -269,6 +275,9 @@ export function initialSheetBar(){
}); });
$("#luckysheet-sheet-area").on("keydown", "span.luckysheet-sheets-item-name", function (e) { $("#luckysheet-sheet-area").on("keydown", "span.luckysheet-sheets-item-name", function (e) {
if(Store.allowEdit===false){
return;
}
let kcode = e.keyCode; let kcode = e.keyCode;
let $t = $(this); let $t = $(this);
if (kcode == keycode.ENTER) { if (kcode == keycode.ENTER) {

8
src/controllers/sheetmanage.js

@ -169,7 +169,7 @@ const sheetmanage = {
return Store.currentSheetIndex; return Store.currentSheetIndex;
}, },
addNewSheet: function(e, isPivotTable) { addNewSheet: function(e, isPivotTable) {
if(isEditMode()){ if(isEditMode() || Store.allowEdit===false){
// alert("非编辑模式下不允许该操作!"); // alert("非编辑模式下不允许该操作!");
return; return;
} }
@ -352,7 +352,7 @@ const sheetmanage = {
}, 1) }, 1)
}, },
copySheet: function(copyindex, e) { copySheet: function(copyindex, e) {
if(isEditMode()){ if(isEditMode() || Store.allowEdit===false){
// alert("非编辑模式下不允许该操作!"); // alert("非编辑模式下不允许该操作!");
return; return;
} }
@ -460,6 +460,10 @@ const sheetmanage = {
deleteSheet: function(index) { deleteSheet: function(index) {
let _this = this; let _this = this;
if(Store.allowEdit===false){
return;
}
let arrIndex = _this.getSheetIndex(index); let arrIndex = _this.getSheetIndex(index);
_this.setSheetHide(index); _this.setSheetHide(index);

2
src/controllers/updateCell.js

@ -13,7 +13,7 @@ import cleargridelement from '../global/cleargridelement';
import Store from '../store'; import Store from '../store';
export default function luckysheetupdateCell(row, row_pre, row_index, col, col_pre, col_index, d, cover, isnotfocus) { export default function luckysheetupdateCell(row, row_pre, row_index, col, col_pre, col_index, d, cover, isnotfocus) {
if(isEditMode()){//此模式下禁用单元格编辑 if(isEditMode() || Store.allowEdit===false){//此模式下禁用单元格编辑
return; return;
} }

5
src/core.js

@ -49,7 +49,8 @@ luckysheet.create = function (setting) {
Store.fullscreenmode = extendsetting.fullscreenmode; Store.fullscreenmode = extendsetting.fullscreenmode;
Store.lang = extendsetting.lang; //language Store.lang = extendsetting.lang; //language
Store.allowEdit = extendsetting.allowEdit; Store.allowEdit = extendsetting.allowEdit;
Store.editMode = extendsetting.editMode;
server.gridKey = extendsetting.gridKey; server.gridKey = extendsetting.gridKey;
server.loadUrl = extendsetting.loadUrl; server.loadUrl = extendsetting.loadUrl;
server.updateUrl = extendsetting.updateUrl; server.updateUrl = extendsetting.updateUrl;
@ -82,7 +83,7 @@ luckysheet.create = function (setting) {
luckysheetConfigsetting.enablePage = extendsetting.enablePage; luckysheetConfigsetting.enablePage = extendsetting.enablePage;
luckysheetConfigsetting.pageInfo = extendsetting.pageInfo; luckysheetConfigsetting.pageInfo = extendsetting.pageInfo;
luckysheetConfigsetting.editMode = extendsetting.editMode;
luckysheetConfigsetting.chartConfigChange = extendsetting.chartConfigChange; luckysheetConfigsetting.chartConfigChange = extendsetting.chartConfigChange;
luckysheetConfigsetting.beforeCreateDom = extendsetting.beforeCreateDom; luckysheetConfigsetting.beforeCreateDom = extendsetting.beforeCreateDom;

2
src/global/validate.js

@ -68,7 +68,7 @@ function hasChinaword(s) {
//是否为非编辑模式 //是否为非编辑模式
function isEditMode() { function isEditMode() {
if(luckysheetConfigsetting.editMode){ if(Store.editMode){
return true; return true;
} }
else{ else{

1
src/index.html

@ -33,6 +33,7 @@
luckysheet.create({ luckysheet.create({
container: 'luckysheet', container: 'luckysheet',
lang: 'en', lang: 'en',
allowEdit:true,
plugins: ['chart'], plugins: ['chart'],
data: [sheetCell,sheetFormula,sheetConditionFormat,sheetTable,sheetSparkline,sheetComment,sheetPivotTableData,sheetPivotTable] data: [sheetCell,sheetFormula,sheetConditionFormat,sheetTable,sheetSparkline,sheetComment,sheetPivotTableData,sheetPivotTable]
}) })

Loading…
Cancel
Save