From b83447d61805192d0310b20e97821eb01b790fb7 Mon Sep 17 00:00:00 2001 From: liuyang Date: Thu, 15 Oct 2020 19:10:39 +0800 Subject: [PATCH] fix(selection bug): fix it --- gulpfile.js | 3 ++- src/controllers/print.js | 5 +++-- src/controllers/select.js | 35 +++++++++++++--------------------- src/controllers/sheetmanage.js | 11 +++++++---- src/global/createdom.js | 4 ++-- 5 files changed, 27 insertions(+), 31 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index cd5c358..bbfd919 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -183,7 +183,8 @@ async function core() { file: 'dist/luckysheet.esm.js', format: 'esm', name: 'luckysheet', - sourcemap: true + sourcemap: true, + inlineDynamicImports:true, }); } diff --git a/src/controllers/print.js b/src/controllers/print.js index 3c92f45..a266ed3 100644 --- a/src/controllers/print.js +++ b/src/controllers/print.js @@ -20,10 +20,11 @@ let ExcelPlaceholder = { // Get the pixel value per millimeter function getOneMmsPx (){ let div = document.createElement("div"); - div.id = "mm"; div.style.width = "1mm"; document.querySelector("body").appendChild(div); - let mm1 = document.getElementById("mm").getBoundingClientRect(); + let mm1 = div.getBoundingClientRect(); + let w = mm1.width; + $(div).remove(); return mm1.width; } diff --git a/src/controllers/select.js b/src/controllers/select.js index 416baa7..a4c1b01 100644 --- a/src/controllers/select.js +++ b/src/controllers/select.js @@ -80,19 +80,10 @@ function selectHightlightShow(isRestore=false) { Store.luckysheet_select_save[i]["top"] = row_pre_f; Store.luckysheet_select_save[i]["height"] = row_f - row_pre_f - 1; - if(isRestore){ - Store.luckysheet_select_save[i]["left_move"] = col_pre_f; - Store.luckysheet_select_save[i]["width_move"] = col_f - col_pre_f - 1; - Store.luckysheet_select_save[i]["top_move"] = row_pre_f; - Store.luckysheet_select_save[i]["height_move"] = row_f - row_pre_f - 1; - } - else{ - - Store.luckysheet_select_save[i]["left_move"] = col_pre; - Store.luckysheet_select_save[i]["width_move"] = col - col_pre - 1; - Store.luckysheet_select_save[i]["top_move"] = row_pre; - Store.luckysheet_select_save[i]["height_move"] = row - row_pre - 1; - } + Store.luckysheet_select_save[i]["left_move"] = col_pre; + Store.luckysheet_select_save[i]["width_move"] = col - col_pre - 1; + Store.luckysheet_select_save[i]["top_move"] = row_pre; + Store.luckysheet_select_save[i]["height_move"] = row - row_pre - 1; if(i == 0){ if(Store.luckysheet_select_save.length == 1){ @@ -201,16 +192,16 @@ function selectTitlesShow(rangeArr,isRestore=false) { for(let i = 0; i < s.length; i++){ let r1 = s[i]["row"][0], r2 = s[i]["row"][1], c1 = s[i]["column"][0], c2 = s[i]["column"][1]; - if(isRestore){ - let margeset = menuButton.mergeborer(Store.flowdata, r1, c1); - if(!!margeset){ - r1 = margeset.row[2]; - r2 = margeset.row[3]; + // if(isRestore){ + // let margeset = menuButton.mergeborer(Store.flowdata, r1, c1); + // if(!!margeset){ + // r1 = margeset.row[2]; + // r2 = margeset.row[3]; - c1 = margeset.column[2]; - c2 = margeset.column[3]; - } - } + // c1 = margeset.column[2]; + // c2 = margeset.column[3]; + // } + // } //行、列标题栏 rowTitleMap = selectTitlesMap(rowTitleMap, r1, r2); diff --git a/src/controllers/sheetmanage.js b/src/controllers/sheetmanage.js index 6b3e548..bf008a6 100644 --- a/src/controllers/sheetmanage.js +++ b/src/controllers/sheetmanage.js @@ -691,7 +691,7 @@ const sheetmanage = { colwidth = c2 + 1; } - Store.flowdata = data; + // Store.flowdata = data; luckysheetcreatedom(colwidth, rowheight, data, menu, title); @@ -721,7 +721,8 @@ const sheetmanage = { let execF = function(){ _this.mergeCalculation(file["index"]); - editor.webWorkerFlowDataCache(Store.flowdata);//worker存数据 + _this.setSheetParam(false); + // editor.webWorkerFlowDataCache(Store.flowdata);//worker存数据 _this.storeSheetParam(); _this.restoreselect(); _this.CacheNotLoadControll = []; @@ -874,7 +875,7 @@ const sheetmanage = { file["zoomRatio"] = Store.zoomRatio; }, - setSheetParam: function(isload) { + setSheetParam: function(isload=true) { let index = this.getSheetIndex(Store.currentSheetIndex); let file = Store.luckysheetfile[index]; @@ -896,7 +897,9 @@ const sheetmanage = { luckysheetFreezen.freezenverticaldata = file["freezen"].vertical == null ? null : file["freezen"].vertical.freezenverticaldata; } - rhchInit(Store.flowdata.length, Store.flowdata[0].length); + if(isload){ + rhchInit(Store.flowdata.length, Store.flowdata[0].length); + } //批注 luckysheetPostil.buildAllPs(Store.flowdata); diff --git a/src/global/createdom.js b/src/global/createdom.js index de4b301..82f6d48 100644 --- a/src/global/createdom.js +++ b/src/global/createdom.js @@ -114,8 +114,8 @@ export default function luckysheetcreatedom(colwidth, rowheight, data, menu, tit $("#luckysheet-cols-h-c").height((Store.columeHeaderHeight-1.5)); $("#luckysheet-left-top").css({width:Store.rowHeaderWidth-1.5, height:Store.columeHeaderHeight-1.5}); - //批注 - luckysheetPostil.buildAllPs(Store.flowdata); + // //批注 + // luckysheetPostil.buildAllPs(Store.flowdata); $("#luckysheet_info_detail_input").val(luckysheetConfigsetting.title); } \ No newline at end of file