Ver código fonte

修复公式显示有延迟的问题

xujunjie 1 ano atrás
pai
commit
3ae76d79ca
2 arquivos alterados com 12 adições e 11 exclusões
  1. 11 10
      src/function/func.js
  2. 1 1
      src/function/functionImplementation.js

+ 11 - 10
src/function/func.js

@@ -1715,16 +1715,17 @@ function luckysheet_getcelldata(txt) {
             "column": col
         });
 
-        //if(formula.execFunctionGlobalData!=null){
-        //    for(let r=row[0];r<=row[1];r++){
-        //        for(let c=col[0];c<=col[1];c++){
-        //            let ef = formula.execFunctionGlobalData[r+"_"+c+"_"+sheetIndex];
-        //            if(ef!=null){
-        //               ret[r-row[0]][c-col[0]] = ef;
-        //            }
-        //        }
-        //    }
-        //}
+        if(formula.execFunctionGlobalData!=null){
+           for(let r=row[0];r<=row[1];r++){
+               for(let c=col[0];c<=col[1];c++){
+                   let ef = formula.execFunctionGlobalData[r+"_"+c+"_"+sheetIndex];
+                   if(ef!=null){
+                      let oldObj = ret[r-row[0]][c-col[0]]
+                      ret[r-row[0]][c-col[0]] = {...oldObj,...ef};
+                   }
+               }
+           }
+        }
 
         
         //范围的长宽

+ 1 - 1
src/function/functionImplementation.js

@@ -4617,7 +4617,7 @@ const functionImplementation = {
 
             for(var i = 0; i < rangeData.length; i++){
                 if(results[i]){
-                    sum = luckysheet_calcADPMM(sum, "+", rangeData[i]); //parseFloat(rangeData[i]);
+                    sum = luckysheet_calcADPMM(sum|| 0, "+", rangeData[i] || 0); //parseFloat(rangeData[i]);
                 }
             }