From 5ebd31e4a455c7547e46c418838e2e3a16def6a7 Mon Sep 17 00:00:00 2001 From: wpxp123456 <2677556700@qq.com> Date: Sat, 25 Jul 2020 01:19:00 +0800 Subject: [PATCH] fix(bug): bug bug --- src/global/scroll.js | 76 ++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/src/global/scroll.js b/src/global/scroll.js index d6cad08..1b582e8 100644 --- a/src/global/scroll.js +++ b/src/global/scroll.js @@ -9,44 +9,44 @@ export default function luckysheetscrollevent(isadjust) { let scrollLeft = $("#luckysheet-scrollbar-x").scrollLeft(), scrollTop = $("#luckysheet-scrollbar-y").scrollTop(); - if (!!isadjust) { - let scrollHeight = $t.get(0).scrollHeight; - let windowHeight = $t.height(); - let scrollWidth = $t.get(0).scrollWidth; - let windowWidth = $t.width(); - - let maxScrollLeft = scrollWidth - windowWidth; - let maxScrollTop = scrollHeight - windowHeight; - - let visibledatacolumn_c = Store.visibledatacolumn, visibledatarow_c = Store.visibledatarow; - - if (luckysheetFreezen.freezenhorizontaldata != null) { - visibledatarow_c = luckysheetFreezen.freezenhorizontaldata[3]; - } - - if (luckysheetFreezen.freezenverticaldata != null) { - visibledatacolumn_c = luckysheetFreezen.freezenverticaldata[3]; - } - - let col_ed = luckysheet_searcharray(visibledatacolumn_c, scrollLeft); - let row_ed = luckysheet_searcharray(visibledatarow_c, scrollTop); - - let refreshLeft = scrollLeft , refreshTop = scrollTop; - - if (col_ed <= 0) { - scrollLeft = 0; - } - else { - scrollLeft = visibledatacolumn_c[col_ed - 1]; - } - - if (row_ed <= 0) { - scrollTop = 0; - } - else { - scrollTop = visibledatarow_c[row_ed - 1]; - } - } + // if (!!isadjust) { + // let scrollHeight = $t.get(0).scrollHeight; + // let windowHeight = $t.height(); + // let scrollWidth = $t.get(0).scrollWidth; + // let windowWidth = $t.width(); + + // let maxScrollLeft = scrollWidth - windowWidth; + // let maxScrollTop = scrollHeight - windowHeight; + + // let visibledatacolumn_c = Store.visibledatacolumn, visibledatarow_c = Store.visibledatarow; + + // if (luckysheetFreezen.freezenhorizontaldata != null) { + // visibledatarow_c = luckysheetFreezen.freezenhorizontaldata[3]; + // } + + // if (luckysheetFreezen.freezenverticaldata != null) { + // visibledatacolumn_c = luckysheetFreezen.freezenverticaldata[3]; + // } + + // let col_ed = luckysheet_searcharray(visibledatacolumn_c, scrollLeft); + // let row_ed = luckysheet_searcharray(visibledatarow_c, scrollTop); + + // let refreshLeft = scrollLeft , refreshTop = scrollTop; + + // if (col_ed <= 0) { + // scrollLeft = 0; + // } + // else { + // scrollLeft = visibledatacolumn_c[col_ed - 1]; + // } + + // if (row_ed <= 0) { + // scrollTop = 0; + // } + // else { + // scrollTop = visibledatarow_c[row_ed - 1]; + // } + // } if (luckysheetFreezen.freezenhorizontaldata != null) { if (scrollTop < luckysheetFreezen.freezenhorizontaldata[2]) {