Merge pull request #487 from flowerField/master

fix bug

src/controllers/inlineString.js

@@ -575,6 +575,12 @@ function extendCssText(origin, cover, isLimit=true){
         let so = originArray[i], isAdd=true;
         so = so.toLowerCase();
         let okey = textTrim(so.substr(0, so.indexOf(':')));
+
+        /* 不设置文字的大小，解决设置删除线等后字体变大的问题 */
+        if(okey == "font-size"){
+            continue;
+        }
+
         let ovalue = textTrim(so.substr(so.indexOf(':') + 1));
 
         if(isLimit){

src/controllers/rowColumnOperation.js

@@ -2066,6 +2066,12 @@ export function rowColumnOperationInitial(){
         
         const locale_info = locale().info;
 
+          /* 对异常情况进行判断：NaN */
+        if(isNaN(size)){
+            tooltip.info("只允许使用数字来设置行列的宽高!", "");
+            return;
+        }
+
         let cfg = $.extend(true, {}, Store.config);
         let type;
         let images = null;

src/global/getRowlen.js

@@ -1559,10 +1559,10 @@ function drawLineInfo(wordGroup, cancelLine,underLine,option){
          if(underLine=="1" || underLine=="2"){
             let item = {};
             item.startX = left;
-            item.startY = top;
+            item.startY = top + 3;
 
             item.endX = left + width;
-            item.endY = top;
+            item.endY = top + 3;
 
             item.fs = fs;