@univerjs-pro/sheets-pivot 1.1.0 → 1.3.0

package/lib/types/index.d.ts

@@ -20,11 +20,14 @@ export type { ISetPivotCollapseByFieldCommandParams } from './commands/command/s
 export { SetPivotCollapseCommand } from './commands/command/set-pivot-collapse.command';
 export type { ISetPivotCollapseCommandParams } from './commands/command/set-pivot-collapse.command';
 export { SetPivotDateGroupCommand } from './commands/command/set-pivot-date-group.command';
+export { SetPivotExcelDateGroupCommand } from './commands/command/set-pivot-excel-date-group.command';
 export { SetPivotFieldsConfigCommand } from './commands/command/set-pivot-fields-config.command';
 export type { ISetPivotFieldsConfigCommandParams } from './commands/command/set-pivot-fields-config.command';
 export { SetPivotFilterCommand } from './commands/command/set-pivot-filter.command';
 export type { ISetPivotFilterCommandParams } from './commands/command/set-pivot-filter.command';
 export { SetPivotLayoutCommand } from './commands/command/set-pivot-layout.command';
+export { SetPivotManualGroupsCommand } from './commands/command/set-pivot-manual-groups.command';
+export { SetPivotNumberGroupCommand } from './commands/command/set-pivot-number-group.command';
 export { SetPivotOptionCommand } from './commands/command/set-pivot-option.command';
 export { SetPivotSortCommand } from './commands/command/set-pivot-sort.command';
 export type { ISetPivotSortCommandParams } from './commands/command/set-pivot-sort.command';
@@ -57,7 +60,8 @@ export { UpdateValuePositionMutation } from './commands/mutations/update-value-p
 export { SHEETS_PIVOT_PLUGIN_CONFIG_KEY } from './config/config';
 export type { IUniverSheetsPivotConfig } from './config/config';
 export { BLANK_ROW_COUNT, getAdjustRangesPosition, PivotDisplayDataType, PositionType, SHEET_PIVOT_TABLE_PLUGIN, } from './const/const';
-export type { IAddPivotTableMutationParams, IPivotCellPositionInfo, IPivotPanelDataInfo, IPivotPanelSourceList, IPivotPanelTableListItemBase, IPivotRangesInfo, IPivotReportScope, IPivotTableAddedEventParams, IPivotTableCellData, IPivotTableConfig, IPivotTableMatrixInfo, IPivotTableMovedEventParams, IPivotTableRemovedEventParams, IPivotTableRenderedEventParams, IPivotViewUpdateInfo, IRemovePivotTableMutationParams, ISendPivotViewLocalMutationParams, ISetPivotLayoutMutationParams, ISetPivotOptionMutationParams, IUnitRangeNameWithSubUnitId, } from './const/type';
+export type { IAddPivotTableMutationParams, IPivotCellPositionInfo, IPivotCollectionChange, IPivotManualFilterCoordinationParams, IPivotManualFilterCoordinationResult, IPivotPanelDataInfo, IPivotPanelSourceList, IPivotPanelTableListItemBase, IPivotRangesInfo, IPivotReportScope, IPivotTableAddedEventParams, IPivotTableCellData, IPivotTableConfig, IPivotTableMatrixInfo, IPivotTableMovedEventParams, IPivotTableRemovedEventParams, IPivotTableRenderedEventParams, IPivotViewUpdateInfo, IRemovePivotTableMutationParams, ISendPivotViewLocalMutationParams, ISetPivotLayoutMutationParams, ISetPivotOptionMutationParams, IUnitRangeNameWithSubUnitId, } from './const/type';
+export { PIVOT_FIELD_REMOVE_COORDINATION, PIVOT_MANUAL_FILTER_COORDINATION, PivotTableOperationEnum, } from './const/type';
 export { PivotCalculatorController } from './controllers/sheets-pivot-caculate.controller';
 export { getOrCreatePivotSheetCopyPlan, PIVOT_SHEET_COPY_CONTEXT_KEY, remapPivotReportDataFields, } from './models/pivot-sheet-copy-plan';
 export type { IPivotSheetCopyPlan, IPivotSheetCopyPlanEntry, IPivotSheetCopyScope, IPivotSheetCopySource, IPivotSheetDataFieldCopyContext, } from './models/pivot-sheet-copy-plan';
@@ -66,8 +70,9 @@ export { SheetsPivotTableConfigModel } from './models/sheets-pivot-config-model'
 export { SheetsPivotDataSourceModel } from './models/sheets-pivot-data-source-model';
 export { SheetsPivotTableAdaptorModel } from './models/sheets-pivot-table-adaptor-model';
 export { UniverSheetsPivotTablePlugin } from './plugin';
+export { compilePivotRecordFilter, getSlicerSelectionFromPivotManualFilter } from './record-filter-bridge';
 export { SheetsPivotCacheService } from './services/sheets-pivot-cache.service';
 export { SheetsPivotRPCService } from './services/sheets-pivot-rpc.service';
 export { SheetsPivotTableService } from './services/sheets-pivot-table.service';
 export type { IPivotSheetCellContext, IPivotValueFilterTarget } from './util';
-export { generateSetRangeValueMutations, getDateGroupName, getEmptyPivotRanges, getPivotAppliedRanges, resolvePivotSheetCell, resolvePivotValueFieldId, resolvePivotValueFilterTarget, setPivotDateSystem, unionPivotViewRange, } from './util';
+export { generateSetRangeValueMutations, getDateGroupName, getEmptyPivotRanges, getInsertRowColMutations, getPivotAppliedRanges, resolvePivotSheetCell, resolvePivotValueFieldId, resolvePivotValueFilterTarget, setPivotDateSystem, unionPivotViewRange, } from './util';

package/lib/types/locale/en-US.d.ts

@@ -39,6 +39,7 @@ declare const locale: {
             values: string;
         };
         dateGroup: {
+            second: string;
             year: string;
             month: string;
             day: string;
@@ -52,7 +53,15 @@ declare const locale: {
             yearMonth: string;
             yearMonthDate: string;
         };
+        numberGroupRange: string;
+        numberGroupClosedRange: string;
+        numberGroupBefore: string;
+        numberGroupAfter: string;
         cellDateGroupDisplay: {
+            second: string;
+            before: string;
+            after: string;
+            dayRange: string;
             minute: string;
             hour: string;
             hourMinute: string;

package/lib/types/models/sheets-pivot-config-model.d.ts

@@ -1,7 +1,13 @@
 import type { IFieldsCollectionJSON } from '@univerjs-pro/engine-pivot';
 import type { Nullable, ObjectMatrix } from '@univerjs/core';
-import type { IDataFieldManagerJSON, IPivotCellPositionInfo, IPivotRangesInfo, IPivotTableCellData, IPivotTableConfig, IPivotTableMatrixInfo, IPivotTableRangeInfo } from '../const/type';
 import { Disposable, ICommandService, IConfigService, Injector, IResourceManagerService, IUniverInstanceService, LocaleService } from '@univerjs/core';
+import type { IDataFieldManagerJSON, IPivotCellPositionInfo, IPivotCollectionChange, IPivotRangesInfo, IPivotTableCellData, IPivotTableConfig, IPivotTableMatrixInfo, IPivotTableRangeInfo, ISheetsPivotCacheSnapshot } from '../const/type';
+interface IPivotConfigChange {
+    unitId: string;
+    subUnitId: string;
+    pivotTableId: string;
+    pivotTableConfig: Nullable<IPivotTableConfig>;
+}
 export declare class SheetsPivotTableConfigModel extends Disposable {
     private _injector;
     private _commandService;
@@ -11,23 +17,44 @@ export declare class SheetsPivotTableConfigModel extends Disposable {
     private readonly _localeService;
     private _model;
     private _collectionConfigModel;
+    private readonly _cacheConfigModel;
+    private readonly _retainedSources;
+    private readonly _runtimeIds;
+    private readonly _runtimeStates;
+    private readonly _runtimeState$;
+    readonly runtimeState$: import("rxjs").Observable<{
+        unitId: string;
+        state: "initializing" | "ready" | "error";
+    }>;
     private _pivotTableRangeInfo;
     private _pivotTableMatrixInfo;
-    private _configVersion$;
+    private readonly _collectionChange$;
+    readonly collectionChange$: import("rxjs").Observable<IPivotCollectionChange>;
+    private _pendingChanges?;
     private _pivotInitCompleted$;
     pivotInitCompleted$: import("rxjs").Observable<boolean>;
     private _pivotConfigChange$;
-    pivotConfigChange$: import("rxjs").Observable<{
-        unitId: string;
-        subUnitId: string;
-        pivotTableId: string;
-        pivotTableConfig: Nullable<IPivotTableConfig>;
-    }>;
+    pivotConfigChange$: import("rxjs").Observable<IPivotConfigChange>;
     private _textInfo;
-    configVersion$: import("rxjs").Observable<number>;
     constructor(_injector: Injector, _commandService: ICommandService, _univerInstanceService: IUniverInstanceService, _resourceManagerService: IResourceManagerService, _configService: IConfigService, _localeService: LocaleService);
+    /** Publish notifications only after all related synchronous model writes have completed. */
+    batchUpdate<T>(update: () => T): T;
+    watchPivotTableChanges(unitId: string, subUnitId: string, pivotTableId: string): import("rxjs").Observable<IPivotCollectionChange | IPivotConfigChange>;
+    private _emitConfigChange;
+    private _emitCollectionChange;
+    private _moveSources;
     private _initUnitDisposed;
     setPivotInitCompleted(): void;
+    beginRuntime(unitId: string, runtimeId: string): void;
+    getRuntimeId(unitId: string): string | undefined;
+    getRuntimeState(unitId: string): 'initializing' | 'ready' | 'error' | undefined;
+    setRuntimeState(unitId: string, state: 'initializing' | 'ready' | 'error'): void;
+    acceptsRuntime(unitId: string, runtimeId?: string): boolean;
+    /** Worker results may refresh derived names, but never replace mutation-owned configuration. */
+    updateDerivedConfig(unitId: string, subUnitId: string, pivotTableId: string, result: Nullable<IPivotTableConfig>, collection?: IFieldsCollectionJSON): boolean;
+    private _getDefaultFieldName;
+    private _getCalculationConfig;
+    updateDerivedMetadata(unitId: string, metadata?: IDataFieldManagerJSON, caches?: Record<string, ISheetsPivotCacheSnapshot>): void;
     private _initLocale;
     getTextInfo(): Record<string, string>;
     updateViewInfo(unitId: string, subUnitId: string, pivotTableId: string, valueMatrix: ObjectMatrix<Nullable<IPivotTableCellData>>, rangesCache: IPivotRangesInfo | undefined): void;
@@ -36,8 +63,26 @@ export declare class SheetsPivotTableConfigModel extends Disposable {
     getTargetByPivotId(unitId: string, subUnitId: string, pivotTableId: string): Nullable<IPivotCellPositionInfo>;
     getSubUnitPivotConfigs(unitId: string, subUnitId: string): Map<string, IPivotTableConfig> | undefined;
     updateConfigCache(unitId: string, subUnitId: string, pivotTableId: string, pivotTableConfig: Nullable<IPivotTableConfig>): void;
+    prepareConfigBatch(updates: readonly {
+        unitId: string;
+        subUnitId: string;
+        pivotTableId: string;
+        config: IPivotTableConfig;
+    }[]): {
+        commit(): void;
+        publish(): void;
+    };
+    applyConfigChange(scope: {
+        unitId: string;
+        subUnitId: string;
+        pivotTableId: string;
+    }, apply: (config: IPivotTableConfig) => void): boolean;
     getCollection(unitId: string, pivotTableId: string): IFieldsCollectionJSON | undefined;
     updateCollectionConfig(unitId: string, collectionConfig: IDataFieldManagerJSON): void;
+    updateCacheConfig(unitId: string, configs: Record<string, ISheetsPivotCacheSnapshot>): void;
+    setRetainedSources(unitId: string, pivotCacheIds: readonly string[]): void;
+    updateCollectionMetadata(unitId: string, reportId: string, collection: IFieldsCollectionJSON, cache?: ISheetsPivotCacheSnapshot): void;
+    removeCollectionMetadata(unitId: string, reportId: string): void;
     private _ensurePivotMap;
     private _ensurePivotTableRangeInfo;
     private _ensurePivotTableMatrixInfo;
@@ -63,3 +108,4 @@ export declare class SheetsPivotTableConfigModel extends Disposable {
     private _toJSON;
     private _initSnapshot;
 }
+export {};

package/lib/types/models/sheets-pivot-data-field-manager.d.ts

@@ -1,24 +1,30 @@
-import type { IDataFieldValue, IFieldsCollectionJSON, PivotSubtotalTypeEnum } from '@univerjs-pro/engine-pivot';
-import type { ICellData, IRange, IUnitRangeName, IUniverInstanceService, Nullable, ObjectMatrix, Styles, Worksheet } from '@univerjs/core';
+import type { IDataFieldValue, IFieldsCollectionJSON, IPivotTableRecordFilter, PivotSubtotalTypeEnum } from '@univerjs-pro/engine-pivot';
+import type { ICellData, IDisposable, IRange, IUnitRangeName, IUniverInstanceService, Nullable, ObjectMatrix, Styles, Worksheet } from '@univerjs/core';
 import type { IRuntimeUnitDataType } from '@univerjs/engine-formula';
+import { DataField, DataFieldManager, FieldsCollection } from '@univerjs-pro/engine-pivot';
+import { numfmt } from '@univerjs/core';
 import type { ICurrentDataMatrix, IDataFieldManagerJSON, IPivotCellPositionInfo, IPivotReportScope, IUnitRangeNameWithSubUnitId, IUpdateInfo } from '../const/type';
 import type { SheetsPivotDataSourceModel } from './sheets-pivot-data-source-model';
-import { DataField, DataFieldManager, FieldsCollection } from '@univerjs-pro/engine-pivot';
 interface IFeatureDirtyRangeType {
     [unitId: string]: Nullable<{
         [sheetId: string]: IRange[];
     }>;
 }
+type TPatternInfoRecord = Record<string, ReturnType<typeof numfmt.getFormatInfo>>;
 export declare class SheetsPivotDataFieldManager extends DataFieldManager {
+    compileRecordFilter(filter: IPivotTableRecordFilter): (value: IDataFieldValue) => boolean;
     /**
      * the key is pivot table id, the value is the data range info. those data range is one-to-one with the pivot table
      */
     rangeKeyMap: Record<string, string>;
     private _reportScopeMap;
+    private readonly _sourceFieldLeases;
     private _univerInstanceService;
-    _host: SheetsPivotDataSourceModel;
+    _host: SheetsPivotDataSourceModel | null;
     constructor(host: SheetsPivotDataSourceModel, univerInstanceService: IUniverInstanceService);
     initDataRanges(): void;
+    retainSourceFields(source: IUnitRangeNameWithSubUnitId): IDisposable;
+    getNoUsedDataFieldIds(excludeCollectionToken: string): string[];
     getAutoDisplayNameFunction(): (baseName: string, subtotalType: PivotSubtotalTypeEnum) => string;
     deleteDataField(dataFieldId: string): void;
     /**
@@ -44,6 +50,10 @@ export declare class SheetsPivotDataFieldManager extends DataFieldManager {
     getCollection(token: string): FieldsCollection;
     addCollection(token: string, collection: FieldsCollection, sourceRangeInfo: IUnitRangeNameWithSubUnitId, targetCellInfo?: IPivotCellPositionInfo, reportScope?: IPivotReportScope): void;
     handleMoveRange(token: string, sourceRangeInfo: IUnitRangeNameWithSubUnitId): void;
+    handleMoveRange(sources: readonly {
+        before: IUnitRangeNameWithSubUnitId;
+        after: IUnitRangeNameWithSubUnitId;
+    }[]): void;
     getPivotDirtyViewInfo(): {
         runtimeCellData: IRuntimeUnitDataType;
         dirtyRanges: IFeatureDirtyRangeType;
@@ -56,9 +66,10 @@ export declare class SheetsPivotDataFieldManager extends DataFieldManager {
      * @param unitDataMatrix the unit data matrix from runtime data
      * @param {number} rowIndex - the row index
      * @param {number} colIndex - the column index
-     * @returns {Nullable<ICellData>} the cell data
+     * @returns {Nullable<ICellData>} the resolved cell data
      */
     getMatrixValue(matrix: ObjectMatrix<Nullable<ICellData>>, arrayFormulaCellDataMatrix: ObjectMatrix<Nullable<ICellData>> | undefined, unitDataMatrix: ObjectMatrix<Nullable<ICellData>> | undefined, rowIndex: number, colIndex: number): Nullable<ICellData>;
+    private _getResolvedMatrixValue;
     refreshDataField(dataFieldId: string, dataRangeInfo: IUnitRangeNameWithSubUnitId, index: number, currentDataMatrix?: ICurrentDataMatrix): void;
     refreshData(collection: FieldsCollection, list: {
         index: number;
@@ -69,10 +80,10 @@ export declare class SheetsPivotDataFieldManager extends DataFieldManager {
      * - adjust sheet cell value to the type that pivot engine can recognize
      * @param {Nullable<ICellData>} cellData the cell data
      * @param {Styles} styles styles in the workbook
-     * @param {Record<string, any>} patternInfoRecord the pattern info record
+     * @param {TPatternInfoRecord} patternInfoRecord the pattern info record
      * @returns {IDataFieldValue} the value to add into the data field
      */
-    adjustSheetCellData(cellData: Nullable<ICellData>, styles: Styles, patternInfoRecord: Record<string, any>): IDataFieldValue;
+    adjustSheetCellData(cellData: Nullable<ICellData>, styles: Styles, patternInfoRecord: TPatternInfoRecord, isArrayFormulaCell?: boolean): IDataFieldValue;
     getRangeData(dataRangeInfo: IUnitRangeName): {
         header: (string | null)[];
         data: IDataFieldValue[][];

package/lib/types/models/sheets-pivot-data-source-model.d.ts

@@ -2,10 +2,11 @@ import type { DataField, FieldsCollection, IFieldsCollectionJSON, IPivotTableSna
 import type { IPivotCacheHandle } from '@univerjs-pro/pivot-cache';
 import type { IUnitRangeName, Nullable } from '@univerjs/core';
 import type { IMoveRangeMutationParams } from '@univerjs/sheets';
-import type { ICollectionChangeInfo, IDataFieldManagerJSON, IPivotCellPositionInfo, IPivotMutationDirtyViewInfo, IPivotReportScope, IPivotTableConfig, IPivotTableJson, IPivotWorkerItemCache, ISendPivotConfigLocalMutationParams, IUnitRangeNameWithSubUnitId, IUpdateInfo } from '../const/type';
-import type { IViewTranslateCtx } from './view-util';
 import { PivotTable } from '@univerjs-pro/engine-pivot';
 import { Disposable, ICommandService, Injector, IResourceManagerService, IUniverInstanceService, LifecycleService } from '@univerjs/core';
+import { IFeatureCalculationManagerService } from '@univerjs/engine-formula';
+import type { ICollectionChangeInfo, ICurrentDataMatrix, IDataFieldManagerJSON, IInitializePivotRuntimeParams, IPivotCellPositionInfo, IPivotMutationDirtyViewInfo, IPivotReportScope, IPivotTableConfig, IPivotTableJson, IPivotWorkerItemCache, ISendPivotConfigLocalMutationParams, IUnitRangeNameWithSubUnitId, IUpdateInfo } from '../const/type';
+import type { IViewTranslateCtx } from './view-util';
 import { PivotTableOperationEnum } from '../const/type';
 import { SheetsPivotCacheService } from '../services/sheets-pivot-cache.service';
 import { SheetsPivotDataFieldManager } from './sheets-pivot-data-field-manager';
@@ -16,7 +17,9 @@ export declare class SheetsPivotDataSourceModel extends Disposable {
     private readonly _commandService;
     private _resourceManagerService;
     private readonly _sheetsPivotCacheService;
+    private readonly _sourceCalculation?;
     private _model;
+    private readonly _runtimeUnits;
     private _pivotTableInstanceCache;
     private _viewData;
     private _viewTranslateContextCache;
@@ -33,6 +36,7 @@ export declare class SheetsPivotDataSourceModel extends Disposable {
     private _fieldsCollectionChange$;
     fieldsCollectionChange$: import("rxjs").Observable<Record<string, FieldsCollection>>;
     private _dataFieldManagerCollection;
+    private readonly _sourceLeases;
     needSameDeleteModel: {
         deleteUnitId: (unitId: string) => void;
     }[];
@@ -40,8 +44,11 @@ export declare class SheetsPivotDataSourceModel extends Disposable {
      * - this property is used to store the dirty pivot table collection which need to be marked dirty when mutations is executed
      */
     private _queryingMap;
-    constructor(_injector: Injector, _univerInstanceService: IUniverInstanceService, _lifecycleService: LifecycleService, _commandService: ICommandService, _resourceManagerService: IResourceManagerService, _sheetsPivotCacheService: SheetsPivotCacheService);
+    constructor(_injector: Injector, _univerInstanceService: IUniverInstanceService, _lifecycleService: LifecycleService, _commandService: ICommandService, _resourceManagerService: IResourceManagerService, _sheetsPivotCacheService: SheetsPivotCacheService, _sourceCalculation?: IFeatureCalculationManagerService | undefined);
     getTextInfo(): Record<string, string>;
+    getRuntimeId(unitId: string): string | undefined;
+    private _getRuntimeIds;
+    initializeRuntime(params: IInitializePivotRuntimeParams): boolean;
     setTextInfo(textInfo: Record<string, string>, direction: 'ltr' | 'rtl'): void;
     handleMoveRange(params: IMoveRangeMutationParams): void;
     broadcastCollectionChange(info: ICollectionChangeInfo): void;
@@ -78,6 +85,21 @@ export declare class SheetsPivotDataSourceModel extends Disposable {
     getPivotTableInstance(pivotTableId: string): PivotTable | undefined;
     getPivotCacheId(unitId: string, pivotTableId: string): string | undefined;
     getPivotCacheHandle(unitId: string, pivotTableId: string): IPivotCacheHandle | undefined;
+    /** Prepare owned report state and derived cell matrices without publishing partial reports. */
+    preparePivotBatch(updates: readonly {
+        unitId: string;
+        subUnitId: string;
+        pivotTableId: string;
+        pivot: PivotTable;
+        config: IPivotTableConfig;
+        view: PivotView;
+    }[]): {
+        commit(): void;
+        publish(): void;
+    };
+    acquireSource(unitId: string, pivotCacheId: string): IPivotCacheHandle;
+    /** Rebuild a retained source even when it has no surviving report collection. */
+    refreshSource(unitId: string, pivotCacheId: string, cycle?: object, matrix?: ICurrentDataMatrix): void;
     deleteUnitId(unitId: string): void;
     addCollectionByJSON(token: string, collectionJSON: IFieldsCollectionJSON, sourceRangeInfo: IUnitRangeNameWithSubUnitId, targetCellInfo?: IPivotCellPositionInfo, reportScope?: IPivotReportScope): IUpdateInfo;
     /**

package/lib/types/record-filter-bridge.d.ts

@@ -0,0 +1,9 @@
+import type { DataField, IDataFieldValue, IPivotTableRecordFilter } from '@univerjs-pro/engine-pivot';
+import type { RecordSelection } from '@univerjs/core';
+export declare function compilePivotRecordFilter(filter: IPivotTableRecordFilter): (value: IDataFieldValue) => boolean;
+export interface IPivotRecordFilterItemState {
+    checkedItems: string[];
+    partialItems: string[];
+}
+export declare function getPivotRecordFilterItemState(field: DataField, filter: IPivotTableRecordFilter): IPivotRecordFilterItemState;
+export declare function getSlicerSelectionFromPivotManualFilter(field: DataField, checkedItems: readonly string[], partialItems: readonly string[], current: RecordSelection, isAll: boolean): RecordSelection;

package/lib/types/services/sheets-pivot-cache.service.d.ts

@@ -1,14 +1,15 @@
 import type { DataFieldManager } from '@univerjs-pro/engine-pivot';
 import type { IPivotCacheHandle } from '@univerjs-pro/pivot-cache';
-import type { ISheetsPivotCacheSnapshot, IUnitRangeNameWithSubUnitId } from '../const/type';
+import type { IRange, Worksheet } from '@univerjs/core';
+import type { IMoveRangeMutationParams } from '@univerjs/sheets';
 import { Disposable, IUniverInstanceService } from '@univerjs/core';
+import type { ISheetsPivotCacheSnapshot, IUnitRangeNameWithSubUnitId } from '../const/type';
 export interface ISheetsPivotCacheRefreshPayload {
     dirtyFieldIds: readonly string[];
     previousFieldNames: Readonly<Record<string, string>>;
 }
 export interface ISheetsPivotCacheRefreshResult extends ISheetsPivotCacheRefreshPayload {
     pivotCacheId: string;
-    revision: number;
 }
 export declare class SheetsPivotCacheService extends Disposable {
     private readonly _univerInstanceService;
@@ -17,9 +18,18 @@ export declare class SheetsPivotCacheService extends Disposable {
     private readonly _reportBindings;
     private readonly _refreshCycleCache;
     constructor(_univerInstanceService: IUniverInstanceService);
+    getExistingCacheId(source: IUnitRangeNameWithSubUnitId, dataFieldManager: DataFieldManager): string | undefined;
+    updateSource(pivotCacheId: string, source: IUnitRangeNameWithSubUnitId): void;
+    moveSources(params: IMoveRangeMutationParams): {
+        pivotCacheId: string;
+        before: IUnitRangeNameWithSubUnitId;
+        after: IUnitRangeNameWithSubUnitId;
+    }[];
+    private _findCache;
     acquireForReport(reportUnitId: string, reportId: string, sourceRangeInfo: IUnitRangeNameWithSubUnitId, dataFieldManager: DataFieldManager, preferredPivotCacheId?: string): IPivotCacheHandle;
     releaseReport(reportUnitId: string, reportId: string): void;
-    acquireById(ownerUnitId: string, pivotCacheId: string): IPivotCacheHandle;
+    acquireById(ownerUnitId: string, pivotCacheId: string, retainSource?: boolean): IPivotCacheHandle;
+    getSourceRange(ownerUnitId: string, pivotCacheId: string): IUnitRangeNameWithSubUnitId | undefined;
     getReportPivotCacheId(reportUnitId: string, reportId: string): string | undefined;
     getReportHandle(reportUnitId: string, reportId: string): IPivotCacheHandle | undefined;
     toJSON(unitId: string): Record<string, ISheetsPivotCacheSnapshot>;
@@ -33,3 +43,5 @@ export declare class SheetsPivotCacheService extends Disposable {
     private _createHandle;
     private _deleteRecordIfUnused;
 }
+export declare function normalizeSourceRange(range: IRange, sheet: Worksheet): IRange;
+export declare function getMovedPivotSource(source: IUnitRangeNameWithSubUnitId, params: IMoveRangeMutationParams, sheetName: string): IUnitRangeNameWithSubUnitId | undefined;

package/lib/types/services/sheets-pivot-table.service.d.ts

@@ -7,9 +7,16 @@ export declare class SheetsPivotTableService extends Disposable {
     private _sheetsPivotTableAdaptorModel;
     private _localeService;
     readonly asyncInterceptor: AsyncInterceptorManager<{
+        PIVOT_MANUAL_FILTER_COORDINATION: import("@univerjs/core").IAsyncInterceptor<import("..").IPivotManualFilterCoordinationResult, import("..").IPivotManualFilterCoordinationParams>;
         PIVOT_PERFORM_CHECK: import("@univerjs/core").IAsyncInterceptor<boolean, IPivotPerformCheckParams>;
     }>;
     readonly interceptor: InterceptorManager<{
+        PIVOT_FIELD_REMOVE_COORDINATION: import("@univerjs/core").IInterceptor<string[], {
+            unitId: string;
+            subUnitId: string;
+            pivotTableId: string;
+            fieldIds: string[];
+        }>;
         PIVOT_MUTATION_GENERATE: import("@univerjs/core").IInterceptor<import("@univerjs/core").IUndoRedoCommandInfosByInterceptor, IPivotPerformCheckParams>;
     }>;
     constructor(_sheetInterceptorService: SheetInterceptorService, _sheetsPivotTableAdaptorModel: SheetsPivotTableAdaptorModel, _localeService: LocaleService);

package/lib/types/util.d.ts

@@ -1,9 +1,9 @@
 import type { ILabelViewHeaderMapItem, IPivotTableSnapshot, IPivotViewInfo, PivotTable, PivotView } from '@univerjs-pro/engine-pivot';
 import type { IAccessor, IMutationInfo, Injector, IObjectArrayPrimitiveType, IRange, Nullable } from '@univerjs/core';
 import type { ISetRangeValuesMutationParams } from '@univerjs/sheets';
-import type { IGetPivotDataLocalMutationParams, IPivotCellPositionInfo, IPivotPanelDataInfo, IPivotRangesInfo, IPivotRenderCache, IPivotTableCellData, IPivotTableConfig } from './const/type';
-import { PivotDateGroupFieldDateTypeEnum, PivotSubtotalTypeEnum, PivotTableFiledAreaEnum } from '@univerjs-pro/engine-pivot';
+import { PivotDateGroupFieldDateTypeEnum, PivotExcelDateGroupUnit, PivotSubtotalTypeEnum, PivotTableFiledAreaEnum } from '@univerjs-pro/engine-pivot';
 import { DateSystem, ObjectMatrix } from '@univerjs/core';
+import type { IGetPivotDataLocalMutationParams, IPivotCellPositionInfo, IPivotPanelDataInfo, IPivotRangesInfo, IPivotRenderCache, IPivotTableCellData, IPivotTableConfig } from './const/type';
 import { SheetsPivotDataSourceModel } from './models/sheets-pivot-data-source-model';
 export declare const generateDefaultEmptyCache: (textOptions: {
     filter: string;
@@ -25,7 +25,7 @@ export declare const generateDefaultEmptyCache: (textOptions: {
  * @param {PivotSubtotalTypeEnum} subtotalType the type of subtotal to be displayed for this value field.
  * @returns {string} the auto display name of the value field.
  */
-export declare function getAutoDisplayName(this: SheetsPivotDataSourceModel, baseName: string, subtotalType: PivotSubtotalTypeEnum): string;
+export declare function getAutoDisplayName(this: Pick<SheetsPivotDataSourceModel, 'getTextInfo'>, baseName: string, subtotalType: PivotSubtotalTypeEnum): string;
 export declare function getPivotCellInfo(row: number, col: number, cellInfo: Nullable<IPivotTableCellData>, pivotTable: PivotTable, pivotItemRenderCache: IPivotRenderCache): {
     filterId: string | undefined;
     info: Nullable<IPivotViewInfo>;
@@ -50,13 +50,7 @@ export declare function resolvePivotSheetCell(row: number, col: number, cellInfo
 export declare function resolvePivotValueFieldId(context: IPivotSheetCellContext, valueFieldIds: string[]): string | undefined;
 export declare function resolvePivotValueFilterTarget(context: IPivotSheetCellContext, fieldsConfig: IPivotTableSnapshot): IPivotValueFilterTarget | undefined;
 export declare function getPivotTableInfo(pivotTable: PivotTable, pivotTableId: string, config: IPivotTableConfig): IPivotPanelDataInfo;
-export declare function flattenObject(inject: Injector, obj: {
-    [key: string]: any;
-}, parentKey?: string, result?: {
-    [key: string]: any;
-}): {
-    [key: string]: any;
-};
+export declare function flattenObject(inject: Injector, obj: Record<string, unknown>, parentKey?: string, result?: Record<string, string>): Record<string, string>;
 export declare const unionPivotViewRange: (rangeInfo: IPivotRangesInfo | undefined) => IRange[];
 export declare function getPivotDrillDownData(injector: Injector, params: IGetPivotDataLocalMutationParams): {
     indexes: number[];
@@ -104,4 +98,4 @@ export declare function setConfigToPivotTable(pivotTable: PivotTable, config: IP
 export declare function resetPivotTable(pivotTable: PivotTable, area?: PivotTableFiledAreaEnum | undefined): void;
 export declare function findCommonDateType(maxExcelDate: number, minExcelDate: number): PivotDateGroupFieldDateTypeEnum;
 export declare function setPivotDateSystem(dateSystem: DateSystem | undefined): void;
-export declare function getDateGroupName(injector: Injector, dateType: PivotDateGroupFieldDateTypeEnum): string;
+export declare function getDateGroupName(injector: Injector, dateType: PivotDateGroupFieldDateTypeEnum | PivotExcelDateGroupUnit): string;