diff --git a/docs/zh/guide/config.md b/docs/zh/guide/config.md index f89fc54..63a031c 100644 --- a/docs/zh/guide/config.md +++ b/docs/zh/guide/config.md @@ -1434,7 +1434,16 @@ Luckysheet开放了更细致的自定义配置选项,分别有 - {Object} [size]: 整个工作簿区域的宽高 ------------ - +### scroll +- 类型:Function +- 默认值:null +- 作用:监听表格滚动值 +- 参数: + - {Number} [scrollLeft]: 水平方向滚动值 + - {Number} [scrollTop]: 垂直方向滚动值 + - {Number} [canvasHeight]: 滚动容器的高度 + +------------ ## 图片 ### imageInsertBefore diff --git a/src/controllers/filter.js b/src/controllers/filter.js index 4561a1a..3d45e1f 100644 --- a/src/controllers/filter.js +++ b/src/controllers/filter.js @@ -726,8 +726,10 @@ function initialFilterHandler(){ } } } - - $("#luckysheet-filter-byvalue-select").html("
" + item.join("") + "
"); + // 适配小屏设备 + let containerH = winH - toffset.top - 350 + if (containerH < 0) containerH = 100 + $("#luckysheet-filter-byvalue-select").html("
" + item.join("") + "
"); }, 1); showrightclickmenu($menu, toffset.left, toffset.top + 20); diff --git a/src/controllers/pivotTable.js b/src/controllers/pivotTable.js index d8773c1..fe084ea 100644 --- a/src/controllers/pivotTable.js +++ b/src/controllers/pivotTable.js @@ -532,8 +532,10 @@ const pivotTable = { } } } - - $("#luckysheet-pivotTableFilter-byvalue-select").html("
" + item.join("") + "
"); + // 适配小屏设备 + let containerH = winH - toffset.top - 350 + if (containerH < 0) containerH = 100 + $("#luckysheet-pivotTableFilter-byvalue-select").html("
" + item.join("") + "
"); }, 1); showrightclickmenu($menu, toffset.left - 250, toffset.top); diff --git a/src/css/luckysheet-core.css b/src/css/luckysheet-core.css index b8236c8..78a786b 100644 --- a/src/css/luckysheet-core.css +++ b/src/css/luckysheet-core.css @@ -2225,6 +2225,8 @@ body:not(.ewa-ipad) .luckysheet-rows-h-cell-sel:hover { } .luckysheet-cols-menu { + max-height: 100%; + overflow-y: auto; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; diff --git a/src/global/api.js b/src/global/api.js index 0a975ef..31ad447 100644 --- a/src/global/api.js +++ b/src/global/api.js @@ -6549,7 +6549,6 @@ export function getTxtByRange(range=Store.luckysheet_select_save){ */ export function pagerInit (config) { const {prevPage, nextPage, total} = locale().button; - console.log(locale().button, prevPage, locale()) $('#luckysheet-bottom-pager').remove() $('#luckysheet-sheet-content').after('
') $("#luckysheet-bottom-pager").sPage({