From 06f307c0b6f4f654a50c5e9c50cb5252e0593d5a Mon Sep 17 00:00:00 2001 From: flowerField Date: Thu, 24 Dec 2020 17:20:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD=E4=B8=BA=E8=87=AA=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/menuButton.js | 1 + src/controllers/mobile.js | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/controllers/menuButton.js b/src/controllers/menuButton.js index 3b9c31d..d3d472a 100644 --- a/src/controllers/menuButton.js +++ b/src/controllers/menuButton.js @@ -431,6 +431,7 @@ const menuButton = { //luckysheet-icon-fmt-other-menuButton_sub $("body").append(menu+submenu); $menuButton = $("#" + menuButtonId).width(250); + _this.focus($menuButton); $menuButton.find(".luckysheet-cols-menuitem").click(function(){ $menuButton.hide(); diff --git a/src/controllers/mobile.js b/src/controllers/mobile.js index 04af798..657815c 100644 --- a/src/controllers/mobile.js +++ b/src/controllers/mobile.js @@ -9,8 +9,6 @@ export default function mobileinit(){ //去除滚动条 Store.cellMainSrollBarSize = 0; - - //滑动滚动表格 let luckysheet_touchmove_status = false, luckysheet_touchmove_startPos = {}, From 0dcef67981ebf0043a21e8afca52a909aa927fa9 Mon Sep 17 00:00:00 2001 From: flowerField Date: Thu, 24 Dec 2020 17:30:33 +0800 Subject: [PATCH 2/2] Replace two; with one --- src/controllers/constant.js | 20 ++++++++++---------- src/controllers/menuButton.js | 2 +- src/controllers/pivotTable.js | 2 +- src/controllers/postil.js | 10 +++++----- src/controllers/sheetBar.js | 2 +- src/controllers/sheetmanage.js | 2 +- src/css/luckysheet-core.css | 2 +- src/global/formula.js | 10 +++++----- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/controllers/constant.js b/src/controllers/constant.js index aade632..7063f95 100644 --- a/src/controllers/constant.js +++ b/src/controllers/constant.js @@ -348,7 +348,7 @@ function rightclickHTML(){ ${rightclick.to} ${rightclick.right} ${rightclick.add} - + ${rightclick.column} @@ -374,7 +374,7 @@ function rightclickHTML(){
${rightclick.column} ${rightclick.width} - + px
@@ -437,9 +437,9 @@ function rightclickHTML(){
${rightclick.array3} - + × - +
@@ -452,7 +452,7 @@ function rightclickHTML(){
${rightclick.diagonalOffset} - + ${rightclick.column}
@@ -467,28 +467,28 @@ function rightclickHTML(){
${rightclick.to}${rightclick.top}${rightclick.add} - + ${rightclick.row}
${rightclick.to}${rightclick.bottom}${rightclick.add} - + ${rightclick.row}
${rightclick.to}${rightclick.left}${rightclick.add} - + ${rightclick.column}
${rightclick.to}${rightclick.right}${rightclick.add} - + ${rightclick.column}
@@ -583,7 +583,7 @@ function rightclickHTML(){ - + diff --git a/src/controllers/menuButton.js b/src/controllers/menuButton.js index d3d472a..263d3f3 100644 --- a/src/controllers/menuButton.js +++ b/src/controllers/menuButton.js @@ -437,7 +437,7 @@ const menuButton = { $menuButton.hide(); luckysheetContainerFocus(); - let $t = $(this), itemvalue = $t.attr("itemvalue"),itemname = $t.attr("itemname");; + let $t = $(this), itemvalue = $t.attr("itemvalue"),itemname = $t.attr("itemname"); $("#luckysheet-icon-fmt-other").find(".luckysheet-toolbar-menu-button-caption").html(" "+ itemname +" "); if(itemvalue == "fmtOtherSelf"){ diff --git a/src/controllers/pivotTable.js b/src/controllers/pivotTable.js index 26d5bbe..7992c4c 100644 --- a/src/controllers/pivotTable.js +++ b/src/controllers/pivotTable.js @@ -2729,7 +2729,7 @@ const pivotTable = { let orderby = r == 0 ? "self" : ((row[r - 1].orderby == "self" || row[r - 1].orderby == null) ? item : (showType == "column" ? item + values[parseInt(row[r - 1].orderby)].fullname : item + locale_pivotTable.valueSum)); if(name == null){ - name = locale_filter.valueBlank;; + name = locale_filter.valueBlank; } curentLevelarr_row.push({ "name": name, "fullname": item, "index": r, "orderby": orderby, "children": [] }); diff --git a/src/controllers/postil.js b/src/controllers/postil.js index 6c260dc..b417634 100644 --- a/src/controllers/postil.js +++ b/src/controllers/postil.js @@ -391,7 +391,7 @@ const luckysheetPostil = { '
' + '' + '
' + - '
' + + '
' + value + '
' + '
' + @@ -466,7 +466,7 @@ const luckysheetPostil = { '
' + '
' + '
' + - '
' + + '
' + '
' + '
' + '
' + @@ -563,7 +563,7 @@ const luckysheetPostil = { '
' + '' + '
' + - '
' + + '
' + value + '
' + '
' + @@ -685,7 +685,7 @@ const luckysheetPostil = { '
' + '
' + '
' + - '
' + + '
' + value + '
' + '
' + @@ -809,7 +809,7 @@ const luckysheetPostil = { '
' + '
' + '
' + - '
' + + '
' + value + '
' + '
' + diff --git a/src/controllers/sheetBar.js b/src/controllers/sheetBar.js index f075152..03cd852 100644 --- a/src/controllers/sheetBar.js +++ b/src/controllers/sheetBar.js @@ -20,7 +20,7 @@ import luckysheetConfigsetting from './luckysheetConfigsetting'; //表格底部名称栏区域 相关事件（增、删、改、隐藏显示、颜色等等） -let isInitialSheetConfig = false, luckysheetcurrentSheetitem = null, jfdbclicklagTimeout = null,oldSheetFileName = "";; +let isInitialSheetConfig = false, luckysheetcurrentSheetitem = null, jfdbclicklagTimeout = null,oldSheetFileName = ""; function showsheetconfigmenu() { if (!isInitialSheetConfig) { isInitialSheetConfig = true; diff --git a/src/controllers/sheetmanage.js b/src/controllers/sheetmanage.js index ec4536c..10ff74e 100644 --- a/src/controllers/sheetmanage.js +++ b/src/controllers/sheetmanage.js @@ -1792,7 +1792,7 @@ const sheetmanage = { } else if(type == "cg"){ let v = value, k = item.k; - let config1 = _this.getSheetConfig(index);; + let config1 = _this.getSheetConfig(index); if(!(k in config1)){ config1[k] = {}; diff --git a/src/css/luckysheet-core.css b/src/css/luckysheet-core.css index de50539..e84596c 100644 --- a/src/css/luckysheet-core.css +++ b/src/css/luckysheet-core.css @@ -139,7 +139,7 @@ position: relative; /* padding-left: 15px; */ /* padding: 0px 0px 10px 15px; */ - padding: 5px 0px 3px 15px;; + padding: 5px 0px 3px 15px; border-bottom: 1px solid #d4d4d4; white-space: nowrap; transition: all 0.2s; diff --git a/src/global/formula.js b/src/global/formula.js index 40e8d55..ec25474 100755 --- a/src/global/formula.js +++ b/src/global/formula.js @@ -1541,7 +1541,7 @@ const luckysheetformula = { } if ((d[r][c].tb == "2" && d[r][c].v != null) || isInlineStringCell(d[r][c])) {//自动换行 - let defaultrowlen = Store.defaultrowlen;; + let defaultrowlen = Store.defaultrowlen; let canvas = $("#luckysheetTableContent").get(0).getContext("2d"); // offlinecanvas.textBaseline = 'top'; //textBaseline以top计算 @@ -2176,7 +2176,7 @@ const luckysheetformula = { } let p = i - 1, - s_pre = null;; + s_pre = null; if (p >= 0) { do { @@ -3501,7 +3501,7 @@ const luckysheetformula = { } else if (s == '&' && matchConfig.squote == 0 && matchConfig.dquote == 0 && matchConfig.braces == 0) { if (str.length > 0) { - function_str += _this.functionHTML(str) + '' + '&' + '';; + function_str += _this.functionHTML(str) + '' + '&' + ''; str = ""; } else { @@ -3514,7 +3514,7 @@ const luckysheetformula = { s_next = funcstack[i + 1]; } - let p = i - 1, s_pre = null;; + let p = i - 1, s_pre = null; if (p >= 0) { do { s_pre = funcstack[p--]; @@ -3679,7 +3679,7 @@ const luckysheetformula = { s_next = funcstack[i + 1]; } - let p = i - 1, s_pre = null;; + let p = i - 1, s_pre = null; if (p >= 0) { do { s_pre = funcstack[p--];