diff --git a/src/controllers/handler.js b/src/controllers/handler.js index 7fe986a80..9979cd62d 100644 --- a/src/controllers/handler.js +++ b/src/controllers/handler.js @@ -60,12 +60,14 @@ import { createLuckyChart, hideAllNeedRangeShow } from '../expendPlugins/chart/p //, columeflowset, rowflowset export default function luckysheetHandler() { + + const os = browser.detectOS(), isMac = os=="Mac"?true:false, scrollNum = isMac?1:3, isMobile = browser.mobilecheck(); + //移动端 - if(browser.mobilecheck()){ + if(isMobile){ mobileinit(); } - const os = browser.detectOS(), isMac = os=="Mac"?true:false, scrollNum = isMac?1:3; if (!Date.now) Date.now = function() { return new Date().getTime(); }; @@ -151,7 +153,8 @@ export default function luckysheetHandler() { $("#luckysheet-scrollbar-y").scrollTop(rowscroll); } - else if(event.deltaX != 0){ + + if((isMobile || event.deltaY ==0) && event.deltaX != 0){ let col_ed; if((isMac && event.deltaX >0 ) || (!isMac && event.deltaX < 0)){ diff --git a/src/global/draw.js b/src/global/draw.js index eabcb4865..7f0fde37a 100644 --- a/src/global/draw.js +++ b/src/global/draw.js @@ -1315,7 +1315,8 @@ let cellRender = function(r, c, start_r, start_c, end_r, end_c, value, luckyshee let pos_y = start_r + offsetTop + 1; luckysheetTableContent.save(); - luckysheetTableContent.rect(pos_x, pos_y, cellWidth, cellHeight); + luckysheetTableContent.beginPath(); + luckysheetTableContent.rect(pos_x * Store.devicePixelRatio, pos_y* Store.devicePixelRatio, cellWidth * Store.devicePixelRatio, cellHeight * Store.devicePixelRatio); luckysheetTableContent.clip(); let horizonAlignPos = (pos_x + space_width) * Store.devicePixelRatio; //默认为1,左对齐 @@ -1772,7 +1773,8 @@ let cellOverflowRender = function(r, c, stc, edc,luckysheetTableContent,scrollHe let pos_y = start_r + offsetTop + 1; luckysheetTableContent.save(); - luckysheetTableContent.rect(pos_x, pos_y, cellWidth, cellHeight); + luckysheetTableContent.beginPath(); + luckysheetTableContent.rect(pos_x* Store.devicePixelRatio, pos_y* Store.devicePixelRatio, cellWidth* Store.devicePixelRatio, cellHeight* Store.devicePixelRatio); luckysheetTableContent.clip(); //溢出单元格 水平对齐