fix(fix forcecaculation feature): complete

5 years ago · 7568ceb442
2 changed files with 7 additions and 3 deletions
--- a/src/demoData/sheetCell.js
+++ b/src/demoData/sheetCell.js
--- a/src/global/formula.js
+++ b/src/global/formula.js
@ -5142,10 +5142,14 @@ const luckysheetformula = {
                    childFormulaObject.parents[key] = 1;
                }
                // console.log(childKey,formulaObject.formulaArray);
-                if(childKey in updateValueOjects){
+                if(!isForce && childKey in updateValueOjects){
                    updateValueArray.push(formulaObject);
                }
            }); 
+
+            if(isForce){
+                updateValueArray.push(formulaObject);
+            }
        });

        // console.log(formulaObjects)
@ -5166,7 +5170,7 @@ const luckysheetformula = {
        while(stack.length>0){
            let formulaObject = stack.pop();

-            if(formulaObject==null){
+            if(formulaObject==null || formulaObject.key in existsFormulaRunList){
                continue;
            }