@univerjs/sheets 1.0.0-alpha.8 → 1.0.0-beta.1

package/lib/cjs/index.js

@@ -8,6 +8,10 @@ let rxjs_operators = require("rxjs/operators");
 let _univerjs_rpc = require("@univerjs/rpc");
 
 //#region src/basics/cell-type.ts
+function isCellImage(documentData) {
+	var _documentData$drawing;
+	return !!(documentData === null || documentData === void 0 || (_documentData$drawing = documentData.drawingsOrder) === null || _documentData$drawing === void 0 ? void 0 : _documentData$drawing.length);
+}
 /**
 * Get cell value type by style, new value and old value.
 * If the new value contains t, then take t directly. In other cases, we need to dynamically determine based on actual data and styles
@@ -284,10 +288,7 @@ let SheetInterceptorService = class SheetInterceptorService extends _univerjs_co
 	interceptCommand(interceptor) {
 		if (this._commandInterceptors.includes(interceptor)) throw new Error("[SheetInterceptorService]: Interceptor already exists!");
 		this._commandInterceptors.push(interceptor);
-		this._commandInterceptors.sort((a, b) => {
-			var _b$priority, _a$priority;
-			return ((_b$priority = b.priority) !== null && _b$priority !== void 0 ? _b$priority : 0) - ((_a$priority = a.priority) !== null && _a$priority !== void 0 ? _a$priority : 0);
-		});
+		this._commandInterceptors.sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));
 		return this.disposeWithMe((0, _univerjs_core.toDisposable)(() => (0, _univerjs_core.remove)(this._commandInterceptors, interceptor)));
 	}
 	/**
@@ -298,25 +299,16 @@ let SheetInterceptorService = class SheetInterceptorService extends _univerjs_co
 	onCommandExecute(info) {
 		const infos = this._commandInterceptors.map((i) => i.getMutations(info));
 		return {
-			preUndos: infos.map((i) => {
-				var _i$preUndos;
-				return (_i$preUndos = i.preUndos) !== null && _i$preUndos !== void 0 ? _i$preUndos : [];
-			}).flat(),
+			preUndos: infos.map((i) => i.preUndos ?? []).flat(),
 			undos: infos.map((i) => i.undos).flat(),
-			preRedos: infos.map((i) => {
-				var _i$preRedos;
-				return (_i$preRedos = i.preRedos) !== null && _i$preRedos !== void 0 ? _i$preRedos : [];
-			}).flat(),
+			preRedos: infos.map((i) => i.preRedos ?? []).flat(),
 			redos: infos.map((i) => i.redos).flat()
 		};
 	}
 	interceptAfterCommand(interceptor) {
 		if (this._afterCommandInterceptors.includes(interceptor)) throw new Error("[SheetInterceptorService]: Interceptor already exists!");
 		this._afterCommandInterceptors.push(interceptor);
-		this._afterCommandInterceptors.sort((a, b) => {
-			var _b$priority2, _a$priority2;
-			return ((_b$priority2 = b.priority) !== null && _b$priority2 !== void 0 ? _b$priority2 : 0) - ((_a$priority2 = a.priority) !== null && _a$priority2 !== void 0 ? _a$priority2 : 0);
-		});
+		this._afterCommandInterceptors.sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));
 		return this.disposeWithMe((0, _univerjs_core.toDisposable)(() => (0, _univerjs_core.remove)(this._afterCommandInterceptors, interceptor)));
 	}
 	afterCommandExecute(info) {
@@ -329,24 +321,15 @@ let SheetInterceptorService = class SheetInterceptorService extends _univerjs_co
 	interceptAutoHeight(interceptor) {
 		if (this._autoHeightInterceptors.includes(interceptor)) throw new Error("[SheetInterceptorService]: Interceptor already exists!");
 		this._autoHeightInterceptors.push(interceptor);
-		this._autoHeightInterceptors.sort((a, b) => {
-			var _b$priority3, _a$priority3;
-			return ((_b$priority3 = b.priority) !== null && _b$priority3 !== void 0 ? _b$priority3 : 0) - ((_a$priority3 = a.priority) !== null && _a$priority3 !== void 0 ? _a$priority3 : 0);
-		});
+		this._autoHeightInterceptors.sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));
 		return this.disposeWithMe((0, _univerjs_core.toDisposable)(() => (0, _univerjs_core.remove)(this._autoHeightInterceptors, interceptor)));
 	}
 	generateMutationsOfAutoHeight(ctx) {
 		const infos = this._autoHeightInterceptors.map((i) => i.getMutations(ctx));
 		return {
-			preUndos: infos.map((i) => {
-				var _i$preUndos2;
-				return (_i$preUndos2 = i.preUndos) !== null && _i$preUndos2 !== void 0 ? _i$preUndos2 : [];
-			}).flat(),
+			preUndos: infos.map((i) => i.preUndos ?? []).flat(),
 			undos: infos.map((i) => i.undos).flat(),
-			preRedos: infos.map((i) => {
-				var _i$preRedos2;
-				return (_i$preRedos2 = i.preRedos) !== null && _i$preRedos2 !== void 0 ? _i$preRedos2 : [];
-			}).flat(),
+			preRedos: infos.map((i) => i.preRedos ?? []).flat(),
 			redos: infos.map((i) => i.redos).flat()
 		};
 	}
@@ -362,10 +345,7 @@ let SheetInterceptorService = class SheetInterceptorService extends _univerjs_co
 	interceptBeforeCommand(interceptor) {
 		if (this._beforeCommandInterceptor.includes(interceptor)) throw new Error("[SheetInterceptorService]: Interceptor already exists!");
 		this._beforeCommandInterceptor.push(interceptor);
-		this._beforeCommandInterceptor.sort((a, b) => {
-			var _b$priority4, _a$priority4;
-			return ((_b$priority4 = b.priority) !== null && _b$priority4 !== void 0 ? _b$priority4 : 0) - ((_a$priority4 = a.priority) !== null && _a$priority4 !== void 0 ? _a$priority4 : 0);
-		});
+		this._beforeCommandInterceptor.sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));
 		return this.disposeWithMe((0, _univerjs_core.toDisposable)(() => (0, _univerjs_core.remove)(this._beforeCommandInterceptor, interceptor)));
 	}
 	/**
@@ -384,24 +364,15 @@ let SheetInterceptorService = class SheetInterceptorService extends _univerjs_co
 	interceptRanges(interceptor) {
 		if (this._rangeInterceptors.includes(interceptor)) throw new Error("[SheetInterceptorService]: Interceptor already exists!");
 		this._rangeInterceptors.push(interceptor);
-		this._rangeInterceptors.sort((a, b) => {
-			var _b$priority5, _a$priority5;
-			return ((_b$priority5 = b.priority) !== null && _b$priority5 !== void 0 ? _b$priority5 : 0) - ((_a$priority5 = a.priority) !== null && _a$priority5 !== void 0 ? _a$priority5 : 0);
-		});
+		this._rangeInterceptors.sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));
 		return this.disposeWithMe((0, _univerjs_core.toDisposable)(() => (0, _univerjs_core.remove)(this._rangeInterceptors, interceptor)));
 	}
 	generateMutationsByRanges(info) {
 		const infos = this._rangeInterceptors.map((i) => i.getMutations(info));
 		return {
-			preUndos: infos.map((i) => {
-				var _i$preUndos3;
-				return (_i$preUndos3 = i.preUndos) !== null && _i$preUndos3 !== void 0 ? _i$preUndos3 : [];
-			}).flat(),
+			preUndos: infos.map((i) => i.preUndos ?? []).flat(),
 			undos: infos.map((i) => i.undos).flat(),
-			preRedos: infos.map((i) => {
-				var _i$preRedos3;
-				return (_i$preRedos3 = i.preRedos) !== null && _i$preRedos3 !== void 0 ? _i$preRedos3 : [];
-			}).flat(),
+			preRedos: infos.map((i) => i.preRedos ?? []).flat(),
 			redos: infos.map((i) => i.redos).flat()
 		};
 	}
@@ -433,10 +404,7 @@ let SheetInterceptorService = class SheetInterceptorService extends _univerjs_co
 		if (!this._interceptorsByName.has(key)) this._interceptorsByName.set(key, []);
 		const interceptors = this._interceptorsByName.get(key);
 		interceptors.push(interceptor);
-		const sortedInterceptors = interceptors.sort((a, b) => {
-			var _b$priority6, _a$priority6;
-			return ((_b$priority6 = b.priority) !== null && _b$priority6 !== void 0 ? _b$priority6 : 0) - ((_a$priority6 = a.priority) !== null && _a$priority6 !== void 0 ? _a$priority6 : 0);
-		});
+		const sortedInterceptors = interceptors.sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));
 		this._invalidateComposedInterceptors();
 		if (key === INTERCEPTOR_POINT.CELL_CONTENT) {
 			const JOINED_EFFECT = _univerjs_core.InterceptorEffectEnum.Style | _univerjs_core.InterceptorEffectEnum.Value;
@@ -461,7 +429,7 @@ let SheetInterceptorService = class SheetInterceptorService extends _univerjs_co
 	}
 	fetchThroughInterceptors(name, effect, _key, filter) {
 		const byNamesKey = effect === void 0 ? name : `${name}-${effect}`;
-		const key = _key !== null && _key !== void 0 ? _key : byNamesKey;
+		const key = _key ?? byNamesKey;
 		let composed = this._composedInterceptorByKey.get(key);
 		if (!composed) {
 			let interceptors = this._interceptorsByName.get(byNamesKey);
@@ -2170,7 +2138,7 @@ function handleStyle(styles, oldVal, newVal) {
 */
 function transformStyle(oldStyle, newStyle) {
 	if (!newStyle || !Object.keys(newStyle).length) return oldStyle;
-	const backupStyle = _univerjs_core.Tools.deepClone(oldStyle !== null && oldStyle !== void 0 ? oldStyle : {}) || {};
+	const backupStyle = _univerjs_core.Tools.deepClone(oldStyle ?? {}) || {};
 	const styleRecord = newStyle;
 	for (const key of _univerjs_core.STYLE_KEYS) {
 		if (!Object.prototype.hasOwnProperty.call(styleRecord, key)) continue;
@@ -2354,7 +2322,7 @@ const SetRangeValuesUndoMutationFactory = (accessor, params) => {
 		const cell = _univerjs_core.Tools.deepClone(cellMatrix === null || cellMatrix === void 0 ? void 0 : cellMatrix.getValue(row, col)) || {};
 		const oldStyle = styles.getStyleByCell(cell);
 		const newStyle = styles.getStyleByCell(newVal);
-		cell.s = isOverrideStyle && Object.prototype.hasOwnProperty.call(newVal !== null && newVal !== void 0 ? newVal : {}, "s") ? oldStyle !== null && oldStyle !== void 0 ? oldStyle : null : transformStyle(oldStyle, newStyle);
+		cell.s = isOverrideStyle && Object.prototype.hasOwnProperty.call(newVal ?? {}, "s") ? oldStyle ?? null : transformStyle(oldStyle, newStyle);
 		undoData.setValue(row, col, setNull(cell));
 	});
 	return {
@@ -2646,8 +2614,8 @@ const SetWorksheetRowHeightMutationFactory = (params, worksheet) => {
 	const rowHeight = {};
 	const manager = worksheet.getRowManager();
 	for (const { startRow, endRow } of ranges) for (let rowIndex = startRow; rowIndex < endRow + 1; rowIndex++) {
-		var _manager$getRow$h, _manager$getRow;
-		rowHeight[rowIndex] = (_manager$getRow$h = (_manager$getRow = manager.getRow(rowIndex)) === null || _manager$getRow === void 0 ? void 0 : _manager$getRow.h) !== null && _manager$getRow$h !== void 0 ? _manager$getRow$h : worksheet.getConfig().defaultRowHeight;
+		var _manager$getRow;
+		rowHeight[rowIndex] = ((_manager$getRow = manager.getRow(rowIndex)) === null || _manager$getRow === void 0 ? void 0 : _manager$getRow.h) ?? worksheet.getConfig().defaultRowHeight;
 	}
 	return {
 		unitId,
@@ -2676,11 +2644,11 @@ const SetWorksheetRowAutoHeightMutationFactory = (params, worksheet) => {
 	const results = [];
 	const manager = worksheet.getRowManager();
 	for (const rowInfo of rowsAutoHeightInfo) {
-		var _manager$getRow$ah, _manager$getRow3;
+		var _manager$getRow3;
 		const { row } = rowInfo;
 		results.push({
 			row,
-			autoHeight: (_manager$getRow$ah = (_manager$getRow3 = manager.getRow(row)) === null || _manager$getRow3 === void 0 ? void 0 : _manager$getRow3.ah) !== null && _manager$getRow$ah !== void 0 ? _manager$getRow$ah : worksheet.getConfig().defaultRowHeight
+			autoHeight: ((_manager$getRow3 = manager.getRow(row)) === null || _manager$getRow3 === void 0 ? void 0 : _manager$getRow3.ah) ?? worksheet.getConfig().defaultRowHeight
 		});
 	}
 	return {
@@ -2714,10 +2682,7 @@ const SetWorksheetRowIsAutoHeightMutation = {
 		for (const { startRow, endRow } of ranges) for (let rowIndex = startRow; rowIndex <= endRow; rowIndex++) {
 			const row = manager.getRowOrCreate(rowIndex);
 			if (typeof autoHeightInfo === "number") row.ia = autoHeightInfo;
-			else {
-				var _autoHeightInfo$rowIn;
-				row.ia = (_autoHeightInfo$rowIn = autoHeightInfo[rowIndex]) !== null && _autoHeightInfo$rowIn !== void 0 ? _autoHeightInfo$rowIn : void 0;
-			}
+			else row.ia = autoHeightInfo[rowIndex] ?? void 0;
 		}
 		return true;
 	}
@@ -4253,8 +4218,7 @@ var WorkbookSelectionModel = class extends _univerjs_core.Disposable {
 		return this._worksheetSelections.get(sheetId);
 	}
 	getLastSelectionPrimaryCellOfWorksheet(sheetId) {
-		var _this$_worksheetLastS;
-		return (_this$_worksheetLastS = this._worksheetLastSelectionPrimaryCell.get(sheetId)) !== null && _this$_worksheetLastS !== void 0 ? _this$_worksheetLastS : null;
+		return this._worksheetLastSelectionPrimaryCell.get(sheetId) ?? null;
 	}
 	setSelectionsOfWorksheet(sheetId, selections) {
 		this._worksheetSelections.set(sheetId, [...selections]);
@@ -4408,16 +4372,15 @@ let SheetsSelectionsService = class SheetsSelectionsService extends _univerjs_co
 	setSelections(unitIdOrSelections, worksheetIdOrType, selectionDatas, type) {
 		if (typeof unitIdOrSelections === "string" && typeof worksheetIdOrType === "string") {
 			const unitId = unitIdOrSelections;
-			this._ensureWorkbookSelection(unitId).setSelections(worksheetIdOrType, selectionDatas || [], type !== null && type !== void 0 ? type : 3);
+			this._ensureWorkbookSelection(unitId).setSelections(worksheetIdOrType, selectionDatas || [], type ?? 3);
 			return;
 		}
 		const current = this._currentSelectionPos;
 		if (!current) throw new Error("[SheetsSelectionsService]: cannot find current selection position!");
 		const { unitId, sheetId } = current;
 		if (typeof unitIdOrSelections === "object") {
-			var _ref;
-			const selectionData = unitIdOrSelections !== null && unitIdOrSelections !== void 0 ? unitIdOrSelections : selectionDatas;
-			const type = (_ref = worksheetIdOrType) !== null && _ref !== void 0 ? _ref : 3;
+			const selectionData = unitIdOrSelections ?? selectionDatas;
+			const type = worksheetIdOrType ?? 3;
 			this._ensureWorkbookSelection(unitId).setSelections(sheetId, selectionData, type);
 		}
 	}
@@ -5115,12 +5078,11 @@ const MoveRangeCommand = {
 	}
 };
 function _resolveMoveRangeContext(accessor, params) {
-	var _ref, _params$toUnitId, _params$fromSubUnitId, _ref2, _params$toSubUnitId;
 	const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
 	const target = getSheetCommandTarget(univerInstanceService);
-	const unitId = (_ref = (_params$toUnitId = params.toUnitId) !== null && _params$toUnitId !== void 0 ? _params$toUnitId : params.fromUnitId) !== null && _ref !== void 0 ? _ref : target === null || target === void 0 ? void 0 : target.unitId;
-	const fromSubUnitId = (_params$fromSubUnitId = params.fromSubUnitId) !== null && _params$fromSubUnitId !== void 0 ? _params$fromSubUnitId : target === null || target === void 0 ? void 0 : target.subUnitId;
-	const toSubUnitId = (_ref2 = (_params$toSubUnitId = params.toSubUnitId) !== null && _params$toSubUnitId !== void 0 ? _params$toSubUnitId : params.fromSubUnitId) !== null && _ref2 !== void 0 ? _ref2 : target === null || target === void 0 ? void 0 : target.subUnitId;
+	const unitId = params.toUnitId ?? params.fromUnitId ?? (target === null || target === void 0 ? void 0 : target.unitId);
+	const fromSubUnitId = params.fromSubUnitId ?? (target === null || target === void 0 ? void 0 : target.subUnitId);
+	const toSubUnitId = params.toSubUnitId ?? params.fromSubUnitId ?? (target === null || target === void 0 ? void 0 : target.subUnitId);
 	if (!unitId || !fromSubUnitId || !toSubUnitId) return null;
 	if (params.fromUnitId && params.toUnitId && params.fromUnitId !== params.toUnitId) return null;
 	const workbook = univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
@@ -5136,7 +5098,6 @@ function _resolveMoveRangeContext(accessor, params) {
 	};
 }
 function getMoveRangeCommandMutations(accessor, params, options = {}) {
-	var _interceptorCommands$, _interceptorCommands$2;
 	const { includeSelection = true, includeAfterCommand = true, includeAutoHeight = true } = options;
 	const context = _resolveMoveRangeContext(accessor, params);
 	if (!context) return null;
@@ -5158,12 +5119,12 @@ function getMoveRangeCommandMutations(accessor, params, options = {}) {
 	};
 	const interceptorCommands = sheetInterceptorService.onCommandExecute(commandInfo);
 	const redos = [
-		...(_interceptorCommands$ = interceptorCommands.preRedos) !== null && _interceptorCommands$ !== void 0 ? _interceptorCommands$ : [],
+		...interceptorCommands.preRedos ?? [],
 		...moveRangeMutations.redos,
 		...interceptorCommands.redos
 	];
 	const undos = [
-		...(_interceptorCommands$2 = interceptorCommands.preUndos) !== null && _interceptorCommands$2 !== void 0 ? _interceptorCommands$2 : [],
+		...interceptorCommands.preUndos ?? [],
 		...moveRangeMutations.undos,
 		...interceptorCommands.undos
 	];
@@ -5231,8 +5192,7 @@ function getMoveRangeUndoRedoMutations(accessor, from, to, ignoreMerge = false)
 	const toRedoCellValue = new _univerjs_core.ObjectMatrix();
 	const toUndoCellValue = new _univerjs_core.ObjectMatrix();
 	_univerjs_core.Range.foreach(fromRange, (row, col) => {
-		var _Tools$deepClone;
-		const cellData = (_Tools$deepClone = _univerjs_core.Tools.deepClone(fromWorksheetCellMatrix.getValue(row, col))) !== null && _Tools$deepClone !== void 0 ? _Tools$deepClone : null;
+		const cellData = _univerjs_core.Tools.deepClone(fromWorksheetCellMatrix.getValue(row, col)) ?? null;
 		if (cellData === null || cellData === void 0 ? void 0 : cellData.s) cellData.s = workbook.getStyles().get(cellData.s);
 		fromRedoCellValue.setValue(row, col, null);
 		fromUndoCellValue.setValue(row, col, cellData);
@@ -5242,8 +5202,7 @@ function getMoveRangeUndoRedoMutations(accessor, from, to, ignoreMerge = false)
 		toRedoCellValue.setValue(range.startRow, range.startColumn, _univerjs_core.Tools.deepClone(cellData));
 	});
 	_univerjs_core.Range.foreach(toRange, (row, col) => {
-		var _Tools$deepClone2;
-		const cellData = (_Tools$deepClone2 = _univerjs_core.Tools.deepClone(toWorksheetCellMatrix.getValue(row, col))) !== null && _Tools$deepClone2 !== void 0 ? _Tools$deepClone2 : null;
+		const cellData = _univerjs_core.Tools.deepClone(toWorksheetCellMatrix.getValue(row, col)) ?? null;
 		toUndoCellValue.setValue(row, col, cellData);
 	});
 	const redoMoveRangeMutationParams = {
@@ -5310,7 +5269,7 @@ const SetRangeValuesCommand = {
 	id: "sheet.command.set-range-values",
 	type: _univerjs_core.CommandType.COMMAND,
 	handler: (accessor, params) => {
-		var _selectionManagerServ, _realCellValue;
+		var _selectionManagerServ;
 		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
 		if (!target) return false;
 		const currentSelections = (_selectionManagerServ = accessor.get(SheetsSelectionsService).getCurrentSelections()) === null || _selectionManagerServ === void 0 ? void 0 : _selectionManagerServ.map((s) => s.range);
@@ -5338,7 +5297,7 @@ const SetRangeValuesCommand = {
 		const setRangeValuesMutationRedoParams = {
 			unitId,
 			subUnitId,
-			cellValue: (_realCellValue = realCellValue) !== null && _realCellValue !== void 0 ? _realCellValue : cellValue.getMatrix()
+			cellValue: realCellValue ?? cellValue.getMatrix()
 		};
 		const setRangeValuesMutationUndoParams = SetRangeValuesUndoMutationFactory(accessor, setRangeValuesMutationRedoParams);
 		const cellHeights = (0, _univerjs_core.mapObjectMatrix)(setRangeValuesMutationRedoParams.cellValue, (row, col) => worksheet.getCellHeight(row, col) || void 0);
@@ -5630,7 +5589,6 @@ const DeleteRangeMoveLeftCommand = {
 	type: _univerjs_core.CommandType.COMMAND,
 	id: DeleteRangeMoveLeftCommandId,
 	handler: async (accessor, params) => {
-		var _sheetInterceptor$pre, _sheetInterceptor$pre2;
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
 		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
@@ -5656,11 +5614,11 @@ const DeleteRangeMoveLeftCommand = {
 			params: { range }
 		});
 		const { redo: removeRangeRedo, undo: removeRangeUndo } = getRemoveRangeMutations(accessor, deleteRangeMutationParams);
-		const redos = [...(_sheetInterceptor$pre = sheetInterceptor.preRedos) !== null && _sheetInterceptor$pre !== void 0 ? _sheetInterceptor$pre : [], ...removeRangeRedo];
+		const redos = [...sheetInterceptor.preRedos ?? [], ...removeRangeRedo];
 		const undos = [...sheetInterceptor.undos, ...removeRangeUndo];
 		redos.push(...sheetInterceptor.redos);
 		redos.push(followSelectionOperation(range, workbook, worksheet));
-		undos.push(...(_sheetInterceptor$pre2 = sheetInterceptor.preUndos) !== null && _sheetInterceptor$pre2 !== void 0 ? _sheetInterceptor$pre2 : []);
+		undos.push(...sheetInterceptor.preUndos ?? []);
 		if ((0, _univerjs_core.sequenceExecute)(redos, commandService).result) {
 			const afterInterceptors = sheetInterceptorService.afterCommandExecute({
 				id: DeleteRangeMoveLeftCommand.id,
@@ -5690,7 +5648,6 @@ const DeleteRangeMoveUpCommand = {
 	type: _univerjs_core.CommandType.COMMAND,
 	id: DeleteRangeMoveUpCommandId,
 	handler: async (accessor, params) => {
-		var _sheetInterceptor$pre, _sheetInterceptor$pre2;
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
 		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
@@ -5716,11 +5673,11 @@ const DeleteRangeMoveUpCommand = {
 			params: { range }
 		});
 		const { redo: removeRangeRedo, undo: removeRangeUndo } = getRemoveRangeMutations(accessor, deleteRangeMutationParams);
-		const redos = [...(_sheetInterceptor$pre = sheetInterceptor.preRedos) !== null && _sheetInterceptor$pre !== void 0 ? _sheetInterceptor$pre : [], ...removeRangeRedo];
+		const redos = [...sheetInterceptor.preRedos ?? [], ...removeRangeRedo];
 		const undos = [...sheetInterceptor.undos, ...removeRangeUndo];
 		redos.push(...sheetInterceptor.redos);
 		redos.push(followSelectionOperation(range, workbook, worksheet));
-		undos.push(...(_sheetInterceptor$pre2 = sheetInterceptor.preUndos) !== null && _sheetInterceptor$pre2 !== void 0 ? _sheetInterceptor$pre2 : []);
+		undos.push(...sheetInterceptor.preUndos ?? []);
 		if ((0, _univerjs_core.sequenceExecute)(redos, commandService).result) {
 			const afterInterceptors = sheetInterceptorService.afterCommandExecute({
 				id: DeleteRangeMoveUpCommand.id,
@@ -5750,7 +5707,6 @@ const InsertRangeMoveDownCommand = {
 	type: _univerjs_core.CommandType.COMMAND,
 	id: InsertRangeMoveDownCommandId,
 	handler: async (accessor, params) => {
-		var _sheetInterceptor$pre, _sheetInterceptor$pre2;
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
 		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
@@ -5826,8 +5782,8 @@ const InsertRangeMoveDownCommand = {
 		});
 		redoMutations.push(...sheetInterceptor.redos);
 		redoMutations.push(followSelectionOperation(range, workbook, worksheet));
-		undoMutations.push(...(_sheetInterceptor$pre = sheetInterceptor.preUndos) !== null && _sheetInterceptor$pre !== void 0 ? _sheetInterceptor$pre : []);
-		redoMutations.unshift(...(_sheetInterceptor$pre2 = sheetInterceptor.preRedos) !== null && _sheetInterceptor$pre2 !== void 0 ? _sheetInterceptor$pre2 : []);
+		undoMutations.push(...sheetInterceptor.preUndos ?? []);
+		redoMutations.unshift(...sheetInterceptor.preRedos ?? []);
 		undoMutations.unshift(...sheetInterceptor.undos);
 		if ((0, _univerjs_core.sequenceExecute)(redoMutations, commandService).result) {
 			const afterInterceptors = sheetInterceptorService.afterCommandExecute({
@@ -5858,7 +5814,6 @@ const InsertRangeMoveRightCommand = {
 	type: _univerjs_core.CommandType.COMMAND,
 	id: InsertRangeMoveRightCommandId,
 	handler: async (accessor, params) => {
-		var _sheetInterceptor$pre, _sheetInterceptor$pre2;
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
 		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
@@ -5934,8 +5889,8 @@ const InsertRangeMoveRightCommand = {
 		});
 		redoMutations.push(...sheetInterceptor.redos);
 		redoMutations.push(followSelectionOperation(range, workbook, worksheet));
-		undoMutations.push(...(_sheetInterceptor$pre = sheetInterceptor.preUndos) !== null && _sheetInterceptor$pre !== void 0 ? _sheetInterceptor$pre : []);
-		redoMutations.unshift(...(_sheetInterceptor$pre2 = sheetInterceptor.preRedos) !== null && _sheetInterceptor$pre2 !== void 0 ? _sheetInterceptor$pre2 : []);
+		undoMutations.push(...sheetInterceptor.preUndos ?? []);
+		redoMutations.unshift(...sheetInterceptor.preRedos ?? []);
 		undoMutations.unshift(...sheetInterceptor.undos);
 		if ((0, _univerjs_core.sequenceExecute)(redoMutations, commandService).result) {
 			const afterInterceptors = sheetInterceptorService.afterCommandExecute({
@@ -5988,7 +5943,6 @@ const InsertRowByRangeCommand = {
 	type: _univerjs_core.CommandType.COMMAND,
 	id: "sheet.command.insert-row-by-range",
 	handler: (accessor, params) => {
-		var _intercepted$preRedos, _intercepted$redos, _intercepted$preUndos, _intercepted$undos;
 		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
 		if (!target) throw new Error("Workbook or Worksheet not found at InsertRowByRangeCommand");
 		const { workbook, worksheet, unitId, subUnitId } = target;
@@ -6031,11 +5985,11 @@ const InsertRowByRangeCommand = {
 			id: InsertRowCommand.id,
 			params
 		});
-		redos.unshift(...(_intercepted$preRedos = intercepted.preRedos) !== null && _intercepted$preRedos !== void 0 ? _intercepted$preRedos : []);
-		redos.push(...(_intercepted$redos = intercepted.redos) !== null && _intercepted$redos !== void 0 ? _intercepted$redos : []);
+		redos.unshift(...intercepted.preRedos ?? []);
+		redos.push(...intercepted.redos ?? []);
 		redos.push(followSelectionOperation(range, workbook, worksheet));
-		undos.unshift(...(_intercepted$preUndos = intercepted.preUndos) !== null && _intercepted$preUndos !== void 0 ? _intercepted$preUndos : []);
-		undos.push(...(_intercepted$undos = intercepted.undos) !== null && _intercepted$undos !== void 0 ? _intercepted$undos : []);
+		undos.unshift(...intercepted.preUndos ?? []);
+		undos.push(...intercepted.undos ?? []);
 		if ((0, _univerjs_core.sequenceExecute)(redos, commandService).result) {
 			const afterInterceptors = sheetInterceptorService.afterCommandExecute({
 				id: InsertRowCommand.id,
@@ -6211,7 +6165,6 @@ const InsertColByRangeCommand = {
 	type: _univerjs_core.CommandType.COMMAND,
 	id: "sheet.command.insert-col-by-range",
 	handler: (accessor, params) => {
-		var _intercepted$preRedos2, _intercepted$redos2, _intercepted$preUndos2, _intercepted$undos2;
 		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
 		if (!target) throw new Error("Workbook or Worksheet not found at InsertColByRangeCommand");
 		const { workbook, worksheet, unitId, subUnitId } = target;
@@ -6254,11 +6207,11 @@ const InsertColByRangeCommand = {
 			id: InsertColCommand.id,
 			params
 		});
-		redos.unshift(...(_intercepted$preRedos2 = intercepted.preRedos) !== null && _intercepted$preRedos2 !== void 0 ? _intercepted$preRedos2 : []);
-		redos.push(...(_intercepted$redos2 = intercepted.redos) !== null && _intercepted$redos2 !== void 0 ? _intercepted$redos2 : []);
+		redos.unshift(...intercepted.preRedos ?? []);
+		redos.push(...intercepted.redos ?? []);
 		redos.push(followSelectionOperation(range, workbook, worksheet));
-		undos.unshift(...(_intercepted$preUndos2 = intercepted.preUndos) !== null && _intercepted$preUndos2 !== void 0 ? _intercepted$preUndos2 : []);
-		undos.push(...(_intercepted$undos2 = intercepted.undos) !== null && _intercepted$undos2 !== void 0 ? _intercepted$undos2 : []);
+		undos.unshift(...intercepted.preUndos ?? []);
+		undos.push(...intercepted.undos ?? []);
 		if ((0, _univerjs_core.sequenceExecute)(redos, commandService).result) {
 			const afterInterceptors = sheetInterceptorService.afterCommandExecute({
 				id: InsertColCommand.id,
@@ -6420,7 +6373,6 @@ const RemoveRowByRangeCommand = {
 	type: _univerjs_core.CommandType.COMMAND,
 	id: "sheet.command.remove-row-by-range",
 	handler: (accessor, params) => {
-		var _intercepted$preRedos;
 		if (!params) return false;
 		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
 		if (!target) return false;
@@ -6467,11 +6419,10 @@ const RemoveRowByRangeCommand = {
 		});
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		if ((0, _univerjs_core.sequenceExecute)([
-			...(_intercepted$preRedos = intercepted.preRedos) !== null && _intercepted$preRedos !== void 0 ? _intercepted$preRedos : [],
+			...intercepted.preRedos ?? [],
 			...redoMutations,
 			...intercepted.redos
 		], commandService).result) {
-			var _intercepted$preUndos, _intercepted$preRedos2;
 			setSelection(range, workbook, worksheet, commandService);
 			const afterInterceptors = sheetInterceptorService.afterCommandExecute({
 				id: RemoveRowCommandId,
@@ -6481,13 +6432,13 @@ const RemoveRowByRangeCommand = {
 			accessor.get(_univerjs_core.IUndoRedoService).pushUndoRedo({
 				unitID: unitId,
 				undoMutations: [
-					...(_intercepted$preUndos = intercepted.preUndos) !== null && _intercepted$preUndos !== void 0 ? _intercepted$preUndos : [],
+					...intercepted.preUndos ?? [],
 					...undoMutations,
 					...intercepted.undos,
 					...afterInterceptors.undos
 				],
 				redoMutations: [
-					...(_intercepted$preRedos2 = intercepted.preRedos) !== null && _intercepted$preRedos2 !== void 0 ? _intercepted$preRedos2 : [],
+					...intercepted.preRedos ?? [],
 					...redoMutations,
 					...intercepted.redos,
 					...afterInterceptors.redos
@@ -6539,7 +6490,6 @@ const RemoveColByRangeCommand = {
 	type: _univerjs_core.CommandType.COMMAND,
 	id: "sheet.command.remove-col-by-range",
 	handler: (accessor, params) => {
-		var _intercepted$preRedos3;
 		if (!params) return false;
 		const target = getSheetCommandTarget(accessor.get(_univerjs_core.IUniverInstanceService), params);
 		if (!target) return false;
@@ -6564,14 +6514,13 @@ const RemoveColByRangeCommand = {
 		});
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		if ((0, _univerjs_core.sequenceExecute)([
-			...(_intercepted$preRedos3 = intercepted.preRedos) !== null && _intercepted$preRedos3 !== void 0 ? _intercepted$preRedos3 : [],
+			...intercepted.preRedos ?? [],
 			{
 				id: RemoveColMutation.id,
 				params: removeColParams
 			},
 			...intercepted.redos
 		], commandService).result) {
-			var _intercepted$preUndos2, _intercepted$preRedos4;
 			setSelection(range, workbook, worksheet, commandService);
 			const afterInterceptors = sheetInterceptorService.afterCommandExecute({
 				id: RemoveColCommandId,
@@ -6581,7 +6530,7 @@ const RemoveColByRangeCommand = {
 			accessor.get(_univerjs_core.IUndoRedoService).pushUndoRedo({
 				unitID: unitId,
 				undoMutations: [
-					...(_intercepted$preUndos2 = intercepted.preUndos) !== null && _intercepted$preUndos2 !== void 0 ? _intercepted$preUndos2 : [],
+					...intercepted.preUndos ?? [],
 					{
 						id: InsertColMutation.id,
 						params: undoRemoveColParams
@@ -6594,7 +6543,7 @@ const RemoveColByRangeCommand = {
 					...afterInterceptors.undos
 				],
 				redoMutations: [
-					...(_intercepted$preRedos4 = intercepted.preRedos) !== null && _intercepted$preRedos4 !== void 0 ? _intercepted$preRedos4 : [],
+					...intercepted.preRedos ?? [],
 					{
 						id: RemoveColMutation.id,
 						params: removeColParams
@@ -6696,7 +6645,6 @@ const MoveRowsCommand = {
 	id: MoveRowsCommandId,
 	type: _univerjs_core.CommandType.COMMAND,
 	handler: (accessor, params) => {
-		var _interceptorCommands$, _interceptorCommands$2;
 		const selectionManagerService = accessor.get(SheetsSelectionsService);
 		const { fromRange: { startRow: fromRow }, toRange: { startRow: toRow }, range } = params;
 		const selections = range ? [covertRangeToSelection(range)] : selectionManagerService.getCurrentSelections();
@@ -6738,11 +6686,11 @@ const MoveRowsCommand = {
 			id: MoveRowsCommand.id,
 			params
 		});
-		const redos = [...(_interceptorCommands$ = interceptorCommands.preRedos) !== null && _interceptorCommands$ !== void 0 ? _interceptorCommands$ : [], {
+		const redos = [...interceptorCommands.preRedos ?? [], {
 			id: MoveRowsMutation.id,
 			params: moveRowsParams
 		}];
-		const undos = [...(_interceptorCommands$2 = interceptorCommands.preUndos) !== null && _interceptorCommands$2 !== void 0 ? _interceptorCommands$2 : [], {
+		const undos = [...interceptorCommands.preUndos ?? [], {
 			id: MoveRowsMutation.id,
 			params: undoMoveRowsParams
 		}];
@@ -6808,7 +6756,6 @@ const MoveColsCommand = {
 	id: MoveColsCommandId,
 	type: _univerjs_core.CommandType.COMMAND,
 	handler: (accessor, params) => {
-		var _interceptorCommands$3, _interceptorCommands$4;
 		const selectionManagerService = accessor.get(SheetsSelectionsService);
 		const { fromRange: { startColumn: fromCol }, toRange: { startColumn: toCol }, range } = params;
 		const selections = range ? [covertRangeToSelection(range)] : selectionManagerService.getCurrentSelections();
@@ -6850,11 +6797,11 @@ const MoveColsCommand = {
 			id: MoveColsCommand.id,
 			params
 		});
-		const redos = [...(_interceptorCommands$3 = interceptorCommands.preRedos) !== null && _interceptorCommands$3 !== void 0 ? _interceptorCommands$3 : [], {
+		const redos = [...interceptorCommands.preRedos ?? [], {
 			id: MoveColsMutation.id,
 			params: moveColsParams
 		}];
-		const undos = [...(_interceptorCommands$4 = interceptorCommands.preUndos) !== null && _interceptorCommands$4 !== void 0 ? _interceptorCommands$4 : [], {
+		const undos = [...interceptorCommands.preUndos ?? [], {
 			id: MoveColsMutation.id,
 			params: undoMoveColsParams
 		}];
@@ -6929,7 +6876,6 @@ const ReorderRangeCommand = {
 	id: ReorderRangeCommandId,
 	type: _univerjs_core.CommandType.COMMAND,
 	handler: (accessor, params) => {
-		var _interceptorCommands$, _interceptorCommands$2;
 		const { subUnitId, unitId, range, order } = params;
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const reorderMutation = {
@@ -6951,12 +6897,12 @@ const ReorderRangeCommand = {
 			params
 		});
 		const redos = [
-			...(_interceptorCommands$ = interceptorCommands.preRedos) !== null && _interceptorCommands$ !== void 0 ? _interceptorCommands$ : [],
+			...interceptorCommands.preRedos ?? [],
 			reorderMutation,
 			...interceptorCommands.redos
 		];
 		const undos = [
-			...(_interceptorCommands$2 = interceptorCommands.preUndos) !== null && _interceptorCommands$2 !== void 0 ? _interceptorCommands$2 : [],
+			...interceptorCommands.preUndos ?? [],
 			undoReorderMutation,
 			...interceptorCommands.undos
 		];
@@ -7053,6 +6999,88 @@ const rotateRange = (range) => {
 		rangeType
 	};
 };
+function mergeAndSortRanges(ranges) {
+	return sortRanges(ranges.length > 1 ? _univerjs_core.Rectangle.mergeRanges(ranges) : ranges);
+}
+function sortRanges(ranges) {
+	return ranges.sort((a, b) => a.startRow - b.startRow || a.startColumn - b.startColumn || a.endRow - b.endRow || a.endColumn - b.endColumn);
+}
+function translateRange(range, rowOffset, columnOffset) {
+	return {
+		startRow: range.startRow + rowOffset,
+		endRow: range.endRow + rowOffset,
+		startColumn: range.startColumn + columnOffset,
+		endColumn: range.endColumn + columnOffset
+	};
+}
+function moveRangeAlongAxis(targetRange, from, count, to, isRow) {
+	let transforms;
+	if (from > to) transforms = [
+		{
+			start: Number.NEGATIVE_INFINITY,
+			end: to - 1,
+			offset: 0
+		},
+		{
+			start: to,
+			end: from - 1,
+			offset: count
+		},
+		{
+			start: from,
+			end: from + count - 1,
+			offset: to - from
+		},
+		{
+			start: from + count,
+			end: Number.POSITIVE_INFINITY,
+			offset: 0
+		}
+	];
+	else {
+		if (from + count > to) throw new Error("Invalid move operation");
+		transforms = [
+			{
+				start: Number.NEGATIVE_INFINITY,
+				end: from - 1,
+				offset: 0
+			},
+			{
+				start: from,
+				end: from + count - 1,
+				offset: to - from - count
+			},
+			{
+				start: from + count,
+				end: to - 1,
+				offset: -count
+			},
+			{
+				start: to,
+				end: Number.POSITIVE_INFINITY,
+				offset: 0
+			}
+		];
+	}
+	const rangeStart = isRow ? targetRange.startRow : targetRange.startColumn;
+	const rangeEnd = isRow ? targetRange.endRow : targetRange.endColumn;
+	return mergeAndSortRanges(transforms.flatMap(({ start, end, offset }) => {
+		const intersectStart = Math.max(rangeStart, start);
+		const intersectEnd = Math.min(rangeEnd, end);
+		if (intersectStart > intersectEnd) return [];
+		return [translateRange(isRow ? {
+			startRow: intersectStart,
+			endRow: intersectEnd,
+			startColumn: targetRange.startColumn,
+			endColumn: targetRange.endColumn
+		} : {
+			startRow: targetRange.startRow,
+			endRow: targetRange.endRow,
+			startColumn: intersectStart,
+			endColumn: intersectEnd
+		}, isRow ? offset : 0, isRow ? 0 : offset)];
+	}));
+}
 /**
 * see docs/tldr/ref-range/move-rows-cols.tldr
 */
@@ -7158,33 +7186,33 @@ const handleMoveRowsCommon = (params, targetRange) => {
 	const fromRow = fromRange.startRow;
 	const count = fromRange.endRow - fromRange.startRow + 1;
 	const toRow = toRange.startRow;
-	const matrix = new _univerjs_core.ObjectMatrix();
-	_univerjs_core.Range.foreach(targetRange, (row, col) => {
-		matrix.setValue(row, col, 1);
-	});
-	matrix.moveRows(fromRow, count, toRow);
-	return (0, _univerjs_core.queryObjectMatrix)(matrix, (value) => value === 1);
+	return moveRangeAlongAxis(targetRange, fromRow, count, toRow, true);
 };
 const handleReorderRangeCommon = (param, targetRange) => {
 	const { range, order } = param.params || {};
 	if (!range || !order) return [targetRange];
-	const matrix = new _univerjs_core.ObjectMatrix();
-	_univerjs_core.Range.foreach(targetRange, (row, col) => {
-		matrix.setValue(row, col, 1);
-	});
-	const cacheMatrix = new _univerjs_core.ObjectMatrix();
-	_univerjs_core.Range.foreach(range, (row, col) => {
-		if (Object.prototype.hasOwnProperty.call(order, row)) {
-			var _matrix$getValue;
-			const targetRow = order[row];
-			const cloneCell = (_matrix$getValue = matrix.getValue(targetRow, col)) !== null && _matrix$getValue !== void 0 ? _matrix$getValue : 0;
-			cacheMatrix.setValue(row, col, cloneCell);
-		}
-	});
-	cacheMatrix.forValue((row, col, cellData) => {
-		matrix.setValue(row, col, cellData);
+	const overwrittenRows = [];
+	const additions = [];
+	const startColumn = Math.max(range.startColumn, targetRange.startColumn);
+	const endColumn = Math.min(range.endColumn, targetRange.endColumn);
+	Object.keys(order).forEach((key) => {
+		const row = Number(key);
+		if (row < range.startRow || row > range.endRow) return;
+		overwrittenRows.push({
+			startRow: row,
+			endRow: row,
+			startColumn: range.startColumn,
+			endColumn: range.endColumn
+		});
+		const sourceRow = order[row];
+		if (sourceRow >= targetRange.startRow && sourceRow <= targetRange.endRow && startColumn <= endColumn) additions.push({
+			startRow: row,
+			endRow: row,
+			startColumn,
+			endColumn
+		});
 	});
-	return (0, _univerjs_core.queryObjectMatrix)(matrix, (value) => value === 1);
+	return mergeAndSortRanges([..._univerjs_core.Rectangle.subtractMulti([targetRange], overwrittenRows), ...additions]);
 };
 const handleMoveCols = (params, targetRange) => {
 	const { fromRange, toRange } = params.params || {};
@@ -7215,12 +7243,7 @@ const handleMoveColsCommon = (params, targetRange) => {
 	const fromCol = fromRange.startColumn;
 	const count = fromRange.endColumn - fromRange.startColumn + 1;
 	const toCol = toRange.startColumn;
-	const matrix = new _univerjs_core.ObjectMatrix();
-	_univerjs_core.Range.foreach(targetRange, (row, col) => {
-		matrix.setValue(row, col, 1);
-	});
-	matrix.moveColumns(fromCol, count, toCol);
-	return (0, _univerjs_core.queryObjectMatrix)(matrix, (value) => value === 1);
+	return moveRangeAlongAxis(targetRange, fromCol, count, toCol, false);
 };
 const handleMoveRange = (param, targetRange) => {
 	var _param$params, _param$params2;
@@ -7250,33 +7273,12 @@ const handleMoveRangeCommon = (param, targetRange) => {
 		const relativeRange = _univerjs_core.Rectangle.getRelativeRange(targetRange, fromRange);
 		return [_univerjs_core.Rectangle.getPositionRange(relativeRange, toRange)];
 	}
-	const matrix = new _univerjs_core.ObjectMatrix();
-	_univerjs_core.Range.foreach(targetRange, (row, col) => {
-		matrix.setValue(row, col, 1);
-	});
-	const fromMatrix = new _univerjs_core.ObjectMatrix();
-	const loopFromRange = (0, _univerjs_core.getIntersectRange)(fromRange, targetRange);
-	loopFromRange && _univerjs_core.Range.foreach(loopFromRange, (row, col) => {
-		if (matrix.getValue(row, col)) {
-			matrix.setValue(row, col, void 0);
-			fromMatrix.setValue(row, col, 1);
-		}
-	});
 	const columnOffset = toRange.startColumn - fromRange.startColumn;
 	const rowOffset = toRange.startRow - fromRange.startRow;
-	const loopToRange = {
-		startColumn: toRange.startColumn - columnOffset,
-		endColumn: toRange.endColumn - columnOffset,
-		startRow: toRange.startRow - rowOffset,
-		endRow: toRange.endRow - rowOffset
-	};
-	loopToRange && _univerjs_core.Range.foreach(loopToRange, (row, col) => {
-		var _fromMatrix$getValue;
-		const targetRow = row + rowOffset;
-		const targetCol = col + columnOffset;
-		matrix.setValue(targetRow, targetCol, (_fromMatrix$getValue = fromMatrix.getValue(row, col)) !== null && _fromMatrix$getValue !== void 0 ? _fromMatrix$getValue : 0);
-	});
-	return (0, _univerjs_core.queryObjectMatrix)(matrix, (value) => value === 1);
+	const movedRange = (0, _univerjs_core.getIntersectRange)(fromRange, targetRange);
+	const remainingRanges = _univerjs_core.Rectangle.subtractMulti([targetRange], [fromRange, toRange]);
+	const translatedRanges = movedRange ? [translateRange(movedRange, rowOffset, columnOffset)] : [];
+	return mergeAndSortRanges([...remainingRanges, ...translatedRanges]);
 };
 const handleBaseRemoveRange = (_removeRange, _targetRange) => {
 	const removeRange = handleRangeTypeInput(_removeRange);
@@ -7486,16 +7488,7 @@ const handleInsertRangeMoveDownCommon = (param, targetRange) => {
 	const noMoveRanges = _univerjs_core.Rectangle.subtract(targetRange, bottomRange);
 	const targetMoveRange = (0, _univerjs_core.getIntersectRange)(bottomRange, targetRange);
 	if (!targetMoveRange) return [targetRange];
-	const matrix = new _univerjs_core.ObjectMatrix();
-	noMoveRanges.forEach((noMoveRange) => {
-		_univerjs_core.Range.foreach(noMoveRange, (row, col) => {
-			matrix.setValue(row, col, 1);
-		});
-	});
-	targetMoveRange && _univerjs_core.Range.foreach(targetMoveRange, (row, col) => {
-		matrix.setValue(row + moveCount, col, 1);
-	});
-	return (0, _univerjs_core.queryObjectMatrix)(matrix, (v) => v === 1);
+	return sortRanges([...noMoveRanges, translateRange(targetMoveRange, moveCount, 0)]);
 };
 const handleInsertRangeMoveRight = (param, targetRange) => {
 	var _param$params11;
@@ -7523,16 +7516,7 @@ const handleInsertRangeMoveRightCommon = (param, targetRange) => {
 	const noMoveRanges = _univerjs_core.Rectangle.subtract(targetRange, bottomRange);
 	const targetMoveRange = (0, _univerjs_core.getIntersectRange)(bottomRange, targetRange);
 	if (!targetMoveRange) return [targetRange];
-	const matrix = new _univerjs_core.ObjectMatrix();
-	noMoveRanges.forEach((noMoveRange) => {
-		_univerjs_core.Range.foreach(noMoveRange, (row, col) => {
-			matrix.setValue(row, col, 1);
-		});
-	});
-	targetMoveRange && _univerjs_core.Range.foreach(targetMoveRange, (row, col) => {
-		matrix.setValue(row, col + moveCount, 1);
-	});
-	return (0, _univerjs_core.queryObjectMatrix)(matrix, (v) => v === 1);
+	return sortRanges([...noMoveRanges, translateRange(targetMoveRange, 0, moveCount)]);
 };
 const handleDeleteRangeMoveLeft = (param, targetRange) => {
 	var _param$params13;
@@ -7562,23 +7546,11 @@ const handleDeleteRangeMoveLeftCommon = (param, targetRange) => {
 		endColumn: Number.POSITIVE_INFINITY
 	};
 	const moveCount = range.endColumn - range.startColumn + 1;
-	const targetDeleteRange = (0, _univerjs_core.getIntersectRange)(range, targetRange);
 	const noMoveRanges = _univerjs_core.Rectangle.subtract(targetRange, rightRange);
 	const targetMoveRange = (0, _univerjs_core.getIntersectRange)(rightRange, targetRange);
-	if (!targetDeleteRange && !targetMoveRange) return [targetRange];
-	const matrix = new _univerjs_core.ObjectMatrix();
-	targetMoveRange && _univerjs_core.Range.foreach(targetMoveRange, (row, col) => {
-		matrix.setValue(row, col - moveCount, 1);
-	});
-	targetDeleteRange && _univerjs_core.Range.foreach(targetDeleteRange, (row, col) => {
-		matrix.setValue(row, col - moveCount, 0);
-	});
-	noMoveRanges.forEach((noMoveRange) => {
-		_univerjs_core.Range.foreach(noMoveRange, (row, col) => {
-			matrix.setValue(row, col, 1);
-		});
-	});
-	return (0, _univerjs_core.queryObjectMatrix)(matrix, (v) => v === 1);
+	if (!targetMoveRange) return [targetRange];
+	const movedRanges = targetMoveRange ? _univerjs_core.Rectangle.subtract(targetMoveRange, range).map((target) => translateRange(target, 0, -moveCount)) : [];
+	return mergeAndSortRanges([...noMoveRanges, ...movedRanges]);
 };
 const handleDeleteRangeMoveUp = (param, targetRange) => {
 	var _param$params15;
@@ -7607,27 +7579,14 @@ const handleDeleteRangeMoveUpCommon = (param, targetRange) => {
 		endRow: Number.POSITIVE_INFINITY
 	};
 	const moveCount = range.endRow - range.startRow + 1;
-	const targetDeleteRange = (0, _univerjs_core.getIntersectRange)(range, targetRange);
 	const noMoveRanges = _univerjs_core.Rectangle.subtract(targetRange, bottomRange);
 	const targetMoveRange = (0, _univerjs_core.getIntersectRange)(bottomRange, targetRange);
-	if (!targetDeleteRange && !targetMoveRange) return [targetRange];
-	const matrix = new _univerjs_core.ObjectMatrix();
-	targetMoveRange && _univerjs_core.Range.foreach(targetMoveRange, (row, col) => {
-		matrix.setValue(row - moveCount, col, 1);
-	});
-	targetDeleteRange && _univerjs_core.Range.foreach(targetDeleteRange, (row, col) => {
-		matrix.setValue(row - moveCount, col, 0);
-	});
-	noMoveRanges.forEach((noMoveRange) => {
-		_univerjs_core.Range.foreach(noMoveRange, (row, col) => {
-			matrix.setValue(row, col, 1);
-		});
-	});
-	return (0, _univerjs_core.queryObjectMatrix)(matrix, (v) => v === 1);
+	if (!targetMoveRange) return [targetRange];
+	const movedRanges = targetMoveRange ? _univerjs_core.Rectangle.subtract(targetMoveRange, range).map((target) => translateRange(target, -moveCount, 0)) : [];
+	return mergeAndSortRanges([...noMoveRanges, ...movedRanges]);
 };
 const handleRemoveRowCommon = (param, targetRange) => {
-	var _param$ranges;
-	const mergedRemoved = (0, _univerjs_core.mergeIntervals)(((_param$ranges = param.ranges) !== null && _param$ranges !== void 0 ? _param$ranges : [param.range]).map((range) => [range.startRow, range.endRow]));
+	const mergedRemoved = (0, _univerjs_core.mergeIntervals)((param.ranges ?? [param.range]).map((range) => [range.startRow, range.endRow]));
 	let targetStartRow = targetRange.startRow;
 	let targetEndRow = targetRange.endRow;
 	for (let i = mergedRemoved.length - 1; i >= 0; i--) {
@@ -8178,8 +8137,9 @@ function getSeparateEffectedRangesOnCommand(accessor, command) {
 const MERGE_REDO = (0, _univerjs_core.createInterceptorKey)("MERGE_REDO");
 const MERGE_UNDO = (0, _univerjs_core.createInterceptorKey)("MERGE_UNDO");
 var WatchRange = class extends _univerjs_core.Disposable {
-	constructor(_unitId, _subUnitId, _range, _callback, _skipIntersects = false) {
+	constructor(revision, _unitId, _subUnitId, _range, _callback, _skipIntersects = false) {
 		super();
+		this.revision = revision;
 		this._unitId = _unitId;
 		this._subUnitId = _subUnitId;
 		this._range = _range;
@@ -8218,6 +8178,8 @@ let RefRangeService = class RefRangeService extends _univerjs_core.Disposable {
 			MERGE_UNDO
 		}));
 		_defineProperty(this, "_watchRanges", /* @__PURE__ */ new Set());
+		_defineProperty(this, "_watchRangesListener", null);
+		_defineProperty(this, "_watchRangeRevision", 0);
 		_defineProperty(this, "_refRangeManagerMap", /* @__PURE__ */ new Map());
 		_defineProperty(this, "_serializer", createRangeSerializer());
 		_defineProperty(this, "_onRefRangeChange", () => {
@@ -8249,15 +8211,14 @@ let RefRangeService = class RefRangeService extends _univerjs_core.Disposable {
 							}], unitId, subUnitId);
 						}
 						case EffectRefRangId.MoveRangeCommandId: {
-							var _params$toUnitId, _params$toSubUnitId;
 							const params = command.params;
 							const sourceTarget = getSheetCommandTarget(this._univerInstanceService, {
 								unitId: params.fromUnitId,
 								subUnitId: params.fromSubUnitId
 							});
 							const destinationTarget = getSheetCommandTarget(this._univerInstanceService, {
-								unitId: (_params$toUnitId = params.toUnitId) !== null && _params$toUnitId !== void 0 ? _params$toUnitId : params.fromUnitId,
-								subUnitId: (_params$toSubUnitId = params.toSubUnitId) !== null && _params$toSubUnitId !== void 0 ? _params$toSubUnitId : params.fromSubUnitId
+								unitId: params.toUnitId ?? params.fromUnitId,
+								subUnitId: params.toSubUnitId ?? params.fromSubUnitId
 							});
 							if (!sourceTarget && !destinationTarget) return [];
 							if (sourceTarget && destinationTarget && sourceTarget.unitId === destinationTarget.unitId && sourceTarget.subUnitId === destinationTarget.subUnitId) return this._checkRange([params.fromRange, params.toRange], sourceTarget.unitId, sourceTarget.subUnitId);
@@ -8375,11 +8336,10 @@ let RefRangeService = class RefRangeService extends _univerjs_core.Disposable {
 					result.push(v);
 					return result;
 				}, []).reduce((result, currentValue) => {
-					var _currentValue$preRedo, _currentValue$preUndo;
 					result.redos.push(...currentValue.redos);
 					result.undos.push(...currentValue.undos);
-					result.preRedos.push(...(_currentValue$preRedo = currentValue.preRedos) !== null && _currentValue$preRedo !== void 0 ? _currentValue$preRedo : []);
-					result.preUndos.push(...(_currentValue$preUndo = currentValue.preUndos) !== null && _currentValue$preUndo !== void 0 ? _currentValue$preUndo : []);
+					result.preRedos.push(...currentValue.preRedos ?? []);
+					result.preUndos.push(...currentValue.preUndos ?? []);
 					return result;
 				}, {
 					redos: [],
@@ -8470,18 +8430,22 @@ let RefRangeService = class RefRangeService extends _univerjs_core.Disposable {
 		});
 	}
 	watchRange(unitId, subUnitId, range, callback, skipIntersects) {
-		let watchRangesListener;
-		if (this._watchRanges.size === 0) watchRangesListener = this._commandService.onCommandExecuted((command) => {
+		if (!this._watchRangesListener) this._watchRangesListener = this.disposeWithMe(this._commandService.onCommandExecuted((command) => {
 			if (command.type !== _univerjs_core.CommandType.MUTATION) return false;
-			for (const watchRange of this._watchRanges) watchRange.onMutation(command);
-		});
-		const watchRange = new WatchRange(unitId, subUnitId, range, callback, skipIntersects);
+			const revision = this._watchRangeRevision;
+			for (const watchRange of this._watchRanges) {
+				if (watchRange.revision > revision) continue;
+				watchRange.onMutation(command);
+			}
+		}));
+		const watchRange = new WatchRange(++this._watchRangeRevision, unitId, subUnitId, range, callback, skipIntersects);
 		this._watchRanges.add(watchRange);
 		const teardownWatching = (0, _univerjs_core.toDisposable)(() => {
 			this._watchRanges.delete(watchRange);
 			if (this._watchRanges.size === 0) {
-				watchRangesListener === null || watchRangesListener === void 0 || watchRangesListener.dispose();
-				watchRangesListener = null;
+				var _this$_watchRangesLis;
+				(_this$_watchRangesLis = this._watchRangesListener) === null || _this$_watchRangesLis === void 0 || _this$_watchRangesLis.dispose();
+				this._watchRangesListener = null;
 			}
 		});
 		const registerToService = this.disposeWithMe(teardownWatching);
@@ -8875,11 +8839,10 @@ let MergeCellController = class MergeCellController extends _univerjs_core.Dispo
 		};
 	}
 	_handleMoveRangeCommand(params, unitId, subUnitId) {
-		var _params$fromSubUnitId, _params$toSubUnitId;
 		const workbook = getWorkbook(this._univerInstanceService, unitId);
 		if (!workbook) return this._handleNull();
-		const sourceSubUnitId = (_params$fromSubUnitId = params.fromSubUnitId) !== null && _params$fromSubUnitId !== void 0 ? _params$fromSubUnitId : subUnitId;
-		const targetSubUnitId = (_params$toSubUnitId = params.toSubUnitId) !== null && _params$toSubUnitId !== void 0 ? _params$toSubUnitId : sourceSubUnitId;
+		const sourceSubUnitId = params.fromSubUnitId ?? subUnitId;
+		const targetSubUnitId = params.toSubUnitId ?? sourceSubUnitId;
 		const sourceWorksheet = getWorksheet(workbook, sourceSubUnitId);
 		const targetWorksheet = getWorksheet(workbook, targetSubUnitId);
 		if (!sourceWorksheet || !targetWorksheet) return this._handleNull();
@@ -9797,8 +9760,8 @@ function getClearContentMutationParamForRange(worksheet, range) {
 	let leftTopCellValue = null;
 	cellMatrix.forValue((row, col, cellData) => {
 		if (cellData && row >= startRow && col >= startColumn) {
-			var _cellData$p$body$data, _cellData$p;
-			if (!leftTopCellValue && worksheet.cellHasValue(cellData) && (cellData.v !== "" || ((_cellData$p$body$data = (_cellData$p = cellData.p) === null || _cellData$p === void 0 || (_cellData$p = _cellData$p.body) === null || _cellData$p === void 0 || (_cellData$p = _cellData$p.dataStream) === null || _cellData$p === void 0 ? void 0 : _cellData$p.length) !== null && _cellData$p$body$data !== void 0 ? _cellData$p$body$data : 0) > 2)) leftTopCellValue = cellData;
+			var _cellData$p;
+			if (!leftTopCellValue && worksheet.cellHasValue(cellData) && (cellData.v !== "" || (((_cellData$p = cellData.p) === null || _cellData$p === void 0 || (_cellData$p = _cellData$p.body) === null || _cellData$p === void 0 || (_cellData$p = _cellData$p.dataStream) === null || _cellData$p === void 0 ? void 0 : _cellData$p.length) ?? 0) > 2)) leftTopCellValue = cellData;
 			redoMatrix.setValue(row, col, cellData.s ? {
 				v: null,
 				t: null,
@@ -12621,7 +12584,6 @@ function splitCellDataIntoBatches(unitId, subUnitId, cellData, batchSize) {
 }
 const COPY_SHEET_COMMAND_ID = "sheet.command.copy-sheet";
 function buildCopySheetMutations(accessor, workbook, worksheet, unitId, subUnitId, localeService, sheetInterceptorService) {
-	var _intercepted$preRedos, _intercepted$preUndos;
 	const pluginConfig = accessor.get(_univerjs_core.IConfigService).getConfig(SHEETS_PLUGIN_CONFIG_KEY);
 	const largeSheetConfig = {
 		...defaultLargeSheetOperationConfig,
@@ -12666,7 +12628,7 @@ function buildCopySheetMutations(accessor, workbook, worksheet, unitId, subUnitI
 	});
 	return {
 		redos: [
-			...(_intercepted$preRedos = intercepted.preRedos) !== null && _intercepted$preRedos !== void 0 ? _intercepted$preRedos : [],
+			...intercepted.preRedos ?? [],
 			{
 				id: InsertSheetMutation.id,
 				params: insertSheetMutationParams
@@ -12674,7 +12636,7 @@ function buildCopySheetMutations(accessor, workbook, worksheet, unitId, subUnitI
 			...intercepted.redos
 		],
 		undos: [
-			...(_intercepted$preUndos = intercepted.preUndos) !== null && _intercepted$preUndos !== void 0 ? _intercepted$preUndos : [],
+			...intercepted.preUndos ?? [],
 			{
 				id: RemoveSheetMutation.id,
 				params: removeSheetMutationParams
@@ -12889,8 +12851,7 @@ const InsertSheetCommand = {
 		const sheetName = sheet === null || sheet === void 0 ? void 0 : sheet.name;
 		const sheetConfig = (0, _univerjs_core.mergeWorksheetSnapshotWithDefault)(sheet || {});
 		if (params) {
-			var _params$index;
-			index = (_params$index = params.index) !== null && _params$index !== void 0 ? _params$index : index;
+			index = params.index ?? index;
 			sheetConfig.id = sheetId || (0, _univerjs_core.generateRandomId)();
 			sheetConfig.name = sheetName ? workbook.uniqueSheetName(sheetName) : workbook.generateNewSheetName(`${localeService.t("sheets.tabs.sheet")}`);
 		} else {
@@ -13005,7 +12966,6 @@ const RemoveDefinedNameCommand = {
 	id: "sheet.command.remove-defined-name",
 	type: _univerjs_core.CommandType.COMMAND,
 	handler: (accessor, params) => {
-		var _interceptorCommands$, _interceptorCommands$2;
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
 		const sheetInterceptorService = accessor.get(SheetInterceptorService);
@@ -13016,7 +12976,7 @@ const RemoveDefinedNameCommand = {
 			params
 		});
 		const redos = [
-			...(_interceptorCommands$ = interceptorCommands.preRedos) !== null && _interceptorCommands$ !== void 0 ? _interceptorCommands$ : [],
+			...interceptorCommands.preRedos ?? [],
 			{
 				id: _univerjs_engine_formula.RemoveDefinedNameMutation.id,
 				params: removeSheetMutationParams
@@ -13024,7 +12984,7 @@ const RemoveDefinedNameCommand = {
 			...interceptorCommands.redos
 		];
 		const undos = [
-			...(_interceptorCommands$2 = interceptorCommands.preUndos) !== null && _interceptorCommands$2 !== void 0 ? _interceptorCommands$2 : [],
+			...interceptorCommands.preUndos ?? [],
 			{
 				id: _univerjs_engine_formula.SetDefinedNameMutation.id,
 				params: removeSheetMutationParams
@@ -13052,7 +13012,6 @@ const RemoveSheetCommand = {
 	id: "sheet.command.remove-sheet",
 	type: _univerjs_core.CommandType.COMMAND,
 	handler: (accessor, params) => {
-		var _intercepted$preRedos, _intercepted$preUndos;
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
 		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
@@ -13082,7 +13041,7 @@ const RemoveSheetCommand = {
 			}
 		});
 		const redos = [
-			...(_intercepted$preRedos = intercepted.preRedos) !== null && _intercepted$preRedos !== void 0 ? _intercepted$preRedos : [],
+			...intercepted.preRedos ?? [],
 			{
 				id: RemoveSheetMutation.id,
 				params: RemoveSheetMutationParams
@@ -13090,7 +13049,7 @@ const RemoveSheetCommand = {
 			...intercepted.redos
 		];
 		const undos = isLargeSheet ? [] : [
-			...(_intercepted$preUndos = intercepted.preUndos) !== null && _intercepted$preUndos !== void 0 ? _intercepted$preUndos : [],
+			...intercepted.preUndos ?? [],
 			{
 				id: InsertSheetMutation.id,
 				params: InsertSheetMutationParams
@@ -13620,7 +13579,6 @@ const SetSpecificColsVisibleCommand = {
 		});
 		const interceptedResult = (0, _univerjs_core.sequenceExecute)([...intercepted.redos], commandService);
 		if (result.result && interceptedResult.result) {
-			var _intercepted$undos, _intercepted$preRedos;
 			const afterInterceptors = sheetInterceptorService.afterCommandExecute({
 				id: SetSpecificColsVisibleCommand.id,
 				params
@@ -13637,11 +13595,11 @@ const SetSpecificColsVisibleCommand = {
 						id: SetSelectionsOperation.id,
 						params: undoSetSelectionsOperationParams
 					},
-					...(_intercepted$undos = intercepted.undos) !== null && _intercepted$undos !== void 0 ? _intercepted$undos : [],
+					...intercepted.undos ?? [],
 					...afterInterceptors.undos
 				],
 				redoMutations: [
-					...(_intercepted$preRedos = intercepted.preRedos) !== null && _intercepted$preRedos !== void 0 ? _intercepted$preRedos : [],
+					...intercepted.preRedos ?? [],
 					{
 						id: SetColVisibleMutation.id,
 						params: redoMutationParams
@@ -13731,7 +13689,6 @@ const SetColHiddenCommand = {
 		});
 		const interceptedResult = (0, _univerjs_core.sequenceExecute)([...intercepted.redos], commandService);
 		if (result.result && interceptedResult.result) {
-			var _intercepted$undos2, _intercepted$preRedos2;
 			const afterInterceptors = sheetInterceptorService.afterCommandExecute({
 				id: SetColHiddenCommand.id,
 				params: redoMutationParams
@@ -13748,11 +13705,11 @@ const SetColHiddenCommand = {
 						id: SetSelectionsOperation.id,
 						params: undoSetSelectionsOperationParams
 					},
-					...(_intercepted$undos2 = intercepted.undos) !== null && _intercepted$undos2 !== void 0 ? _intercepted$undos2 : [],
+					...intercepted.undos ?? [],
 					...afterInterceptors.undos
 				],
 				redoMutations: [
-					...(_intercepted$preRedos2 = intercepted.preRedos) !== null && _intercepted$preRedos2 !== void 0 ? _intercepted$preRedos2 : [],
+					...intercepted.preRedos ?? [],
 					{
 						id: SetColHiddenMutation.id,
 						params: redoMutationParams
@@ -13861,7 +13818,6 @@ const SetDefinedNameCommand = {
 	id: "sheet.command.set-defined-name",
 	type: _univerjs_core.CommandType.COMMAND,
 	handler: (accessor, params) => {
-		var _interceptorCommands$, _interceptorCommands$2;
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
 		const sheetInterceptorService = accessor.get(SheetInterceptorService);
@@ -13873,7 +13829,7 @@ const SetDefinedNameCommand = {
 			params
 		});
 		const redos = [
-			...(_interceptorCommands$ = interceptorCommands.preRedos) !== null && _interceptorCommands$ !== void 0 ? _interceptorCommands$ : [],
+			...interceptorCommands.preRedos ?? [],
 			...oldDefinedNameMutationParams ? [{
 				id: _univerjs_engine_formula.RemoveDefinedNameMutation.id,
 				params: oldDefinedNameMutationParams
@@ -13885,7 +13841,7 @@ const SetDefinedNameCommand = {
 			...interceptorCommands.redos
 		];
 		const undos = [
-			...(_interceptorCommands$2 = interceptorCommands.preUndos) !== null && _interceptorCommands$2 !== void 0 ? _interceptorCommands$2 : [],
+			...interceptorCommands.preUndos ?? [],
 			{
 				id: _univerjs_engine_formula.RemoveDefinedNameMutation.id,
 				params: newDefinedNameMutationParams
@@ -14351,7 +14307,6 @@ const SetSpecificRowsVisibleCommand = {
 		});
 		const interceptedResult = (0, _univerjs_core.sequenceExecute)([...intercepted.redos], commandService);
 		if (result.result && interceptedResult.result) {
-			var _intercepted$preUndos, _intercepted$undos, _intercepted$preRedos;
 			const afterInterceptors = sheetInterceptorService.afterCommandExecute({
 				id: SetSpecificRowsVisibleCommand.id,
 				params
@@ -14360,7 +14315,7 @@ const SetSpecificRowsVisibleCommand = {
 			undoRedoService.pushUndoRedo({
 				unitID: unitId,
 				undoMutations: [
-					...(_intercepted$preUndos = intercepted.preUndos) !== null && _intercepted$preUndos !== void 0 ? _intercepted$preUndos : [],
+					...intercepted.preUndos ?? [],
 					{
 						id: SetRowHiddenMutation.id,
 						params: undoMutationParams
@@ -14369,11 +14324,11 @@ const SetSpecificRowsVisibleCommand = {
 						id: SetSelectionsOperation.id,
 						params: undoSetSelectionsOperationParams
 					},
-					...(_intercepted$undos = intercepted.undos) !== null && _intercepted$undos !== void 0 ? _intercepted$undos : [],
+					...intercepted.undos ?? [],
 					...afterInterceptors.undos
 				],
 				redoMutations: [
-					...(_intercepted$preRedos = intercepted.preRedos) !== null && _intercepted$preRedos !== void 0 ? _intercepted$preRedos : [],
+					...intercepted.preRedos ?? [],
 					{
 						id: SetRowVisibleMutation.id,
 						params: redoMutationParams
@@ -14415,7 +14370,7 @@ const SetRowHiddenCommand = {
 	type: _univerjs_core.CommandType.COMMAND,
 	id: "sheet.command.set-rows-hidden",
 	handler: (accessor, params) => {
-		var _params$ranges, _intercepted$preRedos2;
+		var _params$ranges;
 		const selectionManagerService = accessor.get(SheetsSelectionsService);
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
@@ -14457,7 +14412,7 @@ const SetRowHiddenCommand = {
 			params: redoMutationParams
 		});
 		if ((0, _univerjs_core.sequenceExecute)([
-			...(_intercepted$preRedos2 = intercepted.preRedos) !== null && _intercepted$preRedos2 !== void 0 ? _intercepted$preRedos2 : [],
+			...intercepted.preRedos ?? [],
 			{
 				id: SetRowHiddenMutation.id,
 				params: redoMutationParams
@@ -14468,7 +14423,6 @@ const SetRowHiddenCommand = {
 			},
 			...intercepted.redos
 		], commandService).result) {
-			var _intercepted$preUndos2, _intercepted$undos2, _intercepted$preRedos3;
 			const afterInterceptors = sheetInterceptorService.afterCommandExecute({
 				id: SetRowHiddenCommand.id,
 				params: redoMutationParams
@@ -14477,7 +14431,7 @@ const SetRowHiddenCommand = {
 			undoRedoService.pushUndoRedo({
 				unitID: unitId,
 				undoMutations: [
-					...(_intercepted$preUndos2 = intercepted.preUndos) !== null && _intercepted$preUndos2 !== void 0 ? _intercepted$preUndos2 : [],
+					...intercepted.preUndos ?? [],
 					{
 						id: SetRowVisibleMutation.id,
 						params: undoMutationParams
@@ -14486,11 +14440,11 @@ const SetRowHiddenCommand = {
 						id: SetSelectionsOperation.id,
 						params: undoSetSelectionsOperationParams
 					},
-					...(_intercepted$undos2 = intercepted.undos) !== null && _intercepted$undos2 !== void 0 ? _intercepted$undos2 : [],
+					...intercepted.undos ?? [],
 					...afterInterceptors.undos
 				],
 				redoMutations: [
-					...(_intercepted$preRedos3 = intercepted.preRedos) !== null && _intercepted$preRedos3 !== void 0 ? _intercepted$preRedos3 : [],
+					...intercepted.preRedos ?? [],
 					{
 						id: SetRowHiddenMutation.id,
 						params: redoMutationParams
@@ -14662,7 +14616,6 @@ const SetWorkbookNameCommand = {
 	type: _univerjs_core.CommandType.COMMAND,
 	id: "sheet.command.set-workbook-name",
 	handler: (accessor, params) => {
-		var _interceptedCommands$;
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const sheetInterceptorService = accessor.get(SheetInterceptorService);
 		if (!getSheetCommandTargetWorkbook(accessor.get(_univerjs_core.IUniverInstanceService), params)) return false;
@@ -14675,7 +14628,7 @@ const SetWorkbookNameCommand = {
 			unitId: params.unitId
 		};
 		return (0, _univerjs_core.sequenceExecute)([
-			...(_interceptedCommands$ = interceptedCommands.preRedos) !== null && _interceptedCommands$ !== void 0 ? _interceptedCommands$ : [],
+			...interceptedCommands.preRedos ?? [],
 			{
 				id: SetWorkbookNameMutation.id,
 				params: redoMutationParams
@@ -14851,7 +14804,6 @@ const SetColWidthCommand = {
 		});
 		const result = (0, _univerjs_core.sequenceExecute)([...intercepted.redos, ...autoHeightRedos], commandService);
 		if (setColWidthResult && result.result) {
-			var _intercepted$preUndos, _intercepted$preRedos;
 			const afterInterceptors = sheetInterceptorService.afterCommandExecute({
 				id: SetColWidthCommand.id,
 				params: redoMutationParams
@@ -14860,7 +14812,7 @@ const SetColWidthCommand = {
 			undoRedoService.pushUndoRedo({
 				unitID: unitId,
 				undoMutations: [
-					...(_intercepted$preUndos = intercepted.preUndos) !== null && _intercepted$preUndos !== void 0 ? _intercepted$preUndos : [],
+					...intercepted.preUndos ?? [],
 					{
 						id: SetWorksheetColWidthMutation.id,
 						params: undoMutationParams
@@ -14870,7 +14822,7 @@ const SetColWidthCommand = {
 					...autoHeightUndos
 				],
 				redoMutations: [
-					...(_intercepted$preRedos = intercepted.preRedos) !== null && _intercepted$preRedos !== void 0 ? _intercepted$preRedos : [],
+					...intercepted.preRedos ?? [],
 					{
 						id: SetWorksheetColWidthMutation.id,
 						params: redoMutationParams
@@ -15086,7 +15038,6 @@ const SetWorksheetNameCommand = {
 	type: _univerjs_core.CommandType.COMMAND,
 	id: "sheet.command.set-worksheet-name",
 	handler: (accessor, params) => {
-		var _interceptorCommands$, _interceptorCommands$2;
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
 		const sheetInterceptorService = accessor.get(SheetInterceptorService);
@@ -15104,7 +15055,7 @@ const SetWorksheetNameCommand = {
 			params
 		});
 		const redos = [
-			...(_interceptorCommands$ = interceptorCommands.preRedos) !== null && _interceptorCommands$ !== void 0 ? _interceptorCommands$ : [],
+			...interceptorCommands.preRedos ?? [],
 			{
 				id: SetWorksheetNameMutation.id,
 				params: redoMutationParams
@@ -15112,7 +15063,7 @@ const SetWorksheetNameCommand = {
 			...interceptorCommands.redos
 		];
 		const undos = [
-			...(_interceptorCommands$2 = interceptorCommands.preUndos) !== null && _interceptorCommands$2 !== void 0 ? _interceptorCommands$2 : [],
+			...interceptorCommands.preUndos ?? [],
 			{
 				id: SetWorksheetNameMutation.id,
 				params: undoMutationParams
@@ -16413,10 +16364,7 @@ const SetWorksheetRightToLeftCommand = {
 		if (!target) return false;
 		const { unitId, subUnitId } = target;
 		let rightToLeft = _univerjs_core.BooleanNumber.FALSE;
-		if (params) {
-			var _params$rightToLeft;
-			rightToLeft = (_params$rightToLeft = params.rightToLeft) !== null && _params$rightToLeft !== void 0 ? _params$rightToLeft : _univerjs_core.BooleanNumber.FALSE;
-		}
+		if (params) rightToLeft = params.rightToLeft ?? _univerjs_core.BooleanNumber.FALSE;
 		const setWorksheetRightToLeftMutationParams = {
 			rightToLeft,
 			unitId,
@@ -16549,7 +16497,6 @@ const DeltaRowHeightCommand = {
 		}], commandService);
 		const interceptedResult = (0, _univerjs_core.sequenceExecute)([...intercepted.redos], commandService);
 		if (result.result && interceptedResult.result) {
-			var _intercepted$preUndos, _intercepted$preRedos;
 			const afterInterceptors = sheetInterceptorService.afterCommandExecute({
 				id: DeltaRowHeightCommand.id,
 				params: redoMutationParams
@@ -16558,7 +16505,7 @@ const DeltaRowHeightCommand = {
 			undoRedoService.pushUndoRedo({
 				unitID: unitId,
 				undoMutations: [
-					...(_intercepted$preUndos = intercepted.preUndos) !== null && _intercepted$preUndos !== void 0 ? _intercepted$preUndos : [],
+					...intercepted.preUndos ?? [],
 					{
 						id: SetWorksheetRowHeightMutation.id,
 						params: undoMutationParams
@@ -16571,7 +16518,7 @@ const DeltaRowHeightCommand = {
 					...afterInterceptors.undos
 				],
 				redoMutations: [
-					...(_intercepted$preRedos = intercepted.preRedos) !== null && _intercepted$preRedos !== void 0 ? _intercepted$preRedos : [],
+					...intercepted.preRedos ?? [],
 					{
 						id: SetWorksheetRowHeightMutation.id,
 						params: redoMutationParams
@@ -16631,7 +16578,6 @@ const SetRowHeightCommand = {
 		});
 		const sheetInterceptorResult = (0, _univerjs_core.sequenceExecute)([...intercepted.redos], commandService);
 		if (result.result && sheetInterceptorResult.result) {
-			var _intercepted$preRedos2, _intercepted$preRedos3;
 			const afterInterceptors = sheetInterceptorService.afterCommandExecute({
 				id: SetRowHeightCommand.id,
 				params: redoMutationParams
@@ -16640,7 +16586,7 @@ const SetRowHeightCommand = {
 			undoRedoService.pushUndoRedo({
 				unitID: unitId,
 				undoMutations: [
-					...(_intercepted$preRedos2 = intercepted.preRedos) !== null && _intercepted$preRedos2 !== void 0 ? _intercepted$preRedos2 : [],
+					...intercepted.preRedos ?? [],
 					{
 						id: SetWorksheetRowHeightMutation.id,
 						params: undoMutationParams
@@ -16653,7 +16599,7 @@ const SetRowHeightCommand = {
 					...afterInterceptors.undos
 				],
 				redoMutations: [
-					...(_intercepted$preRedos3 = intercepted.preRedos) !== null && _intercepted$preRedos3 !== void 0 ? _intercepted$preRedos3 : [],
+					...intercepted.preRedos ?? [],
 					{
 						id: SetWorksheetRowHeightMutation.id,
 						params: redoMutationParams
@@ -17007,18 +16953,26 @@ const TextToNumberCommand = {
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
 		const { worksheet, unitId, subUnitId } = target;
 		const newCellValue = new _univerjs_core.ObjectMatrix();
+		const setNumfmtCells = [];
 		const removeNumfmtRanges = [];
 		for (let i = 0; i < ranges.length; i++) for (let r = ranges[i].startRow; r <= ranges[i].endRow; r++) for (let c = ranges[i].startColumn; c <= ranges[i].endColumn; c++) {
 			var _worksheet$getStyleDa, _cell$s;
 			if (newCellValue.getValue(r, c)) continue;
 			const cell = worksheet.getCellRaw(r, c);
 			const pattern = typeof (cell === null || cell === void 0 ? void 0 : cell.s) === "string" ? (_worksheet$getStyleDa = worksheet.getStyleDataByHash(cell.s)) === null || _worksheet$getStyleDa === void 0 || (_worksheet$getStyleDa = _worksheet$getStyleDa.n) === null || _worksheet$getStyleDa === void 0 ? void 0 : _worksheet$getStyleDa.pattern : cell === null || cell === void 0 || (_cell$s = cell.s) === null || _cell$s === void 0 || (_cell$s = _cell$s.n) === null || _cell$s === void 0 ? void 0 : _cell$s.pattern;
-			if (cell && cell.v && (cell.t !== _univerjs_core.CellValueType.NUMBER || (0, _univerjs_core.isTextFormat)(pattern)) && (0, _univerjs_core.isRealNum)(cell.v)) {
+			const parsedValue = typeof (cell === null || cell === void 0 ? void 0 : cell.v) === "string" ? (0, _univerjs_core.getNumfmtParseValueFilter)(cell.v) : null;
+			const numberValue = (0, _univerjs_core.isRealNum)(cell === null || cell === void 0 ? void 0 : cell.v) ? Number(cell === null || cell === void 0 ? void 0 : cell.v) : typeof (parsedValue === null || parsedValue === void 0 ? void 0 : parsedValue.v) === "number" ? parsedValue.v : null;
+			if (cell && cell.v && (cell.t !== _univerjs_core.CellValueType.NUMBER || (0, _univerjs_core.isTextFormat)(pattern)) && numberValue !== null) {
 				newCellValue.setValue(r, c, {
-					v: Number(cell.v),
+					v: numberValue,
 					t: _univerjs_core.CellValueType.NUMBER
 				});
-				if ((0, _univerjs_core.isTextFormat)(pattern)) removeNumfmtRanges.push({
+				if ((parsedValue === null || parsedValue === void 0 ? void 0 : parsedValue.z) && (!pattern || (0, _univerjs_core.isTextFormat)(pattern))) setNumfmtCells.push({
+					pattern: parsedValue.z,
+					row: r,
+					col: c
+				});
+				else if ((0, _univerjs_core.isTextFormat)(pattern)) removeNumfmtRanges.push({
 					startRow: r,
 					endRow: r,
 					startColumn: c,
@@ -17039,6 +16993,14 @@ const TextToNumberCommand = {
 			id: SetRangeValuesMutation.id,
 			params: SetRangeValuesUndoMutationFactory(accessor, setRangeValuesMutationParams)
 		}];
+		if (setNumfmtCells.length) {
+			const setNumfmtMutationParams = transformCellsToRange(unitId, subUnitId, setNumfmtCells);
+			redos.push({
+				id: SetNumfmtMutation.id,
+				params: setNumfmtMutationParams
+			});
+			undos.push(...factorySetNumfmtUndoMutation(accessor, setNumfmtMutationParams));
+		}
 		if (removeNumfmtRanges.length) {
 			const removeNumfmtMutationParams = {
 				unitId,
@@ -17853,14 +17815,14 @@ const effectedByOnlyLocalMutationIds = [
 ];
 let SheetsFreezeSyncController = class SheetsFreezeSyncController extends _univerjs_core.Disposable {
 	constructor(_univerInstanceService, _commandService, _configService) {
-		var _this$_configService$, _this$_configService$2;
+		var _this$_configService$;
 		super();
 		this._univerInstanceService = _univerInstanceService;
 		this._commandService = _commandService;
 		this._configService = _configService;
 		_defineProperty(this, "_d", new _univerjs_core.DisposableCollection());
 		_defineProperty(this, "_enabled", true);
-		const freezeSync = (_this$_configService$ = (_this$_configService$2 = this._configService.getConfig("sheets.config")) === null || _this$_configService$2 === void 0 ? void 0 : _this$_configService$2.freezeSync) !== null && _this$_configService$ !== void 0 ? _this$_configService$ : true;
+		const freezeSync = ((_this$_configService$ = this._configService.getConfig("sheets.config")) === null || _this$_configService$ === void 0 ? void 0 : _this$_configService$.freezeSync) ?? true;
 		this.setEnabled(freezeSync);
 	}
 	getEnabled() {
@@ -18256,6 +18218,19 @@ let SheetPermissionCheckController = class SheetPermissionCheckController extend
 				}, params.unitId, params.localSheetId);
 				errorMsg = this._localeService.t("sheets.permission.dialog.editErr");
 				break;
+			case TextToNumberCommand.id:
+				params = commandInfo.params;
+				permission = this.permissionCheckWithRanges({
+					workbookTypes: [WorkbookEditablePermission],
+					worksheetTypes: [
+						WorksheetSetCellValuePermission,
+						WorksheetSetCellStylePermission,
+						WorksheetEditPermission
+					],
+					rangeTypes: [RangeProtectionPermissionEditPoint]
+				}, params === null || params === void 0 ? void 0 : params.ranges, params === null || params === void 0 ? void 0 : params.unitId, params === null || params === void 0 ? void 0 : params.subUnitId);
+				errorMsg = this._localeService.t("sheets.permission.dialog.editErr");
+				break;
 			default: break;
 		}
 		if (!permission) this.blockExecuteWithoutPermission(errorMsg);
@@ -18280,7 +18255,7 @@ let SheetPermissionCheckController = class SheetPermissionCheckController extend
 		})) return false;
 		if (rangeTypes && rangeTypes.length > 0) {
 			var _this$_selectionManag;
-			const ranges = selectionRanges !== null && selectionRanges !== void 0 ? selectionRanges : (_this$_selectionManag = this._selectionManagerService.getCurrentSelections()) === null || _this$_selectionManag === void 0 ? void 0 : _this$_selectionManag.map((s) => s.range);
+			const ranges = selectionRanges ?? ((_this$_selectionManag = this._selectionManagerService.getCurrentSelections()) === null || _this$_selectionManag === void 0 ? void 0 : _this$_selectionManag.map((s) => s.range));
 			if (!ranges) return false;
 			const rules = this._rangeProtectionRuleModel.getSubunitRuleList(_unitId, _subUnitId);
 			if (rules.length === 0) return true;
@@ -18497,11 +18472,11 @@ let SheetPermissionCheckController = class SheetPermissionCheckController extend
 		return true;
 	}
 	_permissionCheckWithInsertOrDeleteMoveRange(direction, params) {
-		var _params$range, _this$_selectionManag3;
+		var _this$_selectionManag3;
 		const target = getSheetCommandTarget(this._univerInstanceService);
 		if (!target) return false;
 		const { worksheet, unitId, subUnitId } = target;
-		const range = (_params$range = params === null || params === void 0 ? void 0 : params.range) !== null && _params$range !== 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$_selectionManag3 = this._selectionManagerService.getCurrentLastSelection()) === null || _this$_selectionManag3 === void 0 ? void 0 : _this$_selectionManag3.range);
 		if (!range) return false;
 		if (!this.permissionCheckWithRanges({
 			workbookTypes: [WorkbookEditablePermission],
@@ -19085,10 +19060,9 @@ let RangeProtectionRenderModel = class RangeProtectionRenderModel extends _unive
 		const result = [];
 		for (const rule of ruleMap) if (rule.ranges.some((range) => range.startRow <= row && range.endRow >= row && range.startColumn <= col && range.endColumn >= col)) {
 			const permissionMap = getAllRangePermissionPoint().reduce((result, F) => {
-				var _permission$value;
 				const instance = new F(unitId, subUnitId, rule.permissionId);
 				const permission = this._permissionService.getPermissionPoint(instance.id);
-				result[instance.subType] = (_permission$value = permission === null || permission === void 0 ? void 0 : permission.value) !== null && _permission$value !== void 0 ? _permission$value : instance.value;
+				result[instance.subType] = (permission === null || permission === void 0 ? void 0 : permission.value) ?? instance.value;
 				return result;
 			}, {});
 			result.push({
@@ -19244,11 +19218,11 @@ let RangeProtectionCache = class RangeProtectionCache extends _univerjs_core.Dis
 		this._permissionIdCache.delete(rule.permissionId);
 	}
 	_getSelectionActions(unitId, subUnitId, rule) {
-		var _this$_permissionServ, _this$_permissionServ2, _RangeProtectionPermi, _this$_permissionServ3, _this$_permissionServ4, _RangeProtectionPermi2, _this$_permissionServ5, _this$_permissionServ6, _RangeProtectionPermi3, _this$_permissionServ7, _this$_permissionServ8, _RangeProtectionPermi4;
-		const edit = (_this$_permissionServ = (_this$_permissionServ2 = this._permissionService.getPermissionPoint((_RangeProtectionPermi = new RangeProtectionPermissionEditPoint(unitId, subUnitId, rule.permissionId)) === null || _RangeProtectionPermi === void 0 ? void 0 : _RangeProtectionPermi.id)) === null || _this$_permissionServ2 === void 0 ? void 0 : _this$_permissionServ2.value) !== null && _this$_permissionServ !== void 0 ? _this$_permissionServ : false;
-		const view = (_this$_permissionServ3 = (_this$_permissionServ4 = this._permissionService.getPermissionPoint((_RangeProtectionPermi2 = new RangeProtectionPermissionViewPoint(unitId, subUnitId, rule.permissionId)) === null || _RangeProtectionPermi2 === void 0 ? void 0 : _RangeProtectionPermi2.id)) === null || _this$_permissionServ4 === void 0 ? void 0 : _this$_permissionServ4.value) !== null && _this$_permissionServ3 !== void 0 ? _this$_permissionServ3 : false;
-		const manageProtection = (_this$_permissionServ5 = (_this$_permissionServ6 = this._permissionService.getPermissionPoint((_RangeProtectionPermi3 = new RangeProtectionPermissionManageCollaPoint(unitId, subUnitId, rule.permissionId)) === null || _RangeProtectionPermi3 === void 0 ? void 0 : _RangeProtectionPermi3.id)) === null || _this$_permissionServ6 === void 0 ? void 0 : _this$_permissionServ6.value) !== null && _this$_permissionServ5 !== void 0 ? _this$_permissionServ5 : false;
-		const deleteProtection = (_this$_permissionServ7 = (_this$_permissionServ8 = this._permissionService.getPermissionPoint((_RangeProtectionPermi4 = new RangeProtectionPermissionDeleteProtectionPoint(unitId, subUnitId, rule.permissionId)) === null || _RangeProtectionPermi4 === void 0 ? void 0 : _RangeProtectionPermi4.id)) === null || _this$_permissionServ8 === void 0 ? void 0 : _this$_permissionServ8.value) !== null && _this$_permissionServ7 !== void 0 ? _this$_permissionServ7 : false;
+		var _this$_permissionServ, _RangeProtectionPermi, _this$_permissionServ2, _RangeProtectionPermi2, _this$_permissionServ3, _RangeProtectionPermi3, _this$_permissionServ4, _RangeProtectionPermi4;
+		const edit = ((_this$_permissionServ = this._permissionService.getPermissionPoint((_RangeProtectionPermi = new RangeProtectionPermissionEditPoint(unitId, subUnitId, rule.permissionId)) === null || _RangeProtectionPermi === void 0 ? void 0 : _RangeProtectionPermi.id)) === null || _this$_permissionServ === void 0 ? void 0 : _this$_permissionServ.value) ?? false;
+		const view = ((_this$_permissionServ2 = this._permissionService.getPermissionPoint((_RangeProtectionPermi2 = new RangeProtectionPermissionViewPoint(unitId, subUnitId, rule.permissionId)) === null || _RangeProtectionPermi2 === void 0 ? void 0 : _RangeProtectionPermi2.id)) === null || _this$_permissionServ2 === void 0 ? void 0 : _this$_permissionServ2.value) ?? false;
+		const manageProtection = ((_this$_permissionServ3 = this._permissionService.getPermissionPoint((_RangeProtectionPermi3 = new RangeProtectionPermissionManageCollaPoint(unitId, subUnitId, rule.permissionId)) === null || _RangeProtectionPermi3 === void 0 ? void 0 : _RangeProtectionPermi3.id)) === null || _this$_permissionServ3 === void 0 ? void 0 : _this$_permissionServ3.value) ?? false;
+		const deleteProtection = ((_this$_permissionServ4 = this._permissionService.getPermissionPoint((_RangeProtectionPermi4 = new RangeProtectionPermissionDeleteProtectionPoint(unitId, subUnitId, rule.permissionId)) === null || _RangeProtectionPermi4 === void 0 ? void 0 : _RangeProtectionPermi4.id)) === null || _this$_permissionServ4 === void 0 ? void 0 : _this$_permissionServ4.value) ?? false;
 		return {
 			[_univerjs_protocol.UnitAction.Edit]: edit,
 			[_univerjs_protocol.UnitAction.View]: view,
@@ -19396,7 +19370,7 @@ RangeProtectionCache = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets";
-var version = "1.0.0-alpha.8";
+var version = "1.0.0-beta.1";
 
 //#endregion
 //#region src/controllers/active-worksheet.controller.ts
@@ -19503,7 +19477,6 @@ const ONLY_REGISTER_FORMULA_RELATED_MUTATIONS_KEY = "ONLY_REGISTER_FORMULA_RELAT
 //#region src/controllers/basic-worksheet.controller.ts
 let BasicWorksheetController = class BasicWorksheetController extends _univerjs_core.Disposable {
 	constructor(_commandService, _configService, _dataSyncPrimaryController) {
-		var _this$_configService$;
 		super();
 		this._commandService = _commandService;
 		this._configService = _configService;
@@ -19545,7 +19518,7 @@ let BasicWorksheetController = class BasicWorksheetController extends _univerjs_
 			this._commandService.registerCommand(mutation);
 			(_this$_dataSyncPrimar = this._dataSyncPrimaryController) === null || _this$_dataSyncPrimar === void 0 || _this$_dataSyncPrimar.registerSyncingMutations(mutation);
 		});
-		if (!((_this$_configService$ = this._configService.getConfig("ONLY_REGISTER_FORMULA_RELATED_MUTATIONS_KEY")) !== null && _this$_configService$ !== void 0 ? _this$_configService$ : false)) [
+		if (!(this._configService.getConfig("ONLY_REGISTER_FORMULA_RELATED_MUTATIONS_KEY") ?? false)) [
 			AddWorksheetMergeCommand,
 			AddWorksheetMergeAllCommand,
 			AddWorksheetMergeVerticalCommand,
@@ -19783,10 +19756,10 @@ let SheetPermissionViewModelController = class SheetPermissionViewModelControlle
 				const { unitId, subUnitId } = context;
 				const worksheetRule = this._worksheetProtectionRuleModel.getRule(unitId, subUnitId);
 				if (worksheetRule === null || worksheetRule === void 0 ? void 0 : worksheetRule.permissionId) {
-					var _this$_permissionServ, _this$_permissionServ2, _this$_permissionServ3, _this$_permissionServ4, _selectionProtection$;
+					var _this$_permissionServ, _this$_permissionServ2, _selectionProtection$;
 					const selectionProtection = [{
-						[_univerjs_protocol.UnitAction.View]: (_this$_permissionServ = (_this$_permissionServ2 = this._permissionService.getPermissionPoint(new WorksheetViewPermission(unitId, subUnitId).id)) === null || _this$_permissionServ2 === void 0 ? void 0 : _this$_permissionServ2.value) !== null && _this$_permissionServ !== void 0 ? _this$_permissionServ : false,
-						[_univerjs_protocol.UnitAction.Edit]: (_this$_permissionServ3 = (_this$_permissionServ4 = this._permissionService.getPermissionPoint(new WorksheetEditPermission(unitId, subUnitId).id)) === null || _this$_permissionServ4 === void 0 ? void 0 : _this$_permissionServ4.value) !== null && _this$_permissionServ3 !== void 0 ? _this$_permissionServ3 : false
+						[_univerjs_protocol.UnitAction.View]: ((_this$_permissionServ = this._permissionService.getPermissionPoint(new WorksheetViewPermission(unitId, subUnitId).id)) === null || _this$_permissionServ === void 0 ? void 0 : _this$_permissionServ.value) ?? false,
+						[_univerjs_protocol.UnitAction.Edit]: ((_this$_permissionServ2 = this._permissionService.getPermissionPoint(new WorksheetEditPermission(unitId, subUnitId).id)) === null || _this$_permissionServ2 === void 0 ? void 0 : _this$_permissionServ2.value) ?? false
 					}];
 					const isSkipRender = !((_selectionProtection$ = selectionProtection[0]) === null || _selectionProtection$ === void 0 ? void 0 : _selectionProtection$[_univerjs_protocol.UnitAction.View]);
 					const _cellData = !cell || cell === context.rawData ? { ...cell } : cell;
@@ -21857,6 +21830,7 @@ exports.handleInsertRow = handleInsertRow;
 exports.handleMoveCols = handleMoveCols;
 exports.handleMoveRange = handleMoveRange;
 exports.handleMoveRows = handleMoveRows;
+exports.isCellImage = isCellImage;
 exports.isSingleCellSelection = isSingleCellSelection;
 exports.rangeMerge = rangeMerge;
 exports.rangeToDiscreteRange = rangeToDiscreteRange;