Browse Source

fix(fix forcecaculation feature): complete

master
wbfsa 5 years ago
parent
commit
7568ceb442
  1. 2
      src/demoData/sheetCell.js
  2. 8
      src/global/formula.js

2
src/demoData/sheetCell.js

File diff suppressed because one or more lines are too long

8
src/global/formula.js

@ -5142,10 +5142,14 @@ const luckysheetformula = {
childFormulaObject.parents[key] = 1; childFormulaObject.parents[key] = 1;
} }
// console.log(childKey,formulaObject.formulaArray); // console.log(childKey,formulaObject.formulaArray);
if(childKey in updateValueOjects){ if(!isForce && childKey in updateValueOjects){
updateValueArray.push(formulaObject); updateValueArray.push(formulaObject);
} }
}); });
if(isForce){
updateValueArray.push(formulaObject);
}
}); });
// console.log(formulaObjects) // console.log(formulaObjects)
@ -5166,7 +5170,7 @@ const luckysheetformula = {
while(stack.length>0){ while(stack.length>0){
let formulaObject = stack.pop(); let formulaObject = stack.pop();
if(formulaObject==null){ if(formulaObject==null || formulaObject.key in existsFormulaRunList){
continue; continue;
} }

Loading…
Cancel
Save