From 74b1f5d277028c23b083a55182a122219a7dfec1 Mon Sep 17 00:00:00 2001 From: cdswyda Date: Wed, 29 Sep 2021 12:00:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(sheetmanage):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=88=87=E6=8D=A2sheet=E6=BB=9A=E5=8A=A8=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=A4=A7=E9=83=A8=E5=88=86=E6=83=85=E5=86=B5=E5=A7=8B=E7=BB=88?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 累计宽度存在问题导致 --- src/controllers/sheetmanage.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/controllers/sheetmanage.js b/src/controllers/sheetmanage.js index 884273d..12544e5 100644 --- a/src/controllers/sheetmanage.js +++ b/src/controllers/sheetmanage.js @@ -1533,14 +1533,12 @@ const sheetmanage = { this.sheetBarShowAndHide(index); }, sheetArrowShowAndHide(){ - let containerW = $("#luckysheet-sheet-container").width(); + const $wrap = $('#luckysheet-sheet-container-c'); + if (!$wrap.length) return; + var sw = $wrap[0].scrollWidth; + var w = $wrap.width(); - let c_width = 0; - $("#luckysheet-sheet-container-c > div.luckysheet-sheets-item:visible").each(function(){ - c_width += $(this).outerWidth(); - }); - - if (c_width >= containerW) { + if (sw > w) { if(luckysheetConfigsetting.showsheetbarConfig.sheet){ $("#luckysheet-sheet-area .luckysheet-sheets-scroll").css("display", "inline-block"); $("#luckysheet-sheet-container .docs-sheet-fade-left").show(); From b7810c74135e3c074611ff53b75fbe89f538bf56 Mon Sep 17 00:00:00 2001 From: cdswyda Date: Wed, 29 Sep 2021 15:32:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(sheetmanage):=20jQuery3.0=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=AE=BD=E5=BA=A6=E6=9C=89=E5=B0=8F=E6=95=B0=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/sheetmanage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/sheetmanage.js b/src/controllers/sheetmanage.js index 12544e5..6e7687b 100644 --- a/src/controllers/sheetmanage.js +++ b/src/controllers/sheetmanage.js @@ -1536,7 +1536,7 @@ const sheetmanage = { const $wrap = $('#luckysheet-sheet-container-c'); if (!$wrap.length) return; var sw = $wrap[0].scrollWidth; - var w = $wrap.width(); + var w = Math.ceil($wrap.width()); if (sw > w) { if(luckysheetConfigsetting.showsheetbarConfig.sheet){