@univerjs/sheets 1.1.0 → 1.3.0

package/lib/cjs/index.js

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 let _univerjs_core = require("@univerjs/core");
-let rxjs = require("rxjs");
 let _univerjs_engine_formula = require("@univerjs/engine-formula");
+let rxjs = require("rxjs");
 let _univerjs_engine_render = require("@univerjs/engine-render");
 let _univerjs_protocol = require("@univerjs/protocol");
 let rxjs_operators = require("rxjs/operators");
@@ -1201,11 +1201,12 @@ var ZebraCrossingCache = class {
 //#region src/models/range-theme-model.ts
 const SHEET_RANGE_THEME_MODEL_PLUGIN = "SHEET_RANGE_THEME_MODEL_PLUGIN";
 let SheetRangeThemeModel = class SheetRangeThemeModel extends _univerjs_core.Disposable {
-	constructor(_sheetInterceptorService, _resourceManagerService, _univerInstanceService) {
+	constructor(_sheetInterceptorService, _resourceManagerService, _univerInstanceService, _sheetRowFilteredService) {
 		super();
 		this._sheetInterceptorService = _sheetInterceptorService;
 		this._resourceManagerService = _resourceManagerService;
 		this._univerInstanceService = _univerInstanceService;
+		this._sheetRowFilteredService = _sheetRowFilteredService;
 		_defineProperty(this, "_rangeThemeStyleMap", /* @__PURE__ */ new Map());
 		_defineProperty(this, "_rangeThemeStyleRuleMap", /* @__PURE__ */ new Map());
 		_defineProperty(this, "_rTreeCollection", /* @__PURE__ */ new Map());
@@ -1260,8 +1261,11 @@ let SheetRangeThemeModel = class SheetRangeThemeModel extends _univerjs_core.Dis
 			if (sheet) {
 				const rowCount = sheet.getRowCount();
 				const rowManager = sheet.getRowManager();
-				for (let i = 1; i <= rowCount; i++) if (!sheet.getRowVisible(i)) set.add(i);
-				else if (rowManager.getRowHeight(i) === 0) set.add(i);
+				for (let i = 0; i < rowCount; i++) if (!sheet.getRowVisible(i)) set.add(i);
+				else {
+					var _this$_sheetRowFilter;
+					if (rowManager.getRowHeight(i) === 0 || ((_this$_sheetRowFilter = this._sheetRowFilteredService) === null || _this$_sheetRowFilter === void 0 ? void 0 : _this$_sheetRowFilter.getRowFiltered(unitId, subUnitId, i))) set.add(i);
+				}
 			}
 		}
 	}
@@ -1427,8 +1431,11 @@ let SheetRangeThemeModel = class SheetRangeThemeModel extends _univerjs_core.Dis
 				const offsetRow = row - rangeInfo.range.startRow;
 				const offsetCol = col - rangeInfo.range.startColumn;
 				const theme = this.getRangeThemeStyle(unitId, themeName);
+				let lastVisibleRow = rangeInfo.range.endRow;
+				const hiddenRows = this._getSheetRowVisibleFuncSet(unitId, subUnitId);
+				while (lastVisibleRow >= rangeInfo.range.startRow && hiddenRows.has(lastVisibleRow)) lastVisibleRow--;
 				const isToggled = this._ensureZebraCrossingCache(unitId, subUnitId, themes[0]).getIsToggled(row);
-				if (theme) return theme.getStyle(offsetRow, offsetCol, row === rangeInfo.range.endRow, col === rangeInfo.range.endColumn, isToggled);
+				if (theme) return theme.getStyle(offsetRow, offsetCol, row === lastVisibleRow, col === rangeInfo.range.endColumn, isToggled);
 			}
 		}
 	}
@@ -1527,7 +1534,8 @@ let SheetRangeThemeModel = class SheetRangeThemeModel extends _univerjs_core.Dis
 SheetRangeThemeModel = __decorate([
 	__decorateParam(0, (0, _univerjs_core.Inject)(SheetInterceptorService)),
 	__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_core.IResourceManagerService)),
-	__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_core.IUniverInstanceService))
+	__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_core.IUniverInstanceService)),
+	__decorateParam(3, (0, _univerjs_core.Optional)(_univerjs_engine_formula.ISheetRowFilteredService))
 ], SheetRangeThemeModel);
 
 //#endregion
@@ -1607,6 +1615,7 @@ const InsertRowMutation = {
 		const { worksheet } = target;
 		const rowManager = worksheet.getRowManager();
 		const { range, rowInfo } = params;
+		if (rowInfo && !Object.values(rowInfo).every(_univerjs_core.isValidRowDimensions)) return false;
 		const { startRow, endRow } = range;
 		rowManager.insertRowsWithData(startRow, endRow, rowInfo);
 		const insertedRowCount = endRow - startRow + 1;
@@ -1632,6 +1641,7 @@ const InsertColMutation = {
 		const { worksheet } = target;
 		const columnManager = worksheet.getColumnManager();
 		const { range, colInfo } = params;
+		if (colInfo && !Object.values(colInfo).every(_univerjs_core.isValidColumnDimensions)) return false;
 		const { startColumn, endColumn } = range;
 		columnManager.insertColumnsWithData(startColumn, endColumn, colInfo);
 		const insertedColumnCount = endColumn - startColumn + 1;
@@ -1966,6 +1976,7 @@ const SetColDataMutation = {
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
 		const { columnData } = params;
+		if (!Object.values(columnData).every(_univerjs_core.isValidColumnDimensions)) return false;
 		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
 		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
@@ -2407,7 +2418,10 @@ const overwriteCellPropertiesSet = /* @__PURE__ */ new Set([
 	"fd"
 ]);
 function mergeCellData(newValue, oldValue, styles, isOverrideStyle = false) {
-	const type = getCellType(styles, newValue, oldValue);
+	var _previousStyle$n, _styles$getStyleByCel;
+	const canPreserveValue = newValue.v === void 0 && newValue.t === void 0 && oldValue.t != null;
+	const previousStyle = canPreserveValue ? styles.getStyleByCell(oldValue) : void 0;
+	const type = canPreserveValue ? oldValue.t : getCellType(styles, newValue, oldValue);
 	Object.keys(newValue).forEach((key) => {
 		const cellPropertyKey = key;
 		if (overwriteCellPropertiesSet.has(cellPropertyKey)) {
@@ -2424,9 +2438,14 @@ function mergeCellData(newValue, oldValue, styles, isOverrideStyle = false) {
 		delete oldValue.ft;
 		delete oldValue.fd;
 	}
-	if (oldValue.v !== void 0) {
-		oldValue.t = type;
-		oldValue.v = getCellValue(type, oldValue);
+	const numberFormatChanged = canPreserveValue && (previousStyle === null || previousStyle === void 0 || (_previousStyle$n = previousStyle.n) === null || _previousStyle$n === void 0 ? void 0 : _previousStyle$n.pattern) !== ((_styles$getStyleByCel = styles.getStyleByCell(oldValue)) === null || _styles$getStyleByCel === void 0 || (_styles$getStyleByCel = _styles$getStyleByCel.n) === null || _styles$getStyleByCel === void 0 ? void 0 : _styles$getStyleByCel.pattern);
+	if (oldValue.v !== void 0 && (!canPreserveValue || numberFormatChanged)) {
+		const nextType = numberFormatChanged ? getCellType(styles, newValue, {
+			...oldValue,
+			s: previousStyle
+		}) : type;
+		oldValue.t = nextType;
+		oldValue.v = getCellValue(nextType, oldValue);
 	}
 	if (oldValue.v === null) {
 		delete oldValue.t;
@@ -2473,6 +2492,7 @@ const SetRowDataMutation = {
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
 		const { rowData } = params;
+		if (!Object.values(rowData).every(_univerjs_core.isValidRowDimensions)) return false;
 		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
 		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
@@ -2577,6 +2597,8 @@ const SetWorksheetColWidthMutation = {
 		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
 		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
+		const dimensions = params.colWidth;
+		if (typeof dimensions === "number" ? !(0, _univerjs_core.isValidSheetDimension)(dimensions) : dimensions == null || typeof dimensions !== "object" || Object.values(dimensions).some((value) => value != null && !(0, _univerjs_core.isValidSheetDimension)(value))) return false;
 		const { worksheet } = target;
 		const manager = worksheet.getColumnManager();
 		const ranges = params.ranges;
@@ -2721,6 +2743,8 @@ const SetWorksheetRowHeightMutation = {
 		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
 		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
+		const dimensions = params.rowHeight;
+		if (typeof dimensions === "number" ? !(0, _univerjs_core.isValidSheetDimension)(dimensions) : dimensions == null || typeof dimensions !== "object" || Object.values(dimensions).some((value) => value != null && !(0, _univerjs_core.isValidSheetDimension)(value))) return false;
 		const { worksheet } = target;
 		const manager = worksheet.getRowManager();
 		for (const { startRow, endRow } of ranges) for (let rowIndex = startRow; rowIndex <= endRow; rowIndex++) if (typeof rowHeight === "number") manager.setRowHeight(rowIndex, rowHeight);
@@ -2750,6 +2774,7 @@ const SetWorksheetRowAutoHeightMutation = {
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
 		const { rowsAutoHeightInfo } = params;
+		if (rowsAutoHeightInfo.some(({ autoHeight }) => autoHeight != null && !(0, _univerjs_core.isValidSheetDimension)(autoHeight))) return false;
 		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
 		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
@@ -11972,6 +11997,7 @@ let AutoFillService = class AutoFillService extends _univerjs_core.Disposable {
 			direction = _univerjs_core.Direction.RIGHT;
 			target.startColumn = source.endColumn + 1;
 		} else return false;
+		this.setShowMenu(false);
 		this.direction = direction;
 		const autoFillSource = this._injector.invoke((accessor) => rangeToDiscreteRange(source, accessor, unitId, subUnitId));
 		const autoFillTarget = this._injector.invoke((accessor) => rangeToDiscreteRange(target, accessor, unitId, subUnitId));
@@ -12024,7 +12050,7 @@ let AutoFillService = class AutoFillService extends _univerjs_core.Disposable {
 	getAllHooks() {
 		return this._hooks;
 	}
-	getActiveHooks() {
+	getActiveHooks(applyType = this.applyType) {
 		const { source, target, unitId, subUnitId } = this.autoFillLocation || {};
 		if (!source || !target || !unitId || !subUnitId) return [];
 		const enabledHooks = this._hooks.filter((h) => {
@@ -12034,7 +12060,7 @@ let AutoFillService = class AutoFillService extends _univerjs_core.Disposable {
 				target,
 				unitId,
 				subUnitId
-			}, this._direction, this.applyType)) === true;
+			}, this._direction, applyType)) === true;
 		});
 		const onlyHooks = enabledHooks.filter((h) => h.type === "ONLY");
 		if (onlyHooks.length > 0) return this._getOneByPriority(onlyHooks);
@@ -12083,7 +12109,6 @@ let AutoFillService = class AutoFillService extends _univerjs_core.Disposable {
 	}
 	fillData(applyType) {
 		var _activeWorkbook$getAc;
-		this.applyType = applyType;
 		const activeWorkbook = this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		const activeUnitId = activeWorkbook === null || activeWorkbook === void 0 ? void 0 : activeWorkbook.getUnitId();
 		const activeSubUnitId = activeWorkbook === null || activeWorkbook === void 0 || (_activeWorkbook$getAc = activeWorkbook.getActiveSheet()) === null || _activeWorkbook$getAc === void 0 ? void 0 : _activeWorkbook$getAc.getSheetId();
@@ -12094,12 +12119,30 @@ let AutoFillService = class AutoFillService extends _univerjs_core.Disposable {
 		const worksheet = workbook.getSheetBySheetId(subUnitId);
 		if (!worksheet) return false;
 		const direction = this.direction;
+		const activeHooks = this.getActiveHooks(applyType);
+		const fillCallbacks = activeHooks.map((hook) => {
+			var _hook$onPrepareFillDa;
+			return ((_hook$onPrepareFillDa = hook.onPrepareFillData) === null || _hook$onPrepareFillDa === void 0 ? void 0 : _hook$onPrepareFillDa.call(hook, {
+				source,
+				target,
+				unitId,
+				subUnitId
+			}, direction, applyType)) ?? (() => {
+				var _hook$onFillData;
+				return (_hook$onFillData = hook.onFillData) === null || _hook$onFillData === void 0 ? void 0 : _hook$onFillData.call(hook, {
+					source,
+					target,
+					unitId,
+					subUnitId
+				}, direction, applyType);
+			});
+		});
+		this.applyType = applyType;
 		if (this._prevUndos.length > 0) this._prevUndos.forEach((undo) => {
 			this._commandService.syncExecuteCommand(undo.id, undo.params);
 		});
 		this._prevUndos = [];
 		const selection = _univerjs_core.Rectangle.union(discreteRangeToRange(source), discreteRangeToRange(target));
-		const activeHooks = this.getActiveHooks();
 		if (unitId === activeUnitId && subUnitId === activeSubUnitId) this._commandService.syncExecuteCommand(SetSelectionsOperation.id, {
 			selections: [{
 				primary: getPrimaryForRange({
@@ -12118,14 +12161,8 @@ let AutoFillService = class AutoFillService extends _univerjs_core.Disposable {
 		});
 		const undos = [];
 		const redos = [];
-		activeHooks.forEach((hook) => {
-			var _hook$onFillData;
-			const { undos: hookUndos, redos: hookRedos } = ((_hook$onFillData = hook.onFillData) === null || _hook$onFillData === void 0 ? void 0 : _hook$onFillData.call(hook, {
-				source,
-				target,
-				unitId,
-				subUnitId
-			}, direction, applyType)) || {};
+		fillCallbacks.forEach((fill) => {
+			const { undos: hookUndos, redos: hookRedos } = fill() || {};
 			if (hookUndos) undos.push(...hookUndos);
 			if (hookRedos) redos.push(...hookRedos);
 		});
@@ -13664,10 +13701,36 @@ const SetSpecificColsVisibleCommand = {
 		});
 		if (!target) return false;
 		const { worksheet } = target;
+		const zeroWidthRanges = [];
+		for (const range of ranges) for (let column = range.startColumn; column <= range.endColumn; column++) if (worksheet.getColVisible(column) && worksheet.getColumnWidth(column) === 0) zeroWidthRanges.push({
+			...range,
+			startColumn: column,
+			endColumn: column
+		});
+		const widthRanges = _univerjs_core.Rectangle.mergeRanges(zeroWidthRanges);
+		const visibilityRanges = widthRanges.length ? getHiddenColRanges(worksheet, ranges) : ranges;
+		const widthRedos = [];
+		const widthUndos = [];
+		if (widthRanges.length) {
+			const widthParams = {
+				unitId,
+				subUnitId,
+				ranges: widthRanges,
+				colWidth: worksheet.getConfig().defaultColumnWidth
+			};
+			widthRedos.push({
+				id: SetWorksheetColWidthMutation.id,
+				params: widthParams
+			});
+			widthUndos.push({
+				id: SetWorksheetColWidthMutation.id,
+				params: SetWorksheetColWidthMutationFactory(widthParams, worksheet)
+			});
+		}
 		const redoMutationParams = {
 			unitId,
 			subUnitId,
-			ranges
+			ranges: visibilityRanges
 		};
 		const setSelectionOperationParams = {
 			unitId,
@@ -13689,13 +13752,23 @@ const SetSpecificColsVisibleCommand = {
 				style: null
 			}))
 		};
-		const result = (0, _univerjs_core.sequenceExecute)([{
+		const visibilityRedos = visibilityRanges.length ? [{
 			id: SetColVisibleMutation.id,
 			params: redoMutationParams
-		}, {
-			id: SetSelectionsOperation.id,
-			params: setSelectionOperationParams
-		}], commandService);
+		}] : [];
+		const visibilityUndos = visibilityRanges.length ? [{
+			id: SetColHiddenMutation.id,
+			params: undoMutationParams
+		}] : [];
+		const result = (0, _univerjs_core.sequenceExecute)([
+			...visibilityRedos,
+			...widthRedos,
+			{
+				id: SetSelectionsOperation.id,
+				params: setSelectionOperationParams
+			}
+		], commandService);
+		if (!result.result) return false;
 		const intercepted = sheetInterceptorService.onCommandExecute({
 			id: SetSpecificColsVisibleCommand.id,
 			params
@@ -13710,10 +13783,8 @@ const SetSpecificColsVisibleCommand = {
 			accessor.get(_univerjs_core.IUndoRedoService).pushUndoRedo({
 				unitID: unitId,
 				undoMutations: [
-					{
-						id: SetColHiddenMutation.id,
-						params: undoMutationParams
-					},
+					...widthUndos,
+					...visibilityUndos,
 					{
 						id: SetSelectionsOperation.id,
 						params: undoSetSelectionsOperationParams
@@ -13723,10 +13794,8 @@ const SetSpecificColsVisibleCommand = {
 				],
 				redoMutations: [
 					...intercepted.preRedos ?? [],
-					{
-						id: SetColVisibleMutation.id,
-						params: redoMutationParams
-					},
+					...visibilityRedos,
+					...widthRedos,
 					{
 						id: SetSelectionsOperation.id,
 						params: setSelectionOperationParams
@@ -14396,10 +14465,36 @@ const SetSpecificRowsVisibleCommand = {
 		});
 		if (!target) return false;
 		const { worksheet } = target;
+		const zeroHeightRanges = [];
+		for (const range of ranges) for (let row = range.startRow; row <= range.endRow; row++) if (worksheet.getRowVisible(row) && worksheet.getRowHeight(row) === 0) zeroHeightRanges.push({
+			...range,
+			startRow: row,
+			endRow: row
+		});
+		const heightRanges = _univerjs_core.Rectangle.mergeRanges(zeroHeightRanges);
+		const visibilityRanges = heightRanges.length ? getHiddenRowRanges(worksheet, ranges) : ranges;
+		const heightRedos = [];
+		const heightUndos = [];
+		if (heightRanges.length) {
+			const heightParams = {
+				unitId,
+				subUnitId,
+				ranges: heightRanges,
+				rowHeight: worksheet.getConfig().defaultRowHeight
+			};
+			heightRedos.push({
+				id: SetWorksheetRowHeightMutation.id,
+				params: heightParams
+			});
+			heightUndos.push({
+				id: SetWorksheetRowHeightMutation.id,
+				params: SetWorksheetRowHeightMutationFactory(heightParams, worksheet)
+			});
+		}
 		const redoMutationParams = {
 			unitId,
 			subUnitId,
-			ranges
+			ranges: visibilityRanges
 		};
 		const setSelectionOperationParams = {
 			unitId,
@@ -14421,13 +14516,23 @@ const SetSpecificRowsVisibleCommand = {
 				style: null
 			}))
 		};
-		const result = (0, _univerjs_core.sequenceExecute)([{
+		const visibilityRedos = visibilityRanges.length ? [{
 			id: SetRowVisibleMutation.id,
 			params: redoMutationParams
-		}, {
-			id: SetSelectionsOperation.id,
-			params: setSelectionOperationParams
-		}], commandService);
+		}] : [];
+		const visibilityUndos = visibilityRanges.length ? [{
+			id: SetRowHiddenMutation.id,
+			params: undoMutationParams
+		}] : [];
+		const result = (0, _univerjs_core.sequenceExecute)([
+			...visibilityRedos,
+			...heightRedos,
+			{
+				id: SetSelectionsOperation.id,
+				params: setSelectionOperationParams
+			}
+		], commandService);
+		if (!result.result) return false;
 		const intercepted = sheetInterceptorService.onCommandExecute({
 			id: SetSpecificRowsVisibleCommand.id,
 			params
@@ -14443,10 +14548,8 @@ const SetSpecificRowsVisibleCommand = {
 				unitID: unitId,
 				undoMutations: [
 					...intercepted.preUndos ?? [],
-					{
-						id: SetRowHiddenMutation.id,
-						params: undoMutationParams
-					},
+					...heightUndos,
+					...visibilityUndos,
 					{
 						id: SetSelectionsOperation.id,
 						params: undoSetSelectionsOperationParams
@@ -14456,10 +14559,8 @@ const SetSpecificRowsVisibleCommand = {
 				],
 				redoMutations: [
 					...intercepted.preRedos ?? [],
-					{
-						id: SetRowVisibleMutation.id,
-						params: redoMutationParams
-					},
+					...visibilityRedos,
+					...heightRedos,
 					{
 						id: SetSelectionsOperation.id,
 						params: setSelectionOperationParams
@@ -14870,6 +14971,7 @@ const DeltaColumnWidthCommand = {
 		const { worksheet, unitId, subUnitId } = target;
 		const { anchorCol, deltaX } = params;
 		const destColumnWidth = worksheet.getColumnWidth(anchorCol) + deltaX;
+		if (!(0, _univerjs_core.isValidSheetDimension)(destColumnWidth)) return false;
 		const isAllSheetRange = selections.length === 1 && selections[0].range.rangeType === _univerjs_core.RANGE_TYPE.ALL;
 		const colSelections = selections.filter((s) => s.range.rangeType === _univerjs_core.RANGE_TYPE.COLUMN);
 		const rangeType = isAllSheetRange ? _univerjs_core.RANGE_TYPE.ALL : colSelections.some(({ range }) => {
@@ -14965,6 +15067,7 @@ const SetColWidthCommand = {
 	id: "sheet.command.set-worksheet-col-width",
 	handler: (accessor, params) => {
 		var _params$ranges, _selectionManagerServ;
+		if (!(0, _univerjs_core.isValidSheetDimension)(params === null || params === void 0 ? void 0 : params.value)) return false;
 		const selectionManagerService = accessor.get(SheetsSelectionsService);
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
@@ -16625,6 +16728,7 @@ const DeltaRowHeightCommand = {
 		const { worksheet, subUnitId, unitId } = target;
 		const { anchorRow, deltaY } = params;
 		const destRowHeight = worksheet.getRowHeight(anchorRow) + deltaY;
+		if (!(0, _univerjs_core.isValidSheetDimension)(destRowHeight)) return false;
 		const isAllSheetRange = selections.length === 1 && selections[0].range.rangeType === _univerjs_core.RANGE_TYPE.ALL;
 		const rowSelections = selections.filter((s) => s.range.rangeType === _univerjs_core.RANGE_TYPE.ROW);
 		const rangeType = isAllSheetRange ? _univerjs_core.RANGE_TYPE.ALL : rowSelections.some(({ range }) => {
@@ -16729,6 +16833,7 @@ const SetRowHeightCommand = {
 	id: "sheet.command.set-row-height",
 	handler: (accessor, params) => {
 		var _params$ranges, _selectionManagerServ;
+		if (!(0, _univerjs_core.isValidSheetDimension)(params === null || params === void 0 ? void 0 : params.value)) return false;
 		const selectionManagerService = accessor.get(SheetsSelectionsService);
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
@@ -17473,8 +17578,9 @@ let AutoFillController = class AutoFillController extends _univerjs_core.Disposa
 			onBeforeFillData: (location, direction) => {
 				return this._presetAndCacheData(location, direction);
 			},
-			onFillData: (location, direction, applyType) => {
-				return this._fillData(location, direction, applyType);
+			onPrepareFillData: (location, direction, applyType) => {
+				const prepared = this._prepareFillData(location, direction, applyType);
+				return () => this._fillData(location, direction, applyType, prepared);
 			}
 		}));
 	}
@@ -17523,7 +17629,7 @@ let AutoFillController = class AutoFillController extends _univerjs_core.Disposa
 				const arrData = this._applyFunctions(copySquad, len, direction, applyType, customApplyFunctions, copyDataPiece, location);
 				const arrIndex = getDataIndex(csLen, asLen, copySquad.index);
 				applyDataInTypes[type].push({
-					data: arrData,
+					data: arrData ?? [],
 					index: arrIndex
 				});
 			});
@@ -17682,28 +17788,9 @@ let AutoFillController = class AutoFillController extends _univerjs_core.Disposa
 		}
 		return applyMergeRanges;
 	}
-	_fillData(location, direction, applyType) {
-		var _this$_univerInstance4;
-		const undos = [];
-		const redos = [];
-		let hasStyle = true;
-		if (applyType === "NO_FORMAT") {
-			hasStyle = false;
-			applyType = "SERIES";
-		}
-		const { source, target, unitId, subUnitId } = location;
-		if (!source || !target || direction == null) return {
-			undos,
-			redos
-		};
-		const sourceRange = discreteRangeToRange(source);
-		const targetRange = discreteRangeToRange(target);
-		const { cols: targetCols, rows: targetRows } = target;
-		const { cols: sourceCols, rows: sourceRows } = source;
-		const copyData = this._copyData;
-		let csLen;
-		if (direction === _univerjs_core.Direction.DOWN || direction === _univerjs_core.Direction.UP) csLen = sourceRows.length;
-		else csLen = sourceCols.length;
+	_getFillCells(location, direction, applyType, hasStyle, csLen) {
+		const { rows: targetRows, cols: targetCols } = location.target;
+		const copyData = _univerjs_core.Tools.deepClone(this._copyData);
 		const applyDatas = [];
 		if (direction === _univerjs_core.Direction.DOWN || direction === _univerjs_core.Direction.UP) {
 			const asLen = targetRows.length;
@@ -17734,20 +17821,26 @@ let AutoFillController = class AutoFillController extends _univerjs_core.Disposa
 				applyDatas.push(row);
 			});
 		}
-		let applyMergeRanges = [];
+		return applyDatas;
+	}
+	_prepareFillData(location, direction, applyType) {
+		var _this$_univerInstance4;
+		const hasStyle = applyType !== "NO_FORMAT";
+		const effectiveApplyType = hasStyle ? applyType : "SERIES";
+		const { source, target, unitId } = location;
+		const sourceRange = discreteRangeToRange(source);
+		const targetRange = discreteRangeToRange(target);
+		const { cols: targetCols, rows: targetRows } = target;
+		const { cols: sourceCols, rows: sourceRows } = source;
+		let csLen;
+		if (direction === _univerjs_core.Direction.DOWN || direction === _univerjs_core.Direction.UP) csLen = sourceRows.length;
+		else csLen = sourceCols.length;
+		const applyDatas = this._getFillCells(location, direction, effectiveApplyType, hasStyle, csLen);
+		const applyMergeRanges = hasStyle ? this._getMergeApplyData(sourceRange, targetRange, direction, csLen, location) : [];
 		const style = (_this$_univerInstance4 = this._univerInstanceService.getUnit(unitId)) === null || _this$_univerInstance4 === void 0 ? void 0 : _this$_univerInstance4.getStyles();
-		if (hasStyle) {
-			applyMergeRanges = this._getMergeApplyData(sourceRange, targetRange, direction, csLen, location);
-			applyDatas.forEach((row) => {
-				row.forEach((cellData) => {
-					if (cellData && style) {
-						if (style) cellData.s = style.getStyleByCell(cellData);
-					}
-				});
-			});
-		} else applyDatas.forEach((row, rowIndex) => {
+		applyDatas.forEach((row, rowIndex) => {
 			row.forEach((cellData, colIndex) => {
-				if (cellData && style) cellData.s = style.getStyleByCell(this._beforeApplyData[rowIndex][colIndex]) || null;
+				if (cellData && style) cellData.s = hasStyle ? style.getStyleByCell(cellData) : style.getStyleByCell(this._beforeApplyData[rowIndex][colIndex]) || null;
 			});
 		});
 		if (applyType === "ONLY_FORMAT") applyDatas.forEach((row, rowIndex) => {
@@ -17763,30 +17856,59 @@ let AutoFillController = class AutoFillController extends _univerjs_core.Disposa
 				}
 			});
 		});
-		if (hasStyle) {
-			var _this$_univerInstance5;
-			const deleteMergeRanges = [];
-			const mergeData = (_this$_univerInstance5 = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance5 === void 0 || (_this$_univerInstance5 = _this$_univerInstance5.getSheetBySheetId(subUnitId)) === null || _this$_univerInstance5 === void 0 ? void 0 : _this$_univerInstance5.getMergeData();
-			if (mergeData) mergeData.forEach((merge) => {
-				if (_univerjs_core.Rectangle.intersects(merge, targetRange)) deleteMergeRanges.push(merge);
+		const cellValue = new _univerjs_core.ObjectMatrix();
+		targetRows.forEach((row, rowIndex) => {
+			targetCols.forEach((col, colIndex) => {
+				const cell = applyDatas[rowIndex][colIndex];
+				if (cell) cellValue.setValue(row, col, cell);
+			});
+		});
+		const cellValueMatrix = cellValue.getMatrix();
+		this._autoFillService.getActiveHooks(applyType).forEach((hook) => {
+			var _hook$onValidateFillD;
+			(_hook$onValidateFillD = hook.onValidateFillData) === null || _hook$onValidateFillD === void 0 || _hook$onValidateFillD.call(hook, location, direction, applyType, cellValueMatrix);
+		});
+		return {
+			cellValue: cellValueMatrix,
+			applyMergeRanges,
+			hasStyle
+		};
+	}
+	_getRemoveMergeMutations(location) {
+		var _this$_univerInstance5;
+		const { unitId, subUnitId, target } = location;
+		const targetRange = discreteRangeToRange(target);
+		const undos = [];
+		const redos = [];
+		const deleteMergeRanges = ((_this$_univerInstance5 = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance5 === void 0 || (_this$_univerInstance5 = _this$_univerInstance5.getSheetBySheetId(subUnitId)) === null || _this$_univerInstance5 === void 0 ? void 0 : _this$_univerInstance5.getMergeData().filter((merge) => _univerjs_core.Rectangle.intersects(merge, targetRange))) ?? [];
+		if (deleteMergeRanges.length) {
+			const removeMergeMutationParams = {
+				unitId,
+				subUnitId,
+				ranges: deleteMergeRanges
+			};
+			const undoRemoveMergeMutationParams = this._injector.invoke(RemoveMergeUndoMutationFactory, removeMergeMutationParams);
+			redos.push({
+				id: RemoveWorksheetMergeMutation.id,
+				params: removeMergeMutationParams
+			});
+			undos.unshift({
+				id: AddWorksheetMergeMutation.id,
+				params: undoRemoveMergeMutationParams
 			});
-			if (deleteMergeRanges.length) {
-				const removeMergeMutationParams = {
-					unitId,
-					subUnitId,
-					ranges: deleteMergeRanges
-				};
-				const undoRemoveMergeMutationParams = this._injector.invoke(RemoveMergeUndoMutationFactory, removeMergeMutationParams);
-				redos.push({
-					id: RemoveWorksheetMergeMutation.id,
-					params: removeMergeMutationParams
-				});
-				undos.unshift({
-					id: AddWorksheetMergeMutation.id,
-					params: undoRemoveMergeMutationParams
-				});
-			}
 		}
+		return {
+			undos,
+			redos
+		};
+	}
+	_fillData(location, direction, applyType, prepared) {
+		const { target, unitId, subUnitId } = location;
+		const { cellValue, applyMergeRanges, hasStyle } = prepared;
+		const { undos, redos } = hasStyle ? this._getRemoveMergeMutations(location) : {
+			undos: [],
+			redos: []
+		};
 		const clearMutationParams = {
 			subUnitId,
 			unitId,
@@ -17801,22 +17923,15 @@ let AutoFillController = class AutoFillController extends _univerjs_core.Disposa
 			id: SetRangeValuesMutation.id,
 			params: undoClearMutationParams
 		});
-		const cellValue = new _univerjs_core.ObjectMatrix();
-		targetRows.forEach((row, rowIndex) => {
-			targetCols.forEach((col, colIndex) => {
-				if (applyDatas[rowIndex][colIndex]) cellValue.setValue(row, col, applyDatas[rowIndex][colIndex]);
-			});
-		});
-		const cellValueMatrix = cellValue.getMatrix();
 		const setRangeValuesMutationParams = {
 			subUnitId,
 			unitId,
-			cellValue: cellValueMatrix
+			cellValue
 		};
 		const undoSetRangeValuesMutationParams = this._injector.invoke(SetRangeValuesUndoMutationFactory, setRangeValuesMutationParams);
-		this._autoFillService.getActiveHooks().forEach((hook) => {
+		this._autoFillService.getActiveHooks(applyType).forEach((hook) => {
 			var _hook$onBeforeSubmit;
-			(_hook$onBeforeSubmit = hook.onBeforeSubmit) === null || _hook$onBeforeSubmit === void 0 || _hook$onBeforeSubmit.call(hook, location, direction, applyType, cellValueMatrix);
+			(_hook$onBeforeSubmit = hook.onBeforeSubmit) === null || _hook$onBeforeSubmit === void 0 || _hook$onBeforeSubmit.call(hook, location, direction, applyType, cellValue);
 		});
 		undos.unshift({
 			id: SetRangeValuesMutation.id,
@@ -18173,7 +18288,7 @@ SheetsFreezeSyncController = __decorate([
 //#endregion
 //#region src/controllers/permission/sheet-permission-check.controller.ts
 let SheetPermissionCheckController = class SheetPermissionCheckController extends _univerjs_core.Disposable {
-	constructor(_commandService, _univerInstanceService, _permissionService, _selectionManagerService, _rangeProtectionRuleModel, _worksheetProtectionRuleModel, _localeService, _lexerTreeBuilder, _definedNamesService) {
+	constructor(_commandService, _univerInstanceService, _permissionService, _selectionManagerService, _rangeProtectionRuleModel, _worksheetProtectionRuleModel, _localeService, _lexerTreeBuilder, _definedNamesService, _autoFillService, _formulaDataModel, _functionService) {
 		super();
 		this._commandService = _commandService;
 		this._univerInstanceService = _univerInstanceService;
@@ -18184,6 +18299,9 @@ let SheetPermissionCheckController = class SheetPermissionCheckController extend
 		this._localeService = _localeService;
 		this._lexerTreeBuilder = _lexerTreeBuilder;
 		this._definedNamesService = _definedNamesService;
+		this._autoFillService = _autoFillService;
+		this._formulaDataModel = _formulaDataModel;
+		this._functionService = _functionService;
 		_defineProperty(this, "disposableCollection", new _univerjs_core.DisposableCollection());
 		_defineProperty(this, "_triggerPermissionUIEvent$", new rxjs.Subject());
 		_defineProperty(this, "triggerPermissionUIEvent$", this._triggerPermissionUIEvent$.asObservable());
@@ -18191,6 +18309,29 @@ let SheetPermissionCheckController = class SheetPermissionCheckController extend
 	}
 	_initialize() {
 		this._commandExecutedListener();
+		this.disposeWithMe(this._autoFillService.addHook({
+			id: "permission-check",
+			onValidateFillData: ({ unitId, subUnitId }, _direction, applyType, cellValue) => {
+				if (applyType === "ONLY_FORMAT") return;
+				const formulas = new _univerjs_core.ObjectMatrix(this._formulaDataModel.updateFormulaData(unitId, subUnitId, cellValue));
+				new _univerjs_core.ObjectMatrix(cellValue).forValue((row, column) => {
+					const formula = formulas.getValue(row, column);
+					if (!(formula === null || formula === void 0 ? void 0 : formula.f)) return;
+					const formulaString = this._lexerTreeBuilder.moveFormulaRefOffset(formula.f, formula.x ?? 0, formula.y ?? 0);
+					if (!this._permissionCheckWithFormula({
+						unitId,
+						subUnitId,
+						range: {
+							startRow: row,
+							endRow: row,
+							startColumn: column,
+							endColumn: column
+						},
+						value: { f: formulaString }
+					})) this.blockExecuteWithoutPermission(this._localeService.t("sheets.permission.dialog.formulaErr"));
+				});
+			}
+		}));
 	}
 	_commandExecutedListener() {
 		this.disposeWithMe(this._commandService.beforeCommandExecuted((commandInfo) => {
@@ -18515,61 +18656,18 @@ let SheetPermissionCheckController = class SheetPermissionCheckController extend
 	_permissionCheckWithFormula(params) {
 		const target = getSheetCommandTarget(this._univerInstanceService, params);
 		if (!target) return false;
-		const { workbook, unitId, subUnitId } = target;
+		const { unitId, subUnitId } = target;
 		const formulaString = params.value.f;
 		if (formulaString) {
-			const definedNameStr = formulaString.substring(1);
-			const definedName = this._definedNamesService.getValueByName(unitId, definedNameStr);
-			if (definedName) {
-				let formulaOrRefString = definedName.formulaOrRefString;
-				if (formulaOrRefString.startsWith(_univerjs_engine_formula.operatorToken.EQUALS)) formulaOrRefString = formulaOrRefString.slice(1);
-				const refRangesArr = formulaOrRefString.split(",");
-				for (let i = 0; i < refRangesArr.length; i++) {
-					const refRange = refRangesArr[i];
-					const { sheetName, range } = (0, _univerjs_engine_formula.deserializeRangeWithSheet)(refRange);
-					if (sheetName) {
-						const targetSheet = workbook.getSheetBySheetName(sheetName);
-						if (!targetSheet) return true;
-						const { startRow, endRow, startColumn, endColumn } = range;
-						for (let r = startRow; r <= endRow; r++) for (let c = startColumn; c <= endColumn; c++) {
-							var _cell$selectionProtec2;
-							const cell = targetSheet.getCell(r, c);
-							const permission = cell === null || cell === void 0 || (_cell$selectionProtec2 = cell.selectionProtection) === null || _cell$selectionProtec2 === void 0 ? void 0 : _cell$selectionProtec2[0];
-							if ((permission === null || permission === void 0 ? void 0 : permission[_univerjs_protocol.UnitAction.View]) === false) return false;
-						}
-					}
-				}
-				return true;
-			} else {
-				const sequenceNodes = this._lexerTreeBuilder.sequenceNodesBuilder(formulaString);
-				if (!sequenceNodes) return true;
-				for (let i = 0; i < sequenceNodes.length; i++) {
-					const node = sequenceNodes[i];
-					if (typeof node === "string" || node.nodeType !== _univerjs_engine_formula.sequenceNodeType.REFERENCE) continue;
-					const { token } = node;
-					const { unitId: sequenceGridUnitId, sheetName, range } = (0, _univerjs_engine_formula.deserializeRangeWithSheetWithCache)(token);
-					let sequenceGridWorkbook = workbook;
-					if (sequenceGridUnitId && sequenceGridUnitId !== unitId) {
-						const _sequenceGridWorkbook = this._univerInstanceService.getUnit(sequenceGridUnitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
-						if (!_sequenceGridWorkbook) return true;
-						sequenceGridWorkbook = _sequenceGridWorkbook;
-					}
-					const sequenceGridWorksheet = sheetName ? sequenceGridWorkbook.getSheetBySheetName(sheetName) : sequenceGridWorkbook.getActiveSheet();
-					if (!sequenceGridWorksheet) return true;
-					if (sheetName) {
-						const viewPermission = this._permissionService.getPermissionPoint(new WorksheetViewPermission(sequenceGridWorkbook.getUnitId(), sequenceGridWorksheet.getSheetId()).id);
-						if (!viewPermission || viewPermission.value === false) return false;
-					}
-					const { startRow, endRow, startColumn, endColumn } = range;
-					for (let r = startRow; r <= endRow; r++) for (let c = startColumn; c <= endColumn; c++) {
-						var _cell$selectionProtec3;
-						const cell = sequenceGridWorksheet.getCell(r, c);
-						const permission = cell === null || cell === void 0 || (_cell$selectionProtec3 = cell.selectionProtection) === null || _cell$selectionProtec3 === void 0 ? void 0 : _cell$selectionProtec3[0];
-						if ((permission === null || permission === void 0 ? void 0 : permission[_univerjs_protocol.UnitAction.View]) === false) return false;
-					}
-				}
-				return true;
-			}
+			var _this$_selectionManag3;
+			const ranges = params.range ? [params.range] : ((_this$_selectionManag3 = this._selectionManagerService.getCurrentSelections()) === null || _this$_selectionManag3 === void 0 ? void 0 : _this$_selectionManag3.map((selection) => selection.range)) ?? [];
+			for (const range of ranges) for (let row = range.startRow; row <= range.endRow; row++) for (let column = range.startColumn; column <= range.endColumn; column++) if (!this._permissionCheckFormulaReferences(formulaString, {
+				unitId,
+				subUnitId,
+				row,
+				column
+			})) return false;
+			return true;
 		}
 		const { range } = params;
 		if (range) {
@@ -18580,6 +18678,73 @@ let SheetPermissionCheckController = class SheetPermissionCheckController extend
 		}
 		return true;
 	}
+	_getFormulaReferenceWorkbook(unitId, qualifier) {
+		const workbook = this._univerInstanceService.getUnit(qualifier || unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
+		if (workbook || !qualifier) return workbook;
+		const workbooks = this._univerInstanceService.getAllUnitsForType(_univerjs_core.UniverInstanceType.UNIVER_SHEET).filter((item) => item.getSnapshot().name.length > 0);
+		const exactMatches = workbooks.filter((item) => item.getSnapshot().name.toLowerCase() === qualifier.toLowerCase());
+		const matches = exactMatches.length > 0 ? exactMatches : workbooks.filter((item) => (0, _univerjs_engine_formula.normalizeFormulaUnitName)(item.getSnapshot().name) === (0, _univerjs_engine_formula.normalizeFormulaUnitName)(qualifier));
+		return matches.length === 1 ? matches[0] : null;
+	}
+	_permissionCheckFormulaReferences(formulaString, context, visitingNames = /* @__PURE__ */ new Set(), referenceOffset) {
+		const { unitId, subUnitId, row, column } = context;
+		const sequenceNodes = this._lexerTreeBuilder.sequenceNodesBuilder(formulaString) ?? [];
+		for (let index = 0; index < sequenceNodes.length; index++) {
+			const node = sequenceNodes[index];
+			if (typeof node === "string" || node.nodeType !== _univerjs_engine_formula.sequenceNodeType.REFERENCE && node.nodeType !== _univerjs_engine_formula.sequenceNodeType.FUNCTION) continue;
+			const nextNode = sequenceNodes[index + 1];
+			if (node.nodeType === _univerjs_engine_formula.sequenceNodeType.FUNCTION && typeof nextNode === "string" && nextNode.trim() === _univerjs_engine_formula.matchToken.OPEN_BRACKET && this._functionService.hasExecutor(node.token.trim().toUpperCase())) continue;
+			let nameToken = node.token.trim();
+			if (node.nodeType === _univerjs_engine_formula.sequenceNodeType.FUNCTION) {
+				const parts = nameToken.split("!");
+				if (parts.length === 2) {
+					var _this$_univerInstance;
+					const unqualifiedName = parts[1].trim();
+					const unscopedName = this._definedNamesService.getValueByName(unitId, unqualifiedName);
+					const localSheetId = unscopedName === null || unscopedName === void 0 ? void 0 : unscopedName.localSheetId;
+					const localSheet = (_this$_univerInstance = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.getSheetBySheetId(localSheetId ?? "");
+					if (unscopedName && (localSheetId == null || localSheetId === "AllDefaultWorkbook" || (localSheet === null || localSheet === void 0 ? void 0 : localSheet.getName()) === parts[0])) nameToken = unqualifiedName;
+				}
+			}
+			const definedName = this._definedNamesService.getValueByName(unitId, nameToken, subUnitId);
+			if (definedName) {
+				const nameKey = `${unitId}:${definedName.id}`;
+				if (visitingNames.has(nameKey)) continue;
+				visitingNames.add(nameKey);
+				const definition = definedName.formulaOrRefString;
+				const isFormula = definition.startsWith(_univerjs_engine_formula.operatorToken.EQUALS);
+				const offset = isFormula ? void 0 : {
+					x: column - (definedName.localSheetId === "AllDefaultWorkbook" ? 1 : 0),
+					y: row
+				};
+				const permitted = this._permissionCheckFormulaReferences(isFormula ? definition : `${_univerjs_engine_formula.operatorToken.EQUALS}${definition}`, context, visitingNames, offset);
+				visitingNames.delete(nameKey);
+				if (!permitted) return false;
+				continue;
+			}
+			if (node.nodeType !== _univerjs_engine_formula.sequenceNodeType.REFERENCE) continue;
+			const { unitQualifier, sheetName } = (0, _univerjs_engine_formula.handleRefStringInfo)(node.token.trim());
+			const referenceWorkbook = this._getFormulaReferenceWorkbook(unitId, unitQualifier);
+			const referenceWorksheet = sheetName ? referenceWorkbook === null || referenceWorkbook === void 0 ? void 0 : referenceWorkbook.getSheetBySheetName(sheetName) : referenceWorkbook === null || referenceWorkbook === void 0 ? void 0 : referenceWorkbook.getSheetBySheetId(subUnitId);
+			if (!referenceWorkbook || !referenceWorksheet) continue;
+			const referenceUnitId = referenceWorkbook.getUnitId();
+			const referenceSheetId = referenceWorksheet.getSheetId();
+			const { range } = (0, _univerjs_engine_formula.deserializeRangeWithSheetWithCache)(node.token);
+			const referenceRange = referenceOffset ? (0, _univerjs_core.moveRangeByOffset)({ ...range }, referenceOffset.x, referenceOffset.y) : range;
+			if (referenceOffset) {
+				const wrap = (value, limit) => (value % limit + limit) % limit;
+				referenceRange.startRow = wrap(referenceRange.startRow, _univerjs_core.MAX_ROW_COUNT);
+				referenceRange.endRow = wrap(referenceRange.endRow, _univerjs_core.MAX_ROW_COUNT);
+				referenceRange.startColumn = wrap(referenceRange.startColumn, _univerjs_core.MAX_COLUMN_COUNT);
+				referenceRange.endColumn = wrap(referenceRange.endColumn, _univerjs_core.MAX_COLUMN_COUNT);
+			}
+			if (!this.permissionCheckWithRanges({
+				worksheetTypes: [WorksheetViewPermission],
+				rangeTypes: [RangeProtectionPermissionViewPoint]
+			}, [referenceRange], referenceUnitId, referenceSheetId)) return false;
+		}
+		return true;
+	}
 	_permissionCheckBySetRangeValue(permissionTypes, params) {
 		const { unitId, subUnitId, value, range } = params;
 		let ranges = [];
@@ -18675,11 +18840,11 @@ let SheetPermissionCheckController = class SheetPermissionCheckController extend
 		return true;
 	}
 	_permissionCheckWithInsertOrDeleteMoveRange(direction, params) {
-		var _this$_selectionManag3;
+		var _this$_selectionManag4;
 		const target = getSheetCommandTarget(this._univerInstanceService);
 		if (!target) return false;
 		const { worksheet, unitId, subUnitId } = target;
-		const range = (params === null || params === void 0 ? void 0 : params.range) ?? ((_this$_selectionManag3 = this._selectionManagerService.getCurrentLastSelection()) === null || _this$_selectionManag3 === void 0 ? void 0 : _this$_selectionManag3.range);
+		const range = (params === null || params === void 0 ? void 0 : params.range) ?? ((_this$_selectionManag4 = this._selectionManagerService.getCurrentLastSelection()) === null || _this$_selectionManag4 === void 0 ? void 0 : _this$_selectionManag4.range);
 		if (!range) return false;
 		if (!this.permissionCheckWithRanges({
 			workbookTypes: [WorkbookEditablePermission],
@@ -18704,7 +18869,10 @@ SheetPermissionCheckController = __decorate([
 	__decorateParam(5, (0, _univerjs_core.Inject)(WorksheetProtectionRuleModel)),
 	__decorateParam(6, (0, _univerjs_core.Inject)(_univerjs_core.LocaleService)),
 	__decorateParam(7, (0, _univerjs_core.Inject)(_univerjs_engine_formula.LexerTreeBuilder)),
-	__decorateParam(8, _univerjs_engine_formula.IDefinedNamesService)
+	__decorateParam(8, _univerjs_engine_formula.IDefinedNamesService),
+	__decorateParam(9, IAutoFillService),
+	__decorateParam(10, (0, _univerjs_core.Inject)(_univerjs_engine_formula.FormulaDataModel)),
+	__decorateParam(11, _univerjs_engine_formula.IFunctionService)
 ], SheetPermissionCheckController);
 
 //#endregion
@@ -19570,7 +19738,7 @@ RangeProtectionCache = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets";
-var version = "1.1.0";
+var version = "1.3.0";
 
 //#endregion
 //#region src/controllers/active-worksheet.controller.ts
@@ -21500,7 +21668,10 @@ function convertPositionCellToSheetOverGrid(unitId, subUnitId, cellOverGridPosit
 	});
 	const left = (0, _univerjs_engine_render.precisionTo)(startSelectionX + fromColumnOffset, 1);
 	const top = (0, _univerjs_engine_render.precisionTo)(startSelectionY + fromRowOffset, 1);
-	const endSelectionCell = skeleton.getCellIndexAndOffsetByPosition(left + width, top + height);
+	const endSelectionCell = skeleton.getCellIndexAndOffsetByPosition(left + width, top + height, 1, 1, {
+		x: 0,
+		y: 0
+	});
 	return {
 		unitId,
 		subUnitId,