@univerjs/sheets 1.1.0 → 1.2.0

package/lib/index.js

@@ -1,6 +1,6 @@
-import { AUTO_HEIGHT_FOR_MERGED_CELLS, BORDER_KEYS, BORDER_STYLE_KEYS, BooleanNumber, BorderStyleTypes, BorderType, BuildTextUtils, COLOR_STYLE_KEYS, CellModeEnum, CellValueType, CommandType, CustomCommandExecutionError, DependentOn, Dimension, Direction, Disposable, DisposableCollection, DocumentDataModel, ErrorService, FontItalic, FontWeight, HorizontalAlign, IAuthzIoService, ICommandService, IConfigService, IConfirmService, IContextService, ILogService, IPermissionService, IResourceManagerService, IS_ROW_STYLE_PRECEDE_COLUMN_STYLE, IUndoRedoService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, InterceptorManager, LRUMap, LocaleService, MAX_COLUMN_COUNT, MAX_ROW_COUNT, ObjectMatrix, Optional, PADDING_KEYS, PermissionStatus, Plugin, RANGE_TYPE, RTree, Range, Rectangle, RxDisposable, SHEET_TEXT_LINE_GAP, STYLE_KEYS, Styles, TEXT_DECORATION_KEYS, TEXT_ROTATION_KEYS, TextX, Tools, UniverInstanceType, UserManagerService, WorksheetHiddenState, WrapStrategy, cellToRange, cloneWorksheetData, composeInterceptors, concatMatrixArray, createIdentifier, createInterceptorKey, createRowColIter, generateRandomId, getArrayLength, getIntersectRange, getNumfmtLocaleTag, getNumfmtParseValueFilter, isBooleanString, isDefaultFormat, isFormulaId, isFormulaString, isICellData, isRealNum, isSafeNumeric, isTextFormat, mapObjectMatrix, merge, mergeIntervals, mergeOverrideWithDependencies, mergeWorksheetSnapshotWithDefault, moveMatrixArray, normalizeTextRuns, normalizeWorkbookCalculationSettings, numfmt, regexp, registerDependencies, remove, selectionToArray, sequenceExecute, sliceMatrixArray, spliceArray, throttle, toDisposable, touchDependencies, willLoseNumericPrecision } from "@univerjs/core";
+import { AUTO_HEIGHT_FOR_MERGED_CELLS, BORDER_KEYS, BORDER_STYLE_KEYS, BooleanNumber, BorderStyleTypes, BorderType, BuildTextUtils, COLOR_STYLE_KEYS, CellModeEnum, CellValueType, CommandType, CustomCommandExecutionError, DependentOn, Dimension, Direction, Disposable, DisposableCollection, DocumentDataModel, ErrorService, FontItalic, FontWeight, HorizontalAlign, IAuthzIoService, ICommandService, IConfigService, IConfirmService, IContextService, ILogService, IPermissionService, IResourceManagerService, IS_ROW_STYLE_PRECEDE_COLUMN_STYLE, IUndoRedoService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, InterceptorManager, LRUMap, LocaleService, MAX_COLUMN_COUNT, MAX_ROW_COUNT, ObjectMatrix, Optional, PADDING_KEYS, PermissionStatus, Plugin, RANGE_TYPE, RTree, Range, Rectangle, RxDisposable, SHEET_TEXT_LINE_GAP, STYLE_KEYS, Styles, TEXT_DECORATION_KEYS, TEXT_ROTATION_KEYS, TextX, Tools, UniverInstanceType, UserManagerService, WorksheetHiddenState, WrapStrategy, cellToRange, cloneWorksheetData, composeInterceptors, concatMatrixArray, createIdentifier, createInterceptorKey, createRowColIter, generateRandomId, getArrayLength, getIntersectRange, getNumfmtLocaleTag, getNumfmtParseValueFilter, isBooleanString, isDefaultFormat, isFormulaId, isFormulaString, isICellData, isRealNum, isSafeNumeric, isTextFormat, mapObjectMatrix, merge, mergeIntervals, mergeOverrideWithDependencies, mergeWorksheetSnapshotWithDefault, moveMatrixArray, moveRangeByOffset, normalizeTextRuns, normalizeWorkbookCalculationSettings, numfmt, regexp, registerDependencies, remove, selectionToArray, sequenceExecute, sliceMatrixArray, spliceArray, throttle, toDisposable, touchDependencies, willLoseNumericPrecision } from "@univerjs/core";
 import { BehaviorSubject, Subject, distinctUntilChanged, filter, map, merge as merge$1, of, share, shareReplay, skip, switchMap, take, takeUntil } from "rxjs";
-import { IDefinedNamesService, LexerTreeBuilder, RemoveDefinedNameMutation, SetDefinedNameMutation, SetDefinedNameMutationFactory, SetFormulaCalculationResultMutation, UniverFormulaEnginePlugin, deserializeRangeWithSheet, deserializeRangeWithSheetWithCache, handleNumfmtInCell, isReferenceStringWithEffectiveColumn, operatorToken, sequenceNodeType, stripErrorMargin } from "@univerjs/engine-formula";
+import { FormulaDataModel, IDefinedNamesService, IFunctionService, LexerTreeBuilder, RemoveDefinedNameMutation, SetDefinedNameMutation, SetDefinedNameMutationFactory, SetFormulaCalculationResultMutation, UniverFormulaEnginePlugin, deserializeRangeWithSheetWithCache, handleNumfmtInCell, handleRefStringInfo, isReferenceStringWithEffectiveColumn, matchToken, normalizeFormulaUnitName, operatorToken, sequenceNodeType, stripErrorMargin } from "@univerjs/engine-formula";
 import { SpreadsheetSkeleton, cjk, precisionTo } from "@univerjs/engine-render";
 import { UnitAction, UnitObject } from "@univerjs/protocol";
 import { filter as filter$1, map as map$1, takeUntil as takeUntil$1 } from "rxjs/operators";
@@ -11971,6 +11971,7 @@ let AutoFillService = class AutoFillService extends Disposable {
 			direction = 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));
@@ -12023,7 +12024,7 @@ let AutoFillService = class AutoFillService extends 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) => {
@@ -12033,7 +12034,7 @@ let AutoFillService = class AutoFillService extends 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);
@@ -12082,7 +12083,6 @@ let AutoFillService = class AutoFillService extends Disposable {
 	}
 	fillData(applyType) {
 		var _activeWorkbook$getAc;
-		this.applyType = applyType;
 		const activeWorkbook = this._univerInstanceService.getCurrentUnitOfType(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();
@@ -12093,12 +12093,30 @@ let AutoFillService = class AutoFillService extends 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 = Rectangle.union(discreteRangeToRange(source), discreteRangeToRange(target));
-		const activeHooks = this.getActiveHooks();
 		if (unitId === activeUnitId && subUnitId === activeSubUnitId) this._commandService.syncExecuteCommand(SetSelectionsOperation.id, {
 			selections: [{
 				primary: getPrimaryForRange({
@@ -12117,14 +12135,8 @@ let AutoFillService = class AutoFillService extends 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);
 		});
@@ -17472,8 +17484,9 @@ let AutoFillController = class AutoFillController extends Disposable {
 			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);
 			}
 		}));
 	}
@@ -17522,7 +17535,7 @@ let AutoFillController = class AutoFillController extends Disposable {
 				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
 				});
 			});
@@ -17681,28 +17694,9 @@ let AutoFillController = class AutoFillController extends Disposable {
 		}
 		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 === Direction.DOWN || direction === Direction.UP) csLen = sourceRows.length;
-		else csLen = sourceCols.length;
+	_getFillCells(location, direction, applyType, hasStyle, csLen) {
+		const { rows: targetRows, cols: targetCols } = location.target;
+		const copyData = Tools.deepClone(this._copyData);
 		const applyDatas = [];
 		if (direction === Direction.DOWN || direction === Direction.UP) {
 			const asLen = targetRows.length;
@@ -17733,20 +17727,26 @@ let AutoFillController = class AutoFillController extends Disposable {
 				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 === Direction.DOWN || direction === 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) => {
@@ -17762,30 +17762,59 @@ let AutoFillController = class AutoFillController extends Disposable {
 				}
 			});
 		});
-		if (hasStyle) {
-			var _this$_univerInstance5;
-			const deleteMergeRanges = [];
-			const mergeData = (_this$_univerInstance5 = this._univerInstanceService.getUnit(unitId, 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 (Rectangle.intersects(merge, targetRange)) deleteMergeRanges.push(merge);
+		const cellValue = new 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, 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) => 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,
@@ -17800,22 +17829,15 @@ let AutoFillController = class AutoFillController extends Disposable {
 			id: SetRangeValuesMutation.id,
 			params: undoClearMutationParams
 		});
-		const cellValue = new 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,
@@ -18172,7 +18194,7 @@ SheetsFreezeSyncController = __decorate([
 //#endregion
 //#region src/controllers/permission/sheet-permission-check.controller.ts
 let SheetPermissionCheckController = class SheetPermissionCheckController extends 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;
@@ -18183,6 +18205,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 DisposableCollection());
 		_defineProperty(this, "_triggerPermissionUIEvent$", new Subject());
 		_defineProperty(this, "triggerPermissionUIEvent$", this._triggerPermissionUIEvent$.asObservable());
@@ -18190,6 +18215,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 ObjectMatrix(this._formulaDataModel.updateFormulaData(unitId, subUnitId, cellValue));
+				new 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) => {
@@ -18514,61 +18562,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(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 } = 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[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 !== sequenceNodeType.REFERENCE) continue;
-					const { token } = node;
-					const { unitId: sequenceGridUnitId, sheetName, range } = deserializeRangeWithSheetWithCache(token);
-					let sequenceGridWorkbook = workbook;
-					if (sequenceGridUnitId && sequenceGridUnitId !== unitId) {
-						const _sequenceGridWorkbook = this._univerInstanceService.getUnit(sequenceGridUnitId, 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[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) {
@@ -18579,6 +18584,73 @@ let SheetPermissionCheckController = class SheetPermissionCheckController extend
 		}
 		return true;
 	}
+	_getFormulaReferenceWorkbook(unitId, qualifier) {
+		const workbook = this._univerInstanceService.getUnit(qualifier || unitId, UniverInstanceType.UNIVER_SHEET);
+		if (workbook || !qualifier) return workbook;
+		const workbooks = this._univerInstanceService.getAllUnitsForType(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) => normalizeFormulaUnitName(item.getSnapshot().name) === 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 !== sequenceNodeType.REFERENCE && node.nodeType !== sequenceNodeType.FUNCTION) continue;
+			const nextNode = sequenceNodes[index + 1];
+			if (node.nodeType === sequenceNodeType.FUNCTION && typeof nextNode === "string" && nextNode.trim() === matchToken.OPEN_BRACKET && this._functionService.hasExecutor(node.token.trim().toUpperCase())) continue;
+			let nameToken = node.token.trim();
+			if (node.nodeType === 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, 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(operatorToken.EQUALS);
+				const offset = isFormula ? void 0 : {
+					x: column - (definedName.localSheetId === "AllDefaultWorkbook" ? 1 : 0),
+					y: row
+				};
+				const permitted = this._permissionCheckFormulaReferences(isFormula ? definition : `${operatorToken.EQUALS}${definition}`, context, visitingNames, offset);
+				visitingNames.delete(nameKey);
+				if (!permitted) return false;
+				continue;
+			}
+			if (node.nodeType !== sequenceNodeType.REFERENCE) continue;
+			const { unitQualifier, sheetName } = 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 } = deserializeRangeWithSheetWithCache(node.token);
+			const referenceRange = referenceOffset ? moveRangeByOffset({ ...range }, referenceOffset.x, referenceOffset.y) : range;
+			if (referenceOffset) {
+				const wrap = (value, limit) => (value % limit + limit) % limit;
+				referenceRange.startRow = wrap(referenceRange.startRow, MAX_ROW_COUNT);
+				referenceRange.endRow = wrap(referenceRange.endRow, MAX_ROW_COUNT);
+				referenceRange.startColumn = wrap(referenceRange.startColumn, MAX_COLUMN_COUNT);
+				referenceRange.endColumn = wrap(referenceRange.endColumn, 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 = [];
@@ -18674,11 +18746,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],
@@ -18703,7 +18775,10 @@ SheetPermissionCheckController = __decorate([
 	__decorateParam(5, Inject(WorksheetProtectionRuleModel)),
 	__decorateParam(6, Inject(LocaleService)),
 	__decorateParam(7, Inject(LexerTreeBuilder)),
-	__decorateParam(8, IDefinedNamesService)
+	__decorateParam(8, IDefinedNamesService),
+	__decorateParam(9, IAutoFillService),
+	__decorateParam(10, Inject(FormulaDataModel)),
+	__decorateParam(11, IFunctionService)
 ], SheetPermissionCheckController);
 
 //#endregion
@@ -19569,7 +19644,7 @@ RangeProtectionCache = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets";
-var version = "1.1.0";
+var version = "1.2.0";
 
 //#endregion
 //#region src/controllers/active-worksheet.controller.ts
@@ -21499,7 +21574,10 @@ function convertPositionCellToSheetOverGrid(unitId, subUnitId, cellOverGridPosit
 	});
 	const left = precisionTo(startSelectionX + fromColumnOffset, 1);
 	const top = 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,

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/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[];