Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

fix(formula): update (#6363)

Univer7be3f62ba333
diff --git a/packages/engine-formula/src/controller/calculate.controller.ts b/packages/engine-formula/src/controller/calculate.controller.ts
index 9a946c135b..e65106a368 100644
--- a/packages/engine-formula/src/controller/calculate.controller.ts
+++ b/packages/engine-formula/src/controller/calculate.controller.ts
@@ -211,6 +211,7 @@ export class CalculateController extends Disposable {
const functionsExecutedState = data.functionsExecutedState;
switch (functionsExecutedState) {
case FormulaExecutedStateType.NOT_EXECUTED:
+ this._applyTreeResult(data);
break;
case FormulaExecutedStateType.STOP_EXECUTION:
break;
@@ -248,10 +249,26 @@ export class CalculateController extends Disposable {
});
}
+ private async _applyTreeResult(data: IAllRuntimeData) {
+ const { dependencyTreeModelData } = data;
+ if (dependencyTreeModelData.length > 0) {
+ this._commandService.executeCommand(
+ SetFormulaDependencyCalculationResultMutation.id,
+ {
+ result: dependencyTreeModelData,
+ },
+ {
+ onlyLocal: true,
+ }
+ );
+ }
+ }
+
private async _applyResult(data: IAllRuntimeData) {
const { unitData, unitOtherData, arrayFormulaRange, arrayFormulaCellData, clearArrayFormulaCellData, arrayFormulaEmbedded, imageFormulaData, dependencyTreeModelData } = data;
if (!unitData) {
+ this._applyTreeResult(data);
console.error('No sheetData from Formula Engine!');
return;
}
@@ -287,17 +304,7 @@ export class CalculateController extends Disposable {
);
}
- if (dependencyTreeModelData.length > 0) {
- this._commandService.executeCommand(
- SetFormulaDependencyCalculationResultMutation.id,
- {
- result: dependencyTreeModelData,
- },
- {
- onlyLocal: true,
- }
- );
- }
+ this._applyTreeResult(data);
this._commandService.executeCommand(
SetFormulaCalculationResultMutation.id,
diff --git a/packages/engine-formula/src/engine/dependency/formula-dependency.ts b/packages/engine-formula/src/engine/dependency/formula-dependency.ts
index 8032b96af4..fc8cf7d9e2 100644
--- a/packages/engine-formula/src/engine/dependency/formula-dependency.ts
+++ b/packages/engine-formula/src/engine/dependency/formula-dependency.ts
@@ -1281,7 +1281,8 @@ export class FormulaDependencyGenerator extends Disposable {
for (const parentTreeId of tree.parents) {
const parentTree = this._dependencyManagerService.getTreeById(parentTreeId);
if (!parentTree) {
- throw new Error('ParentDependencyTree object is null');
+ console.error('Dependency tree not found for treeId:', parentTreeId);
+ continue;
}
if (parentTree.isAdded() || tree.isSkip()) {
continue;
@@ -1293,7 +1294,8 @@ export class FormulaDependencyGenerator extends Disposable {
for (const parentTreeId of addressSearchResults) {
const parentTree = this._dependencyManagerService.getTreeById(parentTreeId);
if (!parentTree) {
- throw new Error('ParentDependencyTree object is null');
+ console.error('Dependency tree not found for treeId:', parentTreeId);
+ continue;
}
if (parentTree.isAdded() || tree.isSkip()) {
continue;