From 3250ef69606d24518d7b615806c1210c2ce0a684 Mon Sep 17 00:00:00 2001
From: liuyang <qwbfsa@gmail.com>
Date: Tue, 1 Sep 2020 19:14:11 +0800
Subject: [PATCH] fix(add button bug): fix

---
 src/function/func.js                   | 3 +++
 src/function/functionImplementation.js | 6 +++---
 src/global/extend.js                   | 2 +-
 src/global/refresh.js                  | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/function/func.js b/src/function/func.js
index 6abfc1a..673d38e 100644
--- a/src/function/func.js
+++ b/src/function/func.js
@@ -93,6 +93,9 @@ function luckysheet_compareWith() {
     else if(sp == "-" && fp == null){
         fp = 0;
     }
+    else if(sp == "/" && (tp == 0 || tp == null)){
+        return error.d;
+    }
 
     //计算result
     function booleanOperation(a, operator, b){
diff --git a/src/function/functionImplementation.js b/src/function/functionImplementation.js
index 17981f8..3df4cdd 100644
--- a/src/function/functionImplementation.js
+++ b/src/function/functionImplementation.js
@@ -7,7 +7,7 @@ import formula from '../global/formula';
 import func_methods from '../global/func_methods';
 import editor from '../global/editor';
 import { isdatetime, diff, isdatatype } from '../global/datecontroll';
-import { isRealNum, isRealNull, valueIsError } from '../global/validate';
+import { isRealNum, isRealNull, valueIsError,error } from '../global/validate';
 import { jfrefreshgrid } from '../global/refresh';
 import { genarate, update } from '../global/format';
 import { orderbydata } from '../global/sort';
@@ -19496,7 +19496,7 @@ const functionImplementation = {
 
             //结果为 TRUE 
             var value_if_true = func_methods.getFirstValue(arguments[1], "text");
-            if(valueIsError(value_if_true)){
+            if(valueIsError(value_if_true) && value_if_false!=error.d){
                 return value_if_true;
             }
 
@@ -19504,7 +19504,7 @@ const functionImplementation = {
             var value_if_false = "";
             if(arguments.length == 3){
                 value_if_false = func_methods.getFirstValue(arguments[2], "text");
-                if(valueIsError(value_if_false)){
+                if(valueIsError(value_if_false) && value_if_false!=error.d){
                     return value_if_false;
                 }
             }
diff --git a/src/global/extend.js b/src/global/extend.js
index 7f10000..12b0877 100644
--- a/src/global/extend.js
+++ b/src/global/extend.js
@@ -1,7 +1,7 @@
 import editor from './editor';
 import formula from './formula';
 import { jfrefreshgrid_adRC, jfrefreshgrid_deleteCell, jfrefreshgrid_rhcw } from './refresh';
-import { datagridgrowth } from './getdata';
+import { datagridgrowth, getcellFormula } from './getdata';
 import { setcellvalue } from './setdata';
 import conditionformat from '../controllers/conditionformat';
 import luckysheetFreezen from '../controllers/freezen';
diff --git a/src/global/refresh.js b/src/global/refresh.js
index c360fd7..512448e 100644
--- a/src/global/refresh.js
+++ b/src/global/refresh.js
@@ -2,6 +2,7 @@ import rhchInit from './rhchInit';
 import formula from './formula';
 import editor from './editor';
 import { setcellvalue } from './setdata';
+import { getcellFormula } from './getdata';
 import { computeRowlenArr } from './getRowlen';
 import { 
     luckysheetDrawMain,