From f057d7d281fccc7094c4f806c4590dca39cfbaa0 Mon Sep 17 00:00:00 2001
From: wpxp123456 <2677556700@qq.com>
Date: Mon, 3 Aug 2020 15:10:45 +0800
Subject: [PATCH] fix(bug): bug

bug
---
 src/controllers/conditionformat.js |  5 +++++
 src/controllers/insertFormula.js   | 10 +++++++++-
 src/controllers/selection.js       |  2 --
 src/controllers/sheetmanage.js     |  2 +-
 src/global/draw.js                 |  4 ++--
 src/global/formula.js              |  2 +-
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/controllers/conditionformat.js b/src/controllers/conditionformat.js
index 86adbc0..1f1ac42 100644
--- a/src/controllers/conditionformat.js
+++ b/src/controllers/conditionformat.js
@@ -1930,6 +1930,11 @@ const conditionformat = {
         const conditionformat_Text = locale().conditionformat; 
 
         let rule = _this.editorRule.data;
+
+        if(rule == null){
+            return;
+        }
+
         let ruleType = rule["type"], 
             ruleFormat = rule["format"], 
             conditionName = rule["conditionName"];
diff --git a/src/controllers/insertFormula.js b/src/controllers/insertFormula.js
index 8687450..d113412 100644
--- a/src/controllers/insertFormula.js
+++ b/src/controllers/insertFormula.js
@@ -428,10 +428,18 @@ const insertFormula = {
         let lvi = -1; //最后一个有值的参数索引
 
         let formulatxt = $("#luckysheet-search-formula-parm").find(".luckysheet-modal-dialog-title-text").text();
+        let p = Store.luckysheet_function[formulatxt].p;
         
         $("#luckysheet-search-formula-parm .parmBox").each(function(i, e){
             let parmtxt = $(e).find(".txt input").val();
-            let parmRequire = Store.luckysheet_function[formulatxt].p[i].require;
+
+            let parmRequire;
+            if(i < p.length){
+                parmRequire = p[i].require;
+            }
+            else{
+                parmRequire = p[p.length - 1].require;
+            }
 
             if(parmtxt == "" && parmRequire == "m"){
                 isVal = false;
diff --git a/src/controllers/selection.js b/src/controllers/selection.js
index ca3de99..d825d42 100644
--- a/src/controllers/selection.js
+++ b/src/controllers/selection.js
@@ -98,8 +98,6 @@ const selection = {
             clipboardData = e.originalEvent.clipboardData;
         }
 
-
-
         Store.luckysheet_selection_range = [];
         //copy范围
         let minR = Store.luckysheet_select_save[0].row[0], 
diff --git a/src/controllers/sheetmanage.js b/src/controllers/sheetmanage.js
index 61fce2c..a66f778 100644
--- a/src/controllers/sheetmanage.js
+++ b/src/controllers/sheetmanage.js
@@ -215,7 +215,7 @@ const sheetmanage = {
             redo["type"] = "addSheet";
             redo["sheetconfig"] = $.extend(true, {}, sheetconfig);
             redo["index"] = index;
-            redo["Store.currentSheetIndex"] = Store.currentSheetIndex;
+            redo["currentSheetIndex"] = Store.currentSheetIndex;
             Store.jfredo.push(redo);
         }
 
diff --git a/src/global/draw.js b/src/global/draw.js
index 0ff9f5b..1374697 100644
--- a/src/global/draw.js
+++ b/src/global/draw.js
@@ -1075,8 +1075,8 @@ let cellRender = function(r, c, start_r, start_c, end_r, end_c, value, luckyshee
     luckysheetTableContent.fillRect(
         (start_c + offsetLeft - 1) * Store.devicePixelRatio, 
         (start_r + offsetTop) * Store.devicePixelRatio, 
-        (end_c - start_c + 2) * Store.devicePixelRatio,
-        (end_r - start_r) * Store.devicePixelRatio
+        (end_c - start_c) * Store.devicePixelRatio,
+        (end_r - start_r - 1) * Store.devicePixelRatio
     )
 
     //若单元格有批注（单元格右上角红色小三角标示）
diff --git a/src/global/formula.js b/src/global/formula.js
index c1e8ba3..b349a50 100644
--- a/src/global/formula.js
+++ b/src/global/formula.js
@@ -1204,7 +1204,7 @@ const luckysheetformula = {
         let curv = Store.flowdata[r][c];
 
         if(isRealNull(value)){
-            if(curv == null || isRealNull(curv.v)){
+            if(curv == null || (isRealNull(curv.v) && curv.spl == null)){
                 _this.cancelNormalSelected();
                 return;
             }