opensource/univer
3
0
Fork 0
mirror of https://github.com/dream-num/univer.git synced 2026-08-28 23:01:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(formula): update (#6318)

Browse Source
This commit is contained in:
Univer
2025-12-16 12:10:01 +08:00
committed by GitHub
parent 6a1d638236
commit f2571941e4
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/engine-formula/src/engine/dependency/dependency-tree.ts
+2 -2
View File
@@ -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<string>;
subUnitId: string = '';
packages/engine-formula/src/engine/dependency/formula-dependency.ts
+7 -4
View File
@@ -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();