Merge branch 'master' of https://github.com/mengshukeji/Luckysheet

dream-num · Jul 31, 2020 · e90e579 · e90e579
2 parents c3e4f39 + 8eb68e8
commit e90e579
Show file tree

Hide file tree

Showing 17 changed files with 342 additions and 248 deletions.
diff --git a/src/controllers/constant.js b/src/controllers/constant.js
diff --git a/src/controllers/dropCell.js b/src/controllers/dropCell.js
@@ -441,6 +441,10 @@ const luckysheetDropCell = {
     update: function(){
         let _this = this;
 
+        if(Store.allowEdit===false){
+            return;
+        }
+
         let d = editor.deepCopyFlowData(Store.flowdata);
         let file = Store.luckysheetfile[getSheetIndex(Store.currentSheetIndex)];
 

diff --git a/src/controllers/handler.js b/src/controllers/handler.js
@@ -63,7 +63,9 @@ export default function luckysheetHandler() {
     if(browser.mobilecheck()){
         mobileinit();
     }
-
+
+    const os = browser.detectOS(), isMac = os=="Mac"?true:false, scrollNum = isMac?1:3;
+
     //滚动监听
     $("#luckysheet-cell-main").scroll(function () {
 
@@ -100,41 +102,18 @@ export default function luckysheetHandler() {
         let rowscroll = 0;
 
         //一次滚动三行或三列
-        if(event.deltaX != 0){
-            let col_ed;
-
-            if(event.deltaX < 0){
-                col_ed = col_st + 3;
-
-                if(col_ed >= visibledatacolumn_c.length){
-                    col_ed = visibledatacolumn_c.length - 1;
-                }
-            }
-            else{
-                col_ed = col_st - 3;
-
-                if(col_ed < 0){
-                    col_ed = 0;
-                }
-            }
-
-            colscroll = col_ed == 0 ? 0 : visibledatacolumn_c[col_ed - 1];
-
-            $("#luckysheet-scrollbar-x").scrollLeft(colscroll);
-        }
-
         if(event.deltaY != 0){
             let row_ed;
 
             if(event.deltaY < 0){
-                row_ed = row_st + 3;
+                row_ed = row_st + scrollNum;
 
                 if(row_ed >= visibledatarow_c.length){
                     row_ed = visibledatarow_c.length - 1;
                 }
             }
             else{
-                row_ed = row_st - 3;
+                row_ed = row_st - scrollNum;
 
                 if(row_ed < 0){
                     row_ed = 0;
@@ -145,6 +124,28 @@ export default function luckysheetHandler() {
 
             $("#luckysheet-scrollbar-y").scrollTop(rowscroll);
         }
+        else if(event.deltaX != 0){
+            let col_ed;
+
+            if((isMac && event.deltaX >0 ) || (!isMac && event.deltaX < 0)){
+                col_ed = col_st + scrollNum;
+
+                if(col_ed >= visibledatacolumn_c.length){
+                    col_ed = visibledatacolumn_c.length - 1;
+                }
+            }
+            else{
+                col_ed = col_st - scrollNum;
+
+                if(col_ed < 0){
+                    col_ed = 0;
+                }
+            }
+
+            colscroll = col_ed == 0 ? 0 : visibledatacolumn_c[col_ed - 1];
+
+            $("#luckysheet-scrollbar-x").scrollLeft(colscroll);
+        }
     });
 
     $("#luckysheet-scrollbar-x").scroll(function(){
@@ -2667,7 +2668,7 @@ export default function luckysheetHandler() {
 
     //选区拖动替换
     $("#luckysheet-cell-main div.luckysheet-cs-draghandle").mousedown(function (event) {
-        if(isEditMode()){//此模式下禁用选区拖动
+        if(isEditMode() || Store.allowEdit===false){//此模式下禁用选区拖动
             return;
         }
 
@@ -2709,7 +2710,7 @@ export default function luckysheetHandler() {
 
     //选区下拉
     $("#luckysheet-cell-main div.luckysheet-cs-fillhandle").mousedown(function (event) {
-        if(isEditMode()){//此模式下禁用选区下拉
+        if(isEditMode() || Store.allowEdit===false){//此模式下禁用选区下拉
             return;
         }
 

diff --git a/src/controllers/menuButton.js b/src/controllers/menuButton.js
@@ -467,7 +467,7 @@ const menuButton = {
                     let fItem = locale_fontarray[a];
                     let ret = {};
                     ret.value = a;
-                    ret.text = "<span class='luckysheet-mousedown-cancel' style='font-size:16px;font-family:"+fItem+"'>"+fItem+"</span>";
+                    ret.text = "<span class='luckysheet-mousedown-cancel' style='font-size:11px;font-family:"+fItem+"'>"+fItem+"</span>";
                     ret.example = "";
                     itemdata.push(ret);
                 }
@@ -2781,6 +2781,10 @@ const menuButton = {
     updateFormat: function(d, attr, foucsStatus){
         let _this = this;
 
+        if(Store.allowEdit===false){
+            return;
+        }
+
         let canvasElement = document.createElement('canvas');
         let canvas = canvasElement.getContext("2d");
 

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

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

diff --git a/src/controllers/sheetBar.js b/src/controllers/sheetBar.js
@@ -200,6 +200,9 @@ export function initialSheetBar(){
     });
 
     let luckysheetsheetnameeditor = function ($t) {
+        if(Store.allowEdit===false){
+            return;
+        }
         $t.attr("contenteditable", "true").addClass("luckysheet-mousedown-cancel").data("oldtxt", $t.text());
 
         setTimeout(function () {
@@ -221,6 +224,9 @@ export function initialSheetBar(){
     });
 
     $("#luckysheet-sheet-area").on("blur", "span.luckysheet-sheets-item-name", function (e) {
+        if(Store.allowEdit===false){
+            return;
+        }
         let $t = $(this);
         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) {
+        if(Store.allowEdit===false){
+            return;
+        }
         let kcode = e.keyCode;
         let $t = $(this);
         if (kcode == keycode.ENTER) {

diff --git a/src/controllers/sheetmanage.js b/src/controllers/sheetmanage.js
@@ -169,7 +169,7 @@ const sheetmanage = {
         return Store.currentSheetIndex;
     },
     addNewSheet: function(e, isPivotTable) {
-        if(isEditMode()){
+        if(isEditMode() || Store.allowEdit===false){
             // alert("非编辑模式下不允许该操作！");
             return;
         }
@@ -352,7 +352,7 @@ const sheetmanage = {
         }, 1)
     },
     copySheet: function(copyindex, e) {
-        if(isEditMode()){
+        if(isEditMode() || Store.allowEdit===false){
             // alert("非编辑模式下不允许该操作！");
             return;
         }
@@ -460,6 +460,10 @@ const sheetmanage = {
     deleteSheet: function(index) {
         let _this = this;
 
+        if(Store.allowEdit===false){
+            return;
+        }
+
         let arrIndex = _this.getSheetIndex(index);
         _this.setSheetHide(index);
 
@@ -841,7 +845,7 @@ const sheetmanage = {
                 pivotTable.changePivotTable(index);
             }
         }
-        else {
+        else if($("#luckysheet-modal-dialog-slider-pivot").is(":visible")) {
             Store.luckysheetcurrentisPivotTable = false;
             $("#luckysheet-modal-dialog-slider-pivot").hide();
             luckysheetsizeauto();

diff --git a/src/controllers/sparkline.js b/src/controllers/sparkline.js
@@ -1,3 +1,5 @@
+import Store from "../store";
+
 //sparkline设置
 let createClass = function (/* [baseclass, [mixin, ...]], definition */) {
     let Class, args;
@@ -1283,8 +1285,8 @@ const luckysheetSparkline = {
             this.canvasWidth = el.mergedOptions.width;
             this.canvasHeight = el.mergedOptions.height;
 
-            let barWidth = parseInt(options.get('barWidth'), 10),
-                barSpacing = parseInt(options.get('barSpacing'), 10);
+            let barWidth = parseInt(options.get('barWidth'), 10)*Store.devicePixelRatio,
+                barSpacing = parseInt(options.get('barSpacing'), 10)*Store.devicePixelRatio;
             //tristate._super.init.call(this, el, values, options, width, height);
 
             this.regionShapes = {};
@@ -1905,8 +1907,8 @@ const luckysheetSparkline = {
         _this.lastShapeId = null;
 
         _this.mergedOptions = $.extend({}, base, extendedOptions, userOptions);
-        _this.mergedOptions.width = devicePixelRatio * _this.mergedOptions.width;
-        _this.mergedOptions.height = devicePixelRatio * _this.mergedOptions.height;
+        _this.mergedOptions.width = Store.devicePixelRatio * _this.mergedOptions.width;
+        _this.mergedOptions.height = Store.devicePixelRatio * _this.mergedOptions.height;
         _this[_this.mergedOptions.type].render(_this, userValues);
 
         return { shapes:_this.shapes, shapeseq:_this.shapeseq, offsetX:_this.mergedOptions.offsetX, offsetY:_this.mergedOptions.offsetY, pixelWidth:_this.mergedOptions.width, pixelHeight:_this.mergedOptions.height};

diff --git a/src/controllers/updateCell.js b/src/controllers/updateCell.js
@@ -13,7 +13,7 @@ import cleargridelement from '../global/cleargridelement';
 import Store from '../store';
 
 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;
     }
 

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