@univerjs/sheets-formula 0.4.1 → 0.4.2

package/lib/types/controllers/trigger-calculation.controller.d.ts

@@ -4,6 +4,7 @@ import { IActiveDirtyManagerService } from '@univerjs/engine-formula';
  * This interface is for the progress bar to display the calculation progress.
  */
 export interface ICalculationProgress {
+    /** Task that already completed. */
     done: number;
     /** The total number of formulas need to calculate. */
     count: number;
@@ -15,12 +16,20 @@ export declare class TriggerCalculationController extends Disposable {
     private _executingDirtyData;
     private _setTimeoutKey;
     private _startExecutionTime;
-    private _formulaCalculationDoneCount;
-    private _arrayFormulaCalculationDoneCount;
+    private _totalCalculationTaskCount;
+    private _doneCalculationTaskCount;
     private _executionInProgressParams;
     private _restartCalculation;
+    /**
+     * The mark of forced calculation. If a new mutation triggers dirty area calculation during the forced calculation process, forced calculation is still required.
+     */
+    private _forceCalculating;
     private readonly _progress$;
     readonly progress$: import('rxjs').Observable<ICalculationProgress>;
+    private _emitProgress;
+    private _startProgress;
+    private _completeProgress;
+    clearProgress(): void;
     constructor(_commandService: ICommandService, _activeDirtyManagerService: IActiveDirtyManagerService);
     dispose(): void;
     private _commandExecutedListener;
@@ -31,18 +40,4 @@ export declare class TriggerCalculationController extends Disposable {
     private _initialExecuteFormulaProcessListener;
     private _resetExecutingDirtyData;
     private _initialExecuteFormula;
-    /**
-     * The user manually stops the progress bar
-     */
-    private _initialProgressBar;
-    /**
-     * Update progress by completed count
-     * @param completedCount
-     */
-    private _pushFormulaTask;
-    /**
-     * Update progress by completed count
-     * @param completedCount
-     */
-    private _pushArrayFormulaTask;
 }

package/lib/types/index.d.ts

@@ -16,6 +16,7 @@
 export { type IInsertFunction, type IInsertFunctionCommandParams, InsertFunctionCommand } from './commands/commands/insert-function.command';
 export { OtherFormulaMarkDirty } from './commands/mutations/formula.mutation';
 export { UpdateDefinedNameController } from './controllers/update-defined-name.controller';
+export { TriggerCalculationController } from './controllers/trigger-calculation.controller';
 export { UpdateFormulaController } from './controllers/update-formula.controller';
 export { DescriptionService, IDescriptionService, type ISearchItem } from './services/description.service';
 export type { IFormulaInfo, IOtherFormulaResult } from './services/formula-common';

package/lib/types/services/formula-ref-range.service.d.ts

@@ -1,15 +1,23 @@
-import { IDisposable, IMutationInfo, Disposable, IUniverInstanceService } from '@univerjs/core';
+import { IDisposable, IMutationInfo, IRange, Disposable, IUniverInstanceService } from '@univerjs/core';
+import { EffectRefRangeParams, RefRangeService } from '@univerjs/sheets';
 import { LexerTreeBuilder } from '@univerjs/engine-formula';
-import { RefRangeService } from '@univerjs/sheets';
 export type FormulaChangeMap = Record<string, Record<string, Record<string, string>>>;
 export type FormulaChangeCallback = (formulaString: string) => {
     redos: IMutationInfo[];
     undos: IMutationInfo[];
 };
+export type RangeFormulaChangeCallback = (formulas: {
+    formulaString: string;
+    ranges: IRange[];
+}[]) => {
+    redos: IMutationInfo[];
+    undos: IMutationInfo[];
+};
 export declare class FormulaRefRangeService extends Disposable {
     private readonly _refRangeService;
     private readonly _lexerTreeBuilder;
     private readonly _univerInstanceService;
     constructor(_refRangeService: RefRangeService, _lexerTreeBuilder: LexerTreeBuilder, _univerInstanceService: IUniverInstanceService);
-    registerFormula(formula: string, callback: FormulaChangeCallback): IDisposable;
+    transformFormulaByEffectCommand(unitId: string, subUnitId: string, formula: string, params: EffectRefRangeParams): string;
+    registerFormula(unitId: string, subUnitId: string, formula: string, callback: FormulaChangeCallback): IDisposable;
 }