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(sheet): dependency error (#2650)

Univer4ec356d22795
diff --git a/packages/engine-formula/src/engine/dependency/dependency-tree.ts b/packages/engine-formula/src/engine/dependency/dependency-tree.ts
index b1303b4203..30dfc364f7 100644
--- a/packages/engine-formula/src/engine/dependency/dependency-tree.ts
+++ b/packages/engine-formula/src/engine/dependency/dependency-tree.ts
@@ -79,9 +79,12 @@ export class FormulaDependencyTree extends Disposable {
override dispose(): void {
super.dispose();
- this.children.forEach((tree) => {
- tree.dispose();
- });
+ // this.children.forEach((tree) => {
+ // tree.dispose();
+ // });
+
+ this.children = [];
+
this.rangeList = [];
this.parents = [];
@@ -89,6 +92,14 @@ export class FormulaDependencyTree extends Disposable {
this.node?.dispose();
}
+ disposeWithChildren() {
+ this.children.forEach((tree) => {
+ tree.disposeWithChildren();
+ });
+
+ this.dispose();
+ }
+
resetState() {
this._state = FDtreeStateType.DEFAULT;
}
@@ -316,7 +327,7 @@ export class FormulaDependencyTreeCache extends Disposable {
dependenceTree.inRangeData(range)
) {
treeList.forEach((tree) => {
- if (tree === dependenceTree) {
+ if (tree === dependenceTree || tree.children.includes(dependenceTree)) {
return true;
}
tree.pushChildren(dependenceTree);
diff --git a/packages/engine-formula/src/engine/dependency/formula-dependency.ts b/packages/engine-formula/src/engine/dependency/formula-dependency.ts
index 4ff2ac9d54..2dc5ad3506 100644
--- a/packages/engine-formula/src/engine/dependency/formula-dependency.ts
+++ b/packages/engine-formula/src/engine/dependency/formula-dependency.ts
@@ -548,7 +548,7 @@ export class FormulaDependencyGenerator extends Disposable {
if (dependencyTreeCache.size() > treeList.length) {
allTree = this._dependencyManagerService.buildDependencyTree(treeList);
} else {
- allTree = this._dependencyManagerService.buildDependencyTree(dependencyTreeCache);
+ allTree = this._dependencyManagerService.buildDependencyTree(dependencyTreeCache, treeList);
}
for (let i = 0, len = allTree.length; i < len; i++) {
diff --git a/packages/engine-formula/src/services/calculate-formula.service.ts b/packages/engine-formula/src/services/calculate-formula.service.ts
index 7960e8c635..07ca1b0591 100644
--- a/packages/engine-formula/src/services/calculate-formula.service.ts
+++ b/packages/engine-formula/src/services/calculate-formula.service.ts
@@ -113,6 +113,9 @@ export class CalculateFormulaService extends Disposable {
for (let i = 0; i < cycleReferenceCount; i++) {
this._runtimeService.setFormulaCycleIndex(i);
await this._execute();
+
+ FORMULA_REF_TO_ARRAY_CACHE.clear();
+
const isCycleDependency = this._runtimeService.isCycleDependency();
if (!isCycleDependency) {
break;
@@ -125,8 +128,6 @@ export class CalculateFormulaService extends Disposable {
this._executionCompleteListener$.next(this._runtimeService.getAllRuntimeData());
- FORMULA_REF_TO_ARRAY_CACHE.clear();
-
CELL_INVERTED_INDEX_CACHE.clear();
}
diff --git a/packages/engine-formula/src/services/dependency-manager.service.ts b/packages/engine-formula/src/services/dependency-manager.service.ts
index fd362b64a4..715c4d0c3d 100644
--- a/packages/engine-formula/src/services/dependency-manager.service.ts
+++ b/packages/engine-formula/src/services/dependency-manager.service.ts
@@ -33,7 +33,7 @@ export interface IDependencyManagerService {
getAllTree(): FormulaDependencyTree[];
- buildDependencyTree(shouldBeBuildTrees: FormulaDependencyTree[] | FormulaDependencyTreeCache): FormulaDependencyTree[];
+ buildDependencyTree(shouldBeBuildTrees: FormulaDependencyTree[] | FormulaDependencyTreeCache, dependencyTrees?: FormulaDependencyTree[]): FormulaDependencyTree[];
clearDependencyForTree(shouldBeClearTree: Nullable<FormulaDependencyTree>): void;
@@ -124,12 +124,17 @@ export class DependencyManagerService extends Disposable implements IDependencyM
return trees;
}
- buildDependencyTree(shouldBeBuildTrees: FormulaDependencyTree[] | FormulaDependencyTreeCache): FormulaDependencyTree[] {
+ buildDependencyTree(shouldBeBuildTrees: FormulaDependencyTree[] | FormulaDependencyTreeCache, dependencyTrees?: FormulaDependencyTree[]): FormulaDependencyTree[] {
const allTrees = this.getAllTree();
if (shouldBeBuildTrees.length === 0) {
return allTrees;
}
- this._buildDependencyTree(allTrees, shouldBeBuildTrees);
+ if (shouldBeBuildTrees instanceof FormulaDependencyTreeCache) {
+ this._buildDependencyTree(allTrees, shouldBeBuildTrees, dependencyTrees || []);
+ } else {
+ this._buildDependencyTree(allTrees, shouldBeBuildTrees, shouldBeBuildTrees);
+ }
+
return allTrees;
}
@@ -138,13 +143,13 @@ export class DependencyManagerService extends Disposable implements IDependencyM
* @param allTrees all FormulaDependencyTree
* @param shouldBeBuildTrees FormulaDependencyTree[] | FormulaDependencyTreeCache
*/
- private _buildDependencyTree(allTrees: FormulaDependencyTree[], shouldBeBuildTrees: FormulaDependencyTree[] | FormulaDependencyTreeCache) {
+ private _buildDependencyTree(allTrees: FormulaDependencyTree[], shouldBeBuildTrees: FormulaDependencyTree[] | FormulaDependencyTreeCache, dependencyTrees: FormulaDependencyTree[]) {
allTrees.forEach((tree) => {
if (shouldBeBuildTrees instanceof FormulaDependencyTreeCache) {
shouldBeBuildTrees.dependency(tree);
} else {
shouldBeBuildTrees.forEach((shouldBeBuildTree) => {
- if (tree === shouldBeBuildTree) {
+ if (tree === shouldBeBuildTree || shouldBeBuildTree.children.includes(tree)) {
return true;
}
@@ -154,6 +159,19 @@ export class DependencyManagerService extends Disposable implements IDependencyM
});
}
});
+
+ // Build the reverse dependency relationship between the trees.
+ allTrees.forEach((tree) => {
+ dependencyTrees.forEach((dependencyTree) => {
+ if (tree === dependencyTree || tree.children.includes(dependencyTree)) {
+ return true;
+ }
+
+ if (tree.dependency(dependencyTree)) {
+ tree.pushChildren(dependencyTree);
+ }
+ });
+ });
}
/**
@@ -178,7 +196,7 @@ export class DependencyManagerService extends Disposable implements IDependencyM
child.parents = child.parents.filter((parent) => parent !== shouldBeClearTree);
});
- this._buildDependencyTree(parents, children);
+ this._buildDependencyTree(parents, children, children);
shouldBeClearTree.dispose();
}
diff --git a/packages/sheets-formula/src/controllers/update-formula.controller.ts b/packages/sheets-formula/src/controllers/update-formula.controller.ts
index 2504cbbbc6..7380905f86 100644
--- a/packages/sheets-formula/src/controllers/update-formula.controller.ts
+++ b/packages/sheets-formula/src/controllers/update-formula.controller.ts
@@ -106,7 +106,8 @@ import {
} from '@univerjs/sheets';
import { Inject, Injector } from '@wendellhu/redi';
-import { map, merge } from 'rxjs';
+import { filter, map, merge } from 'rxjs';
+import { IEditorService } from '@univerjs/ui';
import type { IRefRangeWithPosition } from './utils/offset-formula-data';
import { removeFormulaData } from './utils/offset-formula-data';
import { getFormulaReferenceMoveUndoRedo } from './utils/ref-range-formula';
@@ -171,6 +172,7 @@ export class UpdateFormulaController extends Disposable {
@Inject(FormulaDataModel) private readonly _formulaDataModel: FormulaDataModel,
@Inject(SheetInterceptorService) private _sheetInterceptorService: SheetInterceptorService,
@Inject(SelectionManagerService) private _selectionManagerService: SelectionManagerService,
+ @IEditorService private readonly _editorService: IEditorService,
@Inject(Injector) readonly _injector: Injector
) {
super();
@@ -221,6 +223,8 @@ export class UpdateFormulaController extends Disposable {
this._univerInstanceService.getTypeOfUnitAdded$<Workbook>(UniverInstanceType.UNIVER_SHEET),
this._univerInstanceService.getTypeOfUnitAdded$<DocumentDataModel>(UniverInstanceType.UNIVER_DOC),
this._univerInstanceService.getTypeOfUnitAdded$<SlideDataModel>(UniverInstanceType.UNIVER_SLIDE)
+ ).pipe(
+ filter((unit) => this._editorService.getEditor(unit.getUnitId()) == null)
).subscribe((unit) => this._handleUnitAdded(unit))
)
);
@@ -231,6 +235,8 @@ export class UpdateFormulaController extends Disposable {
this._univerInstanceService.getTypeOfUnitDisposed$<Workbook>(UniverInstanceType.UNIVER_SHEET).pipe(map((sheet) => sheet.getUnitId())),
this._univerInstanceService.getTypeOfUnitDisposed$<DocumentDataModel>(UniverInstanceType.UNIVER_DOC).pipe(map((doc) => doc.getUnitId())),
this._univerInstanceService.getTypeOfUnitDisposed$<SlideDataModel>(UniverInstanceType.UNIVER_SLIDE).pipe(map((slide) => slide.getUnitId()))
+ ).pipe(
+ filter((unitId) => this._editorService.getEditor(unitId) == null)
).subscribe((id) => this._handleRemoveSheetMutation(id))
)
);