@univerjs/sheets 1.1.0 → 1.3.0

package/lib/types/controllers/auto-fill.controller.d.ts

@@ -31,6 +31,9 @@ export declare class AutoFillController extends Disposable {
     private _getCopyData;
     private _getEmptyCopyDataPiece;
     private _getMergeApplyData;
+    private _getFillCells;
+    private _prepareFillData;
+    private _getRemoveMergeMutations;
     private _fillData;
     private _shouldDisableSeries;
     private _getPreferredApplyType;

package/lib/types/controllers/permission/sheet-permission-check.controller.d.ts

@@ -15,10 +15,11 @@
  */
 import type { IPermissionTypes, IRange } from '@univerjs/core';
 import { Disposable, DisposableCollection, ICommandService, IPermissionService, IUniverInstanceService, LocaleService } from '@univerjs/core';
-import { IDefinedNamesService, LexerTreeBuilder } from '@univerjs/engine-formula';
+import { FormulaDataModel, IDefinedNamesService, IFunctionService, LexerTreeBuilder } from '@univerjs/engine-formula';
 import { RangeProtectionRuleModel } from '../../models/range-protection-rule.model';
-import { WorksheetProtectionRuleModel } from '../../services/permission/worksheet-permission';
-import { SheetsSelectionsService } from '../../services/selections';
+import { IAutoFillService } from '../../services/auto-fill/auto-fill.service';
+import { WorksheetProtectionRuleModel } from '../../services/permission/worksheet-permission/worksheet-permission-rule.model';
+import { SheetsSelectionsService } from '../../services/selections/selection.service';
 export declare class SheetPermissionCheckController extends Disposable {
     private readonly _commandService;
     private readonly _univerInstanceService;
@@ -29,10 +30,13 @@ export declare class SheetPermissionCheckController extends Disposable {
     private readonly _localeService;
     private readonly _lexerTreeBuilder;
     private readonly _definedNamesService;
+    private readonly _autoFillService;
+    private readonly _formulaDataModel;
+    private readonly _functionService;
     disposableCollection: DisposableCollection;
     private _triggerPermissionUIEvent$;
     triggerPermissionUIEvent$: import("rxjs").Observable<string>;
-    constructor(_commandService: ICommandService, _univerInstanceService: IUniverInstanceService, _permissionService: IPermissionService, _selectionManagerService: SheetsSelectionsService, _rangeProtectionRuleModel: RangeProtectionRuleModel, _worksheetProtectionRuleModel: WorksheetProtectionRuleModel, _localeService: LocaleService, _lexerTreeBuilder: LexerTreeBuilder, _definedNamesService: IDefinedNamesService);
+    constructor(_commandService: ICommandService, _univerInstanceService: IUniverInstanceService, _permissionService: IPermissionService, _selectionManagerService: SheetsSelectionsService, _rangeProtectionRuleModel: RangeProtectionRuleModel, _worksheetProtectionRuleModel: WorksheetProtectionRuleModel, _localeService: LocaleService, _lexerTreeBuilder: LexerTreeBuilder, _definedNamesService: IDefinedNamesService, _autoFillService: IAutoFillService, _formulaDataModel: FormulaDataModel, _functionService: IFunctionService);
     private _initialize;
     private _commandExecutedListener;
     blockExecuteWithoutPermission(errorMsg: string): void;
@@ -40,6 +44,8 @@ export declare class SheetPermissionCheckController extends Disposable {
     permissionCheckWithRanges(permissionTypes: IPermissionTypes, selectionRanges?: IRange[], unitId?: string, subUnitId?: string): boolean;
     permissionCheckWithoutRange(permissionTypes: IPermissionTypes, unitId?: string, subUnitId?: string): boolean;
     private _permissionCheckWithFormula;
+    private _getFormulaReferenceWorkbook;
+    private _permissionCheckFormulaReferences;
     private _permissionCheckBySetRangeValue;
     private _permissionCheckByMoveRowsColsCommand;
     private _permissionCheckByMoveRangeCommand;

package/lib/types/models/range-theme-model.d.ts

@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 import type { IRange, Nullable } from '@univerjs/core';
-import type { IRangeThemeStyleItem, IRangeThemeStyleJSON } from './range-theme-util';
 import { Disposable, IResourceManagerService, IUniverInstanceService } from '@univerjs/core';
+import { ISheetRowFilteredService } from '@univerjs/engine-formula';
+import type { IRangeThemeStyleItem, IRangeThemeStyleJSON } from './range-theme-util';
 import { SheetInterceptorService } from '../services/sheet-interceptor/sheet-interceptor.service';
 import { RangeThemeStyle } from './range-theme-util';
 export interface IRangeThemeRangeInfo {
@@ -35,6 +36,7 @@ export declare class SheetRangeThemeModel extends Disposable {
     private _sheetInterceptorService;
     private _resourceManagerService;
     private readonly _univerInstanceService;
+    private readonly _sheetRowFilteredService?;
     private _rangeThemeStyleMap;
     private _rangeThemeStyleRuleMap;
     private _rTreeCollection;
@@ -49,7 +51,7 @@ export declare class SheetRangeThemeModel extends Disposable {
         type: "add" | "remove";
         styleName: string;
     }>;
-    constructor(_sheetInterceptorService: SheetInterceptorService, _resourceManagerService: IResourceManagerService, _univerInstanceService: IUniverInstanceService);
+    constructor(_sheetInterceptorService: SheetInterceptorService, _resourceManagerService: IResourceManagerService, _univerInstanceService: IUniverInstanceService, _sheetRowFilteredService?: ISheetRowFilteredService | undefined);
     private _initDefaultTheme;
     private _ensureRangeThemeStyleMap;
     private _ensureRangeThemeStyleRuleMap;

package/lib/types/services/auto-fill/auto-fill.service.d.ts

@@ -15,8 +15,8 @@
  */
 import type { IDisposable, IRange, Nullable } from '@univerjs/core';
 import type { Observable } from 'rxjs';
-import type { IAutoFillLocation, IAutoFillRule, ISheetAutoFillHook } from './type';
 import { Direction, Disposable, ICommandService, Injector, IUndoRedoService, IUniverInstanceService } from '@univerjs/core';
+import type { IAutoFillLocation, IAutoFillRule, ISheetAutoFillHook } from './type';
 import { AUTO_FILL_APPLY_TYPE } from './type';
 export interface IAutoFillService {
     applyType$: Observable<AUTO_FILL_APPLY_TYPE>;
@@ -34,7 +34,7 @@ export interface IAutoFillService {
     setFillingStyle(isFillingStyle: boolean): void;
     registerRule(rule: IAutoFillRule): void;
     getAllHooks(): ISheetAutoFillHook[];
-    getActiveHooks(): ISheetAutoFillHook[];
+    getActiveHooks(applyType?: AUTO_FILL_APPLY_TYPE): ISheetAutoFillHook[];
     addHook(hook: ISheetAutoFillHook): IDisposable;
     fillData(applyType: AUTO_FILL_APPLY_TYPE): boolean;
     triggerAutoFill(unitId: string, subUnitId: string, source: IRange, target: IRange, manualApplyType?: AUTO_FILL_APPLY_TYPE): Promise<boolean>;
@@ -71,7 +71,7 @@ export declare class AutoFillService extends Disposable implements IAutoFillServ
     registerRule(rule: IAutoFillRule): void;
     getRules(): IAutoFillRule[];
     getAllHooks(): ISheetAutoFillHook[];
-    getActiveHooks(): ISheetAutoFillHook[];
+    getActiveHooks(applyType?: AUTO_FILL_APPLY_TYPE): ISheetAutoFillHook[];
     get applyType(): AUTO_FILL_APPLY_TYPE;
     set applyType(type: AUTO_FILL_APPLY_TYPE);
     get menu(): IApplyMenuItem[];

package/lib/types/services/auto-fill/type.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import type { Direction, IAccessor, ICellData, IMutationInfo, IObjectMatrixPrimitiveType, Nullable } from '@univerjs/core';
-import type { IDiscreteRange } from '../../basics';
+import type { IDiscreteRange } from '../../basics/interfaces/selection-config';
 export declare enum AUTO_FILL_APPLY_TYPE {
     COPY = "COPY",
     SERIES = "SERIES",
@@ -50,11 +50,18 @@ export interface ISheetAutoFillHook {
     bindUnit?: string;
     disable?: (location: IAutoFillLocation, direction: Direction, applyType: AUTO_FILL_APPLY_TYPE) => boolean;
     onBeforeFillData?(location: IAutoFillLocation, direction: Direction): AUTO_FILL_APPLY_TYPE | void;
+    /** Prepare and validate without mutations; the returned callback captures undo data after reverting a previous fill. */
+    onPrepareFillData?(location: IAutoFillLocation, direction: Direction, applyType: AUTO_FILL_APPLY_TYPE): () => {
+        undos: IMutationInfo[];
+        redos: IMutationInfo[];
+    };
     onFillData?(location: IAutoFillLocation, direction: Direction, applyType: AUTO_FILL_APPLY_TYPE): {
         undos: IMutationInfo[];
         redos: IMutationInfo[];
     };
     onAfterFillData?(location: IAutoFillLocation, direction: Direction, applyType: AUTO_FILL_APPLY_TYPE): boolean | void;
+    /** Validate proposed values before reverting or applying any fill mutations. Throw to reject the entire fill. */
+    onValidateFillData?(location: IAutoFillLocation, direction: Direction, applyType: AUTO_FILL_APPLY_TYPE, cellValue: IObjectMatrixPrimitiveType<Nullable<ICellData>>): void;
     onBeforeSubmit?: (location: IAutoFillLocation, direction: Direction, applyType: AUTO_FILL_APPLY_TYPE, cellValue: IObjectMatrixPrimitiveType<Nullable<ICellData>>) => void;
 }
 export type IAutoFillCopyDataInTypeIndexInfo = number[];