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): fix dispose register function bug (#4783)

wpxp123456be00bdd403b2
diff --git a/packages/engine-formula/src/basics/cache-lru.ts b/packages/engine-formula/src/basics/cache-lru.ts
index c86f461d0c..e54abc1871 100644
--- a/packages/engine-formula/src/basics/cache-lru.ts
+++ b/packages/engine-formula/src/basics/cache-lru.ts
@@ -37,6 +37,14 @@ export class FormulaAstLRU<T> {
this._cache.clear();
}
+ delete(formulaString: string) {
+ this._cache.delete(this._hash(formulaString));
+ }
+
+ forEach(callbackfn: (value: T, key: string, map: LRUMap<string, T>) => void, thisArg?: any) {
+ this._cache.forEach(callbackfn, thisArg);
+ }
+
private _hash(formulaString: string) {
if (formulaString.length <= 64) {
return formulaString;
diff --git a/packages/engine-formula/src/services/function.service.ts b/packages/engine-formula/src/services/function.service.ts
index ace2b144e9..731163c60a 100644
--- a/packages/engine-formula/src/services/function.service.ts
+++ b/packages/engine-formula/src/services/function.service.ts
@@ -16,9 +16,9 @@
import type { IDisposable, Nullable } from '@univerjs/core';
import type { IFunctionInfo, IFunctionNames } from '../basics/function';
-
import type { BaseFunction } from '../functions/base-function';
import { createIdentifier, Disposable, toDisposable } from '@univerjs/core';
+import { FORMULA_AST_CACHE } from '../engine/utils/generate-ast-node';
export interface IFunctionService {
/**
@@ -53,6 +53,8 @@ export interface IFunctionService {
hasDescription(functionToken: IFunctionNames): boolean;
unregisterDescriptions(...functionTokens: IFunctionNames[]): void;
+
+ deleteFormulaAstCacheKey(...functionToken: IFunctionNames[]): void;
}
export const IFunctionService = createIdentifier<FunctionService>('univer.formula-function.service');
@@ -125,4 +127,14 @@ export class FunctionService extends Disposable implements IFunctionService {
this._functionDescriptions.delete(functionToken);
}
}
+
+ deleteFormulaAstCacheKey(...functionToken: IFunctionNames[]) {
+ FORMULA_AST_CACHE.forEach((_, key) => {
+ functionToken.forEach((token) => {
+ if (key.includes(token as string)) {
+ FORMULA_AST_CACHE.delete(key);
+ }
+ });
+ });
+ }
}
diff --git a/packages/sheets-formula/src/services/register-function.service.ts b/packages/sheets-formula/src/services/register-function.service.ts
index c6d140461d..8e7e3afd8c 100644
--- a/packages/sheets-formula/src/services/register-function.service.ts
+++ b/packages/sheets-formula/src/services/register-function.service.ts
@@ -207,6 +207,8 @@ export class RegisterFunctionService extends Disposable implements IRegisterFunc
instance.calculateCustom = func;
this._functionService.registerExecutors(instance);
disposables.add(toDisposable(() => this._functionService.unregisterExecutors(name)));
+ disposables.add(toDisposable(() => this._functionService.unregisterDescriptions(name)));
+ disposables.add(toDisposable(() => this._functionService.deleteFormulaAstCacheKey(name)));
// Handle remote registration if available
if (this._remoteRegisterFunctionService) {
diff --git a/packages/sheets-formula/src/services/remote/remote-register-function.service.ts b/packages/sheets-formula/src/services/remote/remote-register-function.service.ts
index 30e78e3ca6..abf385b820 100644
--- a/packages/sheets-formula/src/services/remote/remote-register-function.service.ts
+++ b/packages/sheets-formula/src/services/remote/remote-register-function.service.ts
@@ -52,7 +52,9 @@ export class RemoteRegisterFunctionService implements IRemoteRegisterFunctionSer
}
async unregisterFunctions(names: string[]): Promise<void> {
+ this._functionService.unregisterExecutors(...names);
this._functionService.unregisterDescriptions(...names);
+ this._functionService.deleteFormulaAstCacheKey(...names);
}
}