From 0909f5e4c957e3d3248a8c86d6e092c5a5396112 Mon Sep 17 00:00:00 2001 From: wpxp123456 <2677556700@qq.com> Date: Thu, 29 Oct 2020 17:38:22 +0800 Subject: [PATCH] fix(bug): bug bug fix #142 #132 --- src/controllers/dataVerificationCtrl.js | 9 +++++++++ src/utils/util.js | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/controllers/dataVerificationCtrl.js b/src/controllers/dataVerificationCtrl.js index de64c18..d779194 100644 --- a/src/controllers/dataVerificationCtrl.js +++ b/src/controllers/dataVerificationCtrl.js @@ -1447,6 +1447,15 @@ const dataVerificationCtrl = { 'left': col_pre, 'top': row, }); + + let myh = $("#luckysheet-dataVerification-dropdown-List").outerHeight(); + let currentWinH = $("#luckysheet-cell-main")[0].scrollHeight; + + if(row + myh > currentWinH - 42 - 6){ + $("#luckysheet-dataVerification-dropdown-List").css({ + 'top': row_pre - myh, + }) + } }, getDropdownList: function(txt){ let list = []; diff --git a/src/utils/util.js b/src/utils/util.js index bc03614..132b6ae 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -357,7 +357,7 @@ function luckysheetfontformat(format) { //font-size/line-height if (!format.fs) { - font += Store.luckysheetfontformat + "pt "; + font += Store.defaultFontSize + "pt "; } else { font += Math.ceil(format.fs) + "pt ";