@univerjs/engine-formula 0.6.6 → 0.6.7

package/lib/types/engine/ast-node/function-node.d.ts

@@ -45,6 +45,7 @@ export declare class FunctionNode extends BaseAstNode {
     private _setRefData;
     private _setLocale;
     private _setSheetsInfo;
+    private _setFilteredOutRows;
 }
 export declare class ErrorFunctionNode extends BaseAstNode {
     constructor(token?: string);

package/lib/types/engine/reference-object/base-reference-object.d.ts

@@ -16,6 +16,7 @@ export declare class BaseReferenceObject extends ObjectClassType {
     private _rangeData;
     private _unitData;
     private _unitStylesData;
+    private _filteredOutRows;
     private _defaultUnitId;
     private _forcedUnitId;
     private _runtimeData;
@@ -67,6 +68,8 @@ export declare class BaseReferenceObject extends ObjectClassType {
     setUnitData(unitData: IUnitData): void;
     getUnitStylesData(): IUnitStylesData;
     setUnitStylesData(unitStylesData: IUnitStylesData): void;
+    getFilteredOutRows(): number[];
+    setFilteredOutRows(filteredOutRows: number[]): void;
     getRuntimeData(): IRuntimeUnitDataType;
     setRuntimeData(runtimeData: IRuntimeUnitDataType): void;
     getArrayFormulaCellData(): IRuntimeUnitDataType;

package/lib/types/functions/base-function.d.ts

@@ -3,10 +3,10 @@ import { IFunctionNames } from '../basics/function';
 import { BaseReferenceObject, FunctionVariantType, NodeValueType } from '../engine/reference-object/base-reference-object';
 import { ArrayBinarySearchType, ArrayOrderSearchType } from '../engine/utils/compare';
 import { ArrayValueObject } from '../engine/value-object/array-value-object';
+import { BaseValueObject, ErrorValueObject } from '../engine/value-object/base-value-object';
 import { FormulaFunctionResultValueType, FormulaFunctionValueType } from '../engine/value-object/primitive-object';
 import { FormulaDataModel } from '../models/formula-data.model';
 import { IDefinedNameMapItem } from '../services/defined-names.service';
-import { BaseValueObject, ErrorValueObject } from '../engine/value-object/base-value-object';
 export declare class BaseFunction {
     private _name;
     private _unitId;
@@ -44,6 +44,10 @@ export declare class BaseFunction {
      * Whether the function needs the number of rows and columns in the sheet
      */
     needsSheetRowColumnCount: boolean;
+    /**
+     * Whether the function needs to filter out rows
+     */
+    needsFilteredOutRows: boolean;
     /**
      * Minimum number of parameters
      */

package/lib/types/functions/math/subtotal/index.d.ts

@@ -1,11 +1,11 @@
 import { FunctionVariantType } from '../../../engine/reference-object/base-reference-object';
-import { ArrayValueObject } from '../../../engine/value-object/array-value-object';
 import { BaseFunction } from '../../base-function';
 export declare class Subtotal extends BaseFunction {
     minParams: number;
     maxParams: number;
     needsReferenceObject: boolean;
-    calculate(functionNum: FunctionVariantType, ...refs: FunctionVariantType[]): ArrayValueObject | FunctionVariantType;
+    needsFilteredOutRows: boolean;
+    calculate(functionNum: FunctionVariantType, ...refs: FunctionVariantType[]): FunctionVariantType;
     private _handleSingleObject;
     private _getIndexNumValue;
     private _average;

package/lib/types/index.d.ts

@@ -104,8 +104,8 @@ export { initSheetFormulaData } from './models/formula-data.model';
 export type { IRangeChange } from './models/formula-data.model';
 export { UniverFormulaEnginePlugin } from './plugin';
 export { GlobalComputingStatusService } from './services/global-computing-status.service';
-export { IActiveDirtyManagerService } from './services/active-dirty-manager.service';
-export { ActiveDirtyManagerService } from './services/active-dirty-manager.service';
+export { ActiveDirtyManagerService, IActiveDirtyManagerService } from './services/active-dirty-manager.service';
+export { ISheetRowFilteredService, SheetRowFilteredService } from './services/sheet-row-filtered.service';
 export { CalculateFormulaService, ICalculateFormulaService } from './services/calculate-formula.service';
 export { FormulaCurrentConfigService, IFormulaCurrentConfigService, type IFormulaDirtyData } from './services/current-data.service';
 export { DefinedNamesService, type IDefinedNameMapItem, IDefinedNamesService, type IDefinedNamesServiceParam } from './services/defined-names.service';

package/lib/types/services/current-data.service.d.ts

@@ -1,6 +1,7 @@
 import { IUnitRange, LocaleType, Nullable, Disposable, IUniverInstanceService, LocaleService } from '@univerjs/core';
 import { IArrayFormulaRangeType, IDirtyUnitFeatureMap, IDirtyUnitOtherFormulaMap, IDirtyUnitSheetDefinedNameMap, IDirtyUnitSheetNameMap, IFormulaData, IFormulaDatasetConfig, IRuntimeUnitDataType, IUnitData, IUnitExcludedCell, IUnitRowData, IUnitSheetNameMap, IUnitStylesData } from '../basics/common';
 import { FormulaDataModel } from '../models/formula-data.model';
+import { ISheetRowFilteredService } from './sheet-row-filtered.service';
 export interface IFormulaDirtyData {
     forceCalculation: boolean;
     dirtyRanges: IUnitRange[];
@@ -52,11 +53,13 @@ export interface IFormulaCurrentConfigService {
         rowCount: number;
         columnCount: number;
     };
+    getFilteredOutRows(unitId: string, sheetId: string, startRow: number, endRow: number): number[];
 }
 export declare class FormulaCurrentConfigService extends Disposable implements IFormulaCurrentConfigService {
     private readonly _univerInstanceService;
     private readonly _localeService;
     private readonly _formulaDataModel;
+    private readonly _sheetRowFilteredService;
     private _unitData;
     private _unitStylesData;
     private _arrayFormulaCellData;
@@ -74,7 +77,7 @@ export declare class FormulaCurrentConfigService extends Disposable implements I
     private _sheetIdToNameMap;
     private _executeUnitId;
     private _executeSubUnitId;
-    constructor(_univerInstanceService: IUniverInstanceService, _localeService: LocaleService, _formulaDataModel: FormulaDataModel);
+    constructor(_univerInstanceService: IUniverInstanceService, _localeService: LocaleService, _formulaDataModel: FormulaDataModel, _sheetRowFilteredService: ISheetRowFilteredService);
     dispose(): void;
     getExecuteUnitId(): Nullable<string>;
     getExecuteSubUnitId(): Nullable<string>;
@@ -106,6 +109,7 @@ export declare class FormulaCurrentConfigService extends Disposable implements I
         rowCount: number;
         columnCount: number;
     };
+    getFilteredOutRows(unitId: string, sheetId: string, startRow: number, endRow: number): number[];
     load(config: IFormulaDatasetConfig): void;
     getDirtyData(): IFormulaDirtyData;
     loadDirtyRangesAndExcludedCell(dirtyRanges: IUnitRange[], excludedCell?: IUnitExcludedCell): void;

package/lib/types/services/sheet-row-filtered.service.d.ts

@@ -0,0 +1,16 @@
+import { Disposable } from '@univerjs/core';
+type CallbackFunction = (unitId: string, subUnitId: string, row: number) => boolean;
+/**
+ * The service that gets the row filter status
+ */
+export interface ISheetRowFilteredService {
+    register(callback: CallbackFunction): void;
+    getRowFiltered(unitId: string, subUnitId: string, row: number): boolean;
+}
+export declare class SheetRowFilteredService extends Disposable implements ISheetRowFilteredService {
+    private _getRowFilteredCallback;
+    register(callback: CallbackFunction): void;
+    getRowFiltered(unitId: string, subUnitId: string, row: number): boolean;
+}
+export declare const ISheetRowFilteredService: import('@wendellhu/redi').IdentifierDecorator<SheetRowFilteredService>;
+export {};