fix(bug): bug

bug fix #142 #132
dream-num · Oct 29, 2020 · 0909f5e · 0909f5e
1 parent 5adfc60
commit 0909f5e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git 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
@@ -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 ";