From f2571941e41af4465c8995bfcf878b47516dbf57 Mon Sep 17 00:00:00 2001 From: Univer <68851825+DR-Univer@users.noreply.github.com> Date: Tue, 16 Dec 2025 12:10:01 +0800 Subject: [PATCH] fix(formula): update (#6318) --- .../src/engine/dependency/dependency-tree.ts | 4 ++-- .../src/engine/dependency/formula-dependency.ts | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/engine-formula/src/engine/dependency/dependency-tree.ts b/packages/engine-formula/src/engine/dependency/dependency-tree.ts index 76b10f4b75..a2bfb97008 100644 --- a/packages/engine-formula/src/engine/dependency/dependency-tree.ts +++ b/packages/engine-formula/src/engine/dependency/dependency-tree.ts @@ -47,6 +47,8 @@ export enum FormulaDependencyTreeType { class FormulaDependencyTreeCalculator { private _state = FDtreeStateType.DEFAULT; + type: FormulaDependencyTreeType = FormulaDependencyTreeType.NORMAL_FORMULA; + resetState() { this._state = FDtreeStateType.DEFAULT; } @@ -292,8 +294,6 @@ export class FormulaDependencyTree extends FormulaDependencyTreeCalculator { refOffsetX: number = 0; refOffsetY: number = 0; - type: FormulaDependencyTreeType = FormulaDependencyTreeType.NORMAL_FORMULA; - formulaId: Nullable; subUnitId: string = ''; diff --git a/packages/engine-formula/src/engine/dependency/formula-dependency.ts b/packages/engine-formula/src/engine/dependency/formula-dependency.ts index da3c569ed8..207f736ad8 100644 --- a/packages/engine-formula/src/engine/dependency/formula-dependency.ts +++ b/packages/engine-formula/src/engine/dependency/formula-dependency.ts @@ -531,6 +531,7 @@ export class FormulaDependencyGenerator extends Disposable { virtual.refOffsetX = x; virtual.refOffsetY = y; virtual.isCache = isCache; + virtual.type = FormulaDependencyTreeType.OTHER_FORMULA; this._dependencyManagerService.addOtherFormulaDependency(unitId, subUnitId, subFormulaDataId, virtual); this._dependencyManagerService.addFormulaDependencyByDefinedName(virtual); treeList.push(virtual); @@ -1387,15 +1388,17 @@ export class FormulaDependencyGenerator extends Disposable { const results: FormulaDependencyTreeModel[] = []; for (const tree of treeList) { + const treeType = tree.type; + if (tree.isVirtual && (treeType === FormulaDependencyTreeType.FEATURE_FORMULA || treeType === FormulaDependencyTreeType.OTHER_FORMULA)) { + continue; + } const treeModel = this._getFormulaDependencyTreeModel(tree); - results[tree.treeId] = treeModel; + results.push(treeModel); } const resultsJson: IFormulaDependencyTreeJson[] = []; for (const result of results) { - if (result) { - resultsJson.push(result.toJson()); - } + resultsJson.push(result.toJson()); } this._endFormulaDependencyTreeModel();